diff --git a/.gitignore b/.gitignore
index d80ea9cee9..e75af825e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ Thumbs.db
 customization.lua
 # The COMMIT info is generated everytime CMake is run
 COMMIT.md
+*_codegen.cpp
diff --git a/.gitmodules b/.gitmodules
index 0bfcb7f59d..112e7a1300 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,3 +29,6 @@
 [submodule "ext/date"]
 	path = ext/date
 	url = https://github.com/HowardHinnant/date
+[submodule "support/coding/codegen"]
+	path = support/coding/codegen
+	url = https://github.com/OpenSpace/codegen
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7343b90e4a..a3c2a8c767 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -29,7 +29,7 @@ project(OpenSpace)
 set(OPENSPACE_VERSION_MAJOR 0)
 set(OPENSPACE_VERSION_MINOR 16)
 set(OPENSPACE_VERSION_PATCH 0)
-set(OPENSPACE_VERSION_STRING "Beta-8 RC1")
+set(OPENSPACE_VERSION_STRING "Beta-8")
 
 set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")
 set(OPENSPACE_CMAKE_EXT_DIR "${OPENSPACE_BASE_DIR}/support/cmake")
@@ -37,14 +37,11 @@ set(GHOUL_BASE_DIR "${OPENSPACE_BASE_DIR}/ext/ghoul")
 
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_common.cmake)
 include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
-include(${OPENSPACE_CMAKE_EXT_DIR}/handle_applications.cmake)
-include(${OPENSPACE_CMAKE_EXT_DIR}/handle_modules.cmake)
 include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake)
 include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
 include(${GHOUL_BASE_DIR}/support/cmake/message_macros.cmake)
 
 begin_header("Configuring OpenSpace project")
-message(STATUS "CMake version: ${CMAKE_VERSION}")
 
 # Bail out if the user tries to generate a 32 bit project.
 if (NOT ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
@@ -55,26 +52,28 @@ endif ()
 # Cleanup project                                                                        #
 ##########################################################################################
 set(OPENSPACE_APPS_DIR "${OPENSPACE_BASE_DIR}/apps")
-set(OPENSPACE_EXT_DIR "${OPENSPACE_BASE_DIR}/ext")
 
-if (NOT EXISTS ${OPENSPACE_EXT_DIR}/ghoul/CMakeLists.txt)
-  message(FATAL_ERROR "Git submodules are missing. Please run \n"
-    "git submodule update --init --recursive \n"
-    "to download the missing dependencies."
+if (NOT EXISTS "${OPENSPACE_BASE_DIR}/ext/ghoul/CMakeLists.txt")
+  message(FATAL_ERROR "Git submodules are missing. Please run "
+    "git submodule update --init --recursive to download the missing dependencies."
   )
 endif ()
 
-set_property(GLOBAL PROPERTY USE_FOLDERS On)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER CMake)
 
 mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BUILD_TYPE CMAKE_DEBUG_POSTFIX
   CMAKE_INSTALL_PREFIX CMAKE_OSX_ARCHITECTURES CMAKE_OSX_DEPLOYMENT_TARGET
-  CMAKE_OSX_SYSROOT CMAKE_RELEASE_POSTFIX)
+  CMAKE_OSX_SYSROOT CMAKE_RELEASE_POSTFIX
+)
 
 # Set build output directories
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${OPENSPACE_CMAKE_EXT_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OPENSPACE_BASE_DIR}/bin)
 
+# "OpenSpace Helper" is not a valid CMake target name under OLD
+cmake_policy(SET CMP0037 NEW)
+
 ##########################################################################################
 # Main                                                                                   #
 ##########################################################################################
@@ -103,7 +102,7 @@ execute_process(
 )
 if (NOT OPENSPACE_GIT_STATUS_RETURN EQUAL 0)
   set(OPENSPACE_GIT_STATUS "uncommitted changes")
-else()
+else ()
   set(OPENSPACE_GIT_STATUS "")
 endif ()
 
@@ -133,62 +132,35 @@ if (MSVC)
   set(GHOUL_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS ${OPENSPACE_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS} CACHE BOOL "" FORCE)
 endif ()
 
+option(OPENSPACE_WITH_ABUFFER_RENDERER "Compile ABuffer Renderer" OFF)
+
 if (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++abi")
 endif ()
 
-include(src/CMakeLists.txt)
+add_subdirectory(ext)
 
-##########################################################################################
-# Add external dependencies                                                              #
-##########################################################################################
-# System libraries
-if (APPLE)
-  begin_dependency("Core Libraries")
-  target_include_directories(openspace-core PUBLIC "/Developer/Headers/FlatCarbon")
-  find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-  find_library(CARBON_LIBRARY Carbon)
-  find_library(COCOA_LIBRARY Carbon)
-  find_library(APP_SERVICES_LIBRARY ApplicationServices)
-  mark_as_advanced(CARBON_LIBRARY COCOA_LIBRARY APP_SERVICES_LIBRARY)
-  target_link_libraries(openspace-core PUBLIC ${CARBON_LIBRARY} ${COREFOUNDATION_LIBRARY}
-    ${COCOA_LIBRARY} ${APP_SERVICES_LIBRARY})
-  end_dependency()
-endif ()
+add_subdirectory(src)
 
-# Ghoul
-add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul)
-target_link_libraries(openspace-core PUBLIC Ghoul)
-set_openspace_compile_settings(Ghoul)
-set_folder_location(Lua "External")
-set_folder_location(lz4 "External")
-set_folder_location(GhoulTest "Unit Tests")
-link_directories("${GHOUL_LIBRARY_DIRS}")
+add_subdirectory(support/coding/codegen)
+# It is important that the __codegen.h do not actually exist so
+# that this target is never considered as finished
+add_custom_target(
+  run_codegen
+  ALL DEPENDS
+    "${CMAKE_CURRENT_BINARY_DIR}/__codegen.h"
+)
+add_dependencies(run_codegen codegen)
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/__codegen.h"
+  COMMAND codegen ARGS "${OPENSPACE_BASE_DIR}/modules" "${OPENSPACE_BASE_DIR}/src"
+  VERBATIM
+)
+set_folder_location(codegen-lib "support")
+set_folder_location(codegen "support")
+set_folder_location(run_codegen "support")
 
-# Spice
-begin_dependency("Spice")
-add_subdirectory(${OPENSPACE_EXT_DIR}/spice)
-target_link_libraries(openspace-core PUBLIC Spice)
-set_folder_location(Spice "External")
-end_dependency()
-
-# Curl
-begin_dependency("CURL")
-if (WIN32)
-  set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl")
-  target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_ROOT_DIR}/include)
-  target_link_libraries(openspace-core PUBLIC ${CURL_ROOT_DIR}/lib/libcurl.lib)
-  target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB")
-else ()
-  find_package(CURL)
-  if (CURL_FOUND)
-    target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_INCLUDE_DIRS})
-    target_link_libraries(openspace-core PUBLIC ${CURL_LIBRARIES})
-    target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED")
-  endif ()
-endif ()
-end_dependency()
 
 # Qt
 # Unfortunately, we have to set this value manually; sigh
@@ -202,6 +174,7 @@ if (APPLE)
     "~/Qt/5.10/clang_64/lib/cmake"
     "~/Qt/5.11/clang_64/lib/cmake"
     "~/Qt/5.12/clang_64/lib/cmake"
+    "~/Qt/5.15.1/clang_64/lib/cmake"
   )
 endif ()
 
@@ -217,20 +190,23 @@ if (MSVC)
 endif ()
 
 begin_header("Configuring Modules")
-set(OPENSPACE_EXTERNAL_MODULES_PATHS "" CACHE STRING "List of external modules")
-handle_modules("${OPENSPACE_BASE_DIR}/modules" "${OPENSPACE_EXTERNAL_MODULES_PATHS}")
+add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/modules")
 end_header("End: Configuring Modules")
-message(STATUS "")
+
+
+add_subdirectory(support/coding/codegen/tests)
+set_folder_location(run_test_codegen "Unit Tests/support")
+set_folder_location(codegentest "Unit Tests")
+
 
 begin_header("Configuring Applications")
-handle_applications()
+add_subdirectory("${OPENSPACE_APPS_DIR}")
 end_header("End: Configuring Applications")
-message(STATUS "")
 
 option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON)
 if (OPENSPACE_HAVE_TESTS)
   begin_header("Generating OpenSpace unit test")
-  add_subdirectory("${OPENSPACE_BASE_DIR}/tests")
+  add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests")
   end_header()
 endif (OPENSPACE_HAVE_TESTS)
 
@@ -252,29 +228,13 @@ if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
   # find CEF to initialize it properly.
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${WEBBROWSER_MODULE_PATH}/cmake")
   include(webbrowser_helpers)
-elseif (OPENSPACE_MODULE_WEBBROWSER)
-  message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.")
+elseif ()
+  message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again")
 endif ()
 
 ##########################################################################################
 # Misc settings                                                                          #
 ##########################################################################################
-option(OPENSPACE_WITH_ABUFFER_RENDERER "Compile ABuffer Renderer" OFF)
-if (OPENSPACE_WITH_ABUFFER_RENDERER)
-  target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_ABUFFER_RENDERER")
-endif ()
-
-option(OPENSPACE_WITH_INSTRUMENTATION "Add instrumentation options" OFF)
-if (OPENSPACE_WITH_INSTRUMENTATION)
-  target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_INSTRUMENTATION")
-endif ()
-
-
-# Just in case, create the bin directory
-add_custom_command(
-  TARGET openspace-core
-  PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-)
 
 # Manage the CPack packaging
 include(${OPENSPACE_CMAKE_EXT_DIR}/packaging.cmake)
diff --git a/CREDITS.md b/CREDITS.md
index 5e074cc2aa..c7201a953d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -3,29 +3,38 @@ Alexander Bock
 Emil Axelsson
 Kalle Bladin
 Jonathas Costa
+Gene Payne
 Jonas Strandstedt
 Michal Marcinkowski
-Joakim Kilby
-Gene Payne
+Elon Olsson
+Emma Broman
 Micah Acinapura
+Joakim Kilby
+Lovisa Hassler
+Mikael Petterson 
 Erik Sundén
+Stefan Lindblad
+Malin Ejdbo
+Corrie Roe
 Eric Myers
 
 Sebastian Piwell
 Erik Broberg
 Jonathan Bosson
 Michael Nilsson
-Elon Olsson
 Jonathan Franzen
+Karin Reidarman
 Hans-Christian Helltegen
 Anton Arbring
 Oskar Carlbaum
 Matthew Territo
 Jonathan Grangien
 Klas Eskilson
+Aniisa Bihi
 Tomas Forsyth Rosin
 Niclas Hultberg
 Rickard Lindtstedt
+Ingela Rossing
 Michael Sjöström
 Michael Novén
 Christoffer Särevall
@@ -35,8 +44,10 @@ Christoffer Särevall
 Anteige
 arfon
 DavidLaidlaw
+johnriedel
 mik3caprio
 mingenuity
 nbartzokas
 nealmcb
 noahdasanaike
+sa5bke
diff --git a/Jenkinsfile b/Jenkinsfile
index 53b9c5ab90..5fc5351950 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -92,100 +92,171 @@ parallel tools: {
       )
       recordIssues(
         id: 'tools-cppcheck',
-        tool: cppCheck()
+        tool: cppCheck(pattern: 'build/cppcheck.xml')
       ) 
     }  
     cleanWs()
   } // node('tools')
 },
-linux_gcc: {
-  node('linux' && 'gcc') {
-    stage('linux-gcc/scm') {
-      deleteDir();
-      gitHelper.checkoutGit(url, branch);
-    }
-    stage('linux-gcc/build(make)') {
-        def cmakeCompileOptions = moduleCMakeFlags();
-        cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release';
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-make');
-        compileHelper.recordCompileIssues(compileHelper.Gcc());
-    }
-    stage('linux-gcc/build(ninja)') {
-        def cmakeCompileOptions = moduleCMakeFlags();
-        cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release';
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
-    }
-    stage('linux-gcc/test') {
-      // testHelper.runUnitTests('build/OpenSpaceTest');
-    }
-    cleanWs()
-  } // node('linux')
-},
-linux_clang: {
-  node('linux' && 'clang') {
-    stage('linux-clang/scm') {
-      deleteDir()
-      gitHelper.checkoutGit(url, branch);
-    }
-    stage('linux-clang/build(make)') {
-        def cmakeCompileOptions = moduleCMakeFlags()
-        cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release'
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Make(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-make');
-        compileHelper.recordCompileIssues(compileHelper.Clang());
-    }
-    stage('linux-clang/build(ninja)') {
-        def cmakeCompileOptions = moduleCMakeFlags()
-        cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'
-        // Not sure why the linking of OpenSpaceTest takes so long
-        compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
-    }
-    stage('linux-clang/test') {
-      // testHelper.runUnitTests('build/OpenSpaceTest');
-    }
-    cleanWs()
-  } // node('linux')
-},
-windows: {
-  node('windows') {
-    ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") {
-      stage('windows/scm') {
+linux_gcc_make: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'gcc') {
+      stage('linux-gcc-make/scm') {
         deleteDir();
         gitHelper.checkoutGit(url, branch);
       }
-      stage('windows/build(msvc)') {
+      stage('linux-gcc-make/build') {
+          def cmakeCompileOptions = moduleCMakeFlags();
+          cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release';
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-make');
+          compileHelper.recordCompileIssues(compileHelper.Gcc());
+      }
+      stage('linux-gcc-make/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
+        // testHelper.runUnitTests('bin/codegentest')
+      }
+      cleanWs()
+    } // node('linux')
+  }
+},
+linux_gcc_ninja: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'gcc') {
+      stage('linux-gcc-ninja/scm') {
+        deleteDir();
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('linux-gcc-ninja/build') {
+          def cmakeCompileOptions = moduleCMakeFlags();
+          cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release';
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
+      }
+      stage('linux-gcc-ninja/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
+        // testHelper.runUnitTests('bin/codegentest')
+      }
+      cleanWs()
+    } // node('linux')
+  }
+},
+linux_clang_make: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'clang') {
+      stage('linux-clang-make/scm') {
+        deleteDir()
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('linux-clang-make/build') {
+          def cmakeCompileOptions = moduleCMakeFlags()
+          cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release'
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Make(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-make');
+          compileHelper.recordCompileIssues(compileHelper.Clang());
+      }
+      stage('linux-clang-make/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
+        // testHelper.runUnitTests('bin/codegentest')
+      }
+      cleanWs()
+    } // node('linux')
+  }
+},
+linux_clang_ninja: {
+  if (env.USE_BUILD_OS_LINUX == 'true') {
+    node('linux' && 'clang') {
+      stage('linux-clang-ninja/scm') {
+        deleteDir()
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('linux-clang-ninja/build') {
+          def cmakeCompileOptions = moduleCMakeFlags()
+          cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'
+          // Not sure why the linking of OpenSpaceTest takes so long
+          compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
+      }
+      stage('linux-clang-ninja/test') {
+        // testHelper.runUnitTests('build/OpenSpaceTest');
+        // testHelper.runUnitTests('bin/codegentest')
+      }
+      cleanWs()
+    } // node('linux')
+  }
+},
+windows_msvc: {
+  if (env.USE_BUILD_OS_WINDOWS == 'true') {
+    node('windows') {
+      stage('windows-msvc/scm') {
+        deleteDir();
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('windows-msvc/build') {
         compileHelper.build(compileHelper.VisualStudio(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-msvc');
         compileHelper.recordCompileIssues(compileHelper.VisualStudio());
       }
-      stage('windows/build(ninja)') {
-        compileHelper.build(compileHelper.Ninja(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-ninja');
-      }
-      stage('windows/test') {
+      stage('windows-msvc/test') {
         // Currently, the unit tests are failing on Windows
         // testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest')
+        testHelper.runUnitTests('bin\\Debug\\codegentest')
       }
+      cleanWs()
     } // node('windows')
-    cleanWs()
-  } // node('windows')
+  }
 },
-macos: {
-  node('macos') {
-    stage('macos/scm') {
-      deleteDir();
-      gitHelper.checkoutGit(url, branch);
-    }
-    stage('macos/build(make)') {
-        compileHelper.build(compileHelper.Make(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-make');
-    }
-    stage('macos/build(xcode)') {
-        compileHelper.build(compileHelper.Xcode(), compileHelper.Xcode(), moduleCMakeFlags(), '', 'build-xcode');
-    }
-    stage('macos/test') {
-      // Currently, the unit tests are crashing on OS X
-      // testHelper.runUnitTests('build/Debug/OpenSpaceTest')
-    }
-    cleanWs()
-  } // node('macos')
+// windows_ninja: {
+//   if (env.USE_BUILD_OS_WINDOWS == 'true') {
+//     node('windows') {
+//       ws("${env.JENKINS_BASE}/O/${env.BRANCH_NAME}/${env.BUILD_ID}") {
+//         stage('windows-ninja/scm') {
+//           deleteDir();
+//           gitHelper.checkoutGit(url, branch);
+//         }
+//         stage('windows-ninja/build') {
+//           compileHelper.build(compileHelper.Ninja(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-ninja');
+//         }
+//         stage('windows-ninja/test') {
+//           // Currently, the unit tests are failing on Windows
+//           // testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest')
+//         }
+//       } // node('windows')
+//       cleanWs()
+//     } // node('windows')
+//   }
+// },
+macos_make: {
+  if (env.USE_BUILD_OS_MACOS == 'true') {
+    node('macos') {
+      stage('macos-make/scm') {
+        deleteDir();
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('macos-make/build') {
+          compileHelper.build(compileHelper.Make(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-make');
+      }
+      stage('macos-make/test') {
+        // Currently, the unit tests are crashing on OS X
+        // testHelper.runUnitTests('build/Debug/OpenSpaceTest')
+      }
+      cleanWs()
+    } // node('macos')
+  }
+},
+macos_xcode: {
+  if (env.USE_BUILD_OS_MACOS == 'true') {
+    node('macos') {
+      stage('macos-xcode/scm') {
+        deleteDir();
+        gitHelper.checkoutGit(url, branch);
+      }
+      stage('macos-xcode/build') {
+          compileHelper.build(compileHelper.Xcode(), compileHelper.Xcode(), moduleCMakeFlags(), '', 'build-xcode');
+      }
+      stage('macos-xcode/test') {
+        // Currently, the unit tests are crashing on OS X
+        // testHelper.runUnitTests('build/Debug/OpenSpaceTest')
+      }
+      cleanWs()
+    } // node('macos')
+  }
 }
diff --git a/LICENSE.md b/LICENSE.md
index 4e0881c01c..de2f93f1ad 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2014-2020
+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
diff --git a/README.md b/README.md
index 24a9baf505..19d721dd2a 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-[OpenSpace](http://openspaceproject.com) is an open source, non-commercial, and freely available interactive data visualization software designed to visualize the entire known universe and portray our ongoing efforts to investigate the cosmos.  Bringing the latest techniques from data visualization research to the general public, OpenSpace supports interactive presentation of dynamic data from observations, simulations, and space mission planning and operations.  The software works on multiple operating systems (Windows, Linux, MacOS) with an extensible architecture powering high resolution tiled displays and planetarium domes, making use of the latest graphic card technologies for rapid data throughput.  In addition, OpenSpace enables simultaneous connections across the globe creating opportunity for shared experiences among audiences worldwide.
+[OpenSpace](http://openspaceproject.com) is an open source, non-commercial, and freely available interactive data visualization software designed to visualize the entire known universe and portray our ongoing efforts to investigate the cosmos. Bringing the latest techniques from data visualization research to the general public, OpenSpace supports interactive presentation of dynamic data from observations, simulations, and space mission planning and operations. The software works on multiple operating systems (Windows, Linux, MacOS) with an extensible architecture powering high resolution tiled displays and planetarium domes, making use of the latest graphic card technologies for rapid data throughput. In addition, OpenSpace enables simultaneous connections across the globe creating opportunity for shared experiences among audiences worldwide.
 
-The project stems from the same academic collaboration between Sweden’s [Linköping University](https://www.liu.se) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH) that led to the creation of Uniview and its parent company [SCISS](http://sciss.se).  Development of the software began several years ago through a close collaboration with NASA Goddard’s [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA’s New Horizons mission to Pluto and ESA’s Rosetta mission.  This promising set of preliminary work provided a foundation for recent NASA funding, which has extended the collaboration to include the University of Utah’s [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)’s Tandon School of Engineering, multiple informal science institutions across the United States, and multiple, international vendors.  Current areas of focus within OpenSpace include:
+The project stems from the same academic collaboration between Sweden’s [Linköping University](https://www.liu.se) (LiU) and the [American Museum of Natural History](https://www.amnh.org) (AMNH) that led to the creation of Uniview and its parent company [SCISS](http://sciss.se). Development of the software began several years ago through a close collaboration with NASA Goddard’s [Community Coordinated Modeling Center](https://ccmc.gsfc.nasa.gov) (CCMC) to model space weather forecasting and continued with visualizations of NASA’s New Horizons mission to Pluto and ESA’s Rosetta mission. This promising set of preliminary work provided a foundation for recent NASA funding, which has extended the collaboration to include the University of Utah’s [Scientific Computing and Imaging](https://www.sci.utah.edu) (SCI) Institute, [New York University](https://www.nyu.edu)’s Tandon School of Engineering, multiple informal science institutions across the United States, and multiple, international vendors. Current areas of focus within OpenSpace include:
 
 - Visualization of dynamic simulations via interactive volumetric rendering, as a priority for communicating research in astrophysics.
-- Utilization of NASA’s SPICE observational geometry system with its Planetary Data Service (PDS) to enable space mission visualization that reveal how missions are designed to gather science.
+- Utilization of NASA’s SPICE observational geometry system with its Planetary Data Service (PDS) to enable space mission visualizations that reveal how missions are designed to gather science.
 - Globe browsing techniques across spatial and temporal scales to examine scientific campaigns on multiple planets, including close up surface exploration.
 
 OpenSpace requires graphics support for [OpenGL](https://www.opengl.org/) version 3.3.
 
-This repository contains the source code and example scenes for OpenSpace, but does not contain any data.  To build and install the client, we refer to the [OpenSpace Wiki](http://wiki.openspaceproject.com/), specifically [building](http://wiki.openspaceproject.com/docs/developers/compiling/general) for [Windows](http://wiki.openspaceproject.com/docs/developers/compiling/windows), [Linux (Ubuntu)](http://wiki.openspaceproject.com/docs/developers/compiling/ubuntu), and [MacOS](http://wiki.openspaceproject.com/docs/developers/compiling/macos).  Required preexisting dependencies are: [Boost](http://www.boost.org/) and [Qt](http://www.qt.io/download).  Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:alexander.bock@me.com?subject=OpenSpace:).
+This repository contains the source code and example scenes for OpenSpace, but does not contain any data. To build and install the client, we refer to the [OpenSpace Wiki](http://wiki.openspaceproject.com/), specifically [building](http://wiki.openspaceproject.com/docs/developers/compiling/general) for [Windows](http://wiki.openspaceproject.com/docs/developers/compiling/windows), [Linux (Ubuntu)](http://wiki.openspaceproject.com/docs/developers/compiling/ubuntu), and [MacOS](http://wiki.openspaceproject.com/docs/developers/compiling/macos). Required preexisting dependencies are: [Boost](http://www.boost.org/) and [Qt](http://www.qt.io/download). Feel free to create issues for missing features, bug reports, or compile problems or contact us via [email](mailto:alexander.bock@me.com?subject=OpenSpace:).
 
 Regarding any issues, you are very welcome on our [Slack support channel](https://openspacesupport.slack.com) to which you can freely [sign-up](https://join.slack.com/t/openspacesupport/shared_invite/zt-37niq6y9-T0JaCIk4UoFLI4VF5U9Vsw).
diff --git a/support/cmake/handle_applications.cmake b/apps/CMakeLists.txt
similarity index 50%
rename from support/cmake/handle_applications.cmake
rename to apps/CMakeLists.txt
index 45db49da6b..cbc8540483 100644
--- a/support/cmake/handle_applications.cmake
+++ b/apps/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -22,63 +22,51 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################
 
-
-function (handle_applications)
-    # Get a list of all of the application directories
-    file(GLOB appDirs RELATIVE ${OPENSPACE_APPS_DIR} ${OPENSPACE_APPS_DIR}/*)
-    # Remove the .DS_Store present on Mac
-    list(REMOVE_ITEM appDirs ".DS_Store")
-
-    # Print all the enabled modules
-    # message(STATUS "Enabled modules:")
-    # list(LENGTH enabled_module_names enabled_module_count)
-    # math(EXPR enabled_module_count "${enabled_module_count} - 1")
-    # foreach (val RANGE ${enabled_module_count})
-    #     list(GET enabled_module_names ${val} name)
-    #     list(GET enabled_module_paths ${val} path)
-
-    #     message(STATUS "\t${name}    (${path})")
-    # endforeach ()
-
-    message(STATUS "Enabled applications:")
-    foreach (app ${appDirs})
-        string(TOUPPER ${app} upper_app)
-        if (OPENSPACE_APPLICATION_${upper_app})
-            message(STATUS "\t${app}  (${OPENSPACE_APPS_DIR}/${app})")
-        endif ()
-    endforeach ()
-
-
-    # First create all of the options for the applications. In case that one of the
-    # applications fail to include later, we still want all of them listed
-    foreach (app ${appDirs})
-        set(app_dir "${OPENSPACE_APPS_DIR}/${app}")
-        string(TOUPPER ${app} upper_app)
-
-        get_application_attribute_default(${app_dir} is_default_application)
-        option(OPENSPACE_APPLICATION_${upper_app} "Build ${app} application" ${is_default_application})
-    endforeach ()
-
-    foreach (app ${appDirs})
-        set(app_dir "${OPENSPACE_APPS_DIR}/${app}")
-        string(TOUPPER ${app} upper_app)
-        if (OPENSPACE_APPLICATION_${upper_app})
-            begin_header("Application: ${app}")
-            add_subdirectory(${app_dir})
-            end_header("End: Application: ${app}")
-        endif ()
-    endforeach ()
-endfunction()
-
-
 # Returns whether the application located at 'path' is a default application or not
 function (get_application_attribute_default path result)
-    set(${result} OFF PARENT_SCOPE)
-    if (EXISTS "${path}/include.cmake")
-        unset(DEFAULT_APPLICATION)
-        include(${path}/include.cmake)
-        if (DEFINED DEFAULT_APPLICATION)
-            set(${result} ${DEFAULT_APPLICATION} PARENT_SCOPE)
-        endif ()
+  set(${result} OFF PARENT_SCOPE)
+  if (EXISTS "${path}/include.cmake")
+    unset(DEFAULT_APPLICATION)
+    include(${path}/include.cmake)
+    if (DEFINED DEFAULT_APPLICATION)
+      set(${result} ${DEFAULT_APPLICATION} PARENT_SCOPE)
     endif ()
+  endif ()
 endfunction()
+
+# Get a list of all of the application directories
+file(GLOB app_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*)
+# Remove the .DS_Store present on Mac
+list(REMOVE_ITEM app_dirs ".DS_Store")
+list(REMOVE_ITEM app_dirs "CMakeLists.txt")
+
+
+
+
+message(STATUS "Enabled applications:")
+foreach (app ${app_dirs})
+  string(TOUPPER ${app} upper_app)
+  if (OPENSPACE_APPLICATION_${upper_app})
+    message(STATUS "\t${app}  (${CMAKE_CURRENT_SOURCE_DIR}/${app})")
+  endif ()
+endforeach ()
+
+# First create all of the options for the applications. In case that one of the
+# applications fail to include later, we still want all of them listed
+foreach (app ${app_dirs})
+  set(app_dir "${CMAKE_CURRENT_SOURCE_DIR}/${app}")
+  string(TOUPPER ${app} upper_app)
+
+  get_application_attribute_default(${app_dir} is_default_application)
+  option(OPENSPACE_APPLICATION_${upper_app} "Build ${app} application" ${is_default_application})
+endforeach ()
+
+foreach (app ${app_dirs})
+  set(app_dir "${CMAKE_CURRENT_SOURCE_DIR}/${app}")
+  string(TOUPPER ${app} upper_app)
+  if (OPENSPACE_APPLICATION_${upper_app})
+    begin_header("Application: ${app}")
+    add_subdirectory(${app_dir})
+    end_header("End: Application: ${app}")
+  endif ()
+endforeach ()
diff --git a/apps/OpenSpace-MinVR/CMakeLists.txt b/apps/OpenSpace-MinVR/CMakeLists.txt
index a13829c550..f83661443e 100644
--- a/apps/OpenSpace-MinVR/CMakeLists.txt
+++ b/apps/OpenSpace-MinVR/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
diff --git a/apps/OpenSpace-MinVR/main.cpp b/apps/OpenSpace-MinVR/main.cpp
index cd1191434b..80d2be0229 100644
--- a/apps/OpenSpace-MinVR/main.cpp
+++ b/apps/OpenSpace-MinVR/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt
index 6df54e9086..7622653bf6 100644
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -27,6 +27,9 @@ include(${GHOUL_BASE_DIR}/support/cmake/message_macros.cmake)
 include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
 include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
 
+# We are getting all_enabled_modules from the handle_applications.cmake file which gets
+# it from the main CMakeLists file
+
 #####
 # OpenVR
 #####
@@ -34,8 +37,6 @@ option(OPENSPACE_OPENVR_SUPPORT "Build OpenSpace application with OpenVR support
 
 if (OPENSPACE_OPENVR_SUPPORT)
   begin_header("Dependency: OpenVR")
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${OPENSPACE_EXT_DIR}/sgct/cmake/modules/")
-
   find_package(OpenVR REQUIRED)
 
   set(SGCT_OPENVR_DEFINITIONS OPENVR_SUPPORT)
@@ -43,14 +44,14 @@ if (OPENSPACE_OPENVR_SUPPORT)
     if (WIN32)
       find_path(SGCT_OPENVR_INCLUDE_DIRECTORY
         NAMES SGCTOpenVR.h
-        PATHS ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr NO_DEFAULT_PATH
+        PATHS ${OPENSPACE_BASE_DIR}/ext/sgct/additional_includes/openvr NO_DEFAULT_PATH
         REQUIRED
       )
     else ()
       find_path(SGCT_OPENVR_INCLUDE_DIRECTORY
         NAMES SGCTOpenVR.h
         PATH_SUFFIXES SGCTOpenVR
-        PATHS ${OPENSPACE_EXT_DIR}/sgct/additional_includes/openvr
+        PATHS ${OPENSPACE_BASE_DIR}/ext/sgct/additional_includes/openvr
         REQUIRED
       )
     endif ()
@@ -89,10 +90,7 @@ create_new_application(OpenSpace
   ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
 )
 
-set_source_files_properties(
-  ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
-  PROPERTIES MACOSX_PACKAGE_LOCATION "Resources"
-)
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
 
 target_include_directories(
   OpenSpace PRIVATE
@@ -101,7 +99,7 @@ target_include_directories(
   ${SPOUT_INCLUDE_DIRS}
 )
 
-target_link_libraries(OpenSpace PUBLIC openspace-core ${OPENVR_LIBRARY} ${SPOUT_LIBRARY})
+target_link_libraries(OpenSpace PRIVATE openspace-core openspace-module-collection ${OPENVR_LIBRARY} ${SPOUT_LIBRARY})
 
 target_compile_definitions(OpenSpace PRIVATE
   ${SGCT_OPENVR_DEFINITIONS}
@@ -115,8 +113,7 @@ set(SGCT_DEP_INCLUDE_FREETYPE OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_FMT OFF CACHE BOOL "" FORCE)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct)
-target_include_directories(OpenSpace SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct/include)
-target_link_libraries(OpenSpace PUBLIC sgct)
+target_link_libraries(OpenSpace PRIVATE sgct)
 
 set_folder_location(sgct "External")
 set_folder_location(glfw "External/SGCT")
@@ -128,15 +125,14 @@ set_folder_location(vrpn "External/SGCT")
 set_folder_location(zlibstatic "External/SGCT")
 
 if (UNIX AND (NOT APPLE))
-  target_link_libraries(OpenSpace PUBLIC Xcursor Xinerama X11)
+  target_link_libraries(OpenSpace PRIVATE Xcursor Xinerama X11)
 endif ()
 
 end_header("Dependency: SGCT")
 
 begin_header("Dependency: Profile Editor")
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/launcher)
-# target_include_directories(OpenSpace SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ext/launcher/include)
-target_link_libraries(OpenSpace PUBLIC openspace-ui-launcher)
+target_link_libraries(OpenSpace PRIVATE openspace-ui-launcher)
 end_header("Dependency: Profile Editor")
 
 
@@ -158,17 +154,17 @@ if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
 
   set_cef_targets("${CEF_ROOT}" OpenSpace)
   run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}")
-elseif (OPENSPACE_MODULE_WEBBROWSER)
+elseif ()
   message(WARNING "Web configured to be included, but no CEF_ROOT was found, please try configuring CMake again.")
 endif ()
 
 if (MSVC)
   begin_header("Dependency: Dbghelp")
   # This library is used for being able to output the callstack if an exception escapes
-  target_link_libraries(OpenSpace PUBLIC Dbghelp.lib)
+  target_link_libraries(OpenSpace PRIVATE Dbghelp.lib)
   end_header()
 endif ()
 
 if (OPENSPACE_NVTOOLS_ENABLED)
-  target_link_libraries(OpenSpace "${OPENSPACE_NVTOOLS_PATH}/lib/x64/nvToolsExt64_1.lib")
+  target_link_libraries(OpenSpace PRIVATE "${OPENSPACE_NVTOOLS_PATH}/lib/x64/nvToolsExt64_1.lib")
 endif ()
diff --git a/apps/OpenSpace/ext/launcher/CMakeLists.txt b/apps/OpenSpace/ext/launcher/CMakeLists.txt
index 573d872042..460f486412 100644
--- a/apps/OpenSpace/ext/launcher/CMakeLists.txt
+++ b/apps/OpenSpace/ext/launcher/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -90,3 +90,11 @@ set_openspace_compile_settings(openspace-ui-launcher)
 target_include_directories(openspace-ui-launcher PUBLIC include)
 target_link_libraries(openspace-ui-launcher PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets openspace-core)
 
+if (MSVC)
+set(MSVC_WARNINGS
+  "/wd4619"   # #pragma warning: there is no warning number (raised by Qt headers)
+  "/wd4946"   # reinterpret_cast used between related classes: 
+)
+target_compile_options(openspace-ui-launcher INTERFACE ${MSVC_WARNINGS})
+
+endif ()
diff --git a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
index 4538e33835..e0bcc51d56 100644
--- a/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
+++ b/apps/OpenSpace/ext/launcher/include/filesystemaccess.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/launcherwindow.h b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
index 6b7283ea23..a8be7350a4 100644
--- a/apps/OpenSpace/ext/launcher/include/launcherwindow.h
+++ b/apps/OpenSpace/ext/launcher/include/launcherwindow.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
index c8288565bc..563a0ec5a7 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/additionalscriptsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
index 4bb35e62f2..0e81238f1c 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
index 375fae968b..1274297db1 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreeitem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
index 1426e3ff39..26f538a6fa 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/assettreemodel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
index 34b497b34a..eeb6a32c06 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/cameradialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
index 3d192af852..744a1db8ac 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -61,7 +61,7 @@ public:
      *
      * \param evt #QKeyEvent object for the key press event
      */
-    void keyPressEvent(QKeyEvent* evt);
+    virtual void keyPressEvent(QKeyEvent* evt) override;
 
 
 private slots:
diff --git a/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h b/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h
index 2bc01477ca..f242f19e42 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/keybindingsdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -56,7 +56,7 @@ public:
      *
      * \param evt #QKeyEvent object for the key press event
      */
-    void keyPressEvent(QKeyEvent* evt);
+    virtual void keyPressEvent(QKeyEvent* evt) override;
 
 private slots:
     void listItemSelected();
diff --git a/apps/OpenSpace/ext/launcher/include/profile/line.h b/apps/OpenSpace/ext/launcher/include/profile/line.h
index ebe27607dc..12d2aa9658 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/line.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/line.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
index eae3617543..f20d680f92 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/marknodesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -51,7 +51,7 @@ public:
      *
      * \param evt #QKeyEvent object for the key press event
      */
-    void keyPressEvent(QKeyEvent* evt);
+    void keyPressEvent(QKeyEvent* evt) override;
 
 private slots:
     void listItemSelected();
diff --git a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
index f3a79acdfd..51c500f972 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/metadialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
index c2c419528f..6ca0c5b209 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -52,7 +52,7 @@ public:
      *
      * \param evt #QKeyEvent object for the key press event
      */
-    void keyPressEvent(QKeyEvent* evt);
+    virtual void keyPressEvent(QKeyEvent* evt) override;
 
 private slots:
     void listItemSelected();
diff --git a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
index d8de4c4ab9..7c12634fdd 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/profileedit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -75,7 +75,7 @@ public:
      *
      * \param evt #QKeyEvent object for the key press event
      */
-    void keyPressEvent(QKeyEvent* evt);
+    virtual void keyPressEvent(QKeyEvent* evt) override;
 
 private slots:
     void duplicateProfile();
diff --git a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
index ac13ed474e..0938bc8659 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/propertiesdialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -53,7 +53,7 @@ public:
      *
      * \param evt #QKeyEvent object for the key press event
      */
-    void keyPressEvent(QKeyEvent* evt);
+    virtual void keyPressEvent(QKeyEvent* evt) override;
 
 private slots:
     void listItemSelected();
diff --git a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
index 9a0a6c4421..394b477f0f 100644
--- a/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
+++ b/apps/OpenSpace/ext/launcher/include/profile/timedialog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
index f0a98ce58d..7c9634b47e 100644
--- a/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
+++ b/apps/OpenSpace/ext/launcher/src/filesystemaccess.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -56,14 +56,13 @@ void FileSystemAccess::parseChildDirElements(QFileInfo fileInfo, std::string spa
 
     QFileInfoList fileList = dir.entryInfoList(_fileFilterOptions);
     for (int i = 0; i < fileList.size(); i++) {
-        QFileInfo fileInfo = fileList[i];
-        std::string res = space + fileInfo.fileName().toStdString();
+        QFileInfo fi = fileList[i];
+        std::string res = space + fi.fileName().toStdString();
 
-        if (fileInfo.isDir()) {
+        if (fi.isDir()) {
             if (level != 0 || (level == 0 && isApprovedPath(res))) {
                 dirNames.push_back(res);
-                parseChildDirElements(fileInfo, (space + " "), level + 1, dirNames,
-                    output);
+                parseChildDirElements(fi, (space + " "), level + 1, dirNames, output);
             }
         }
         else {
diff --git a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
index 6d1e775849..6d50f5788c 100644
--- a/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+++ b/apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 
 #include <openspace/engine/configuration.h>
 #include <ghoul/filesystem/filesystem.h>
+#include <ghoul/logging/logmanager.h>
 #include <QComboBox>
 #include <QFile>
 #include <QLabel>
@@ -220,8 +221,17 @@ QWidget* LauncherWindow::createCentralWidget() {
     connect(
         startButton, &QPushButton::released,
         [this]() {
-            _shouldLaunch = true;
-            close();
+            if (_profileBox->currentText().isEmpty()) {
+                QMessageBox::critical(
+                    this,
+                    "Empty Profile",
+                    "Cannot launch with an empty profile"
+                );
+            }
+            else {
+                _shouldLaunch = true;
+                close();
+            }
         }
     );
     startButton->setObjectName("large");
@@ -301,6 +311,13 @@ void LauncherWindow::populateProfilesList(std::string preset) {
     
     _profileBox->clear();
 
+    if (!std::filesystem::exists(_profilePath)) {
+        LINFOC(
+            "LauncherWindow",
+            fmt::format("Could not find profile folder '{}'", _profilePath)
+        );
+        return;
+    }
     // Add all the files with the .profile extension to the dropdown
     for (const fs::directory_entry& p : fs::directory_iterator(_profilePath)) {
         if (p.path().extension() != ".profile") {
@@ -321,12 +338,20 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
     namespace fs = std::filesystem;
 
     _windowConfigBox->clear();
-    // Add all the files with the .xml extension to the dropdown
-    for (const fs::directory_entry& p : fs::directory_iterator(_configPath)) {
-        if (p.path().extension() != ".xml") {
-            continue;
+    if (std::filesystem::exists(_configPath)) {
+        // Add all the files with the .xml extension to the dropdown
+        for (const fs::directory_entry& p : fs::directory_iterator(_configPath)) {
+            if (p.path().extension() != ".xml") {
+                continue;
+            }
+            _windowConfigBox->addItem(QString::fromStdString(p.path().stem().string()));
         }
-        _windowConfigBox->addItem(QString::fromStdString(p.path().stem().string()));
+    }
+    else {
+        LINFOC(
+            "LauncherWindow",
+            fmt::format("Could not find config folder '{}'", _configPath)
+        );
     }
 
     // Try to find the requested configuration file and set it as the current one. As we
diff --git a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
index 30a6ccec84..7c584e2f13 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/additionalscriptsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
index e8d99b617c..9993f43ce9 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -207,12 +207,9 @@ QString AssetsDialog::createTextSummary() {
         return "";
     }
     QString summary;
-    for (int i = 0; i < summaryItems.size(); ++i) {
+    for (size_t i = 0; i < summaryItems.size(); ++i) {
         bool existsInFilesystem = summaryItems.at(i)->doesExistInFilesystem();
 
-        constexpr const char* ExistsFormat = "{}<br>";
-        constexpr const char* NotExistsFormat = "<font color='{}'>{}</font><br>";
-
         std::string s = existsInFilesystem ?
             fmt::format("{}<br>", summaryPaths.at(i)) :
             fmt::format("<font color='red'>{}</font><br>", summaryPaths.at(i));
@@ -233,6 +230,6 @@ void AssetsDialog::parseSelections() {
     accept();
 }
 
-void AssetsDialog::selected(const QModelIndex& sel) {
+void AssetsDialog::selected(const QModelIndex&) {
     _summary->setText(createTextSummary());
 }
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
index 199a755fb1..e08f79d3ec 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreeitem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -55,7 +55,7 @@ int AssetTreeItem::row() const {
             _parentItem->_childItems.cend(),
             this
         );
-        return std::distance(_parentItem->_childItems.cbegin(), it);
+        return static_cast<int>(std::distance(_parentItem->_childItems.cbegin(), it));
     }
     else {
         return 0;
@@ -63,11 +63,11 @@ int AssetTreeItem::row() const {
 }
 
 int AssetTreeItem::columnCount() const {
-    return _itemData.size();
+    return static_cast<int>(_itemData.size());
 }
 
 QVariant AssetTreeItem::data(int column) const {
-    if (column < 0 || column >= _itemData.size()) {
+    if (column < 0 || column >= static_cast<int>(_itemData.size())) {
         return QVariant();
     }
     else {
@@ -76,7 +76,7 @@ QVariant AssetTreeItem::data(int column) const {
 }
 
 bool AssetTreeItem::setData(int column, const QVariant& value) {
-    if (column < 0 || column >= _itemData.size()) {
+    if (column < 0 || column >= static_cast<int>(_itemData.size())) {
         return false;
     }
 
@@ -112,11 +112,11 @@ bool AssetTreeItem::doesExistInFilesystem() const {
 }
 
 QString AssetTreeItem::name() const {
-    return QString(data(0).toString());
+    return data(0).toString();
 }
 
 bool AssetTreeItem::insertChildren(int position, int count, int columns) {
-    if (position < 0 || position > _childItems.size()) {
+    if (position < 0 || position > static_cast<int>(_childItems.size())) {
         return false;
     }
 
@@ -130,7 +130,7 @@ bool AssetTreeItem::insertChildren(int position, int count, int columns) {
 }
 
 bool AssetTreeItem::removeChildren(int position, int count) {
-    if (position < 0 || position + count > _childItems.size()) {
+    if (position < 0 || position + count > static_cast<int>(_childItems.size())) {
         return false;
     }
 
@@ -143,7 +143,7 @@ bool AssetTreeItem::removeChildren(int position, int count) {
 }
 
 bool AssetTreeItem::insertColumns(int position, int columns) {
-    if (position < 0 || position > _itemData.size()) {
+    if (position < 0 || position > static_cast<int>(_itemData.size())) {
         return false;
     }
 
diff --git a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
index 16b7ba2b77..60bd29f6e2 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/assettreemodel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
index 2137770c36..c5adbc8c6d 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -191,22 +191,22 @@ QWidget* CameraDialog::createNavStateWidget() {
         QWidget* posBox = new QWidget;
         QBoxLayout* posLayout = new QHBoxLayout(posBox);
         posLayout->setContentsMargins(0, 0, 0, 0);
-        posLayout->addWidget(new QLabel("X"));
+        posLayout->addWidget(new QLabel("X [m]"));
         _navState.positionX = new QLineEdit;
         _navState.positionX->setValidator(new QDoubleValidator);
-        _navState.positionX->setToolTip("Camera position vector (x)");
+        _navState.positionX->setToolTip("Camera position vector (x) [m]");
         posLayout->addWidget(_navState.positionX);
 
-        posLayout->addWidget(new QLabel("Y"));
+        posLayout->addWidget(new QLabel("Y [m]"));
         _navState.positionY = new QLineEdit;
         _navState.positionY->setValidator(new QDoubleValidator);
-        _navState.positionY->setToolTip("Camera position vector (y)");
+        _navState.positionY->setToolTip("Camera position vector (y) [m]");
         posLayout->addWidget(_navState.positionY);
 
-        posLayout->addWidget(new QLabel("Z"));
+        posLayout->addWidget(new QLabel("Z [m]"));
         _navState.positionZ = new QLineEdit;
         _navState.positionZ->setValidator(new QDoubleValidator);
-        _navState.positionZ->setToolTip("Camera position vector (z)");
+        _navState.positionZ->setToolTip("Camera position vector (z) [m]");
         posLayout->addWidget(_navState.positionZ);
         layout->addWidget(posBox, 3, 1);
     }
@@ -277,7 +277,7 @@ QWidget* CameraDialog::createGeoWidget() {
     _geoState.longitude->setToolTip("Longitude of camera focus point (+/- 180 degrees)");
     layout->addWidget(_geoState.longitude, 2, 1);
 
-    layout->addWidget(new QLabel("Altitude"), 3, 0);
+    layout->addWidget(new QLabel("Altitude [m]"), 3, 0);
     _geoState.altitude = new QLineEdit;
     _geoState.altitude->setValidator(new QDoubleValidator);
     _geoState.altitude->setToolTip("Altitude of camera (meters)");
@@ -308,7 +308,7 @@ bool CameraDialog::areRequiredFormsFilledAndValid() {
             allFormsOk = false;
             addErrorMsg("Position Z is empty");
         }
-        int upVectorCount = 0;
+
         const bool hasUpX = !_navState.upX->text().isEmpty();
         const bool hasUpY = !_navState.upY->text().isEmpty();
         const bool hasUpZ = !_navState.upZ->text().isEmpty();
diff --git a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
index 8beac8fb1d..33db001533 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/deltatimesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -75,7 +75,7 @@ namespace {
                 break;
             }
         }
-        return checkForTimeDescription(i, value);
+        return checkForTimeDescription(static_cast<int>(i), value);
     }
 } // namespace
 
@@ -230,8 +230,8 @@ void DeltaTimesDialog::listItemSelected() {
 
 void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string color) {
     std::string labelS = "Set Simulation Time Increment for key";
-    if (index >= _data.size()) {
-        index = _data.size() - 1;
+    if (index >= static_cast<int>(_data.size())) {
+        index = static_cast<int>(_data.size()) - 1;
     }
     if (editMode) {
         labelS += " '" + createSummaryForDeltaTime(index, false) + "':";
@@ -242,14 +242,14 @@ void DeltaTimesDialog::setLabelForKey(int index, bool editMode, std::string colo
 }
 
 void DeltaTimesDialog::valueChanged(const QString& text) {
-    if (_seconds->text().isEmpty()) {
+    if (text.isEmpty()) {
         _errorMsg->setText("");
     }
     else {
-        int value = _seconds->text().toDouble();
+        int value = text.toDouble();
         if (value != 0) {
             _value->setText(QString::fromStdString(
-                timeDescription(_seconds->text().toDouble()))
+                timeDescription(text.toDouble()))
             );
             _errorMsg->setText("");
         }
@@ -358,14 +358,14 @@ void DeltaTimesDialog::parseSelections() {
     if ((_data.size() == 1) && (_data.at(0) == 0)) {
         _data.clear();
     }
-    int finalNonzeroIndex = _data.size() - 1;
+    int finalNonzeroIndex = static_cast<int>(_data.size()) - 1;
     for (; finalNonzeroIndex >= 0; --finalNonzeroIndex) {
         if (_data.at(finalNonzeroIndex) != 0) {
             break;
         }
     }
     std::vector<double> tempDt;
-    for (size_t i = 0; i < (finalNonzeroIndex + 1); ++i) {
+    for (int i = 0; i < (finalNonzeroIndex + 1); ++i) {
         tempDt.push_back(_data[i]);
     }
     _profile.setDeltaTimes(tempDt);
diff --git a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
index 2201d728ba..8ea5dcf272 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -323,7 +323,7 @@ void KeybindingsDialog::keySelected(int index) {
 
 int KeybindingsDialog::indexInKeyMapping(std::vector<int>& mapVector, int keyInt) {
     const auto it = std::find(mapVector.cbegin(), mapVector.cend(), keyInt);
-    return std::distance(mapVector.cbegin(), it);
+    return static_cast<int>(std::distance(mapVector.cbegin(), it));
 }
 
 bool KeybindingsDialog::isLineEmpty(int index) {
@@ -338,8 +338,6 @@ bool KeybindingsDialog::isLineEmpty(int index) {
 }
 
 void KeybindingsDialog::listItemAdded() {
-    int currentListSize = _list->count();
-
     _data.push_back(BlankKey);
     _list->addItem(new QListWidgetItem("  (Enter details below & click 'Save')"));
     // Scroll down to that blank line highlighted
diff --git a/apps/OpenSpace/ext/launcher/src/profile/line.cpp b/apps/OpenSpace/ext/launcher/src/profile/line.cpp
index 336dc722a0..c7f2821cf1 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/line.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/line.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
index 604827f837..9af27989c7 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/marknodesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -112,7 +112,7 @@ void MarkNodesDialog::listItemAdded() {
     std::string itemToAdd = _newNode->text().toStdString();
     const auto it = std::find(_data.cbegin(), _data.cend(), itemToAdd);
     if (it != _data.end()) {
-        _list->setCurrentRow(std::distance(_data.cbegin(), it));
+        _list->setCurrentRow(static_cast<int>(std::distance(_data.cbegin(), it)));
     }
     else {
         _data.push_back(itemToAdd);
@@ -131,7 +131,7 @@ void MarkNodesDialog::listItemRemove() {
     QListWidgetItem* item = _list->currentItem();
     int index = _list->row(item);
 
-    if (index < 0 || index >= _markedNodesListItems.size()) {
+    if (index < 0 || index >= static_cast<int>(_markedNodesListItems.size())) {
         return;
     }
 
diff --git a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
index c96c206426..1edba2fdee 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/metadialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
index 217ea9e5d8..5f7ad9f7f4 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
index 46e7a8d942..2b945851a4 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/profileedit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -50,7 +50,7 @@
 using namespace openspace;
 
 namespace {
-    QString labelText(int size, QString title) {
+    QString labelText(size_t size, QString title) {
         QString label;
         if (size > 0) {
             label = title + " (" + QString::number(size) + ")";
@@ -98,9 +98,9 @@ ProfileEdit::ProfileEdit(Profile& profile, const std::string& profileName,
                          const std::vector<std::string>& readOnlyProfiles,
                          QWidget* parent)
     : QDialog(parent)
+    , _profile(profile)
     , _assetBasePath(std::move(assetBasePath))
     , _profileBasePath(std::move(profileBasePath))
-    , _profile(profile)
     , _readOnlyProfiles(readOnlyProfiles)
 {
     setWindowTitle("Profile Editor");
@@ -373,7 +373,7 @@ void ProfileEdit::duplicateProfile() {
             // will remove the suffix here first
             profile = profile.substr(0, it);
         }
-        catch (const std::invalid_argument& e) {
+        catch (const std::invalid_argument&) {
             // If this exception is thrown, we did find a separator character but the
             // substring afterwards was not a number, so the user just added a separator
             // by themselves. In this case we don't do anything
diff --git a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
index 5ae897d8b8..8e1f9477f9 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
index 678b5bf504..03d9526b82 100644
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index f3094de5ba..fed1f55a0b 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit f3094de5ba02d86ee899f4108cf066e37652c65e
+Subproject commit fed1f55a0b259a70a5ad8461a4e56f07990609f1
diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index c41a94245f..b370da39e6 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,13 +41,11 @@
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/boolean.h>
-//#include <ghoul/opengl/ghoul_gl.h>
-#include <GLFW/glfw3.h>
-#ifdef _WIN32
+#include <ghoul/opengl/ghoul_gl.h>
+#ifdef WIN32
 #define GLFW_EXPOSE_NATIVE_WIN32
-#else
-#define GLFW_INCLUDE_NONE
 #endif
+#include <GLFW/glfw3.h>
 #include <GLFW/glfw3native.h>
 #include <sgct/clustermanager.h>
 #include <sgct/commandline.h>
@@ -224,6 +222,8 @@ void mainInitFunc(GLFWwindow*) {
     global::openSpaceEngine->initialize();
     LDEBUG("Initializing OpenSpace Engine finished");
 
+#ifndef __APPLE__
+    // Apparently: "Cocoa: Regular windows do not have icons on macOS"
     {
         std::string path = absPath("${DATA}/openspace-icon.png");
         int x;
@@ -242,6 +242,7 @@ void mainInitFunc(GLFWwindow*) {
 
         stbi_image_free(icons[0].pixels);
     }
+#endif // __APPLE__
 
     currentWindow = Engine::instance().windows().front().get();
     currentViewport = currentWindow->viewports().front().get();
@@ -575,18 +576,18 @@ void mainPostDrawFunc() {
             glBindTexture(GL_TEXTURE_2D, texId);
             w.leftOrMain.handle->SendTexture(
                 texId,
-                GL_TEXTURE_2D,
+                GLuint(GL_TEXTURE_2D),
                 window.framebufferResolution().x,
                 window.framebufferResolution().y
             );
         }
 
         if (w.right.initialized) {
-            const GLuint texId = window.frameBufferTexture(Window::TextureIndex::RightEye);
-            glBindTexture(GL_TEXTURE_2D, texId);
+            const GLuint tId = window.frameBufferTexture(Window::TextureIndex::RightEye);
+            glBindTexture(GL_TEXTURE_2D, tId);
             w.right.handle->SendTexture(
-                texId,
-                GL_TEXTURE_2D,
+                tId,
+                GLuint(GL_TEXTURE_2D),
                 window.framebufferResolution().x,
                 window.framebufferResolution().y
             );
@@ -925,6 +926,9 @@ void setSgctDelegateFunctions() {
 
         return currentWindow->swapGroupFrameNumber();
     };
+    sgctDelegate.setScreenshotFolder = [](std::string path) {
+        Settings::instance().setCapturePath(std::move(path));
+    };
 }
 
 void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& hasProfile,
@@ -1008,9 +1012,7 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
     return config;
 }
 
-int main(int argc, char** argv) {
-    glfwInit();
-
+int main(int argc, char* argv[]) {
 #ifdef WIN32
     SetUnhandledExceptionFilter(generateMiniDump);
 #endif // WIN32
@@ -1166,19 +1168,38 @@ int main(int argc, char** argv) {
         sgctFunctionName
     );
 
+    // (abock, 2020-12-07)  For some reason on Apple the keyboard handler in CEF will call
+    // the Qt one even if the QApplication was destroyed, leading to invalid memory
+    // access.  The only way we could fix this for the release was to keep the
+    // QApplication object around until the end of the program.  Even though the Qt
+    // keyboard handler gets called, it doesn't do anything so everything still works.
+#ifdef __APPLE__
+    int qac = 0;
+    QApplication app(qac, nullptr);
+#endif // __APPLE__
+
     bool skipLauncher =
         (hasProfile && hasSGCTConfig) || global::configuration->bypassLauncher;
     if (!skipLauncher) {
+#ifndef __APPLE__
         int qac = 0;
         QApplication app(qac, nullptr);
-        LauncherWindow win(!hasProfile,
-            *global::configuration, !hasSGCTConfig, windowCfgPreset, nullptr);
+#endif // __APPLE__
+
+        LauncherWindow win(
+            !hasProfile,
+            *global::configuration,
+            !hasSGCTConfig,
+            windowCfgPreset,
+            nullptr
+        );
         win.show();
         app.exec();
 
         if (!win.wasLaunchSelected()) {
             exit(EXIT_SUCCESS);
         }
+        glfwInit();
 
         global::configuration->profile = win.selectedProfile();
         windowConfiguration = selectedSgctProfileFromLauncher(
@@ -1188,7 +1209,14 @@ int main(int argc, char** argv) {
             labelFromCfgFile,
             xmlExt
         );
+    } else {
+        glfwInit();
     }
+    if (global::configuration->profile.empty()) {
+        LFATAL("Cannot launch with an empty profile");
+        exit(EXIT_FAILURE);
+    }
+
 
     // Prepend the outgoing sgctArguments with the program name
     // as well as the configuration file that sgct is supposed to use
@@ -1197,7 +1225,7 @@ int main(int argc, char** argv) {
     arguments.insert(arguments.begin() + 2, absPath(windowConfiguration));
 
     // Need to set this before the creation of the sgct::Engine
-    
+
     Log::instance().setLogToConsole(false);
     Log::instance().setShowTime(false);
     Log::instance().setShowLogLevel(false);
diff --git a/apps/Sync/CMakeLists.txt b/apps/Sync/CMakeLists.txt
index 71bfbf3859..58ba3cbf69 100644
--- a/apps/Sync/CMakeLists.txt
+++ b/apps/Sync/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -37,7 +37,7 @@ create_new_application(Sync MACOSX_BUNDLE
   ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
 )
 
-target_link_libraries(Sync PUBLIC openspace-core)
+target_link_libraries(Sync PRIVATE openspace-core openspace-module-collection)
 
 # Web Browser and Web gui
 # Why not put these in the module's path? Because they do not have access to the
diff --git a/apps/Sync/main.cpp b/apps/Sync/main.cpp
index 7ea54a745a..1de9e7aad5 100644
--- a/apps/Sync/main.cpp
+++ b/apps/Sync/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/apps/TaskRunner/CMakeLists.txt b/apps/TaskRunner/CMakeLists.txt
index 8fa2b9bbd1..c000cb973f 100644
--- a/apps/TaskRunner/CMakeLists.txt
+++ b/apps/TaskRunner/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -37,7 +37,7 @@ create_new_application(TaskRunner MACOSX_BUNDLE
   ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
 )
 
-target_link_libraries(TaskRunner PUBLIC openspace-core)
+target_link_libraries(TaskRunner PRIVATE openspace-core openspace-module-collection)
 
 # Web Browser and Web gui
 # Why not put these in the module's path? Because they do not have access to the
diff --git a/apps/TaskRunner/main.cpp b/apps/TaskRunner/main.cpp
index f41d8105ab..cd2c1be9ac 100644
--- a/apps/TaskRunner/main.cpp
+++ b/apps/TaskRunner/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -107,6 +107,7 @@ int main(int argc, char** argv) {
     using namespace openspace;
 
     ghoul::initialize();
+    global::create();
 
     // Register the path of the executable,
     // to make it possible to find other files in the same directory.
@@ -117,9 +118,9 @@ int main(int argc, char** argv) {
     );
 
     std::string configFile = configuration::findConfiguration();
-    global::configuration = configuration::loadConfigurationFromFile(configFile);
-    openspace::global::openSpaceEngine.registerPathTokens();
-    global::openSpaceEngine.initialize();
+    *global::configuration = configuration::loadConfigurationFromFile(configFile);
+    openspace::global::openSpaceEngine->registerPathTokens();
+    global::openSpaceEngine->initialize();
 
     ghoul::cmdparser::CommandlineParser commandlineParser(
         "OpenSpace TaskRunner",
@@ -157,5 +158,7 @@ int main(int argc, char** argv) {
         std::cout << "TASK > ";
     }
 
+    global::destroy();
+    ghoul::deinitialize();
     return 0;
 };
diff --git a/apps/Wormhole/CMakeLists.txt b/apps/Wormhole/CMakeLists.txt
index a268c81d2c..2478659808 100644
--- a/apps/Wormhole/CMakeLists.txt
+++ b/apps/Wormhole/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -38,7 +38,7 @@ create_new_application(
   ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
 )
 
-target_link_libraries(Wormhole PUBLIC openspace-core)
+target_link_libraries(Wormhole PRIVATE openspace-core openspace-module-collection)
 
 # Web Browser and Web gui
 # Why not put these in the module's path? Because they do not have access to the
diff --git a/apps/Wormhole/main.cpp b/apps/Wormhole/main.cpp
index 487244aef8..adfec873be 100644
--- a/apps/Wormhole/main.cpp
+++ b/apps/Wormhole/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/data/assets/base.asset b/data/assets/base.asset
index ee94a61231..e89a6a74c9 100644
--- a/data/assets/base.asset
+++ b/data/assets/base.asset
@@ -7,22 +7,62 @@ asset.require('./base_blank')
 -- Specifying which other assets should be loaded in this scene
 asset.require('scene/solarsystem/sun/sun')
 asset.require('scene/solarsystem/sun/glare')
+asset.require('scene/solarsystem/sun/habitablezone')
 asset.require('scene/solarsystem/sun/default_layers')
 asset.require('scene/solarsystem/planets/planets')
 asset.require('scene/solarsystem/planets/default_layers')
-asset.require('scene/solarsystem/planets/mars/moons/phobos')
-asset.require('scene/solarsystem/planets/mars/moons/deimos')
 asset.require('scene/solarsystem/dwarf_planets/pluto/system')
 asset.require('scene/solarsystem/dwarf_planets/pluto/default_layers')
 asset.require('scene/solarsystem/dwarf_planets/pluto/charon/default_layers')
 asset.require('scene/milkyway/milkyway/volume')
 asset.require('scene/milkyway/constellations/constellation_art')
 asset.require('scene/milkyway/constellations/constellation_keybinds')
+asset.require('scene/milkyway/objects/orionnebula/orionnebula')
 asset.require('util/launcher_images')
 
+-- For exoplanet system visualizations
+asset.require('scene/milkyway/exoplanets/exoplanets_data')
+asset.require('scene/milkyway/exoplanets/exoplanets_textures')
+
 local assetHelper = asset.require('util/asset_helper')
-assetHelper.requireAll(asset, 'scene/milkyway/exoplanets')
-assetHelper.requireAll(asset, 'scene/digitaluniverse')
+asset.require('scene/digitaluniverse/2dF')
+asset.require('scene/digitaluniverse/2mass')
+asset.require('scene/digitaluniverse/6dF')
+asset.require('scene/digitaluniverse/abell')
+asset.require('scene/digitaluniverse/alternatestarlabels')
+asset.require('scene/digitaluniverse/backgroundradiation')
+-- asset.require('scene/digitaluniverse/backgroundradiation_multiverse')
+asset.require('scene/digitaluniverse/clusters')
+asset.require('scene/digitaluniverse/constellationbounds')
+asset.require('scene/digitaluniverse/constellations')
+asset.require('scene/digitaluniverse/deepsky')
+asset.require('scene/digitaluniverse/dwarfs')
+asset.require('scene/digitaluniverse/exoplanets')
+asset.require('scene/digitaluniverse/globularclusters')
+asset.require('scene/digitaluniverse/grids')
+asset.require('scene/digitaluniverse/groups')
+asset.require('scene/digitaluniverse/h2regions')
+asset.require('scene/digitaluniverse/kepler')
+asset.require('scene/digitaluniverse/localdwarfs')
+asset.require('scene/digitaluniverse/milkyway')
+asset.require('scene/digitaluniverse/milkyway_arm_labels')
+asset.require('scene/digitaluniverse/milkyway_data')
+asset.require('scene/digitaluniverse/milkyway_label')
+asset.require('scene/digitaluniverse/milkyway_sphere')
+asset.require('scene/digitaluniverse/obassociations')
+asset.require('scene/digitaluniverse/openclusters')
+asset.require('scene/digitaluniverse/planetarynebulae')
+asset.require('scene/digitaluniverse/pulsars')
+asset.require('scene/digitaluniverse/quasars')
+asset.require('scene/digitaluniverse/sdss')
+asset.require('scene/digitaluniverse/starlabels')
+asset.require('scene/digitaluniverse/starorbits')
+asset.require('scene/digitaluniverse/stars')
+asset.require('scene/digitaluniverse/superclusters')
+asset.require('scene/digitaluniverse/supernovaremnants')
+asset.require('scene/digitaluniverse/tully')
+asset.require('scene/digitaluniverse/voids')
+
 
 asset.require('customization/globebrowsing')
 
diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset
index f9ed7a949e..ae89b790de 100644
--- a/data/assets/customization/globebrowsing.asset
+++ b/data/assets/customization/globebrowsing.asset
@@ -1,10 +1,13 @@
--- Add require statements for assets exporting the neccessary globes
--- here we add Mars, Moon and Mercury:
-asset.require('../scene/solarsystem/planets/mars/mars')
-asset.require('../scene/solarsystem/planets/earth/moon/moon')
-asset.require('../scene/solarsystem/planets/mercury/mercury')
-
+----------------------------------------
+-- Configuration options for this asset
 local CreateFocusNodes = false
+local AddMarsLayers = true
+local AddMoonLayers = true
+local AddMercuryLayers = true
+----------------------------------------
+
+-- If you add layers for different planets than listed here, be sure to add an
+-- asset.require(...) statement in here similar to the ones that are used below
 
 -- Add folders to this list that contain .info files describing patches
 -- OBS: Even on Windows, you have to use forward slashes (/) or double backslashes (\\)
@@ -51,6 +54,24 @@ local vrt_folders = {
     }
 }
 
+-- Add require statements for assets exporting the neccessary globes
+-- here we add Mars, Moon and Mercury:
+if AddMarsLayers then
+    asset.require('../scene/solarsystem/planets/mars/mars')
+else
+    vrt_folders['Mars'] = nil
+end
+if AddMoonLayers then
+    asset.require('../scene/solarsystem/planets/earth/moon/moon')
+else
+    vrt_folders['Moon'] = nil
+end
+if AddMercuryLayers then
+    asset.require('../scene/solarsystem/planets/mercury/mercury')
+else
+    vrt_folders['Mercury'] = nil
+end
+
 asset.onInitialize(function ()
     -- Add local patches described at the top of this file
     for obj, list in pairs(vrt_folders) do
diff --git a/data/assets/examples/discs.asset b/data/assets/examples/discs.asset
new file mode 100644
index 0000000000..0b15b2115b
--- /dev/null
+++ b/data/assets/examples/discs.asset
@@ -0,0 +1,25 @@
+local assetHelper = asset.require('util/asset_helper')
+
+local color = {0.0, 1.0, 1.0}
+
+-- @TODO (emmbr 2020-02-03) Potential threading issue later on? This will run on the main thread
+local singeColorTexturePath = openspace.createSingeColorImage("example_ring_color", color)
+
+local BasicDisc = {
+    Identifier = "BasicDisc",
+    Parent = "Root",
+    Renderable = {
+        Type = "RenderableDisc",
+        Texture = singeColorTexturePath,
+        Size = 1e10,
+        Width = 0.5
+    },
+    GUI = {
+        Name = "Basic Disc",
+        Path = "/Examples/Discs"
+    }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+    BasicDisc
+})
diff --git a/data/assets/examples/grids.asset b/data/assets/examples/grids.asset
index 8f001c06ad..e29652e3bc 100644
--- a/data/assets/examples/grids.asset
+++ b/data/assets/examples/grids.asset
@@ -1,6 +1,6 @@
 local assetHelper = asset.require('util/asset_helper')
 
-local scale = 3E11  
+local scale = 149597870700 -- 1 AU
 
 local radialGrid = {
     Identifier = "ExampleRadialGrid",
@@ -14,9 +14,10 @@ local radialGrid = {
     Renderable = {
         Type = "RenderableRadialGrid",
         Opacity = 0.8,
-        GridColor = {0.6, 1.0, 0.7},
+        Color = { 0.6, 1.0, 0.7 },
         LineWidth = 3.0,
-        GridSegments = {3, 4},
+        GridSegments = { 3, 4 },
+        OuterSize = 1.0,
         InnerRadius = 0.2,
         Enabled = false
     },
@@ -36,10 +37,10 @@ local planarGrid = {
     },
     Renderable = {
         Type = "RenderableGrid",
-        GridColor = {0.0, 1.0, 0.8},
+        Color = { 0.0, 1.0, 0.8 },
         LineWidth = 2.0,
-        Segments = {5, 10},
-        Size = {1, 2},
+        Segments = { 5, 10 },
+        Size = { 1, 2 },
         Enabled = false
     },
     GUI = {
@@ -48,7 +49,51 @@ local planarGrid = {
     }
 }
 
-assetHelper.registerSceneGraphNodesAndExport(asset, { 
-    radialGrid, 
-    planarGrid 
+local sphericalGrid = {
+    Identifier = "ExampleSphericalGrid",
+    Transform = {
+        Scale = {
+            Type = "StaticScale",
+            Scale = scale
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphericalGrid",
+        Color = { 1.0, 0.5, 0.2 },
+        LineWidth = 2.0,
+        Segments = 40,
+        Enabled = false
+    },
+    GUI = {
+        Name = "Example Spherical Grid",
+        Path = "/Examples/Grids"
+    }
+}
+
+local boxGrid = {
+    Identifier = "ExampleBoxGrid",
+    Transform = {
+        Scale = {
+            Type = "StaticScale",
+            Scale = scale
+        }
+    },
+    Renderable = {
+        Type = "RenderableBoxGrid",
+        Color = { 0.5, 0.0, 1.0 },
+        LineWidth = 2.0,
+        Size = { 2, 2, 2 },
+        Enabled = false
+    },
+    GUI = {
+        Name = "Example Box Grid",
+        Path = "/Examples/Grids"
+    }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+    radialGrid,
+    planarGrid,
+    sphericalGrid,
+    boxGrid
 })
diff --git a/data/assets/scene/digitaluniverse/6dF.asset b/data/assets/scene/digitaluniverse/6dF.asset
index a77c03fd11..c7871b5e69 100644
--- a/data/assets/scene/digitaluniverse/6dF.asset
+++ b/data/assets/scene/digitaluniverse/6dF.asset
@@ -30,7 +30,7 @@ local object = {
         ColorRange = { { 0.0, 0.075 }, { 1.0, 10.0 } },
         Unit = "Mpc",
         ScaleFactor = 534.0,
-        BillboardMaxSize = 7.0,
+        BillboardMaxSize = 9.0,
         EnablePixelSizeControl = true,
     },
     GUI = {
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation.asset b/data/assets/scene/digitaluniverse/backgroundradiation.asset
index 1a7e4d7d44..fbe1002e5e 100644
--- a/data/assets/scene/digitaluniverse/backgroundradiation.asset
+++ b/data/assets/scene/digitaluniverse/backgroundradiation.asset
@@ -1,13 +1,5 @@
 local assetHelper = asset.require('util/asset_helper')
-
-
-
-local textures = asset.syncedResource({
-    Name = "Background Radiation Textures",
-    Type = "HttpSynchronization",
-    Identifier = "digitaluniverse_backgroundradiation_textures",
-    Version = 2
-})
+local textures = asset.require('./backgroundradiation_textures').textures
 
 local speck = asset.syncedResource({
     Name = "Background Radiation Speck Files",
@@ -94,126 +86,6 @@ local planck = {
     }
 }
 
-local multiverse_planck_1 = {
-    Identifier = "PlanckMultiverse1",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 0.0, 0.0, 2000E23}
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 1",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
-local multiverse_planck_2 = {
-    Identifier = "PlanckMultiverse2",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 2500E23, 0.0, 2000E23}
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 2",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
-local multiverse_planck_3 = {
-    Identifier = "PlanckMultiverse3",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 2500E23, 5000E23, 2000E23}
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 3",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
-local multiverse_planck_4 = {
-    Identifier = "PlanckMultiverse4",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 0.0, 10000E23, 0.0 }
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 4",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
 
 local Halpha = {
     Identifier = "HAlpha",
@@ -244,8 +116,7 @@ local Halpha = {
 
 
 assetHelper.registerSceneGraphNodesAndExport(asset, {
-    wmap, cbe, planck, multiverse_planck_1, multiverse_planck_2, multiverse_planck_3,
-    multiverse_planck_4, Halpha
+    wmap, cbe, planck, Halpha
 })
 
 
@@ -254,12 +125,11 @@ asset.meta = {
     Version = "2.0",
     Description = [[Various AllSky images for the Milky Way and observable Universe.
         Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
-        Planck, Planck Multiverse 1-4, and H Alpha <br><br> Data Reference: Planck/ESA and
-        the Planck Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
+        Planck, and H Alpha <br><br> Data Reference: Planck/ESA and the Planck
+        Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
         Finkbeiner (Princeton)]],
     Author = "Brian Abbott (AMNH), OpenSpace Team",
     URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
     License = "AMNH Digital Universe",
-    Identifiers = {"WMAP", "CBE", "Planck", "PlanckMultiverse1", "PlanckMultiverse2",
-        "PlanckMultiverse3", "PlanckMultiverse4", "HAlpha"}
+    Identifiers = {"WMAP", "CBE", "Planck", "HAlpha"}
 }
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
new file mode 100644
index 0000000000..69cbb46808
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
@@ -0,0 +1,141 @@
+local assetHelper = asset.require('util/asset_helper')
+local textures = asset.require('./backgroundradiation_textures').textures
+
+local multiverse_planck_1 = {
+    Identifier = "PlanckMultiverse1",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 0.0, 0.0, 2000E23}
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 1",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+local multiverse_planck_2 = {
+    Identifier = "PlanckMultiverse2",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 2500E23, 0.0, 2000E23}
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 2",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+local multiverse_planck_3 = {
+    Identifier = "PlanckMultiverse3",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 2500E23, 5000E23, 2000E23}
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 3",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+local multiverse_planck_4 = {
+    Identifier = "PlanckMultiverse4",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 0.0, 10000E23, 0.0 }
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 4",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+    multiverse_planck_1, multiverse_planck_2, multiverse_planck_3, multiverse_planck_4
+})
+
+
+asset.meta = {
+    Name = "Multiverse Background Radiation",
+    Version = "2.0",
+    Description = [[ Non-physical representation of the location of hypothetical 
+        cosmic microwave background radiation images how they would be observed from other
+        locations in the universe. <br> This is not a measured dataset!]],
+    Author = "Brian Abbott (AMNH), OpenSpace Team",
+    URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+    License = "AMNH Digital Universe",
+    Identifiers = { "PlanckMultiverse1", "PlanckMultiverse2",
+        "PlanckMultiverse3", "PlanckMultiverse4" }
+}
diff --git a/data/assets/scene/digitaluniverse/backgroundradiation_textures.asset b/data/assets/scene/digitaluniverse/backgroundradiation_textures.asset
new file mode 100644
index 0000000000..e58983b118
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/backgroundradiation_textures.asset
@@ -0,0 +1,8 @@
+local textures = asset.syncedResource({
+    Name = "Background Radiation Textures",
+    Type = "HttpSynchronization",
+    Identifier = "digitaluniverse_backgroundradiation_textures",
+    Version = 2
+})
+
+asset.export('textures', textures)
diff --git a/data/assets/scene/digitaluniverse/deepsky.asset b/data/assets/scene/digitaluniverse/deepsky.asset
index 8d858cc663..3c16db2cbb 100644
--- a/data/assets/scene/digitaluniverse/deepsky.asset
+++ b/data/assets/scene/digitaluniverse/deepsky.asset
@@ -33,7 +33,7 @@ local deepSkyPoints = {
         TextColor = { 0.1, 0.4, 0.6 },
         TextSize = 20.50,
         TextMinSize = 16.0,
-        Unit = "Mpc",
+        Unit = "pc",
         -- Fade in value in the same unit as "Unit"
         --FadeInDistances = { 0.05, 1.0 },
         -- Max size in pixels
@@ -68,7 +68,7 @@ local deepSkyImages = {
         TexturePath = textures,
         Luminosity = "radius",
         ScaleLuminosity = 0.001,
-        Unit = "Mpc",
+        Unit = "pc",
         -- Fade in value in the same unit as "Unit"
         --FadeInDistances = {0.001, 0.05010},
         PlaneMinSize = 5.0
diff --git a/data/assets/scene/digitaluniverse/digitaluniverse.asset b/data/assets/scene/digitaluniverse/digitaluniverse.asset
new file mode 100644
index 0000000000..9bdf3c367a
--- /dev/null
+++ b/data/assets/scene/digitaluniverse/digitaluniverse.asset
@@ -0,0 +1,37 @@
+asset.require('./2dF')
+asset.require('./2mass')
+asset.require('./6dF')
+asset.require('./abell')
+asset.require('./alternatestarlabels')
+asset.require('./backgroundradiation')
+asset.require('./backgroundradiation_multiverse')
+asset.require('./clusters')
+asset.require('./constellationbounds')
+asset.require('./constellations')
+asset.require('./deepsky')
+asset.require('./dwarfs')
+asset.require('./exoplanets')
+asset.require('./globularclusters')
+asset.require('./grids')
+asset.require('./groups')
+asset.require('./h2regions')
+asset.require('./kepler')
+asset.require('./localdwarfs')
+asset.require('./milkyway')
+asset.require('./milkyway_arm_labels')
+asset.require('./milkyway_data')
+asset.require('./milkyway_label')
+asset.require('./milkyway_sphere')
+asset.require('./obassociations')
+asset.require('./openclusters')
+asset.require('./planetarynebulae')
+asset.require('./pulsars')
+asset.require('./quasars')
+asset.require('./sdss')
+asset.require('./starlabels')
+asset.require('./starorbits')
+asset.require('./stars')
+asset.require('./superclusters')
+asset.require('./supernovaremnants')
+asset.require('./tully')
+asset.require('./voids')
diff --git a/data/assets/scene/digitaluniverse/dwarfs.asset b/data/assets/scene/digitaluniverse/dwarfs.asset
index 1efccea999..8641e25771 100644
--- a/data/assets/scene/digitaluniverse/dwarfs.asset
+++ b/data/assets/scene/digitaluniverse/dwarfs.asset
@@ -32,10 +32,10 @@ local object = {
         TextColor = { 0.5, 0.1, 0.2 },
         TextSize = 14.6,
         TextMinSize = 10.0,
-        ScaleFactor = 370,
+        ScaleFactor = 372.1,
         --CorrectionSizeEndDistance = 16.1,
         --CorrectionSizeFactor = 7.75,
-        BillboardMaxSize = 18.0,
+        BillboardMaxSize = 20.0,
         EnablePixelSizeControl = true,
         Unit = "pc"
     },
diff --git a/data/assets/scene/digitaluniverse/exoplanets.asset b/data/assets/scene/digitaluniverse/exoplanets.asset
index 027f5de52e..ec4e7e1c3a 100644
--- a/data/assets/scene/digitaluniverse/exoplanets.asset
+++ b/data/assets/scene/digitaluniverse/exoplanets.asset
@@ -13,7 +13,7 @@ local speck = asset.syncedResource({
     Name = "Exoplanets Speck Files",
     Type = "HttpSynchronization",
     Identifier = "digitaluniverse_exoplanets_speck",
-    Version = 1
+    Version = 2
 })
 
 local object = {
@@ -27,7 +27,7 @@ local object = {
         Texture = textures .. "/target-blue.png",
         File = speck .. "/expl.speck",
         LabelFile = speck .. "/expl.label",
-        ScaleFactor = 392.5,
+        ScaleFactor = 388.67923,
         TextColor = { 0.3, 0.3, 0.8 },
         TextSize = 14.8,
         TextMaxSize = 200.0,
@@ -35,7 +35,7 @@ local object = {
         CorrectionSizeEndDistance = 15.23,
         CorrectionSizeFactor = 13.3,
         Unit = "pc",
-        BillboardMaxSize = 52.0,
+        BillboardMaxSize = 75.0,
         EnablePixelSizeControl = true,
     },
     GUI = {
diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset
index 2699247df4..16f4afd20b 100644
--- a/data/assets/scene/digitaluniverse/grids.asset
+++ b/data/assets/scene/digitaluniverse/grids.asset
@@ -40,7 +40,7 @@ local radio = {
         Type = "RenderableSphericalGrid",
         Enabled = false,
         Opacity = 1.0,
-        GridColor = { 0.3, 0.84, 1.0 },
+        Color = { 0.3, 0.84, 1.0 },
         LineWidth = 2.0
     },
     GUI = {
@@ -66,7 +66,7 @@ local oort = {
         Type = "RenderableSphericalGrid",
         Enabled = false,
         Opacity = 0.8,
-        GridColor = { 0.8, 0.4, 0.4 },
+        Color = { 0.8, 0.4, 0.4 },
         LineWidth = 2.0
     },
     GUI = {
@@ -92,7 +92,7 @@ local ecliptic = {
         Type = "RenderableSphericalGrid",
         Enabled = false,
         Opacity = 1.0,
-        GridColor = { 0.74, 0.26, 0.26 },
+        Color = { 0.74, 0.26, 0.26 },
         LineWidth = 2.0
     },
     GUI = {
@@ -146,7 +146,7 @@ local equatorial = {
         Type = "RenderableSphericalGrid",
         Enabled = false,
         Opacity = 0.8,
-        GridColor = { 0.69, 0.68, 0.29 },
+        Color = { 0.69, 0.68, 0.29 },
         LineWidth = 2.0
     },
     GUI = {
@@ -197,7 +197,7 @@ local galactic = {
         Enabled = false,
         LineWidth = 2.0,
         Opacity = 1.0,
-        GridColor = { 0.0, 0.6, 0.6 }
+        Color = { 0.0, 0.6, 0.6 }
     },
     GUI = {
         Name = "Galactic Sphere",
@@ -550,6 +550,6 @@ asset.meta = {
     License = "AMNH Digital Universe",
     Identifiers = {"RadioSphere", "OortSphere", "EclipticSphere", "EclipticSphereLabels",
         "Equatorial", "EquatorialSphereLabels", "GalacticSphere", "GalacticSphereLabels",
-        "1ldGrid", "1lmGrid", "1lyGrid", "10lyGrid", "100lyGrid", "1klyGrid" "10klyGrid",
+        "1ldGrid", "1lmGrid", "1lyGrid", "10lyGrid", "100lyGrid", "1klyGrid", "10klyGrid",
         "100klyGrid", "1MlyGrid", "10MlyGrid", "100MlyGrid", "20GlyGrid"}
 }
diff --git a/data/assets/scene/digitaluniverse/kepler.asset b/data/assets/scene/digitaluniverse/kepler.asset
index 212071b5fe..04fc503c77 100644
--- a/data/assets/scene/digitaluniverse/kepler.asset
+++ b/data/assets/scene/digitaluniverse/kepler.asset
@@ -29,7 +29,7 @@ local object = {
         CorrectionSizeEndDistance = 15.86,
         CorrectionSizeFactor = 8.59,
         Unit = "pc",
-        BillboardMaxSize = 23.0,
+        BillboardMaxSize = 30.0,
         EnablePixelSizeControl = true
     },
     GUI = {
diff --git a/data/assets/scene/digitaluniverse/stars.asset b/data/assets/scene/digitaluniverse/stars.asset
index 7328d0fae4..e269202667 100644
--- a/data/assets/scene/digitaluniverse/stars.asset
+++ b/data/assets/scene/digitaluniverse/stars.asset
@@ -66,7 +66,8 @@ local sunstar = {
         MagnitudeExponent = 6.2,
         SizeComposition = "Distance Modulus",
         RenderMethod = "Texture Based", -- or PSF
-        FadeInDistances = { 0.0001, 0.1 }
+        FadeInDistances = { 0.0001, 0.1 },
+        RenderableType = "PostDeferredTransparent"
     },
     GUI = {
         Name = "Sun",
diff --git a/data/assets/scene/digitaluniverse/tully.asset b/data/assets/scene/digitaluniverse/tully.asset
index 2bc40a8ac4..42438baa5e 100644
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -23,7 +23,7 @@ local tullyPoints = {
         Enabled = true,
         Color = { 1.0, 0.4, 0.2 },
         Opacity = 0.99,
-        ScaleFactor = 500.0,
+        ScaleFactor = 504.0,
         File = speck .. "/tully.speck",
         Texture = textures .. "/point3A.png",
         --ColorMap = speck .. "/tully.cmap",
@@ -46,7 +46,7 @@ local tullyPoints = {
         -- Fade in value in the same unit as "Unit"
         FadeInDistances = { 0.001, 1.0 },
         -- Max size in pixels
-        BillboardMaxSize = 5,
+        BillboardMaxSize = 7,
         BillboardMinSize = 0,
         --CorrectionSizeEndDistance = 22.0,
         --CorrectionSizeFactor = 10.45
diff --git a/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset b/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset
index b49f091844..0d2ab171e8 100644
--- a/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset
+++ b/data/assets/scene/milkyway/exoplanets/exoplanets_data.asset
@@ -2,6 +2,17 @@ local DataPath = asset.syncedResource({
     Name = "Exoplanet Data Files",
     Type = "HttpSynchronization",
     Identifier = "exoplanets_data",
-    Version = 1
+    Version = 2
 })
 asset.export("DataPath", DataPath)
+
+asset.meta = {
+    Name = "Exoplanet Data",
+    Version = "2.0",
+    Description = [[ The data that is used for the exoplanet systems. The data has been 
+    derived from the 'Planetary Systems Composite Data' dataset from the NASA Exoplanet 
+    Archive]],
+    Author = "OpenSpace Team",
+    URL = "https://exoplanetarchive.ipac.caltech.edu/docs/data.html",
+    License = "MIT license",
+}
diff --git a/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset b/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset
index 287b29d61e..9efd63b65c 100644
--- a/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset
+++ b/data/assets/scene/milkyway/exoplanets/exoplanets_textures.asset
@@ -1,7 +1,19 @@
+asset.require('./../habitable_zones/habitable_zone_textures')
+
 local TexturesPath = asset.syncedResource({
     Name = "Exoplanet Textures",
     Type = "HttpSynchronization",
     Identifier = "exoplanets_textures",
-    Version = 1
+    Version = 2
 })
 asset.export("TexturesPath", TexturesPath)
+
+asset.meta = {
+    Name = "Exoplanet Textures",
+    Version = "2.0",
+    Description = [[ Adds all textures that are required for the exoplanet system
+     visualizations]],
+    Author = "OpenSpace Team",
+    URL = "http://openspaceproject.com",
+    License = "MIT license",
+}
diff --git a/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
new file mode 100644
index 0000000000..0687c70693
--- /dev/null
+++ b/data/assets/scene/milkyway/habitable_zones/habitable_zone_textures.asset
@@ -0,0 +1,17 @@
+local TexturesPath = asset.syncedResource({
+    Name = "Habitable Zone Textures",
+    Type = "HttpSynchronization",
+    Identifier = "habitable_zone_textures",
+    Version = 1
+})
+asset.export("TexturesPath", TexturesPath)
+
+asset.meta = {
+    Name = "Habitable Zone Textures",
+    Version = "1.0",
+    Description = [[ Default textures that can be used for the habitable zone 
+     rendering]],
+    Author = "OpenSpace Team",
+    URL = "http://openspaceproject.com",
+    License = "MIT license",
+}
diff --git a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
index 910aca0673..d02f8c3a5f 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/cluster.asset
@@ -16,25 +16,16 @@ local OrionClusterStars = {
         Type = "RenderableStars",
         File = sync .. "/oricluster.speck",
         Texture = sync .. "/halo.png",
-        Texture = sync .. "/colorbv.cmap",
+        ColorMap = sync .. "/colorbv.cmap",
         MagnitudeExponent = 5.02,
         SizeComposition = "Distance Modulus",
         RenderMethod = "Texture Based"
     },
     GUI = {
         Name = "Orion Nebula Star Cluster",
-        Path = "/Milky Way/Stars"
-    }
-}
-
-assetHelper.registerSceneGraphNodesAndExport(asset, { OrionClusterStars })
-
-
-asset.meta = {
-    Name = "Orion Nebula Star Cluster",
-    Version = "1.0",
-    Description = [[ In order to have an accurate depiction of the Orion nebula, we need 
-to include the star cluster that was birthed from it. We turned to a study of the 
+        Path = "/Milky Way/Orion",
+        Description = [[ In order to have an accurate depiction of the Orion nebula, we
+need to include the star cluster that was birthed from it. We turned to a study of the
 cluster's stellar population by Lynne Hillenbrand, who was working at the University of 
 California, Berkeley at the time. The catalog from her paper contains more than 1500 
 stars, about half the stars in the actual cluster. The cluster is very crowded, with a 
@@ -45,7 +36,18 @@ Knowing the size of the cluster and approximating the shape to be roughly spheri
 placed each star along a line of sight through this imaginary sphere centered on the 
 cluster. In this sense, these data are observed data and the view from Earth is accurate. 
 But the distance of each star has been derived from this educated-guess approach for the 
-cluster distribution. ]],
+cluster distribution. ]]
+    }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { OrionClusterStars })
+
+
+asset.meta = {
+    Name = "Orion Nebula Star Cluster",
+    Version = "1.0",
+    Description = [[ Digital Universe asset for the Orion star cluster. To be used in
+        conjunction with nebula model. Use orionnebula.asset to include both.]],
     Author = "AMNH Digital Universe",
     URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
     License = "AMNH Digital Universe",
diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
index dc99a09a4f..8c5a86cf8e 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset
@@ -31,7 +31,20 @@ local NebulaHolder = {
     },
     GUI = {
         Name = "Orion Nebula",
-        Path = "/Milky Way/Objects",
+        Path = "/Milky Way/Orion",
+        Description = [[ In the Digital Universe model of the Orion Nebula, we depict the 
+ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped 
+on the undulating surface. In reality, the ionization front has a slight thickness to
+it - about a third of a light year - but is quite thin compared to the overall size of 
+the nebula, which stretches about ten light years from side to side.<br><br>Close into 
+the center, we see small teardrop-shaped structures with their narrow ends pointing away 
+from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust 
+surrounding young stars. The larger formations that one sees farther away from the center 
+of the nebula take on a cup-like shape, with the narrow end pointing away from the 
+nebulas center. These enormous structures are bow shocks that delineate the region where 
+highspeed winds from the central star slow from supersonic to subsonic speeds. You can 
+think of an HII region as a sort of tremendous explosion, taking place over millennia, 
+and the bow shocks are part of the outward rush of material. ]]
     }
 }
 
@@ -54,15 +67,17 @@ local OrionNebulaModel = {
         Opacity = 1.0,
         DisableFaceCulling = false,
         SpecularIntensity = 0.0,
-        AmbientIntensity = 0.45,
-        DiffuseIntensity = 0.0,
+        AmbientIntensity = 0.0,
+        DiffuseIntensity = 1.0,
+        --PerformShading = false,
         RotationVector = { 0.000000, 22.300000, 0.000000 },
         LightSources = LIGHTS;
     },
     GUI = {
         Name = "Orion Nebula Model",
-        Path = "/Milky Way/Objects",
-        Hidden = true
+        Path = "/Milky Way/Orion",
+        Hidden = true,
+        Description = "Orion Nebula 3D model. See Orion Nebula for description."
     }
 }
 
@@ -85,15 +100,17 @@ local OrionNebulaShocksModel = {
         Opacity = 1.0, 
         DisableFaceCulling = false,
         SpecularIntensity = 0.0,
-        AmbientIntensity = 0.19,
-        DiffuseIntensity = 0.4,
+        AmbientIntensity = 0.0,
+        DiffuseIntensity = 1.0,
+        --PerformShading = false,
         RotationVector = { 0.000000, 22.300000, 0.000000 },
         LightSources = LIGHTS;
     },
     GUI = {
         Name = "Orion Nebula Shocks",
-        Path = "/Milky Way/Objects",
-        Hidden = false
+        Path = "/Milky Way/Orion",
+        Hidden = false,
+        Description = "Orion Nebula Shocks 3D model. See Orion Nebula for description."
     }
 }
 
@@ -116,15 +133,17 @@ local OrionNebulaProplydsModel = {
         Opacity = 1.0, 
         DisableFaceCulling = false,
         SpecularIntensity = 0.0,
-        AmbientIntensity = 1.0,
+        AmbientIntensity = 0.0,
         DiffuseIntensity = 1.0,
+        --PerformShading = false,
         RotationVector = { 0.000000, 22.300000, 0.000000 },
         LightSources = LIGHTS;
     },
     GUI = {
         Name = "Orion Nebula Proplyds",
-        Path = "/Milky Way/Objects",
-        Hidden = false
+        Path = "/Milky Way/Orion",
+        Hidden = false,
+        Description = "Orion Nebula Proplyds 3D model. See Orion Nebula for description."
     }
 }
 
@@ -139,22 +158,12 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
 asset.meta = {
     Name = "Orion Nebula Model",
     Version = "1.0",
-    Description = [[ In the Digital Universe model of the Orion Nebula, we depict the 
-ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped 
-on the undulating surface. In reality, the ionization front has a slight thickness to
-it - about a third of a light year - but is quite thin compared to the overall size of 
-the nebula, which stretches about ten light years from side to side.<br><br>Close into 
-the center, we see small teardrop-shaped structures with their narrow ends pointing away 
-from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust 
-surrounding young stars. The larger formations that one sees farther away from the center 
-of the nebula take on a cup-like shape, with the narrow end pointing away from the 
-nebulas center. These enormous structures are bow shocks that delineate the region where 
-highspeed winds from the central star slow from supersonic to subsonic speeds. You can 
-think of an HII region as a sort of tremendous explosion, taking place over millennia, 
-and the bow shocks are part of the outward rush of material. ]],
+    Description = [[ Digital Universe asset for the Orion nebula 3D model. This asset
+        contains seperate models for the nebula, proplyds and shocks. To be used in
+        conjunction with orion star cluster. Use orionnebula.asset to include both.]],
     Author = "AMNH Digital Universe",
     URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
     License = "AMNH Digital Universe",
-    Identifiers = {"OrionNebulaModel", "OrionNebulaModel", "OrionNebulaProplydsModel",
+    Identifiers = {"OrionNebulaHolder", "OrionNebulaModel", "OrionNebulaProplydsModel",
         "OrionNebulaShocksModel"}
 }
diff --git a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
index 15bc241234..3461943c80 100644
--- a/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
+++ b/data/assets/scene/milkyway/objects/orionnebula/transforms.asset
@@ -18,8 +18,9 @@ local NebulaPosition = {
     },
     GUI = {
         Name = "Orion Nebula Position",
-        Path = "/Milky Way/Objects",
-        Hidden = true
+        Path = "/Milky Way/Orion",
+        Hidden = true,
+        Description = "Static position for Orion Nebula"
     }
 }
 
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 35e6fe6436..4b6aa574c2 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
@@ -31,16 +31,17 @@ local Charon = {
             Enable = false,
             FileName = labelsPath .. "/charon.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 14.0,
+            LabelsFontSize = 40.0,
             LabelsSize = 8.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 2000000.0,
+            FadeOutStartingDistance = 800000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 250000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
index 667c201781..5299ebc5dd 100644
--- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
@@ -31,16 +31,17 @@ local Pluto = {
             Enable = false,
             FileName = labelsPath .. "/pluto.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 14.0,
+            LabelsFontSize = 28.0,
             LabelsSize = 8.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 4000000.0,
+            FadeOutStartingDistance = 650000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 500000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
index f76730f83c..8f7ad17c31 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
@@ -15,7 +15,7 @@ local kernelsList = {kernelsFolder .. '/p10-a.bsp'}
 local Pioneer10NAIF = "-23"
 
 local Pioneer10 = {
-    Identifier = "Pioneer10",
+    Identifier = "Pioneer_10",
     Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Transform = {
         Translation = {
@@ -27,13 +27,15 @@ local Pioneer10 = {
     },
     Renderable = model.PioneerModel,
     GUI = {
-        Name = "Pioneer 10",
-        Path = "/Solar System/Missions/Pioneer/10"
+        Name = "Pioneer 10 Spacecraft",
+        Path = "/Solar System/Missions/Pioneer",
+        Description = [[Pioneer 10 Spacecraft. Positioned by SPICE data.]]
+
     }
 }
 
 local Pioneer10Trail = {
-    Identifier = "Pioneer10Trail",
+    Identifier = "Pioneer_10Trail",
     Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
@@ -51,8 +53,10 @@ local Pioneer10Trail = {
         -- 6545 is the number of days between the Start and End time (aka sample every 2d)
     },
     GUI = {
-        Name = "Pioneer 10 Trail",
-        Path = "/Solar System/Missions/Pioneer/10"
+        Name = "Pioneer 10 Trail (SPICE)",
+        Path = "/Solar System/Missions/Pioneer",
+        Description = [[Pioneer 10 Trail, spanning March 3rd, 1972 to January 2nd, 1990.
+        Data from SPICE]]
     }
 }
 
@@ -60,3 +64,15 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
     Pioneer10,
     Pioneer10Trail,
 })
+
+
+asset.meta = {
+    Name = "Pioneer 10",
+    Version = "1.0",
+    Description = [[ Pioneer 10 Model and Trail. Driven by SPICE data for high accuracy
+    from March 3rd, 1972 to January 2nd, 1990.]],
+    Author = "OpenSpace Team",
+    URL = "http://openspaceproject.com",
+    License = "MIT license",
+    Identifiers = {"Pioneer_10", "Pioneer_10Trail"}
+}
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
index 5e69367ae1..ae51e753a8 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
@@ -30,13 +30,14 @@ local Pioneer11 = {
     },
     Renderable = model.PioneerModel,
     GUI = {
-        Name = "Pioneer 11",
-        Path = "/Solar System/Missions/Pioneer/11"
+        Name = "Pioneer 11 Spacecraft",
+        Path = "/Solar System/Missions/Pioneer",
+        Description = [[Pioneer 11 Spacecraft. Positioned by SPICE data.]]
     }
 }
 
 local Pioneer11Trail = {
-    Identifier = "Pioneer11Trail",
+    Identifier = "Pioneer_11Trail",
     Parent = sunTransforms.SolarSystemBarycenter.Identifier,
     Renderable = {
         Type = "RenderableTrailTrajectory",
@@ -54,8 +55,10 @@ local Pioneer11Trail = {
         --6087 is the number of days between the Start and End time (so sample every 2d)
     },
     GUI = {
-        Name = "Pioneer 11 Trail",
-        Path = "/Solar System/Missions/Pioneer/11"
+        Name = "Pioneer 11 Trail (SPICE)",
+        Path = "/Solar System/Missions/Pioneer",
+        Description = [[Pioneer 11 Trail, spanning April 6th, 1973 to January 2nd, 1990.
+        Data from SPICE.]]
     }
 }
 
@@ -63,3 +66,15 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
     Pioneer11,
     Pioneer11Trail,
 })
+
+
+asset.meta = {
+    Name = "Pioneer 11",
+    Version = "1.0",
+    Description = [[ Pioneer 11 Model and Trail. Driven by SPICE data for high accuracy
+    from April 6th, 1973 to January 2nd, 1990.]],
+    Author = "OpenSpace Team",
+    URL = "http://openspaceproject.com",
+    License = "MIT license",
+    Identifiers = {"Pioneer_11", "Pioneer_11Trail"}
+}
diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
index 1903e5bb71..a0b1b632ff 100644
--- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
+++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset
@@ -1,5 +1,5 @@
 local assetHelper = asset.require('util/asset_helper')
-
+local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 
 local modelFolder = asset.syncedResource({
     Name = "Pioneer 10/11 Models",
@@ -21,3 +21,13 @@ local ModelRenderable = {
 }
 
 asset.export("PioneerModel", ModelRenderable)
+
+asset.meta = {
+    Name = "Pioneer Model",
+    Version = "1.0",
+    Description = [[ Pioneer model asset. Used by both pioneer 10 and pioneer 11 asset.
+    Untextured version of model from NASA 3D resources.]],
+    Author = "NASA",
+    URL = "https://nasa3d.arc.nasa.gov/detail/eoss-pioneer",
+    License = "NASA"
+}
\ No newline at end of file
diff --git a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
index b609658789..02be5ab03e 100644
--- a/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
+++ b/data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
@@ -20,8 +20,10 @@ local voyager1 = {
        TimeStampSubsampleFactor = 1
    },
    GUI = {
-       Name = "Voyager 1",
-       Path = "/Solar System/Missions"
+       Name = "Voyager 1 Trail",
+       Path = "/Solar System/Missions/Voyager",
+       Description = [[Voyager 1 Trail, spanning September 6th, 1977 to December 31st,
+       2030. Data from JPL Horizons.]]
    }
 }
 
@@ -43,8 +45,10 @@ local voyager2 = {
        TimeStampSubsampleFactor = 1
    },
    GUI = {
-       Name = "Voyager 2",
-       Path = "/Solar System/Missions"
+       Name = "Voyager 2 Trail",
+       Path = "/Solar System/Missions/Voyager",
+       Description = [[Voyager 2 Trail, spanning August 21st, 1977 to December 31st, 2030.
+       Data from JPL Horizons.]]
    }
 }
 
@@ -66,8 +70,10 @@ local pioneer10 = {
        TimeStampSubsampleFactor = 1
    },
    GUI = {
-       Name = "Pioneer 10",
-       Path = "/Solar System/Missions"
+       Name = "Pioneer 10 Trail",
+       Path = "/Solar System/Missions/Pioneer",
+       Description = [[Pioneer 10 Trail, spanning March 4th, 1972 to December 31st, 2030.
+       Data from JPL Horizons.]]
    }
 }
 
@@ -89,9 +95,24 @@ local pioneer11 ={
        TimeStampSubsampleFactor = 1
    },
    GUI = {
-       Name = "Pioneer 11",
-       Path = "/Solar System/Missions"
+       Name = "Pioneer 11 Trail",
+       Path = "/Solar System/Missions/Pioneer",
+       Description = [[Pioneer 11 Trail, spanning April 7th, 1973 to December 31st, 2030.
+       Data from JPL Horizons.]]
    }
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, { voyager1, voyager2, pioneer10, pioneer11 })
+
+
+asset.meta = {
+    Name = "Pioneer and Voyager Trails",
+    Version = "1.0",
+    Description = [[ Pioneer 10, Pioneer 11, Voyager 1 and Voyager 2 trails. Driven by JPL
+    Horizons data for better performance then spice but lower resolution. Data is from 
+    shortly after mission launches until December 31st, 2030.]],
+    Author = "OpenSpace Team",
+    URL = "http://openspaceproject.com",
+    License = "MIT license",
+    Identifiers = {"Pioneer10", "Pioneer11", "Voyager1", "Voyager2"}
+}
\ No newline at end of file
diff --git a/data/assets/scene/solarsystem/planets/default_layers.asset b/data/assets/scene/solarsystem/planets/default_layers.asset
index 4fc2b0ada0..37649a9ed0 100644
--- a/data/assets/scene/solarsystem/planets/default_layers.asset
+++ b/data/assets/scene/solarsystem/planets/default_layers.asset
@@ -8,6 +8,8 @@ asset.require('./jupiter/ganymede/default_layers')
 asset.require('./jupiter/io/default_layers')
 
 asset.require('./mars/default_layers')
+asset.require('./mars/moons/layers/colorlayers/deimos_viking')
+asset.require('./mars/moons/layers/colorlayers/phobos_viking')
 
 asset.require('./mercury/default_layers')
 
diff --git a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
index 9bb7b5cadd..e52677d158 100644
--- a/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/earth/atmosphere.asset
@@ -6,110 +6,98 @@ local assetHelper = asset.require('util/asset_helper')
 -- local earthEllipsoid = { 6378137.0, 6378137.0, 6356752.314245 }
 local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 }
 local Atmosphere = {
-    Identifier = "EarthAtmosphere",
-    Parent = transforms.Earth.Identifier,
-    Renderable = {
-        Type = "RenderableAtmosphere",
-        Atmosphere = {
-            -- Atmosphere radius in Km
-            AtmosphereRadius = 6447.0,
-            PlanetRadius    = 6377.0,
-            PlanetAverageGroundReflectance = 0.1,
-            GroundRadianceEmittion = 0.6,
-            SunIntensity = 6.9,
-            Rayleigh = {
-              Coefficients = {
-                -- Wavelengths are given in 10^-9m
-                Wavelengths = { 680, 550, 440 },
-                -- Reflection coefficients are given in km^-1
-                Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 },
-                -- In Rayleigh scattering, the coefficients of absorption and scattering are the same.
-              },
-              -- Thichkness of atmosphere if its density were uniform, in Km
-              H_R = 8.0
-            },
-            --[[
-              Ozone = {
-              Coefficients = {
-                -- Extinction coefficients 
-                Extinction = {3.426, 8.298, 0.356}
-              },
-              H_O = 8.0,
-            },
-            ]]
-            -- Default
-            Mie = {
-               Coefficients = {
-                 -- Reflection coefficients are given in km^-1
-                 Scattering = { 4.0e-3, 4.0e-3, 4.0e-3 },
-                 -- Extinction coefficients are a fraction of the Mie coefficients
-                 Extinction = { 4.0e-3/0.9, 4.0e-3/0.9, 4.0e-3/0.9 }
-               },
-               -- Height scale (atmosphere thickness for constant density) in Km
-               H_M = 1.2,
-               -- Mie Phase Function Value (G e [-1.0, 1.0]. If G = 1.0, Mie phase function = Rayleigh Phase Function)
-               G = 0.85
-            },
-            -- Clear Sky
-            -- Mie = {
-            --     Coefficients = {
-            --         Scattering = {20e-3, 20e-3, 20e-3},
-            --         Extinction = 1.0/0.9,
-            --      }
-            --     H_M = 1.2,
-            --     G = 0.76,
-            -- },
-            -- Cloudy
-            -- Mie = {
-            --     Coefficients = {
-            --         Scattering = {3e-3, 3e-3, 3e-3},
-            --         Extinction = 1.0/0.9,
-            --      }
-            --     H_M = 3.0,
-            --     G = 0.65,
-            -- },
-            Image = {
-               ToneMapping = jToneMapping,
-               Exposure = 0.4,
-               Background = 1.8,
-               Gamma = 1.85
-            },
-            Debug = {
-               PreCalculatedTextureScale = 1.0,
-               SaveCalculatedTextures = false
-            }
+  Identifier = "EarthAtmosphere",
+  Parent = transforms.Earth.Identifier,
+  Renderable = {
+    Type = "RenderableAtmosphere",
+      -- Atmosphere radius in Km
+      AtmosphereHeight = 6447.0 - 6377.0,
+      PlanetRadius = 6377.0,
+      PlanetAverageGroundReflectance = 0.1,
+      GroundRadianceEmission = 0.6,
+      SunIntensity = 6.9,
+      Rayleigh = {
+        Coefficients = {
+          -- Wavelengths are given in 10^-9m
+          Wavelengths = { 680, 550, 440 },
+          -- Reflection coefficients are given in km^-1
+          Scattering = { 5.8E-3, 13.5E-3, 33.1E-3 },
+          -- In Rayleigh scattering, the coefficients of absorption and scattering are the same.
         },
-        ShadowGroup = {
-            Source1 = {
-                Name = "Sun",
-                -- All radius in meters
-                Radius = 696.3E6
-            },
-            --Source2 = { Name = "Monolith", Radius = 0.01E6, },
-            Caster1 = { 
-                Name = "Moon",
-                -- All radius in meters
-                Radius = 1.737E6
-            }
-            --Caster2 = { Name = "Independency Day Ship", Radius = 0.0, }
-         }
+        -- Thichkness of atmosphere if its density were uniform, in Km
+        H_R = 8.0
+      },
+      --[[
+        Ozone = {
+        Coefficients = {
+          -- Extinction coefficients 
+          Extinction = {3.426, 8.298, 0.356}
+        },
+        H_O = 8.0,
+      },
+      ]]
+      -- Default
+      Mie = {
+          Coefficients = {
+            -- Reflection coefficients are given in km^-1
+            Scattering = { 4.0e-3, 4.0e-3, 4.0e-3 },
+            -- Extinction coefficients are a fraction of the Mie coefficients
+            Extinction = { 4.0e-3/0.9, 4.0e-3/0.9, 4.0e-3/0.9 }
+          },
+          -- Height scale (atmosphere thickness for constant density) in Km
+          H_M = 1.2,
+          -- Mie Phase Function Value (G e [-1.0, 1.0]. If G = 1.0, Mie phase function = Rayleigh Phase Function)
+          G = 0.85
+      },
+      -- Clear Sky
+      -- Mie = {
+      --     Coefficients = {
+      --         Scattering = {20e-3, 20e-3, 20e-3},
+      --         Extinction = 1.0/0.9,
+      --      }
+      --     H_M = 1.2,
+      --     G = 0.76,
+      -- },
+      -- Cloudy
+      -- Mie = {
+      --     Coefficients = {
+      --         Scattering = {3e-3, 3e-3, 3e-3},
+      --         Extinction = 1.0/0.9,
+      --      }
+      --     H_M = 3.0,
+      --     G = 0.65,
+      -- },
+      Debug = {
+          PreCalculatedTextureScale = 1.0,
+          SaveCalculatedTextures = false
     },
-    GUI = {
-        Name = "Earth Atmosphere",
-        Path = "/Solar System/Planets/Earth",
-        Description = [[ Atmosphere of Earth.]]
+    ShadowGroup = {
+      Sources = {
+        { Name = "Sun", Radius = 696.3E6 },
+        -- { Name = "Monolith", Radius = 0.01E6 }
+      },
+      Casters = {
+        { Name = "Moon", Radius = 1.737E6 },
+        -- { Name = "Independence Day Ship", Radius = 0.0 }
+      }
     }
+  },
+  GUI = {
+      Name = "Earth Atmosphere",
+      Path = "/Solar System/Planets/Earth",
+      Description = [[ Atmosphere of Earth.]]
+  }
 }
 
 assetHelper.registerSceneGraphNodesAndExport(asset, { Atmosphere })
 
 
 asset.meta = {
-    Name = "Earth Atmosphere",
-    Version = "1.0",
-    Description = [[ RenderableAtmosphere for Earth.]],
-    Author = "OpenSpace Team",
-    URL = "http://openspaceproject.com",
-    License = "MIT license",
-    Identifiers = {"EarthAtmosphere"}
+  Name = "Earth Atmosphere",
+  Version = "1.0",
+  Description = [[ RenderableAtmosphere for Earth.]],
+  Author = "OpenSpace Team",
+  URL = "http://openspaceproject.com",
+  License = "MIT license",
+  Identifiers = { "EarthAtmosphere" }
 }
diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset
index 476414303f..e66cb53329 100644
--- a/data/assets/scene/solarsystem/planets/earth/earth.asset
+++ b/data/assets/scene/solarsystem/planets/earth/earth.asset
@@ -15,30 +15,26 @@ local Earth = {
         PerformShading = false,
         Layers = {},
         ShadowGroup = {
-            Source1 = {
-                Name = "Sun",
-                -- All radius in meters
-                Radius = 696.3E6
+            Sources = {
+                { Name = "Sun", Radius = 696.3E6 },
             },
-            Caster1 = { 
-                Name = "Moon",
-                -- All radius in meters
-                Radius = 1.737E6
+            Casters = {
+                { Name = "Moon", Radius = 1.737E6 },
             }
         },
         Labels = {
             Enable = false,
             FileName = labelsPath .. "/Earth.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 41.0,
-            LabelsSize = 0.52,
+            LabelsFontSize = 40.0,
+            LabelsSize = 4.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            LabelsFadeOutEnabled = false,
-            FadeInStartingDistance = 50000.0,
-            FadeOutStartingDistance = 80000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 300000.0,
+            FadeOutStartingDistance = 10000.0,
             LabelsForceDomeRendering = true,
             LabelsDistanceEPS = 1500000.0,
             LabelsColor = { 1.0, 0.0, 0.0 }
diff --git a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/water/MODIS_Water_Mask.wms b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/water/MODIS_Water_Mask.wms
index 57df99fa5a..8c190c62e5 100644
--- a/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/water/MODIS_Water_Mask.wms
+++ b/data/assets/scene/solarsystem/planets/earth/map_service_configs/GIBS/water/MODIS_Water_Mask.wms
@@ -1,6 +1,6 @@
 <GDAL_WMS>
   <Service name="TMS">
-    <ServerUrl>https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Water_Mask/default/2013-08-21/250m/${z}/${y}/${x}.png</ServerUrl>
+    <ServerUrl>https://gibs.earthdata.nasa.gov/wmts/epsg4326/best/MODIS_Terra_L3_Land_Water_Mask/default/2015-08-21/250m/${z}/${y}/${x}.png</ServerUrl>
   </Service>
   <DataWindow>
     <UpperLeftX>-180.0</UpperLeftX>
diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
index c6079124a9..160b880246 100644
--- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset
@@ -26,15 +26,13 @@ local Moon = {
         SegmentsPerPatch = 64,
         Layers = {},
         ShadowGroup = {
-            Source1 = {
-                Name = sunAsset.Sun.Name,
-                Radius = 696.3E6
+            Sources = {
+                { Name = sunAsset.Sun.Identifier, Radius = 696.3E6 },
             },
-            Caster1 = { 
-                Name = earthAsset.Earth.Name,
-                Radius = 6.371E6
+            Casters = {
+                { Name = earthAsset.Earth.Identifier, Radius = 6.371E6 },
             }
-        },
+        },        
         Labels = {
             Enable = false,
             FileName = labelsPath .. "/moon.labels",
@@ -45,8 +43,9 @@ local Moon = {
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
+            LabelsFadeOutEnabled = true,
             FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            FadeOutStartingDistance = 100000.0,
             LabelsForceDomeRendering = true,
             LabelsDistanceEPS = 1350000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
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 635c56d9f0..2a91bf1261 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
@@ -3,7 +3,7 @@ local satelliteHelper = asset.require('util/tle_helper')
 local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 
-local url = "https://celestrak.com/satcat/tle.php?CATNR=25544"
+local url = "http://celestrak.com/satcat/tle.php?CATNR=25544"
 local identifier = "ISS"
 local filename = "ISS.txt"
 local nodes = {}
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 9d2587e1fd..9ebe43df49 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
@@ -3,7 +3,7 @@ local satelliteHelper = asset.require('util/tle_helper')
 local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 
-local url = "https://celestrak.com/satcat/tle.php?CATNR=27424"
+local url = "http://celestrak.com/satcat/tle.php?CATNR=27424"
 local identifier = "Aqua"
 local filename = "Aqua.txt"
 local nodes = {}
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 ff812053a1..2b251d229d 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
@@ -3,7 +3,7 @@ local satelliteHelper = asset.require('util/tle_helper')
 local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 
-local url = "https://celestrak.com/satcat/tle.php?CATNR=37849"
+local url = "http://celestrak.com/satcat/tle.php?CATNR=37849"
 local identifier = "SNPP"
 local filename = "SNPP.txt"
 local nodes = {}
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 0cdae52344..3d064550ee 100644
--- a/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+++ b/data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
@@ -3,7 +3,7 @@ local satelliteHelper = asset.require('util/tle_helper')
 local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
 local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
 
-local url = "https://celestrak.com/satcat/tle.php?CATNR=25994"
+local url = "http://celestrak.com/satcat/tle.php?CATNR=25994"
 local identifier = "Terra"
 local filename = "Terra.txt"
 local nodes = {}
diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
index 09c2888303..580e6c72ca 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
@@ -37,8 +37,9 @@ local Callisto = {
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
+            LabelsFadeOutEnabled = true,
             FadeInStartingDistance = 15000000.0,
-            FadeOutStartingDistance = 1000000.0,
+            FadeOutStartingDistance = 5000000.0,
             LabelsForceDomeRendering = true,
             LabelsDistanceEPS = 1350000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
index 6be8e60814..d3e29eba08 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
@@ -32,15 +32,16 @@ local Europa = {
             FileName = labelsPath .. "/europa.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
             LabelsFontSize = 40.0,
-            LabelsSize = 10.5,
+            LabelsSize = 10.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 15000000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 8000000.0,
+            FadeOutStartingDistance = 5000000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 700000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
index c93b359f3e..0e53d189d1 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
@@ -37,10 +37,11 @@ local Ganymede = {
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 15000000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 8000000.0,
+            FadeOutStartingDistance = 2250000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 1750000.0,
             LabelsColor = {1.0, 1.0, 0.0}
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
index e64cbfe431..20f2d5a2b6 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset
@@ -32,15 +32,16 @@ local Io = {
             FileName = labelsPath .. "/io.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
             LabelsFontSize = 40.0,
-            LabelsSize = 10.5,
+            LabelsSize = 10.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 15000000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 8500000.0,
+            FadeOutStartingDistance = 4000000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 1000000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
index 520a72d840..80f4bbd695 100644
--- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
@@ -17,7 +17,18 @@ local Jupiter = {
         Type = "RenderableGlobe",
         Radii = { 71492000.0, 71492000.0, 66854000.0 },
         SegmentsPerPatch = 64,
-        Layers = {}
+        Layers = {},
+        ShadowGroup = {
+            Sources = {
+                { Name = "Sun", Radius = 696.3E6 },
+            },
+            Casters = {
+                { Name = "Ganymede", Radius = 2631000 },
+                { Name = "Io", Radius = 1821600 },
+                { Name = "Europa", Radius = 1560800 },
+                { Name = "Callisto", Radius = 2410000 }
+            }
+        }
     },
     Tag = { "planet_solarSystem", "planet_giants" },
     GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
index 9f45e9804b..ff627cb98a 100644
--- a/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/mars/atmosphere.asset
@@ -8,53 +8,43 @@ local Atmosphere = {
     Parent = transforms.Mars.Identifier,
     Renderable = {
         Type = "RenderableAtmosphere",
-        Atmosphere = {
-            -- Atmosphere radius in Km
-            AtmosphereRadius = 3463.17495,
-            --PlanetRadius    = 3396.19,
-            --PlanetRadius = 3393.0,
-            PlanetRadius = 3386.190,
-            PlanetAverageGroundReflectance = 0.1,
-            GroundRadianceEmittion = 0.37,
-            SunIntensity = 13.1,
-            MieScatteringExtinctionPropCoefficient = 0.23862,
-            Rayleigh = {
-                Coefficients = {
-                    -- Wavelengths are given in 10^-9m
-                    Wavelengths = { 680, 550, 440 },
-                    -- Reflection coefficients are given in km^-1
-                    Scattering = { 19.918E-3, 13.57E-3, 5.75E-3 }
-                    -- In Rayleigh scattering, the coefficients of 
-                    -- absorption and scattering are the same.
-                },
-            -- Thichkness of atmosphere if its density were uniform, in Km
-                H_R = 10.43979
+        -- Atmosphere radius in Km
+        AtmosphereHeight = 3463.17495 - 3386.190,
+        PlanetRadius = 3386.190,
+        PlanetAverageGroundReflectance = 0.1,
+        GroundRadianceEmission = 0.37,
+        SunIntensity = 13.1,
+        MieScatteringExtinctionPropCoefficient = 0.23862,
+        Rayleigh = {
+            Coefficients = {
+                -- Wavelengths are given in 10^-9m
+                Wavelengths = { 680, 550, 440 },
+                -- Reflection coefficients are given in km^-1
+                Scattering = { 19.918E-3, 13.57E-3, 5.75E-3 }
+                -- In Rayleigh scattering, the coefficients of 
+                -- absorption and scattering are the same.
             },
-            -- Default
-            Mie = {
-                Coefficients = {
-                    -- Reflection coefficients are given in km^-1
-                    Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 },
-                    -- Extinction coefficients are a fraction of the Scattering coefficients
-                    Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 }
-                },
-                -- Mie Height scale (atmosphere thickness for constant density) in Km
-                H_M = 3.09526,
-                -- Mie Phase Function Value (G e [-1.0, 1.0]. 
-                -- If G = 1.0, Mie phase function = Rayleigh Phase Function)
-                G = 0.85
+        -- Thichkness of atmosphere if its density were uniform, in Km
+            H_R = 10.43979
+        },
+        -- Default
+        Mie = {
+            Coefficients = {
+                -- Reflection coefficients are given in km^-1
+                Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 },
+                -- Extinction coefficients are a fraction of the Scattering coefficients
+                Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 }
             },
-            Image = {
-                ToneMapping = jToneMapping,
-                Exposure = 0.4,
-                Background = 1.8,
-                Gamma = 1.85
-            },
-            Debug = {
-                -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....)
-                PreCalculatedTextureScale = 1.0,
-                SaveCalculatedTextures = false
-            }
+            -- Mie Height scale (atmosphere thickness for constant density) in Km
+            H_M = 3.09526,
+            -- Mie Phase Function Value (G e [-1.0, 1.0]. 
+            -- If G = 1.0, Mie phase function = Rayleigh Phase Function)
+            G = 0.85
+        },
+        Debug = {
+            -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....)
+            PreCalculatedTextureScale = 1.0,
+            SaveCalculatedTextures = false
         }
     },
     GUI = {
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset b/data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
similarity index 100%
rename from data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset
rename to data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirise.asset
diff --git a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
index 0fa9c56943..01adfc48b6 100644
--- a/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
+++ b/data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
@@ -4,7 +4,7 @@ local globeIdentifier = asset.require("./../../mars").Mars.Identifier
 local layer = {
     Identifier = "HiRISE-LS-DEM",
     Name = "HiRISE Local Set DEM",
-    FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_DEM.wms",   
+    FilePath = mapServiceConfigs .. "/ESRI/HiRISE/HiRISE_DEM.dem",
     Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most
         powerful camera ever sent to another planet, one of six instruments onboard the
         Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have
diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.tif b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.dem
similarity index 87%
rename from data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.tif
rename to data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.dem
index f557be2ac1..8446fe69d3 100644
--- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.tif
+++ b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.dem
@@ -1,6 +1,6 @@
 <GDAL_WMS>
   <Service name="TMS">
-    <ServerUrl>http://astro.arcgis.com/arcgis/rest/services/OnMars/HiRISE_DEM/ImageServer/tile/${z}/${y}/${x}</ServerUrl>
+    <ServerUrl>http://astro.arcgis.com/arcgis/rest/services/OnMars/HiRISE_DEM/raw/tile/${z}/${y}/${x}</ServerUrl>
   </Service>
   <DataWindow>
     <UpperLeftX>-180</UpperLeftX> <UpperLeftY>90</UpperLeftY>
@@ -11,7 +11,7 @@
   <Projection>GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190,0]],PRIMEM["Reference_Meridian",0],UNIT["Degree",0.0174532925199433]]</Projection>
   <BlockSizeX>512</BlockSizeX> <BlockSizeY>512</BlockSizeY>
   <BandsCount>1</BandsCount> <DataType>Int16</DataType>
-  <DataValues NoData="-32768" Min="-8528" Max="21226"/>
+  <DataValues NoData="0" Min="-8528" Max="21226"/>
   <MaxConnections>5</MaxConnections>
   <ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
 </GDAL_WMS>
diff --git a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.wms b/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.wms
deleted file mode 100644
index bedcb068e0..0000000000
--- a/data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/HiRISE/HiRISE_DEM.wms
+++ /dev/null
@@ -1,17 +0,0 @@
-<GDAL_WMS>
-  <Service name="TMS">
-    <ServerUrl>http://astro.arcgis.com/arcgis/rest/services/OnMars/HiRISE_DEM/ImageServer/tile/${z}/${y}/${x}</ServerUrl>
-  </Service>
-  <DataWindow>
-    <UpperLeftX>-180</UpperLeftX> <UpperLeftY>90</UpperLeftY>
-    <LowerRightX>180</LowerRightX> <LowerRightY>-90</LowerRightY>
-    <SizeX>20971520</SizeX> <SizeY>10485760</SizeY>
-    <TileLevel>15</TileLevel> <YOrigin>top</YOrigin>
-  </DataWindow>
-  <Projection>GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190,0]],PRIMEM["Reference_Meridian",0],UNIT["Degree",0.0174532925199433]]</Projection>
-  <BlockSizeX>512</BlockSizeX> <BlockSizeY>512</BlockSizeY>
-  <BandsCount>1</BandsCount> <DataType>Int16</DataType>
-  <DataValues NoData="0" Min="-10000" Max="10000"></DataValues>
-  <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 8bdd08008d..e96320563a 100644
--- a/data/assets/scene/solarsystem/planets/mars/mars.asset
+++ b/data/assets/scene/solarsystem/planets/mars/mars.asset
@@ -27,15 +27,16 @@ local Mars = {
             FileName = labelsPath .. "/mars.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
             LabelsFontSize = 14.0,
-            LabelsSize = 8.0,
+            LabelsSize = 9.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 2000000.0,
+            FadeOutStartingDistance = 750000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 2500000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
new file mode 100644
index 0000000000..a339e5b425
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/deimos_viking.asset
@@ -0,0 +1,29 @@
+local globeIdentifier = asset.require("./../../deimos").Deimos.Identifier
+
+local layer = {
+    Identifier = "Deimos_Global_Mosaic_USGS",
+    Name = "Deimos Global Mosaic [USGS]",
+    Enabled = true,
+    FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Deimos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90",
+    Description = [[ This Viking-based cylindrical map of Deimos was created by Philip
+    Stooke with the assistance of Chris Jongkind and Megan Arntz. Control is based on a
+    shape model and mosaic by Peter Thomas and colleagues at Cornell University. Date
+    released 26 October 2001. (Description from URL)]]
+}
+
+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.export("layer", layer)
+
+
+asset.meta = {
+    Name = "Deimos Global Mosaic [USGS]",
+    Version = "1.0",
+    Author = "Philip Stooke/NASA",
+    URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html",
+    License = "NASA/PDS",
+    Identifiers = {'Deimos_Global_Mosaic_USGS'}
+
+}
diff --git a/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
new file mode 100644
index 0000000000..6a0c5b8d9a
--- /dev/null
+++ b/data/assets/scene/solarsystem/planets/mars/moons/layers/colorlayers/phobos_viking.asset
@@ -0,0 +1,26 @@
+local globeIdentifier = asset.require("./../../phobos").Phobos.Identifier
+
+local layer = {
+    Identifier = "Phobos_Global_Shaded_Relief_USGS",
+    Name = "Phobos Global Shaded Relief [USGS]",
+    Enabled = true,
+    FilePath = "WMS:https://wms.wr.usgs.gov/cgi-bin/mapserv?map=/maps/mars/phobos_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=Phobos_Simple_Cylindrical_Rasters&SRS=EPSG:4326&BBOX=-180,-90,360,90",
+    Description = [[ Viking-base Phobos shaded relief created by USGS.]]
+}
+
+asset.onInitialize(function () 
+    openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.export("layer", layer)
+
+
+asset.meta = {
+    Name = "Phobos Global Shaded Relief [USGS]",
+    Version = "1.0",
+    Author = "USGS/NASA",
+    URL = "https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html",
+    License = "NASA/PDS",
+    Identifiers = {'Phobos_Global_Shaded_Relief_USGS'}
+
+}
diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
index c2a9ca1584..4ce1efa083 100644
--- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset
+++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset
@@ -27,13 +27,15 @@ local Mercury = {
             Enable = false,
             FileName = labelsPath .. "/Mercury.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 40.0,
+            LabelsFontSize = 22.0,
             LabelsSize = 10.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
-            FadeInStartingDistance = 40000000.0,
-            FadeOutStartingDistance = 80000.0,
+            LabelsFadeInEnabled = true,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 5000000.0,
+            FadeOutStartingDistance = 1800000.0,
             LabelsForceDomeRendering = true,
             LabelsDistanceEPS = 1500000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset
index d7ea310c0b..2c80f258c5 100644
--- a/data/assets/scene/solarsystem/planets/planets.asset
+++ b/data/assets/scene/solarsystem/planets/planets.asset
@@ -14,6 +14,8 @@ asset.require('./earth/moon/trail')
 
 asset.require('./mars/mars')
 asset.require('./mars/atmosphere')
+asset.require('./mars/moons/phobos')
+asset.require('./mars/moons/deimos')
 
 asset.require('./jupiter/jupiter')
 asset.require('./jupiter/major_moons')
diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
index bee85a6396..34b711430c 100644
--- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
@@ -29,16 +29,17 @@ local Dione = {
             Enable = false,
             FileName = labelsPath .. "/dione.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 14.0,
+            LabelsFontSize = 32.0,
             LabelsSize = 8.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 3500000.0,
             FadeOutStartingDistance = 1000000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 200000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
index bb66e85ba2..4dd5e1cff5 100644
--- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
@@ -29,16 +29,17 @@ local Enceladus = {
             Enable = false,
             FileName = labelsPath .. "/enceladus.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 14.0,
+            LabelsFontSize = 22.0,
             LabelsSize = 8.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 1000000.0,
+            FadeOutStartingDistance = 500000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 100000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
index ec01d7b69a..fbe22a9aec 100644
--- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
@@ -29,16 +29,17 @@ local Iapetus = {
             Enable = false,
             FileName = labelsPath .. "/iapetus.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 14.0,
+            LabelsFontSize = 30.0,
             LabelsSize = 8.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 3500000.0,
+            FadeOutStartingDistance = 600000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 250000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
index 1ba8d19d3f..7f1b4efab1 100644
--- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
@@ -35,10 +35,11 @@ local Mimas = {
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 1000000.0,
+            FadeOutStartingDistance = 400000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 25000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
index fbbe12a40d..83792b1a33 100644
--- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
@@ -29,16 +29,17 @@ local Rhea = {
             Enable = false,
             FileName = labelsPath .. "/rhea.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 14.0,
+            LabelsFontSize = 40.0,
             LabelsSize = 8.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 2500000.0,
             FadeOutStartingDistance = 1000000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 250000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
index e4440665df..18a97e75c3 100644
--- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
@@ -29,16 +29,17 @@ local Tethys = {
             Enable = false,
             FileName = labelsPath .. "/tethys.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
-            LabelsFontSize = 14.0,
+            LabelsFontSize = 24.0,
             LabelsSize = 8.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 1500000.0,
+            FadeOutStartingDistance = 500000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 1350000.0,
+            LabelsDistanceEPS = 200000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
index dd947f3214..eaa851c833 100644
--- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
@@ -30,13 +30,14 @@ local Titan = {
             FileName = labelsPath .. "/titan.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
             LabelsFontSize = 14.0,
-            LabelsSize = 8.0,
+            LabelsSize = 10.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 7500000.0,
+            FadeOutStartingDistance = 6000000.0,
             LabelsForceDomeRendering = true,
             LabelsDistanceEPS = 1350000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
diff --git a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
index 5742ade4a8..71a439877b 100644
--- a/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
+++ b/data/assets/scene/solarsystem/planets/venus/atmosphere.asset
@@ -8,51 +8,42 @@ local Atmosphere = {
     Parent = transforms.Venus.Identifier,
     Renderable = {
         Type = "RenderableAtmosphere",
-        Atmosphere = {
-            -- Atmosphere radius in Km
-            AtmosphereRadius = 6121.9,
-            PlanetRadius = 6051.9,
-            PlanetAverageGroundReflectance = 0.018,
-            GroundRadianceEmittion = 0.8,
-            SunIntensity = 11.47,
-            --MieScatteringExtinctionPropCoefficient = 0.23862,
-            Rayleigh = {
-                Coefficients = {
-                    -- Wavelengths are given in 10^-9m
-                    Wavelengths = { 680, 550, 440 },
-                    -- Reflection coefficients are given in km^-1
-                    Scattering = { 19.518E-3, 13.83E-3, 3.65E-3 }
-                    -- In Rayleigh scattering, the coefficients of 
-                    -- absorption and scattering are the same.
-                },
-            -- Thichkness of atmosphere if its density were uniform, in Km
-                H_R = 3.53
+        -- Atmosphere radius in Km
+        AtmosphereHeight = 6121.9 - 6051.9,
+        PlanetRadius = 6051.9,
+        PlanetAverageGroundReflectance = 0.018,
+        GroundRadianceEmission = 0.8,
+        SunIntensity = 11.47,
+        Rayleigh = {
+            Coefficients = {
+                -- Wavelengths are given in 10^-9m
+                Wavelengths = { 680, 550, 440 },
+                -- Reflection coefficients are given in km^-1
+                Scattering = { 19.518E-3, 13.83E-3, 3.65E-3 }
+                -- In Rayleigh scattering, the coefficients of 
+                -- absorption and scattering are the same.
             },
-            -- Default
-            Mie = {
-                Coefficients = {
-                    -- Reflection coefficients are given in km^-1
-                    Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 },
-                    -- Extinction coefficients are a fraction of the Scattering coefficients
-                    Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 }
-                },
-                -- Mie Height scale (atmosphere thickness for constant density) in Km
-                H_M = 5.42,
-                -- Mie Phase Function Value (G e [-1.0, 1.0]. 
-                -- If G = 1.0, Mie phase function = Rayleigh Phase Function)
-                G = 0.85
+        -- Thichkness of atmosphere if its density were uniform, in Km
+            H_R = 3.53
+        },
+        -- Default
+        Mie = {
+            Coefficients = {
+                -- Reflection coefficients are given in km^-1
+                Scattering = { 53.61771e-3, 53.61771e-3, 53.61771e-3 },
+                -- Extinction coefficients are a fraction of the Scattering coefficients
+                Extinction = { 53.61771e-3/0.98979, 53.61771e-3/0.98979, 53.61771e-3/0.98979 }
             },
-            Image = {
-                ToneMapping = jToneMapping,
-                Exposure = 0.4,
-                Background = 1.8,
-                Gamma = 1.85
-            },
-            Debug = {
-                -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....)
-                PreCalculatedTextureScale = 1.0,
-                SaveCalculatedTextures = false
-            }
+            -- Mie Height scale (atmosphere thickness for constant density) in Km
+            H_M = 5.42,
+            -- Mie Phase Function Value (G e [-1.0, 1.0]. 
+            -- If G = 1.0, Mie phase function = Rayleigh Phase Function)
+            G = 0.85
+        },
+        Debug = {
+            -- PreCalculatedTextureScale is a float from 1.0 to N, with N > 0.0 and N in Naturals (i.e., 1, 2, 3, 4, 5....)
+            PreCalculatedTextureScale = 1.0,
+            SaveCalculatedTextures = false
         }
     },
     GUI = {
diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset
index 0f4c1cbe9f..b1bb529e58 100644
--- a/data/assets/scene/solarsystem/planets/venus/venus.asset
+++ b/data/assets/scene/solarsystem/planets/venus/venus.asset
@@ -30,15 +30,17 @@ local Venus = {
             FileName = labelsPath .. "/venus.labels",
             LabelAlignmentOption = "Horizontally", -- or Circularly
             LabelsFontSize = 40.0,
-            LabelsSize = 12.0,
+            LabelsSize = 10.0,
             LabelsMinSize = 1.0,
             LabelsMaxSize = 1500.0,
             ProximityEnabled = false,
             LabelsFadeInEnabled = true,
-            FadeInStartingDistance = 500000.0,
-            FadeOutStartingDistance = 1000000.0,
+            LabelsFadeInEnabled = true,
+            LabelsFadeOutEnabled = true,
+            FadeInStartingDistance = 7000000.0,
+            FadeOutStartingDistance = 2000000.0,
             LabelsForceDomeRendering = true,
-            LabelsDistanceEPS = 3500000.0,
+            LabelsDistanceEPS = 4000000.0,
             LabelsColor = { 1.0, 1.0, 0.0 }
         }
     },
diff --git a/data/assets/scene/solarsystem/sun/habitablezone.asset b/data/assets/scene/solarsystem/sun/habitablezone.asset
new file mode 100644
index 0000000000..1816f4500b
--- /dev/null
+++ b/data/assets/scene/solarsystem/sun/habitablezone.asset
@@ -0,0 +1,35 @@
+local assetHelper = asset.require("util/asset_helper")
+local transforms = asset.require("./transforms")
+local textures = asset.require('scene/milkyway/habitable_zones/habitable_zone_textures').TexturesPath
+
+local HabitableZone = {
+    Identifier = "SunHabitableZone",
+    Parent =  transforms.SunECLIPJ2000.Identifier,
+    Renderable = {
+        Type = "RenderableHabitableZone",
+        Enabled = false,
+        Texture = textures .. "/hot_to_cold_faded.png",
+        EffectiveTemperature = 5780, -- Kelvin
+        Luminosity = 1, -- solar
+        Opacity = 0.1,
+        Optimistic = true
+    },
+    GUI = {
+        Name = "Sun Habitable Zone",
+        Path = "/Solar System/Sun",
+        Description = "Habitable zone for the sun in our solar system."
+    }
+}
+
+assetHelper.registerSceneGraphNodesAndExport(asset, { HabitableZone })
+
+asset.meta = {
+    Name = "Sun Habitable Zone",
+    Version = "1.0",
+    Description = [[ The habitable zone around our sun, computed using formula and 
+    coefficients by Kopparapu et al. (2015) https://arxiv.org/abs/1404.5292]],
+    Author = "OpenSpace Team",
+    URL = "http://openspaceproject.com",
+    License = "MIT license",
+    Identifiers = {"SunHabitableZone"}
+}
diff --git a/data/assets/util/debug_helper.asset b/data/assets/util/debug_helper.asset
index f01d50824d..68b04f3197 100644
--- a/data/assets/util/debug_helper.asset
+++ b/data/assets/util/debug_helper.asset
@@ -41,7 +41,7 @@ local addGrid = function (specification)
             Type = "RenderableSphericalGrid",
             Enabled = true,
             LineWidth = 2.0,
-            GridColor = color
+            Color = color
         },
         GUI = {
             Name = name,
diff --git a/data/assets/util/generate_bookmarks.asset b/data/assets/util/generate_bookmarks.asset
index b500522d92..d17307d5a6 100644
--- a/data/assets/util/generate_bookmarks.asset
+++ b/data/assets/util/generate_bookmarks.asset
@@ -36,7 +36,7 @@ local getBookmarks = function (guiPath, bookmarkfile)
               Type = 'RenderableSphericalGrid',
               Enabled = false,
               Opacity = 0.3,
-              GridColor = { 0.3, 0.84, 1.0},
+              Color = { 0.3, 0.84, 1.0},
               LineWidth = linewidth
           },
           GUI = {
diff --git a/data/assets/util/slide_deck_helper.asset b/data/assets/util/slide_deck_helper.asset
index b434466ddf..4698b7c178 100644
--- a/data/assets/util/slide_deck_helper.asset
+++ b/data/assets/util/slide_deck_helper.asset
@@ -60,9 +60,9 @@ local setCurrentSlide = function (deck, index, interpolationDuration)
             opacity = 1
         end
         if interpolationDuration == 0 then
-            openspace.setPropertyValueSingle("ScreenSpace." .. identifier .. ".Alpha", opacity)
+            openspace.setPropertyValueSingle("ScreenSpace." .. identifier .. ".Opacity", opacity)
         else
-            openspace.setPropertyValueSingle("ScreenSpace." .. identifier .. ".Alpha", opacity, interpolationDuration, "QuadraticEaseOut")
+            openspace.setPropertyValueSingle("ScreenSpace." .. identifier .. ".Opacity", opacity, interpolationDuration, "QuadraticEaseOut")
         end
     end
 end
@@ -84,13 +84,13 @@ local toggleSlides = function (deck, interpolationDuration)
                 opacity = 1
             end
             openspace.setPropertyValueSingle(
-                "ScreenSpace." .. identifier .. ".Alpha", opacity,
+                "ScreenSpace." .. identifier .. ".Opacity", opacity,
                 interpolationDuration, "QuadraticEaseOut")
         end
     else 
         for i, identifier in pairs(deck.SlideIdentifiers) do
             openspace.setPropertyValueSingle(
-                "ScreenSpace." .. identifier .. ".Alpha", 0,
+                "ScreenSpace." .. identifier .. ".Opacity", 0,
                 interpolationDuration, "QuadraticEaseOut")
         end
     end
diff --git a/data/profiles/asteroids.profile b/data/profiles/asteroids.profile
index 70bbb0af63..8e6cb40535 100644
--- a/data/profiles/asteroids.profile
+++ b/data/profiles/asteroids.profile
@@ -1,6 +1,8 @@
 {
   "assets": [
     "base",
+    "scene/solarsystem/interstellar/c-2019_q4_borisov",
+    "scene/solarsystem/interstellar/oumuamua",
     "scene/solarsystem/sssb/amor_asteroid",
     "scene/solarsystem/sssb/apollo_asteroid",
     "scene/solarsystem/sssb/aten_asteroid",
diff --git a/data/profiles/mars.profile b/data/profiles/mars.profile
index 56d2dd82a6..87493a7562 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.OnMarsHiRISE-LS-DEM.Settings.Offset', -470.800006);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISE-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: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});"
     },
     {
       "documentation": "Disable Mars layer settings used for insight EDL",
@@ -47,7 +47,7 @@
       "is_local": false,
       "key": "SHIFT+I",
       "name": "Unset Insight Landing",
-      "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISE-LS-DEM.Enabled', false);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISE-LS.Enabled', false);"
+      "script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', 0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', false);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', false);"
     },
     {
       "documentation": "Sets time and layers for Perseverance landing",
@@ -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.OnMarsHiRISE-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.OnMarsHiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.OnMarsHiRISE-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', -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});"
     }
   ],
   "mark_nodes": [
@@ -77,6 +77,6 @@
   },
   "version": {
     "major": 1,
-    "minor": 0
+    "minor": 1
   }
 }
\ No newline at end of file
diff --git a/data/profiles/newhorizons.profile b/data/profiles/newhorizons.profile
index abe410ecc9..7f30857769 100644
--- a/data/profiles/newhorizons.profile
+++ b/data/profiles/newhorizons.profile
@@ -42,7 +42,7 @@
       "is_local": false,
       "key": "A",
       "name": "Focus on New Horizons",
-      "script": "\"openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'NewHorizons');openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);"
+      "script": "openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'NewHorizons');openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);"
     },
     {
       "documentation": "Anchor at New Horizons, Aim at Pluto",
@@ -194,7 +194,7 @@
       "is_local": false,
       "key": "SHIFT+T",
       "name": "Toggle Shadows",
-      "script": "openspace.setPropertyValueSingle('Scene.PlutoShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoShadow.Renderable.Enabled'));"
+      "script": "openspace.setPropertyValueSingle('Scene.PlutoShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoShadow.Renderable.Enabled'));openspace.setPropertyValueSingle('Scene.CharonShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.CharonShadow.Renderable.Enabled'));"
     },
     {
       "documentation": "Toggles the trail of New Horizons",
@@ -243,4 +243,4 @@
     "major": 1,
     "minor": 0
   }
-}
\ No newline at end of file
+}
diff --git a/data/tasks/sessFileVersion.task b/data/tasks/sessFileVersion.task
new file mode 100644
index 0000000000..61fae36c7f
--- /dev/null
+++ b/data/tasks/sessFileVersion.task
@@ -0,0 +1,6 @@
+return {
+    {
+        Type = "ConvertRecFileVersionTask",
+        InputFilePath = "../../recordings/test-libcurl-certificate.osrec"
+    }
+}
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
new file mode 100644
index 0000000000..0010d35d22
--- /dev/null
+++ b/ext/CMakeLists.txt
@@ -0,0 +1,76 @@
+##########################################################################################
+#                                                                                        #
+# 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_CMAKE_EXT_DIR}/set_openspace_compile_settings.cmake)
+
+# System libraries
+if (APPLE)
+  begin_dependency("Core Libraries")
+  add_library(external-system-apple INTERFACE)
+
+  target_include_directories(external-system-apple INTERFACE "/Developer/Headers/FlatCarbon")
+  find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
+  find_library(CARBON_LIBRARY Carbon REQUIRED)
+  find_library(COCOA_LIBRARY Cocoa REQUIRED) # This was Carbon before
+  find_library(APP_SERVICES_LIBRARY ApplicationServices REQUIRED)
+  find_library(APPKIT_LIBRARY AppKit REQUIRED)
+  mark_as_advanced(COREFOUNDATION_LIBRARY CARBON_LIBRARY COCOA_LIBRARY
+    APP_SERVICES_LIBRARY APPKIT_LIBRARY
+  )
+  target_link_libraries(external-system-apple INTERFACE # This was PUBLIC before
+    ${CARBON_LIBRARY} ${COREFOUNDATION_LIBRARY}
+    ${COCOA_LIBRARY} ${APP_SERVICES_LIBRARY}
+    ${APPKIT_LIBRARY}
+  )
+  end_dependency()
+endif ()
+
+# Ghoul
+add_subdirectory(ghoul)
+set_folder_location(Lua "External")
+set_folder_location(lz4 "External")
+set_folder_location(GhoulTest "Unit Tests")
+
+# Spice
+begin_dependency("Spice")
+add_subdirectory(spice)
+set_folder_location(spice "External")
+end_dependency()
+
+# Curl
+begin_dependency("CURL")
+add_library(external-curl INTERFACE)
+if (WIN32)
+  target_include_directories(external-curl INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/curl/include")
+  target_link_libraries(external-curl INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/curl/lib/libcurl.lib")
+  target_compile_definitions(external-curl INTERFACE "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB")
+else ()
+  find_package(CURL)
+  if (CURL_FOUND)
+    target_include_directories(external-curl INTERFACE ${CURL_INCLUDE_DIRS})
+    target_link_libraries(external-curl INTERFACE ${CURL_LIBRARIES})
+    target_compile_definitions(external-curl INTERFACE "OPENSPACE_CURL_ENABLED")
+  endif ()
+endif ()
+end_dependency()
diff --git a/ext/json/json.hpp b/ext/json/json.hpp
index 5003a4fa2d..a70aaf8cbc 100644
--- a/ext/json/json.hpp
+++ b/ext/json/json.hpp
@@ -1,7 +1,7 @@
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.6.1
+|  |  |__   |  |  | | | |  version 3.9.1
 |_____|_____|_____|_|___|  https://github.com/nlohmann/json
 
 Licensed under the MIT License <http://opensource.org/licenses/MIT>.
@@ -31,12 +31,10 @@ SOFTWARE.
 #define INCLUDE_NLOHMANN_JSON_HPP_
 
 #define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 6
+#define NLOHMANN_JSON_VERSION_MINOR 9
 #define NLOHMANN_JSON_VERSION_PATCH 1
 
 #include <algorithm> // all_of, find, for_each
-#include <cassert> // assert
-#include <ciso646> // and, not, or
 #include <cstddef> // nullptr_t, ptrdiff_t, size_t
 #include <functional> // hash, less
 #include <initializer_list> // initializer_list
@@ -58,7 +56,6 @@ SOFTWARE.
 
 #include <algorithm> // transform
 #include <array> // array
-#include <ciso646> // and, not
 #include <forward_list> // forward_list
 #include <iterator> // inserter, front_inserter, end
 #include <map> // map
@@ -105,6 +102,2216 @@ struct position_t
 } // namespace detail
 } // namespace nlohmann
 
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#include <utility> // pair
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ *
+ * To the extent possible under law, the author(s) have dedicated all
+ * copyright and related and neighboring rights to this software to
+ * the public domain worldwide. This software is distributed without
+ * any warranty.
+ *
+ * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * SPDX-License-Identifier: CC0-1.0
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 13)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 13
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_CONCAT3_EX)
+    #undef JSON_HEDLEY_CONCAT3_EX
+#endif
+#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
+
+#if defined(JSON_HEDLEY_CONCAT3)
+    #undef JSON_HEDLEY_CONCAT3
+#endif
+#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if \
+    defined(__TI_COMPILER_VERSION__) && \
+    ( \
+      defined(__TMS470__) || defined(__TI_ARM__) || \
+      defined(__MSP430__) || \
+      defined(__TMS320C2000__) \
+    )
+#if (__TI_COMPILER_VERSION__ >= 16000000)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #undef JSON_HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
+    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
+    !defined(__COMPCERT__)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_IAR_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    else
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    endif
+#  endif
+#endif
+#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
+    ((T) (expr)) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("diag_suppress=Pe137") \
+    JSON_HEDLEY_DIAGNOSTIC_POP \
+#  else
+#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
+#  endif
+#else
+#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(JSON_HEDLEY_ASSUME)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+#if !defined(JSON_HEDLEY_ASSUME)
+    #if defined(JSON_HEDLEY_UNREACHABLE)
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
+    #endif
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #if  \
+        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
+    #else
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+    #endif
+#else
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
+#endif
+#if \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
+#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
+#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
+#elif \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
+  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+#  define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
+    )
+#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+#  define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
+    )
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define JSON_HEDLEY_PRIVATE
+#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+#  if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    ( \
+      defined(__TI_EABI__) && \
+      ( \
+        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
+      ) \
+    )
+#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+#  else
+#    define JSON_HEDLEY_PRIVATE
+#    define JSON_HEDLEY_PUBLIC
+#  endif
+#  define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       ( \
+          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
+          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
+          !defined(JSON_HEDLEY_PGI_VERSION) && \
+          !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
+       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
+       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0)
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum)
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+    #define JSON_HAS_CPP_20
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+    #define JSON_HAS_CPP_14
+#endif
+
+// disable float-equal warnings on GCC/clang
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdocumentation"
+#endif
+
+// allow to disable exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// allow to override assert
+#if !defined(JSON_ASSERT)
+    #include <cassert> // assert
+    #define JSON_ASSERT(x) assert(x)
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer,     \
+             class BinaryType>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer, BinaryType>
+
+// Macros to simplify conversion from/to types
+
+#define NLOHMANN_JSON_EXPAND( x ) x
+#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
+#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
+        NLOHMANN_JSON_PASTE64, \
+        NLOHMANN_JSON_PASTE63, \
+        NLOHMANN_JSON_PASTE62, \
+        NLOHMANN_JSON_PASTE61, \
+        NLOHMANN_JSON_PASTE60, \
+        NLOHMANN_JSON_PASTE59, \
+        NLOHMANN_JSON_PASTE58, \
+        NLOHMANN_JSON_PASTE57, \
+        NLOHMANN_JSON_PASTE56, \
+        NLOHMANN_JSON_PASTE55, \
+        NLOHMANN_JSON_PASTE54, \
+        NLOHMANN_JSON_PASTE53, \
+        NLOHMANN_JSON_PASTE52, \
+        NLOHMANN_JSON_PASTE51, \
+        NLOHMANN_JSON_PASTE50, \
+        NLOHMANN_JSON_PASTE49, \
+        NLOHMANN_JSON_PASTE48, \
+        NLOHMANN_JSON_PASTE47, \
+        NLOHMANN_JSON_PASTE46, \
+        NLOHMANN_JSON_PASTE45, \
+        NLOHMANN_JSON_PASTE44, \
+        NLOHMANN_JSON_PASTE43, \
+        NLOHMANN_JSON_PASTE42, \
+        NLOHMANN_JSON_PASTE41, \
+        NLOHMANN_JSON_PASTE40, \
+        NLOHMANN_JSON_PASTE39, \
+        NLOHMANN_JSON_PASTE38, \
+        NLOHMANN_JSON_PASTE37, \
+        NLOHMANN_JSON_PASTE36, \
+        NLOHMANN_JSON_PASTE35, \
+        NLOHMANN_JSON_PASTE34, \
+        NLOHMANN_JSON_PASTE33, \
+        NLOHMANN_JSON_PASTE32, \
+        NLOHMANN_JSON_PASTE31, \
+        NLOHMANN_JSON_PASTE30, \
+        NLOHMANN_JSON_PASTE29, \
+        NLOHMANN_JSON_PASTE28, \
+        NLOHMANN_JSON_PASTE27, \
+        NLOHMANN_JSON_PASTE26, \
+        NLOHMANN_JSON_PASTE25, \
+        NLOHMANN_JSON_PASTE24, \
+        NLOHMANN_JSON_PASTE23, \
+        NLOHMANN_JSON_PASTE22, \
+        NLOHMANN_JSON_PASTE21, \
+        NLOHMANN_JSON_PASTE20, \
+        NLOHMANN_JSON_PASTE19, \
+        NLOHMANN_JSON_PASTE18, \
+        NLOHMANN_JSON_PASTE17, \
+        NLOHMANN_JSON_PASTE16, \
+        NLOHMANN_JSON_PASTE15, \
+        NLOHMANN_JSON_PASTE14, \
+        NLOHMANN_JSON_PASTE13, \
+        NLOHMANN_JSON_PASTE12, \
+        NLOHMANN_JSON_PASTE11, \
+        NLOHMANN_JSON_PASTE10, \
+        NLOHMANN_JSON_PASTE9, \
+        NLOHMANN_JSON_PASTE8, \
+        NLOHMANN_JSON_PASTE7, \
+        NLOHMANN_JSON_PASTE6, \
+        NLOHMANN_JSON_PASTE5, \
+        NLOHMANN_JSON_PASTE4, \
+        NLOHMANN_JSON_PASTE3, \
+        NLOHMANN_JSON_PASTE2, \
+        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
+#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
+#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
+#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
+#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
+#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
+#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
+#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
+#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
+#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
+#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
+#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
+#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
+#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
+#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
+#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
+#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
+#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
+#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
+#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
+#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
+#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
+#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
+#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
+#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
+#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
+#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
+#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
+#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
+#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
+#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
+#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
+#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
+#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
+#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
+#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
+#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
+#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
+#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
+#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
+#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
+#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
+#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
+#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
+#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
+#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
+#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
+#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
+#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
+#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
+#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
+#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
+#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
+#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
+#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
+#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
+#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
+#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
+#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
+#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
+#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
+#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
+#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
+#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
+
+#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
+#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_USE_IMPLICIT_CONVERSIONS 1
+#endif
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_EXPLICIT
+#else
+    #define JSON_EXPLICIT explicit
+#endif
+
 
 namespace nlohmann
 {
@@ -146,6 +2353,7 @@ class exception : public std::exception
 {
   public:
     /// returns the explanatory string
+    JSON_HEDLEY_RETURNS_NON_NULL
     const char* what() const noexcept override
     {
         return m.what();
@@ -155,6 +2363,7 @@ class exception : public std::exception
     const int id;
 
   protected:
+    JSON_HEDLEY_NON_NULL(3)
     exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
 
     static std::string name(const std::string& ename, int id_)
@@ -194,6 +2403,7 @@ json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vect
 json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
 json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
 json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
+json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed.
 
 @note For an input with n bytes, 1 is the index of the first character and n+1
       is the index of the terminating null byte or the end of file. This also
@@ -307,6 +2517,7 @@ class invalid_iterator : public exception
     }
 
   private:
+    JSON_HEDLEY_NON_NULL(3)
     invalid_iterator(int id_, const char* what_arg)
         : exception(id_, what_arg) {}
 };
@@ -360,6 +2571,7 @@ class type_error : public exception
     }
 
   private:
+    JSON_HEDLEY_NON_NULL(3)
     type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
 };
 
@@ -380,7 +2592,7 @@ json.exception.out_of_range.403 | key 'foo' not found | The provided key was not
 json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
 json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
 json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
-json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. |
+json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) |
 json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
 json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
 
@@ -406,6 +2618,7 @@ class out_of_range : public exception
     }
 
   private:
+    JSON_HEDLEY_NON_NULL(3)
     out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
 };
 
@@ -443,6 +2656,7 @@ class other_error : public exception
     }
 
   private:
+    JSON_HEDLEY_NON_NULL(3)
     other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
 };
 }  // namespace detail
@@ -450,161 +2664,9 @@ class other_error : public exception
 
 // #include <nlohmann/detail/macro_scope.hpp>
 
-
-#include <utility> // pair
-
-// This file contains all internal macro definitions
-// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
-
-// exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #endif
-#endif
-
-// disable float-equal warnings on GCC/clang
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-
-// disable documentation warnings on clang
-#if defined(__clang__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wdocumentation"
-#endif
-
-// allow for portable deprecation warnings
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #define JSON_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER)
-    #define JSON_DEPRECATED __declspec(deprecated)
-#else
-    #define JSON_DEPRECATED
-#endif
-
-// allow for portable nodiscard warnings
-#if defined(__has_cpp_attribute)
-    #if __has_cpp_attribute(nodiscard)
-        #define JSON_NODISCARD [[nodiscard]]
-    #elif __has_cpp_attribute(gnu::warn_unused_result)
-        #define JSON_NODISCARD [[gnu::warn_unused_result]]
-    #else
-        #define JSON_NODISCARD
-    #endif
-#else
-    #define JSON_NODISCARD
-#endif
-
-// allow to disable exceptions
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
-    #define JSON_THROW(exception) throw exception
-    #define JSON_TRY try
-    #define JSON_CATCH(exception) catch(exception)
-    #define JSON_INTERNAL_CATCH(exception) catch(exception)
-#else
-    #include <cstdlib>
-    #define JSON_THROW(exception) std::abort()
-    #define JSON_TRY if(true)
-    #define JSON_CATCH(exception) if(false)
-    #define JSON_INTERNAL_CATCH(exception) if(false)
-#endif
-
-// override exception macros
-#if defined(JSON_THROW_USER)
-    #undef JSON_THROW
-    #define JSON_THROW JSON_THROW_USER
-#endif
-#if defined(JSON_TRY_USER)
-    #undef JSON_TRY
-    #define JSON_TRY JSON_TRY_USER
-#endif
-#if defined(JSON_CATCH_USER)
-    #undef JSON_CATCH
-    #define JSON_CATCH JSON_CATCH_USER
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
-#endif
-#if defined(JSON_INTERNAL_CATCH_USER)
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
-#endif
-
-// manual branch prediction
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #define JSON_LIKELY(x)      __builtin_expect(x, 1)
-    #define JSON_UNLIKELY(x)    __builtin_expect(x, 0)
-#else
-    #define JSON_LIKELY(x)      x
-    #define JSON_UNLIKELY(x)    x
-#endif
-
-// C++ language standard detection
-#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-    #define JSON_HAS_CPP_14
-#endif
-
-/*!
-@brief macro to briefly define a mapping between an enum and JSON
-@def NLOHMANN_JSON_SERIALIZE_ENUM
-@since version 3.4.0
-*/
-#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                           \
-    template<typename BasicJsonType>                                                           \
-    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                  \
-    {                                                                                          \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");         \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                    \
-        auto it = std::find_if(std::begin(m), std::end(m),                                     \
-                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
-        {                                                                                      \
-            return ej_pair.first == e;                                                         \
-        });                                                                                    \
-        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                \
-    }                                                                                          \
-    template<typename BasicJsonType>                                                           \
-    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                \
-    {                                                                                          \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");         \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                    \
-        auto it = std::find_if(std::begin(m), std::end(m),                                     \
-                               [j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
-        {                                                                                      \
-            return ej_pair.second == j;                                                        \
-        });                                                                                    \
-        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                 \
-    }
-
-// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
-// may be removed in the future once the class is split.
-
-#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
-    template<template<typename, typename, typename...> class ObjectType,   \
-             template<typename, typename...> class ArrayType,              \
-             class StringType, class BooleanType, class NumberIntegerType, \
-             class NumberUnsignedType, class NumberFloatType,              \
-             template<typename> class AllocatorType,                       \
-             template<typename, typename = void> class JSONSerializer>
-
-#define NLOHMANN_BASIC_JSON_TPL                                            \
-    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
-    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
-    AllocatorType, JSONSerializer>
-
 // #include <nlohmann/detail/meta/cpp_future.hpp>
 
 
-#include <ciso646> // not
 #include <cstddef> // size_t
 #include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
 
@@ -669,7 +2731,6 @@ constexpr T static_const<T>::value;
 // #include <nlohmann/detail/meta/type_traits.hpp>
 
 
-#include <ciso646> // not
 #include <limits> // numeric_limits
 #include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
 #include <utility> // declval
@@ -686,11 +2747,11 @@ namespace nlohmann
 {
 namespace detail
 {
-template <typename ...Ts> struct make_void
+template<typename ...Ts> struct make_void
 {
     using type = void;
 };
-template <typename ...Ts> using void_t = typename make_void<Ts...>::type;
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
 } // namespace detail
 }  // namespace nlohmann
 
@@ -701,10 +2762,10 @@ namespace nlohmann
 {
 namespace detail
 {
-template <typename It, typename = void>
+template<typename It, typename = void>
 struct iterator_types {};
 
-template <typename It>
+template<typename It>
 struct iterator_types <
     It,
     void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
@@ -719,18 +2780,18 @@ struct iterator_types <
 
 // This is required as some compilers implement std::iterator_traits in a way that
 // doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
-template <typename T, typename = void>
+template<typename T, typename = void>
 struct iterator_traits
 {
 };
 
-template <typename T>
+template<typename T>
 struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
             : iterator_types<T>
 {
 };
 
-template <typename T>
+template<typename T>
 struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
 {
     using iterator_category = std::random_access_iterator_tag;
@@ -754,7 +2815,7 @@ struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
 // #include <nlohmann/detail/meta/void_t.hpp>
 
 
-// http://en.cppreference.com/w/cpp/experimental/is_detected
+// https://en.cppreference.com/w/cpp/experimental/is_detected
 namespace nlohmann
 {
 namespace detail
@@ -769,39 +2830,39 @@ struct nonesuch
     void operator=(nonesuch&&) = delete;
 };
 
-template <class Default,
-          class AlwaysVoid,
-          template <class...> class Op,
-          class... Args>
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
 struct detector
 {
     using value_t = std::false_type;
     using type = Default;
 };
 
-template <class Default, template <class...> class Op, class... Args>
+template<class Default, template<class...> class Op, class... Args>
 struct detector<Default, void_t<Op<Args...>>, Op, Args...>
 {
     using value_t = std::true_type;
     using type = Op<Args...>;
 };
 
-template <template <class...> class Op, class... Args>
+template<template<class...> class Op, class... Args>
 using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
 
-template <template <class...> class Op, class... Args>
+template<template<class...> class Op, class... Args>
 using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
 
-template <class Default, template <class...> class Op, class... Args>
+template<class Default, template<class...> class Op, class... Args>
 using detected_or = detector<Default, void, Op, Args...>;
 
-template <class Default, template <class...> class Op, class... Args>
+template<class Default, template<class...> class Op, class... Args>
 using detected_or_t = typename detected_or<Default, Op, Args...>::type;
 
-template <class Expected, template <class...> class Op, class... Args>
+template<class Expected, template<class...> class Op, class... Args>
 using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
 
-template <class To, template <class...> class Op, class... Args>
+template<class To, template<class...> class Op, class... Args>
 using is_detected_convertible =
     std::is_convertible<detected_t<Op, Args...>, To>;
 }  // namespace detail
@@ -843,7 +2904,8 @@ template<template<typename U, typename V, typename... Args> class ObjectType =
          class NumberFloatType = double,
          template<typename U> class AllocatorType = std::allocator,
          template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer>
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>>
 class basic_json;
 
 /*!
@@ -869,6 +2931,19 @@ uses the standard template types.
 @since version 1.0.0
 */
 using json = basic_json<>;
+
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/*!
+@brief ordered JSON class
+
+This type preserves the insertion order of object keys.
+
+@since version 3.9.0
+*/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
 }  // namespace nlohmann
 
 #endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
@@ -904,50 +2979,73 @@ template<typename> struct is_basic_json : std::false_type {};
 NLOHMANN_BASIC_JSON_TPL_DECLARATION
 struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
 
+//////////////////////
+// json_ref helpers //
+//////////////////////
+
+template<typename>
+class json_ref;
+
+template<typename>
+struct is_json_ref : std::false_type {};
+
+template<typename T>
+struct is_json_ref<json_ref<T>> : std::true_type {};
+
 //////////////////////////
 // aliases for detected //
 //////////////////////////
 
-template <typename T>
+template<typename T>
 using mapped_type_t = typename T::mapped_type;
 
-template <typename T>
+template<typename T>
 using key_type_t = typename T::key_type;
 
-template <typename T>
+template<typename T>
 using value_type_t = typename T::value_type;
 
-template <typename T>
+template<typename T>
 using difference_type_t = typename T::difference_type;
 
-template <typename T>
+template<typename T>
 using pointer_t = typename T::pointer;
 
-template <typename T>
+template<typename T>
 using reference_t = typename T::reference;
 
-template <typename T>
+template<typename T>
 using iterator_category_t = typename T::iterator_category;
 
-template <typename T>
+template<typename T>
 using iterator_t = typename T::iterator;
 
-template <typename T, typename... Args>
+template<typename T, typename... Args>
 using to_json_function = decltype(T::to_json(std::declval<Args>()...));
 
-template <typename T, typename... Args>
+template<typename T, typename... Args>
 using from_json_function = decltype(T::from_json(std::declval<Args>()...));
 
-template <typename T, typename U>
+template<typename T, typename U>
 using get_template_function = decltype(std::declval<T>().template get<U>());
 
 // trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template <typename BasicJsonType, typename T, typename = void>
+template<typename BasicJsonType, typename T, typename = void>
 struct has_from_json : std::false_type {};
 
+// trait checking if j.get<T> is valid
+// use this trait instead of std::is_constructible or std::is_convertible,
+// both rely on, or make use of implicit conversions, and thus fail when T
+// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
 template <typename BasicJsonType, typename T>
-struct has_from_json<BasicJsonType, T,
-           enable_if_t<not is_basic_json<T>::value>>
+struct is_getable
+{
+    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct has_from_json < BasicJsonType, T,
+           enable_if_t < !is_basic_json<T>::value >>
 {
     using serializer = typename BasicJsonType::template json_serializer<T, void>;
 
@@ -958,11 +3056,11 @@ struct has_from_json<BasicJsonType, T,
 
 // This trait checks if JSONSerializer<T>::from_json(json const&) exists
 // this overload is used for non-default-constructible user-defined-types
-template <typename BasicJsonType, typename T, typename = void>
+template<typename BasicJsonType, typename T, typename = void>
 struct has_non_default_from_json : std::false_type {};
 
 template<typename BasicJsonType, typename T>
-struct has_non_default_from_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
 {
     using serializer = typename BasicJsonType::template json_serializer<T, void>;
 
@@ -973,11 +3071,11 @@ struct has_non_default_from_json<BasicJsonType, T, enable_if_t<not is_basic_json
 
 // This trait checks if BasicJsonType::json_serializer<T>::to_json exists
 // Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
-template <typename BasicJsonType, typename T, typename = void>
+template<typename BasicJsonType, typename T, typename = void>
 struct has_to_json : std::false_type {};
 
-template <typename BasicJsonType, typename T>
-struct has_to_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
+template<typename BasicJsonType, typename T>
+struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
 {
     using serializer = typename BasicJsonType::template json_serializer<T, void>;
 
@@ -991,10 +3089,10 @@ struct has_to_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
 // is_ functions //
 ///////////////////
 
-template <typename T, typename = void>
+template<typename T, typename = void>
 struct is_iterator_traits : std::false_type {};
 
-template <typename T>
+template<typename T>
 struct is_iterator_traits<iterator_traits<T>>
 {
   private:
@@ -1011,20 +3109,20 @@ struct is_iterator_traits<iterator_traits<T>>
 
 // source: https://stackoverflow.com/a/37193089/4116453
 
-template <typename T, typename = void>
+template<typename T, typename = void>
 struct is_complete_type : std::false_type {};
 
-template <typename T>
+template<typename T>
 struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
 
-template <typename BasicJsonType, typename CompatibleObjectType,
-          typename = void>
+template<typename BasicJsonType, typename CompatibleObjectType,
+         typename = void>
 struct is_compatible_object_type_impl : std::false_type {};
 
-template <typename BasicJsonType, typename CompatibleObjectType>
+template<typename BasicJsonType, typename CompatibleObjectType>
 struct is_compatible_object_type_impl <
     BasicJsonType, CompatibleObjectType,
-    enable_if_t<is_detected<mapped_type_t, CompatibleObjectType>::value and
+    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
     is_detected<key_type_t, CompatibleObjectType>::value >>
 {
 
@@ -1033,44 +3131,53 @@ struct is_compatible_object_type_impl <
     // macOS's is_constructible does not play well with nonesuch...
     static constexpr bool value =
         std::is_constructible<typename object_t::key_type,
-        typename CompatibleObjectType::key_type>::value and
+        typename CompatibleObjectType::key_type>::value &&
         std::is_constructible<typename object_t::mapped_type,
         typename CompatibleObjectType::mapped_type>::value;
 };
 
-template <typename BasicJsonType, typename CompatibleObjectType>
+template<typename BasicJsonType, typename CompatibleObjectType>
 struct is_compatible_object_type
     : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
 
-template <typename BasicJsonType, typename ConstructibleObjectType,
-          typename = void>
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         typename = void>
 struct is_constructible_object_type_impl : std::false_type {};
 
-template <typename BasicJsonType, typename ConstructibleObjectType>
+template<typename BasicJsonType, typename ConstructibleObjectType>
 struct is_constructible_object_type_impl <
     BasicJsonType, ConstructibleObjectType,
-    enable_if_t<is_detected<mapped_type_t, ConstructibleObjectType>::value and
+    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
     is_detected<key_type_t, ConstructibleObjectType>::value >>
 {
     using object_t = typename BasicJsonType::object_t;
 
     static constexpr bool value =
-        (std::is_constructible<typename ConstructibleObjectType::key_type, typename object_t::key_type>::value and
-         std::is_same<typename object_t::mapped_type, typename ConstructibleObjectType::mapped_type>::value) or
-        (has_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type>::value or
-         has_non_default_from_json<BasicJsonType, typename ConstructibleObjectType::mapped_type >::value);
+        (std::is_default_constructible<ConstructibleObjectType>::value &&
+         (std::is_move_assignable<ConstructibleObjectType>::value ||
+          std::is_copy_assignable<ConstructibleObjectType>::value) &&
+         (std::is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value &&
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) ||
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
 };
 
-template <typename BasicJsonType, typename ConstructibleObjectType>
+template<typename BasicJsonType, typename ConstructibleObjectType>
 struct is_constructible_object_type
     : is_constructible_object_type_impl<BasicJsonType,
       ConstructibleObjectType> {};
 
-template <typename BasicJsonType, typename CompatibleStringType,
-          typename = void>
+template<typename BasicJsonType, typename CompatibleStringType,
+         typename = void>
 struct is_compatible_string_type_impl : std::false_type {};
 
-template <typename BasicJsonType, typename CompatibleStringType>
+template<typename BasicJsonType, typename CompatibleStringType>
 struct is_compatible_string_type_impl <
     BasicJsonType, CompatibleStringType,
     enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
@@ -1080,15 +3187,15 @@ struct is_compatible_string_type_impl <
         std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
 };
 
-template <typename BasicJsonType, typename ConstructibleStringType>
+template<typename BasicJsonType, typename ConstructibleStringType>
 struct is_compatible_string_type
     : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
 
-template <typename BasicJsonType, typename ConstructibleStringType,
-          typename = void>
+template<typename BasicJsonType, typename ConstructibleStringType,
+         typename = void>
 struct is_constructible_string_type_impl : std::false_type {};
 
-template <typename BasicJsonType, typename ConstructibleStringType>
+template<typename BasicJsonType, typename ConstructibleStringType>
 struct is_constructible_string_type_impl <
     BasicJsonType, ConstructibleStringType,
     enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
@@ -1099,82 +3206,86 @@ struct is_constructible_string_type_impl <
         typename BasicJsonType::string_t>::value;
 };
 
-template <typename BasicJsonType, typename ConstructibleStringType>
+template<typename BasicJsonType, typename ConstructibleStringType>
 struct is_constructible_string_type
     : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
 
-template <typename BasicJsonType, typename CompatibleArrayType, typename = void>
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
 struct is_compatible_array_type_impl : std::false_type {};
 
-template <typename BasicJsonType, typename CompatibleArrayType>
+template<typename BasicJsonType, typename CompatibleArrayType>
 struct is_compatible_array_type_impl <
     BasicJsonType, CompatibleArrayType,
-    enable_if_t<is_detected<value_type_t, CompatibleArrayType>::value and
-    is_detected<iterator_t, CompatibleArrayType>::value and
+    enable_if_t < is_detected<value_type_t, CompatibleArrayType>::value&&
+    is_detected<iterator_t, CompatibleArrayType>::value&&
 // This is needed because json_reverse_iterator has a ::iterator type...
 // Therefore it is detected as a CompatibleArrayType.
 // The real fix would be to have an Iterable concept.
-    not is_iterator_traits<
-    iterator_traits<CompatibleArrayType>>::value >>
+    !is_iterator_traits <
+    iterator_traits<CompatibleArrayType >>::value >>
 {
     static constexpr bool value =
         std::is_constructible<BasicJsonType,
         typename CompatibleArrayType::value_type>::value;
 };
 
-template <typename BasicJsonType, typename CompatibleArrayType>
+template<typename BasicJsonType, typename CompatibleArrayType>
 struct is_compatible_array_type
     : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
 
-template <typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
 struct is_constructible_array_type_impl : std::false_type {};
 
-template <typename BasicJsonType, typename ConstructibleArrayType>
+template<typename BasicJsonType, typename ConstructibleArrayType>
 struct is_constructible_array_type_impl <
     BasicJsonType, ConstructibleArrayType,
     enable_if_t<std::is_same<ConstructibleArrayType,
     typename BasicJsonType::value_type>::value >>
             : std::true_type {};
 
-template <typename BasicJsonType, typename ConstructibleArrayType>
+template<typename BasicJsonType, typename ConstructibleArrayType>
 struct is_constructible_array_type_impl <
     BasicJsonType, ConstructibleArrayType,
-    enable_if_t<not std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value and
-    is_detected<value_type_t, ConstructibleArrayType>::value and
-    is_detected<iterator_t, ConstructibleArrayType>::value and
-    is_complete_type<
-    detected_t<value_type_t, ConstructibleArrayType>>::value >>
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    std::is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<value_type_t, ConstructibleArrayType>::value&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_complete_type <
+detected_t<value_type_t, ConstructibleArrayType >>::value >>
 {
     static constexpr bool value =
         // This is needed because json_reverse_iterator has a ::iterator type,
-        // furthermore, std::back_insert_iterator (and other iterators) have a base class `iterator`...
-        // Therefore it is detected as a ConstructibleArrayType.
-        // The real fix would be to have an Iterable concept.
-        not is_iterator_traits <
-        iterator_traits<ConstructibleArrayType >>::value and
+        // furthermore, std::back_insert_iterator (and other iterators) have a
+        // base class `iterator`... Therefore it is detected as a
+        // ConstructibleArrayType. The real fix would be to have an Iterable
+        // concept.
+        !is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value &&
 
-        (std::is_same<typename ConstructibleArrayType::value_type, typename BasicJsonType::array_t::value_type>::value or
+        (std::is_same<typename ConstructibleArrayType::value_type,
+         typename BasicJsonType::array_t::value_type>::value ||
          has_from_json<BasicJsonType,
-         typename ConstructibleArrayType::value_type>::value or
+         typename ConstructibleArrayType::value_type>::value ||
          has_non_default_from_json <
          BasicJsonType, typename ConstructibleArrayType::value_type >::value);
 };
 
-template <typename BasicJsonType, typename ConstructibleArrayType>
+template<typename BasicJsonType, typename ConstructibleArrayType>
 struct is_constructible_array_type
     : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
 
-template <typename RealIntegerType, typename CompatibleNumberIntegerType,
-          typename = void>
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
+         typename = void>
 struct is_compatible_integer_type_impl : std::false_type {};
 
-template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
 struct is_compatible_integer_type_impl <
     RealIntegerType, CompatibleNumberIntegerType,
-    enable_if_t<std::is_integral<RealIntegerType>::value and
-    std::is_integral<CompatibleNumberIntegerType>::value and
-    not std::is_same<bool, CompatibleNumberIntegerType>::value >>
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
 {
     // is there an assert somewhere on overflows?
     using RealLimits = std::numeric_limits<RealIntegerType>;
@@ -1182,20 +3293,20 @@ struct is_compatible_integer_type_impl <
 
     static constexpr auto value =
         std::is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value and
-        CompatibleLimits::is_integer and
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
         RealLimits::is_signed == CompatibleLimits::is_signed;
 };
 
-template <typename RealIntegerType, typename CompatibleNumberIntegerType>
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
 struct is_compatible_integer_type
     : is_compatible_integer_type_impl<RealIntegerType,
       CompatibleNumberIntegerType> {};
 
-template <typename BasicJsonType, typename CompatibleType, typename = void>
+template<typename BasicJsonType, typename CompatibleType, typename = void>
 struct is_compatible_type_impl: std::false_type {};
 
-template <typename BasicJsonType, typename CompatibleType>
+template<typename BasicJsonType, typename CompatibleType>
 struct is_compatible_type_impl <
     BasicJsonType, CompatibleType,
     enable_if_t<is_complete_type<CompatibleType>::value >>
@@ -1204,9 +3315,22 @@ struct is_compatible_type_impl <
         has_to_json<BasicJsonType, CompatibleType>::value;
 };
 
-template <typename BasicJsonType, typename CompatibleType>
+template<typename BasicJsonType, typename CompatibleType>
 struct is_compatible_type
     : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B1> struct conjunction<B1> : B1 { };
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...>
+: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_constructible<T1, Args>...> {};
 }  // namespace detail
 }  // namespace nlohmann
 
@@ -1214,7 +3338,6 @@ struct is_compatible_type
 
 
 #include <array> // array
-#include <ciso646> // and
 #include <cstddef> // size_t
 #include <cstdint> // uint8_t
 #include <string> // string
@@ -1261,30 +3384,35 @@ enum class value_t : std::uint8_t
     number_integer,   ///< number value (signed integer)
     number_unsigned,  ///< number value (unsigned integer)
     number_float,     ///< number value (floating-point)
-    discarded         ///< discarded by the the parser callback function
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
 };
 
 /*!
 @brief comparison operator for JSON types
 
 Returns an ordering that is similar to Python:
-- order: null < boolean < number < object < array < string
+- order: null < boolean < number < object < array < string < binary
 - furthermore, each type is not smaller than itself
 - discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
 
 @since version 1.0.0
 */
 inline bool operator<(const value_t lhs, const value_t rhs) noexcept
 {
-    static constexpr std::array<std::uint8_t, 8> order = {{
+    static constexpr std::array<std::uint8_t, 9> order = {{
             0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
-            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
         }
     };
 
     const auto l_index = static_cast<std::size_t>(lhs);
     const auto r_index = static_cast<std::size_t>(rhs);
-    return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index];
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
 }
 }  // namespace detail
 }  // namespace nlohmann
@@ -1297,7 +3425,7 @@ namespace detail
 template<typename BasicJsonType>
 void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
 {
-    if (JSON_UNLIKELY(not j.is_null()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
     {
         JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name())));
     }
@@ -1305,10 +3433,10 @@ void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
 }
 
 // overloads for basic_json template parameters
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
-                     not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-                     int> = 0>
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
+                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                         int > = 0 >
 void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
 {
     switch (static_cast<value_t>(j))
@@ -1337,7 +3465,7 @@ void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
 template<typename BasicJsonType>
 void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
 {
-    if (JSON_UNLIKELY(not j.is_boolean()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
     {
         JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
     }
@@ -1347,7 +3475,7 @@ void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
 template<typename BasicJsonType>
 void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
 {
-    if (JSON_UNLIKELY(not j.is_string()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
     {
         JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
     }
@@ -1357,13 +3485,13 @@ void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
 template <
     typename BasicJsonType, typename ConstructibleStringType,
     enable_if_t <
-        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value and
-        not std::is_same<typename BasicJsonType::string_t,
-                         ConstructibleStringType>::value,
+        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value&&
+        !std::is_same<typename BasicJsonType::string_t,
+                      ConstructibleStringType>::value,
         int > = 0 >
 void from_json(const BasicJsonType& j, ConstructibleStringType& s)
 {
-    if (JSON_UNLIKELY(not j.is_string()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
     {
         JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
     }
@@ -1400,13 +3528,14 @@ void from_json(const BasicJsonType& j, EnumType& e)
 
 // forward_list doesn't have an insert method
 template<typename BasicJsonType, typename T, typename Allocator,
-         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
 void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
 {
-    if (JSON_UNLIKELY(not j.is_array()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
         JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
     }
+    l.clear();
     std::transform(j.rbegin(), j.rend(),
                    std::front_inserter(l), [](const BasicJsonType & i)
     {
@@ -1416,15 +3545,29 @@ void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
 
 // valarray doesn't have an insert method
 template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
 void from_json(const BasicJsonType& j, std::valarray<T>& l)
 {
-    if (JSON_UNLIKELY(not j.is_array()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
         JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
     }
     l.resize(j.size());
-    std::copy(j.m_value.array->begin(), j.m_value.array->end(), std::begin(l));
+    std::transform(j.begin(), j.end(), std::begin(l),
+                   [](const BasicJsonType & elem)
+    {
+        return elem.template get<T>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
 }
 
 template<typename BasicJsonType>
@@ -1433,7 +3576,7 @@ void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_
     arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
 }
 
-template <typename BasicJsonType, typename T, std::size_t N>
+template<typename BasicJsonType, typename T, std::size_t N>
 auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
                           priority_tag<2> /*unused*/)
 -> decltype(j.template get<T>(), void())
@@ -1453,46 +3596,50 @@ auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, p
 {
     using std::end;
 
-    arr.reserve(j.size());
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
     std::transform(j.begin(), j.end(),
-                   std::inserter(arr, end(arr)), [](const BasicJsonType & i)
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
     {
         // get<BasicJsonType>() returns *this, this won't call a from_json
         // method when value_type is BasicJsonType
         return i.template get<typename ConstructibleArrayType::value_type>();
     });
+    arr = std::move(ret);
 }
 
-template <typename BasicJsonType, typename ConstructibleArrayType>
+template<typename BasicJsonType, typename ConstructibleArrayType>
 void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
                           priority_tag<0> /*unused*/)
 {
     using std::end;
 
+    ConstructibleArrayType ret;
     std::transform(
-        j.begin(), j.end(), std::inserter(arr, end(arr)),
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
         [](const BasicJsonType & i)
     {
         // get<BasicJsonType>() returns *this, this won't call a from_json
         // method when value_type is BasicJsonType
         return i.template get<typename ConstructibleArrayType::value_type>();
     });
+    arr = std::move(ret);
 }
 
-template <typename BasicJsonType, typename ConstructibleArrayType,
-          enable_if_t <
-              is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value and
-              not is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value and
-              not is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value and
-              not is_basic_json<ConstructibleArrayType>::value,
-              int > = 0 >
-
+template < typename BasicJsonType, typename ConstructibleArrayType,
+           enable_if_t <
+               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
+               !is_basic_json<ConstructibleArrayType>::value,
+               int > = 0 >
 auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
 -> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
 j.template get<typename ConstructibleArrayType::value_type>(),
 void())
 {
-    if (JSON_UNLIKELY(not j.is_array()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
         JSON_THROW(type_error::create(302, "type must be array, but is " +
                                       std::string(j.type_name())));
@@ -1501,38 +3648,51 @@ void())
     from_json_array_impl(j, arr, priority_tag<3> {});
 }
 
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
+    {
+        JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name())));
+    }
+
+    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
+}
+
 template<typename BasicJsonType, typename ConstructibleObjectType,
          enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
 void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
 {
-    if (JSON_UNLIKELY(not j.is_object()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
     {
         JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
     }
 
+    ConstructibleObjectType ret;
     auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
     using value_type = typename ConstructibleObjectType::value_type;
     std::transform(
         inner_object->begin(), inner_object->end(),
-        std::inserter(obj, obj.begin()),
+        std::inserter(ret, ret.begin()),
         [](typename BasicJsonType::object_t::value_type const & p)
     {
         return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
     });
+    obj = std::move(ret);
 }
 
 // overload for arithmetic types, not chosen for basic_json template arguments
 // (BooleanType, etc..); note: Is it really necessary to provide explicit
 // overloads for boolean_t etc. in case of a custom BooleanType which is not
 // an arithmetic type?
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t <
-             std::is_arithmetic<ArithmeticType>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-             int> = 0>
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t <
+               std::is_arithmetic<ArithmeticType>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+               int > = 0 >
 void from_json(const BasicJsonType& j, ArithmeticType& val)
 {
     switch (static_cast<value_t>(j))
@@ -1581,18 +3741,19 @@ void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
     from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
 }
 
-template <typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
-          typename = enable_if_t<not std::is_constructible<
-                                     typename BasicJsonType::string_t, Key>::value>>
+template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
 void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
 {
-    if (JSON_UNLIKELY(not j.is_array()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
         JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
     }
+    m.clear();
     for (const auto& p : j)
     {
-        if (JSON_UNLIKELY(not p.is_array()))
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
         {
             JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
         }
@@ -1600,18 +3761,19 @@ void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>&
     }
 }
 
-template <typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
-          typename = enable_if_t<not std::is_constructible<
-                                     typename BasicJsonType::string_t, Key>::value>>
+template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
 void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
 {
-    if (JSON_UNLIKELY(not j.is_array()))
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
     {
         JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
     }
+    m.clear();
     for (const auto& p : j)
     {
-        if (JSON_UNLIKELY(not p.is_array()))
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
         {
             JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
         }
@@ -1638,13 +3800,12 @@ namespace
 {
 constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
 } // namespace
-}  // namespace nlohmann
+} // namespace nlohmann
 
 // #include <nlohmann/detail/conversions/to_json.hpp>
 
 
 #include <algorithm> // copy
-#include <ciso646> // or, and, not
 #include <iterator> // begin, end
 #include <string> // string
 #include <tuple> // tuple, get
@@ -1670,7 +3831,14 @@ namespace nlohmann
 {
 namespace detail
 {
-template <typename IteratorType> class iteration_proxy_value
+template<typename string_type>
+void int_to_string( string_type& target, std::size_t value )
+{
+    // For ADL
+    using std::to_string;
+    target = to_string(value);
+}
+template<typename IteratorType> class iteration_proxy_value
 {
   public:
     using difference_type = std::ptrdiff_t;
@@ -1678,6 +3846,7 @@ template <typename IteratorType> class iteration_proxy_value
     using pointer = value_type * ;
     using reference = value_type & ;
     using iterator_category = std::input_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
 
   private:
     /// the iterator
@@ -1687,9 +3856,9 @@ template <typename IteratorType> class iteration_proxy_value
     /// last stringified array index
     mutable std::size_t array_index_last = 0;
     /// a string representation of the array index
-    mutable std::string array_index_str = "0";
+    mutable string_type array_index_str = "0";
     /// an empty string (to return a reference for primitive values)
-    const std::string empty_str = "";
+    const string_type empty_str = "";
 
   public:
     explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
@@ -1722,9 +3891,9 @@ template <typename IteratorType> class iteration_proxy_value
     }
 
     /// return key of the iterator
-    const std::string& key() const
+    const string_type& key() const
     {
-        assert(anchor.m_object != nullptr);
+        JSON_ASSERT(anchor.m_object != nullptr);
 
         switch (anchor.m_object->type())
         {
@@ -1733,7 +3902,7 @@ template <typename IteratorType> class iteration_proxy_value
             {
                 if (array_index != array_index_last)
                 {
-                    array_index_str = std::to_string(array_index);
+                    int_to_string( array_index_str, array_index );
                     array_index_last = array_index;
                 }
                 return array_index_str;
@@ -1783,7 +3952,7 @@ template<typename IteratorType> class iteration_proxy
 // Structured Bindings Support
 // For further reference see https://blog.tartanllama.xyz/structured-bindings/
 // And see https://github.com/nlohmann/json/pull/1391
-template <std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
 auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
 {
     return i.key();
@@ -1791,7 +3960,7 @@ auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decl
 // Structured Bindings Support
 // For further reference see https://blog.tartanllama.xyz/structured-bindings/
 // And see https://github.com/nlohmann/json/pull/1391
-template <std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
 auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
 {
     return i.value();
@@ -1810,11 +3979,11 @@ namespace std
     #pragma clang diagnostic push
     #pragma clang diagnostic ignored "-Wmismatched-tags"
 #endif
-template <typename IteratorType>
+template<typename IteratorType>
 class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
             : public std::integral_constant<std::size_t, 2> {};
 
-template <std::size_t N, typename IteratorType>
+template<std::size_t N, typename IteratorType>
 class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
 {
   public:
@@ -1875,9 +4044,9 @@ struct external_constructor<value_t::string>
         j.assert_invariant();
     }
 
-    template<typename BasicJsonType, typename CompatibleStringType,
-             enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
-                         int> = 0>
+    template < typename BasicJsonType, typename CompatibleStringType,
+               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                             int > = 0 >
     static void construct(BasicJsonType& j, const CompatibleStringType& str)
     {
         j.m_type = value_t::string;
@@ -1886,6 +4055,28 @@ struct external_constructor<value_t::string>
     }
 };
 
+template<>
+struct external_constructor<value_t::binary>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
+    {
+        j.m_type = value_t::binary;
+        typename BasicJsonType::binary_t value{b};
+        j.m_value = value;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
+    {
+        j.m_type = value_t::binary;
+        typename BasicJsonType::binary_t value{std::move(b)};
+        j.m_value = value;
+        j.assert_invariant();
+    }
+};
+
 template<>
 struct external_constructor<value_t::number_float>
 {
@@ -1941,9 +4132,9 @@ struct external_constructor<value_t::array>
         j.assert_invariant();
     }
 
-    template<typename BasicJsonType, typename CompatibleArrayType,
-             enable_if_t<not std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
-                         int> = 0>
+    template < typename BasicJsonType, typename CompatibleArrayType,
+               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                             int > = 0 >
     static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
     {
         using std::begin;
@@ -1973,7 +4164,10 @@ struct external_constructor<value_t::array>
         j.m_type = value_t::array;
         j.m_value = value_t::array;
         j.m_value.array->resize(arr.size());
-        std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        }
         j.assert_invariant();
     }
 };
@@ -1997,8 +4191,8 @@ struct external_constructor<value_t::object>
         j.assert_invariant();
     }
 
-    template<typename BasicJsonType, typename CompatibleObjectType,
-             enable_if_t<not std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int> = 0>
+    template < typename BasicJsonType, typename CompatibleObjectType,
+               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
     static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
     {
         using std::begin;
@@ -2069,19 +4263,25 @@ void to_json(BasicJsonType& j, const std::vector<bool>& e)
     external_constructor<value_t::array>::construct(j, e);
 }
 
-template <typename BasicJsonType, typename CompatibleArrayType,
-          enable_if_t<is_compatible_array_type<BasicJsonType,
-                      CompatibleArrayType>::value and
-                      not is_compatible_object_type<
-                          BasicJsonType, CompatibleArrayType>::value and
-                      not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
-                      not is_basic_json<CompatibleArrayType>::value,
-                      int> = 0>
+template < typename BasicJsonType, typename CompatibleArrayType,
+           enable_if_t < is_compatible_array_type<BasicJsonType,
+                         CompatibleArrayType>::value&&
+                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
+                         !is_basic_json<CompatibleArrayType>::value,
+                         int > = 0 >
 void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
 
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+{
+    external_constructor<value_t::binary>::construct(j, bin);
+}
+
 template<typename BasicJsonType, typename T,
          enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
 void to_json(BasicJsonType& j, const std::valarray<T>& arr)
@@ -2095,8 +4295,8 @@ void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
     external_constructor<value_t::array>::construct(j, std::move(arr));
 }
 
-template<typename BasicJsonType, typename CompatibleObjectType,
-         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value and not is_basic_json<CompatibleObjectType>::value, int> = 0>
+template < typename BasicJsonType, typename CompatibleObjectType,
+           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
 void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
 {
     external_constructor<value_t::object>::construct(j, obj);
@@ -2110,23 +4310,23 @@ void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
 
 template <
     typename BasicJsonType, typename T, std::size_t N,
-    enable_if_t<not std::is_constructible<typename BasicJsonType::string_t,
-                const T(&)[N]>::value,
-                int> = 0 >
+    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
+                  const T(&)[N]>::value,
+                  int > = 0 >
 void to_json(BasicJsonType& j, const T(&arr)[N])
 {
     external_constructor<value_t::array>::construct(j, arr);
 }
 
-template<typename BasicJsonType, typename... Args>
-void to_json(BasicJsonType& j, const std::pair<Args...>& p)
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
 {
     j = { p.first, p.second };
 }
 
 // for https://github.com/nlohmann/json/pull/1134
-template < typename BasicJsonType, typename T,
-           enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
 void to_json(BasicJsonType& j, const T& b)
 {
     j = { {b.key(), b.value()} };
@@ -2138,10 +4338,10 @@ void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...>
     j = { std::get<Idx>(t)... };
 }
 
-template<typename BasicJsonType, typename... Args>
-void to_json(BasicJsonType& j, const std::tuple<Args...>& t)
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+void to_json(BasicJsonType& j, const T& t)
 {
-    to_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
 }
 
 struct to_json_fn
@@ -2160,7 +4360,7 @@ namespace
 {
 constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
 } // namespace
-}  // namespace nlohmann
+} // namespace nlohmann
 
 
 namespace nlohmann
@@ -2195,7 +4395,7 @@ struct adl_serializer
     @param[in,out] j  JSON value to write to
     @param[in] val    value to read from
     */
-    template <typename BasicJsonType, typename ValueType>
+    template<typename BasicJsonType, typename ValueType>
     static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
         noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
     -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
@@ -2206,18 +4406,304 @@ struct adl_serializer
 
 }  // namespace nlohmann
 
+// #include <nlohmann/byte_container_with_subtype.hpp>
+
+
+#include <cstdint> // uint8_t
+#include <tuple> // tie
+#include <utility> // move
+
+namespace nlohmann
+{
+
+/*!
+@brief an internal type for a backed binary type
+
+This type extends the template parameter @a BinaryType provided to `basic_json`
+with a subtype used by BSON and MessagePack. This type exists so that the user
+does not have to specify a type themselves with a specific naming scheme in
+order to override the binary type.
+
+@tparam BinaryType container to store bytes (`std::vector<std::uint8_t>` by
+                   default)
+
+@since version 3.8.0
+*/
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType
+{
+  public:
+    /// the type of the underlying container
+    using container_type = BinaryType;
+
+    byte_container_with_subtype() noexcept(noexcept(container_type()))
+        : container_type()
+    {}
+
+    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+    {}
+
+    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+    {}
+
+    byte_container_with_subtype(const container_type& b, std::uint8_t subtype) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+        , m_subtype(subtype)
+        , m_has_subtype(true)
+    {}
+
+    byte_container_with_subtype(container_type&& b, std::uint8_t subtype) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+        , m_subtype(subtype)
+        , m_has_subtype(true)
+    {}
+
+    bool operator==(const byte_container_with_subtype& rhs) const
+    {
+        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
+               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
+    }
+
+    bool operator!=(const byte_container_with_subtype& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+    /*!
+    @brief sets the binary subtype
+
+    Sets the binary subtype of the value, also flags a binary JSON value as
+    having a subtype, which has implications for serialization.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref subtype() -- return the binary subtype
+    @sa @ref clear_subtype() -- clears the binary subtype
+    @sa @ref has_subtype() -- returns whether or not the binary value has a
+    subtype
+
+    @since version 3.8.0
+    */
+    void set_subtype(std::uint8_t subtype) noexcept
+    {
+        m_subtype = subtype;
+        m_has_subtype = true;
+    }
+
+    /*!
+    @brief return the binary subtype
+
+    Returns the numerical subtype of the value if it has a subtype. If it does
+    not have a subtype, this function will return size_t(-1) as a sentinel
+    value.
+
+    @return the numerical subtype of the binary value
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref set_subtype() -- sets the binary subtype
+    @sa @ref clear_subtype() -- clears the binary subtype
+    @sa @ref has_subtype() -- returns whether or not the binary value has a
+    subtype
+
+    @since version 3.8.0
+    */
+    constexpr std::uint8_t subtype() const noexcept
+    {
+        return m_subtype;
+    }
+
+    /*!
+    @brief return whether the value has a subtype
+
+    @return whether the value has a subtype
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref subtype() -- return the binary subtype
+    @sa @ref set_subtype() -- sets the binary subtype
+    @sa @ref clear_subtype() -- clears the binary subtype
+
+    @since version 3.8.0
+    */
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
+
+    /*!
+    @brief clears the binary subtype
+
+    Clears the binary subtype and flags the value as not having a subtype, which
+    has implications for serialization; for instance MessagePack will prefer the
+    bin family over the ext family.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref subtype() -- return the binary subtype
+    @sa @ref set_subtype() -- sets the binary subtype
+    @sa @ref has_subtype() -- returns whether or not the binary value has a
+    subtype
+
+    @since version 3.8.0
+    */
+    void clear_subtype() noexcept
+    {
+        m_subtype = 0;
+        m_has_subtype = false;
+    }
+
+  private:
+    std::uint8_t m_subtype = 0;
+    bool m_has_subtype = false;
+};
+
+}  // namespace nlohmann
+
 // #include <nlohmann/detail/conversions/from_json.hpp>
 
 // #include <nlohmann/detail/conversions/to_json.hpp>
 
 // #include <nlohmann/detail/exceptions.hpp>
 
+// #include <nlohmann/detail/hash.hpp>
+
+
+#include <cstddef> // size_t, uint8_t
+#include <functional> // hash
+
+namespace nlohmann
+{
+namespace detail
+{
+
+// boost::hash_combine
+inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
+{
+    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
+    return seed;
+}
+
+/*!
+@brief hash a JSON value
+
+The hash function tries to rely on std::hash where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for
+null, 0, 0U, and false, etc.
+
+@tparam BasicJsonType basic_json specialization
+@param j JSON value to hash
+@return hash value of j
+*/
+template<typename BasicJsonType>
+std::size_t hash(const BasicJsonType& j)
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+    const auto type = static_cast<std::size_t>(j.type());
+    switch (j.type())
+    {
+        case BasicJsonType::value_t::null:
+        case BasicJsonType::value_t::discarded:
+        {
+            return combine(type, 0);
+        }
+
+        case BasicJsonType::value_t::object:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j.items())
+            {
+                const auto h = std::hash<string_t> {}(element.key());
+                seed = combine(seed, h);
+                seed = combine(seed, hash(element.value()));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::array:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j)
+            {
+                seed = combine(seed, hash(element));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::string:
+        {
+            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::boolean:
+        {
+            const auto h = std::hash<bool> {}(j.template get<bool>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_integer:
+        {
+            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
+            return combine(type, h);
+        }
+
+        case nlohmann::detail::value_t::number_unsigned:
+        {
+            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
+            return combine(type, h);
+        }
+
+        case nlohmann::detail::value_t::number_float:
+        {
+            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
+            return combine(type, h);
+        }
+
+        case nlohmann::detail::value_t::binary:
+        {
+            auto seed = combine(type, j.get_binary().size());
+            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
+            seed = combine(seed, h);
+            seed = combine(seed, j.get_binary().subtype());
+            for (const auto byte : j.get_binary())
+            {
+                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
+            }
+            return seed;
+        }
+
+        default: // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // LCOV_EXCL_LINE
+    }
+}
+
+}  // namespace detail
+}  // namespace nlohmann
+
 // #include <nlohmann/detail/input/binary_reader.hpp>
 
 
 #include <algorithm> // generate_n
 #include <array> // array
-#include <cassert> // assert
 #include <cmath> // ldexp
 #include <cstddef> // size_t
 #include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
@@ -2234,7 +4720,6 @@ struct adl_serializer
 
 
 #include <array> // array
-#include <cassert> // assert
 #include <cstddef> // size_t
 #include <cstdio> //FILE *
 #include <cstring> // strlen
@@ -2262,35 +4747,17 @@ enum class input_format_t { json, cbor, msgpack, ubjson, bson };
 // input adapters //
 ////////////////////
 
-/*!
-@brief abstract input adapter interface
-
-Produces a stream of std::char_traits<char>::int_type characters from a
-std::istream, a buffer, or some other input type. Accepts the return of
-exactly one non-EOF character for future input. The int_type characters
-returned consist of all valid char values as positive values (typically
-unsigned char), plus an EOF value outside that range, specified by the value
-of the function std::char_traits<char>::eof(). This value is typically -1, but
-could be any arbitrary value which is not a valid char value.
-*/
-struct input_adapter_protocol
-{
-    /// get a character [0,255] or std::char_traits<char>::eof().
-    virtual std::char_traits<char>::int_type get_character() = 0;
-    virtual ~input_adapter_protocol() = default;
-};
-
-/// a type to simplify interfaces
-using input_adapter_t = std::shared_ptr<input_adapter_protocol>;
-
 /*!
 Input adapter for stdio file access. This adapter read only 1 byte and do not use any
  buffer. This adapter is a very low level adapter.
 */
-class file_input_adapter : public input_adapter_protocol
+class file_input_adapter
 {
   public:
-    explicit file_input_adapter(std::FILE* f)  noexcept
+    using char_type = char;
+
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f) noexcept
         : m_file(f)
     {}
 
@@ -2298,10 +4765,9 @@ class file_input_adapter : public input_adapter_protocol
     file_input_adapter(const file_input_adapter&) = delete;
     file_input_adapter(file_input_adapter&&) = default;
     file_input_adapter& operator=(const file_input_adapter&) = delete;
-    file_input_adapter& operator=(file_input_adapter&&) = default;
-    ~file_input_adapter() override = default;
+    file_input_adapter& operator=(file_input_adapter&&) = delete;
 
-    std::char_traits<char>::int_type get_character() noexcept override
+    std::char_traits<char>::int_type get_character() noexcept
     {
         return std::fgetc(m_file);
     }
@@ -2321,91 +4787,111 @@ characters following those used in parsing the JSON input.  Clears the
 std::istream flags; any input errors (e.g., EOF) will be detected by the first
 subsequent call for input from the std::istream.
 */
-class input_stream_adapter : public input_adapter_protocol
+class input_stream_adapter
 {
   public:
-    ~input_stream_adapter() override
+    using char_type = char;
+
+    ~input_stream_adapter()
     {
         // clear stream flags; we use underlying streambuf I/O, do not
         // maintain ifstream flags, except eof
-        is.clear(is.rdstate() & std::ios::eofbit);
+        if (is != nullptr)
+        {
+            is->clear(is->rdstate() & std::ios::eofbit);
+        }
     }
 
     explicit input_stream_adapter(std::istream& i)
-        : is(i), sb(*i.rdbuf())
+        : is(&i), sb(i.rdbuf())
     {}
 
     // delete because of pointer members
     input_stream_adapter(const input_stream_adapter&) = delete;
     input_stream_adapter& operator=(input_stream_adapter&) = delete;
-    input_stream_adapter(input_stream_adapter&&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&& rhs) = delete;
+
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
 
     // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
     // ensure that std::char_traits<char>::eof() and the character 0xFF do not
     // end up as the same value, eg. 0xFFFFFFFF.
-    std::char_traits<char>::int_type get_character() override
+    std::char_traits<char>::int_type get_character()
     {
-        auto res = sb.sbumpc();
+        auto res = sb->sbumpc();
         // set eof manually, as we don't use the istream interface.
-        if (res == EOF)
+        if (JSON_HEDLEY_UNLIKELY(res == EOF))
         {
-            is.clear(is.rdstate() | std::ios::eofbit);
+            is->clear(is->rdstate() | std::ios::eofbit);
         }
         return res;
     }
 
   private:
     /// the associated input stream
-    std::istream& is;
-    std::streambuf& sb;
+    std::istream* is = nullptr;
+    std::streambuf* sb = nullptr;
 };
 
-/// input adapter for buffer input
-class input_buffer_adapter : public input_adapter_protocol
+// General-purpose iterator-based adapter. It might not be as fast as
+// theoretically possible for some containers, but it is extremely versatile.
+template<typename IteratorType>
+class iterator_input_adapter
 {
   public:
-    input_buffer_adapter(const char* b, const std::size_t l) noexcept
-        : cursor(b), limit(b + l)
-    {}
+    using char_type = typename std::iterator_traits<IteratorType>::value_type;
 
-    // delete because of pointer members
-    input_buffer_adapter(const input_buffer_adapter&) = delete;
-    input_buffer_adapter& operator=(input_buffer_adapter&) = delete;
-    input_buffer_adapter(input_buffer_adapter&&) = delete;
-    input_buffer_adapter& operator=(input_buffer_adapter&&) = delete;
-    ~input_buffer_adapter() override = default;
+    iterator_input_adapter(IteratorType first, IteratorType last)
+        : current(std::move(first)), end(std::move(last)) {}
 
-    std::char_traits<char>::int_type get_character() noexcept override
+    typename std::char_traits<char_type>::int_type get_character()
     {
-        if (JSON_LIKELY(cursor < limit))
+        if (JSON_HEDLEY_LIKELY(current != end))
         {
-            return std::char_traits<char>::to_int_type(*(cursor++));
+            auto result = std::char_traits<char_type>::to_int_type(*current);
+            std::advance(current, 1);
+            return result;
+        }
+        else
+        {
+            return std::char_traits<char_type>::eof();
         }
-
-        return std::char_traits<char>::eof();
     }
 
   private:
-    /// pointer to the current character
-    const char* cursor;
-    /// pointer past the last character
-    const char* const limit;
+    IteratorType current;
+    IteratorType end;
+
+    template<typename BaseInputAdapter, size_t T>
+    friend struct wide_string_input_helper;
+
+    bool empty() const
+    {
+        return current == end;
+    }
+
 };
 
-template<typename WideStringType, size_t T>
-struct wide_string_input_helper
+
+template<typename BaseInputAdapter, size_t T>
+struct wide_string_input_helper;
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 4>
 {
     // UTF-32
-    static void fill_buffer(const WideStringType& str,
-                            size_t& current_wchar,
+    static void fill_buffer(BaseInputAdapter& input,
                             std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
                             size_t& utf8_bytes_index,
                             size_t& utf8_bytes_filled)
     {
         utf8_bytes_index = 0;
 
-        if (current_wchar == str.size())
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
         {
             utf8_bytes[0] = std::char_traits<char>::eof();
             utf8_bytes_filled = 1;
@@ -2413,7 +4899,7 @@ struct wide_string_input_helper
         else
         {
             // get the current character
-            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+            const auto wc = input.get_character();
 
             // UTF-32 to UTF-8 encoding
             if (wc < 0x80)
@@ -2423,23 +4909,23 @@ struct wide_string_input_helper
             }
             else if (wc <= 0x7FF)
             {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u) & 0x1Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
                 utf8_bytes_filled = 2;
             }
             else if (wc <= 0xFFFF)
             {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u) & 0x0Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
                 utf8_bytes_filled = 3;
             }
             else if (wc <= 0x10FFFF)
             {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((wc >> 18u) & 0x07u));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 12u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
-                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
                 utf8_bytes_filled = 4;
             }
             else
@@ -2452,19 +4938,18 @@ struct wide_string_input_helper
     }
 };
 
-template<typename WideStringType>
-struct wide_string_input_helper<WideStringType, 2>
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 2>
 {
     // UTF-16
-    static void fill_buffer(const WideStringType& str,
-                            size_t& current_wchar,
+    static void fill_buffer(BaseInputAdapter& input,
                             std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
                             size_t& utf8_bytes_index,
                             size_t& utf8_bytes_filled)
     {
         utf8_bytes_index = 0;
 
-        if (current_wchar == str.size())
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
         {
             utf8_bytes[0] = std::char_traits<char>::eof();
             utf8_bytes_filled = 1;
@@ -2472,7 +4957,7 @@ struct wide_string_input_helper<WideStringType, 2>
         else
         {
             // get the current character
-            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
+            const auto wc = input.get_character();
 
             // UTF-16 to UTF-8 encoding
             if (wc < 0x80)
@@ -2482,23 +4967,23 @@ struct wide_string_input_helper<WideStringType, 2>
             }
             else if (wc <= 0x7FF)
             {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
                 utf8_bytes_filled = 2;
             }
-            else if (0xD800 > wc or wc >= 0xE000)
+            else if (0xD800 > wc || wc >= 0xE000)
             {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
                 utf8_bytes_filled = 3;
             }
             else
             {
-                if (current_wchar < str.size())
+                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
                 {
-                    const auto wc2 = static_cast<unsigned int>(str[current_wchar++]);
-                    const auto charcode = 0x10000u + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    const auto wc2 = static_cast<unsigned int>(input.get_character());
+                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
                     utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
                     utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
                     utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
@@ -2507,8 +4992,6 @@ struct wide_string_input_helper<WideStringType, 2>
                 }
                 else
                 {
-                    // unknown character
-                    ++current_wchar;
                     utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
                     utf8_bytes_filled = 1;
                 }
@@ -2517,44 +5000,42 @@ struct wide_string_input_helper<WideStringType, 2>
     }
 };
 
-template<typename WideStringType>
-class wide_string_input_adapter : public input_adapter_protocol
+// Wraps another input apdater to convert wide character types into individual bytes.
+template<typename BaseInputAdapter, typename WideCharType>
+class wide_string_input_adapter
 {
   public:
-    explicit wide_string_input_adapter(const WideStringType& w) noexcept
-        : str(w)
-    {}
+    using char_type = char;
 
-    std::char_traits<char>::int_type get_character() noexcept override
+    wide_string_input_adapter(BaseInputAdapter base)
+        : base_adapter(base) {}
+
+    typename std::char_traits<char>::int_type get_character() noexcept
     {
         // check if buffer needs to be filled
         if (utf8_bytes_index == utf8_bytes_filled)
         {
-            fill_buffer<sizeof(typename WideStringType::value_type)>();
+            fill_buffer<sizeof(WideCharType)>();
 
-            assert(utf8_bytes_filled > 0);
-            assert(utf8_bytes_index == 0);
+            JSON_ASSERT(utf8_bytes_filled > 0);
+            JSON_ASSERT(utf8_bytes_index == 0);
         }
 
         // use buffer
-        assert(utf8_bytes_filled > 0);
-        assert(utf8_bytes_index < utf8_bytes_filled);
+        JSON_ASSERT(utf8_bytes_filled > 0);
+        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
         return utf8_bytes[utf8_bytes_index++];
     }
 
   private:
+    BaseInputAdapter base_adapter;
+
     template<size_t T>
     void fill_buffer()
     {
-        wide_string_input_helper<WideStringType, T>::fill_buffer(str, current_wchar, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
     }
 
-    /// the wstring to process
-    const WideStringType& str;
-
-    /// index of the current wchar in str
-    std::size_t current_wchar = 0;
-
     /// a buffer for UTF-8 bytes
     std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
 
@@ -2564,111 +5045,131 @@ class wide_string_input_adapter : public input_adapter_protocol
     std::size_t utf8_bytes_filled = 0;
 };
 
-class input_adapter
+
+template<typename IteratorType, typename Enable = void>
+struct iterator_input_adapter_factory
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using adapter_type = iterator_input_adapter<iterator_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(std::move(first), std::move(last));
+    }
+};
+
+template<typename T>
+struct is_iterator_of_multibyte
+{
+    using value_type = typename std::iterator_traits<T>::value_type;
+    enum
+    {
+        value = sizeof(value_type) > 1
+    };
+};
+
+template<typename IteratorType>
+struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using base_adapter_type = iterator_input_adapter<iterator_type>;
+    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
+    }
+};
+
+// General purpose iterator-based input
+template<typename IteratorType>
+typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
+{
+    using factory_type = iterator_input_adapter_factory<IteratorType>;
+    return factory_type::create(first, last);
+}
+
+// Convenience shorthand from container to iterator
+template<typename ContainerType>
+auto input_adapter(const ContainerType& container) -> decltype(input_adapter(begin(container), end(container)))
+{
+    // Enable ADL
+    using std::begin;
+    using std::end;
+
+    return input_adapter(begin(container), end(container));
+}
+
+// Special cases with fast paths
+inline file_input_adapter input_adapter(std::FILE* file)
+{
+    return file_input_adapter(file);
+}
+
+inline input_stream_adapter input_adapter(std::istream& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+inline input_stream_adapter input_adapter(std::istream&& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
+
+// Null-delimited strings, and the like.
+template < typename CharT,
+           typename std::enable_if <
+               std::is_pointer<CharT>::value&&
+               !std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+               sizeof(typename std::remove_pointer<CharT>::type) == 1,
+               int >::type = 0 >
+contiguous_bytes_input_adapter input_adapter(CharT b)
+{
+    auto length = std::strlen(reinterpret_cast<const char*>(b));
+    const auto* ptr = reinterpret_cast<const char*>(b);
+    return input_adapter(ptr, ptr + length);
+}
+
+template<typename T, std::size_t N>
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N))
+{
+    return input_adapter(array, array + N);
+}
+
+// This class only handles inputs of input_buffer_adapter type.
+// It's required so that expressions like {ptr, len} can be implicitely casted
+// to the correct adapter.
+class span_input_adapter
 {
   public:
-    // native support
-    input_adapter(std::FILE* file)
-        : ia(std::make_shared<file_input_adapter>(file)) {}
-    /// input adapter for input stream
-    input_adapter(std::istream& i)
-        : ia(std::make_shared<input_stream_adapter>(i)) {}
+    template < typename CharT,
+               typename std::enable_if <
+                   std::is_pointer<CharT>::value&&
+                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                   int >::type = 0 >
+    span_input_adapter(CharT b, std::size_t l)
+        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
 
-    /// input adapter for input stream
-    input_adapter(std::istream&& i)
-        : ia(std::make_shared<input_stream_adapter>(i)) {}
-
-    input_adapter(const std::wstring& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::wstring>>(ws)) {}
-
-    input_adapter(const std::u16string& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::u16string>>(ws)) {}
-
-    input_adapter(const std::u32string& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::u32string>>(ws)) {}
-
-    /// input adapter for buffer
-    template<typename CharT,
-             typename std::enable_if<
-                 std::is_pointer<CharT>::value and
-                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
-                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
-                 int>::type = 0>
-    input_adapter(CharT b, std::size_t l)
-        : ia(std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(b), l)) {}
-
-    // derived support
-
-    /// input adapter for string literal
-    template<typename CharT,
-             typename std::enable_if<
-                 std::is_pointer<CharT>::value and
-                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
-                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
-                 int>::type = 0>
-    input_adapter(CharT b)
-        : input_adapter(reinterpret_cast<const char*>(b),
-                        std::strlen(reinterpret_cast<const char*>(b))) {}
-
-    /// input adapter for iterator range with contiguous storage
     template<class IteratorType,
              typename std::enable_if<
                  std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
                  int>::type = 0>
-    input_adapter(IteratorType first, IteratorType last)
+    span_input_adapter(IteratorType first, IteratorType last)
+        : ia(input_adapter(first, last)) {}
+
+    contiguous_bytes_input_adapter&& get()
     {
-#ifndef NDEBUG
-        // assertion to check that the iterator range is indeed contiguous,
-        // see http://stackoverflow.com/a/35008842/266378 for more discussion
-        const auto is_contiguous = std::accumulate(
-                                       first, last, std::pair<bool, int>(true, 0),
-                                       [&first](std::pair<bool, int> res, decltype(*first) val)
-        {
-            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
-            return res;
-        }).first;
-        assert(is_contiguous);
-#endif
-
-        // assertion to check that each element is 1 byte long
-        static_assert(
-            sizeof(typename iterator_traits<IteratorType>::value_type) == 1,
-            "each element in the iterator range must have the size of 1 byte");
-
-        const auto len = static_cast<size_t>(std::distance(first, last));
-        if (JSON_LIKELY(len > 0))
-        {
-            // there is at least one element: use the address of first
-            ia = std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(&(*first)), len);
-        }
-        else
-        {
-            // the address of first cannot be used: use nullptr
-            ia = std::make_shared<input_buffer_adapter>(nullptr, len);
-        }
-    }
-
-    /// input adapter for array
-    template<class T, std::size_t N>
-    input_adapter(T (&array)[N])
-        : input_adapter(std::begin(array), std::end(array)) {}
-
-    /// input adapter for contiguous container
-    template<class ContiguousContainer, typename
-             std::enable_if<not std::is_pointer<ContiguousContainer>::value and
-                            std::is_base_of<std::random_access_iterator_tag, typename iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value,
-                            int>::type = 0>
-    input_adapter(const ContiguousContainer& c)
-        : input_adapter(std::begin(c), std::end(c)) {}
-
-    operator input_adapter_t()
-    {
-        return ia;
+        return std::move(ia);
     }
 
   private:
-    /// the actual adapter
-    input_adapter_t ia = nullptr;
+    contiguous_bytes_input_adapter ia;
 };
 }  // namespace detail
 }  // namespace nlohmann
@@ -2676,7 +5177,6 @@ class input_adapter
 // #include <nlohmann/detail/input/json_sax.hpp>
 
 
-#include <cassert> // assert
 #include <cstddef>
 #include <string> // string
 #include <utility> // move
@@ -2701,14 +5201,11 @@ input.
 template<typename BasicJsonType>
 struct json_sax
 {
-    /// type for (signed) integers
     using number_integer_t = typename BasicJsonType::number_integer_t;
-    /// type for unsigned integers
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    /// type for floating-point numbers
     using number_float_t = typename BasicJsonType::number_float_t;
-    /// type for strings
     using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
 
     /*!
     @brief a null value was read
@@ -2753,6 +5250,14 @@ struct json_sax
     */
     virtual bool string(string_t& val) = 0;
 
+    /*!
+    @brief a binary string was read
+    @param[in] val  binary value
+    @return whether parsing should proceed
+    @note It is safe to move the passed binary.
+    */
+    virtual bool binary(binary_t& val) = 0;
+
     /*!
     @brief the beginning of an object was read
     @param[in] elements  number of object elements or -1 if unknown
@@ -2827,6 +5332,7 @@ class json_sax_dom_parser
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
     using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
 
     /*!
     @param[in, out] r  reference to a JSON value that is manipulated while
@@ -2880,11 +5386,17 @@ class json_sax_dom_parser
         return true;
     }
 
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
     bool start_object(std::size_t len)
     {
         ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
 
-        if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
         {
             JSON_THROW(out_of_range::create(408,
                                             "excessive object size: " + std::to_string(len)));
@@ -2910,7 +5422,7 @@ class json_sax_dom_parser
     {
         ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
 
-        if (JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
         {
             JSON_THROW(out_of_range::create(408,
                                             "excessive array size: " + std::to_string(len)));
@@ -2925,30 +5437,15 @@ class json_sax_dom_parser
         return true;
     }
 
+    template<class Exception>
     bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const detail::exception& ex)
+                     const Exception& ex)
     {
         errored = true;
+        static_cast<void>(ex);
         if (allow_exceptions)
         {
-            // determine the proper exception type from the id
-            switch ((ex.id / 100) % 100)
-            {
-                case 1:
-                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
-                case 4:
-                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
-                // LCOV_EXCL_START
-                case 2:
-                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
-                case 3:
-                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
-                case 5:
-                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
-                default:
-                    assert(false);
-                    // LCOV_EXCL_STOP
-            }
+            JSON_THROW(ex);
         }
         return false;
     }
@@ -2966,6 +5463,7 @@ class json_sax_dom_parser
                object to which we can add elements
     */
     template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
     BasicJsonType* handle_value(Value&& v)
     {
         if (ref_stack.empty())
@@ -2974,7 +5472,7 @@ class json_sax_dom_parser
             return &root;
         }
 
-        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
 
         if (ref_stack.back()->is_array())
         {
@@ -2982,8 +5480,8 @@ class json_sax_dom_parser
             return &(ref_stack.back()->m_value.array->back());
         }
 
-        assert(ref_stack.back()->is_object());
-        assert(object_element);
+        JSON_ASSERT(ref_stack.back()->is_object());
+        JSON_ASSERT(object_element);
         *object_element = BasicJsonType(std::forward<Value>(v));
         return object_element;
     }
@@ -3008,6 +5506,7 @@ class json_sax_dom_callback_parser
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
     using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
     using parser_callback_t = typename BasicJsonType::parser_callback_t;
     using parse_event_t = typename BasicJsonType::parse_event_t;
 
@@ -3062,6 +5561,12 @@ class json_sax_dom_callback_parser
         return true;
     }
 
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
     bool start_object(std::size_t len)
     {
         // check callback for object start
@@ -3072,7 +5577,7 @@ class json_sax_dom_callback_parser
         ref_stack.push_back(val.second);
 
         // check object limit
-        if (ref_stack.back() and JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
         {
             JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len)));
         }
@@ -3089,7 +5594,7 @@ class json_sax_dom_callback_parser
         key_keep_stack.push_back(keep);
 
         // add discarded value at given key and store the reference for later
-        if (keep and ref_stack.back())
+        if (keep && ref_stack.back())
         {
             object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
         }
@@ -3099,18 +5604,18 @@ class json_sax_dom_callback_parser
 
     bool end_object()
     {
-        if (ref_stack.back() and not callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+        if (ref_stack.back() && !callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
         {
             // discard object
             *ref_stack.back() = discarded;
         }
 
-        assert(not ref_stack.empty());
-        assert(not keep_stack.empty());
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
         ref_stack.pop_back();
         keep_stack.pop_back();
 
-        if (not ref_stack.empty() and ref_stack.back() and ref_stack.back()->is_object())
+        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
         {
             // remove discarded value
             for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
@@ -3135,7 +5640,7 @@ class json_sax_dom_callback_parser
         ref_stack.push_back(val.second);
 
         // check array limit
-        if (ref_stack.back() and JSON_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
         {
             JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len)));
         }
@@ -3150,20 +5655,20 @@ class json_sax_dom_callback_parser
         if (ref_stack.back())
         {
             keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
-            if (not keep)
+            if (!keep)
             {
                 // discard array
                 *ref_stack.back() = discarded;
             }
         }
 
-        assert(not ref_stack.empty());
-        assert(not keep_stack.empty());
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
         ref_stack.pop_back();
         keep_stack.pop_back();
 
         // remove discarded value
-        if (not keep and not ref_stack.empty() and ref_stack.back()->is_array())
+        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
         {
             ref_stack.back()->m_value.array->pop_back();
         }
@@ -3171,30 +5676,15 @@ class json_sax_dom_callback_parser
         return true;
     }
 
+    template<class Exception>
     bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const detail::exception& ex)
+                     const Exception& ex)
     {
         errored = true;
+        static_cast<void>(ex);
         if (allow_exceptions)
         {
-            // determine the proper exception type from the id
-            switch ((ex.id / 100) % 100)
-            {
-                case 1:
-                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
-                case 4:
-                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
-                // LCOV_EXCL_START
-                case 2:
-                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
-                case 3:
-                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
-                case 5:
-                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
-                default:
-                    assert(false);
-                    // LCOV_EXCL_STOP
-            }
+            JSON_THROW(ex);
         }
         return false;
     }
@@ -3223,11 +5713,11 @@ class json_sax_dom_callback_parser
     template<typename Value>
     std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
     {
-        assert(not keep_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
 
         // do not handle this value if we know it would be added to a discarded
         // container
-        if (not keep_stack.back())
+        if (!keep_stack.back())
         {
             return {false, nullptr};
         }
@@ -3236,10 +5726,10 @@ class json_sax_dom_callback_parser
         auto value = BasicJsonType(std::forward<Value>(v));
 
         // check callback
-        const bool keep = skip_callback or callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
 
         // do not handle this value if we just learnt it shall be discarded
-        if (not keep)
+        if (!keep)
         {
             return {false, nullptr};
         }
@@ -3252,13 +5742,13 @@ class json_sax_dom_callback_parser
 
         // skip this value if we already decided to skip the parent
         // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
-        if (not ref_stack.back())
+        if (!ref_stack.back())
         {
             return {false, nullptr};
         }
 
         // we now only expect arrays and objects
-        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
 
         // array
         if (ref_stack.back()->is_array())
@@ -3268,18 +5758,18 @@ class json_sax_dom_callback_parser
         }
 
         // object
-        assert(ref_stack.back()->is_object());
+        JSON_ASSERT(ref_stack.back()->is_object());
         // check if we should store an element for the current key
-        assert(not key_keep_stack.empty());
+        JSON_ASSERT(!key_keep_stack.empty());
         const bool store_element = key_keep_stack.back();
         key_keep_stack.pop_back();
 
-        if (not store_element)
+        if (!store_element)
         {
             return {false, nullptr};
         }
 
-        assert(object_element);
+        JSON_ASSERT(object_element);
         *object_element = std::move(value);
         return {true, object_element};
     }
@@ -3312,6 +5802,7 @@ class json_sax_acceptor
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
     using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
 
     bool null()
     {
@@ -3343,7 +5834,12 @@ class json_sax_acceptor
         return true;
     }
 
-    bool start_object(std::size_t  /*unused*/ = std::size_t(-1))
+    bool binary(binary_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t /*unused*/ = std::size_t(-1))
     {
         return true;
     }
@@ -3358,7 +5854,7 @@ class json_sax_acceptor
         return true;
     }
 
-    bool start_array(std::size_t  /*unused*/ = std::size_t(-1))
+    bool start_array(std::size_t /*unused*/ = std::size_t(-1))
     {
         return true;
     }
@@ -3377,2124 +5873,6 @@ class json_sax_acceptor
 
 }  // namespace nlohmann
 
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-
-#include <cstdint> // size_t
-#include <utility> // declval
-#include <string> // string
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template <typename T>
-using null_function_t = decltype(std::declval<T&>().null());
-
-template <typename T>
-using boolean_function_t =
-    decltype(std::declval<T&>().boolean(std::declval<bool>()));
-
-template <typename T, typename Integer>
-using number_integer_function_t =
-    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
-
-template <typename T, typename Unsigned>
-using number_unsigned_function_t =
-    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
-
-template <typename T, typename Float, typename String>
-using number_float_function_t = decltype(std::declval<T&>().number_float(
-                                    std::declval<Float>(), std::declval<const String&>()));
-
-template <typename T, typename String>
-using string_function_t =
-    decltype(std::declval<T&>().string(std::declval<String&>()));
-
-template <typename T>
-using start_object_function_t =
-    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
-
-template <typename T, typename String>
-using key_function_t =
-    decltype(std::declval<T&>().key(std::declval<String&>()));
-
-template <typename T>
-using end_object_function_t = decltype(std::declval<T&>().end_object());
-
-template <typename T>
-using start_array_function_t =
-    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
-
-template <typename T>
-using end_array_function_t = decltype(std::declval<T&>().end_array());
-
-template <typename T, typename Exception>
-using parse_error_function_t = decltype(std::declval<T&>().parse_error(
-        std::declval<std::size_t>(), std::declval<const std::string&>(),
-        std::declval<const Exception&>()));
-
-template <typename SAX, typename BasicJsonType>
-struct is_sax
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static constexpr bool value =
-        is_detected_exact<bool, null_function_t, SAX>::value &&
-        is_detected_exact<bool, boolean_function_t, SAX>::value &&
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value &&
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value &&
-        is_detected_exact<bool, number_float_function_t, SAX, number_float_t,
-        string_t>::value &&
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, start_object_function_t, SAX>::value &&
-        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, end_object_function_t, SAX>::value &&
-        is_detected_exact<bool, start_array_function_t, SAX>::value &&
-        is_detected_exact<bool, end_array_function_t, SAX>::value &&
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
-};
-
-template <typename SAX, typename BasicJsonType>
-struct is_sax_static_asserts
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
-                  "Missing/invalid function: bool null()");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value,
-        "Missing/invalid function: bool number_integer(number_integer_t)");
-    static_assert(
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value,
-        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
-    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
-                  number_float_t, string_t>::value,
-                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
-    static_assert(
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
-        "Missing/invalid function: bool string(string_t&)");
-    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_object(std::size_t)");
-    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
-                  "Missing/invalid function: bool key(string_t&)");
-    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_object()");
-    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_array(std::size_t)");
-    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_array()");
-    static_assert(
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
-        "Missing/invalid function: bool parse_error(std::size_t, const "
-        "std::string&, const exception&)");
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// binary reader //
-///////////////////
-
-/*!
-@brief deserialization of CBOR, MessagePack, and UBJSON values
-*/
-template<typename BasicJsonType, typename SAX = json_sax_dom_parser<BasicJsonType>>
-class binary_reader
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using json_sax_t = SAX;
-
-  public:
-    /*!
-    @brief create a binary reader
-
-    @param[in] adapter  input adapter to read from
-    */
-    explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-        assert(ia);
-    }
-
-    // make class move-only
-    binary_reader(const binary_reader&) = delete;
-    binary_reader(binary_reader&&) = default;
-    binary_reader& operator=(const binary_reader&) = delete;
-    binary_reader& operator=(binary_reader&&) = default;
-    ~binary_reader() = default;
-
-    /*!
-    @param[in] format  the binary format to parse
-    @param[in] sax_    a SAX event processor
-    @param[in] strict  whether to expect the input to be consumed completed
-
-    @return
-    */
-    bool sax_parse(const input_format_t format,
-                   json_sax_t* sax_,
-                   const bool strict = true)
-    {
-        sax = sax_;
-        bool result = false;
-
-        switch (format)
-        {
-            case input_format_t::bson:
-                result = parse_bson_internal();
-                break;
-
-            case input_format_t::cbor:
-                result = parse_cbor_internal();
-                break;
-
-            case input_format_t::msgpack:
-                result = parse_msgpack_internal();
-                break;
-
-            case input_format_t::ubjson:
-                result = parse_ubjson_internal();
-                break;
-
-            default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
-        }
-
-        // strict mode: next byte must be EOF
-        if (result and strict)
-        {
-            if (format == input_format_t::ubjson)
-            {
-                get_ignore_noop();
-            }
-            else
-            {
-                get();
-            }
-
-            if (JSON_UNLIKELY(current != std::char_traits<char>::eof()))
-            {
-                return sax->parse_error(chars_read, get_token_string(),
-                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value")));
-            }
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief determine system byte order
-
-    @return true if and only if system's byte order is little endian
-
-    @note from http://stackoverflow.com/a/1001328/266378
-    */
-    static constexpr bool little_endianess(int num = 1) noexcept
-    {
-        return *reinterpret_cast<char*>(&num) == 1;
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @brief Reads in a BSON-object and passes it to the SAX-parser.
-    @return whether a valid BSON-value was passed to the SAX parser
-    */
-    bool parse_bson_internal()
-    {
-        std::int32_t document_size;
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/false)))
-        {
-            return false;
-        }
-
-        return sax->end_object();
-    }
-
-    /*!
-    @brief Parses a C-style string from the BSON input.
-    @param[in, out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @return `true` if the \x00-byte indicating the end of the string was
-             encountered before the EOF; false` indicates an unexpected EOF.
-    */
-    bool get_bson_cstr(string_t& result)
-    {
-        auto out = std::back_inserter(result);
-        while (true)
-        {
-            get();
-            if (JSON_UNLIKELY(not unexpect_eof(input_format_t::bson, "cstring")))
-            {
-                return false;
-            }
-            if (current == 0x00)
-            {
-                return true;
-            }
-            *out++ = static_cast<char>(current);
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief Parses a zero-terminated string of length @a len from the BSON
-           input.
-    @param[in] len  The length (including the zero-byte at the end) of the
-                    string to be read.
-    @param[in, out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 1
-    @return `true` if the string was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_string(const NumberType len, string_t& result)
-    {
-        if (JSON_UNLIKELY(len < 1))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string")));
-        }
-
-        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) and get() != std::char_traits<char>::eof();
-    }
-
-    /*!
-    @brief Read a BSON document element of the given @a element_type.
-    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
-    @param[in] element_type_parse_position The position in the input stream,
-               where the `element_type` was read.
-    @warning Not all BSON element types are supported yet. An unsupported
-             @a element_type will give rise to a parse_error.114:
-             Unsupported BSON record type 0x...
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_internal(const int element_type,
-                                     const std::size_t element_type_parse_position)
-    {
-        switch (element_type)
-        {
-            case 0x01: // double
-            {
-                double number;
-                return get_number<double, true>(input_format_t::bson, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0x02: // string
-            {
-                std::int32_t len;
-                string_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value);
-            }
-
-            case 0x03: // object
-            {
-                return parse_bson_internal();
-            }
-
-            case 0x04: // array
-            {
-                return parse_bson_array();
-            }
-
-            case 0x08: // boolean
-            {
-                return sax->boolean(get() != 0);
-            }
-
-            case 0x0A: // null
-            {
-                return sax->null();
-            }
-
-            case 0x10: // int32
-            {
-                std::int32_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, value) and sax->number_integer(value);
-            }
-
-            case 0x12: // int64
-            {
-                std::int64_t value;
-                return get_number<std::int64_t, true>(input_format_t::bson, value) and sax->number_integer(value);
-            }
-
-            default: // anything else not supported (yet)
-            {
-                std::array<char, 3> cr{{}};
-                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
-                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data())));
-            }
-        }
-    }
-
-    /*!
-    @brief Read a BSON element list (as specified in the BSON-spec)
-
-    The same binary layout is used for objects and arrays, hence it must be
-    indicated with the argument @a is_array which one is expected
-    (true --> array, false --> object).
-
-    @param[in] is_array Determines if the element list being read is to be
-                        treated as an object (@a is_array == false), or as an
-                        array (@a is_array == true).
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_list(const bool is_array)
-    {
-        string_t key;
-        while (int element_type = get())
-        {
-            if (JSON_UNLIKELY(not unexpect_eof(input_format_t::bson, "element list")))
-            {
-                return false;
-            }
-
-            const std::size_t element_type_parse_position = chars_read;
-            if (JSON_UNLIKELY(not get_bson_cstr(key)))
-            {
-                return false;
-            }
-
-            if (not is_array and not sax->key(key))
-            {
-                return false;
-            }
-
-            if (JSON_UNLIKELY(not parse_bson_element_internal(element_type, element_type_parse_position)))
-            {
-                return false;
-            }
-
-            // get_bson_cstr only appends
-            key.clear();
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief Reads an array from the BSON input and passes it to the SAX-parser.
-    @return whether a valid BSON-array was passed to the SAX parser
-    */
-    bool parse_bson_array()
-    {
-        std::int32_t document_size;
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_UNLIKELY(not parse_bson_element_list(/*is_array*/true)))
-        {
-            return false;
-        }
-
-        return sax->end_array();
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether a valid CBOR value was passed to the SAX parser
-    */
-    bool parse_cbor_internal(const bool get_char = true)
-    {
-        switch (get_char ? get() : current)
-        {
-            // EOF
-            case std::char_traits<char>::eof():
-                return unexpect_eof(input_format_t::cbor, "value");
-
-            // Integer 0x00..0x17 (0..23)
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                std::uint16_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
-            {
-                std::uint32_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                std::uint64_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            // Negative integer -1-0x00..-1-0x17 (-1..-24)
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
-
-            case 0x38: // Negative integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
-            {
-                std::uint16_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
-            {
-                std::uint32_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
-            {
-                std::uint64_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1)
-                        - static_cast<number_integer_t>(number));
-            }
-
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                string_t s;
-                return get_cbor_string(s) and sax->string(s);
-            }
-
-            // array (0x00..0x17 data items follow)
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
-
-            case 0x98: // array (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x99: // array (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x9A: // array (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x9B: // array (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x9F: // array (indefinite length)
-                return get_cbor_array(std::size_t(-1));
-
-            // map (0x00..0x17 pairs of data items follow)
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
-
-            case 0xB8: // map (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xB9: // map (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xBA: // map (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xBB: // map (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xBF: // map (indefinite length)
-                return get_cbor_object(std::size_t(-1));
-
-            case 0xF4: // false
-                return sax->boolean(false);
-
-            case 0xF5: // true
-                return sax->boolean(true);
-
-            case 0xF6: // null
-                return sax->null();
-
-            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
-            {
-                const int byte1_raw = get();
-                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-                const int byte2_raw = get();
-                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-
-                const auto byte1 = static_cast<unsigned char>(byte1_raw);
-                const auto byte2 = static_cast<unsigned char>(byte2_raw);
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added
-                // to IEEE 754 in 2008, today's programming platforms often
-                // still only have limited support for them. It is very
-                // easy to include at least decoding support for them even
-                // without such support. An example of a small decoder for
-                // half-precision floating-point numbers in the C language
-                // is shown in Fig. 3.
-                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
-                const double val = [&half]
-                {
-                    const int exp = (half >> 10u) & 0x1Fu;
-                    const unsigned int mant = half & 0x3FFu;
-                    assert(0 <= exp and exp <= 32);
-                    assert(0 <= mant and mant <= 1024);
-                    switch (exp)
-                    {
-                        case 0:
-                            return std::ldexp(mant, -24);
-                        case 31:
-                            return (mant == 0)
-                            ? std::numeric_limits<double>::infinity()
-                            : std::numeric_limits<double>::quiet_NaN();
-                        default:
-                            return std::ldexp(mant + 1024, exp - 25);
-                    }
-                }();
-                return sax->number_float((half & 0x8000u) != 0
-                                         ? static_cast<number_float_t>(-val)
-                                         : static_cast<number_float_t>(val), "");
-            }
-
-            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
-            {
-                float number;
-                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
-            {
-                double number;
-                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            default: // anything else (0xFF is handled inside the other types)
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-    Additionally, CBOR's strings with indefinite lengths are supported.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_cbor_string(string_t& result)
-    {
-        if (JSON_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            {
-                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    string_t chunk;
-                    if (not get_cbor_string(chunk))
-                    {
-                        return false;
-                    }
-                    result.append(chunk);
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string")));
-            }
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array or std::size_t(-1) for an
-                    array of indefinite size
-    @return whether array creation completed
-    */
-    bool get_cbor_array(const std::size_t len)
-    {
-        if (JSON_UNLIKELY(not sax->start_array(len)))
-        {
-            return false;
-        }
-
-        if (len != std::size_t(-1))
-        {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                if (JSON_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            while (get() != 0xFF)
-            {
-                if (JSON_UNLIKELY(not parse_cbor_internal(false)))
-                {
-                    return false;
-                }
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object or std::size_t(-1) for an
-                    object of indefinite size
-    @return whether object creation completed
-    */
-    bool get_cbor_object(const std::size_t len)
-    {
-        if (JSON_UNLIKELY(not sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        if (len != std::size_t(-1))
-        {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                get();
-                if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
-                {
-                    return false;
-                }
-
-                if (JSON_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-                key.clear();
-            }
-        }
-        else
-        {
-            while (get() != 0xFF)
-            {
-                if (JSON_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
-                {
-                    return false;
-                }
-
-                if (JSON_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    /*!
-    @return whether a valid MessagePack value was passed to the SAX parser
-    */
-    bool parse_msgpack_internal()
-    {
-        switch (get())
-        {
-            // EOF
-            case std::char_traits<char>::eof():
-                return unexpect_eof(input_format_t::msgpack, "value");
-
-            // positive fixint
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-            case 0x18:
-            case 0x19:
-            case 0x1A:
-            case 0x1B:
-            case 0x1C:
-            case 0x1D:
-            case 0x1E:
-            case 0x1F:
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-            case 0x38:
-            case 0x39:
-            case 0x3A:
-            case 0x3B:
-            case 0x3C:
-            case 0x3D:
-            case 0x3E:
-            case 0x3F:
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58:
-            case 0x59:
-            case 0x5A:
-            case 0x5B:
-            case 0x5C:
-            case 0x5D:
-            case 0x5E:
-            case 0x5F:
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78:
-            case 0x79:
-            case 0x7A:
-            case 0x7B:
-            case 0x7C:
-            case 0x7D:
-            case 0x7E:
-            case 0x7F:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            // fixmap
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixarray
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-            case 0x98:
-            case 0x99:
-            case 0x9A:
-            case 0x9B:
-            case 0x9C:
-            case 0x9D:
-            case 0x9E:
-            case 0x9F:
-                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            {
-                string_t s;
-                return get_msgpack_string(s) and sax->string(s);
-            }
-
-            case 0xC0: // nil
-                return sax->null();
-
-            case 0xC2: // false
-                return sax->boolean(false);
-
-            case 0xC3: // true
-                return sax->boolean(true);
-
-            case 0xCA: // float 32
-            {
-                float number;
-                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCB: // float 64
-            {
-                double number;
-                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCC: // uint 8
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xCD: // uint 16
-            {
-                std::uint16_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xCE: // uint 32
-            {
-                std::uint32_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xCF: // uint 64
-            {
-                std::uint64_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xD0: // int 8
-            {
-                std::int8_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xD1: // int 16
-            {
-                std::int16_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xD2: // int 32
-            {
-                std::int32_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xD3: // int 64
-            {
-                std::int64_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xD9: // str 8
-            case 0xDA: // str 16
-            case 0xDB: // str 32
-            {
-                string_t s;
-                return get_msgpack_string(s) and sax->string(s);
-            }
-
-            case 0xDC: // array 16
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDD: // array 32
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDE: // map 16
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xDF: // map 32
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            // negative fixint
-            case 0xE0:
-            case 0xE1:
-            case 0xE2:
-            case 0xE3:
-            case 0xE4:
-            case 0xE5:
-            case 0xE6:
-            case 0xE7:
-            case 0xE8:
-            case 0xE9:
-            case 0xEA:
-            case 0xEB:
-            case 0xEC:
-            case 0xED:
-            case 0xEE:
-            case 0xEF:
-            case 0xF0:
-            case 0xF1:
-            case 0xF2:
-            case 0xF3:
-            case 0xF4:
-            case 0xF5:
-            case 0xF6:
-            case 0xF7:
-            case 0xF8:
-            case 0xF9:
-            case 0xFA:
-            case 0xFB:
-            case 0xFC:
-            case 0xFD:
-            case 0xFE:
-            case 0xFF:
-                return sax->number_integer(static_cast<std::int8_t>(current));
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value")));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_msgpack_string(string_t& result)
-    {
-        if (JSON_UNLIKELY(not unexpect_eof(input_format_t::msgpack, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            {
-                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0xD9: // str 8
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDA: // str 16
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDB: // str 32
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string")));
-            }
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array
-    @return whether array creation completed
-    */
-    bool get_msgpack_array(const std::size_t len)
-    {
-        if (JSON_UNLIKELY(not sax->start_array(len)))
-        {
-            return false;
-        }
-
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            if (JSON_UNLIKELY(not parse_msgpack_internal()))
-            {
-                return false;
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object
-    @return whether object creation completed
-    */
-    bool get_msgpack_object(const std::size_t len)
-    {
-        if (JSON_UNLIKELY(not sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            get();
-            if (JSON_UNLIKELY(not get_msgpack_string(key) or not sax->key(key)))
-            {
-                return false;
-            }
-
-            if (JSON_UNLIKELY(not parse_msgpack_internal()))
-            {
-                return false;
-            }
-            key.clear();
-        }
-
-        return sax->end_object();
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether a valid UBJSON value was passed to the SAX parser
-    */
-    bool parse_ubjson_internal(const bool get_char = true)
-    {
-        return get_ubjson_value(get_char ? get_ignore_noop() : current);
-    }
-
-    /*!
-    @brief reads a UBJSON string
-
-    This function is either called after reading the 'S' byte explicitly
-    indicating a string, or in case of an object key where the 'S' byte can be
-    left out.
-
-    @param[out] result   created string
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether string creation completed
-    */
-    bool get_ubjson_string(string_t& result, const bool get_char = true)
-    {
-        if (get_char)
-        {
-            get();  // TODO(niels): may we ignore N here?
-        }
-
-        if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            case 'U':
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'i':
-            {
-                std::int8_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'I':
-            {
-                std::int16_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'l':
-            {
-                std::int32_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'L':
-            {
-                std::int64_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            default:
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string")));
-        }
-    }
-
-    /*!
-    @param[out] result  determined size
-    @return whether size determination completed
-    */
-    bool get_ubjson_size_value(std::size_t& result)
-    {
-        switch (get_ignore_noop())
-        {
-            case 'U':
-            {
-                std::uint8_t number;
-                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'i':
-            {
-                std::int8_t number;
-                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'I':
-            {
-                std::int16_t number;
-                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'l':
-            {
-                std::int32_t number;
-                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'L':
-            {
-                std::int64_t number;
-                if (JSON_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size")));
-            }
-        }
-    }
-
-    /*!
-    @brief determine the type and size for a container
-
-    In the optimized UBJSON format, a type and a size can be provided to allow
-    for a more compact representation.
-
-    @param[out] result  pair of the size and the type
-
-    @return whether pair creation completed
-    */
-    bool get_ubjson_size_type(std::pair<std::size_t, int>& result)
-    {
-        result.first = string_t::npos; // size
-        result.second = 0; // type
-
-        get_ignore_noop();
-
-        if (current == '$')
-        {
-            result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "type")))
-            {
-                return false;
-            }
-
-            get_ignore_noop();
-            if (JSON_UNLIKELY(current != '#'))
-            {
-                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
-                {
-                    return false;
-                }
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size")));
-            }
-
-            return get_ubjson_size_value(result.first);
-        }
-
-        if (current == '#')
-        {
-            return get_ubjson_size_value(result.first);
-        }
-
-        return true;
-    }
-
-    /*!
-    @param prefix  the previously read or set type prefix
-    @return whether value creation completed
-    */
-    bool get_ubjson_value(const int prefix)
-    {
-        switch (prefix)
-        {
-            case std::char_traits<char>::eof():  // EOF
-                return unexpect_eof(input_format_t::ubjson, "value");
-
-            case 'T':  // true
-                return sax->boolean(true);
-            case 'F':  // false
-                return sax->boolean(false);
-
-            case 'Z':  // null
-                return sax->null();
-
-            case 'U':
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number);
-            }
-
-            case 'i':
-            {
-                std::int8_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'I':
-            {
-                std::int16_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'l':
-            {
-                std::int32_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'L':
-            {
-                std::int64_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'd':
-            {
-                float number;
-                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'D':
-            {
-                double number;
-                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'C':  // char
-            {
-                get();
-                if (JSON_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "char")))
-                {
-                    return false;
-                }
-                if (JSON_UNLIKELY(current > 127))
-                {
-                    auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char")));
-                }
-                string_t s(1, static_cast<char>(current));
-                return sax->string(s);
-            }
-
-            case 'S':  // string
-            {
-                string_t s;
-                return get_ubjson_string(s) and sax->string(s);
-            }
-
-            case '[':  // array
-                return get_ubjson_array();
-
-            case '{':  // object
-                return get_ubjson_object();
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value")));
-            }
-        }
-    }
-
-    /*!
-    @return whether array creation completed
-    */
-    bool get_ubjson_array()
-    {
-        std::pair<std::size_t, int> size_and_type;
-        if (JSON_UNLIKELY(not get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_UNLIKELY(not sax->start_array(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                if (size_and_type.second != 'N')
-                {
-                    for (std::size_t i = 0; i < size_and_type.first; ++i)
-                    {
-                        if (JSON_UNLIKELY(not get_ubjson_value(size_and_type.second)))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_UNLIKELY(not parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
-            {
-                return false;
-            }
-
-            while (current != ']')
-            {
-                if (JSON_UNLIKELY(not parse_ubjson_internal(false)))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @return whether object creation completed
-    */
-    bool get_ubjson_object()
-    {
-        std::pair<std::size_t, int> size_and_type;
-        if (JSON_UNLIKELY(not get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        string_t key;
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_UNLIKELY(not sax->start_object(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_UNLIKELY(not get_ubjson_value(size_and_type.second)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_UNLIKELY(not parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-        else
-        {
-            if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
-            {
-                return false;
-            }
-
-            while (current != '}')
-            {
-                if (JSON_UNLIKELY(not get_ubjson_string(key, false) or not sax->key(key)))
-                {
-                    return false;
-                }
-                if (JSON_UNLIKELY(not parse_ubjson_internal()))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*!
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a -'ve valued
-    `std::char_traits<char>::eof()` in that case.
-
-    @return character read from the input
-    */
-    int get()
-    {
-        ++chars_read;
-        return current = ia->get_character();
-    }
-
-    /*!
-    @return character read from the input after ignoring all 'N' entries
-    */
-    int get_ignore_noop()
-    {
-        do
-        {
-            get();
-        }
-        while (current == 'N');
-
-        return current;
-    }
-
-    /*
-    @brief read a number from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format   the current format (for diagnostics)
-    @param[out] result  number of type @a NumberType
-
-    @return whether conversion completed
-
-    @note This function needs to respect the system's endianess, because
-          bytes in CBOR, MessagePack, and UBJSON are stored in network order
-          (big endian) and therefore need reordering on little endian systems.
-    */
-    template<typename NumberType, bool InputIsLittleEndian = false>
-    bool get_number(const input_format_t format, NumberType& result)
-    {
-        // step 1: read input into array with system's byte order
-        std::array<std::uint8_t, sizeof(NumberType)> vec;
-        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
-        {
-            get();
-            if (JSON_UNLIKELY(not unexpect_eof(format, "number")))
-            {
-                return false;
-            }
-
-            // reverse byte order prior to conversion if necessary
-            if (is_little_endian != InputIsLittleEndian)
-            {
-                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
-            }
-            else
-            {
-                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
-            }
-        }
-
-        // step 2: convert array into number of type T and return
-        std::memcpy(&result, vec.data(), sizeof(NumberType));
-        return true;
-    }
-
-    /*!
-    @brief create a string by reading characters from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of characters to read
-    @param[out] result string created by reading @a len bytes
-
-    @return whether string creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of string memory.
-    */
-    template<typename NumberType>
-    bool get_string(const input_format_t format,
-                    const NumberType len,
-                    string_t& result)
-    {
-        bool success = true;
-        std::generate_n(std::back_inserter(result), len, [this, &success, &format]()
-        {
-            get();
-            if (JSON_UNLIKELY(not unexpect_eof(format, "string")))
-            {
-                success = false;
-            }
-            return static_cast<char>(current);
-        });
-        return success;
-    }
-
-    /*!
-    @param[in] format   the current format (for diagnostics)
-    @param[in] context  further context information (for diagnostics)
-    @return whether the last read character is not EOF
-    */
-    bool unexpect_eof(const input_format_t format, const char* context) const
-    {
-        if (JSON_UNLIKELY(current == std::char_traits<char>::eof()))
-        {
-            return sax->parse_error(chars_read, "<end of file>",
-                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context)));
-        }
-        return true;
-    }
-
-    /*!
-    @return a string representation of the last read byte
-    */
-    std::string get_token_string() const
-    {
-        std::array<char, 3> cr{{}};
-        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
-        return std::string{cr.data()};
-    }
-
-    /*!
-    @param[in] format   the current format
-    @param[in] detail   a detailed error message
-    @param[in] context  further contect information
-    @return a message string to use in the parse_error exceptions
-    */
-    std::string exception_message(const input_format_t format,
-                                  const std::string& detail,
-                                  const std::string& context) const
-    {
-        std::string error_msg = "syntax error while parsing ";
-
-        switch (format)
-        {
-            case input_format_t::cbor:
-                error_msg += "CBOR";
-                break;
-
-            case input_format_t::msgpack:
-                error_msg += "MessagePack";
-                break;
-
-            case input_format_t::ubjson:
-                error_msg += "UBJSON";
-                break;
-
-            case input_format_t::bson:
-                error_msg += "BSON";
-                break;
-
-            default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
-        }
-
-        return error_msg + " " + context + ": " + detail;
-    }
-
-  private:
-    /// input adapter
-    input_adapter_t ia = nullptr;
-
-    /// the current character
-    int current = std::char_traits<char>::eof();
-
-    /// the number of characters read
-    std::size_t chars_read = 0;
-
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
-
-    /// the SAX parser
-    json_sax_t* sax = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
 // #include <nlohmann/detail/input/lexer.hpp>
 
 
@@ -5523,19 +5901,9 @@ namespace detail
 // lexer //
 ///////////
 
-/*!
-@brief lexical analysis
-
-This class organizes the lexical analysis during JSON deserialization.
-*/
 template<typename BasicJsonType>
-class lexer
+class lexer_base
 {
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-
   public:
     /// token types for the parser
     enum class token_type
@@ -5560,6 +5928,8 @@ class lexer
     };
 
     /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
     static const char* token_type_name(const token_type t) noexcept
     {
         switch (t)
@@ -5574,9 +5944,9 @@ class lexer
                 return "null literal";
             case token_type::value_string:
                 return "string literal";
-            case lexer::token_type::value_unsigned:
-            case lexer::token_type::value_integer:
-            case lexer::token_type::value_float:
+            case token_type::value_unsigned:
+            case token_type::value_integer:
+            case token_type::value_float:
                 return "number literal";
             case token_type::begin_array:
                 return "'['";
@@ -5602,15 +5972,36 @@ class lexer
                 // LCOV_EXCL_STOP
         }
     }
+};
+/*!
+@brief lexical analysis
 
-    explicit lexer(detail::input_adapter_t&& adapter)
-        : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class lexer : public lexer_base<BasicJsonType>
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    using token_type = typename lexer_base<BasicJsonType>::token_type;
+
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false)
+        : ia(std::move(adapter))
+        , ignore_comments(ignore_comments_)
+        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
+    {}
 
     // delete because of pointer members
     lexer(const lexer&) = delete;
-    lexer(lexer&&) = delete;
+    lexer(lexer&&) = default;
     lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) = delete;
+    lexer& operator=(lexer&&) = default;
     ~lexer() = default;
 
   private:
@@ -5619,10 +6010,11 @@ class lexer
     /////////////////////
 
     /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
     static char get_decimal_point() noexcept
     {
-        const auto loc = localeconv();
-        assert(loc != nullptr);
+        const auto* loc = localeconv();
+        JSON_ASSERT(loc != nullptr);
         return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
     }
 
@@ -5648,7 +6040,7 @@ class lexer
     int get_codepoint()
     {
         // this function only makes sense after reading `\u`
-        assert(current == 'u');
+        JSON_ASSERT(current == 'u');
         int codepoint = 0;
 
         const auto factors = { 12u, 8u, 4u, 0u };
@@ -5656,15 +6048,15 @@ class lexer
         {
             get();
 
-            if (current >= '0' and current <= '9')
+            if (current >= '0' && current <= '9')
             {
                 codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
             }
-            else if (current >= 'A' and current <= 'F')
+            else if (current >= 'A' && current <= 'F')
             {
                 codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
             }
-            else if (current >= 'a' and current <= 'f')
+            else if (current >= 'a' && current <= 'f')
             {
                 codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
             }
@@ -5674,7 +6066,7 @@ class lexer
             }
         }
 
-        assert(0x0000 <= codepoint and codepoint <= 0xFFFF);
+        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
         return codepoint;
     }
 
@@ -5693,15 +6085,15 @@ class lexer
 
     @return true if and only if no range violation was detected
     */
-    bool next_byte_in_range(std::initializer_list<int> ranges)
+    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
     {
-        assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
+        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
         add(current);
 
         for (auto range = ranges.begin(); range != ranges.end(); ++range)
         {
             get();
-            if (JSON_LIKELY(*range <= current and current <= *(++range)))
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
             {
                 add(current);
             }
@@ -5736,7 +6128,7 @@ class lexer
         reset();
 
         // we entered the function by reading an open quote
-        assert(current == '\"');
+        JSON_ASSERT(current == '\"');
 
         while (true)
         {
@@ -5744,7 +6136,7 @@ class lexer
             switch (get())
             {
                 // end of file while parsing string
-                case std::char_traits<char>::eof():
+                case std::char_traits<char_type>::eof():
                 {
                     error_message = "invalid string: missing closing quote";
                     return token_type::parse_error;
@@ -5800,28 +6192,28 @@ class lexer
                             const int codepoint1 = get_codepoint();
                             int codepoint = codepoint1; // start with codepoint1
 
-                            if (JSON_UNLIKELY(codepoint1 == -1))
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
                             {
                                 error_message = "invalid string: '\\u' must be followed by 4 hex digits";
                                 return token_type::parse_error;
                             }
 
                             // check if code point is a high surrogate
-                            if (0xD800 <= codepoint1 and codepoint1 <= 0xDBFF)
+                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
                             {
                                 // expect next \uxxxx entry
-                                if (JSON_LIKELY(get() == '\\' and get() == 'u'))
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
                                 {
                                     const int codepoint2 = get_codepoint();
 
-                                    if (JSON_UNLIKELY(codepoint2 == -1))
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
                                     {
                                         error_message = "invalid string: '\\u' must be followed by 4 hex digits";
                                         return token_type::parse_error;
                                     }
 
                                     // check if codepoint2 is a low surrogate
-                                    if (JSON_LIKELY(0xDC00 <= codepoint2 and codepoint2 <= 0xDFFF))
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
                                     {
                                         // overwrite codepoint
                                         codepoint = static_cast<int>(
@@ -5836,19 +6228,19 @@ class lexer
                                     }
                                     else
                                     {
-                                        error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
                                         return token_type::parse_error;
                                     }
                                 }
                                 else
                                 {
-                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
+                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
                                     return token_type::parse_error;
                                 }
                             }
                             else
                             {
-                                if (JSON_UNLIKELY(0xDC00 <= codepoint1 and codepoint1 <= 0xDFFF))
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
                                 {
                                     error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
                                     return token_type::parse_error;
@@ -5856,34 +6248,34 @@ class lexer
                             }
 
                             // result of the above calculation yields a proper codepoint
-                            assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
+                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
 
                             // translate codepoint into bytes
                             if (codepoint < 0x80)
                             {
                                 // 1-byte characters: 0xxxxxxx (ASCII)
-                                add(codepoint);
+                                add(static_cast<char_int_type>(codepoint));
                             }
                             else if (codepoint <= 0x7FF)
                             {
                                 // 2-byte characters: 110xxxxx 10xxxxxx
-                                add(static_cast<int>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
-                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
                             }
                             else if (codepoint <= 0xFFFF)
                             {
                                 // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<int>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
-                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
                             }
                             else
                             {
                                 // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<int>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
-                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
-                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
                             }
 
                             break;
@@ -6223,7 +6615,7 @@ class lexer
                 case 0xDE:
                 case 0xDF:
                 {
-                    if (JSON_UNLIKELY(not next_byte_in_range({0x80, 0xBF})))
+                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
                     {
                         return token_type::parse_error;
                     }
@@ -6233,7 +6625,7 @@ class lexer
                 // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
                 case 0xE0:
                 {
-                    if (JSON_UNLIKELY(not (next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
                     {
                         return token_type::parse_error;
                     }
@@ -6257,7 +6649,7 @@ class lexer
                 case 0xEE:
                 case 0xEF:
                 {
-                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
                     {
                         return token_type::parse_error;
                     }
@@ -6267,7 +6659,7 @@ class lexer
                 // U+D000..U+D7FF: bytes ED 80..9F 80..BF
                 case 0xED:
                 {
-                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
                     {
                         return token_type::parse_error;
                     }
@@ -6277,7 +6669,7 @@ class lexer
                 // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
                 case 0xF0:
                 {
-                    if (JSON_UNLIKELY(not (next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
                     {
                         return token_type::parse_error;
                     }
@@ -6289,7 +6681,7 @@ class lexer
                 case 0xF2:
                 case 0xF3:
                 {
-                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
                     {
                         return token_type::parse_error;
                     }
@@ -6299,7 +6691,7 @@ class lexer
                 // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
                 case 0xF4:
                 {
-                    if (JSON_UNLIKELY(not (next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
                     {
                         return token_type::parse_error;
                     }
@@ -6316,16 +6708,90 @@ class lexer
         }
     }
 
+    /*!
+     * @brief scan a comment
+     * @return whether comment could be scanned successfully
+     */
+    bool scan_comment()
+    {
+        switch (get())
+        {
+            // single-line comments skip input until a newline or EOF is read
+            case '/':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case '\n':
+                        case '\r':
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                            return true;
+
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // multi-line comments skip input until */ is read
+            case '*':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                        {
+                            error_message = "invalid comment; missing closing '*/'";
+                            return false;
+                        }
+
+                        case '*':
+                        {
+                            switch (get())
+                            {
+                                case '/':
+                                    return true;
+
+                                default:
+                                {
+                                    unget();
+                                    continue;
+                                }
+                            }
+                        }
+
+                        default:
+                            continue;
+                    }
+                }
+            }
+
+            // unexpected character after reading '/'
+            default:
+            {
+                error_message = "invalid comment; expecting '/' or '*' after '/'";
+                return false;
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
     static void strtof(float& f, const char* str, char** endptr) noexcept
     {
         f = std::strtof(str, endptr);
     }
 
+    JSON_HEDLEY_NON_NULL(2)
     static void strtof(double& f, const char* str, char** endptr) noexcept
     {
         f = std::strtod(str, endptr);
     }
 
+    JSON_HEDLEY_NON_NULL(2)
     static void strtof(long double& f, const char* str, char** endptr) noexcept
     {
         f = std::strtold(str, endptr);
@@ -6348,7 +6814,7 @@ class lexer
     minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
     zero     | done     | done     | exponent | done    | done    | decimal1 | done
     any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
-    decimal1 | decimal2 | [error]  | [error]  | [error] | [error] | [error]  | [error]
+    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
     decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
     exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
     sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
@@ -6411,7 +6877,7 @@ class lexer
 
             // all other characters are rejected outside scan_number()
             default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
         }
 
 scan_number_minus:
@@ -6658,7 +7124,7 @@ scan_number_done:
             const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
 
             // we checked the number format before
-            assert(endptr == token_buffer.data() + token_buffer.size());
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
 
             if (errno == 0)
             {
@@ -6674,7 +7140,7 @@ scan_number_done:
             const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
 
             // we checked the number format before
-            assert(endptr == token_buffer.data() + token_buffer.size());
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
 
             if (errno == 0)
             {
@@ -6691,7 +7157,7 @@ scan_number_done:
         strtof(value_float, token_buffer.data(), &endptr);
 
         // we checked the number format before
-        assert(endptr == token_buffer.data() + token_buffer.size());
+        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
 
         return token_type::value_float;
     }
@@ -6701,13 +7167,14 @@ scan_number_done:
     @param[in] length        the length of the passed literal text
     @param[in] return_type   the token type to return on success
     */
-    token_type scan_literal(const char* literal_text, const std::size_t length,
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char_type* literal_text, const std::size_t length,
                             token_type return_type)
     {
-        assert(current == literal_text[0]);
+        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
         for (std::size_t i = 1; i < length; ++i)
         {
-            if (JSON_UNLIKELY(get() != literal_text[i]))
+            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
             {
                 error_message = "invalid literal";
                 return token_type::parse_error;
@@ -6725,7 +7192,7 @@ scan_number_done:
     {
         token_buffer.clear();
         token_string.clear();
-        token_string.push_back(std::char_traits<char>::to_char_type(current));
+        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
     }
 
     /*
@@ -6738,7 +7205,7 @@ scan_number_done:
 
     @return character read from the input
     */
-    std::char_traits<char>::int_type get()
+    char_int_type get()
     {
         ++position.chars_read_total;
         ++position.chars_read_current_line;
@@ -6750,12 +7217,12 @@ scan_number_done:
         }
         else
         {
-            current = ia->get_character();
+            current = ia.get_character();
         }
 
-        if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
         {
-            token_string.push_back(std::char_traits<char>::to_char_type(current));
+            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
         }
 
         if (current == '\n')
@@ -6794,17 +7261,17 @@ scan_number_done:
             --position.chars_read_current_line;
         }
 
-        if (JSON_LIKELY(current != std::char_traits<char>::eof()))
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
         {
-            assert(not token_string.empty());
+            JSON_ASSERT(!token_string.empty());
             token_string.pop_back();
         }
     }
 
     /// add a character to token_buffer
-    void add(int c)
+    void add(char_int_type c)
     {
-        token_buffer.push_back(std::char_traits<char>::to_char_type(c));
+        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
     }
 
   public:
@@ -6855,7 +7322,7 @@ scan_number_done:
         std::string result;
         for (const auto c : token_string)
         {
-            if ('\x00' <= c and c <= '\x1F')
+            if (static_cast<unsigned char>(c) <= '\x1F')
             {
                 // escape control characters
                 std::array<char, 9> cs{{}};
@@ -6865,7 +7332,7 @@ scan_number_done:
             else
             {
                 // add character as is
-                result.push_back(c);
+                result.push_back(static_cast<std::string::value_type>(c));
             }
         }
 
@@ -6873,6 +7340,7 @@ scan_number_done:
     }
 
     /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
     constexpr const char* get_error_message() const noexcept
     {
         return error_message;
@@ -6891,7 +7359,7 @@ scan_number_done:
         if (get() == 0xEF)
         {
             // check if we completely parse the BOM
-            return get() == 0xBB and get() == 0xBF;
+            return get() == 0xBB && get() == 0xBF;
         }
 
         // the first character is not the beginning of the BOM; unget it to
@@ -6900,21 +7368,38 @@ scan_number_done:
         return true;
     }
 
+    void skip_whitespace()
+    {
+        do
+        {
+            get();
+        }
+        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
+    }
+
     token_type scan()
     {
         // initially, skip the BOM
-        if (position.chars_read_total == 0 and not skip_bom())
+        if (position.chars_read_total == 0 && !skip_bom())
         {
             error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
             return token_type::parse_error;
         }
 
         // read next character and ignore whitespace
-        do
+        skip_whitespace();
+
+        // ignore comments
+        while (ignore_comments && current == '/')
         {
-            get();
+            if (!scan_comment())
+            {
+                return token_type::parse_error;
+            }
+
+            // skip following whitespace
+            skip_whitespace();
         }
-        while (current == ' ' or current == '\t' or current == '\n' or current == '\r');
 
         switch (current)
         {
@@ -6934,11 +7419,20 @@ scan_number_done:
 
             // literals
             case 't':
-                return scan_literal("true", 4, token_type::literal_true);
+            {
+                std::array<char_type, 4> true_literal = {{'t', 'r', 'u', 'e'}};
+                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
+            }
             case 'f':
-                return scan_literal("false", 5, token_type::literal_false);
+            {
+                std::array<char_type, 5> false_literal = {{'f', 'a', 'l', 's', 'e'}};
+                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
+            }
             case 'n':
-                return scan_literal("null", 4, token_type::literal_null);
+            {
+                std::array<char_type, 4> null_literal = {{'n', 'u', 'l', 'l'}};
+                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
+            }
 
             // string
             case '\"':
@@ -6961,7 +7455,7 @@ scan_number_done:
             // end of input (the null byte is needed when parsing from
             // string literals)
             case '\0':
-            case std::char_traits<char>::eof():
+            case std::char_traits<char_type>::eof():
                 return token_type::end_of_input;
 
             // error
@@ -6973,10 +7467,13 @@ scan_number_done:
 
   private:
     /// input adapter
-    detail::input_adapter_t ia = nullptr;
+    InputAdapterType ia;
+
+    /// whether comments should be ignored (true) or signaled as errors (false)
+    const bool ignore_comments = false;
 
     /// the current character
-    std::char_traits<char>::int_type current = std::char_traits<char>::eof();
+    char_int_type current = std::char_traits<char_type>::eof();
 
     /// whether the next get() call should just return current
     bool next_unget = false;
@@ -6985,7 +7482,7 @@ scan_number_done:
     position_t position {};
 
     /// raw input token string (for error messages)
-    std::vector<char> token_string {};
+    std::vector<char_type> token_string {};
 
     /// buffer for variable-length tokens (numbers, strings)
     string_t token_buffer {};
@@ -6999,15 +7496,2614 @@ scan_number_done:
     number_float_t value_float = 0;
 
     /// the decimal point
-    const char decimal_point_char = '.';
+    const char_int_type decimal_point_char = '.';
 };
 }  // namespace detail
 }  // namespace nlohmann
 
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template<typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template<typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template<typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template<typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template<typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template<typename T, typename Binary>
+using binary_function_t =
+    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
+
+template<typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template<typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template<typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template<typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template<typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template<typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
+        "Missing/invalid function: bool binary(binary_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/// how to treat CBOR tags
+enum class cbor_tag_handler_t
+{
+    error,  ///< throw a parse_error exception in case of a tag
+    ignore   ///< ignore tags
+};
+
+/*!
+@brief determine system byte order
+
+@return true if and only if system's byte order is little endian
+
+@note from https://stackoverflow.com/a/1001328/266378
+*/
+static inline bool little_endianess(int num = 1) noexcept
+{
+    return *reinterpret_cast<char*>(&num) == 1;
+}
+
+
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using json_sax_t = SAX;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(InputAdapterType&& adapter) : ia(std::move(adapter))
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default;
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default;
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+    @param[in] tag_handler  how to treat CBOR tags
+
+    @return
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true,
+                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal(true, tag_handler);
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+                result = parse_ubjson_internal();
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result && strict)
+        {
+            if (format == input_format_t::ubjson)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(),
+                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value")));
+            }
+        }
+
+        return result;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<typename string_t::value_type>(current);
+        }
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string")));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
+    }
+
+    /*!
+    @brief Parses a byte array input of length @a len from the BSON input.
+    @param[in] len  The length of the byte array to be read.
+    @param[in, out] result  A reference to the binary variable where the read
+                            array is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 0
+    @return `true` if the byte array was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_binary(const NumberType len, binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 0))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary")));
+        }
+
+        // All BSON binary values have a subtype
+        std::uint8_t subtype{};
+        get_number<std::uint8_t>(input_format_t::bson, subtype);
+        result.set_subtype(subtype);
+
+        return get_binary(input_format_t::bson, len, result);
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const char_int_type element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number{};
+                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len{};
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x05: // binary
+            {
+                std::int32_t len{};
+                binary_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value{};
+                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value{};
+                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
+                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data())));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+
+        while (auto element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (!is_array && !sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true) or whether the last read character should
+                         be considered instead (false)
+    @param[in] tag_handler how CBOR tags should be treated
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char,
+                             const cbor_tag_handler_t tag_handler)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            case 0x5F: // Binary data (indefinite length)
+            {
+                binary_t b;
+                return get_cbor_binary(b) && sax->binary(b);
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) && sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(std::size_t(-1), tag_handler);
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(std::size_t(-1), tag_handler);
+
+            case 0xC6: // tagged item
+            case 0xC7:
+            case 0xC8:
+            case 0xC9:
+            case 0xCA:
+            case 0xCB:
+            case 0xCC:
+            case 0xCD:
+            case 0xCE:
+            case 0xCF:
+            case 0xD0:
+            case 0xD1:
+            case 0xD2:
+            case 0xD3:
+            case 0xD4:
+            case 0xD8: // tagged item (1 bytes follow)
+            case 0xD9: // tagged item (2 bytes follow)
+            case 0xDA: // tagged item (4 bytes follow)
+            case 0xDB: // tagged item (8 bytes follow)
+            {
+                switch (tag_handler)
+                {
+                    case cbor_tag_handler_t::error:
+                    {
+                        auto last_token = get_token_string();
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
+                    }
+
+                    case cbor_tag_handler_t::ignore:
+                    {
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                        return parse_cbor_internal(true, tag_handler);
+                    }
+
+                    default:            // LCOV_EXCL_LINE
+                        JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                }
+            }
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (!get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into the byte array.
+    Additionally, CBOR's byte arrays with indefinite lengths are supported.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_cbor_binary(binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            {
+                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5F: // Binary data (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    binary_t chunk;
+                    if (!get_cbor_binary(chunk))
+                    {
+                        return false;
+                    }
+                    result.insert(result.end(), chunk.begin(), chunk.end());
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or std::size_t(-1) for an
+                    array of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len,
+                        const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or std::size_t(-1) for an
+                    object of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len,
+                         const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) && sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xC4: // bin 8
+            case 0xC5: // bin 16
+            case 0xC6: // bin 32
+            case 0xC7: // ext 8
+            case 0xC8: // ext 16
+            case 0xC9: // ext 32
+            case 0xD4: // fixext 1
+            case 0xD5: // fixext 2
+            case 0xD6: // fixext 4
+            case 0xD7: // fixext 8
+            case 0xD8: // fixext 16
+            {
+                binary_t b;
+                return get_msgpack_binary(b) && sax->binary(b);
+            }
+
+            case 0xCA: // float 32
+            {
+                float number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into a byte array.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_msgpack_binary(binary_t& result)
+    {
+        // helper function to set the subtype
+        auto assign_and_return_true = [&result](std::int8_t subtype)
+        {
+            result.set_subtype(static_cast<std::uint8_t>(subtype));
+            return true;
+        };
+
+        switch (current)
+        {
+            case 0xC4: // bin 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC5: // bin 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC6: // bin 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC7: // ext 8
+            {
+                std::uint8_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC8: // ext 16
+            {
+                std::uint16_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC9: // ext 32
+            {
+                std::uint32_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD4: // fixext 1
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 1, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD5: // fixext 2
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 2, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD6: // fixext 4
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 4, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD7: // fixext 8
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 8, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD8: // fixext 16
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 16, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            default:           // LCOV_EXCL_LINE
+                return false;  // LCOV_EXCL_LINE
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            default:
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string")));
+        }
+    }
+
+    /*!
+    @param[out] result  determined size
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result)
+    {
+        switch (get_ignore_noop())
+        {
+            case 'U':
+            {
+                std::uint8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size")));
+            }
+        }
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result)
+    {
+        result.first = string_t::npos; // size
+        result.second = 0; // type
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size")));
+            }
+
+            return get_ubjson_size_value(result.first);
+        }
+
+        if (current == '#')
+        {
+            return get_ubjson_size_value(result.first);
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const char_int_type prefix)
+    {
+        switch (prefix)
+        {
+            case std::char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format_t::ubjson, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'd':
+            {
+                float number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'H':
+            {
+                return get_ubjson_high_precision_number();
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char")));
+                }
+                string_t s(1, static_cast<typename string_t::value_type>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) && sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    // Note, no reader for UBJSON binary types is implemented because they do
+    // not exist
+
+    bool get_ubjson_high_precision_number()
+    {
+        // get size of following number string
+        std::size_t size{};
+        auto res = get_ubjson_size_value(size);
+        if (JSON_HEDLEY_UNLIKELY(!res))
+        {
+            return res;
+        }
+
+        // get number string
+        std::vector<char> number_vector;
+        for (std::size_t i = 0; i < size; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number")))
+            {
+                return false;
+            }
+            number_vector.push_back(static_cast<char>(current));
+        }
+
+        // parse number string
+        auto number_ia = detail::input_adapter(std::forward<decltype(number_vector)>(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, decltype(number_ia)>(std::move(number_ia), false);
+        const auto result_number = number_lexer.scan();
+        const auto number_string = number_lexer.get_token_string();
+        const auto result_remainder = number_lexer.scan();
+
+        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
+
+        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
+        {
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number")));
+        }
+
+        switch (result_number)
+        {
+            case token_type::value_integer:
+                return sax->number_integer(number_lexer.get_number_integer());
+            case token_type::value_unsigned:
+                return sax->number_unsigned(number_lexer.get_number_unsigned());
+            case token_type::value_float:
+                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            default:
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number")));
+        }
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char_type>::eof()` in that case.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++chars_read;
+        return current = ia.get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    char_int_type get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianess, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec;
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != InputIsLittleEndian)
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<typename string_t::value_type>(current));
+        };
+        return success;
+    }
+
+    /*!
+    @brief create a byte array by reading bytes from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of bytes to read
+    @param[out] result byte array created by reading @a len bytes
+
+    @return whether byte array creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of memory.
+    */
+    template<typename NumberType>
+    bool get_binary(const input_format_t format,
+                    const NumberType len,
+                    binary_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<std::uint8_t>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context)));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+        }
+
+        return error_msg + " " + context + ": " + detail;
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// the current character
+    char_int_type current = std::char_traits<char_type>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianess
+    const bool is_little_endian = little_endianess();
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
 // #include <nlohmann/detail/input/parser.hpp>
 
 
-#include <cassert> // assert
 #include <cmath> // isfinite
 #include <cstdint> // uint8_t
 #include <functional> // function
@@ -7038,46 +10134,50 @@ namespace detail
 // parser //
 ////////////
 
+enum class parse_event_t : uint8_t
+{
+    /// the parser read `{` and started to process a JSON object
+    object_start,
+    /// the parser read `}` and finished processing a JSON object
+    object_end,
+    /// the parser read `[` and started to process a JSON array
+    array_start,
+    /// the parser read `]` and finished processing a JSON array
+    array_end,
+    /// the parser read a key of a value in an object
+    key,
+    /// the parser finished reading a JSON value
+    value
+};
+
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+
 /*!
 @brief syntax analysis
 
-This class implements a recursive decent parser.
+This class implements a recursive descent parser.
 */
-template<typename BasicJsonType>
+template<typename BasicJsonType, typename InputAdapterType>
 class parser
 {
     using number_integer_t = typename BasicJsonType::number_integer_t;
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
     using number_float_t = typename BasicJsonType::number_float_t;
     using string_t = typename BasicJsonType::string_t;
-    using lexer_t = lexer<BasicJsonType>;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
     using token_type = typename lexer_t::token_type;
 
   public:
-    enum class parse_event_t : uint8_t
-    {
-        /// the parser read `{` and started to process a JSON object
-        object_start,
-        /// the parser read `}` and finished processing a JSON object
-        object_end,
-        /// the parser read `[` and started to process a JSON array
-        array_start,
-        /// the parser read `]` and finished processing a JSON array
-        array_end,
-        /// the parser read a key of a value in an object
-        key,
-        /// the parser finished reading a JSON value
-        value
-    };
-
-    using parser_callback_t =
-        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
-
     /// a parser reading from an input adapter
-    explicit parser(detail::input_adapter_t&& adapter,
-                    const parser_callback_t cb = nullptr,
-                    const bool allow_exceptions_ = true)
-        : callback(cb), m_lexer(std::move(adapter)), allow_exceptions(allow_exceptions_)
+    explicit parser(InputAdapterType&& adapter,
+                    const parser_callback_t<BasicJsonType> cb = nullptr,
+                    const bool allow_exceptions_ = true,
+                    const bool skip_comments = false)
+        : callback(cb)
+        , m_lexer(std::move(adapter), skip_comments)
+        , allow_exceptions(allow_exceptions_)
     {
         // read first token
         get_token();
@@ -7102,7 +10202,7 @@ class parser
             result.assert_invariant();
 
             // in strict mode, input must be completely read
-            if (strict and (get_token() != token_type::end_of_input))
+            if (strict && (get_token() != token_type::end_of_input))
             {
                 sdp.parse_error(m_lexer.get_position(),
                                 m_lexer.get_token_string(),
@@ -7131,7 +10231,7 @@ class parser
             result.assert_invariant();
 
             // in strict mode, input must be completely read
-            if (strict and (get_token() != token_type::end_of_input))
+            if (strict && (get_token() != token_type::end_of_input))
             {
                 sdp.parse_error(m_lexer.get_position(),
                                 m_lexer.get_token_string(),
@@ -7160,14 +10260,15 @@ class parser
         return sax_parse(&sax_acceptor, strict);
     }
 
-    template <typename SAX>
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
     bool sax_parse(SAX* sax, const bool strict = true)
     {
         (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
         const bool result = sax_parse_internal(sax);
 
         // strict mode: next byte must be EOF
-        if (result and strict and (get_token() != token_type::end_of_input))
+        if (result && strict && (get_token() != token_type::end_of_input))
         {
             return sax->parse_error(m_lexer.get_position(),
                                     m_lexer.get_token_string(),
@@ -7179,7 +10280,8 @@ class parser
     }
 
   private:
-    template <typename SAX>
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
     bool sax_parse_internal(SAX* sax)
     {
         // stack to remember the hierarchy of structured values we are parsing
@@ -7190,14 +10292,14 @@ class parser
 
         while (true)
         {
-            if (not skip_to_state_evaluation)
+            if (!skip_to_state_evaluation)
             {
                 // invariant: get_token() was called before each iteration
                 switch (last_token)
                 {
                     case token_type::begin_object:
                     {
-                        if (JSON_UNLIKELY(not sax->start_object(std::size_t(-1))))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
                         {
                             return false;
                         }
@@ -7205,7 +10307,7 @@ class parser
                         // closing } -> we are done
                         if (get_token() == token_type::end_object)
                         {
-                            if (JSON_UNLIKELY(not sax->end_object()))
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
                             {
                                 return false;
                             }
@@ -7213,20 +10315,20 @@ class parser
                         }
 
                         // parse key
-                        if (JSON_UNLIKELY(last_token != token_type::value_string))
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
                                                     parse_error::create(101, m_lexer.get_position(),
                                                             exception_message(token_type::value_string, "object key")));
                         }
-                        if (JSON_UNLIKELY(not sax->key(m_lexer.get_string())))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
                         {
                             return false;
                         }
 
                         // parse separator (:)
-                        if (JSON_UNLIKELY(get_token() != token_type::name_separator))
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
@@ -7244,7 +10346,7 @@ class parser
 
                     case token_type::begin_array:
                     {
-                        if (JSON_UNLIKELY(not sax->start_array(std::size_t(-1))))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
                         {
                             return false;
                         }
@@ -7252,7 +10354,7 @@ class parser
                         // closing ] -> we are done
                         if (get_token() == token_type::end_array)
                         {
-                            if (JSON_UNLIKELY(not sax->end_array()))
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
                             {
                                 return false;
                             }
@@ -7270,14 +10372,14 @@ class parser
                     {
                         const auto res = m_lexer.get_number_float();
 
-                        if (JSON_UNLIKELY(not std::isfinite(res)))
+                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
                         {
                             return sax->parse_error(m_lexer.get_position(),
                                                     m_lexer.get_token_string(),
                                                     out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
                         }
 
-                        if (JSON_UNLIKELY(not sax->number_float(res, m_lexer.get_string())))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
                         {
                             return false;
                         }
@@ -7287,7 +10389,7 @@ class parser
 
                     case token_type::literal_false:
                     {
-                        if (JSON_UNLIKELY(not sax->boolean(false)))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
                         {
                             return false;
                         }
@@ -7296,7 +10398,7 @@ class parser
 
                     case token_type::literal_null:
                     {
-                        if (JSON_UNLIKELY(not sax->null()))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
                         {
                             return false;
                         }
@@ -7305,7 +10407,7 @@ class parser
 
                     case token_type::literal_true:
                     {
-                        if (JSON_UNLIKELY(not sax->boolean(true)))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
                         {
                             return false;
                         }
@@ -7314,7 +10416,7 @@ class parser
 
                     case token_type::value_integer:
                     {
-                        if (JSON_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
                         {
                             return false;
                         }
@@ -7323,7 +10425,7 @@ class parser
 
                     case token_type::value_string:
                     {
-                        if (JSON_UNLIKELY(not sax->string(m_lexer.get_string())))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
                         {
                             return false;
                         }
@@ -7332,7 +10434,7 @@ class parser
 
                     case token_type::value_unsigned:
                     {
-                        if (JSON_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
                         {
                             return false;
                         }
@@ -7380,9 +10482,9 @@ class parser
                 }
 
                 // closing ]
-                if (JSON_LIKELY(last_token == token_type::end_array))
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
                 {
-                    if (JSON_UNLIKELY(not sax->end_array()))
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
                     {
                         return false;
                     }
@@ -7391,7 +10493,7 @@ class parser
                     // new value, we need to evaluate the new state first.
                     // By setting skip_to_state_evaluation to false, we
                     // are effectively jumping to the beginning of this if.
-                    assert(not states.empty());
+                    JSON_ASSERT(!states.empty());
                     states.pop_back();
                     skip_to_state_evaluation = true;
                     continue;
@@ -7408,7 +10510,7 @@ class parser
                 if (get_token() == token_type::value_separator)
                 {
                     // parse key
-                    if (JSON_UNLIKELY(get_token() != token_type::value_string))
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
                     {
                         return sax->parse_error(m_lexer.get_position(),
                                                 m_lexer.get_token_string(),
@@ -7416,13 +10518,13 @@ class parser
                                                         exception_message(token_type::value_string, "object key")));
                     }
 
-                    if (JSON_UNLIKELY(not sax->key(m_lexer.get_string())))
+                    if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
                     {
                         return false;
                     }
 
                     // parse separator (:)
-                    if (JSON_UNLIKELY(get_token() != token_type::name_separator))
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
                     {
                         return sax->parse_error(m_lexer.get_position(),
                                                 m_lexer.get_token_string(),
@@ -7436,9 +10538,9 @@ class parser
                 }
 
                 // closing }
-                if (JSON_LIKELY(last_token == token_type::end_object))
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
                 {
-                    if (JSON_UNLIKELY(not sax->end_object()))
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
                     {
                         return false;
                     }
@@ -7447,7 +10549,7 @@ class parser
                     // new value, we need to evaluate the new state first.
                     // By setting skip_to_state_evaluation to false, we
                     // are effectively jumping to the beginning of this if.
-                    assert(not states.empty());
+                    JSON_ASSERT(!states.empty());
                     states.pop_back();
                     skip_to_state_evaluation = true;
                     continue;
@@ -7471,7 +10573,7 @@ class parser
     {
         std::string error_msg = "syntax error ";
 
-        if (not context.empty())
+        if (!context.empty())
         {
             error_msg += "while parsing " + context + " ";
         }
@@ -7498,7 +10600,7 @@ class parser
 
   private:
     /// callback function
-    const parser_callback_t callback = nullptr;
+    const parser_callback_t<BasicJsonType> callback = nullptr;
     /// the type of the last read token
     token_type last_token = token_type::uninitialized;
     /// the lexer
@@ -7660,7 +10762,6 @@ template<typename BasicJsonType> struct internal_iterator
 // #include <nlohmann/detail/iterators/iter_impl.hpp>
 
 
-#include <ciso646> // not
 #include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
 #include <type_traits> // conditional, is_const, remove_const
 
@@ -7752,7 +10853,7 @@ class iter_impl
     */
     explicit iter_impl(pointer object) noexcept : m_object(object)
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -7785,17 +10886,42 @@ class iter_impl
           to iterator is not defined.
     */
 
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
     /*!
     @brief converting constructor
     @param[in] other  non-const iterator to copy from
     @note It is not checked whether @a other is initialized.
     */
     iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it) {}
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
 
     /*!
     @brief converting assignment
-    @param[in,out] other  non-const iterator to copy from
+    @param[in] other  non-const iterator to copy from
     @return const/non-const iterator
     @note It is not checked whether @a other is initialized.
     */
@@ -7813,7 +10939,7 @@ class iter_impl
     */
     void set_begin() noexcept
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -7850,7 +10976,7 @@ class iter_impl
     */
     void set_end() noexcept
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -7881,19 +11007,19 @@ class iter_impl
     */
     reference operator*() const
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
             case value_t::object:
             {
-                assert(m_it.object_iterator != m_object->m_value.object->end());
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
                 return m_it.object_iterator->second;
             }
 
             case value_t::array:
             {
-                assert(m_it.array_iterator != m_object->m_value.array->end());
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
                 return *m_it.array_iterator;
             }
 
@@ -7902,7 +11028,7 @@ class iter_impl
 
             default:
             {
-                if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
                 {
                     return *m_object;
                 }
@@ -7918,25 +11044,25 @@ class iter_impl
     */
     pointer operator->() const
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
             case value_t::object:
             {
-                assert(m_it.object_iterator != m_object->m_value.object->end());
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
                 return &(m_it.object_iterator->second);
             }
 
             case value_t::array:
             {
-                assert(m_it.array_iterator != m_object->m_value.array->end());
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
                 return &*m_it.array_iterator;
             }
 
             default:
             {
-                if (JSON_LIKELY(m_it.primitive_iterator.is_begin()))
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
                 {
                     return m_object;
                 }
@@ -7963,7 +11089,7 @@ class iter_impl
     */
     iter_impl& operator++()
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -8006,7 +11132,7 @@ class iter_impl
     */
     iter_impl& operator--()
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -8039,12 +11165,12 @@ class iter_impl
     bool operator==(const iter_impl& other) const
     {
         // if objects are not the same, the comparison is undefined
-        if (JSON_UNLIKELY(m_object != other.m_object))
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
         {
             JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
         }
 
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -8065,7 +11191,7 @@ class iter_impl
     */
     bool operator!=(const iter_impl& other) const
     {
-        return not operator==(other);
+        return !operator==(other);
     }
 
     /*!
@@ -8075,12 +11201,12 @@ class iter_impl
     bool operator<(const iter_impl& other) const
     {
         // if objects are not the same, the comparison is undefined
-        if (JSON_UNLIKELY(m_object != other.m_object))
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
         {
             JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
         }
 
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -8101,7 +11227,7 @@ class iter_impl
     */
     bool operator<=(const iter_impl& other) const
     {
-        return not other.operator < (*this);
+        return !other.operator < (*this);
     }
 
     /*!
@@ -8110,7 +11236,7 @@ class iter_impl
     */
     bool operator>(const iter_impl& other) const
     {
-        return not operator<=(other);
+        return !operator<=(other);
     }
 
     /*!
@@ -8119,7 +11245,7 @@ class iter_impl
     */
     bool operator>=(const iter_impl& other) const
     {
-        return not operator<(other);
+        return !operator<(other);
     }
 
     /*!
@@ -8128,7 +11254,7 @@ class iter_impl
     */
     iter_impl& operator+=(difference_type i)
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -8199,7 +11325,7 @@ class iter_impl
     */
     difference_type operator-(const iter_impl& other) const
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -8220,7 +11346,7 @@ class iter_impl
     */
     reference operator[](difference_type n) const
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
         switch (m_object->m_type)
         {
@@ -8235,7 +11361,7 @@ class iter_impl
 
             default:
             {
-                if (JSON_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
                 {
                     return *m_object;
                 }
@@ -8251,9 +11377,9 @@ class iter_impl
     */
     const typename object_t::key_type& key() const
     {
-        assert(m_object != nullptr);
+        JSON_ASSERT(m_object != nullptr);
 
-        if (JSON_LIKELY(m_object->is_object()))
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
         {
             return m_it.object_iterator->first;
         }
@@ -8276,7 +11402,7 @@ class iter_impl
     /// the actual iterator of the associated instance
     internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
 };
-}  // namespace detail
+} // namespace detail
 } // namespace nlohmann
 
 // #include <nlohmann/detail/iterators/iteration_proxy.hpp>
@@ -8408,7 +11534,8 @@ class json_reverse_iterator : public std::reverse_iterator<Base>
 
 
 #include <algorithm> // all_of
-#include <cassert> // assert
+#include <cctype> // isdigit
+#include <limits> // max
 #include <numeric> // accumulate
 #include <string> // string
 #include <utility> // move
@@ -8535,8 +11662,8 @@ class json_pointer
     /*!
     @brief append an array index at the end of this JSON pointer
 
-    @param[in] array_index  array index ot append
-    @return JSON pointer with @a array_index appended
+    @param[in] array_idx  array index to append
+    @return JSON pointer with @a array_idx appended
 
     @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
 
@@ -8548,9 +11675,9 @@ class json_pointer
 
     @since version 3.6.0
     */
-    json_pointer& operator/=(std::size_t array_index)
+    json_pointer& operator/=(std::size_t array_idx)
     {
-        return *this /= std::to_string(array_index);
+        return *this /= std::to_string(array_idx);
     }
 
     /*!
@@ -8598,8 +11725,8 @@ class json_pointer
     @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
 
     @param[in] ptr  JSON pointer
-    @param[in] array_index  array index
-    @return a new JSON pointer with @a array_index appended to @a ptr
+    @param[in] array_idx  array index
+    @return a new JSON pointer with @a array_idx appended to @a ptr
 
     @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
 
@@ -8609,9 +11736,9 @@ class json_pointer
 
     @since version 3.6.0
     */
-    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_index)
+    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx)
     {
-        return json_pointer(ptr) /= array_index;
+        return json_pointer(ptr) /= array_idx;
     }
 
     /*!
@@ -8654,7 +11781,7 @@ class json_pointer
     */
     void pop_back()
     {
-        if (JSON_UNLIKELY(empty()))
+        if (JSON_HEDLEY_UNLIKELY(empty()))
         {
             JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
         }
@@ -8676,9 +11803,9 @@ class json_pointer
 
     @since version 3.6.0
     */
-    const std::string& back()
+    const std::string& back() const
     {
-        if (JSON_UNLIKELY(empty()))
+        if (JSON_HEDLEY_UNLIKELY(empty()))
         {
             JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
         }
@@ -8734,25 +11861,59 @@ class json_pointer
 
     @return integer representation of @a s
 
+    @throw parse_error.106  if an array index begins with '0'
+    @throw parse_error.109  if an array index begins not with a digit
     @throw out_of_range.404 if string @a s could not be converted to an integer
+    @throw out_of_range.410 if an array index exceeds size_type
     */
-    static int array_index(const std::string& s)
+    static typename BasicJsonType::size_type array_index(const std::string& s)
     {
-        std::size_t processed_chars = 0;
-        const int res = std::stoi(s, &processed_chars);
+        using size_type = typename BasicJsonType::size_type;
 
-        // check if the string was completely read
-        if (JSON_UNLIKELY(processed_chars != s.size()))
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
+        {
+            JSON_THROW(detail::parse_error::create(106, 0,
+                                                   "array index '" + s +
+                                                   "' must not begin with '0'"));
+        }
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
+        {
+            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number"));
+        }
+
+        std::size_t processed_chars = 0;
+        unsigned long long res = 0;
+        JSON_TRY
+        {
+            res = std::stoull(s, &processed_chars);
+        }
+        JSON_CATCH(std::out_of_range&)
         {
             JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
         }
 
-        return res;
+        // check if the string was completely read
+        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
+        }
+
+        // only triggered on special platforms (like 32bit), see also
+        // https://github.com/nlohmann/json/pull/2203
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))
+        {
+            JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type")); // LCOV_EXCL_LINE
+        }
+
+        return static_cast<size_type>(res);
     }
 
     json_pointer top() const
     {
-        if (JSON_UNLIKELY(empty()))
+        if (JSON_HEDLEY_UNLIKELY(empty()))
         {
             JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
         }
@@ -8772,14 +11933,13 @@ class json_pointer
     */
     BasicJsonType& get_and_create(BasicJsonType& j) const
     {
-        using size_type = typename BasicJsonType::size_type;
         auto result = &j;
 
         // in case no reference tokens exist, return a reference to the JSON value
         // j which will be overwritten by a primitive value
         for (const auto& reference_token : reference_tokens)
         {
-            switch (result->m_type)
+            switch (result->type())
             {
                 case detail::value_t::null:
                 {
@@ -8806,14 +11966,7 @@ class json_pointer
                 case detail::value_t::array:
                 {
                     // create an entry in the array
-                    JSON_TRY
-                    {
-                        result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
+                    result = &result->operator[](array_index(reference_token));
                     break;
                 }
 
@@ -8852,27 +12005,26 @@ class json_pointer
     */
     BasicJsonType& get_unchecked(BasicJsonType* ptr) const
     {
-        using size_type = typename BasicJsonType::size_type;
         for (const auto& reference_token : reference_tokens)
         {
             // convert null values to arrays or objects before continuing
-            if (ptr->m_type == detail::value_t::null)
+            if (ptr->is_null())
             {
                 // check if reference token is a number
                 const bool nums =
                     std::all_of(reference_token.begin(), reference_token.end(),
-                                [](const char x)
+                                [](const unsigned char x)
                 {
-                    return x >= '0' and x <= '9';
+                    return std::isdigit(x);
                 });
 
                 // change value to array for numbers or "-" or to object otherwise
-                *ptr = (nums or reference_token == "-")
+                *ptr = (nums || reference_token == "-")
                        ? detail::value_t::array
                        : detail::value_t::object;
             }
 
-            switch (ptr->m_type)
+            switch (ptr->type())
             {
                 case detail::value_t::object:
                 {
@@ -8883,14 +12035,6 @@ class json_pointer
 
                 case detail::value_t::array:
                 {
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
                     if (reference_token == "-")
                     {
                         // explicitly treat "-" as index beyond the end
@@ -8899,15 +12043,7 @@ class json_pointer
                     else
                     {
                         // convert array index to number; unchecked access
-                        JSON_TRY
-                        {
-                            ptr = &ptr->operator[](
-                                static_cast<size_type>(array_index(reference_token)));
-                        }
-                        JSON_CATCH(std::invalid_argument&)
-                        {
-                            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                        }
+                        ptr = &ptr->operator[](array_index(reference_token));
                     }
                     break;
                 }
@@ -8928,10 +12064,9 @@ class json_pointer
     */
     BasicJsonType& get_checked(BasicJsonType* ptr) const
     {
-        using size_type = typename BasicJsonType::size_type;
         for (const auto& reference_token : reference_tokens)
         {
-            switch (ptr->m_type)
+            switch (ptr->type())
             {
                 case detail::value_t::object:
                 {
@@ -8942,7 +12077,7 @@ class json_pointer
 
                 case detail::value_t::array:
                 {
-                    if (JSON_UNLIKELY(reference_token == "-"))
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" always fails the range check
                         JSON_THROW(detail::out_of_range::create(402,
@@ -8950,23 +12085,8 @@ class json_pointer
                                                                 ") is out of range"));
                     }
 
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
                     // note: at performs range check
-                    JSON_TRY
-                    {
-                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
+                    ptr = &ptr->at(array_index(reference_token));
                     break;
                 }
 
@@ -8993,10 +12113,9 @@ class json_pointer
     */
     const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
     {
-        using size_type = typename BasicJsonType::size_type;
         for (const auto& reference_token : reference_tokens)
         {
-            switch (ptr->m_type)
+            switch (ptr->type())
             {
                 case detail::value_t::object:
                 {
@@ -9007,7 +12126,7 @@ class json_pointer
 
                 case detail::value_t::array:
                 {
-                    if (JSON_UNLIKELY(reference_token == "-"))
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" cannot be used for const access
                         JSON_THROW(detail::out_of_range::create(402,
@@ -9015,24 +12134,8 @@ class json_pointer
                                                                 ") is out of range"));
                     }
 
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
                     // use unchecked array access
-                    JSON_TRY
-                    {
-                        ptr = &ptr->operator[](
-                            static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
+                    ptr = &ptr->operator[](array_index(reference_token));
                     break;
                 }
 
@@ -9052,10 +12155,9 @@ class json_pointer
     */
     const BasicJsonType& get_checked(const BasicJsonType* ptr) const
     {
-        using size_type = typename BasicJsonType::size_type;
         for (const auto& reference_token : reference_tokens)
         {
-            switch (ptr->m_type)
+            switch (ptr->type())
             {
                 case detail::value_t::object:
                 {
@@ -9066,7 +12168,7 @@ class json_pointer
 
                 case detail::value_t::array:
                 {
-                    if (JSON_UNLIKELY(reference_token == "-"))
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
                     {
                         // "-" always fails the range check
                         JSON_THROW(detail::out_of_range::create(402,
@@ -9074,23 +12176,8 @@ class json_pointer
                                                                 ") is out of range"));
                     }
 
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
                     // note: at performs range check
-                    JSON_TRY
-                    {
-                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
+                    ptr = &ptr->at(array_index(reference_token));
                     break;
                 }
 
@@ -9102,6 +12189,81 @@ class json_pointer
         return *ptr;
     }
 
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    bool contains(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (!ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
+                    {
+                        // invalid char
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
+                        {
+                            // first char should be between '1' and '9'
+                            return false;
+                        }
+                        for (std::size_t i = 1; i < reference_token.size(); i++)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
+                            {
+                                // other char should be between '0' and '9'
+                                return false;
+                            }
+                        }
+                    }
+
+                    const auto idx = array_index(reference_token);
+                    if (idx >= ptr->size())
+                    {
+                        // index out of range
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](idx);
+                    break;
+                }
+
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
     /*!
     @brief split the string input to reference tokens
 
@@ -9122,7 +12284,7 @@ class json_pointer
         }
 
         // check if nonempty reference string begins with slash
-        if (JSON_UNLIKELY(reference_string[0] != '/'))
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
         {
             JSON_THROW(detail::parse_error::create(107, 1,
                                                    "JSON pointer must be empty or begin with '/' - was: '" +
@@ -9154,12 +12316,12 @@ class json_pointer
                     pos != std::string::npos;
                     pos = reference_token.find_first_of('~', pos + 1))
             {
-                assert(reference_token[pos] == '~');
+                JSON_ASSERT(reference_token[pos] == '~');
 
                 // ~ must be followed by 0 or 1
-                if (JSON_UNLIKELY(pos == reference_token.size() - 1 or
-                                  (reference_token[pos + 1] != '0' and
-                                   reference_token[pos + 1] != '1')))
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
+                                         (reference_token[pos + 1] != '0' &&
+                                          reference_token[pos + 1] != '1')))
                 {
                     JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
                 }
@@ -9189,7 +12351,7 @@ class json_pointer
     static void replace_substring(std::string& s, const std::string& f,
                                   const std::string& t)
     {
-        assert(not f.empty());
+        JSON_ASSERT(!f.empty());
         for (auto pos = s.find(f);                // find first occurrence of f
                 pos != std::string::npos;         // make sure f was found
                 s.replace(pos, f.size(), t),      // replace with t, and
@@ -9223,7 +12385,7 @@ class json_pointer
                         const BasicJsonType& value,
                         BasicJsonType& result)
     {
-        switch (value.m_type)
+        switch (value.type())
         {
             case detail::value_t::array:
             {
@@ -9284,7 +12446,7 @@ class json_pointer
     static BasicJsonType
     unflatten(const BasicJsonType& value)
     {
-        if (JSON_UNLIKELY(not value.is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
         {
             JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
         }
@@ -9294,7 +12456,7 @@ class json_pointer
         // iterate the JSON object values
         for (const auto& element : *value.m_value.object)
         {
-            if (JSON_UNLIKELY(not element.second.is_primitive()))
+            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
             {
                 JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
             }
@@ -9340,7 +12502,7 @@ class json_pointer
     friend bool operator!=(json_pointer const& lhs,
                            json_pointer const& rhs) noexcept
     {
-        return not (lhs == rhs);
+        return !(lhs == rhs);
     }
 
     /// the reference tokens
@@ -9368,23 +12530,30 @@ class json_ref
     using value_type = BasicJsonType;
 
     json_ref(value_type&& value)
-        : owned_value(std::move(value)), value_ref(&owned_value), is_rvalue(true)
+        : owned_value(std::move(value))
+        , value_ref(&owned_value)
+        , is_rvalue(true)
     {}
 
     json_ref(const value_type& value)
-        : value_ref(const_cast<value_type*>(&value)), is_rvalue(false)
+        : value_ref(const_cast<value_type*>(&value))
+        , is_rvalue(false)
     {}
 
     json_ref(std::initializer_list<json_ref> init)
-        : owned_value(init), value_ref(&owned_value), is_rvalue(true)
+        : owned_value(init)
+        , value_ref(&owned_value)
+        , is_rvalue(true)
     {}
 
     template <
         class... Args,
         enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
     json_ref(Args && ... args)
-        : owned_value(std::forward<Args>(args)...), value_ref(&owned_value),
-          is_rvalue(true) {}
+        : owned_value(std::forward<Args>(args)...)
+        , value_ref(&owned_value)
+        , is_rvalue(true)
+    {}
 
     // class should be movable only
     json_ref(json_ref&&) = default;
@@ -9415,7 +12584,7 @@ class json_ref
   private:
     mutable value_type owned_value = nullptr;
     value_type* value_ref = nullptr;
-    const bool is_rvalue;
+    const bool is_rvalue = true;
 };
 }  // namespace detail
 }  // namespace nlohmann
@@ -9435,9 +12604,12 @@ class json_ref
 #include <cstring> // memcpy
 #include <limits> // numeric_limits
 #include <string> // string
+#include <cmath> // isnan, isinf
 
 // #include <nlohmann/detail/input/binary_reader.hpp>
 
+// #include <nlohmann/detail/macro_scope.hpp>
+
 // #include <nlohmann/detail/output/output_adapters.hpp>
 
 
@@ -9449,6 +12621,8 @@ class json_ref
 #include <ostream> // basic_ostream
 #include <string> // basic_string
 #include <vector> // vector
+// #include <nlohmann/detail/macro_scope.hpp>
+
 
 namespace nlohmann
 {
@@ -9480,6 +12654,7 @@ class output_vector_adapter : public output_adapter_protocol<CharType>
         v.push_back(c);
     }
 
+    JSON_HEDLEY_NON_NULL(2)
     void write_characters(const CharType* s, std::size_t length) override
     {
         std::copy(s, s + length, std::back_inserter(v));
@@ -9503,6 +12678,7 @@ class output_stream_adapter : public output_adapter_protocol<CharType>
         stream.put(c);
     }
 
+    JSON_HEDLEY_NON_NULL(2)
     void write_characters(const CharType* s, std::size_t length) override
     {
         stream.write(s, static_cast<std::streamsize>(length));
@@ -9526,6 +12702,7 @@ class output_string_adapter : public output_adapter_protocol<CharType>
         str.push_back(c);
     }
 
+    JSON_HEDLEY_NON_NULL(2)
     void write_characters(const CharType* s, std::size_t length) override
     {
         str.append(s, length);
@@ -9575,6 +12752,8 @@ template<typename BasicJsonType, typename CharType>
 class binary_writer
 {
     using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
 
   public:
     /*!
@@ -9584,7 +12763,7 @@ class binary_writer
     */
     explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
     {
-        assert(oa);
+        JSON_ASSERT(oa);
     }
 
     /*!
@@ -9725,8 +12904,24 @@ class binary_writer
 
             case value_t::number_float:
             {
-                oa->write_character(get_cbor_float_prefix(j.m_value.number_float));
-                write_number(j.m_value.number_float);
+                if (std::isnan(j.m_value.number_float))
+                {
+                    // NaN is 0xf97e00 in CBOR
+                    oa->write_character(to_char_type(0xF9));
+                    oa->write_character(to_char_type(0x7E));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else if (std::isinf(j.m_value.number_float))
+                {
+                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
+                    oa->write_character(to_char_type(0xf9));
+                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else
+                {
+                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
+                }
                 break;
             }
 
@@ -9807,6 +13002,51 @@ class binary_writer
                 break;
             }
 
+            case value_t::binary:
+            {
+                if (j.m_value.binary->has_subtype())
+                {
+                    write_number(static_cast<std::uint8_t>(0xd8));
+                    write_number(j.m_value.binary->subtype());
+                }
+
+                // step 1: write control byte and the binary array size
+                const auto N = j.m_value.binary->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x40 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x58));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x59));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
             case value_t::object:
             {
                 // step 1: write control byte and the object size
@@ -9917,28 +13157,28 @@ class binary_writer
                         // negative fixnum
                         write_number(static_cast<std::int8_t>(j.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() and
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
                              j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
                     {
                         // int 8
                         oa->write_character(to_char_type(0xD0));
                         write_number(static_cast<std::int8_t>(j.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() and
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
                              j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
                     {
                         // int 16
                         oa->write_character(to_char_type(0xD1));
                         write_number(static_cast<std::int16_t>(j.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() and
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
                              j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
                     {
                         // int 32
                         oa->write_character(to_char_type(0xD2));
                         write_number(static_cast<std::int32_t>(j.m_value.number_integer));
                     }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() and
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
                              j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
                     {
                         // int 64
@@ -9985,8 +13225,7 @@ class binary_writer
 
             case value_t::number_float:
             {
-                oa->write_character(get_msgpack_float_prefix(j.m_value.number_float));
-                write_number(j.m_value.number_float);
+                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
                 break;
             }
 
@@ -10055,6 +13294,89 @@ class binary_writer
                 break;
             }
 
+            case value_t::binary:
+            {
+                // step 0: determine if the binary type has a set subtype to
+                // determine whether or not to use the ext or fixext types
+                const bool use_ext = j.m_value.binary->has_subtype();
+
+                // step 1: write control byte and the byte string length
+                const auto N = j.m_value.binary->size();
+                if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    std::uint8_t output_type{};
+                    bool fixed = true;
+                    if (use_ext)
+                    {
+                        switch (N)
+                        {
+                            case 1:
+                                output_type = 0xD4; // fixext 1
+                                break;
+                            case 2:
+                                output_type = 0xD5; // fixext 2
+                                break;
+                            case 4:
+                                output_type = 0xD6; // fixext 4
+                                break;
+                            case 8:
+                                output_type = 0xD7; // fixext 8
+                                break;
+                            case 16:
+                                output_type = 0xD8; // fixext 16
+                                break;
+                            default:
+                                output_type = 0xC7; // ext 8
+                                fixed = false;
+                                break;
+                        }
+
+                    }
+                    else
+                    {
+                        output_type = 0xC4; // bin 8
+                        fixed = false;
+                    }
+
+                    oa->write_character(to_char_type(output_type));
+                    if (!fixed)
+                    {
+                        write_number(static_cast<std::uint8_t>(N));
+                    }
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    std::uint8_t output_type = use_ext
+                                               ? 0xC8 // ext 16
+                                               : 0xC5; // bin 16
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    std::uint8_t output_type = use_ext
+                                               ? 0xC9 // ext 32
+                                               : 0xC6; // bin 32
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 1.5: if this is an ext type, write the subtype
+                if (use_ext)
+                {
+                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
+                }
+
+                // step 2: write the byte string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
             case value_t::object:
             {
                 // step 1: write control byte and the object size
@@ -10161,9 +13483,9 @@ class binary_writer
                 }
 
                 bool prefix_required = true;
-                if (use_type and not j.m_value.array->empty())
+                if (use_type && !j.m_value.array->empty())
                 {
-                    assert(use_count);
+                    JSON_ASSERT(use_count);
                     const CharType first_prefix = ubjson_prefix(j.front());
                     const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
                                                          [this, first_prefix](const BasicJsonType & v)
@@ -10190,7 +13512,50 @@ class binary_writer
                     write_ubjson(el, use_count, use_type, prefix_required);
                 }
 
-                if (not use_count)
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                if (use_type && !j.m_value.binary->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    oa->write_character(to_char_type('$'));
+                    oa->write_character('U');
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true);
+                }
+
+                if (use_type)
+                {
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                        j.m_value.binary->size());
+                }
+                else
+                {
+                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
+                    {
+                        oa->write_character(to_char_type('U'));
+                        oa->write_character(j.m_value.binary->data()[i]);
+                    }
+                }
+
+                if (!use_count)
                 {
                     oa->write_character(to_char_type(']'));
                 }
@@ -10206,9 +13571,9 @@ class binary_writer
                 }
 
                 bool prefix_required = true;
-                if (use_type and not j.m_value.object->empty())
+                if (use_type && !j.m_value.object->empty())
                 {
-                    assert(use_count);
+                    JSON_ASSERT(use_count);
                     const CharType first_prefix = ubjson_prefix(j.front());
                     const bool same_prefix = std::all_of(j.begin(), j.end(),
                                                          [this, first_prefix](const BasicJsonType & v)
@@ -10239,7 +13604,7 @@ class binary_writer
                     write_ubjson(el.second, use_count, use_type, prefix_required);
                 }
 
-                if (not use_count)
+                if (!use_count)
                 {
                     oa->write_character(to_char_type('}'));
                 }
@@ -10264,7 +13629,7 @@ class binary_writer
     static std::size_t calc_bson_entry_header_size(const string_t& name)
     {
         const auto it = name.find(static_cast<typename string_t::value_type>(0));
-        if (JSON_UNLIKELY(it != BasicJsonType::string_t::npos))
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
         {
             JSON_THROW(out_of_range::create(409,
                                             "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")"));
@@ -10340,7 +13705,7 @@ class binary_writer
     */
     static std::size_t calc_bson_integer_size(const std::int64_t value)
     {
-        return (std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)()
+        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
                ? sizeof(std::int32_t)
                : sizeof(std::int64_t);
     }
@@ -10351,7 +13716,7 @@ class binary_writer
     void write_bson_integer(const string_t& name,
                             const std::int64_t value)
     {
-        if ((std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)())
+        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
         {
             write_bson_entry_header(name, 0x10); // int32
             write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
@@ -10410,17 +13775,24 @@ class binary_writer
     */
     static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
     {
-        std::size_t embedded_document_size = 0ul;
         std::size_t array_index = 0ul;
 
-        for (const auto& el : value)
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), std::size_t(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
         {
-            embedded_document_size += calc_bson_element_size(std::to_string(array_index++), el);
-        }
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
 
         return sizeof(std::int32_t) + embedded_document_size + 1ul;
     }
 
+    /*!
+    @return The size of the BSON-encoded binary array @a value
+    */
+    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
     /*!
     @brief Writes a BSON element with key @a name and array @a value
     */
@@ -10440,6 +13812,20 @@ class binary_writer
         oa->write_character(to_char_type(0x00));
     }
 
+    /*!
+    @brief Writes a BSON element with key @a name and binary value @a value
+    */
+    void write_bson_binary(const string_t& name,
+                           const binary_t& value)
+    {
+        write_bson_entry_header(name, 0x05);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size()));
+        write_number(value.has_subtype() ? value.subtype() : std::uint8_t(0x00));
+
+        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
+    }
+
     /*!
     @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
     @return The calculated size for the BSON document entry for @a j with the given @a name.
@@ -10456,6 +13842,9 @@ class binary_writer
             case value_t::array:
                 return header_size + calc_bson_array_size(*j.m_value.array);
 
+            case value_t::binary:
+                return header_size + calc_bson_binary_size(*j.m_value.binary);
+
             case value_t::boolean:
                 return header_size + 1ul;
 
@@ -10476,7 +13865,7 @@ class binary_writer
 
             // LCOV_EXCL_START
             default:
-                assert(false);
+                JSON_ASSERT(false);
                 return 0ul;
                 // LCOV_EXCL_STOP
         }
@@ -10500,6 +13889,9 @@ class binary_writer
             case value_t::array:
                 return write_bson_array(name, *j.m_value.array);
 
+            case value_t::binary:
+                return write_bson_binary(name, *j.m_value.binary);
+
             case value_t::boolean:
                 return write_bson_boolean(name, j.m_value.boolean);
 
@@ -10520,7 +13912,7 @@ class binary_writer
 
             // LCOV_EXCL_START
             default:
-                assert(false);
+                JSON_ASSERT(false);
                 return;
                 // LCOV_EXCL_STOP
         }
@@ -10534,7 +13926,7 @@ class binary_writer
     */
     static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
     {
-        std::size_t document_size = std::accumulate(value.begin(), value.end(), 0ul,
+        std::size_t document_size = std::accumulate(value.begin(), value.end(), std::size_t(0),
                                     [](size_t result, const typename BasicJsonType::object_t::value_type & el)
         {
             return result += calc_bson_element_size(el.first, el.second);
@@ -10652,18 +14044,28 @@ class binary_writer
         }
         else
         {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
         }
     }
 
     // UBJSON: write number (signed integer)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_signed<NumberType>::value and
-                 not std::is_floating_point<NumberType>::value, int>::type = 0>
+    template < typename NumberType, typename std::enable_if <
+                   std::is_signed<NumberType>::value&&
+                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
     void write_number_with_ubjson_prefix(const NumberType n,
                                          const bool add_prefix)
     {
-        if ((std::numeric_limits<std::int8_t>::min)() <= n and n <= (std::numeric_limits<std::int8_t>::max)())
+        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
         {
             if (add_prefix)
             {
@@ -10671,7 +14073,7 @@ class binary_writer
             }
             write_number(static_cast<std::int8_t>(n));
         }
-        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n and n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
         {
             if (add_prefix)
             {
@@ -10679,7 +14081,7 @@ class binary_writer
             }
             write_number(static_cast<std::uint8_t>(n));
         }
-        else if ((std::numeric_limits<std::int16_t>::min)() <= n and n <= (std::numeric_limits<std::int16_t>::max)())
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
         {
             if (add_prefix)
             {
@@ -10687,7 +14089,7 @@ class binary_writer
             }
             write_number(static_cast<std::int16_t>(n));
         }
-        else if ((std::numeric_limits<std::int32_t>::min)() <= n and n <= (std::numeric_limits<std::int32_t>::max)())
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
         {
             if (add_prefix)
             {
@@ -10695,7 +14097,7 @@ class binary_writer
             }
             write_number(static_cast<std::int32_t>(n));
         }
-        else if ((std::numeric_limits<std::int64_t>::min)() <= n and n <= (std::numeric_limits<std::int64_t>::max)())
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
         {
             if (add_prefix)
             {
@@ -10706,19 +14108,23 @@ class binary_writer
         // LCOV_EXCL_START
         else
         {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
         }
         // LCOV_EXCL_STOP
     }
 
     /*!
     @brief determine the type prefix of container values
-
-    @note This function does not need to be 100% accurate when it comes to
-          integer limits. In case a number exceeds the limits of int64_t,
-          this will be detected by a later call to function
-          write_number_with_ubjson_prefix. Therefore, we return 'L' for any
-          value that does not fit the previous limits.
     */
     CharType ubjson_prefix(const BasicJsonType& j) const noexcept
     {
@@ -10732,46 +14138,54 @@ class binary_writer
 
             case value_t::number_integer:
             {
-                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
                 {
                     return 'i';
                 }
-                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
                 {
                     return 'U';
                 }
-                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
                 {
                     return 'I';
                 }
-                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
                 {
                     return 'l';
                 }
-                // no check and assume int64_t (see note above)
-                return 'L';
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
             }
 
             case value_t::number_unsigned:
             {
-                if (j.m_value.number_unsigned <= (std::numeric_limits<std::int8_t>::max)())
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
                 {
                     return 'i';
                 }
-                if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
                 {
                     return 'U';
                 }
-                if (j.m_value.number_unsigned <= (std::numeric_limits<std::int16_t>::max)())
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
                 {
                     return 'I';
                 }
-                if (j.m_value.number_unsigned <= (std::numeric_limits<std::int32_t>::max)())
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
                 {
                     return 'l';
                 }
-                // no check and assume int64_t (see note above)
-                return 'L';
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
             }
 
             case value_t::number_float:
@@ -10780,7 +14194,8 @@ class binary_writer
             case value_t::string:
                 return 'S';
 
-            case value_t::array:
+            case value_t::array: // fallthrough
+            case value_t::binary:
                 return '[';
 
             case value_t::object:
@@ -10833,24 +14248,44 @@ class binary_writer
         oa->write_characters(vec.data(), sizeof(NumberType));
     }
 
+    void write_compact_float(const number_float_t n, detail::input_format_t format)
+    {
+        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
+                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
+                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(static_cast<float>(n))
+                                : get_msgpack_float_prefix(static_cast<float>(n)));
+            write_number(static_cast<float>(n));
+        }
+        else
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(n)
+                                : get_msgpack_float_prefix(n));
+            write_number(n);
+        }
+    }
+
   public:
     // The following to_char_type functions are implement the conversion
     // between uint8_t and CharType. In case CharType is not unsigned,
     // such a conversion is required to allow values greater than 128.
     // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
     template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value and std::is_signed<char>::value > * = nullptr >
+               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
     static constexpr CharType to_char_type(std::uint8_t x) noexcept
     {
         return *reinterpret_cast<char*>(&x);
     }
 
     template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value and std::is_unsigned<char>::value > * = nullptr >
+               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
     static CharType to_char_type(std::uint8_t x) noexcept
     {
         static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
-        static_assert(std::is_pod<CharType>::value, "CharType must be POD");
+        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
         CharType result;
         std::memcpy(&result, &x, sizeof(x));
         return result;
@@ -10865,8 +14300,8 @@ class binary_writer
 
     template < typename InputCharType, typename C = CharType,
                enable_if_t <
-                   std::is_signed<C>::value and
-                   std::is_signed<char>::value and
+                   std::is_signed<C>::value &&
+                   std::is_signed<char>::value &&
                    std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
                    > * = nullptr >
     static constexpr CharType to_char_type(InputCharType x) noexcept
@@ -10876,7 +14311,7 @@ class binary_writer
 
   private:
     /// whether we can assume little endianess
-    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
+    const bool is_little_endian = little_endianess();
 
     /// the output
     output_adapter_t<CharType> oa = nullptr;
@@ -10891,15 +14326,13 @@ class binary_writer
 
 #include <algorithm> // reverse, remove, fill, find, none_of
 #include <array> // array
-#include <cassert> // assert
-#include <ciso646> // and, or
 #include <clocale> // localeconv, lconv
 #include <cmath> // labs, isfinite, isnan, signbit
 #include <cstddef> // size_t, ptrdiff_t
 #include <cstdint> // uint8_t
 #include <cstdio> // snprintf
 #include <limits> // numeric_limits
-#include <string> // string
+#include <string> // string, char_traits
 #include <type_traits> // is_same
 #include <utility> // move
 
@@ -10907,14 +14340,15 @@ class binary_writer
 
 
 #include <array> // array
-#include <cassert> // assert
-#include <ciso646> // or, and, not
 #include <cmath>   // signbit, isfinite
 #include <cstdint> // intN_t, uintN_t
 #include <cstring> // memcpy, memmove
 #include <limits> // numeric_limits
 #include <type_traits> // conditional
 
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
 namespace nlohmann
 {
 namespace detail
@@ -10942,7 +14376,7 @@ For a detailed description of the algorithm see:
 namespace dtoa_impl
 {
 
-template <typename Target, typename Source>
+template<typename Target, typename Source>
 Target reinterpret_bits(const Source source)
 {
     static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
@@ -10967,8 +14401,8 @@ struct diyfp // f * 2^e
     */
     static diyfp sub(const diyfp& x, const diyfp& y) noexcept
     {
-        assert(x.e == y.e);
-        assert(x.f >= y.f);
+        JSON_ASSERT(x.e == y.e);
+        JSON_ASSERT(x.f >= y.f);
 
         return {x.f - y.f, x.e};
     }
@@ -11044,7 +14478,7 @@ struct diyfp // f * 2^e
     */
     static diyfp normalize(diyfp x) noexcept
     {
-        assert(x.f != 0);
+        JSON_ASSERT(x.f != 0);
 
         while ((x.f >> 63u) == 0)
         {
@@ -11063,8 +14497,8 @@ struct diyfp // f * 2^e
     {
         const int delta = x.e - target_exponent;
 
-        assert(delta >= 0);
-        assert(((x.f << delta) >> delta) == x.f);
+        JSON_ASSERT(delta >= 0);
+        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
 
         return {x.f << delta, target_exponent};
     }
@@ -11083,11 +14517,11 @@ boundaries.
 
 @pre value must be finite and positive
 */
-template <typename FloatType>
+template<typename FloatType>
 boundaries compute_boundaries(FloatType value)
 {
-    assert(std::isfinite(value));
-    assert(value > 0);
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
 
     // Convert the IEEE representation into a diyfp.
     //
@@ -11136,7 +14570,7 @@ boundaries compute_boundaries(FloatType value)
     //      -----------------+------+------+-------------+-------------+---  (B)
     //                       v-     m-     v             m+            v+
 
-    const bool lower_boundary_is_closer = F == 0 and E > 1;
+    const bool lower_boundary_is_closer = F == 0 && E > 1;
     const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
     const diyfp m_minus = lower_boundary_is_closer
                           ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
@@ -11235,7 +14669,7 @@ inline cached_power get_cached_power_for_binary_exponent(int e)
     //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
     //      ==> 2^(alpha - e - 1) <= c
     //
-    // If c were an exakt power of ten, i.e. c = 10^k, one may determine k as
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
     //
     //      k = ceil( log_10( 2^(alpha - e - 1) ) )
     //        = ceil( (alpha - e - 1) * log_10(2) )
@@ -11367,18 +14801,18 @@ inline cached_power get_cached_power_for_binary_exponent(int e)
     //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
     // for |e| <= 1500, but doesn't require floating-point operations.
     // NB: log_10(2) ~= 78913 / 2^18
-    assert(e >= -1500);
-    assert(e <=  1500);
+    JSON_ASSERT(e >= -1500);
+    JSON_ASSERT(e <=  1500);
     const int f = kAlpha - e - 1;
     const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
 
     const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
-    assert(index >= 0);
-    assert(static_cast<std::size_t>(index) < kCachedPowers.size());
+    JSON_ASSERT(index >= 0);
+    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
 
     const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
-    assert(kAlpha <= cached.e + e + 64);
-    assert(kGamma >= cached.e + e + 64);
+    JSON_ASSERT(kAlpha <= cached.e + e + 64);
+    JSON_ASSERT(kGamma >= cached.e + e + 64);
 
     return cached;
 }
@@ -11446,10 +14880,10 @@ inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
 inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
                          std::uint64_t rest, std::uint64_t ten_k)
 {
-    assert(len >= 1);
-    assert(dist <= delta);
-    assert(rest <= delta);
-    assert(ten_k > 0);
+    JSON_ASSERT(len >= 1);
+    JSON_ASSERT(dist <= delta);
+    JSON_ASSERT(rest <= delta);
+    JSON_ASSERT(ten_k > 0);
 
     //               <--------------------------- delta ---->
     //                                  <---- dist --------->
@@ -11471,10 +14905,10 @@ inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t d
     // integer arithmetic.
 
     while (rest < dist
-            and delta - rest >= ten_k
-            and (rest + ten_k < dist or dist - rest > rest + ten_k - dist))
+            && delta - rest >= ten_k
+            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
     {
-        assert(buf[len - 1] != '0');
+        JSON_ASSERT(buf[len - 1] != '0');
         buf[len - 1]--;
         rest += ten_k;
     }
@@ -11502,8 +14936,8 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
     // Grisu2 generates the digits of M+ from left to right and stops as soon as
     // V is in [M-,M+].
 
-    assert(M_plus.e >= kAlpha);
-    assert(M_plus.e <= kGamma);
+    JSON_ASSERT(M_plus.e >= kAlpha);
+    JSON_ASSERT(M_plus.e <= kGamma);
 
     std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
     std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
@@ -11524,7 +14958,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
     //
     // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
 
-    assert(p1 > 0);
+    JSON_ASSERT(p1 > 0);
 
     std::uint32_t pow10;
     const int k = find_largest_pow10(p1, pow10);
@@ -11560,7 +14994,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
         //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
         //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
         //
-        assert(d <= 9);
+        JSON_ASSERT(d <= 9);
         buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
         //
         //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
@@ -11647,7 +15081,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
     //
     // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
 
-    assert(p2 > delta);
+    JSON_ASSERT(p2 > delta);
 
     int m = 0;
     for (;;)
@@ -11658,7 +15092,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
         //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
         //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
         //
-        assert(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
         p2 *= 10;
         const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
         const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
@@ -11667,7 +15101,7 @@ inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
         //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
         //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
         //
-        assert(d <= 9);
+        JSON_ASSERT(d <= 9);
         buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
         //
         //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
@@ -11724,11 +15158,12 @@ v = buf * 10^decimal_exponent
 len is the length of the buffer (number of decimal digits)
 The buffer must be large enough, i.e. >= max_digits10.
 */
+JSON_HEDLEY_NON_NULL(1)
 inline void grisu2(char* buf, int& len, int& decimal_exponent,
                    diyfp m_minus, diyfp v, diyfp m_plus)
 {
-    assert(m_plus.e == m_minus.e);
-    assert(m_plus.e == v.e);
+    JSON_ASSERT(m_plus.e == m_minus.e);
+    JSON_ASSERT(m_plus.e == v.e);
 
     //  --------(-----------------------+-----------------------)--------    (A)
     //          m-                      v                       m+
@@ -11782,14 +15217,15 @@ v = buf * 10^decimal_exponent
 len is the length of the buffer (number of decimal digits)
 The buffer must be large enough, i.e. >= max_digits10.
 */
-template <typename FloatType>
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
 void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
 {
     static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
                   "internal error: not enough precision");
 
-    assert(std::isfinite(value));
-    assert(value > 0);
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
 
     // If the neighbors (and boundaries) of 'value' are always computed for double-precision
     // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
@@ -11821,10 +15257,12 @@ void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
 @return a pointer to the element following the exponent.
 @pre -1000 < e < 1000
 */
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
 inline char* append_exponent(char* buf, int e)
 {
-    assert(e > -1000);
-    assert(e <  1000);
+    JSON_ASSERT(e > -1000);
+    JSON_ASSERT(e <  1000);
 
     if (e < 0)
     {
@@ -11871,11 +15309,13 @@ notation. Otherwise it will be printed in exponential notation.
 @pre min_exp < 0
 @pre max_exp > 0
 */
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
 inline char* format_buffer(char* buf, int len, int decimal_exponent,
                            int min_exp, int max_exp)
 {
-    assert(min_exp < 0);
-    assert(max_exp > 0);
+    JSON_ASSERT(min_exp < 0);
+    JSON_ASSERT(max_exp > 0);
 
     const int k = len;
     const int n = len + decimal_exponent;
@@ -11884,40 +15324,40 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
     // k is the length of the buffer (number of decimal digits)
     // n is the position of the decimal point relative to the start of the buffer.
 
-    if (k <= n and n <= max_exp)
+    if (k <= n && n <= max_exp)
     {
         // digits[000]
         // len <= max_exp + 2
 
-        std::memset(buf + k, '0', static_cast<size_t>(n - k));
+        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
         // Make it look like a floating-point number (#362, #378)
         buf[n + 0] = '.';
         buf[n + 1] = '0';
-        return buf + (n + 2);
+        return buf + (static_cast<size_t>(n) + 2);
     }
 
-    if (0 < n and n <= max_exp)
+    if (0 < n && n <= max_exp)
     {
         // dig.its
         // len <= max_digits10 + 1
 
-        assert(k > n);
+        JSON_ASSERT(k > n);
 
-        std::memmove(buf + (n + 1), buf + n, static_cast<size_t>(k - n));
+        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
         buf[n] = '.';
-        return buf + (k + 1);
+        return buf + (static_cast<size_t>(k) + 1U);
     }
 
-    if (min_exp < n and n <= 0)
+    if (min_exp < n && n <= 0)
     {
         // 0.[000]digits
         // len <= 2 + (-min_exp - 1) + max_digits10
 
-        std::memmove(buf + (2 + -n), buf, static_cast<size_t>(k));
+        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
         buf[0] = '0';
         buf[1] = '.';
         std::memset(buf + 2, '0', static_cast<size_t>(-n));
-        return buf + (2 + (-n) + k);
+        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
     }
 
     if (k == 1)
@@ -11932,9 +15372,9 @@ inline char* format_buffer(char* buf, int len, int decimal_exponent,
         // d.igitsE+123
         // len <= max_digits10 + 1 + 5
 
-        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k - 1));
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
         buf[1] = '.';
-        buf += 1 + k;
+        buf += 1 + static_cast<size_t>(k);
     }
 
     *buf++ = 'e';
@@ -11953,11 +15393,13 @@ format. Returns an iterator pointing past-the-end of the decimal representation.
 @note The buffer must be large enough.
 @note The result is NOT null-terminated.
 */
-template <typename FloatType>
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
 char* to_chars(char* first, const char* last, FloatType value)
 {
     static_cast<void>(last); // maybe unused - fix warning
-    assert(std::isfinite(value));
+    JSON_ASSERT(std::isfinite(value));
 
     // Use signbit(value) instead of (value < 0) since signbit works for -0.
     if (std::signbit(value))
@@ -11975,7 +15417,7 @@ char* to_chars(char* first, const char* last, FloatType value)
         return first;
     }
 
-    assert(last - first >= std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
 
     // Compute v = buffer * 10^decimal_exponent.
     // The decimal digits are stored in the buffer, which needs to be interpreted
@@ -11985,16 +15427,16 @@ char* to_chars(char* first, const char* last, FloatType value)
     int decimal_exponent = 0;
     dtoa_impl::grisu2(first, len, decimal_exponent, value);
 
-    assert(len <= std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
 
     // Format the buffer like printf("%.*g", prec, value)
     constexpr int kMinExp = -4;
     // Use digits10 here to increase compatibility with version 2.
     constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
 
-    assert(last - first >= kMaxExp + 2);
-    assert(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
-    assert(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+    JSON_ASSERT(last - first >= kMaxExp + 2);
+    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
 
     return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
 }
@@ -12038,6 +15480,7 @@ class serializer
     using number_float_t = typename BasicJsonType::number_float_t;
     using number_integer_t = typename BasicJsonType::number_integer_t;
     using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using binary_char_t = typename BasicJsonType::binary_t::value_type;
     static constexpr std::uint8_t UTF8_ACCEPT = 0;
     static constexpr std::uint8_t UTF8_REJECT = 1;
 
@@ -12051,8 +15494,8 @@ class serializer
                error_handler_t error_handler_ = error_handler_t::strict)
         : o(std::move(s))
         , loc(std::localeconv())
-        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep))
-        , decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point))
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
         , indent_char(ichar)
         , indent_string(512, indent_char)
         , error_handler(error_handler_)
@@ -12076,13 +15519,19 @@ class serializer
     - strings and object keys are escaped using `escape_string()`
     - integer numbers are converted implicitly via `operator<<`
     - floating-point numbers are converted to a string using `"%g"` format
+    - binary values are serialized as objects containing the subtype and the
+      byte array
 
-    @param[in] val             value to serialize
-    @param[in] pretty_print    whether the output shall be pretty-printed
-    @param[in] indent_step     the indent level
-    @param[in] current_indent  the current indent level (only used internally)
+    @param[in] val               value to serialize
+    @param[in] pretty_print      whether the output shall be pretty-printed
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] indent_step       the indent level
+    @param[in] current_indent    the current indent level (only used internally)
     */
-    void dump(const BasicJsonType& val, const bool pretty_print,
+    void dump(const BasicJsonType& val,
+              const bool pretty_print,
               const bool ensure_ascii,
               const unsigned int indent_step,
               const unsigned int current_indent = 0)
@@ -12103,7 +15552,7 @@ class serializer
 
                     // variable to hold indentation for recursive calls
                     const auto new_indent = current_indent + indent_step;
-                    if (JSON_UNLIKELY(indent_string.size() < new_indent))
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
                     {
                         indent_string.resize(indent_string.size() * 2, ' ');
                     }
@@ -12121,8 +15570,8 @@ class serializer
                     }
 
                     // last element
-                    assert(i != val.m_value.object->cend());
-                    assert(std::next(i) == val.m_value.object->cend());
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
                     o->write_characters(indent_string.c_str(), new_indent);
                     o->write_character('\"');
                     dump_escaped(i->first, ensure_ascii);
@@ -12149,8 +15598,8 @@ class serializer
                     }
 
                     // last element
-                    assert(i != val.m_value.object->cend());
-                    assert(std::next(i) == val.m_value.object->cend());
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
                     o->write_character('\"');
                     dump_escaped(i->first, ensure_ascii);
                     o->write_characters("\":", 2);
@@ -12176,7 +15625,7 @@ class serializer
 
                     // variable to hold indentation for recursive calls
                     const auto new_indent = current_indent + indent_step;
-                    if (JSON_UNLIKELY(indent_string.size() < new_indent))
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
                     {
                         indent_string.resize(indent_string.size() * 2, ' ');
                     }
@@ -12191,7 +15640,7 @@ class serializer
                     }
 
                     // last element
-                    assert(not val.m_value.array->empty());
+                    JSON_ASSERT(!val.m_value.array->empty());
                     o->write_characters(indent_string.c_str(), new_indent);
                     dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
 
@@ -12212,7 +15661,7 @@ class serializer
                     }
 
                     // last element
-                    assert(not val.m_value.array->empty());
+                    JSON_ASSERT(!val.m_value.array->empty());
                     dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
 
                     o->write_character(']');
@@ -12229,6 +15678,79 @@ class serializer
                 return;
             }
 
+            case value_t::binary:
+            {
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"bytes\": [", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_characters(", ", 2);
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\n", 3);
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"subtype\": ", 11);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                    }
+                    else
+                    {
+                        o->write_characters("null", 4);
+                    }
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_characters("{\"bytes\":[", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_character(',');
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\"subtype\":", 12);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                        o->write_character('}');
+                    }
+                    else
+                    {
+                        o->write_characters("null}", 5);
+                    }
+                }
+                return;
+            }
+
             case value_t::boolean:
             {
                 if (val.m_value.boolean)
@@ -12273,7 +15795,7 @@ class serializer
             }
 
             default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
         }
     }
 
@@ -12365,7 +15887,7 @@ class serializer
                         {
                             // escape control characters (0x00..0x1F) or, if
                             // ensure_ascii parameter is used, non-ASCII characters
-                            if ((codepoint <= 0x1F) or (ensure_ascii and (codepoint >= 0x7F)))
+                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
                             {
                                 if (codepoint <= 0xFFFF)
                                 {
@@ -12472,14 +15994,14 @@ class serializer
                         }
 
                         default:            // LCOV_EXCL_LINE
-                            assert(false);  // LCOV_EXCL_LINE
+                            JSON_ASSERT(false);  // LCOV_EXCL_LINE
                     }
                     break;
                 }
 
                 default:  // decode found yet incomplete multi-byte code point
                 {
-                    if (not ensure_ascii)
+                    if (!ensure_ascii)
                     {
                         // code point will not be escaped - copy byte to buffer
                         string_buffer[bytes++] = s[i];
@@ -12491,7 +16013,7 @@ class serializer
         }
 
         // we finished processing the string
-        if (JSON_LIKELY(state == UTF8_ACCEPT))
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
         {
             // write buffer
             if (bytes > 0)
@@ -12535,7 +16057,7 @@ class serializer
                 }
 
                 default:            // LCOV_EXCL_LINE
-                    assert(false);  // LCOV_EXCL_LINE
+                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
             }
         }
     }
@@ -12583,10 +16105,11 @@ class serializer
     @param[in] x  integer number (signed or unsigned) to dump
     @tparam NumberType either @a number_integer_t or @a number_unsigned_t
     */
-    template<typename NumberType, detail::enable_if_t<
-                 std::is_same<NumberType, number_unsigned_t>::value or
-                 std::is_same<NumberType, number_integer_t>::value,
-                 int> = 0>
+    template < typename NumberType, detail::enable_if_t <
+                   std::is_same<NumberType, number_unsigned_t>::value ||
+                   std::is_same<NumberType, number_integer_t>::value ||
+                   std::is_same<NumberType, binary_char_t>::value,
+                   int > = 0 >
     void dump_integer(NumberType x)
     {
         static constexpr std::array<std::array<char, 2>, 100> digits_to_99
@@ -12615,7 +16138,7 @@ class serializer
         // use a pointer to fill the buffer
         auto buffer_ptr = number_buffer.begin();
 
-        const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755
+        const bool is_negative = std::is_same<NumberType, number_integer_t>::value && !(x >= 0); // see issue #755
         number_unsigned_t abs_value;
 
         unsigned int n_chars;
@@ -12623,7 +16146,7 @@ class serializer
         if (is_negative)
         {
             *buffer_ptr = '-';
-            abs_value = static_cast<number_unsigned_t>(std::abs(static_cast<std::intmax_t>(x)));
+            abs_value = remove_sign(static_cast<number_integer_t>(x));
 
             // account one more byte for the minus sign
             n_chars = 1 + count_digits(abs_value);
@@ -12635,7 +16158,7 @@ class serializer
         }
 
         // spare 1 byte for '\0'
-        assert(n_chars < number_buffer.size() - 1);
+        JSON_ASSERT(n_chars < number_buffer.size() - 1);
 
         // jump to the end to generate the string from backward
         // so we later avoid reversing the result
@@ -12676,7 +16199,7 @@ class serializer
     void dump_float(number_float_t x)
     {
         // NaN / inf
-        if (not std::isfinite(x))
+        if (!std::isfinite(x))
         {
             o->write_characters("null", 4);
             return;
@@ -12688,8 +16211,8 @@ class serializer
         //
         // NB: The test below works if <long double> == <double>.
         static constexpr bool is_ieee_single_or_double
-            = (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 24 and std::numeric_limits<number_float_t>::max_exponent == 128) or
-              (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 53 and std::numeric_limits<number_float_t>::max_exponent == 1024);
+            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
+              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
 
         dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
     }
@@ -12711,9 +16234,9 @@ class serializer
         std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
 
         // negative value indicates an error
-        assert(len > 0);
+        JSON_ASSERT(len > 0);
         // check if buffer was large enough
-        assert(static_cast<std::size_t>(len) < number_buffer.size());
+        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
 
         // erase thousands separator
         if (thousands_sep != '\0')
@@ -12721,12 +16244,12 @@ class serializer
             const auto end = std::remove(number_buffer.begin(),
                                          number_buffer.begin() + len, thousands_sep);
             std::fill(end, number_buffer.end(), '\0');
-            assert((end - number_buffer.begin()) <= len);
+            JSON_ASSERT((end - number_buffer.begin()) <= len);
             len = (end - number_buffer.begin());
         }
 
         // convert decimal point to '.'
-        if (decimal_point != '\0' and decimal_point != '.')
+        if (decimal_point != '\0' && decimal_point != '.')
         {
             const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
             if (dec_pos != number_buffer.end())
@@ -12742,7 +16265,7 @@ class serializer
             std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
                          [](char c)
         {
-            return c == '.' or c == 'e';
+            return c == '.' || c == 'e';
         });
 
         if (value_is_int_like)
@@ -12800,10 +16323,38 @@ class serializer
                 ? (byte & 0x3fu) | (codep << 6u)
                 : (0xFFu >> type) & (byte);
 
-        state = utf8d[256u + state * 16u + type];
+        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        JSON_ASSERT(index < 400);
+        state = utf8d[index];
         return state;
     }
 
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        JSON_ASSERT(false); // LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)());
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
   private:
     /// the output of the serializer
     output_adapter_t<char> o = nullptr;
@@ -12836,6 +16387,179 @@ class serializer
 
 // #include <nlohmann/json_fwd.hpp>
 
+// #include <nlohmann/ordered_map.hpp>
+
+
+#include <functional> // less
+#include <memory> // allocator
+#include <utility> // pair
+#include <vector> // vector
+
+namespace nlohmann
+{
+
+/// ordered_map: a minimal map-like container that preserves insertion order
+/// for use within nlohmann::basic_json<ordered_map>
+template <class Key, class T, class IgnoredLess = std::less<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
+{
+    using key_type = Key;
+    using mapped_type = T;
+    using Container = std::vector<std::pair<const Key, T>, Allocator>;
+    using typename Container::iterator;
+    using typename Container::const_iterator;
+    using typename Container::size_type;
+    using typename Container::value_type;
+
+    // Explicit constructors instead of `using Container::Container`
+    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
+    ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {}
+    template <class It>
+    ordered_map(It first, It last, const Allocator& alloc = Allocator())
+        : Container{first, last, alloc} {}
+    ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
+        : Container{init, alloc} {}
+
+    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(key, t);
+        return {--this->end(), true};
+    }
+
+    T& operator[](const Key& key)
+    {
+        return emplace(key, T{}).first->second;
+    }
+
+    const T& operator[](const Key& key) const
+    {
+        return at(key);
+    }
+
+    T& at(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it->second;
+            }
+        }
+
+        throw std::out_of_range("key not found");
+    }
+
+    const T& at(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it->second;
+            }
+        }
+
+        throw std::out_of_range("key not found");
+    }
+
+    size_type erase(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator erase(iterator pos)
+    {
+        auto it = pos;
+
+        // Since we cannot move const Keys, re-construct them in place
+        for (auto next = it; ++next != this->end(); ++it)
+        {
+            it->~value_type(); // Destroy but keep allocation
+            new (&*it) value_type{std::move(*next)};
+        }
+        Container::pop_back();
+        return pos;
+    }
+
+    size_type count(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator find(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value )
+    {
+        return emplace(value.first, std::move(value.second));
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value )
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == value.first)
+            {
+                return {it, false};
+            }
+        }
+        Container::push_back(value);
+        return {--this->end(), true};
+    }
+};
+
+}  // namespace nlohmann
+
 
 /*!
 @brief namespace for Niels Lohmann
@@ -12862,6 +16586,9 @@ default; will be used in @ref number_integer_t)
 `uint64_t` by default; will be used in @ref number_unsigned_t)
 @tparam NumberFloatType type for JSON floating-point numbers (`double` by
 default; will be used in @ref number_float_t)
+@tparam BinaryType type for packed binary data for compatibility with binary
+serialization formats (`std::vector<std::uint8_t>` by default; will be used in
+@ref binary_t)
 @tparam AllocatorType type of the allocator to use (`std::allocator` by
 default)
 @tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
@@ -12916,7 +16643,7 @@ relationship:
 The invariants are checked by member function assert_invariant().
 
 @internal
-@note ObjectType trick from http://stackoverflow.com/a/9860911
+@note ObjectType trick from https://stackoverflow.com/a/9860911
 @endinternal
 
 @see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
@@ -12932,13 +16659,15 @@ class basic_json
   private:
     template<detail::value_t> friend struct detail::external_constructor;
     friend ::nlohmann::json_pointer<basic_json>;
-    friend ::nlohmann::detail::parser<basic_json>;
+
+    template<typename BasicJsonType, typename InputType>
+    friend class ::nlohmann::detail::parser;
     friend ::nlohmann::detail::serializer<basic_json>;
     template<typename BasicJsonType>
     friend class ::nlohmann::detail::iter_impl;
     template<typename BasicJsonType, typename CharType>
     friend class ::nlohmann::detail::binary_writer;
-    template<typename BasicJsonType, typename SAX>
+    template<typename BasicJsonType, typename InputType, typename SAX>
     friend class ::nlohmann::detail::binary_reader;
     template<typename BasicJsonType>
     friend class ::nlohmann::detail::json_sax_dom_parser;
@@ -12949,8 +16678,19 @@ class basic_json
     using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
 
     // convenience aliases for types residing in namespace detail;
-    using lexer = ::nlohmann::detail::lexer<basic_json>;
-    using parser = ::nlohmann::detail::parser<basic_json>;
+    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
+
+    template<typename InputAdapterType>
+    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
+        InputAdapterType adapter,
+        detail::parser_callback_t<basic_json>cb = nullptr,
+        const bool allow_exceptions = true,
+        const bool ignore_comments = false
+                                 )
+    {
+        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
+                std::move(cb), allow_exceptions, ignore_comments);
+    }
 
     using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
     template<typename BasicJsonType>
@@ -12964,7 +16704,8 @@ class basic_json
     template<typename CharType>
     using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
 
-    using binary_reader = ::nlohmann::detail::binary_reader<basic_json>;
+    template<typename InputType>
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
     template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
 
     using serializer = ::nlohmann::detail::serializer<basic_json>;
@@ -12977,6 +16718,8 @@ class basic_json
     using json_serializer = JSONSerializer<T, SFINAE>;
     /// how to treat decoding errors
     using error_handler_t = detail::error_handler_t;
+    /// how to treat CBOR tags
+    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
     /// helper type for initializer lists of basic_json values
     using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
 
@@ -13084,12 +16827,12 @@ class basic_json
 
     @since 2.1.0
     */
-    JSON_NODISCARD
+    JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json meta()
     {
         basic_json result;
 
-        result["copyright"] = "(C) 2013-2017 Niels Lohmann";
+        result["copyright"] = "(C) 2013-2020 Niels Lohmann";
         result["name"] = "JSON for Modern C++";
         result["url"] = "https://github.com/nlohmann/json";
         result["version"]["string"] =
@@ -13583,12 +17326,83 @@ class basic_json
     */
     using number_float_t = NumberFloatType;
 
+    /*!
+    @brief a type for a packed binary type
+
+    This type is a type designed to carry binary data that appears in various
+    serialized formats, such as CBOR's Major Type 2, MessagePack's bin, and
+    BSON's generic binary subtype. This type is NOT a part of standard JSON and
+    exists solely for compatibility with these binary types. As such, it is
+    simply defined as an ordered sequence of zero or more byte values.
+
+    Additionally, as an implementation detail, the subtype of the binary data is
+    carried around as a `std::uint8_t`, which is compatible with both of the
+    binary data formats that use binary subtyping, (though the specific
+    numbering is incompatible with each other, and it is up to the user to
+    translate between them).
+
+    [CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type
+    as:
+    > Major type 2: a byte string. The string's length in bytes is represented
+    > following the rules for positive integers (major type 0).
+
+    [MessagePack's documentation on the bin type
+    family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family)
+    describes this type as:
+    > Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes
+    > in addition to the size of the byte array.
+
+    [BSON's specifications](http://bsonspec.org/spec.html) describe several
+    binary types; however, this type is intended to represent the generic binary
+    type which has the description:
+    > Generic binary subtype - This is the most commonly used binary subtype and
+    > should be the 'default' for drivers and tools.
+
+    None of these impose any limitations on the internal representation other
+    than the basic unit of storage be some type of array whose parts are
+    decomposable into bytes.
+
+    The default representation of this binary format is a
+    `std::vector<std::uint8_t>`, which is a very common way to represent a byte
+    array in modern C++.
+
+    #### Default type
+
+    The default values for @a BinaryType is `std::vector<std::uint8_t>`
+
+    #### Storage
+
+    Binary Arrays are stored as pointers in a @ref basic_json type. That is,
+    for any access to array values, a pointer of the type `binary_t*` must be
+    dereferenced.
+
+    #### Notes on subtypes
+
+    - CBOR
+       - Binary values are represented as byte strings. No subtypes are
+         supported and will be ignored when CBOR is written.
+    - MessagePack
+       - If a subtype is given and the binary array contains exactly 1, 2, 4, 8,
+         or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8)
+         is used. For other sizes, the ext family (ext8, ext16, ext32) is used.
+         The subtype is then added as singed 8-bit integer.
+       - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
+    - BSON
+       - If a subtype is given, it is used and added as unsigned 8-bit integer.
+       - If no subtype is given, the generic binary subtype 0x00 is used.
+
+    @sa @ref binary -- create a binary array
+
+    @since version 3.8.0
+    */
+    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
     /// @}
 
   private:
 
     /// helper for exception-safe object creation
     template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
     static T* create(Args&& ... args)
     {
         AllocatorType<T> alloc;
@@ -13600,7 +17414,7 @@ class basic_json
         };
         std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
         AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
-        assert(object != nullptr);
+        JSON_ASSERT(object != nullptr);
         return object.release();
     }
 
@@ -13624,6 +17438,7 @@ class basic_json
     number    | number_integer  | @ref number_integer_t
     number    | number_unsigned | @ref number_unsigned_t
     number    | number_float    | @ref number_float_t
+    binary    | binary          | pointer to @ref binary_t
     null      | null            | *no value is stored*
 
     @note Variable-length types (objects, arrays, and strings) are stored as
@@ -13640,6 +17455,8 @@ class basic_json
         array_t* array;
         /// string (stored with pointer to save storage)
         string_t* string;
+        /// binary (stored with pointer to save storage)
+        binary_t* binary;
         /// boolean
         boolean_t boolean;
         /// number (integer)
@@ -13682,6 +17499,12 @@ class basic_json
                     break;
                 }
 
+                case value_t::binary:
+                {
+                    binary = create<binary_t>();
+                    break;
+                }
+
                 case value_t::boolean:
                 {
                     boolean = boolean_t(false);
@@ -13715,9 +17538,9 @@ class basic_json
                 default:
                 {
                     object = nullptr;  // silence warning, see #821
-                    if (JSON_UNLIKELY(t == value_t::null))
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
                     {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.6.1")); // LCOV_EXCL_LINE
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.9.1")); // LCOV_EXCL_LINE
                     }
                     break;
                 }
@@ -13760,8 +17583,79 @@ class basic_json
             array = create<array_t>(std::move(value));
         }
 
+        /// constructor for binary arrays
+        json_value(const typename binary_t::container_type& value)
+        {
+            binary = create<binary_t>(value);
+        }
+
+        /// constructor for rvalue binary arrays
+        json_value(typename binary_t::container_type&& value)
+        {
+            binary = create<binary_t>(std::move(value));
+        }
+
+        /// constructor for binary arrays (internal type)
+        json_value(const binary_t& value)
+        {
+            binary = create<binary_t>(value);
+        }
+
+        /// constructor for rvalue binary arrays (internal type)
+        json_value(binary_t&& value)
+        {
+            binary = create<binary_t>(std::move(value));
+        }
+
         void destroy(value_t t) noexcept
         {
+            // flatten the current json_value to a heap-allocated stack
+            std::vector<basic_json> stack;
+
+            // move the top-level items to stack
+            if (t == value_t::array)
+            {
+                stack.reserve(array->size());
+                std::move(array->begin(), array->end(), std::back_inserter(stack));
+            }
+            else if (t == value_t::object)
+            {
+                stack.reserve(object->size());
+                for (auto&& it : *object)
+                {
+                    stack.push_back(std::move(it.second));
+                }
+            }
+
+            while (!stack.empty())
+            {
+                // move the last item to local variable to be processed
+                basic_json current_item(std::move(stack.back()));
+                stack.pop_back();
+
+                // if current_item is array/object, move
+                // its children to the stack to be processed later
+                if (current_item.is_array())
+                {
+                    std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
+                              std::back_inserter(stack));
+
+                    current_item.m_value.array->clear();
+                }
+                else if (current_item.is_object())
+                {
+                    for (auto&& it : *current_item.m_value.object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+
+                    current_item.m_value.object->clear();
+                }
+
+                // it's now safe that current_item get destructed
+                // since it doesn't have any children
+            }
+
             switch (t)
             {
                 case value_t::object:
@@ -13788,6 +17682,14 @@ class basic_json
                     break;
                 }
 
+                case value_t::binary:
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
+                    break;
+                }
+
                 default:
                 {
                     break;
@@ -13807,9 +17709,10 @@ class basic_json
     */
     void assert_invariant() const noexcept
     {
-        assert(m_type != value_t::object or m_value.object != nullptr);
-        assert(m_type != value_t::array or m_value.array != nullptr);
-        assert(m_type != value_t::string or m_value.string != nullptr);
+        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
+        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
+        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
+        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
     }
 
   public:
@@ -13832,7 +17735,7 @@ class basic_json
 
     @sa @ref parser_callback_t for more information and examples
     */
-    using parse_event_t = typename parser::parse_event_t;
+    using parse_event_t = detail::parse_event_t;
 
     /*!
     @brief per-element parser callback type
@@ -13883,7 +17786,7 @@ class basic_json
 
     @since version 1.0.0
     */
-    using parser_callback_t = typename parser::parser_callback_t;
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
 
     //////////////////
     // constructors //
@@ -13908,6 +17811,7 @@ class basic_json
     number      | `0`
     object      | `{}`
     array       | `[]`
+    binary      | empty array
 
     @param[in] v  the type of the value to create
 
@@ -13979,6 +17883,12 @@ class basic_json
       @ref number_float_t, and all convertible number types such as `int`,
       `size_t`, `int64_t`, `float` or `double` can be used.
     - **boolean**: @ref boolean_t / `bool` can be used.
+    - **binary**: @ref binary_t / `std::vector<uint8_t>` may be used,
+      unfortunately because string literals cannot be distinguished from binary
+      character arrays by the C++ type system, all types compatible with `const
+      char*` will be directed to the string constructor instead.  This is both
+      for backwards compatibility, and due to the fact that a binary type is not
+      a standard JSON type.
 
     See the examples below.
 
@@ -14010,10 +17920,10 @@ class basic_json
 
     @since version 2.1.0
     */
-    template <typename CompatibleType,
-              typename U = detail::uncvref_t<CompatibleType>,
-              detail::enable_if_t<
-                  not detail::is_basic_json<U>::value and detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
+    template < typename CompatibleType,
+               typename U = detail::uncvref_t<CompatibleType>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
     basic_json(CompatibleType && val) noexcept(noexcept(
                 JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
                                            std::forward<CompatibleType>(val))))
@@ -14048,9 +17958,9 @@ class basic_json
 
     @since version 3.2.0
     */
-    template <typename BasicJsonType,
-              detail::enable_if_t<
-                  detail::is_basic_json<BasicJsonType>::value and not std::is_same<basic_json, BasicJsonType>::value, int> = 0>
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
     basic_json(const BasicJsonType& val)
     {
         using other_boolean_t = typename BasicJsonType::boolean_t;
@@ -14060,6 +17970,7 @@ class basic_json
         using other_string_t = typename BasicJsonType::string_t;
         using other_object_t = typename BasicJsonType::object_t;
         using other_array_t = typename BasicJsonType::array_t;
+        using other_binary_t = typename BasicJsonType::binary_t;
 
         switch (val.type())
         {
@@ -14084,6 +17995,9 @@ class basic_json
             case value_t::array:
                 JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
                 break;
+            case value_t::binary:
+                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
+                break;
             case value_t::null:
                 *this = nullptr;
                 break;
@@ -14091,7 +18005,7 @@ class basic_json
                 m_type = value_t::discarded;
                 break;
             default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
         }
         assert_invariant();
     }
@@ -14179,11 +18093,11 @@ class basic_json
         bool is_an_object = std::all_of(init.begin(), init.end(),
                                         [](const detail::json_ref<basic_json>& element_ref)
         {
-            return element_ref->is_array() and element_ref->size() == 2 and (*element_ref)[0].is_string();
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
         });
 
         // adjust type if type deduction is not wanted
-        if (not type_deduction)
+        if (!type_deduction)
         {
             // if array is wanted, do not create an object though possible
             if (manual_type == value_t::array)
@@ -14192,7 +18106,7 @@ class basic_json
             }
 
             // if object is wanted but impossible, throw an exception
-            if (JSON_UNLIKELY(manual_type == value_t::object and not is_an_object))
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
             {
                 JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
             }
@@ -14222,6 +18136,99 @@ class basic_json
         assert_invariant();
     }
 
+    /*!
+    @brief explicitly create a binary array (without subtype)
+
+    Creates a JSON binary array value from a given binary container. Binary
+    values are part of various binary formats, such as CBOR, MessagePack, and
+    BSON. This constructor is used to create a value for serialization to those
+    formats.
+
+    @note Note, this function exists because of the difficulty in correctly
+    specifying the correct template overload in the standard value ctor, as both
+    JSON arrays and JSON binary arrays are backed with some form of a
+    `std::vector`. Because JSON binary arrays are a non-standard extension it
+    was decided that it would be best to prevent automatic initialization of a
+    binary array type, for backwards compatibility and so it does not happen on
+    accident.
+
+    @param[in] init container containing bytes to use as binary type
+
+    @return JSON binary array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @since version 3.8.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = init;
+        return res;
+    }
+
+    /*!
+    @brief explicitly create a binary array (with subtype)
+
+    Creates a JSON binary array value from a given binary container. Binary
+    values are part of various binary formats, such as CBOR, MessagePack, and
+    BSON. This constructor is used to create a value for serialization to those
+    formats.
+
+    @note Note, this function exists because of the difficulty in correctly
+    specifying the correct template overload in the standard value ctor, as both
+    JSON arrays and JSON binary arrays are backed with some form of a
+    `std::vector`. Because JSON binary arrays are a non-standard extension it
+    was decided that it would be best to prevent automatic initialization of a
+    binary array type, for backwards compatibility and so it does not happen on
+    accident.
+
+    @param[in] init container containing bytes to use as binary type
+    @param[in] subtype subtype to use in MessagePack and BSON
+
+    @return JSON binary array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @since version 3.8.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init, std::uint8_t subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(init, subtype);
+        return res;
+    }
+
+    /// @copydoc binary(const typename binary_t::container_type&)
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = std::move(init);
+        return res;
+    }
+
+    /// @copydoc binary(const typename binary_t::container_type&, std::uint8_t)
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init, std::uint8_t subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(std::move(init), subtype);
+        return res;
+    }
+
     /*!
     @brief explicitly create an array from an initializer list
 
@@ -14259,7 +18266,7 @@ class basic_json
 
     @since version 1.0.0
     */
-    JSON_NODISCARD
+    JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json array(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::array);
@@ -14303,7 +18310,7 @@ class basic_json
 
     @since version 1.0.0
     */
-    JSON_NODISCARD
+    JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json object(initializer_list_t init = {})
     {
         return basic_json(init, false, value_t::object);
@@ -14393,16 +18400,16 @@ class basic_json
 
     @since version 1.0.0
     */
-    template<class InputIT, typename std::enable_if<
-                 std::is_same<InputIT, typename basic_json_t::iterator>::value or
-                 std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
+    template < class InputIT, typename std::enable_if <
+                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
+                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
     basic_json(InputIT first, InputIT last)
     {
-        assert(first.m_object != nullptr);
-        assert(last.m_object != nullptr);
+        JSON_ASSERT(first.m_object != nullptr);
+        JSON_ASSERT(last.m_object != nullptr);
 
         // make sure iterator fits the current value
-        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
             JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
         }
@@ -14419,8 +18426,8 @@ class basic_json
             case value_t::number_unsigned:
             case value_t::string:
             {
-                if (JSON_UNLIKELY(not first.m_it.primitive_iterator.is_begin()
-                                  or not last.m_it.primitive_iterator.is_end()))
+                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
+                                         || !last.m_it.primitive_iterator.is_end()))
                 {
                     JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
                 }
@@ -14477,6 +18484,12 @@ class basic_json
                 break;
             }
 
+            case value_t::binary:
+            {
+                m_value = *first.m_object->m_value.binary;
+                break;
+            }
+
             default:
                 JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
                                                     std::string(first.m_object->type_name())));
@@ -14490,10 +18503,10 @@ class basic_json
     // other constructors and destructor //
     ///////////////////////////////////////
 
-    /// @private
-    basic_json(const detail::json_ref<basic_json>& ref)
-        : basic_json(ref.moved_or_copied())
-    {}
+    template<typename JsonRef,
+             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
+                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
 
     /*!
     @brief copy constructor
@@ -14570,6 +18583,12 @@ class basic_json
                 break;
             }
 
+            case value_t::binary:
+            {
+                m_value = *other.m_value.binary;
+                break;
+            }
+
             default:
                 break;
         }
@@ -14641,9 +18660,9 @@ class basic_json
     @since version 1.0.0
     */
     basic_json& operator=(basic_json other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
         std::is_nothrow_move_assignable<json_value>::value
     )
     {
@@ -14709,12 +18728,17 @@ class basic_json
     @param[in] error_handler  how to react on decoding errors; there are three
     possible values: `strict` (throws and exception in case a decoding error
     occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
-    and `ignore` (ignore invalid UTF-8 sequences during serialization).
+    and `ignore` (ignore invalid UTF-8 sequences during serialization; all
+    bytes are copied to the output unchanged).
 
     @return string containing the serialization of the JSON value
 
     @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded
+                          UTF-8 encoded and @a error_handler is set to strict
+
+    @note Binary values are serialized as object containing two keys:
+      - "bytes": an array of bytes as integers
+      - "subtype": the subtype as integer or "null" if the binary has no subtype
 
     @complexity Linear.
 
@@ -14729,7 +18753,8 @@ class basic_json
 
     @since version 1.0.0; indentation character @a indent_char, option
            @a ensure_ascii and exceptions added in version 3.0.0; error
-           handlers added in version 3.4.0.
+           handlers added in version 3.4.0; serialization of binary values added
+           in version 3.8.0.
     */
     string_t dump(const int indent = -1,
                   const char indent_char = ' ',
@@ -14768,6 +18793,7 @@ class basic_json
             number (floating-point)   | value_t::number_float
             object                    | value_t::object
             array                     | value_t::array
+            binary                    | value_t::binary
             discarded                 | value_t::discarded
 
     @complexity Constant.
@@ -14810,12 +18836,13 @@ class basic_json
     @sa @ref is_string() -- returns whether JSON value is a string
     @sa @ref is_boolean() -- returns whether JSON value is a boolean
     @sa @ref is_number() -- returns whether JSON value is a number
+    @sa @ref is_binary() -- returns whether JSON value is a binary array
 
     @since version 1.0.0
     */
     constexpr bool is_primitive() const noexcept
     {
-        return is_null() or is_string() or is_boolean() or is_number();
+        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
     }
 
     /*!
@@ -14842,7 +18869,7 @@ class basic_json
     */
     constexpr bool is_structured() const noexcept
     {
-        return is_array() or is_object();
+        return is_array() || is_object();
     }
 
     /*!
@@ -14916,7 +18943,7 @@ class basic_json
     */
     constexpr bool is_number() const noexcept
     {
-        return is_number_integer() or is_number_float();
+        return is_number_integer() || is_number_float();
     }
 
     /*!
@@ -14945,7 +18972,7 @@ class basic_json
     */
     constexpr bool is_number_integer() const noexcept
     {
-        return m_type == value_t::number_integer or m_type == value_t::number_unsigned;
+        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
     }
 
     /*!
@@ -15070,6 +19097,28 @@ class basic_json
         return m_type == value_t::string;
     }
 
+    /*!
+    @brief return whether value is a binary array
+
+    This function returns true if and only if the JSON value is a binary array.
+
+    @return `true` if type is binary array, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_binary()` for all JSON
+    types.,is_binary}
+
+    @since version 3.8.0
+    */
+    constexpr bool is_binary() const noexcept
+    {
+        return m_type == value_t::binary;
+    }
+
     /*!
     @brief return whether value is discarded
 
@@ -15133,7 +19182,7 @@ class basic_json
     /// get a boolean (explicit)
     boolean_t get_impl(boolean_t* /*unused*/) const
     {
-        if (JSON_LIKELY(is_boolean()))
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
         {
             return m_value.boolean;
         }
@@ -15225,6 +19274,18 @@ class basic_json
         return is_number_float() ? &m_value.number_float : nullptr;
     }
 
+    /// get a pointer to the value (binary)
+    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
     /*!
     @brief helper function to implement get_ref()
 
@@ -15242,7 +19303,7 @@ class basic_json
         // delegate the call to get_ptr<>()
         auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
 
-        if (JSON_LIKELY(ptr != nullptr))
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
         {
             return *ptr;
         }
@@ -15292,9 +19353,9 @@ class basic_json
 
     @since version 3.2.0
     */
-    template<typename BasicJsonType, detail::enable_if_t<
-                 not std::is_same<BasicJsonType, basic_json>::value and
-                 detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    template < typename BasicJsonType, detail::enable_if_t <
+                   !std::is_same<BasicJsonType, basic_json>::value&&
+                   detail::is_basic_json<BasicJsonType>::value, int > = 0 >
     BasicJsonType get() const
     {
         return *this;
@@ -15339,19 +19400,19 @@ class basic_json
 
     @since version 2.1.0
     */
-    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
-             detail::enable_if_t <
-                 not detail::is_basic_json<ValueType>::value and
-                 detail::has_from_json<basic_json_t, ValueType>::value and
-                 not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                 int> = 0>
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value &&
+                   detail::has_from_json<basic_json_t, ValueType>::value &&
+                   !detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
     ValueType get() const noexcept(noexcept(
                                        JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
     {
         // we cannot static_assert on ValueTypeCV being non-const, because
         // there is support for get<const basic_json_t>(), which is why we
         // still need the uncvref
-        static_assert(not std::is_reference<ValueTypeCV>::value,
+        static_assert(!std::is_reference<ValueTypeCV>::value,
                       "get() cannot be used with reference types, you might want to use get_ref()");
         static_assert(std::is_default_constructible<ValueType>::value,
                       "types must be DefaultConstructible when used with get()");
@@ -15392,16 +19453,16 @@ class basic_json
 
     @since version 2.1.0
     */
-    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
-             detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
-                                 detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                                 int> = 0>
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+               detail::enable_if_t < !std::is_same<basic_json_t, ValueType>::value &&
+                                     detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                                     int > = 0 >
     ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueTypeCV>::from_json(std::declval<const basic_json_t&>())))
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
     {
-        static_assert(not std::is_reference<ValueTypeCV>::value,
+        static_assert(!std::is_reference<ValueTypeCV>::value,
                       "get() cannot be used with reference types, you might want to use get_ref()");
-        return JSONSerializer<ValueTypeCV>::from_json(*this);
+        return JSONSerializer<ValueType>::from_json(*this);
     }
 
     /*!
@@ -15437,11 +19498,11 @@ class basic_json
 
     @since version 3.3.0
     */
-    template<typename ValueType,
-             detail::enable_if_t <
-                 not detail::is_basic_json<ValueType>::value and
-                 detail::has_from_json<basic_json_t, ValueType>::value,
-                 int> = 0>
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
     ValueType & get_to(ValueType& v) const noexcept(noexcept(
                 JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
     {
@@ -15449,6 +19510,31 @@ class basic_json
         return v;
     }
 
+    // specialization to allow to call get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N],
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
 
     /*!
     @brief get a pointer value (implicit)
@@ -15488,9 +19574,9 @@ class basic_json
     @brief get a pointer value (implicit)
     @copydoc get_ptr()
     */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value and
-                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
     constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
     {
         // delegate the call to get_impl_ptr<>() const
@@ -15582,9 +19668,9 @@ class basic_json
     @brief get a reference value (implicit)
     @copydoc get_ref()
     */
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value and
-                 std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int>::type = 0>
+    template < typename ReferenceType, typename std::enable_if <
+                   std::is_reference<ReferenceType>::value&&
+                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
     ReferenceType get_ref() const
     {
         // delegate call to get_ref_impl
@@ -15621,25 +19707,52 @@ class basic_json
     @since version 1.0.0
     */
     template < typename ValueType, typename std::enable_if <
-                   not std::is_pointer<ValueType>::value and
-                   not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
-                   not std::is_same<ValueType, typename string_t::value_type>::value and
-                   not detail::is_basic_json<ValueType>::value
-
-#ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
-                   and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
-#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
-                   and not std::is_same<ValueType, typename std::string_view>::value
+                   !std::is_pointer<ValueType>::value&&
+                   !std::is_same<ValueType, detail::json_ref<basic_json>>::value&&
+                   !std::is_same<ValueType, typename string_t::value_type>::value&&
+                   !detail::is_basic_json<ValueType>::value
+                   && !std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
+                   && !std::is_same<ValueType, typename std::string_view>::value
 #endif
-#endif
-                   and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
+                   && detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
                    , int >::type = 0 >
-    operator ValueType() const
+    JSON_EXPLICIT operator ValueType() const
     {
         // delegate the call to get<>() const
         return get<ValueType>();
     }
 
+    /*!
+    @return reference to the binary value
+
+    @throw type_error.302 if the value is not binary
+
+    @sa @ref is_binary() to check if the value is binary
+
+    @since version 3.8.0
+    */
+    binary_t& get_binary()
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name())));
+        }
+
+        return *get_ptr<binary_t*>();
+    }
+
+    /// @copydoc get_binary()
+    const binary_t& get_binary() const
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name())));
+        }
+
+        return *get_ptr<const binary_t*>();
+    }
+
     /// @}
 
 
@@ -15680,7 +19793,7 @@ class basic_json
     reference at(size_type idx)
     {
         // at only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
             JSON_TRY
             {
@@ -15727,7 +19840,7 @@ class basic_json
     const_reference at(size_type idx) const
     {
         // at only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
             JSON_TRY
             {
@@ -15778,7 +19891,7 @@ class basic_json
     reference at(const typename object_t::key_type& key)
     {
         // at only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             JSON_TRY
             {
@@ -15829,7 +19942,7 @@ class basic_json
     const_reference at(const typename object_t::key_type& key) const
     {
         // at only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             JSON_TRY
             {
@@ -15883,7 +19996,7 @@ class basic_json
         }
 
         // operator[] only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
             // fill up array with null values if given idx is outside range
             if (idx >= m_value.array->size())
@@ -15921,7 +20034,7 @@ class basic_json
     const_reference operator[](size_type idx) const
     {
         // const operator[] only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
             return m_value.array->operator[](idx);
         }
@@ -15967,7 +20080,7 @@ class basic_json
         }
 
         // operator[] only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             return m_value.object->operator[](key);
         }
@@ -16008,9 +20121,9 @@ class basic_json
     const_reference operator[](const typename object_t::key_type& key) const
     {
         // const operator[] only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            assert(m_value.object->find(key) != m_value.object->end());
+            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
             return m_value.object->find(key)->second;
         }
 
@@ -16045,6 +20158,7 @@ class basic_json
     @since version 1.1.0
     */
     template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
     reference operator[](T* key)
     {
         // implicitly convert null to object
@@ -16056,7 +20170,7 @@ class basic_json
         }
 
         // at only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             return m_value.object->operator[](key);
         }
@@ -16095,12 +20209,13 @@ class basic_json
     @since version 1.1.0
     */
     template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
     const_reference operator[](T* key) const
     {
         // at only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
-            assert(m_value.object->find(key) != m_value.object->end());
+            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
             return m_value.object->find(key)->second;
         }
 
@@ -16140,6 +20255,8 @@ class basic_json
     @return copy of the element at key @a key or @a default_value if @a key
     is not found
 
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a key
     @throw type_error.306 if the JSON value is not an object; in that case,
     using `value()` with a key makes no sense.
 
@@ -16155,18 +20272,20 @@ class basic_json
 
     @since version 1.0.0
     */
-    template<class ValueType, typename std::enable_if<
-                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+    // using std::is_convertible in a std::enable_if will fail when using explicit conversions
+    template < class ValueType, typename std::enable_if <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, ValueType>::value, int >::type = 0 >
     ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
     {
         // at only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             // if key is found, return value and given default value otherwise
             const auto it = find(key);
             if (it != end())
             {
-                return *it;
+                return it->template get<ValueType>();
             }
 
             return default_value;
@@ -16213,6 +20332,8 @@ class basic_json
     @return copy of the element at key @a key or @a default_value if @a key
     is not found
 
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a ptr
     @throw type_error.306 if the JSON value is not an object; in that case,
     using `value()` with a key makes no sense.
 
@@ -16226,16 +20347,16 @@ class basic_json
     @since version 2.0.2
     */
     template<class ValueType, typename std::enable_if<
-                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
+                 detail::is_getable<basic_json_t, ValueType>::value, int>::type = 0>
     ValueType value(const json_pointer& ptr, const ValueType& default_value) const
     {
         // at only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             // if pointer resolves a value, return it or use default value
             JSON_TRY
             {
-                return ptr.get_checked(this);
+                return ptr.get_checked(this).template get<ValueType>();
             }
             JSON_INTERNAL_CATCH (out_of_range&)
             {
@@ -16250,6 +20371,7 @@ class basic_json
     @brief overload for a default value of type const char*
     @copydoc basic_json::value(const json_pointer&, ValueType) const
     */
+    JSON_HEDLEY_NON_NULL(3)
     string_t value(const json_pointer& ptr, const char* default_value) const
     {
         return value(ptr, string_t(default_value));
@@ -16262,8 +20384,8 @@ class basic_json
     container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
 
     @return In case of a structured type (array or object), a reference to the
-    first element is returned. In case of number, string, or boolean values, a
-    reference to the value is returned.
+    first element is returned. In case of number, string, boolean, or binary
+    values, a reference to the value is returned.
 
     @complexity Constant.
 
@@ -16305,8 +20427,8 @@ class basic_json
     @endcode
 
     @return In case of a structured type (array or object), a reference to the
-    last element is returned. In case of number, string, or boolean values, a
-    reference to the value is returned.
+    last element is returned. In case of number, string, boolean, or binary
+    values, a reference to the value is returned.
 
     @complexity Constant.
 
@@ -16372,7 +20494,7 @@ class basic_json
     @complexity The complexity depends on the type:
     - objects: amortized constant
     - arrays: linear in distance between @a pos and the end of the container
-    - strings: linear in the length of the string
+    - strings and binary: linear in the length of the member
     - other types: constant
 
     @liveexample{The example shows the result of `erase()` for different JSON
@@ -16387,14 +20509,14 @@ class basic_json
 
     @since version 1.0.0
     */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
-                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
-             = 0>
+    template < class IteratorType, typename std::enable_if <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
+               = 0 >
     IteratorType erase(IteratorType pos)
     {
         // make sure iterator fits the current value
-        if (JSON_UNLIKELY(this != pos.m_object))
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
         {
             JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
         }
@@ -16408,8 +20530,9 @@ class basic_json
             case value_t::number_integer:
             case value_t::number_unsigned:
             case value_t::string:
+            case value_t::binary:
             {
-                if (JSON_UNLIKELY(not pos.m_it.primitive_iterator.is_begin()))
+                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
                 {
                     JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
                 }
@@ -16421,6 +20544,13 @@ class basic_json
                     std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
                     m_value.string = nullptr;
                 }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
 
                 m_type = value_t::null;
                 assert_invariant();
@@ -16478,7 +20608,7 @@ class basic_json
     - objects: `log(size()) + std::distance(first, last)`
     - arrays: linear in the distance between @a first and @a last, plus linear
       in the distance between @a last and end of the container
-    - strings: linear in the length of the string
+    - strings and binary: linear in the length of the member
     - other types: constant
 
     @liveexample{The example shows the result of `erase()` for different JSON
@@ -16492,14 +20622,14 @@ class basic_json
 
     @since version 1.0.0
     */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
-                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
-             = 0>
+    template < class IteratorType, typename std::enable_if <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
+               = 0 >
     IteratorType erase(IteratorType first, IteratorType last)
     {
         // make sure iterator fits the current value
-        if (JSON_UNLIKELY(this != first.m_object or this != last.m_object))
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
         {
             JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
         }
@@ -16513,9 +20643,10 @@ class basic_json
             case value_t::number_integer:
             case value_t::number_unsigned:
             case value_t::string:
+            case value_t::binary:
             {
-                if (JSON_LIKELY(not first.m_it.primitive_iterator.is_begin()
-                                or not last.m_it.primitive_iterator.is_end()))
+                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
+                                       || !last.m_it.primitive_iterator.is_end()))
                 {
                     JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
                 }
@@ -16527,6 +20658,13 @@ class basic_json
                     std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
                     m_value.string = nullptr;
                 }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
 
                 m_type = value_t::null;
                 assert_invariant();
@@ -16586,7 +20724,7 @@ class basic_json
     size_type erase(const typename object_t::key_type& key)
     {
         // this erase only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             return m_value.object->erase(key);
         }
@@ -16621,9 +20759,9 @@ class basic_json
     void erase(const size_type idx)
     {
         // this erase only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
-            if (JSON_UNLIKELY(idx >= size()))
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
             {
                 JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
             }
@@ -16749,13 +20887,46 @@ class basic_json
     @liveexample{The following code shows an example for `contains()`.,contains}
 
     @sa @ref find(KeyT&&) -- returns an iterator to an object element
+    @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
 
     @since version 3.6.0
     */
-    template<typename KeyT>
-    bool contains(KeyT&& key) const
+    template < typename KeyT, typename std::enable_if <
+                   !std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int >::type = 0 >
+    bool contains(KeyT && key) const
     {
-        return is_object() and m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+        return is_object() && m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object given a JSON pointer
+
+    Check whether the given JSON pointer @a ptr can be resolved in the current
+    JSON value.
+
+    @note This method can be executed on any JSON value type.
+
+    @param[in] ptr JSON pointer to check its existence.
+
+    @return true if the JSON pointer can be resolved to a stored value, false
+    otherwise.
+
+    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
+
+    @sa @ref contains(KeyT &&) const -- checks the existence of a key
+
+    @since version 3.7.0
+    */
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
     }
 
     /// @}
@@ -17099,7 +21270,7 @@ class basic_json
                 future 4.0.0 of the library. Please use @ref items() instead;
                 that is, replace `json::iterator_wrapper(j)` with `j.items()`.
     */
-    JSON_DEPRECATED
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
     static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
     {
         return ref.items();
@@ -17108,7 +21279,7 @@ class basic_json
     /*!
     @copydoc iterator_wrapper(reference)
     */
-    JSON_DEPRECATED
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
     static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
     {
         return ref.items();
@@ -17165,6 +21336,11 @@ class basic_json
           element as string (see example). For primitive types (e.g., numbers),
           `key()` returns an empty string.
 
+    @warning Using `items()` on temporary objects is dangerous. Make sure the
+             object's lifetime exeeds the iteration. See
+             <https://github.com/nlohmann/json/issues/2040> for more
+             information.
+
     @return iteration proxy object wrapping @a ref with an interface to use in
             range-based for loops
 
@@ -17213,6 +21389,7 @@ class basic_json
             boolean     | `false`
             string      | `false`
             number      | `false`
+            binary      | `false`
             object      | result of function `object_t::empty()`
             array       | result of function `array_t::empty()`
 
@@ -17284,6 +21461,7 @@ class basic_json
             boolean     | `1`
             string      | `1`
             number      | `1`
+            binary      | `1`
             object      | result of function object_t::size()
             array       | result of function array_t::size()
 
@@ -17358,6 +21536,7 @@ class basic_json
             boolean     | `1` (same as `size()`)
             string      | `1` (same as `size()`)
             number      | `1` (same as `size()`)
+            binary      | `1` (same as `size()`)
             object      | result of function `object_t::max_size()`
             array       | result of function `array_t::max_size()`
 
@@ -17430,6 +21609,7 @@ class basic_json
     boolean     | `false`
     string      | `""`
     number      | `0`
+    binary      | An empty byte vector
     object      | `{}`
     array       | `[]`
 
@@ -17487,6 +21667,12 @@ class basic_json
                 break;
             }
 
+            case value_t::binary:
+            {
+                m_value.binary->clear();
+                break;
+            }
+
             case value_t::array:
             {
                 m_value.array->clear();
@@ -17527,7 +21713,7 @@ class basic_json
     void push_back(basic_json&& val)
     {
         // push_back only works for null objects or arrays
-        if (JSON_UNLIKELY(not(is_null() or is_array())))
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
             JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
         }
@@ -17542,9 +21728,7 @@ class basic_json
 
         // add element to array (move semantics)
         m_value.array->push_back(std::move(val));
-        // invalidate object: mark it null so we do not call the destructor
-        // cppcheck-suppress accessMoved
-        val.m_type = value_t::null;
+        // if val is moved from, basic_json move constructor marks it null so we do not call the destructor
     }
 
     /*!
@@ -17564,7 +21748,7 @@ class basic_json
     void push_back(const basic_json& val)
     {
         // push_back only works for null objects or arrays
-        if (JSON_UNLIKELY(not(is_null() or is_array())))
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
             JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
         }
@@ -17614,7 +21798,7 @@ class basic_json
     void push_back(const typename object_t::value_type& val)
     {
         // push_back only works for null objects or objects
-        if (JSON_UNLIKELY(not(is_null() or is_object())))
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
         {
             JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
         }
@@ -17668,7 +21852,7 @@ class basic_json
     */
     void push_back(initializer_list_t init)
     {
-        if (is_object() and init.size() == 2 and (*init.begin())->is_string())
+        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
         {
             basic_json&& key = init.begin()->moved_or_copied();
             push_back(typename object_t::value_type(
@@ -17700,6 +21884,8 @@ class basic_json
     @param[in] args arguments to forward to a constructor of @ref basic_json
     @tparam Args compatible types to create a @ref basic_json object
 
+    @return reference to the inserted element
+
     @throw type_error.311 when called on a type other than JSON array or
     null; example: `"cannot use emplace_back() with number"`
 
@@ -17709,13 +21895,13 @@ class basic_json
     elements to a JSON array. Note how the `null` value was silently converted
     to a JSON array.,emplace_back}
 
-    @since version 2.0.8
+    @since version 2.0.8, returns reference since 3.7.0
     */
     template<class... Args>
-    void emplace_back(Args&& ... args)
+    reference emplace_back(Args&& ... args)
     {
         // emplace_back only works for null objects or arrays
-        if (JSON_UNLIKELY(not(is_null() or is_array())))
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
         {
             JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
         }
@@ -17729,7 +21915,12 @@ class basic_json
         }
 
         // add element to array (perfect forwarding)
+#ifdef JSON_HAS_CPP_17
+        return m_value.array->emplace_back(std::forward<Args>(args)...);
+#else
         m_value.array->emplace_back(std::forward<Args>(args)...);
+        return m_value.array->back();
+#endif
     }
 
     /*!
@@ -17763,7 +21954,7 @@ class basic_json
     std::pair<iterator, bool> emplace(Args&& ... args)
     {
         // emplace only works for null objects or arrays
-        if (JSON_UNLIKELY(not(is_null() or is_object())))
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
         {
             JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
         }
@@ -17793,7 +21984,7 @@ class basic_json
     iterator insert_iterator(const_iterator pos, Args&& ... args)
     {
         iterator result(this);
-        assert(m_value.array != nullptr);
+        JSON_ASSERT(m_value.array != nullptr);
 
         auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
         m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
@@ -17831,10 +22022,10 @@ class basic_json
     iterator insert(const_iterator pos, const basic_json& val)
     {
         // insert only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
             // check if iterator pos fits to this JSON value
-            if (JSON_UNLIKELY(pos.m_object != this))
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
             {
                 JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
             }
@@ -17882,10 +22073,10 @@ class basic_json
     iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
     {
         // insert only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
             // check if iterator pos fits to this JSON value
-            if (JSON_UNLIKELY(pos.m_object != this))
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
             {
                 JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
             }
@@ -17930,24 +22121,24 @@ class basic_json
     iterator insert(const_iterator pos, const_iterator first, const_iterator last)
     {
         // insert only works for arrays
-        if (JSON_UNLIKELY(not is_array()))
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
         {
             JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
         }
 
         // check if iterator pos fits to this JSON value
-        if (JSON_UNLIKELY(pos.m_object != this))
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
         {
             JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
         }
 
         // check if range iterators belong to the same JSON object
-        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
             JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
         }
 
-        if (JSON_UNLIKELY(first.m_object == this))
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
         {
             JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
         }
@@ -17983,13 +22174,13 @@ class basic_json
     iterator insert(const_iterator pos, initializer_list_t ilist)
     {
         // insert only works for arrays
-        if (JSON_UNLIKELY(not is_array()))
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
         {
             JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
         }
 
         // check if iterator pos fits to this JSON value
-        if (JSON_UNLIKELY(pos.m_object != this))
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
         {
             JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
         }
@@ -18024,19 +22215,19 @@ class basic_json
     void insert(const_iterator first, const_iterator last)
     {
         // insert only works for objects
-        if (JSON_UNLIKELY(not is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
             JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
         }
 
         // check if range iterators belong to the same JSON object
-        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
             JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
         }
 
         // passed iterators must belong to objects
-        if (JSON_UNLIKELY(not first.m_object->is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
         {
             JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
         }
@@ -18073,11 +22264,11 @@ class basic_json
             assert_invariant();
         }
 
-        if (JSON_UNLIKELY(not is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
             JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
         }
-        if (JSON_UNLIKELY(not j.is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
         {
             JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
         }
@@ -18124,20 +22315,20 @@ class basic_json
             assert_invariant();
         }
 
-        if (JSON_UNLIKELY(not is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
         {
             JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
         }
 
         // check if range iterators belong to the same JSON object
-        if (JSON_UNLIKELY(first.m_object != last.m_object))
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
         {
             JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
         }
 
         // passed iterators must belong to objects
-        if (JSON_UNLIKELY(not first.m_object->is_object()
-                          or not last.m_object->is_object()))
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()
+                                 || !last.m_object->is_object()))
         {
             JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
         }
@@ -18166,9 +22357,9 @@ class basic_json
     @since version 1.0.0
     */
     void swap(reference other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
         std::is_nothrow_move_assignable<json_value>::value
     )
     {
@@ -18180,6 +22371,34 @@ class basic_json
     /*!
     @brief exchanges the values
 
+    Exchanges the contents of the JSON value from @a left with those of @a right. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated. implemented as a friend function callable via ADL.
+
+    @param[in,out] left JSON value to exchange the contents with
+    @param[in,out] right JSON value to exchange the contents with
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how JSON values can be swapped with
+    `swap()`.,swap__reference}
+
+    @since version 1.0.0
+    */
+    friend void swap(reference left, reference right) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        left.swap(right);
+    }
+
+    /*!
+    @brief exchanges the values
+
     Exchanges the contents of a JSON array with those of @a other. Does not
     invoke any move, copy, or swap operations on individual elements. All
     iterators and references remain valid. The past-the-end iterator is
@@ -18200,7 +22419,7 @@ class basic_json
     void swap(array_t& other)
     {
         // swap only works for arrays
-        if (JSON_LIKELY(is_array()))
+        if (JSON_HEDLEY_LIKELY(is_array()))
         {
             std::swap(*(m_value.array), other);
         }
@@ -18233,7 +22452,7 @@ class basic_json
     void swap(object_t& other)
     {
         // swap only works for objects
-        if (JSON_LIKELY(is_object()))
+        if (JSON_HEDLEY_LIKELY(is_object()))
         {
             std::swap(*(m_value.object), other);
         }
@@ -18266,7 +22485,7 @@ class basic_json
     void swap(string_t& other)
     {
         // swap only works for strings
-        if (JSON_LIKELY(is_string()))
+        if (JSON_HEDLEY_LIKELY(is_string()))
         {
             std::swap(*(m_value.string), other);
         }
@@ -18276,6 +22495,53 @@ class basic_json
         }
     }
 
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON string with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other binary to exchange the contents with
+
+    @throw type_error.310 when JSON value is not a string; example: `"cannot
+    use swap() with boolean"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how strings can be swapped with
+    `swap()`.,swap__binary_t}
+
+    @since version 3.8.0
+    */
+    void swap(binary_t& other)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            std::swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /// @copydoc swap(binary_t)
+    void swap(typename binary_t::container_type& other)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            std::swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
     /// @}
 
   public:
@@ -18294,13 +22560,13 @@ class basic_json
       their stored values are the same according to their respective
       `operator==`.
     - Integer and floating-point numbers are automatically converted before
-      comparison. Note than two NaN values are always treated as unequal.
+      comparison. Note that two NaN values are always treated as unequal.
     - Two JSON null values are equal.
 
     @note Floating-point inside JSON values numbers are compared with
     `json::number_float_t::operator==` which is `double::operator==` by
     default. To compare floating-point while respecting an epsilon, an alternative
-    [comparison function](https://github.com/mariokonrad/marnav/blob/master/src/marnav/math/floatingpoint.hpp#L34-#L39)
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
     could be used, for instance
     @code {.cpp}
     template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
@@ -18309,6 +22575,22 @@ class basic_json
         return std::abs(a - b) <= epsilon;
     }
     @endcode
+    Or you can self-defined operator equal function like this:
+    @code {.cpp}
+    bool my_equal(const_reference lhs, const_reference rhs) {
+    const auto lhs_type lhs.type();
+    const auto rhs_type rhs.type();
+    if (lhs_type == rhs_type) {
+        switch(lhs_type)
+            // self_defined case
+            case value_t::number_float:
+                return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
+            // other cases remain the same with the original
+            ...
+    }
+    ...
+    }
+    @endcode
 
     @note NaN values never compare equal to themselves or to other NaN values.
 
@@ -18358,31 +22640,34 @@ class basic_json
                 case value_t::number_float:
                     return lhs.m_value.number_float == rhs.m_value.number_float;
 
+                case value_t::binary:
+                    return *lhs.m_value.binary == *rhs.m_value.binary;
+
                 default:
                     return false;
             }
         }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
         {
             return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
         }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
         {
             return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
         }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
         {
             return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
         }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
         {
             return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
         }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
         {
             return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
         }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
         {
             return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
         }
@@ -18432,7 +22717,7 @@ class basic_json
     */
     friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
     {
-        return not (lhs == rhs);
+        return !(lhs == rhs);
     }
 
     /*!
@@ -18498,51 +22783,54 @@ class basic_json
                     return (*lhs.m_value.array) < (*rhs.m_value.array);
 
                 case value_t::object:
-                    return *lhs.m_value.object < *rhs.m_value.object;
+                    return (*lhs.m_value.object) < (*rhs.m_value.object);
 
                 case value_t::null:
                     return false;
 
                 case value_t::string:
-                    return *lhs.m_value.string < *rhs.m_value.string;
+                    return (*lhs.m_value.string) < (*rhs.m_value.string);
 
                 case value_t::boolean:
-                    return lhs.m_value.boolean < rhs.m_value.boolean;
+                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
 
                 case value_t::number_integer:
-                    return lhs.m_value.number_integer < rhs.m_value.number_integer;
+                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
 
                 case value_t::number_unsigned:
-                    return lhs.m_value.number_unsigned < rhs.m_value.number_unsigned;
+                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
 
                 case value_t::number_float:
-                    return lhs.m_value.number_float < rhs.m_value.number_float;
+                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
+
+                case value_t::binary:
+                    return (*lhs.m_value.binary) < (*rhs.m_value.binary);
 
                 default:
                     return false;
             }
         }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
         {
             return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
         }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
         {
             return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
         }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
         {
             return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
         }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
         {
             return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
         }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
         {
             return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
         }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
         {
             return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
         }
@@ -18596,7 +22884,7 @@ class basic_json
     */
     friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
     {
-        return not (rhs < lhs);
+        return !(rhs < lhs);
     }
 
     /*!
@@ -18642,7 +22930,7 @@ class basic_json
     */
     friend bool operator>(const_reference lhs, const_reference rhs) noexcept
     {
-        return not (lhs <= rhs);
+        return !(lhs <= rhs);
     }
 
     /*!
@@ -18688,7 +22976,7 @@ class basic_json
     */
     friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
     {
-        return not (lhs < rhs);
+        return !(lhs < rhs);
     }
 
     /*!
@@ -18776,7 +23064,7 @@ class basic_json
                 instead; that is, replace calls like `j >> o;` with `o << j;`.
     @since version 1.0.0; deprecated since version 3.0.0
     */
-    JSON_DEPRECATED
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
     friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
     {
         return o << j;
@@ -18795,29 +23083,13 @@ class basic_json
     /*!
     @brief deserialize from a compatible input
 
-    This function reads from a compatible input. Examples are:
-    - an array of 1-byte values
-    - strings with character/literal type with size of 1 byte
-    - input streams
-    - container with contiguous storage of 1-byte values. Compatible container
-      types include `std::vector`, `std::string`, `std::array`,
-      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
-      arrays can be used with `std::begin()`/`std::end()`. User-defined
-      containers can be used as long as they implement random-access iterators
-      and a contiguous storage.
-
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @pre The container storage is contiguous. Violating this precondition
-    yields undefined behavior. **This precondition is enforced with an
-    assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with a noncompliant container and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
+    @tparam InputType A compatible input, for instance
+    - an std::istream object
+    - a FILE pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object obj for which begin(obj) and end(obj) produces a valid pair of
+      iterators.
 
     @param[in] i  input to read from
     @param[in] cb  a parser callback function of type @ref parser_callback_t
@@ -18825,6 +23097,9 @@ class basic_json
     (optional)
     @param[in] allow_exceptions  whether to throw exceptions in case of a
     parse error (optional, true by default)
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default)
 
     @return deserialized JSON value; in case of a parse error and
             @a allow_exceptions set to `false`, the return value will be
@@ -18837,7 +23112,7 @@ class basic_json
 
     @complexity Linear in the length of the input. The parser is a predictive
     LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
+    @a cb or reading from the input @a i has a super-linear complexity.
 
     @note A UTF-8 byte order mark is silently ignored.
 
@@ -18853,21 +23128,122 @@ class basic_json
     @liveexample{The example below demonstrates the `parse()` function reading
     from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
 
-    @since version 2.0.3 (contiguous containers)
+    @since version 2.0.3 (contiguous containers); version 3.9.0 allowed to
+    ignore comments.
     */
-    JSON_NODISCARD
-    static basic_json parse(detail::input_adapter&& i,
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(InputType&& i,
                             const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true)
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
     {
         basic_json result;
-        parser(i, cb, allow_exceptions).parse(true, result);
+        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
         return result;
     }
 
-    static bool accept(detail::input_adapter&& i)
+    /*!
+    @brief deserialize from a pair of character iterators
+
+    The value_type of the iterator must be a integral type with size of 1, 2 or
+    4 bytes, which will be interpreted respectively as UTF-8, UTF-16 and UTF-32.
+
+    @param[in] first iterator to start of character range
+    @param[in] last  iterator to end of character range
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(IteratorType first,
+                            IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
     {
-        return parser(i).accept(true);
+        basic_json result;
+        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
+    static basic_json parse(detail::span_input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /*!
+    @brief check if the input is valid JSON
+
+    Unlike the @ref parse(InputType&&, const parser_callback_t,const bool)
+    function, this function neither throws an exception in case of invalid JSON
+    input (i.e., a parse error) nor creates diagnostic information.
+
+    @tparam InputType A compatible input, for instance
+    - an std::istream object
+    - a FILE pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object obj for which begin(obj) and end(obj) produces a valid pair of
+      iterators.
+
+    @param[in] i input to read from
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default)
+
+    @return Whether the input read from @a i is valid JSON.
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `accept()` function reading
+    from a string.,accept__string}
+    */
+    template<typename InputType>
+    static bool accept(InputType&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    template<typename IteratorType>
+    static bool accept(IteratorType first, IteratorType last,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
+    static bool accept(detail::span_input_adapter&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
     }
 
     /*!
@@ -18876,33 +23252,20 @@ class basic_json
     The SAX event lister must follow the interface of @ref json_sax.
 
     This function reads from a compatible input. Examples are:
-    - an array of 1-byte values
-    - strings with character/literal type with size of 1 byte
-    - input streams
-    - container with contiguous storage of 1-byte values. Compatible container
-      types include `std::vector`, `std::string`, `std::array`,
-      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
-      arrays can be used with `std::begin()`/`std::end()`. User-defined
-      containers can be used as long as they implement random-access iterators
-      and a contiguous storage.
-
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @pre The container storage is contiguous. Violating this precondition
-    yields undefined behavior. **This precondition is enforced with an
-    assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with a noncompliant container and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
+    - an std::istream object
+    - a FILE pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object obj for which begin(obj) and end(obj) produces a valid pair of
+      iterators.
 
     @param[in] i  input to read from
     @param[in,out] sax  SAX event listener
     @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
     @param[in] strict  whether the input has to be consumed completely
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default); only applies to the JSON file format.
 
     @return return value of the last processed SAX event
 
@@ -18923,95 +23286,44 @@ class basic_json
 
     @since version 3.2.0
     */
-    template <typename SAX>
-    static bool sax_parse(detail::input_adapter&& i, SAX* sax,
+    template <typename InputType, typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(InputType&& i, SAX* sax,
                           input_format_t format = input_format_t::json,
-                          const bool strict = true)
+                          const bool strict = true,
+                          const bool ignore_comments = false)
     {
-        assert(sax);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
         return format == input_format_t::json
-               ? parser(std::move(i)).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, SAX>(std::move(i)).sax_parse(format, sax, strict);
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
     }
 
-    /*!
-    @brief deserialize from an iterator range with contiguous storage
-
-    This function reads from an iterator range of a container with contiguous
-    storage of 1-byte values. Compatible container types include
-    `std::vector`, `std::string`, `std::array`, `std::valarray`, and
-    `std::initializer_list`. Furthermore, C-style arrays can be used with
-    `std::begin()`/`std::end()`. User-defined containers can be used as long
-    as they implement random-access iterators and a contiguous storage.
-
-    @pre The iterator range is contiguous. Violating this precondition yields
-    undefined behavior. **This precondition is enforced with an assertion.**
-    @pre Each element in the range has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with noncompliant iterators and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @tparam IteratorType iterator of container with contiguous storage
-    @param[in] first  begin of the range to parse (included)
-    @param[in] last  end of the range to parse (excluded)
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an iterator range.,parse__iteratortype__parser_callback_t}
-
-    @since version 2.0.3
-    */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    static basic_json parse(IteratorType first, IteratorType last,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true)
+    template<class IteratorType, class SAX>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
     {
-        basic_json result;
-        parser(detail::input_adapter(first, last), cb, allow_exceptions).parse(true, result);
-        return result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
     }
 
-    template<class IteratorType, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    static bool accept(IteratorType first, IteratorType last)
+    template <typename SAX>
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
     {
-        return parser(detail::input_adapter(first, last)).accept(true);
-    }
-
-    template<class IteratorType, class SAX, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax)
-    {
-        return parser(detail::input_adapter(first, last)).sax_parse(sax);
+        auto ia = i.get();
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
     }
 
     /*!
@@ -19022,7 +23334,7 @@ class basic_json
                 instead; that is, replace calls like `j << i;` with `i >> j;`.
     @since version 1.0.0; deprecated since version 3.0.0
     */
-    JSON_DEPRECATED
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
     friend std::istream& operator<<(basic_json& j, std::istream& i)
     {
         return operator>>(i, j);
@@ -19080,6 +23392,7 @@ class basic_json
             number      | `"number"` (for all number types)
             object      | `"object"`
             array       | `"array"`
+            binary      | `"binary"`
             discarded   | `"discarded"`
 
     @exceptionsafety No-throw guarantee: this function never throws exceptions.
@@ -19095,6 +23408,7 @@ class basic_json
     @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
     since 3.0.0
     */
+    JSON_HEDLEY_RETURNS_NON_NULL
     const char* type_name() const noexcept
     {
         {
@@ -19110,6 +23424,8 @@ class basic_json
                     return "string";
                 case value_t::boolean:
                     return "boolean";
+                case value_t::binary:
+                    return "binary";
                 case value_t::discarded:
                     return "discarded";
                 default:
@@ -19169,7 +23485,8 @@ class basic_json
     number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
     number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
     number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_float    | *any value*                                | Double-Precision Float             | 0xFB
+    number_float    | *any value representable by a float*       | Single-Precision Float             | 0xFA
+    number_float    | *any value NOT representable by a float*   | Double-Precision Float             | 0xFB
     string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
     string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
     string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
@@ -19185,6 +23502,11 @@ class basic_json
     object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
     object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
     object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
+    binary          | *size*: 0..23                              | byte string                        | 0x40..0x57
+    binary          | *size*: 23..255                            | byte string (1 byte follow)        | 0x58
+    binary          | *size*: 256..65535                         | byte string (2 bytes follow)       | 0x59
+    binary          | *size*: 65536..4294967295                  | byte string (4 bytes follow)       | 0x5A
+    binary          | *size*: 4294967296..18446744073709551615   | byte string (8 bytes follow)       | 0x5B
 
     @note The mapping is **complete** in the sense that any JSON value type
           can be converted to a CBOR value.
@@ -19194,23 +23516,22 @@ class basic_json
           function which serializes NaN or Infinity to `null`.
 
     @note The following CBOR types are not used in the conversion:
-          - byte strings (0x40..0x5F)
           - UTF-8 strings terminated by "break" (0x7F)
           - arrays terminated by "break" (0x9F)
           - maps terminated by "break" (0xBF)
+          - byte strings terminated by "break" (0x5F)
           - date/time (0xC0..0xC1)
           - bignum (0xC2..0xC3)
           - decimal fraction (0xC4)
           - bigfloat (0xC5)
-          - tagged items (0xC6..0xD4, 0xD8..0xDB)
           - expected conversions (0xD5..0xD7)
           - simple values (0xE0..0xF3, 0xF8)
           - undefined (0xF7)
-          - half and single-precision floats (0xF9-0xFA)
+          - half-precision floats (0xF9)
           - break (0xFF)
 
     @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
+    @return CBOR serialization as byte vector
 
     @complexity Linear in the size of the JSON value @a j.
 
@@ -19218,13 +23539,14 @@ class basic_json
     vector in CBOR format.,to_cbor}
 
     @sa http://cbor.io
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
         analogous deserialization
     @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
     @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
              related UBJSON format
 
-    @since version 2.0.9
+    @since version 2.0.9; compact representation of floating-point numbers
+           since version 3.8.0
     */
     static std::vector<uint8_t> to_cbor(const basic_json& j)
     {
@@ -19273,7 +23595,8 @@ class basic_json
     number_unsigned | 256..65535                        | uint 16          | 0xCD
     number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
     number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_float    | *any value*                       | float 64         | 0xCB
+    number_float    | *any value representable by a float*     | float 32 | 0xCA
+    number_float    | *any value NOT representable by a float* | float 64 | 0xCB
     string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
     string          | *length*: 32..255                 | str 8            | 0xD9
     string          | *length*: 256..65535              | str 16           | 0xDA
@@ -19284,21 +23607,19 @@ class basic_json
     object          | *size*: 0..15                     | fix map          | 0x80..0x8F
     object          | *size*: 16..65535                 | map 16           | 0xDE
     object          | *size*: 65536..4294967295         | map 32           | 0xDF
+    binary          | *size*: 0..255                    | bin 8            | 0xC4
+    binary          | *size*: 256..65535                | bin 16           | 0xC5
+    binary          | *size*: 65536..4294967295         | bin 32           | 0xC6
 
     @note The mapping is **complete** in the sense that any JSON value type
           can be converted to a MessagePack value.
 
     @note The following values can **not** be converted to a MessagePack value:
           - strings with more than 4294967295 bytes
+          - byte strings with more than 4294967295 bytes
           - arrays with more than 4294967295 elements
           - objects with more than 4294967295 elements
 
-    @note The following MessagePack types are not used in the conversion:
-          - bin 8 - bin 32 (0xC4..0xC6)
-          - ext 8 - ext 32 (0xC7..0xC9)
-          - float 32 (0xCA)
-          - fixext 1 - fixext 16 (0xD4..0xD8)
-
     @note Any MessagePack output created @ref to_msgpack can be successfully
           parsed by @ref from_msgpack.
 
@@ -19367,6 +23688,7 @@ class basic_json
     number_unsigned | 256..32767                        | int16       | `I`
     number_unsigned | 32768..2147483647                 | int32       | `l`
     number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
+    number_unsigned | 2147483649..18446744073709551615  | high-precision | `H`
     number_float    | *any value*                       | float64     | `D`
     string          | *with shortest length indicator*  | string      | `S`
     array           | *see notes on optimized format*   | array       | `[`
@@ -19377,7 +23699,6 @@ class basic_json
 
     @note The following values can **not** be converted to a UBJSON value:
           - strings with more than 9223372036854775807 bytes (theoretical)
-          - unsigned integer numbers above 9223372036854775807
 
     @note The following markers are not used in the conversion:
           - `Z`: no-op values are not created.
@@ -19400,6 +23721,12 @@ class basic_json
           the benefit of this parameter is that the receiving side is
           immediately informed on the number of elements of the container.
 
+    @note If the JSON data contains the binary type, the value stored is a list
+          of integers, as suggested by the UBJSON documentation.  In particular,
+          this means that serialization and the deserialization of a JSON
+          containing binary values into UBJSON and back will result in a
+          different JSON object.
+
     @param[in] j  JSON value to serialize
     @param[in] use_size  whether to add size annotations to container types
     @param[in] use_type  whether to add type annotations to container types
@@ -19464,6 +23791,7 @@ class basic_json
     string          | *any value*                       | string      | 0x02
     array           | *any value*                       | document    | 0x04
     object          | *any value*                       | document    | 0x03
+    binary          | *any value*                       | binary      | 0x05
 
     @warning The mapping is **incomplete**, since only JSON-objects (and things
     contained therein) can be serialized to BSON.
@@ -19545,7 +23873,11 @@ class basic_json
     Negative integer       | number_integer  | 0x39
     Negative integer       | number_integer  | 0x3A
     Negative integer       | number_integer  | 0x3B
-    Negative integer       | number_integer  | 0x40..0x57
+    Byte string            | binary          | 0x40..0x57
+    Byte string            | binary          | 0x58
+    Byte string            | binary          | 0x59
+    Byte string            | binary          | 0x5A
+    Byte string            | binary          | 0x5B
     UTF-8 string           | string          | 0x60..0x77
     UTF-8 string           | string          | 0x78
     UTF-8 string           | string          | 0x79
@@ -19574,12 +23906,10 @@ class basic_json
     @warning The mapping is **incomplete** in the sense that not all CBOR
              types can be converted to a JSON value. The following CBOR types
              are not supported and will yield parse errors (parse_error.112):
-             - byte strings (0x40..0x5F)
              - date/time (0xC0..0xC1)
              - bignum (0xC2..0xC3)
              - decimal fraction (0xC4)
              - bigfloat (0xC5)
-             - tagged items (0xC6..0xD4, 0xD8..0xDB)
              - expected conversions (0xD5..0xD7)
              - simple values (0xE0..0xF3, 0xF8)
              - undefined (0xF7)
@@ -19596,6 +23926,7 @@ class basic_json
                        (true by default)
     @param[in] allow_exceptions  whether to throw exceptions in case of a
     parse error (optional, true by default)
+    @param[in] tag_handler how to treat CBOR tags (optional, error by default)
 
     @return deserialized JSON value; in case of a parse error and
             @a allow_exceptions set to `false`, the return value will be
@@ -19622,32 +23953,62 @@ class basic_json
     @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
            consume input adapters, removed start_index parameter, and added
            @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0
+           since 3.2.0; added @a tag_handler parameter since 3.9.0.
     */
-    JSON_NODISCARD
-    static basic_json from_cbor(detail::input_adapter&& i,
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(InputType&& i,
                                 const bool strict = true,
-                                const bool allow_exceptions = true)
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::cbor, &sdp, strict);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
 
     /*!
-    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool)
+    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t)
     */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_NODISCARD
-    static basic_json from_cbor(A1 && a1, A2 && a2,
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(IteratorType first, IteratorType last,
                                 const bool strict = true,
-                                const bool allow_exceptions = true)
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::cbor, &sdp, strict);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
+    }
+
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
         return res ? result : basic_json(value_t::discarded);
     }
 
@@ -19685,15 +24046,19 @@ class basic_json
     array 32         | array           | 0xDD
     map 16           | object          | 0xDE
     map 32           | object          | 0xDF
+    bin 8            | binary          | 0xC4
+    bin 16           | binary          | 0xC5
+    bin 32           | binary          | 0xC6
+    ext 8            | binary          | 0xC7
+    ext 16           | binary          | 0xC8
+    ext 32           | binary          | 0xC9
+    fixext 1         | binary          | 0xD4
+    fixext 2         | binary          | 0xD5
+    fixext 4         | binary          | 0xD6
+    fixext 8         | binary          | 0xD7
+    fixext 16        | binary          | 0xD8
     negative fixint  | number_integer  | 0xE0-0xFF
 
-    @warning The mapping is **incomplete** in the sense that not all
-             MessagePack types can be converted to a JSON value. The following
-             MessagePack types are not supported and will yield parse errors:
-              - bin 8 - bin 32 (0xC4..0xC6)
-              - ext 8 - ext 32 (0xC7..0xC9)
-              - fixext 1 - fixext 16 (0xD4..0xD8)
-
     @note Any MessagePack output created @ref to_msgpack can be successfully
           parsed by @ref from_msgpack.
 
@@ -19721,7 +24086,7 @@ class basic_json
 
     @sa http://msgpack.org
     @sa @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
         related CBOR format
     @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
         the related UBJSON format
@@ -19733,33 +24098,60 @@ class basic_json
            @a strict parameter since 3.0.0; added @a allow_exceptions parameter
            since 3.2.0
     */
-    JSON_NODISCARD
-    static basic_json from_msgpack(detail::input_adapter&& i,
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(InputType&& i,
                                    const bool strict = true,
                                    const bool allow_exceptions = true)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
     /*!
     @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
     */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_NODISCARD
-    static basic_json from_msgpack(A1 && a1, A2 && a2,
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(IteratorType first, IteratorType last,
                                    const bool strict = true,
                                    const bool allow_exceptions = true)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::msgpack, &sdp, strict);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(const T* ptr, std::size_t len,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(detail::span_input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
     /*!
     @brief create a JSON value from an input in UBJSON format
 
@@ -19781,6 +24173,7 @@ class basic_json
     int16       | number_integer                          | `I`
     int32       | number_integer                          | `l`
     int64       | number_integer                          | `L`
+    high-precision number | number_integer, number_unsigned, or number_float - depends on number string | 'H'
     string      | string                                  | `S`
     char        | string                                  | `C`
     array       | array (optimized values are supported)  | `[`
@@ -19812,7 +24205,7 @@ class basic_json
     @sa http://ubjson.org
     @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
              analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
         related CBOR format
     @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
         the related MessagePack format
@@ -19821,33 +24214,59 @@ class basic_json
 
     @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
     */
-    JSON_NODISCARD
-    static basic_json from_ubjson(detail::input_adapter&& i,
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(InputType&& i,
                                   const bool strict = true,
                                   const bool allow_exceptions = true)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
     /*!
     @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
     */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_NODISCARD
-    static basic_json from_ubjson(A1 && a1, A2 && a2,
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(IteratorType first, IteratorType last,
                                   const bool strict = true,
                                   const bool allow_exceptions = true)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::ubjson, &sdp, strict);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(const T* ptr, std::size_t len,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(detail::span_input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
     /*!
     @brief Create a JSON value from an input in BSON format
 
@@ -19901,42 +24320,64 @@ class basic_json
 
     @sa http://bsonspec.org/spec.html
     @sa @ref to_bson(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
         related CBOR format
     @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
         the related MessagePack format
     @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
         related UBJSON format
     */
-    JSON_NODISCARD
-    static basic_json from_bson(detail::input_adapter&& i,
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(InputType&& i,
                                 const bool strict = true,
                                 const bool allow_exceptions = true)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::bson, &sdp, strict);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
     /*!
     @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
     */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_NODISCARD
-    static basic_json from_bson(A1 && a1, A2 && a2,
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(IteratorType first, IteratorType last,
                                 const bool strict = true,
                                 const bool allow_exceptions = true)
     {
         basic_json result;
         detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::bson, &sdp, strict);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
         return res ? result : basic_json(value_t::discarded);
     }
 
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        return from_bson(ptr, ptr + len, strict, allow_exceptions);
+    }
 
-
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
     /// @}
 
     //////////////////////////
@@ -19989,7 +24430,7 @@ class basic_json
 
     Uses a JSON pointer to retrieve a reference to the respective JSON value.
     No bound checking is performed. The function does not change the JSON
-    value; no `null` values are created. In particular, the the special value
+    value; no `null` values are created. In particular, the special value
     `-` yields an exception.
 
     @param[in] ptr  JSON pointer to the desired element
@@ -20298,7 +24739,7 @@ class basic_json
                     else
                     {
                         const auto idx = json_pointer::array_index(last_path);
-                        if (JSON_UNLIKELY(static_cast<size_type>(idx) > parent.size()))
+                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
                         {
                             // avoid undefined behavior
                             JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
@@ -20312,7 +24753,7 @@ class basic_json
 
                 // if there exists a parent it cannot be primitive
                 default:            // LCOV_EXCL_LINE
-                    assert(false);  // LCOV_EXCL_LINE
+                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
             }
         };
 
@@ -20329,7 +24770,7 @@ class basic_json
             {
                 // perform range check
                 auto it = parent.find(last_path);
-                if (JSON_LIKELY(it != parent.end()))
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
                 {
                     parent.erase(it);
                 }
@@ -20341,12 +24782,12 @@ class basic_json
             else if (parent.is_array())
             {
                 // note erase performs range check
-                parent.erase(static_cast<size_type>(json_pointer::array_index(last_path)));
+                parent.erase(json_pointer::array_index(last_path));
             }
         };
 
         // type check: top level value must be an array
-        if (JSON_UNLIKELY(not json_patch.is_array()))
+        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
         {
             JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
         }
@@ -20366,13 +24807,13 @@ class basic_json
                 const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
 
                 // check if desired value is present
-                if (JSON_UNLIKELY(it == val.m_value.object->end()))
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
                 {
                     JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
                 }
 
                 // check if result is of type string
-                if (JSON_UNLIKELY(string_type and not it->second.is_string()))
+                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
                 {
                     JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
                 }
@@ -20382,14 +24823,14 @@ class basic_json
             };
 
             // type check: every element of the array must be an object
-            if (JSON_UNLIKELY(not val.is_object()))
+            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
             {
                 JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
             }
 
             // collect mandatory members
-            const std::string op = get_value("op", "op", true);
-            const std::string path = get_value(op, "path", true);
+            const auto op = get_value("op", "op", true).template get<std::string>();
+            const auto path = get_value(op, "path", true).template get<std::string>();
             json_pointer ptr(path);
 
             switch (get_op(op))
@@ -20415,7 +24856,7 @@ class basic_json
 
                 case patch_operations::move:
                 {
-                    const std::string from_path = get_value("move", "from", true);
+                    const auto from_path = get_value("move", "from", true).template get<std::string>();
                     json_pointer from_ptr(from_path);
 
                     // the "from" location must exist - use at()
@@ -20432,7 +24873,7 @@ class basic_json
 
                 case patch_operations::copy:
                 {
-                    const std::string from_path = get_value("copy", "from", true);
+                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
                     const json_pointer from_ptr(from_path);
 
                     // the "from" location must exist - use at()
@@ -20460,7 +24901,7 @@ class basic_json
                     }
 
                     // throw an exception if test fails
-                    if (JSON_UNLIKELY(not success))
+                    if (JSON_HEDLEY_UNLIKELY(!success))
                     {
                         JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
                     }
@@ -20513,7 +24954,7 @@ class basic_json
 
     @since version 2.0.0
     */
-    JSON_NODISCARD
+    JSON_HEDLEY_WARN_UNUSED_RESULT
     static basic_json diff(const basic_json& source, const basic_json& target,
                            const std::string& path = "")
     {
@@ -20542,7 +24983,7 @@ class basic_json
             {
                 // first pass: traverse common elements
                 std::size_t i = 0;
-                while (i < source.size() and i < target.size())
+                while (i < source.size() && i < target.size())
                 {
                     // recursive call to compare array values at index i
                     auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
@@ -20573,7 +25014,7 @@ class basic_json
                     result.push_back(
                     {
                         {"op", "add"},
-                        {"path", path + "/" + std::to_string(i)},
+                        {"path", path + "/-"},
                         {"value", target[i]}
                     });
                     ++i;
@@ -20693,7 +25134,7 @@ class basic_json
     {
         if (apply_patch.is_object())
         {
-            if (not is_object())
+            if (!is_object())
             {
                 *this = object();
             }
@@ -20717,6 +25158,21 @@ class basic_json
 
     /// @}
 };
+
+/*!
+@brief user-defined to_string function for JSON values
+
+This function implements a user-defined to_string  for JSON objects.
+
+@param[in] j  a JSON object
+@return a std::string object
+*/
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
 } // namespace nlohmann
 
 ///////////////////////
@@ -20738,9 +25194,7 @@ struct hash<nlohmann::json>
     */
     std::size_t operator()(const nlohmann::json& j) const
     {
-        // a naive hashing via the string representation
-        const auto& h = hash<nlohmann::json::string_t>();
-        return h(j.dump());
+        return nlohmann::detail::hash(j);
     }
 };
 
@@ -20748,7 +25202,7 @@ struct hash<nlohmann::json>
 /// @note: do not remove the space after '<',
 ///        see https://github.com/nlohmann/json/pull/679
 template<>
-struct less< ::nlohmann::detail::value_t>
+struct less<::nlohmann::detail::value_t>
 {
     /*!
     @brief compare two value_t enum values
@@ -20761,6 +25215,9 @@ struct less< ::nlohmann::detail::value_t>
     }
 };
 
+// C++20 prohibit function specialization in the std namespace.
+#ifndef JSON_HAS_CPP_20
+
 /*!
 @brief exchanges the values of two JSON objects
 
@@ -20768,13 +25225,15 @@ struct less< ::nlohmann::detail::value_t>
 */
 template<>
 inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
-    is_nothrow_move_constructible<nlohmann::json>::value and
+    is_nothrow_move_constructible<nlohmann::json>::value&&
     is_nothrow_move_assignable<nlohmann::json>::value
-)
+                              )
 {
     j1.swap(j2);
 }
 
+#endif
+
 } // namespace std
 
 /*!
@@ -20790,6 +25249,7 @@ if no parse error occurred.
 
 @since version 1.0.0
 */
+JSON_HEDLEY_NON_NULL(1)
 inline nlohmann::json operator "" _json(const char* s, std::size_t n)
 {
     return nlohmann::json::parse(s, s + n);
@@ -20808,6 +25268,7 @@ object if no parse error occurred.
 
 @since version 2.0.0
 */
+JSON_HEDLEY_NON_NULL(1)
 inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
 {
     return nlohmann::json::json_pointer(std::string(s, n));
@@ -20825,18 +25286,162 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
 #endif
 
 // clean up
+#undef JSON_ASSERT
 #undef JSON_INTERNAL_CATCH
 #undef JSON_CATCH
 #undef JSON_THROW
 #undef JSON_TRY
-#undef JSON_LIKELY
-#undef JSON_UNLIKELY
-#undef JSON_DEPRECATED
-#undef JSON_NODISCARD
 #undef JSON_HAS_CPP_14
 #undef JSON_HAS_CPP_17
 #undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
 #undef NLOHMANN_BASIC_JSON_TPL
+#undef JSON_EXPLICIT
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT3
+#undef JSON_HEDLEY_CONCAT3_EX
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_ARMCL_VERSION
+#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL2000_VERSION
+#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL430_VERSION
+#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL6X_VERSION
+#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL7X_VERSION
+#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CLPRU_VERSION
+#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#undef JSON_HEDLEY_FALL_THROUGH
+
 
 
 #endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/ext/spice b/ext/spice
index 63e382ac76..ba40ad2c25 160000
--- a/ext/spice
+++ b/ext/spice
@@ -1 +1 @@
-Subproject commit 63e382ac76e0ef37d46a8a0ec3d1980e480f3f88
+Subproject commit ba40ad2c25fe81e152a733b4a6afe53868388206
diff --git a/include/openspace/documentation/core_registration.h b/include/openspace/documentation/core_registration.h
index 90176260a9..9c79012a39 100644
--- a/include/openspace/documentation/core_registration.h
+++ b/include/openspace/documentation/core_registration.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index f6dac77b15..f40ebb1d06 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -323,4 +323,11 @@ std::string to_string(const openspace::documentation::TestResult::Warning::Reaso
 
 } // namespace ghoul
 
+// The verifier header depends on the classes defined in here, but we want to make it
+// easier for consumers of this header to just have access to all verifiers without
+// needing to include this file separately.  Particularly with the use of the codegen, it
+// might lead to some unexcepted error messages about recognized identifiers in the
+// generated code which look scary
+#include <openspace/documentation/verifier.h>
+
 #endif // __OPENSPACE_CORE___DOCUMENTATION___H__
diff --git a/include/openspace/documentation/documentationengine.h b/include/openspace/documentation/documentationengine.h
index 4fc4065f8d..a5d0d7a4c0 100644
--- a/include/openspace/documentation/documentationengine.h
+++ b/include/openspace/documentation/documentationengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/documentation/documentationgenerator.h b/include/openspace/documentation/documentationgenerator.h
index 8b5a165880..103187675f 100644
--- a/include/openspace/documentation/documentationgenerator.h
+++ b/include/openspace/documentation/documentationgenerator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/documentation/verifier.h b/include/openspace/documentation/verifier.h
index a94792e2b0..4817be5492 100644
--- a/include/openspace/documentation/verifier.h
+++ b/include/openspace/documentation/verifier.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -1140,13 +1140,10 @@ using TableDeprecatedVerifier = DeprecatedVerifier<TableVerifier>;
 // Definitions of external templates that are instantiated in the cpp file
 // This cuts down the compilation times as almost all of the possible template types do
 // not need to be instantiated multiple times
-extern template struct Vector2Verifier<bool>;
 extern template struct Vector2Verifier<int>;
 extern template struct Vector2Verifier<double>;
-extern template struct Vector3Verifier<bool>;
 extern template struct Vector3Verifier<int>;
 extern template struct Vector3Verifier<double>;
-extern template struct Vector4Verifier<bool>;
 extern template struct Vector4Verifier<int>;
 extern template struct Vector4Verifier<double>;
 
@@ -1196,13 +1193,10 @@ extern template struct AnnotationVerifier<IntVerifier>;
 extern template struct AnnotationVerifier<DoubleVerifier>;
 extern template struct AnnotationVerifier<StringVerifier>;
 extern template struct AnnotationVerifier<TableVerifier>;
-extern template struct AnnotationVerifier<BoolVector2Verifier>;
 extern template struct AnnotationVerifier<IntVector2Verifier>;
 extern template struct AnnotationVerifier<DoubleVector2Verifier>;
-extern template struct AnnotationVerifier<BoolVector3Verifier>;
 extern template struct AnnotationVerifier<IntVector3Verifier>;
 extern template struct AnnotationVerifier<DoubleVector3Verifier>;
-extern template struct AnnotationVerifier<BoolVector4Verifier>;
 extern template struct AnnotationVerifier<IntVector4Verifier>;
 extern template struct AnnotationVerifier<DoubleVector4Verifier>;
 
@@ -1211,13 +1205,10 @@ extern template struct DeprecatedVerifier<IntVerifier>;
 extern template struct DeprecatedVerifier<DoubleVerifier>;
 extern template struct DeprecatedVerifier<StringVerifier>;
 extern template struct DeprecatedVerifier<TableVerifier>;
-extern template struct DeprecatedVerifier<BoolVector2Verifier>;
 extern template struct DeprecatedVerifier<IntVector2Verifier>;
 extern template struct DeprecatedVerifier<DoubleVector2Verifier>;
-extern template struct DeprecatedVerifier<BoolVector3Verifier>;
 extern template struct DeprecatedVerifier<IntVector3Verifier>;
 extern template struct DeprecatedVerifier<DoubleVector3Verifier>;
-extern template struct DeprecatedVerifier<BoolVector4Verifier>;
 extern template struct DeprecatedVerifier<IntVector4Verifier>;
 extern template struct DeprecatedVerifier<DoubleVector4Verifier>;
 
diff --git a/include/openspace/documentation/verifier.inl b/include/openspace/documentation/verifier.inl
index 6b707ece6f..d61169dd2c 100644
--- a/include/openspace/documentation/verifier.inl
+++ b/include/openspace/documentation/verifier.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,11 +29,23 @@
 
 namespace openspace::documentation {
 
+template <>
+TestResult TemplateVerifier<glm::ivec2>::operator()(const ghoul::Dictionary& dict,
+    const std::string& key) const;
+
+template <>
+TestResult TemplateVerifier<glm::ivec3>::operator()(const ghoul::Dictionary& dict,
+    const std::string& key) const;
+
+template <>
+TestResult TemplateVerifier<glm::ivec4>::operator()(const ghoul::Dictionary& dict,
+    const std::string& key) const;
+
 template <typename T>
 TestResult TemplateVerifier<T>::operator()(const ghoul::Dictionary& dict,
                                            const std::string& key) const
 {
-    if (dict.hasKeyAndValue<Type>(key)) {
+    if (dict.hasValue<Type>(key)) {
         return { true, {}, {} };
     }
     else {
@@ -122,7 +134,22 @@ TestResult OperatorVerifier<T, Operator>::operator()(const ghoul::Dictionary& di
 {
     TestResult res = T::operator()(dict, key);
     if (res.success) {
-        if (Operator()(dict.value<typename T::Type>(key), value)) {
+        typename T::Type val;
+        if constexpr (std::is_same_v<typename T::Type, int>) {
+            const double d = dict.value<double>(key);
+            double intPart;
+            bool isInt = modf(d, &intPart) == 0.0;
+            if (isInt) {
+                val = static_cast<int>(d);
+            }
+            else {
+                return { false, { { key, TestResult::Offense::Reason::WrongType } }, {} };
+            }
+        }
+        else {
+            val = dict.value<typename T::Type>(key);
+        }
+        if (Operator()(val, value)) {
             return { true, {}, {} };
         }
         else {
@@ -270,7 +297,21 @@ TestResult InRangeVerifier<T>::operator()(const ghoul::Dictionary& dict,
 {
     TestResult res = T::operator()(dict, key);
     if (res.success) {
-        typename T::Type val = dict.value<typename T::Type>(key);
+        typename T::Type val;
+        if constexpr (std::is_same_v<typename T::Type, int>) {
+            const double d = dict.value<double>(key);
+            double intPart;
+            bool isInt = modf(d, &intPart) == 0.0;
+            if (isInt) {
+                val = static_cast<int>(d);
+            }
+            else {
+                return { false, { { key, TestResult::Offense::Reason::WrongType } }, {} };
+            }
+        }
+        else {
+            val = dict.value<typename T::Type>(key);
+        }
 
         if (val >= lower && val <= upper) {
             return { true, {}, {} };
@@ -303,7 +344,21 @@ TestResult NotInRangeVerifier<T>::operator()(const ghoul::Dictionary& dict,
                                              const std::string& key) const {
     TestResult res = T::operator()(dict, key);
     if (res.success) {
-        typename T::Type val = dict.value<typename T::Type>(key);
+        typename T::Type val;
+        if constexpr (std::is_same_v<typename T::Type, int>) {
+            const double d = dict.value<double>(key);
+            double intPart;
+            bool isInt = modf(d, &intPart) == 0.0;
+            if (isInt) {
+                val = static_cast<int>(d);
+            }
+            else {
+                return { false, { { key, TestResult::Offense::Reason::WrongType } }, {} };
+            }
+        }
+        else {
+            val = dict.value<typename T::Type>(key);
+        }
 
         if (val >= lower && val <= upper) {
             return { false, { { key, TestResult::Offense::Reason::Verification } }, {} };
@@ -328,7 +383,7 @@ template <typename T>
 AnnotationVerifier<T>::AnnotationVerifier(std::string a)
     : annotation(std::move(a))
 {
-    ghoul_assert(!annotation.empty(), "Annotation must not be empty");
+
 }
 
 template <typename T>
diff --git a/include/openspace/engine/configuration.h b/include/openspace/engine/configuration.h
index 65811a23fc..5ba443cf7e 100644
--- a/include/openspace/engine/configuration.h
+++ b/include/openspace/engine/configuration.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/engine/downloadmanager.h b/include/openspace/engine/downloadmanager.h
index 9769089855..26b0fa21f6 100644
--- a/include/openspace/engine/downloadmanager.h
+++ b/include/openspace/engine/downloadmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/engine/globals.h b/include/openspace/engine/globals.h
index 2a1b946491..c308a08bf7 100644
--- a/include/openspace/engine/globals.h
+++ b/include/openspace/engine/globals.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/engine/globalscallbacks.h b/include/openspace/engine/globalscallbacks.h
index 9131294139..0a4544a33e 100644
--- a/include/openspace/engine/globalscallbacks.h
+++ b/include/openspace/engine/globalscallbacks.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,62 +31,26 @@
 #include <functional>
 #include <vector>
 
-namespace openspace::global {
+namespace openspace::global::callback {
 
-namespace detail {
-
-std::vector<std::function<void()>>& gInitialize();
-std::vector<std::function<void()>>& gDeinitialize();
-
-std::vector<std::function<void()>>& gInitializeGL();
-std::vector<std::function<void()>>& gDeinitializeGL();
-
-std::vector<std::function<void()>>& gPreSync();
-std::vector<std::function<void()>>& gPostSyncPreDraw();
-std::vector<std::function<void()>>& gRender();
-std::vector<std::function<void()>>& gDraw2D();
-std::vector<std::function<void()>>& gPostDraw();
-
-std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>& gKeyboard();
-std::vector<std::function<bool(unsigned int, KeyModifier)>>& gCharacter();
-
-std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>>& gMouseButton();
-std::vector<std::function<void(double, double)>>& gMousePosition();
-std::vector<std::function<bool(double, double)>>& gMouseScrollWheel();
-
-std::vector<std::function<bool(TouchInput)>>& gTouchDetected();
-std::vector<std::function<bool(TouchInput)>>& gTouchUpdated();
-std::vector<std::function<void(TouchInput)>>& gTouchExit();
-
-} // namespace detail
-
-namespace callback {
-
-static std::vector<std::function<void()>>& initialize = detail::gInitialize();
-static std::vector<std::function<void()>>& deinitialize = detail::gDeinitialize();
-static std::vector<std::function<void()>>& initializeGL = detail::gInitializeGL();
-static std::vector<std::function<void()>>& deinitializeGL = detail::gDeinitializeGL();
-static std::vector<std::function<void()>>& preSync = detail::gPreSync();
-static std::vector<std::function<void()>>& postSyncPreDraw = detail::gPostSyncPreDraw();
-static std::vector<std::function<void()>>& render = detail::gRender();
-static std::vector<std::function<void()>>& draw2D = detail::gDraw2D();
-static std::vector<std::function<void()>>& postDraw = detail::gPostDraw();
-static std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>& keyboard =
-    detail::gKeyboard();
-static std::vector<std::function<bool(unsigned int, KeyModifier)>>& character =
-    detail::gCharacter();
-static std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>>&
-    mouseButton = detail::gMouseButton();
-static std::vector<std::function<void(double, double)>>& mousePosition =
-    detail::gMousePosition();
-static std::vector<std::function<bool(double, double)>>& mouseScrollWheel =
-    detail::gMouseScrollWheel();
-static std::vector<std::function<bool(TouchInput)>>& touchDetected =
-    detail::gTouchDetected();
-static std::vector<std::function<bool(TouchInput)>>& touchUpdated =
-    detail::gTouchUpdated();
-static std::vector<std::function<void(TouchInput)>>& touchExit =
-    detail::gTouchExit();
+inline std::vector<std::function<void()>>* initialize;
+inline std::vector<std::function<void()>>* deinitialize;
+inline std::vector<std::function<void()>>* initializeGL;
+inline std::vector<std::function<void()>>* deinitializeGL;
+inline std::vector<std::function<void()>>* preSync;
+inline std::vector<std::function<void()>>* postSyncPreDraw;
+inline std::vector<std::function<void()>>* render;
+inline std::vector<std::function<void()>>* draw2D;
+inline std::vector<std::function<void()>>* postDraw;
+inline std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>* keyboard;
+inline std::vector<std::function<bool(unsigned int, KeyModifier)>>* character;
+inline std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>>*
+    mouseButton;
+inline std::vector<std::function<void(double, double)>>* mousePosition;
+inline std::vector<std::function<bool(double, double)>>* mouseScrollWheel;
+inline std::vector<std::function<bool(TouchInput)>>* touchDetected;
+inline std::vector<std::function<bool(TouchInput)>>* touchUpdated;
+inline std::vector<std::function<void(TouchInput)>>* touchExit;
 
 /**
  * If the framerate becomes slow, Chromium Embedded Framework (used in Web Browser Module)
@@ -99,7 +63,8 @@ static std::vector<std::function<void(TouchInput)>>& touchExit =
  */
 extern void (*webBrowserPerformanceHotfix)();
 
-} // namespace callback
+void create();
+void destroy();
 
 } // namespace openspace::global
 
diff --git a/include/openspace/engine/logfactory.h b/include/openspace/engine/logfactory.h
index 4d023ec9e9..7b48b5a82e 100644
--- a/include/openspace/engine/logfactory.h
+++ b/include/openspace/engine/logfactory.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/engine/moduleengine.h b/include/openspace/engine/moduleengine.h
index d12cf5189f..cc23589a4c 100644
--- a/include/openspace/engine/moduleengine.h
+++ b/include/openspace/engine/moduleengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -88,8 +88,7 @@ public:
      *        previously
      * \pre \p module must not be nullptr
      */
-    void registerModule(std::unique_ptr<OpenSpaceModule> module,
-        const ghoul::Dictionary& configuration);
+    void registerModule(std::unique_ptr<OpenSpaceModule> module);
 
     /**
      * Returns a list of all registered OpenSpaceModule%s that have been registered with
diff --git a/include/openspace/engine/moduleengine.inl b/include/openspace/engine/moduleengine.inl
index 7853a64eb1..d00009950f 100644
--- a/include/openspace/engine/moduleengine.inl
+++ b/include/openspace/engine/moduleengine.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h
index 6ccae1f19a..42612a9368 100644
--- a/include/openspace/engine/openspaceengine.h
+++ b/include/openspace/engine/openspaceengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -139,4 +139,11 @@ private:
 
 } // namespace openspace
 
+// Lua functions - exposed for testing
+namespace openspace::luascriptfunctions {
+
+int createSingeColorImage(lua_State* L);
+
+} // openspace::luascriptfunctions
+
 #endif // __OPENSPACE_CORE___OPENSPACEENGINE___H__
diff --git a/include/openspace/engine/syncengine.h b/include/openspace/engine/syncengine.h
index 67902b34ee..a962694aa0 100644
--- a/include/openspace/engine/syncengine.h
+++ b/include/openspace/engine/syncengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/engine/virtualpropertymanager.h b/include/openspace/engine/virtualpropertymanager.h
index 5d0701797f..d2054868f1 100644
--- a/include/openspace/engine/virtualpropertymanager.h
+++ b/include/openspace/engine/virtualpropertymanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/engine/windowdelegate.h b/include/openspace/engine/windowdelegate.h
index 0fd27ba589..04e698cbe0 100644
--- a/include/openspace/engine/windowdelegate.h
+++ b/include/openspace/engine/windowdelegate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -100,6 +100,8 @@ struct WindowDelegate {
     Frustum (*frustumMode)() = []() { return Frustum::Mono; };
 
     uint64_t (*swapGroupFrameNumber)() = []() { return uint64_t(0); };
+
+    void (*setScreenshotFolder)(std::string) = [](std::string) {};
 };
 
 } // namespace openspace
diff --git a/include/openspace/interaction/camerainteractionstates.h b/include/openspace/interaction/camerainteractionstates.h
index 43912f6d5c..ba51a74348 100644
--- a/include/openspace/interaction/camerainteractionstates.h
+++ b/include/openspace/interaction/camerainteractionstates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/delayedvariable.h b/include/openspace/interaction/delayedvariable.h
index fd2a653820..7ecec27b00 100644
--- a/include/openspace/interaction/delayedvariable.h
+++ b/include/openspace/interaction/delayedvariable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/delayedvariable.inl b/include/openspace/interaction/delayedvariable.inl
index 2d36d5fbfa..e0e18a84e1 100644
--- a/include/openspace/interaction/delayedvariable.inl
+++ b/include/openspace/interaction/delayedvariable.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/externinteraction.h b/include/openspace/interaction/externinteraction.h
index a0478c86e1..f112c47df3 100644
--- a/include/openspace/interaction/externinteraction.h
+++ b/include/openspace/interaction/externinteraction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/inputstate.h b/include/openspace/interaction/inputstate.h
index 443899df35..5cb71905c7 100644
--- a/include/openspace/interaction/inputstate.h
+++ b/include/openspace/interaction/inputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/interactionmonitor.h b/include/openspace/interaction/interactionmonitor.h
index b8c7a8b2b9..112b788f32 100644
--- a/include/openspace/interaction/interactionmonitor.h
+++ b/include/openspace/interaction/interactionmonitor.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/interpolator.h b/include/openspace/interaction/interpolator.h
index 9b52cef505..d9674f6f61 100644
--- a/include/openspace/interaction/interpolator.h
+++ b/include/openspace/interaction/interpolator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -51,7 +51,6 @@ public:
 
 private:
     std::function<T(float)> _transferFunction;
-    bool _isInterpolating = false;
     float _t = 1.f;
     float _interpolationTime = 1.f;
     float _scaledDeltaTime = 0.f;
diff --git a/include/openspace/interaction/interpolator.inl b/include/openspace/interaction/interpolator.inl
index 3b2588fac3..35c5bca308 100644
--- a/include/openspace/interaction/interpolator.inl
+++ b/include/openspace/interaction/interpolator.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,28 +34,16 @@ Interpolator<T>::Interpolator()
 template <typename T>
 void Interpolator<T>::start() {
     _t = 0.f;
-    _isInterpolating = true;
 }
 
 template <typename T>
 void Interpolator<T>::end() {
     _t = 1.f;
-    _isInterpolating = false;
 }
 
 template <typename T>
 void Interpolator<T>::setDeltaTime(float deltaTime) {
-    if (_interpolationTime > 0.f) {
-        _scaledDeltaTime = deltaTime / _interpolationTime;
-    }
-    else {
-        if (deltaTime > 0.f) {
-            _scaledDeltaTime = 1.f;
-        }
-        else {
-            _scaledDeltaTime = -1.f;
-        }
-    }
+    _scaledDeltaTime = deltaTime / _interpolationTime;
 }
 
 template <typename T>
@@ -71,7 +59,7 @@ void Interpolator<T>::setInterpolationTime(float interpolationTime) {
 template <typename T>
 void Interpolator<T>::step() {
     _t += _scaledDeltaTime;
-    _t = glm::clamp(_t, 0.f, 1.f);
+    _t = glm::clamp(_t, 0.0f, 1.0f);
 }
 
 template <typename T>
@@ -86,7 +74,7 @@ T Interpolator<T>::value() const {
 
 template <typename T>
 bool Interpolator<T>::isInterpolating() const {
-    return _isInterpolating;
+    return (_t < 1.f) && (_t >= 0.f);
 }
 
 } // namespace openspace::interaction
diff --git a/include/openspace/interaction/joystickcamerastates.h b/include/openspace/interaction/joystickcamerastates.h
index f98dda8783..fd0098e933 100644
--- a/include/openspace/interaction/joystickcamerastates.h
+++ b/include/openspace/interaction/joystickcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/joystickinputstate.h b/include/openspace/interaction/joystickinputstate.h
index 66c46ee11c..ced81f4013 100644
--- a/include/openspace/interaction/joystickinputstate.h
+++ b/include/openspace/interaction/joystickinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h
index 054f490b6a..e837da5c36 100644
--- a/include/openspace/interaction/keybindingmanager.h
+++ b/include/openspace/interaction/keybindingmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/keyframenavigator.h b/include/openspace/interaction/keyframenavigator.h
index 5d98fe412e..767aced843 100644
--- a/include/openspace/interaction/keyframenavigator.h
+++ b/include/openspace/interaction/keyframenavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/mousecamerastates.h b/include/openspace/interaction/mousecamerastates.h
index 719dcd6926..c1aae53864 100644
--- a/include/openspace/interaction/mousecamerastates.h
+++ b/include/openspace/interaction/mousecamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/navigationhandler.h b/include/openspace/interaction/navigationhandler.h
index 24d3ef495b..68d34498b2 100644
--- a/include/openspace/interaction/navigationhandler.h
+++ b/include/openspace/interaction/navigationhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -166,7 +166,8 @@ private:
 
     std::optional<NavigationState> _pendingNavigationState;
 
-    properties::BoolProperty _disableInputs;
+    properties::BoolProperty _disableMouseInputs;
+    properties::BoolProperty _disableJoystickInputs;
     properties::BoolProperty _useKeyFrameInteraction;
 };
 
diff --git a/include/openspace/interaction/orbitalnavigator.h b/include/openspace/interaction/orbitalnavigator.h
index e541ab23fd..a8e2a02697 100644
--- a/include/openspace/interaction/orbitalnavigator.h
+++ b/include/openspace/interaction/orbitalnavigator.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -268,7 +268,7 @@ private:
     */
     glm::dvec3 moveCameraAlongVector(const glm::dvec3& camPos,
         double distFromCameraToFocus, const glm::dvec3& camPosToCenterPosDiff,
-        double destination) const;
+        double destination, double deltaTime) const;
 
     /*
      * Adds rotation to the camera position so that it follows the rotation of the anchor
diff --git a/include/openspace/interaction/scriptcamerastates.h b/include/openspace/interaction/scriptcamerastates.h
index c70814bac4..df5fa5a612 100644
--- a/include/openspace/interaction/scriptcamerastates.h
+++ b/include/openspace/interaction/scriptcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/sessionrecording.h b/include/openspace/interaction/sessionrecording.h
index 21b518568f..51aaaf6686 100644
--- a/include/openspace/interaction/sessionrecording.h
+++ b/include/openspace/interaction/sessionrecording.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,9 +33,13 @@
 
 namespace openspace::interaction {
 
+struct ConversionError : public ghoul::RuntimeError {
+    explicit ConversionError(std::string msg);
+};
 
 class SessionRecording : public properties::PropertyOwner {
 public:
+
     inline static const std::string FileHeaderTitle = "OpenSpace_record/playback";
     inline static const std::string HeaderCameraAscii = "camera";
     inline static const std::string HeaderTimeAscii = "time";
@@ -66,14 +70,13 @@ public:
     };
 
     static const size_t FileHeaderVersionLength = 5;
-    static constexpr char FileHeaderVersion[FileHeaderVersionLength] = {
-        '0', '0', '.', '8', '5'
-    };
+    char FileHeaderVersion[FileHeaderVersionLength+1] = "01.00";
+    char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
     static const char DataFormatAsciiTag = 'A';
     static const char DataFormatBinaryTag = 'B';
     static const size_t keyframeHeaderSize_bytes = 33;
     static const size_t saveBufferCameraSize_min = 82;
-    static const size_t saveBufferStringSize_max = 500;
+    static const size_t saveBufferStringSize_max = 2000;
     static const size_t _saveBufferMaxSize_bytes = keyframeHeaderSize_bytes +
         + saveBufferCameraSize_min + saveBufferStringSize_max;
 
@@ -81,6 +84,7 @@ public:
     using StateChangeCallback = std::function<void()>;
 
     SessionRecording();
+    SessionRecording(bool isGlobal);
 
     ~SessionRecording();
 
@@ -158,7 +162,7 @@ public:
      *
      * \return \c true if recording to file starts without errors
      */
-    bool startPlayback(const std::string& filename, KeyframeTimeRef timeMode,
+    bool startPlayback(std::string& filename, KeyframeTimeRef timeMode,
         bool forceSimTimeAtStart);
 
     /**
@@ -254,8 +258,10 @@ public:
      * \param kf reference to a camera keyframe which contains camera details
      * \param file an ifstream reference to the playback file being read
      * \param lineN keyframe number in playback file where this keyframe resides
+     *
+     * \return true if data read has no errors
      */
-    static void readCameraKeyframeBinary(Timestamps& times,
+    bool readCameraKeyframeBinary(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, std::ifstream& file, int lineN);
 
     /**
@@ -266,8 +272,10 @@ public:
      * \param kf reference to a camera keyframe which contains camera details
      * \param currentParsingLine string containing the most current line that was read
      * \param lineN line number in playback file where this keyframe resides
+     *
+     * \return true if data read has no errors
      */
-    static void readCameraKeyframeAscii(Timestamps& times,
+    bool readCameraKeyframeAscii(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, std::string currentParsingLine,
         int lineN);
 
@@ -279,8 +287,10 @@ public:
      * \param kf reference to a time keyframe which contains time details
      * \param file an ifstream reference to the playback file being read
      * \param lineN keyframe number in playback file where this keyframe resides
+     *
+     * \return true if data read has no errors
      */
-    static void readTimeKeyframeBinary(Timestamps& times,
+    bool readTimeKeyframeBinary(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, std::ifstream& file, int lineN);
 
     /**
@@ -291,8 +301,10 @@ public:
      * \param kf reference to a time keyframe which contains time details
      * \param currentParsingLine string containing the most current line that was read
      * \param lineN line number in playback file where this keyframe resides
+     *
+     * \return true if data read has no errors
      */
-    static void readTimeKeyframeAscii(Timestamps& times,
+    bool readTimeKeyframeAscii(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, std::string currentParsingLine,
         int lineN);
 
@@ -305,8 +317,10 @@ public:
      *        (in chars) and the text itself
      * \param file an ifstream reference to the playback file being read
      * \param lineN keyframe number in playback file where this keyframe resides
+     *
+     * \return true if data read has no errors
      */
-    static void readScriptKeyframeBinary(Timestamps& times,
+    bool readScriptKeyframeBinary(Timestamps& times,
         datamessagestructures::ScriptMessage& kf, std::ifstream& file, int lineN);
 
     /**
@@ -318,8 +332,10 @@ public:
      *        (in chars) and the text itself
      * \param currentParsingLine string containing the most current line that was read
      * \param lineN line number in playback file where this keyframe resides
+     *
+     * \return true if data read has no errors
      */
-    static void readScriptKeyframeAscii(Timestamps& times,
+    bool readScriptKeyframeAscii(Timestamps& times,
         datamessagestructures::ScriptMessage& kf, std::string currentParsingLine,
         int lineN);
 
@@ -331,7 +347,7 @@ public:
      * \param kfBuffer a buffer temporarily used for preparing data to be written
      * \param file an ofstream reference to the recording file being written-to
      */
-    static void saveCameraKeyframeBinary(Timestamps times,
+    void saveCameraKeyframeBinary(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, unsigned char* kfBuffer,
         std::ofstream& file);
 
@@ -342,7 +358,7 @@ public:
      * \param kf reference to a camera keyframe which contains the camera details
      * \param file an ofstream reference to the recording file being written-to
      */
-    static void saveCameraKeyframeAscii(Timestamps times,
+    void saveCameraKeyframeAscii(Timestamps& times,
         datamessagestructures::CameraKeyframe& kf, std::ofstream& file);
 
     /**
@@ -353,7 +369,7 @@ public:
      * \param kfBuffer a buffer temporarily used for preparing data to be written
      * \param file an ofstream reference to the recording file being written-to
      */
-    static void saveTimeKeyframeBinary(Timestamps times,
+    void saveTimeKeyframeBinary(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, unsigned char* kfBuffer,
         std::ofstream& file);
 
@@ -364,7 +380,7 @@ public:
      * \param kf reference to a time keyframe which contains the time details
      * \param file an ofstream reference to the recording file being written-to
      */
-    static void saveTimeKeyframeAscii(Timestamps times,
+    void saveTimeKeyframeAscii(Timestamps& times,
         datamessagestructures::TimeKeyframe& kf, std::ofstream& file);
 
     /**
@@ -375,7 +391,7 @@ public:
      * \param smBuffer a buffer temporarily used for preparing data to be written
      * \param file an ofstream reference to the recording file being written-to
      */
-    static void saveScriptKeyframeBinary(Timestamps times,
+    void saveScriptKeyframeBinary(Timestamps& times,
         datamessagestructures::ScriptMessage& sm, unsigned char* smBuffer,
         std::ofstream& file);
 
@@ -386,7 +402,7 @@ public:
      * \param sm reference to a ScriptMessage which contains the script details
      * \param file an ofstream reference to the recording file being written-to
      */
-    static void saveScriptKeyframeAscii(Timestamps times,
+    void saveScriptKeyframeAscii(Timestamps& times,
         datamessagestructures::ScriptMessage& sm, std::ofstream& file);
 
     /**
@@ -398,6 +414,15 @@ public:
      */
     static std::string readHeaderElement(std::ifstream& stream, size_t readLen_chars);
 
+    /**
+ * Reads header information from a session recording file
+ *
+ * \param stringstream reference to ifstream that contains the session recording file data
+ * \param readLen_chars number of characters to be read, which may be the expected
+ *        length of the header line, or an arbitrary number of characters within it
+ */
+    static std::string readHeaderElement(std::stringstream& stream, size_t readLen_chars);
+
     /**
      * Writes a header to a binary recording file buffer
      *
@@ -406,7 +431,7 @@ public:
      * \param kfBuffer the char buffer holding the recording info to be written
      * \param idx index into write buffer (this is updated with the num of chars written)
      */
-    static void saveHeaderBinary(Timestamps times, char type, unsigned char* kfBuffer,
+    static void saveHeaderBinary(Timestamps& times, char type, unsigned char* kfBuffer,
         size_t& idx);
 
     /**
@@ -416,7 +441,7 @@ public:
      * \param type string signifying the keyframe type
      * \param line the stringstream buffer being written to
      */
-    static void saveHeaderAscii(Timestamps times, const std::string& type,
+    static void saveHeaderAscii(Timestamps& times, const std::string& type,
         std::stringstream& line);
 
     /**
@@ -435,7 +460,59 @@ public:
      */
     static bool hasFileExtension(std::string filename, std::string extension);
 
-private:
+    /**
+     * Converts file format of a session recording file to the current format version
+     * (will determine the file format conversion to convert from based on the file's
+     * header version number).
+     *
+     * \param filename name of the file to convert
+     * \param depth iteration number to prevent runaway recursion (init call with zero)
+     *
+     * \return string containing the filename of the previous conversion step. This is
+     *         used if there are multiple conversion steps where each step has to use
+     *         the output of the previous.
+     */
+    std::string convertFile(std::string filename, int depth = 0);
+
+    /**
+     * Goes to legacy session recording inherited class, and calls its convertFile()
+     * method, and then returns the resulting conversion filename.
+     *
+     * \param filename name of the file to convert
+     * \param depth iteration number to prevent runaway recursion (init call with zero)
+     *
+     * \return string containing the filename of the conversion
+     */
+    virtual std::string getLegacyConversionResult(std::string filename, int depth);
+
+    /*
+     * Version string for file format version currently supported by this class
+     *
+     * \return string of the file format version this class supports
+     */
+    virtual std::string fileFormatVersion();
+
+    /*
+     * Version string for file format version that a conversion operation will convert
+     * to (e.g. upgrades to this version). This is only relevant for inherited classes
+     * that support conversion from legacy versions (if called in the base class, it
+     * will return its own current version).
+     *
+     * \return string of the file format version this class supports
+     */
+    virtual std::string targetFileFormatVersion();
+
+    /*
+     * Determines a filename for the conversion result based on the original filename
+     * and the file format version number.
+     *
+     * \param filename source filename to be converted
+     *
+     * \return pathname of the converted version of the file
+     */
+    std::string determineConversionOutFilename(const std::string filename, DataMode mode);
+
+protected:
     properties::BoolProperty _renderPlaybackInformation;
 
     enum class RecordedType {
@@ -459,6 +536,9 @@ private:
     double equivalentSimulationTime(double timeOs, double timeRec, double timeSim);
     double equivalentApplicationTime(double timeOs, double timeRec, double timeSim);
     bool handleRecordingFile(std::string filenameIn);
+    static bool isPath(std::string& filename);
+    void removeTrailingPathSlashes(std::string& filename);
+    void extractFilenameFromPath(std::string& filename);
     bool playbackCamera();
     bool playbackTimeChange();
     bool playbackScript();
@@ -485,7 +565,21 @@ private:
     bool findNextFutureCameraIndex(double currTime);
     bool processCameraKeyframe(double now);
     bool processScriptKeyframe();
-    //bool isDataModeBinary();
+    bool readSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
+        Timestamps& times, DataMode mode, std::ifstream& file,
+        std::string& inLine, const int lineNum);
+    void saveSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
+        Timestamps& times, DataMode mode, std::ofstream& file, unsigned char* buffer);
+    bool readSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
+        Timestamps& times, DataMode mode, std::ifstream& file, std::string& inLine,
+        const int lineNum);
+    void saveSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
+        Timestamps& times, DataMode mode, std::ofstream& file, unsigned char* buffer);
+    bool readSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
+        Timestamps& times, DataMode mode, std::ifstream& file, std::string& inLine,
+        const int lineNum);
+    void saveSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
+        Timestamps& times, DataMode mode, std::ofstream& file, unsigned char* buffer);
     unsigned int findIndexOfLastCameraKeyframeInTimeline();
     bool doesTimelineEntryContainCamera(unsigned int index) const;
     std::vector<std::pair<CallbackHandle, StateChangeCallback>> _stateChangeCallbacks;
@@ -495,11 +589,24 @@ private:
     double getNextTimestamp();
     double getPrevTimestamp();
     void cleanUpPlayback();
+    bool convertEntries(std::string& inFilename, std::stringstream& inStream,
+        DataMode mode, int lineNum, std::ofstream& outFile);
+    virtual bool convertCamera(std::stringstream& inStream, DataMode mode, int lineNum,
+        std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
+    virtual bool convertTimeChange(std::stringstream& inStream, DataMode mode,
+        int lineNum, std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
+    virtual bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
+        std::string& inputLine, std::ofstream& outFile, unsigned char* buff);
+    DataMode readModeFromHeader(std::string filename);
+    void readPlaybackHeader_stream(std::stringstream& conversionInStream,
+        std::string& version, DataMode& mode);
 
     static void writeToFileBuffer(unsigned char* buf, size_t& idx, double src);
     static void writeToFileBuffer(unsigned char* buf, size_t& idx, std::vector<char>& cv);
     static void writeToFileBuffer(unsigned char* buf, size_t& idx, unsigned char c);
     static void writeToFileBuffer(unsigned char* buf, size_t& idx, bool b);
+    void readFileIntoStringStream(std::string filename,
+        std::ifstream& inputFstream, std::stringstream& stream);
 
     DataMode _recordingDataMode = DataMode::Binary;
     SessionState _state = SessionState::Idle;
@@ -541,6 +648,69 @@ private:
     double _cameraFirstInTimeline_timestamp = 0;
 
     int _nextCallbackHandle = 0;
+
+    DataMode _conversionDataMode = DataMode::Binary;
+    int _conversionLineNum = 1;
+    const int _maximumRecursionDepth = 50;
+};
+
+// Instructions for bumping the file format version with new changes:
+//
+// 1. Create a new subclass with the current version # in its name, such as:
+//    SessionRecording_legacy_####, which inherits from SessionRecording
+// 2. Override any method that changes in the new version. This includes both
+//    methods in SessionRecording class and structs in
+//    openspace::datamessagestructure that do data read/writes. Make the modified
+//    method/struct virtual, and override it in the new legacy subclass. This
+//    override will contain the code as it is before the new changes. This will
+//    need to be done in every legacy subclass/struct that exists, but only if that
+//    subclass does NOT already contain an override of that method/struct.
+// 3. Override FileHeaderVersion with the version # of the new subclass (which is
+//    the version being replaced by the new changes).
+// 4. Override TargetConvertVersion with the version # with the new changes. This
+//    is now the version that this legacy subclass converts up to.
+// 5. Override getLegacyConversionResult method so that it creates an instance of
+//    the new version subclass. This is how the current version looks back to the
+//    legacy version that preceded it.
+// 6. The convert method for frame types that changed will need to be changed
+//    (for example SessionRecording_legacy_0085::convertScript uses its own
+//    override of script keyframe for the conversion functionality).
+
+class SessionRecording_legacy_0085 : public SessionRecording {
+public:
+    SessionRecording_legacy_0085() : SessionRecording() {}
+    ~SessionRecording_legacy_0085() {}
+    char FileHeaderVersion[FileHeaderVersionLength+1] = "00.85";
+    char TargetConvertVersion[FileHeaderVersionLength+1] = "01.00";
+    std::string fileFormatVersion() {
+        return std::string(FileHeaderVersion);
+    }
+    std::string targetFileFormatVersion() {
+        return std::string(TargetConvertVersion);
+    }
+    std::string getLegacyConversionResult(std::string filename, int depth);
+
+    struct ScriptMessage_legacy_0085 : public datamessagestructures::ScriptMessage {
+        void read(std::istream* in) {
+            size_t strLen;
+            //Read string length from file
+            in->read(reinterpret_cast<char*>(&strLen), sizeof(strLen));
+            if (strLen > saveBufferStringSize_max) {
+                throw ConversionError("Invalid script size for conversion read.");
+            }
+            //Read back full string
+            std::vector<char> temp(strLen + 1);
+            in->read(temp.data(), strLen);
+            temp[strLen] = '\0';
+
+            _script.erase();
+            _script = temp.data();
+        };
+    };
+
+protected:
+    bool convertScript(std::stringstream& inStream, DataMode mode, int lineNum,
+        std::string& inputLine, std::ofstream& outFile, unsigned char* buffer);
 };
 
 } // namespace openspace
diff --git a/include/openspace/interaction/sessionrecording.inl b/include/openspace/interaction/sessionrecording.inl
index 1d8ca3bcad..d77b364052 100644
--- a/include/openspace/interaction/sessionrecording.inl
+++ b/include/openspace/interaction/sessionrecording.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -62,4 +62,11 @@ T readFromPlayback(std::ifstream& stream) {
     return res;
 }
 
+template <typename T>
+T readFromPlayback(std::stringstream& stream) {
+    T res;
+    stream.read(reinterpret_cast<char*>(&res), sizeof(T));
+    return res;
+}
+
 } // namespace openspace::interaction
diff --git a/include/openspace/interaction/shortcutmanager.h b/include/openspace/interaction/shortcutmanager.h
index 4f901f9f42..d1043cf74b 100644
--- a/include/openspace/interaction/shortcutmanager.h
+++ b/include/openspace/interaction/shortcutmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/tasks/convertrecfileversiontask.h b/include/openspace/interaction/tasks/convertrecfileversiontask.h
new file mode 100644
index 0000000000..a707146095
--- /dev/null
+++ b/include/openspace/interaction/tasks/convertrecfileversiontask.h
@@ -0,0 +1,57 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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___CONVERTRECFILEVERSIONTASK___H__
+#define __OPENSPACE_CORE___CONVERTRECFILEVERSIONTASK___H__
+
+#include <openspace/util/task.h>
+#include <openspace/interaction/sessionrecording.h>
+
+#include <ghoul/glm.h>
+
+#include <string>
+
+
+
+namespace openspace::interaction {
+
+class ConvertRecFileVersionTask : public Task {
+public:
+    ConvertRecFileVersionTask(const ghoul::Dictionary& dictionary);
+    ~ConvertRecFileVersionTask();
+    std::string description() override;
+    void perform(const Task::ProgressCallback& progressCallback) override;
+    static documentation::Documentation documentation();
+    void convert();
+    SessionRecording* sessRec;
+
+private:
+    std::string _inFilename;
+    std::string _inFilePath;
+    std::string _valueFunctionLua;
+};
+
+} // namespace openspace::interaction
+
+#endif // __OPENSPACE_CORE___CONVERTRECFILEVERSIONTASK___H__
diff --git a/include/openspace/interaction/tasks/convertrecformattask.h b/include/openspace/interaction/tasks/convertrecformattask.h
index ba9f4f5ada..9258d70406 100644
--- a/include/openspace/interaction/tasks/convertrecformattask.h
+++ b/include/openspace/interaction/tasks/convertrecformattask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,8 +32,6 @@
 
 #include <string>
 
-
-
 namespace openspace::interaction {
 
 class ConvertRecFormatTask : public Task {
@@ -59,10 +57,12 @@ private:
     std::ifstream _iFile;
     std::ofstream _oFile;
     SessionRecording::DataMode _fileFormatType;
+    std::string _version;
 
     std::string _valueFunctionLua;
+    SessionRecording* sessRec;
 };
 
 } // namespace openspace::interaction
 
-#endif //__OPENSPACE_CORE___CONVERTRECFORMATTASK___H__
+#endif // __OPENSPACE_CORE___CONVERTRECFORMATTASK___H__
diff --git a/include/openspace/interaction/touchbar.h b/include/openspace/interaction/touchbar.h
index 3b769a03f9..153652852f 100644
--- a/include/openspace/interaction/touchbar.h
+++ b/include/openspace/interaction/touchbar.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/websocketcamerastates.h b/include/openspace/interaction/websocketcamerastates.h
index 3dffe9d690..f36660a649 100644
--- a/include/openspace/interaction/websocketcamerastates.h
+++ b/include/openspace/interaction/websocketcamerastates.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/interaction/websocketinputstate.h b/include/openspace/interaction/websocketinputstate.h
index 7c59c89089..a1908d6f69 100644
--- a/include/openspace/interaction/websocketinputstate.h
+++ b/include/openspace/interaction/websocketinputstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/json.h b/include/openspace/json.h
index 11faafa5cf..940842fdec 100644
--- a/include/openspace/json.h
+++ b/include/openspace/json.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,7 +36,7 @@
 #pragma GCC diagnostic ignored "-Wuseless-cast"
 #endif // __GNUC__
 
-#include <ext/json/json.hpp>
+#include <json/json.hpp>
 
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop
diff --git a/include/openspace/mission/mission.h b/include/openspace/mission/mission.h
index 3cb5c8caf1..d5b55c5c7b 100644
--- a/include/openspace/mission/mission.h
+++ b/include/openspace/mission/mission.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/mission/missionmanager.h b/include/openspace/mission/missionmanager.h
index 97522d490d..dddf0797ec 100644
--- a/include/openspace/mission/missionmanager.h
+++ b/include/openspace/mission/missionmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h
index bea328662d..f9e7492ebf 100644
--- a/include/openspace/network/messagestructures.h
+++ b/include/openspace/network/messagestructures.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,9 +25,9 @@
 #ifndef __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
 #define __OPENSPACE_CORE___MESSAGESTRUCTURES___H__
 
+#include <ghoul/fmt.h>
 #include <ghoul/glm.h>
 #include <ghoul/logging/logmanager.h>
-#include <fmt/format.h>
 #include <algorithm>
 #include <cstring>
 #include <fstream>
@@ -114,12 +114,12 @@ struct CameraKeyframe {
 
         // Position
         size = sizeof(_position);
-        std::memcpy(&_position, buffer.data() + offset, size);
+        std::memcpy(glm::value_ptr(_position), buffer.data() + offset, size);
         offset += size;
 
         // Orientation
         size = sizeof(_rotation);
-        std::memcpy(&_rotation, buffer.data() + offset, size);
+        std::memcpy(glm::value_ptr(_rotation), buffer.data() + offset, size);
         offset += size;
 
         // Follow focus node rotation?
@@ -150,8 +150,14 @@ struct CameraKeyframe {
     };
 
     void write(std::ostream& out) const {
-        out.write(reinterpret_cast<const char*>(&_position), sizeof(_position));
-        out.write(reinterpret_cast<const char*>(&_rotation), sizeof(_rotation));
+        out.write(
+            reinterpret_cast<const char*>(glm::value_ptr(_position)),
+            sizeof(_position)
+        );
+        out.write(
+            reinterpret_cast<const char*>(glm::value_ptr(_rotation)),
+            sizeof(_rotation)
+        );
 
         // Write follow focus node rotation?
         out.write(
@@ -370,6 +376,7 @@ struct ScriptMessage {
     ScriptMessage(const std::vector<char>& buffer) {
         deserialize(buffer);
     }
+    virtual ~ScriptMessage() {};
 
     std::string _script;
     double _timestamp = 0.0;
@@ -429,8 +436,8 @@ struct ScriptMessage {
         ss << _script;
     }
 
-    void read(std::istream* in) {
-        size_t strLen;
+    virtual void read(std::istream* in) {
+        uint32_t strLen;
         //Read string length from file
         in->read(reinterpret_cast<char*>(&strLen), sizeof(strLen));
         //Read back full string
diff --git a/include/openspace/network/parallelconnection.h b/include/openspace/network/parallelconnection.h
index f70e87ed16..5763cbf700 100644
--- a/include/openspace/network/parallelconnection.h
+++ b/include/openspace/network/parallelconnection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/network/parallelpeer.h b/include/openspace/network/parallelpeer.h
index 293f433794..ff9c718da4 100644
--- a/include/openspace/network/parallelpeer.h
+++ b/include/openspace/network/parallelpeer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/network/parallelserver.h b/include/openspace/network/parallelserver.h
index 684ac62f2a..f6fbeff7a0 100644
--- a/include/openspace/network/parallelserver.h
+++ b/include/openspace/network/parallelserver.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat2property.h b/include/openspace/properties/matrix/dmat2property.h
index 030e9b710c..617e56d186 100644
--- a/include/openspace/properties/matrix/dmat2property.h
+++ b/include/openspace/properties/matrix/dmat2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat2x3property.h b/include/openspace/properties/matrix/dmat2x3property.h
index 4885a392c0..825d639204 100644
--- a/include/openspace/properties/matrix/dmat2x3property.h
+++ b/include/openspace/properties/matrix/dmat2x3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat2x4property.h b/include/openspace/properties/matrix/dmat2x4property.h
index 20eb77fcda..ba3898edad 100644
--- a/include/openspace/properties/matrix/dmat2x4property.h
+++ b/include/openspace/properties/matrix/dmat2x4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat3property.h b/include/openspace/properties/matrix/dmat3property.h
index 9c2543d7d2..486e2ad9c3 100644
--- a/include/openspace/properties/matrix/dmat3property.h
+++ b/include/openspace/properties/matrix/dmat3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat3x2property.h b/include/openspace/properties/matrix/dmat3x2property.h
index 5824b869ee..e823466c34 100644
--- a/include/openspace/properties/matrix/dmat3x2property.h
+++ b/include/openspace/properties/matrix/dmat3x2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat3x4property.h b/include/openspace/properties/matrix/dmat3x4property.h
index 39c83f408d..87521b8724 100644
--- a/include/openspace/properties/matrix/dmat3x4property.h
+++ b/include/openspace/properties/matrix/dmat3x4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat4property.h b/include/openspace/properties/matrix/dmat4property.h
index cd7b9b3eb1..3788742621 100644
--- a/include/openspace/properties/matrix/dmat4property.h
+++ b/include/openspace/properties/matrix/dmat4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat4x2property.h b/include/openspace/properties/matrix/dmat4x2property.h
index a1bea90a79..7205415c08 100644
--- a/include/openspace/properties/matrix/dmat4x2property.h
+++ b/include/openspace/properties/matrix/dmat4x2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/dmat4x3property.h b/include/openspace/properties/matrix/dmat4x3property.h
index 8ed951cffb..0e028317b8 100644
--- a/include/openspace/properties/matrix/dmat4x3property.h
+++ b/include/openspace/properties/matrix/dmat4x3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat2property.h b/include/openspace/properties/matrix/mat2property.h
index f500659e08..42fea778cb 100644
--- a/include/openspace/properties/matrix/mat2property.h
+++ b/include/openspace/properties/matrix/mat2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat2x3property.h b/include/openspace/properties/matrix/mat2x3property.h
index 2ba18f51e1..4ad90b4c51 100644
--- a/include/openspace/properties/matrix/mat2x3property.h
+++ b/include/openspace/properties/matrix/mat2x3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat2x4property.h b/include/openspace/properties/matrix/mat2x4property.h
index 98820e069a..54508d5535 100644
--- a/include/openspace/properties/matrix/mat2x4property.h
+++ b/include/openspace/properties/matrix/mat2x4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat3property.h b/include/openspace/properties/matrix/mat3property.h
index dd2104482e..fbbd272390 100644
--- a/include/openspace/properties/matrix/mat3property.h
+++ b/include/openspace/properties/matrix/mat3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat3x2property.h b/include/openspace/properties/matrix/mat3x2property.h
index 88c157d3bf..42290b8fbd 100644
--- a/include/openspace/properties/matrix/mat3x2property.h
+++ b/include/openspace/properties/matrix/mat3x2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat3x4property.h b/include/openspace/properties/matrix/mat3x4property.h
index 294e77b82f..ee26c13adf 100644
--- a/include/openspace/properties/matrix/mat3x4property.h
+++ b/include/openspace/properties/matrix/mat3x4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat4property.h b/include/openspace/properties/matrix/mat4property.h
index abf0e01e61..50ddd70c40 100644
--- a/include/openspace/properties/matrix/mat4property.h
+++ b/include/openspace/properties/matrix/mat4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat4x2property.h b/include/openspace/properties/matrix/mat4x2property.h
index a688965a86..a30aec4c13 100644
--- a/include/openspace/properties/matrix/mat4x2property.h
+++ b/include/openspace/properties/matrix/mat4x2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/matrix/mat4x3property.h b/include/openspace/properties/matrix/mat4x3property.h
index 231d253c0d..fa63aa6c9e 100644
--- a/include/openspace/properties/matrix/mat4x3property.h
+++ b/include/openspace/properties/matrix/mat4x3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/numericalproperty.h b/include/openspace/properties/numericalproperty.h
index d66ec0e99c..53f2122125 100644
--- a/include/openspace/properties/numericalproperty.h
+++ b/include/openspace/properties/numericalproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/numericalproperty.inl b/include/openspace/properties/numericalproperty.inl
index eb4504ae84..7417c2a212 100644
--- a/include/openspace/properties/numericalproperty.inl
+++ b/include/openspace/properties/numericalproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index 1165337d56..cfe6fa168d 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/property.h b/include/openspace/properties/property.h
index ce92102ece..eda38ae4c6 100644
--- a/include/openspace/properties/property.h
+++ b/include/openspace/properties/property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,6 +27,7 @@
 
 #include <ghoul/misc/dictionary.h>
 #include <ghoul/misc/easing.h>
+#include <any>
 #include <functional>
 #include <string>
 
diff --git a/include/openspace/properties/propertydelegate.h b/include/openspace/properties/propertydelegate.h
index cd2c0e7979..f107a00878 100644
--- a/include/openspace/properties/propertydelegate.h
+++ b/include/openspace/properties/propertydelegate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/propertydelegate.inl b/include/openspace/properties/propertydelegate.inl
index d09a4f615e..6486381916 100644
--- a/include/openspace/properties/propertydelegate.inl
+++ b/include/openspace/properties/propertydelegate.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h
index 48a26bb079..d20257fe9d 100644
--- a/include/openspace/properties/propertyowner.h
+++ b/include/openspace/properties/propertyowner.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -294,7 +294,6 @@ public:
     // Generate JSON for documentation
     std::string generateJson() const override;
 
-
 protected:
     /// The unique identifier of this PropertyOwner
     std::string _identifier;
diff --git a/include/openspace/properties/scalar/boolproperty.h b/include/openspace/properties/scalar/boolproperty.h
index e478e3318a..71932957a0 100644
--- a/include/openspace/properties/scalar/boolproperty.h
+++ b/include/openspace/properties/scalar/boolproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/charproperty.h b/include/openspace/properties/scalar/charproperty.h
index 07ab7ad040..bce7e2b672 100644
--- a/include/openspace/properties/scalar/charproperty.h
+++ b/include/openspace/properties/scalar/charproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/doubleproperty.h b/include/openspace/properties/scalar/doubleproperty.h
index 2f11f14277..f0ad097207 100644
--- a/include/openspace/properties/scalar/doubleproperty.h
+++ b/include/openspace/properties/scalar/doubleproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/floatproperty.h b/include/openspace/properties/scalar/floatproperty.h
index a19df16279..5812c05179 100644
--- a/include/openspace/properties/scalar/floatproperty.h
+++ b/include/openspace/properties/scalar/floatproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/intproperty.h b/include/openspace/properties/scalar/intproperty.h
index ec5c528ac2..06ea74f47d 100644
--- a/include/openspace/properties/scalar/intproperty.h
+++ b/include/openspace/properties/scalar/intproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/longdoubleproperty.h b/include/openspace/properties/scalar/longdoubleproperty.h
index 768bba53f1..065c80aff1 100644
--- a/include/openspace/properties/scalar/longdoubleproperty.h
+++ b/include/openspace/properties/scalar/longdoubleproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/longlongproperty.h b/include/openspace/properties/scalar/longlongproperty.h
index eedcff1a82..f754ee2a33 100644
--- a/include/openspace/properties/scalar/longlongproperty.h
+++ b/include/openspace/properties/scalar/longlongproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/longproperty.h b/include/openspace/properties/scalar/longproperty.h
index ed23a04a6f..b77efc39ea 100644
--- a/include/openspace/properties/scalar/longproperty.h
+++ b/include/openspace/properties/scalar/longproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/shortproperty.h b/include/openspace/properties/scalar/shortproperty.h
index a8cf97126e..3bd3c5af9b 100644
--- a/include/openspace/properties/scalar/shortproperty.h
+++ b/include/openspace/properties/scalar/shortproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/signedcharproperty.h b/include/openspace/properties/scalar/signedcharproperty.h
index 9419e9a7e2..6f177f1219 100644
--- a/include/openspace/properties/scalar/signedcharproperty.h
+++ b/include/openspace/properties/scalar/signedcharproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/ucharproperty.h b/include/openspace/properties/scalar/ucharproperty.h
index 4439157256..0e35a5c482 100644
--- a/include/openspace/properties/scalar/ucharproperty.h
+++ b/include/openspace/properties/scalar/ucharproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/uintproperty.h b/include/openspace/properties/scalar/uintproperty.h
index 12b40502fa..dcbc60ee57 100644
--- a/include/openspace/properties/scalar/uintproperty.h
+++ b/include/openspace/properties/scalar/uintproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/ulonglongproperty.h b/include/openspace/properties/scalar/ulonglongproperty.h
index c852b42554..2adc241bd4 100644
--- a/include/openspace/properties/scalar/ulonglongproperty.h
+++ b/include/openspace/properties/scalar/ulonglongproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/ulongproperty.h b/include/openspace/properties/scalar/ulongproperty.h
index fdb283b2aa..862cce3e69 100644
--- a/include/openspace/properties/scalar/ulongproperty.h
+++ b/include/openspace/properties/scalar/ulongproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/ushortproperty.h b/include/openspace/properties/scalar/ushortproperty.h
index d58c9e12f7..5a166ddd98 100644
--- a/include/openspace/properties/scalar/ushortproperty.h
+++ b/include/openspace/properties/scalar/ushortproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/scalar/wcharproperty.h b/include/openspace/properties/scalar/wcharproperty.h
index 9ede24d24c..321067bd84 100644
--- a/include/openspace/properties/scalar/wcharproperty.h
+++ b/include/openspace/properties/scalar/wcharproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/selectionproperty.h b/include/openspace/properties/selectionproperty.h
index 871faf1c7e..30749ca9b3 100644
--- a/include/openspace/properties/selectionproperty.h
+++ b/include/openspace/properties/selectionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/stringlistproperty.h b/include/openspace/properties/stringlistproperty.h
index 7078bdaecb..b929273cf3 100644
--- a/include/openspace/properties/stringlistproperty.h
+++ b/include/openspace/properties/stringlistproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/stringproperty.h b/include/openspace/properties/stringproperty.h
index 2ad56eb387..e869528c5b 100644
--- a/include/openspace/properties/stringproperty.h
+++ b/include/openspace/properties/stringproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/templateproperty.h b/include/openspace/properties/templateproperty.h
index eb55526ee1..e4bd1d9257 100644
--- a/include/openspace/properties/templateproperty.h
+++ b/include/openspace/properties/templateproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/templateproperty.inl b/include/openspace/properties/templateproperty.inl
index f8bdb0ecd3..2cadcc91c3 100644
--- a/include/openspace/properties/templateproperty.inl
+++ b/include/openspace/properties/templateproperty.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/triggerproperty.h b/include/openspace/properties/triggerproperty.h
index cd741a1101..1980938914 100644
--- a/include/openspace/properties/triggerproperty.h
+++ b/include/openspace/properties/triggerproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/bvec2property.h b/include/openspace/properties/vector/bvec2property.h
index 76e81000fc..d830934a8d 100644
--- a/include/openspace/properties/vector/bvec2property.h
+++ b/include/openspace/properties/vector/bvec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/bvec3property.h b/include/openspace/properties/vector/bvec3property.h
index 65aeb2ffc7..e800cd040e 100644
--- a/include/openspace/properties/vector/bvec3property.h
+++ b/include/openspace/properties/vector/bvec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/bvec4property.h b/include/openspace/properties/vector/bvec4property.h
index b551d624ef..9c007f8f42 100644
--- a/include/openspace/properties/vector/bvec4property.h
+++ b/include/openspace/properties/vector/bvec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/dvec2property.h b/include/openspace/properties/vector/dvec2property.h
index 66985a611f..a6d72d8e48 100644
--- a/include/openspace/properties/vector/dvec2property.h
+++ b/include/openspace/properties/vector/dvec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/dvec3property.h b/include/openspace/properties/vector/dvec3property.h
index 974d4133e8..782f1c63d2 100644
--- a/include/openspace/properties/vector/dvec3property.h
+++ b/include/openspace/properties/vector/dvec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/dvec4property.h b/include/openspace/properties/vector/dvec4property.h
index 13b6ffa47d..e4e85dc79d 100644
--- a/include/openspace/properties/vector/dvec4property.h
+++ b/include/openspace/properties/vector/dvec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/ivec2property.h b/include/openspace/properties/vector/ivec2property.h
index 59b4bc89f4..720afa62e8 100644
--- a/include/openspace/properties/vector/ivec2property.h
+++ b/include/openspace/properties/vector/ivec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/ivec3property.h b/include/openspace/properties/vector/ivec3property.h
index d24f44e85d..0a68a8e7dd 100644
--- a/include/openspace/properties/vector/ivec3property.h
+++ b/include/openspace/properties/vector/ivec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/ivec4property.h b/include/openspace/properties/vector/ivec4property.h
index 597516ba0e..9e076f009d 100644
--- a/include/openspace/properties/vector/ivec4property.h
+++ b/include/openspace/properties/vector/ivec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/uvec2property.h b/include/openspace/properties/vector/uvec2property.h
index ff647091c8..cd8ee273e6 100644
--- a/include/openspace/properties/vector/uvec2property.h
+++ b/include/openspace/properties/vector/uvec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/uvec3property.h b/include/openspace/properties/vector/uvec3property.h
index cff5d16233..a0cae39791 100644
--- a/include/openspace/properties/vector/uvec3property.h
+++ b/include/openspace/properties/vector/uvec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/uvec4property.h b/include/openspace/properties/vector/uvec4property.h
index ccd4a97fbc..57111530a4 100644
--- a/include/openspace/properties/vector/uvec4property.h
+++ b/include/openspace/properties/vector/uvec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/vec2property.h b/include/openspace/properties/vector/vec2property.h
index 1a9709a728..e17bf88f99 100644
--- a/include/openspace/properties/vector/vec2property.h
+++ b/include/openspace/properties/vector/vec2property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/vec3property.h b/include/openspace/properties/vector/vec3property.h
index 1795c705a0..902226eed3 100644
--- a/include/openspace/properties/vector/vec3property.h
+++ b/include/openspace/properties/vector/vec3property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/properties/vector/vec4property.h b/include/openspace/properties/vector/vec4property.h
index bc66aafab8..35b5b4c6a6 100644
--- a/include/openspace/properties/vector/vec4property.h
+++ b/include/openspace/properties/vector/vec4property.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/query/query.h b/include/openspace/query/query.h
index 18253a75d0..2a1ff53d5a 100644
--- a/include/openspace/query/query.h
+++ b/include/openspace/query/query.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/abufferrenderer.h b/include/openspace/rendering/abufferrenderer.h
index 3505c13292..5769c1e28c 100644
--- a/include/openspace/rendering/abufferrenderer.h
+++ b/include/openspace/rendering/abufferrenderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/dashboard.h b/include/openspace/rendering/dashboard.h
index 019b086773..f8cbbfa55c 100644
--- a/include/openspace/rendering/dashboard.h
+++ b/include/openspace/rendering/dashboard.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/dashboarditem.h b/include/openspace/rendering/dashboarditem.h
index e33467a555..11013a5d28 100644
--- a/include/openspace/rendering/dashboarditem.h
+++ b/include/openspace/rendering/dashboarditem.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,9 +28,12 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/stringproperty.h>
 #include <ghoul/glm.h>
 
 namespace ghoul { class Dictionary; }
+namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
 
@@ -55,6 +58,22 @@ protected:
     properties::BoolProperty _isEnabled;
 };
 
+
+
+class DashboardTextItem : public DashboardItem {
+public:
+    static documentation::Documentation Documentation();
+
+    DashboardTextItem(const ghoul::Dictionary& dictionary, float fontSize = 10.f,
+        const std::string& fontName = "Mono");
+
+protected:
+    properties::StringProperty _fontName;
+    properties::FloatProperty _fontSize;
+
+    std::shared_ptr<ghoul::fontrendering::Font> _font;
+};
+
 } // openspace
 
 #endif // __OPENSPACE_CORE___DASHBOARDITEM___H__
diff --git a/include/openspace/rendering/deferredcaster.h b/include/openspace/rendering/deferredcaster.h
index 32e8592f4e..0f33e1894e 100644
--- a/include/openspace/rendering/deferredcaster.h
+++ b/include/openspace/rendering/deferredcaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/deferredcasterlistener.h b/include/openspace/rendering/deferredcasterlistener.h
index 067ec2afb6..003b5da515 100644
--- a/include/openspace/rendering/deferredcasterlistener.h
+++ b/include/openspace/rendering/deferredcasterlistener.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/deferredcastermanager.h b/include/openspace/rendering/deferredcastermanager.h
index 0d6623e066..95a2b05aee 100644
--- a/include/openspace/rendering/deferredcastermanager.h
+++ b/include/openspace/rendering/deferredcastermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index 52df76befd..ce4c00fb86 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/helper.h b/include/openspace/rendering/helper.h
index a26eb9aab6..f82fabe5a0 100644
--- a/include/openspace/rendering/helper.h
+++ b/include/openspace/rendering/helper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -105,7 +105,8 @@ VertexXYZ convertToXYZ(const Vertex& v);
 
 std::vector<VertexXYZ> convert(std::vector<Vertex> v);
 
-std::vector<Vertex> createRing(int nSegments, float radius, glm::vec4 colors = glm::vec4(1.f));
+std::vector<Vertex> createRing(int nSegments, float radius,
+    glm::vec4 colors = glm::vec4(1.f));
 
 } // namespace openspace::rendering::helper
 
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index 5e3900e8eb..2d618b42ad 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/luaconsole.h b/include/openspace/rendering/luaconsole.h
index 2c4e0e21a9..d00e3e9029 100644
--- a/include/openspace/rendering/luaconsole.h
+++ b/include/openspace/rendering/luaconsole.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/raycasterlistener.h b/include/openspace/rendering/raycasterlistener.h
index 5a0af12e7d..486a52c917 100644
--- a/include/openspace/rendering/raycasterlistener.h
+++ b/include/openspace/rendering/raycasterlistener.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/raycastermanager.h b/include/openspace/rendering/raycastermanager.h
index 8aa36ab6d1..2043e7c315 100644
--- a/include/openspace/rendering/raycastermanager.h
+++ b/include/openspace/rendering/raycastermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h
index 589daf3827..3fa96880d4 100644
--- a/include/openspace/rendering/renderable.h
+++ b/include/openspace/rendering/renderable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 #include <openspace/properties/propertyowner.h>
 
 #include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/doubleproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <ghoul/misc/managedmemoryuniqueptr.h>
@@ -60,7 +61,7 @@ public:
     };
 
     static ghoul::mm_unique_ptr<Renderable> createFromDictionary(
-        const ghoul::Dictionary& dictionary);
+        ghoul::Dictionary dictionary);
 
     Renderable(const ghoul::Dictionary& dictionary);
     virtual ~Renderable() = default;
@@ -74,8 +75,8 @@ public:
     bool isEnabled() const;
     bool shouldUpdateIfDisabled() const;
 
-    void setBoundingSphere(float boundingSphere);
-    float boundingSphere() const;
+    void setBoundingSphere(double boundingSphere);
+    double boundingSphere() const;
 
     virtual void render(const RenderData& data, RendererTasks& rendererTask);
     virtual void update(const UpdateData& data);
@@ -97,7 +98,7 @@ public:
 protected:
     properties::BoolProperty _enabled;
     properties::FloatProperty _opacity;
-    properties::FloatProperty _boundingSphere;
+    properties::DoubleProperty _boundingSphere;
     properties::StringProperty _renderableType;
 
     bool _shouldUpdateIfDisabled = false;
diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index 08209e3ac8..000595f69e 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,6 +33,7 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <openspace/properties/triggerproperty.h>
+#include <chrono>
 
 namespace ghoul {
     namespace fontrendering { class Font; }
@@ -201,20 +202,6 @@ private:
 
     properties::BoolProperty _applyWarping;
     properties::BoolProperty _showFrameInformation;
-#ifdef OPENSPACE_WITH_INSTRUMENTATION
-    struct FrameInfo {
-        uint64_t iFrame;
-        double deltaTime;
-        double avgDeltaTime;
-    };
-
-    struct {
-        std::vector<FrameInfo> frames;
-        uint64_t lastSavedFrame = 0;
-        uint16_t saveEveryNthFrame = 2048;
-    } _frameInfo;
-    properties::BoolProperty _saveFrameInformation;
-#endif // OPENSPACE_WITH_INSTRUMENTATION
     properties::BoolProperty _disableMasterRendering;
 
     properties::FloatProperty _globalBlackOutFactor;
@@ -229,6 +216,8 @@ private:
     properties::FloatProperty _saturation;
     properties::FloatProperty _value;
 
+    properties::IntProperty _framerateLimit;
+    std::chrono::high_resolution_clock::time_point _lastFrameTime;
     properties::FloatProperty _horizFieldOfView;
 
     properties::Vec3Property _globalRotation;
diff --git a/include/openspace/rendering/renderer.h b/include/openspace/rendering/renderer.h
index b587e640f6..6a9243592d 100644
--- a/include/openspace/rendering/renderer.h
+++ b/include/openspace/rendering/renderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/screenspacerenderable.h b/include/openspace/rendering/screenspacerenderable.h
index 24d887e1a7..189ae16d12 100644
--- a/include/openspace/rendering/screenspacerenderable.h
+++ b/include/openspace/rendering/screenspacerenderable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -104,7 +104,7 @@ protected:
     properties::Vec3Property _localRotation;
 
     properties::FloatProperty _scale;
-    properties::FloatProperty _alpha;
+    properties::FloatProperty _opacity;
     properties::TriggerProperty _delete;
 
     glm::ivec2 _objectSize = glm::ivec2(0);
diff --git a/include/openspace/rendering/texturecomponent.h b/include/openspace/rendering/texturecomponent.h
new file mode 100644
index 0000000000..5c4d905a7c
--- /dev/null
+++ b/include/openspace/rendering/texturecomponent.h
@@ -0,0 +1,72 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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___TEXTURECOMPONENT___H__
+#define __OPENSPACE_CORE___TEXTURECOMPONENT___H__
+
+#include <ghoul/opengl/texture.h>
+
+namespace ghoul::filesystem { class File; }
+namespace ghoul::opengl {class Texture; }
+
+namespace openspace {
+
+class TextureComponent {
+public:
+    using Texture = ghoul::opengl::Texture;
+
+    const Texture* texture() const;
+    Texture* texture();
+
+    void setFilterMode(Texture::FilterMode filterMode);
+    void setWrapping(Texture::WrappingMode wrapping);
+    void setShouldWatchFileForChanges(bool value);
+    void setShouldPurgeFromRAM(bool value);
+
+    void bind();
+    void uploadToGpu();
+
+    // Loads a texture from a file on disk
+    void loadFromFile(const std::string& path);
+
+    // Function to call in a renderable's update function to make sure
+    // the texture is kept up to date
+    void update();
+
+private:
+    std::unique_ptr<ghoul::filesystem::File> _textureFile;
+    std::unique_ptr<Texture> _texture;
+
+    Texture::FilterMode _filterMode = Texture::FilterMode::LinearMipMap;
+    Texture::WrappingMode _wrappingMode = Texture::WrappingMode::Repeat;
+    bool _shouldWatchFile = true;
+    bool _shouldPurgeFromRAM = true;
+
+    bool _fileIsDirty = false;
+    bool _textureIsDirty = false;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_CORE___TEXTURECOMPONENT___H__
diff --git a/include/openspace/rendering/transferfunction.h b/include/openspace/rendering/transferfunction.h
index 43edecbd53..cdad470af7 100644
--- a/include/openspace/rendering/transferfunction.h
+++ b/include/openspace/rendering/transferfunction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -52,12 +52,9 @@ public:
     glm::vec4 sample(size_t offset);
     size_t width();
     void setCallback(TfChangedCallback callback);
-    void setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture> ptr);
+    void setTextureFromTxt();
 
 private:
-    void setTextureFromTxt() {
-        setTextureFromTxt(_texture);
-    }
     void setTextureFromImage();
     void uploadTexture();
 
diff --git a/include/openspace/rendering/volume.h b/include/openspace/rendering/volume.h
index c3d40bcaf7..14a4dc9d18 100644
--- a/include/openspace/rendering/volume.h
+++ b/include/openspace/rendering/volume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/rendering/volumeraycaster.h b/include/openspace/rendering/volumeraycaster.h
index 1534c51ff8..000a963ff4 100644
--- a/include/openspace/rendering/volumeraycaster.h
+++ b/include/openspace/rendering/volumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/asset.h b/include/openspace/scene/asset.h
index 7fd8afd13f..d20f42ccd2 100644
--- a/include/openspace/scene/asset.h
+++ b/include/openspace/scene/asset.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/assetlistener.h b/include/openspace/scene/assetlistener.h
index 62041a919f..60546b521e 100644
--- a/include/openspace/scene/assetlistener.h
+++ b/include/openspace/scene/assetlistener.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/assetloader.h b/include/openspace/scene/assetloader.h
index 644acf671d..779e98e892 100644
--- a/include/openspace/scene/assetloader.h
+++ b/include/openspace/scene/assetloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -215,7 +215,7 @@ private:
         _onDependencyInitializationFunctionRefs;
     std::unordered_map<Asset*, std::map<Asset*, std::vector<int>>>
         _onDependencyDeinitializationFunctionRefs;
-    
+
     int _assetsTableRef = 0;
 };
 
diff --git a/include/openspace/scene/assetmanager.h b/include/openspace/scene/assetmanager.h
index 8ed157d56d..cec0176a17 100644
--- a/include/openspace/scene/assetmanager.h
+++ b/include/openspace/scene/assetmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/lightsource.h b/include/openspace/scene/lightsource.h
index ff754e6efb..98aa7b69d8 100644
--- a/include/openspace/scene/lightsource.h
+++ b/include/openspace/scene/lightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index ab8de80916..28a3a360eb 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -127,7 +127,7 @@ public:
      * and all of the property & asset changes that were made since startup.
      */
     void saveCurrentSettingsToProfile(const properties::PropertyOwner& rootOwner,
-        std::string currentTime, 
+        std::string currentTime,
         interaction::NavigationHandler::NavigationState navState);
 
     /// If the value passed to this function is 'true', the addAsset and removeAsset
diff --git a/include/openspace/scene/rotation.h b/include/openspace/scene/rotation.h
index ce6970716e..28b2ec8f5c 100644
--- a/include/openspace/scene/rotation.h
+++ b/include/openspace/scene/rotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/scale.h b/include/openspace/scene/scale.h
index ef9230d32d..36b5e08398 100644
--- a/include/openspace/scene/scale.h
+++ b/include/openspace/scene/scale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index 3f9f5e6d7e..fc22f6d1e2 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index d2b3bfc4d1..879a78a352 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -126,7 +126,7 @@ public:
     SceneGraphNode* parent() const;
     std::vector<SceneGraphNode*> children() const;
 
-    float boundingSphere() const;
+    double boundingSphere() const;
 
     SceneGraphNode* childNode(const std::string& identifier);
 
@@ -177,7 +177,7 @@ private:
 
     glm::dmat4 _modelTransformCached = glm::dmat4(1.0);
 
-    properties::FloatProperty _boundingSphere;
+    properties::DoubleProperty _boundingSphere;
     properties::BoolProperty _computeScreenSpaceValues;
     properties::IVec2Property _screenSpacePosition;
     properties::BoolProperty _screenVisibility;
diff --git a/include/openspace/scene/sceneinitializer.h b/include/openspace/scene/sceneinitializer.h
index eb1a4e4c6b..9f7eff48e6 100644
--- a/include/openspace/scene/sceneinitializer.h
+++ b/include/openspace/scene/sceneinitializer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/scenelicensewriter.h b/include/openspace/scene/scenelicensewriter.h
index 8a10eb56bf..e0eb6be2d6 100644
--- a/include/openspace/scene/scenelicensewriter.h
+++ b/include/openspace/scene/scenelicensewriter.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/timeframe.h b/include/openspace/scene/timeframe.h
index ec66a07b0b..592eda123f 100644
--- a/include/openspace/scene/timeframe.h
+++ b/include/openspace/scene/timeframe.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scene/translation.h b/include/openspace/scene/translation.h
index f40e90bd17..074b90bbb2 100644
--- a/include/openspace/scene/translation.h
+++ b/include/openspace/scene/translation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scripting/lualibrary.h b/include/openspace/scripting/lualibrary.h
index 275d485adc..1c123f6014 100644
--- a/include/openspace/scripting/lualibrary.h
+++ b/include/openspace/scripting/lualibrary.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 8914527778..5890e6bb7e 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/scripting/scriptscheduler.h b/include/openspace/scripting/scriptscheduler.h
index 98327cf41e..0375a38f11 100644
--- a/include/openspace/scripting/scriptscheduler.h
+++ b/include/openspace/scripting/scriptscheduler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,13 +33,6 @@
 #include <string>
 #include <vector>
 
-namespace {
-    constexpr const char* KeyTime = "Time";
-    constexpr const char* KeyForwardScript = "ForwardScript";
-    constexpr const char* KeyBackwardScript = "BackwardScript";
-    constexpr const char* KeyUniversalScript = "Script";
-} // namespace
-
 namespace ghoul { class Dictionary; }
 namespace openspace::documentation { struct Documentation; }
 
@@ -54,12 +47,11 @@ struct LuaLibrary;
 class ScriptScheduler {
 public:
     struct ScheduledScript {
-        ScheduledScript() = default;
-        ScheduledScript(const ghoul::Dictionary& dictionary);
 
         double time = -std::numeric_limits<double>::max();
         std::string forwardScript;
         std::string backwardScript;
+        std::string universalScript;
     };
 
     /**
@@ -69,7 +61,7 @@ public:
      * \throw SpecificationError If the dictionary does not adhere to the Documentation as
      * specified in the openspace::Documentation function
      */
-    void loadScripts(const ghoul::Dictionary& dictionary);
+    void loadScripts(std::vector<ScheduledScript> scheduledScripts);
 
 
     /**
diff --git a/include/openspace/scripting/systemcapabilitiesbinding.h b/include/openspace/scripting/systemcapabilitiesbinding.h
index af4e524fe9..4744167acb 100644
--- a/include/openspace/scripting/systemcapabilitiesbinding.h
+++ b/include/openspace/scripting/systemcapabilitiesbinding.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/blockplaneintersectiongeometry.h b/include/openspace/util/blockplaneintersectiongeometry.h
index e4f4703f8b..37e9e7d134 100644
--- a/include/openspace/util/blockplaneintersectiongeometry.h
+++ b/include/openspace/util/blockplaneintersectiongeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/boxgeometry.h b/include/openspace/util/boxgeometry.h
index 9d42e83d1f..d9c82388c6 100644
--- a/include/openspace/util/boxgeometry.h
+++ b/include/openspace/util/boxgeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/camera.h b/include/openspace/util/camera.h
index 0ea6ca7285..7321b5b85a 100644
--- a/include/openspace/util/camera.h
+++ b/include/openspace/util/camera.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/concurrentjobmanager.h b/include/openspace/util/concurrentjobmanager.h
index ddb4331294..6f5ed0abf3 100644
--- a/include/openspace/util/concurrentjobmanager.h
+++ b/include/openspace/util/concurrentjobmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/concurrentjobmanager.inl b/include/openspace/util/concurrentjobmanager.inl
index f53897d514..a49dff3da9 100644
--- a/include/openspace/util/concurrentjobmanager.inl
+++ b/include/openspace/util/concurrentjobmanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/concurrentqueue.h b/include/openspace/util/concurrentqueue.h
index 83d7a1aa62..fe37fe705b 100644
--- a/include/openspace/util/concurrentqueue.h
+++ b/include/openspace/util/concurrentqueue.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/concurrentqueue.inl b/include/openspace/util/concurrentqueue.inl
index 4f150dda2c..7ebf62f2da 100644
--- a/include/openspace/util/concurrentqueue.inl
+++ b/include/openspace/util/concurrentqueue.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/coordinateconversion.h b/include/openspace/util/coordinateconversion.h
index 7dcce4ad6e..b6ba2ec7d5 100644
--- a/include/openspace/util/coordinateconversion.h
+++ b/include/openspace/util/coordinateconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/distanceconstants.h b/include/openspace/util/distanceconstants.h
index e488cce1f9..695e463324 100644
--- a/include/openspace/util/distanceconstants.h
+++ b/include/openspace/util/distanceconstants.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/distanceconversion.h b/include/openspace/util/distanceconversion.h
index fb37657915..79258ba131 100644
--- a/include/openspace/util/distanceconversion.h
+++ b/include/openspace/util/distanceconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/factorymanager.h b/include/openspace/util/factorymanager.h
index 7d04502609..443a756f1f 100644
--- a/include/openspace/util/factorymanager.h
+++ b/include/openspace/util/factorymanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/factorymanager.inl b/include/openspace/util/factorymanager.inl
index 0718c3be15..7c389c72a7 100644
--- a/include/openspace/util/factorymanager.inl
+++ b/include/openspace/util/factorymanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/histogram.h b/include/openspace/util/histogram.h
index 92e21898a0..3b2a2c5641 100644
--- a/include/openspace/util/histogram.h
+++ b/include/openspace/util/histogram.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h
index fa08dd4c65..7bfd0ac35c 100644
--- a/include/openspace/util/httprequest.h
+++ b/include/openspace/util/httprequest.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -184,7 +184,6 @@ class AsyncHttpDownload : public virtual HttpDownload {
 public:
     AsyncHttpDownload(std::string url);
     AsyncHttpDownload(AsyncHttpDownload&& d);
-    AsyncHttpDownload& operator=(AsyncHttpDownload&&) = default;
     virtual ~AsyncHttpDownload() = default;
     void start(HttpRequest::RequestOptions opt);
     void cancel();
@@ -210,8 +209,6 @@ public:
 
     HttpFileDownload() = default;
     HttpFileDownload(std::string destination, Overwrite = Overwrite::No);
-    HttpFileDownload(HttpFileDownload&& d) = default;
-    HttpFileDownload& operator=(HttpFileDownload&&) = default;
     virtual ~HttpFileDownload() = default;
 
     const std::string& destination() const;
diff --git a/include/openspace/util/job.h b/include/openspace/util/job.h
index bce9134c69..c37566ee51 100644
--- a/include/openspace/util/job.h
+++ b/include/openspace/util/job.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/keys.h b/include/openspace/util/keys.h
index c1bb9bc651..cc7b3fbb71 100644
--- a/include/openspace/util/keys.h
+++ b/include/openspace/util/keys.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/memorymanager.h b/include/openspace/util/memorymanager.h
index 7fa289263c..e6f8771d9e 100644
--- a/include/openspace/util/memorymanager.h
+++ b/include/openspace/util/memorymanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/mouse.h b/include/openspace/util/mouse.h
index a215afa244..1539b353bf 100644
--- a/include/openspace/util/mouse.h
+++ b/include/openspace/util/mouse.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/openspacemodule.h b/include/openspace/util/openspacemodule.h
index c1f5a2603e..3040eff52e 100644
--- a/include/openspace/util/openspacemodule.h
+++ b/include/openspace/util/openspacemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -66,8 +66,7 @@ public:
      * is set in the OpenSpaceModule constructor. This method will call the
      * internalInitialize method for further customization for each subclass.
      */
-    void initialize(const ModuleEngine* moduleEngine,
-        const ghoul::Dictionary& configuration);
+    void initialize(const ghoul::Dictionary& configuration);
 
     /**
      * This method calls the internalInitializeGL method for further customization for
@@ -168,9 +167,6 @@ protected:
      * Returns a const pointer to the module engine
      */
     const ModuleEngine* moduleEngine() const;
-
-private:
-    const ModuleEngine* _moduleEngine = nullptr;
 };
 
 } // namespace openspace
diff --git a/include/openspace/util/planegeometry.h b/include/openspace/util/planegeometry.h
new file mode 100644
index 0000000000..2b29302c79
--- /dev/null
+++ b/include/openspace/util/planegeometry.h
@@ -0,0 +1,57 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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___PLANEGEOMETRY___H__
+#define __OPENSPACE_CORE___PLANEGEOMETRY___H__
+
+#include <ghoul/glm.h>
+#include <ghoul/opengl/ghoul_gl.h>
+
+namespace openspace {
+
+class PlaneGeometry {
+public:
+    PlaneGeometry(glm::vec2 size);
+    PlaneGeometry(float size);
+
+    ~PlaneGeometry();
+
+    void initialize();
+    void deinitialize();
+    void render();
+
+    void updateSize(const glm::vec2& size);
+    void updateSize(const float size);
+
+private:
+    void updateGeometry();
+
+    GLuint _vaoId = 0;
+    GLuint _vBufferId = 0;
+    glm::vec2 _size = glm::vec2(0.f);
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_CORE___PLANEGEOMETRY___H__
diff --git a/include/openspace/util/progressbar.h b/include/openspace/util/progressbar.h
index 8667500c9e..e3e1957b69 100644
--- a/include/openspace/util/progressbar.h
+++ b/include/openspace/util/progressbar.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/resourcesynchronization.h b/include/openspace/util/resourcesynchronization.h
index 9a96ea6d2c..790439a76f 100644
--- a/include/openspace/util/resourcesynchronization.h
+++ b/include/openspace/util/resourcesynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/screenlog.h b/include/openspace/util/screenlog.h
index ed8de1228e..57673b2170 100644
--- a/include/openspace/util/screenlog.h
+++ b/include/openspace/util/screenlog.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/sphere.h b/include/openspace/util/sphere.h
index a0e1557b63..1167c4e4f2 100644
--- a/include/openspace/util/sphere.h
+++ b/include/openspace/util/sphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index 6aefd5c52e..fc22791ed7 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,9 +35,24 @@
 #include <string>
 #include <vector>
 #include <set>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
 #include "SpiceUsr.h"
 #include "SpiceZpr.h"
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
 namespace openspace {
 
 namespace scripting { struct LuaLibrary; }
@@ -226,6 +241,18 @@ public:
      */
     bool hasSpkCoverage(const std::string& target, double et) const;
 
+    /**
+     * Returns a list of loaded SPK coverage intervals for \p target
+     *
+     * \param target The body to be examined. The target has to name a valid SPICE object
+     *        with respect to the kernels that have been loaded
+     * \return \c list of SPK kernels for \p target , \c empty list if none loaded.
+     *
+     * \throw SpiceException If \p target does not name a valid SPICE object
+     * \pre \p target must not be empty.
+     */
+    std::vector<std::pair<double, double>> spkCoverage(const std::string& target) const;
+
     /**
      * Returns whether a given \p frame has a CK kernel covering it at the designated
      * \p et ephemeris time.
@@ -242,6 +269,27 @@ public:
      */
     bool hasCkCoverage(const std::string& frame, double et) const;
 
+    /**
+    * Returns a list of loaded CK coverage intervals for \p target
+    *
+    * \param target The body to be examined. The target has to name a valid SPICE object
+    *        with respect to the kernels that have been loaded
+    * \return \c list of CK kernels for \p target , \c empty list if none loaded.
+    *
+    * \throw SpiceException If \p target does not name a valid SPICE object
+    * \pre \p target must not be empty.
+    */
+    std::vector<std::pair<double, double>> ckCoverage(const std::string& target) const;
+
+    /**
+   * Returns a list of loaded spice frames,
+   *
+   * \param builtInFrames Boolean representing if builtIn or LoadedFrames should be used
+   * \return \c list of Spice frames with ID(int) and Name(string).
+   *
+   */
+    std::vector<std::pair<int, std::string>> spiceBodies(bool builtInFrames) const;
+
     /**
      * Determines whether values exist for some \p item for any body, identified by its
      * \p naifId, in the kernel pool by passing it to the \c bodfnd_c function.
@@ -511,6 +559,8 @@ public:
         }
     }
 
+    std::string dateFromEphemerisTime(double ephemerisTime, const char* format);
+
     /**
      * Returns the \p position of a \p target body relative to an \p observer in a
      * specific \p referenceFrame, optionally corrected for \p lightTime (planetary
diff --git a/include/openspace/util/syncable.h b/include/openspace/util/syncable.h
index f3c19e7afd..4a8590948e 100644
--- a/include/openspace/util/syncable.h
+++ b/include/openspace/util/syncable.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/syncbuffer.h b/include/openspace/util/syncbuffer.h
index c73d05270c..54a1f5f0fa 100644
--- a/include/openspace/util/syncbuffer.h
+++ b/include/openspace/util/syncbuffer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,6 +25,7 @@
 #ifndef __OPENSPACE_CORE___SYNCBUFFER___H__
 #define __OPENSPACE_CORE___SYNCBUFFER___H__
 
+#include <ghoul/glm.h>
 #include <memory>
 #include <string>
 #include <vector>
@@ -48,6 +49,10 @@ public:
     T decode();
 
     void decode(std::string& s);
+    void decode(glm::quat& value);
+    void decode(glm::dquat& value);
+    void decode(glm::vec3& value);
+    void decode(glm::dvec3& value);
 
     template <typename T>
     void decode(T& value);
diff --git a/include/openspace/util/syncbuffer.inl b/include/openspace/util/syncbuffer.inl
index fcac31e1e5..73b684b3ff 100644
--- a/include/openspace/util/syncbuffer.inl
+++ b/include/openspace/util/syncbuffer.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -23,6 +23,7 @@
  ****************************************************************************************/
 
 #include <ghoul/misc/assert.h>
+#include <ghoul/glm.h>
 #include <cstring>
 
 namespace openspace {
@@ -36,7 +37,7 @@ void SyncBuffer::encode(const T& v) {
         _dataStream.resize(anticpatedBufferSize);
     }
 
-    memcpy(_dataStream.data() + _encodeOffset, &v, size);
+    std::memcpy(_dataStream.data() + _encodeOffset, &v, size);
     _encodeOffset += size;
 }
 
@@ -45,7 +46,7 @@ T SyncBuffer::decode() {
     const size_t size = sizeof(T);
     ghoul_assert(_decodeOffset + size < _n, "");
     T value;
-    memcpy(&value, _dataStream.data() + _decodeOffset, size);
+    std::memcpy(&value, _dataStream.data() + _decodeOffset, size);
     _decodeOffset += size;
     return value;
 }
@@ -54,7 +55,7 @@ template <typename T>
 void SyncBuffer::decode(T& value) {
     const size_t size = sizeof(T);
     ghoul_assert(_decodeOffset + size < _n, "");
-    memcpy(&value, _dataStream.data() + _decodeOffset, size);
+    std::memcpy(&value, _dataStream.data() + _decodeOffset, size);
     _decodeOffset += size;
 }
 
diff --git a/include/openspace/util/syncdata.h b/include/openspace/util/syncdata.h
index 7f3552c5a5..cee6820737 100644
--- a/include/openspace/util/syncdata.h
+++ b/include/openspace/util/syncdata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/syncdata.inl b/include/openspace/util/syncdata.inl
index b0a39e4ae0..7d1d93fc00 100644
--- a/include/openspace/util/syncdata.inl
+++ b/include/openspace/util/syncdata.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/synchronizationwatcher.h b/include/openspace/util/synchronizationwatcher.h
index d830218cb8..1afb1c5dab 100644
--- a/include/openspace/util/synchronizationwatcher.h
+++ b/include/openspace/util/synchronizationwatcher.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/task.h b/include/openspace/util/task.h
index ef7e280dcd..3b25a987a7 100644
--- a/include/openspace/util/task.h
+++ b/include/openspace/util/task.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/taskloader.h b/include/openspace/util/taskloader.h
index 6a598df9e5..01c0ed5363 100644
--- a/include/openspace/util/taskloader.h
+++ b/include/openspace/util/taskloader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/threadpool.h b/include/openspace/util/threadpool.h
index ba596fc732..8f6c639145 100644
--- a/include/openspace/util/threadpool.h
+++ b/include/openspace/util/threadpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/time.h b/include/openspace/util/time.h
index 9a08d6a704..b09bae84e6 100644
--- a/include/openspace/util/time.h
+++ b/include/openspace/util/time.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/timeconversion.h b/include/openspace/util/timeconversion.h
index 0ec2feca49..51063e0661 100644
--- a/include/openspace/util/timeconversion.h
+++ b/include/openspace/util/timeconversion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/timeline.h b/include/openspace/util/timeline.h
index ea2b31f135..1f2936cf40 100644
--- a/include/openspace/util/timeline.h
+++ b/include/openspace/util/timeline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/timeline.inl b/include/openspace/util/timeline.inl
index 5ceae3d875..21d46e741b 100644
--- a/include/openspace/util/timeline.inl
+++ b/include/openspace/util/timeline.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/timemanager.h b/include/openspace/util/timemanager.h
index 2297e29a18..1e213abb0a 100644
--- a/include/openspace/util/timemanager.h
+++ b/include/openspace/util/timemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -160,7 +160,8 @@ private:
 
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timeChangeCallbacks;
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _deltaTimeChangeCallbacks;
-    std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _deltaTimeStepsChangeCallbacks;
+    std::vector<std::pair<CallbackHandle, TimeChangeCallback>>
+        _deltaTimeStepsChangeCallbacks;
 
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timeJumpCallbacks;
     std::vector<std::pair<CallbackHandle, TimeChangeCallback>> _timelineChangeCallbacks;
diff --git a/include/openspace/util/timerange.h b/include/openspace/util/timerange.h
index 8b56bfb996..3585a5e581 100644
--- a/include/openspace/util/timerange.h
+++ b/include/openspace/util/timerange.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/touch.h b/include/openspace/util/touch.h
index 2f5f1d6deb..341a671c21 100644
--- a/include/openspace/util/touch.h
+++ b/include/openspace/util/touch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/transformationmanager.h b/include/openspace/util/transformationmanager.h
index abd1361351..8e204ae528 100644
--- a/include/openspace/util/transformationmanager.h
+++ b/include/openspace/util/transformationmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/updatestructures.h b/include/openspace/util/updatestructures.h
index 0613821590..5ea1f1fe5b 100644
--- a/include/openspace/util/updatestructures.h
+++ b/include/openspace/util/updatestructures.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/include/openspace/util/versionchecker.h b/include/openspace/util/versionchecker.h
index fb4c513e45..f7ce2e4865 100644
--- a/include/openspace/util/versionchecker.h
+++ b/include/openspace/util/versionchecker.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
new file mode 100644
index 0000000000..b08c0bf7e5
--- /dev/null
+++ b/modules/CMakeLists.txt
@@ -0,0 +1,391 @@
+##########################################################################################
+#                                                                                        #
+# 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_CMAKE_EXT_DIR}/global_variables.cmake)
+include(${GHOUL_BASE_DIR}/support/cmake/message_macros.cmake)
+
+
+# This function takes a list of module paths and returns the list of include paths that
+# need to be added to the moduleregistration file. Each module files parent directory is
+# considered, but with the internal module path ignored
+function (get_unique_include_paths module_paths internal_module_path result)
+  set(res "")
+  foreach (p ${all_module_paths})
+    get_filename_component(base_dir_parent "${p}/.." ABSOLUTE)
+    get_filename_component(base_dir_grandparent "${p}/../.." ABSOLUTE)
+    get_filename_component(int_dir "${internal_module_path}/.." ABSOLUTE)
+    if (NOT ${base_dir_grandparent} STREQUAL ${int_dir})
+      # We need to add both parent and grantparent directory:
+      # The grandparent has to be added if we have an external module in the path
+      # x/modules/name and we need to add 'x' to the module search path such that
+      # people can write #include <modules/name/namemodule.h>
+      #
+      # The parent needs to be included for modules in subdirectories of the form
+      # openspace/modules/dir/name such that 'dir' is included in the search path
+      list(APPEND res ${base_dir_parent})
+      list(APPEND res ${base_dir_grandparent})
+    endif ()
+  endforeach ()
+
+  list(REMOVE_DUPLICATES res)
+  set(${result} ${res} PARENT_SCOPE)
+endfunction ()
+
+
+# Returns whether the module located at 'path' is a default module or not
+function (get_module_attribute_default path result)
+  set(${result} OFF PARENT_SCOPE)
+  if (EXISTS "${path}/include.cmake")
+    unset(DEFAULT_MODULE)
+    include(${path}/include.cmake)
+    if (DEFINED DEFAULT_MODULE)
+      set(${result} ${DEFAULT_MODULE} PARENT_SCOPE)
+    endif ()
+  endif ()
+endfunction()
+
+
+# Returns the list of dependencies of the module located at 'path'
+function (get_module_attribute_dependencies path result)
+  set(${result} "" PARENT_SCOPE)
+  if (EXISTS "${path}/include.cmake")
+    unset(OPENSPACE_DEPENDENCIES)
+    include(${path}/${dir}/include.cmake)
+    if (DEFINED OPENSPACE_DEPENDENCIES)
+      set(${result} ${OPENSPACE_DEPENDENCIES} PARENT_SCOPE)
+    endif ()
+  endif ()
+endfunction()
+
+# Returns the state whether the module located at 'path' is supported on this machine
+function (get_module_attribute_supported path result)
+  set(${result} ON PARENT_SCOPE)
+  if (EXISTS "${path}/include.cmake")
+    unset(SUPPORTED)
+    include(${path}/${dir}/include.cmake)
+    if (DEFINED SUPPORTED)
+      set(${result} ${SUPPORTED} PARENT_SCOPE)
+    endif ()
+  endif ()
+endfunction()
+
+
+# Returns the path for the 'module_name'. If the module has not been seen before by 
+# get_individual_modules, an empty string is returned
+function (find_path_for_module module_name module_names module_paths result)
+  list(FIND module_names ${module_name} i)
+  if (i EQUAL -1)
+    # Did not find the name in the list
+    set(${result} "" PARENT_SCOPE)
+  else ()
+    # We found the name in the list, so the path is at the same location
+    list(GET module_paths ${i} path)
+    set(${result} ${path} PARENT_SCOPE)
+  endif ()
+endfunction ()
+
+
+# Gets the names of the dependencies of 'module_name' recursively and returns them in
+# 'result'.  For a dependency chain of a -> b -> c   get_recursive_depdencies(a) will
+# return "b,c"
+function (get_recursive_dependencies module_name module_path module_names module_paths result)
+  set(result_aggregate "")
+  get_module_attribute_dependencies(${module_path} deps)
+  if (deps)
+    foreach (name ${deps})
+      find_path_for_module(${name} "${module_names}" "${module_paths}" path)
+      if (path)
+        get_recursive_dependencies(
+          ${name} ${path}
+          "${module_names}" "${module_paths}"
+          res
+        )
+        # 1. We add "base" to the list of dependencies as we always want it 
+        # 2. We add dependencies in this order such that when we later traverse
+        #    this list, we automatically get them in the correct order (meaning
+        #    that we include a dependency first)
+        set(result_aggregate ${result_aggregate} "base" ${res} ${name})
+      else ()
+        message(FATAL_ERROR "Could not find dependency ${name} for module ${module_name}")
+      endif ()
+    endforeach ()
+  endif ()
+  set(${result} ${result_aggregate} PARENT_SCOPE)
+endfunction()
+
+
+# Returns a list of all modules contained in the folder 'path'
+function (get_individual_modules path module_names module_paths)
+  file(GLOB moduleDirs RELATIVE ${path} ${path}/*)
+
+  set(names "")
+  set(paths "")
+  foreach (dir ${moduleDirs})
+    if (EXISTS "${path}/${dir}/CMakeLists.txt")
+      list(APPEND names ${dir})
+      list(APPEND paths ${path}/${dir})
+    else ()
+      # The CMakeLists.txt does not exist, so it might be a group of subdirectories
+      get_individual_modules(${path}/${dir} _mod_names _mod_paths)
+      list(APPEND names ${_mod_names})
+      list(APPEND paths ${_mod_paths})
+      # message(STATUS "Skipping ${dir} as ${dir}/CMakeLists.txt does not exist")
+    endif ()
+  endforeach ()
+
+  set(${module_names} ${names} PARENT_SCOPE)
+  set(${module_paths} ${paths} PARENT_SCOPE)
+endfunction ()
+
+
+
+
+
+
+set(OPENSPACE_EXTERNAL_MODULES_PATHS "" CACHE STRING "List of external modules")
+set(internal_module_path "${OPENSPACE_BASE_DIR}/modules")
+set(all_enabled_modules "")
+
+
+#
+# Step 1:  Get a list of all modules
+#
+# First get all the internal module
+get_individual_modules(${internal_module_path} all_module_names all_module_paths)
+
+# Then get all external modules
+foreach (path ${OPENSPACE_EXTERNAL_MODULES_PATHS})
+  get_individual_modules(${path} names paths)
+
+  foreach (n ${names})
+    if (${n} IN_LIST all_module_names)
+      message(FATAL_ERROR "Module name ${n} is not unique among the external directories")
+    endif ()
+  endforeach ()
+
+  set(all_module_names ${all_module_names} ${names})
+  set(all_module_paths ${all_module_paths} ${paths})
+endforeach ()
+
+list(LENGTH all_module_names all_module_names_count)
+math(EXPR all_module_names_count "${all_module_names_count} - 1")
+
+
+#
+# Step 2:  Create options for all modules with correct default values
+#
+set(enabled_module_names "")
+set(enabled_module_paths "")
+foreach(val RANGE ${all_module_names_count})
+  list(GET all_module_names ${val} name)
+  list(GET all_module_paths ${val} path)
+
+  get_module_attribute_supported(${path} is_module_supported)
+  if (NOT ${is_module_supported})
+    message(STATUS "Skipping module ${name} (${path}) as it is not supported on this machine")
+    continue()
+  endif ()
+
+  get_module_attribute_default(${path} is_default_module)
+  create_option_name(${name} optionName)
+  option(${optionName} "Build ${path} Module" ${is_default_module})
+
+  if (${optionName})
+    list(APPEND enabled_module_names ${name})
+    list(APPEND enabled_module_paths ${path})
+  endif ()
+endforeach ()
+
+
+#
+# Step 3:  For each module that is default or enabled by the user, get the dependencies
+#
+set(dependencies "")
+list(LENGTH enabled_module_names enabled_module_count)
+if (${enabled_module_count} EQUAL 0)
+  message(STATUS "No modules selected")
+  return()
+endif ()
+math(EXPR enabled_module_count "${enabled_module_count} - 1")
+foreach (val RANGE ${enabled_module_count})
+  list(GET enabled_module_names ${val} name)
+  list(GET enabled_module_paths ${val} path)
+
+  get_recursive_dependencies(
+    ${name} ${path}
+    "${all_module_names}" "${all_module_paths}"
+    deps
+)
+
+  set(dependencies ${dependencies} ${deps})
+endforeach()
+
+# We can remove the duplicates here.  We constructed the list such that nested 
+# dependencies are order left to right.  REMOVE_DUPLICATES will keep the left most
+# value in the case of duplicates, so that will still work
+list(REMOVE_DUPLICATES dependencies)
+
+
+#
+# Step 4:  Check each dependency and set it, if necessary
+#
+foreach (dep ${dependencies})
+  create_option_name(${dep} optionName)
+  if (NOT ${optionName})
+    set(${optionName} ON CACHE BOOL "Build ${dep} Module" FORCE)
+    message(STATUS "Due to dependencies, the '${dep}' was enabled")
+
+    find_path_for_module(${dep} "${all_module_names}" "${all_module_paths}" path)
+    list(APPEND enabled_module_names ${dep})
+    list(APPEND enabled_module_paths ${path})
+  endif ()
+endforeach ()
+
+# Print all the enabled modules
+message(STATUS "Enabled modules:")
+list(LENGTH enabled_module_names enabled_module_count)
+math(EXPR enabled_module_count "${enabled_module_count} - 1")
+foreach (val RANGE ${enabled_module_count})
+  list(GET enabled_module_names ${val} name)
+  list(GET enabled_module_paths ${val} path)
+
+  message(STATUS "\t${name}  (${path})")
+endforeach ()
+
+
+#
+# Step 5:  Add the subdirectories of all enabled modules
+#
+add_library(openspace-module-collection INTERFACE)
+set(module_class_names "")
+set(module_external_libraries "")
+foreach (val RANGE ${enabled_module_count})
+  list(GET enabled_module_names ${val} name)
+  list(GET enabled_module_paths ${val} path)
+
+  create_library_name(${name} library_name)
+  list(APPEND all_enabled_modules "${library_name}")
+  begin_header("Module ${name} (${library_name})")
+  add_subdirectory(${path})
+  # Make sure that the code generator always runs before a module
+  add_dependencies(${library_name} run_codegen)
+  end_header("End: Module ${name}")
+  message(STATUS "")
+
+  target_link_libraries(openspace-module-collection INTERFACE ${library_name})
+
+  # This is just a hack as a dependency from kameleon->core has been introduced that
+  # should be removed
+  if (${library_name} STREQUAL "openspace-module-kameleon")
+    cmake_policy(SET CMP0079 NEW)
+    target_link_libraries(openspace-core PRIVATE openspace-module-kameleon)
+  endif ()
+
+  create_define_name(${name} define_name)
+  target_compile_definitions(openspace-module-collection INTERFACE "${define_name}")
+
+  get_property(class_name GLOBAL PROPERTY CurrentModuleClassName)
+  list(APPEND module_class_names ${class_name})
+
+  get_property(ext_lib GLOBAL PROPERTY CurrentModuleExternalLibraries)
+  list(APPEND module_external_libraries ${ext_lib})
+endforeach ()
+
+list(REMOVE_DUPLICATES module_external_libraries)
+add_external_library_dependencies("${module_external_libraries}")
+
+
+#
+# Step 6:  Create the moduleregistration.h file with the header file paths, class
+#          names and the external module paths.
+#          The class list needs to be topologically sorted, based on
+#          the dependency graph, in order to guarantee that modules are
+#          initialized after their dependencies.
+#
+
+# We generate a list of the names of the enabled modules taking
+# the topologically sorted dependencies and adding the rest of the modules.
+# REMOVE_DUPLICATES will keep the left most value in the case of duplicates
+set(topologically_sorted ${dependencies} ${enabled_module_names})
+list(REMOVE_DUPLICATES topologically_sorted)
+
+set(MODULE_HEADERS "")
+set(MODULE_CLASSES "")
+set(MODULE_PATHS "")
+
+foreach (key RANGE ${enabled_module_count})
+  list(GET topologically_sorted ${key} name)
+  list(FIND enabled_module_names ${name} val)
+
+  list(GET enabled_module_paths ${val} path)
+  list(GET module_class_names ${val} class_name)
+
+  string(TOUPPER ${name} module_upper)
+  string(TOLOWER ${name} module_lower)
+
+  create_module_header_filepath(${name} ${path} header_filepath)
+
+  list(APPEND MODULE_HEADERS "#include <${header_filepath}>\n")
+  list(APPEND MODULE_CLASSES "        new ${class_name},\n")
+endforeach ()
+
+get_unique_include_paths(
+    "${enabled_module_paths}"
+    "${internal_module_path}"
+    module_paths
+)
+
+foreach (path ${module_paths})
+  list(APPEND MODULE_PATHS "    \"${path}\",\n")
+  # The module path should include the 'modules' directory, which is removed for the
+  # include path to make all of the includes look the same
+  list(APPEND MODULE_PATHS "    \"${path}/modules\",\n")
+  target_include_directories(openspace-module-collection PUBLIC ${path})
+endforeach ()
+
+if (NOT "${MODULE_HEADERS}" STREQUAL "")
+  string(REPLACE ";" "" MODULE_HEADERS ${MODULE_HEADERS})
+endif ()
+
+if (NOT "${MODULE_CLASSES}" STREQUAL "")
+  string(REPLACE ";" "" MODULE_CLASSES ${MODULE_CLASSES})
+endif ()
+
+if (NOT "${MODULE_PATHS}" STREQUAL "")
+  string(REPLACE ";" "" MODULE_PATHS ${MODULE_PATHS})
+  string(REPLACE "\\" "/" MODULE_PATHS ${MODULE_PATHS})
+endif ()
+
+configure_file(
+  ${OPENSPACE_CMAKE_EXT_DIR}/module_registration.template
+  ${CMAKE_BINARY_DIR}/_generated/include/openspace/moduleregistration.h
+)
+
+configure_file(
+  ${OPENSPACE_CMAKE_EXT_DIR}/module_path.template
+  ${CMAKE_BINARY_DIR}/_generated/include/openspace/modulepath.h
+)
+
+# Return the list of enabled modules to the caller
+set(all_enabled_modules ${all_enabled_modules} PARENT_SCOPE)
diff --git a/modules/atmosphere/CMakeLists.txt b/modules/atmosphere/CMakeLists.txt
index 68f88ebda5..475810d9fb 100644
--- a/modules/atmosphere/CMakeLists.txt
+++ b/modules/atmosphere/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,46 +25,46 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atmospheredeferredcaster.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableatmosphere.h
+  rendering/atmospheredeferredcaster.h
+  rendering/renderableatmosphere.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atmospheredeferredcaster.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableatmosphere.cpp
+  rendering/atmospheredeferredcaster.cpp
+  rendering/renderableatmosphere.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_common.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_deferred_vs.glsl 
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/atmosphere_deferred_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaE_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaE_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaJ_calc_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/deltaS_sup_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/inScattering_sup_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_final_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_final_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_sup_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/irradiance_sup_calc_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/transmittance_calc_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/transmittance_calc_fs.glsl
+  shaders/atmosphere_common.glsl
+  shaders/atmosphere_deferred_vs.glsl 
+  shaders/atmosphere_deferred_fs.glsl
+  shaders/deltaE_calc_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/atmospheremodule.cpp b/modules/atmosphere/atmospheremodule.cpp
index 94fb594ef0..d243bcec00 100644
--- a/modules/atmosphere/atmospheremodule.cpp
+++ b/modules/atmosphere/atmospheremodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/atmosphere/atmospheremodule.h b/modules/atmosphere/atmospheremodule.h
index 6b89bc761f..c17be3f83f 100644
--- a/modules/atmosphere/atmospheremodule.h
+++ b/modules/atmosphere/atmospheremodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
index 54dfbaa48e..0a27be4596 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -284,7 +284,7 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                 _time,
                 lt
             );
-            glm::dvec4 sunPosObj = glm::dvec4(0.0);
+            glm::dvec4 sunPosObj;
 
             // Sun following camera position
             if (_sunFollowingCameraEnabled) {
@@ -340,6 +340,15 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                     SceneGraphNode* casterNode =
                         global::renderEngine->scene()->sceneGraphNode(caster);
 
+                    if ((sourceNode == nullptr) || (casterNode == nullptr)) {
+                        LERRORC(
+                            "AtmosphereDeferredcaster",
+                            "Invalid scenegraph node for the shadow's caster or shadow's "
+                            "receiver."
+                        );
+                        return;
+                    }
+
                     const double sourceRadiusScale = std::max(
                         glm::compMax(sourceNode->scale()),
                         1.0
@@ -350,15 +359,6 @@ void AtmosphereDeferredcaster::preRaycast(const RenderData& renderData,
                         1.0
                     );
 
-                    if ((sourceNode == nullptr) || (casterNode == nullptr)) {
-                        LERRORC(
-                            "AtmosphereDeferredcaster",
-                            "Invalid scenegraph node for the shadow's caster or shadow's "
-                            "receiver."
-                        );
-                        return;
-                    }
-
                     // First we determine if the caster is shadowing the current planet
                     // (all calculations in World Coordinates):
                     glm::dvec3 planetCasterVec =
@@ -1377,7 +1377,7 @@ void AtmosphereDeferredcaster::step3DTexture(
         shaderProg->setUniform("dhdH", dminT, dH, dminG, dh);
     }
 
-    shaderProg->setUniform("layer", static_cast<int>(layer));
+    shaderProg->setUniform("layer", layer);
 }
 
 void AtmosphereDeferredcaster::saveTextureToPPMFile(GLenum color_buffer_attachment,
diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.h b/modules/atmosphere/rendering/atmospheredeferredcaster.h
index 8f5cf1b75c..f0f142824a 100644
--- a/modules/atmosphere/rendering/atmospheredeferredcaster.h
+++ b/modules/atmosphere/rendering/atmospheredeferredcaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/atmosphere/rendering/renderableatmosphere.cpp b/modules/atmosphere/rendering/renderableatmosphere.cpp
index 62582209a1..4859a00628 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.cpp
+++ b/modules/atmosphere/rendering/renderableatmosphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -47,6 +47,7 @@
 #include <glm/gtx/string_cast.hpp>
 #include <fstream>
 #include <memory>
+#include <optional>
 
 #ifdef WIN32
 #define _USE_MATH_DEFINES
@@ -54,33 +55,10 @@
 #include <math.h>
 
 namespace {
-    static const char* _loggerCat = "RenderableAtmosphere";
-
-    constexpr const char* KeyShadowGroup  = "ShadowGroup";
-    constexpr const char* KeyShadowSource = "Source";
-    constexpr const char* KeyShadowCaster = "Caster";
-
-    constexpr const char* keyAtmosphere               = "Atmosphere";
-    constexpr const char* keyAtmosphereRadius         = "AtmosphereRadius";
-    constexpr const char* keyPlanetRadius             = "PlanetRadius";
-    constexpr const char* keyAverageGroundReflectance = "PlanetAverageGroundReflectance";
-    constexpr const char* keyRayleigh                 = "Rayleigh";
-    constexpr const char* keyRayleighHeightScale      = "H_R";
-    constexpr const char* keyOzone                    = "Ozone";
-    constexpr const char* keyOzoneHeightScale         = "H_O";
-    constexpr const char* keyMie                      = "Mie";
-    constexpr const char* keyMieHeightScale           = "H_M";
-    constexpr const char* keyMiePhaseConstant         = "G";
-    constexpr const char* keyImage                    = "Image";
-    constexpr const char* keyToneMappingOp            = "ToneMapping";
-    constexpr const char* keyATMDebug                 = "Debug";
-    constexpr const char* keyTextureScale             = "PreCalculatedTextureScale";
-    constexpr const char* keySaveTextures             = "SaveCalculatedTextures";
-
     constexpr openspace::properties::Property::PropertyInfo AtmosphereHeightInfo = {
-        "atmosphereHeight",
+        "AtmosphereHeight",
         "Atmosphere Height (KM)",
-        "The thickness of the atmosphere in Km"
+        "The thickness of the atmosphere in km"
     };
 
     constexpr openspace::properties::Property::PropertyInfo AverageGroundReflectanceInfo =
@@ -92,7 +70,7 @@ namespace {
     };
 
     constexpr openspace::properties::Property::PropertyInfo GroundRadianceEmittioninfo = {
-        "GroundRadianceEmittion",
+        "GroundRadianceEmission",
         "Percentage of initial radiance emitted from ground",
         "Multiplier of the ground radiance color during the rendering phase"
     };
@@ -104,24 +82,10 @@ namespace {
         "constant factor"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo RayleighScatteringCoeffXInfo =
+    constexpr openspace::properties::Property::PropertyInfo RayleighScatteringCoeffInfo =
     {
-        "RayleighScatteringCoeffX",
-        "Rayleigh Scattering Coeff X (x10e-3)",
-        "Rayleigh sea-level scattering coefficients in meters"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo RayleighScatteringCoeffYInfo =
-    {
-        "RayleighScatteringCoeffY",
-        "Rayleigh Scattering Coeff Y (x10e-3)",
-        "Rayleigh sea-level scattering coefficients in meters"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo RayleighScatteringCoeffZInfo =
-    {
-        "RayleighScatteringCoeffZ",
-        "Rayleigh Scattering Coeff Z (x10e-3)",
+        "RayleighScatteringCoeff",
+        "Rayleigh Scattering Coeff",
         "Rayleigh sea-level scattering coefficients in meters"
     };
 
@@ -138,21 +102,9 @@ namespace {
         "constant factor"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffXInfo = {
-        "OzoneLayerCoeffX",
-        "Ozone Layer Extinction Coeff X (x10e-5)",
-        "Ozone scattering coefficients in meters"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffYInfo = {
-        "OzoneLayerCoeffY",
-        "Ozone Layer Extinction Coeff Y (x10e-5)",
-        "Ozone scattering coefficients in meters"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffZInfo = {
-        "OzoneLayerCoeffZ",
-        "Ozone Layer Extinction Coeff Z (x10e-5)",
+    constexpr openspace::properties::Property::PropertyInfo OzoneLayerCoeffInfo = {
+        "OzoneLayerCoeff",
+        "Ozone Layer Extinction Coeff",
         "Ozone scattering coefficients in meters"
     };
 
@@ -163,21 +115,9 @@ namespace {
         "constant factor"
     };
 
-    constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffXInfo = {
-        "MieScatteringCoeffX",
-        "Mie Scattering Coeff X (x10e-3)",
-        "Mie sea-level scattering coefficients in meters"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffYInfo = {
-        "MieScatteringCoeffY",
-        "Mie Scattering Coeff Y (x10e-3)",
-        "Mie sea-level scattering coefficients in meters"
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffZInfo = {
-        "MieScatteringCoeffZ",
-        "Mie Scattering Coeff Z (x10e-3)",
+    constexpr openspace::properties::Property::PropertyInfo MieScatteringCoeffInfo = {
+        "MieScatteringCoeff",
+        "Mie Scattering Coeff",
         "Mie sea-level scattering coefficients in meters"
     };
 
@@ -214,592 +154,334 @@ namespace {
         "Enable Hard Shadows for Eclipses",
         "Enable/Disables hard shadows through the atmosphere"
     };
+
+
+    struct [[codegen::Dictionary(RenderableAtmosphere)]] Parameters {
+        struct ShadowGroup {
+            // Individual light sources
+            struct SourceElement {
+                // The scene graph node name of the source
+                std::string name;
+                // The radius of the object in meters
+                double radius;
+            };
+            // A list of light sources
+            std::vector<SourceElement> sources;
+
+            // Individual shadow casters
+            struct CasterElement {
+                // The scene graph node name of the source
+                std::string name;
+                // The radius of the object in meters
+                double radius;
+            };
+
+            // A list of objects that cast light on this atmosphere
+            std::vector<CasterElement> casters;
+        };
+        // Declares shadow groups, meaning which nodes are considered in shadow calculations
+        std::optional<ShadowGroup> shadowGroup;
+
+        // [[codegen::verbatim(AtmosphereHeightInfo.description)]]
+        float atmosphereHeight;
+
+        // The radius of the planet in meters
+        float planetRadius;
+
+        float planetAverageGroundReflectance;
+
+        // [[codegen::verbatim(SunIntensityInfo.description)]]
+        std::optional<float> sunIntensity;
+
+        // [[codegen::verbatim(MieScatteringExtinctionPropCoeffInfo.description)]]
+        std::optional<float> mieScatteringExtinctionPropCoefficient;
+
+        // [[codegen::verbatim(GroundRadianceEmittioninfo.description)]]
+        float groundRadianceEmission;
+
+        struct Rayleigh {
+            struct Coefficients {
+                glm::dvec3 wavelengths;
+                glm::dvec3 scattering;
+            };
+            Coefficients coefficients;
+            float heightScale [[codegen::key("H_R")]];
+        };
+        Rayleigh rayleigh;
+
+        struct Ozone {
+            struct Coefficients {
+                std::optional<glm::vec3> extinction;
+            };
+            std::optional<Coefficients> coefficients;
+            std::optional<float> heightScale [[codegen::key("H_O")]];
+        };
+        std::optional<Ozone> ozone;
+
+        struct Mie {
+            struct Coefficients {
+                glm::dvec3 scattering;
+                glm::dvec3 extinction;
+            };
+            Coefficients coefficients;
+            float heightScale [[codegen::key("H_M")]];
+            float phaseConstant [[codegen::key("G"), codegen::inrange(-1.0, 1.0)]];
+        };
+        Mie mie;
+
+        struct ATMDebug {
+            std::optional<float> preCalculatedTextureScale [[codegen::inrange(0.0, 1.0)]];
+            std::optional<bool> saveCalculatedTextures;
+        };
+        std::optional<ATMDebug> debug;
+    };
+#include "renderableatmosphere_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableAtmosphere::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableAtmosphere",
-        "atmosphere_renderable_atmosphere",
-        {}
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "atmosphere_renderable_atmosphere";
+    return doc;
 }
 
 RenderableAtmosphere::RenderableAtmosphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _atmosphereHeightP(AtmosphereHeightInfo, 60.0f, 0.1f, 99.0f)
-    , _groundAverageReflectanceP(AverageGroundReflectanceInfo, 0.1f, 0.0f, 1.0f)
-    , _groundRadianceEmittionP(GroundRadianceEmittioninfo, 0.3f, 0.0f, 1.0f)
-    , _rayleighHeightScaleP(RayleighHeightScaleInfo, 8.0f, 0.1f, 20.0f)
-    , _rayleighScatteringCoeffXP(RayleighScatteringCoeffXInfo, 1.0f, 0.01f, 100.0f)
-    , _rayleighScatteringCoeffYP(RayleighScatteringCoeffYInfo, 1.0f, 0.01f, 100.0f)
-    , _rayleighScatteringCoeffZP(RayleighScatteringCoeffZInfo, 1.0f, 0.01f, 100.0f)
-    , _ozoneEnabledP(OzoneLayerInfo, true)
-    , _ozoneHeightScaleP(OzoneHeightScaleInfo, 8.0f, 0.1f, 20.0f)
-    , _ozoneCoeffXP(OzoneLayerCoeffXInfo, 3.426f, 0.01f, 100.0f)
-    , _ozoneCoeffYP(OzoneLayerCoeffYInfo, 8.298f, 0.01f, 100.0f)
-    , _ozoneCoeffZP(OzoneLayerCoeffZInfo, 0.356f, 0.01f, 100.0f)
-    , _mieHeightScaleP(MieHeightScaleInfo, 1.2f, 0.1f, 20.0f)
-    , _mieScatteringCoeffXP(MieScatteringCoeffXInfo, 4.0f, 0.01f, 1000.0f)
-    , _mieScatteringCoeffYP(MieScatteringCoeffYInfo, 4.0f, 0.01f, 1000.0f)
-    , _mieScatteringCoeffZP(MieScatteringCoeffZInfo, 4.0f, 0.01f, 1000.0f)
-    , _mieScatteringExtinctionPropCoefficientP(
-        MieScatteringExtinctionPropCoeffInfo,
-        0.9f,
-        0.01f,
-        1.0f
+    , _atmosphereHeight(AtmosphereHeightInfo, 60.f, 0.1f, 99.0f)
+    , _groundAverageReflectance(AverageGroundReflectanceInfo, 0.f, 0.f, 1.f)
+    , _groundRadianceEmission(GroundRadianceEmittioninfo, 0.f, 0.f, 1.f)
+    , _rayleighHeightScale(RayleighHeightScaleInfo, 0.f, 0.1f, 20.f)
+    , _rayleighScatteringCoeff(
+        RayleighScatteringCoeffInfo,
+        glm::vec3(0.f), glm::vec3(0.00001f), glm::vec3(0.1f)
     )
-    , _mieAsymmetricFactorGP(MieAsymmetricFactorGInfo, 0.85f, -1.0f, 1.0f)
-    , _sunIntensityP(SunIntensityInfo, 50.0f, 0.1f, 1000.0f)
-    , _sunFollowingCameraEnabledP(EnableSunOnCameraPositionInfo, false)
-    , _hardShadowsEnabledP(EclipseHardShadowsInfo, false)
+    , _ozoneEnabled(OzoneLayerInfo, false)
+    , _ozoneHeightScale(OzoneHeightScaleInfo, 0.f, 0.1f, 20.f)
+    , _ozoneCoeff(
+        OzoneLayerCoeffInfo,
+        glm::vec3(0.f), glm::vec3(0.00001f), glm::vec3(0.001f)
+    )
+    , _mieHeightScale(MieHeightScaleInfo, 0.f, 0.1f, 20.f)
+    , _mieScatteringCoeff(
+        MieScatteringCoeffInfo,
+        glm::vec3(0.004f), glm::vec3(0.00001f), glm::vec3(1.f)
+    )
+    , _mieScatteringExtinctionPropCoefficient(
+        MieScatteringExtinctionPropCoeffInfo,
+        0.9f, 0.01f, 1.f
+    )
+    , _miePhaseConstant(MieAsymmetricFactorGInfo, 0.f, -1.f, 1.f)
+    , _sunIntensity(SunIntensityInfo, 5.f, 0.1f, 1000.f)
+    , _sunFollowingCameraEnabled(EnableSunOnCameraPositionInfo, false)
+    , _hardShadowsEnabled(EclipseHardShadowsInfo, false)
  {
-    ghoul_precondition(
-        dictionary.hasKeyAndValue<std::string>(SceneGraphNode::KeyIdentifier),
-        "RenderableAtmosphere needs the identifier to be specified"
-    );
+    auto updateWithCalculation = [this]() {
+        _deferredCasterNeedsUpdate = true;
+        _deferredCasterNeedsCalculation = true;
+    };
+    auto updateWithoutCalculation = [this]() {
+        _deferredCasterNeedsUpdate = true;
+    };
 
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableAtmosphere"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    const std::string identifier = dictionary.value<std::string>(
-        SceneGraphNode::KeyIdentifier
-    );
-    //================================================================
-    //======== Reads Shadow (Eclipses) Entries in mod file ===========
-    //================================================================
-    ghoul::Dictionary shadowDictionary;
-    bool success = dictionary.getValue(KeyShadowGroup, shadowDictionary);
-    bool disableShadows = false;
-    if (success) {
-        std::vector<std::pair<std::string, double>> sourceArray;
-        unsigned int sourceCounter = 1;
-        while (success) {
-            std::string sourceName;
-            success = shadowDictionary.getValue(KeyShadowSource +
-                std::to_string(sourceCounter) + ".Name", sourceName);
-            if (success) {
-                double sourceRadius;
-                success = shadowDictionary.getValue(KeyShadowSource +
-                    std::to_string(sourceCounter) + ".Radius", sourceRadius);
-                if (success) {
-                    sourceArray.emplace_back(sourceName, sourceRadius);
-                }
-                else {
-                    LWARNING(fmt::format(
-                        "No Radius value expecified for Shadow Source Name '{}' from "
-                        "'{}' planet. Disabling shadows for this planet.",
-                        sourceName,
-                        identifier
-                    ));
-                    disableShadows = true;
-                    break;
-                }
-            }
-            sourceCounter++;
-        }
-
-        if (!disableShadows && !sourceArray.empty()) {
-            success = true;
-            std::vector<std::pair<std::string, double>> casterArray;
-            unsigned int casterCounter = 1;
-            while (success) {
-                std::string casterName;
-                success = shadowDictionary.getValue(KeyShadowCaster +
-                    std::to_string(casterCounter) + ".Name", casterName);
-                if (success) {
-                    double casterRadius;
-                    success = shadowDictionary.getValue(KeyShadowCaster +
-                        std::to_string(casterCounter) + ".Radius", casterRadius);
-                    if (success) {
-                        casterArray.emplace_back(casterName, casterRadius);
-                    }
-                    else {
-                        LWARNING(fmt::format(
-                            "No Radius value expecified for Shadow Caster Name '{}' from "
-                            "'{}' planet. Disabling shadows for this planet.",
-                            casterName,
-                            identifier
-                        ));
-                        disableShadows = true;
-                        break;
-                    }
-                }
-
-                casterCounter++;
-            }
-
-            if (!disableShadows && (!sourceArray.empty() && !casterArray.empty())) {
-                for (const auto & source : sourceArray) {
-                    for (const auto & caster : casterArray) {
-                        ShadowConfiguration sc;
-                        sc.source = source;
-                        sc.caster = caster;
-                        _shadowConfArray.push_back(sc);
-                    }
-                }
-                _shadowEnabled = true;
+    _shadowEnabled = p.shadowGroup.has_value();
+    if (_shadowEnabled) {
+        for (const Parameters::ShadowGroup::SourceElement& s : p.shadowGroup->sources) {
+            for (const Parameters::ShadowGroup::CasterElement& c :
+                 p.shadowGroup->casters)
+            {
+                ShadowConfiguration sc;
+                sc.source = std::pair(s.name, s.radius);
+                sc.caster = std::pair(c.name, c.radius);
+                _shadowConfArray.push_back(sc);
             }
         }
     }
 
-    //================================================================
-    //========== Reads Atmosphere Entries from mod file ==============
-    //================================================================
-    bool errorReadingAtmosphereData = false;
-    ghoul::Dictionary atmosphereDictionary;
-    success = dictionary.getValue(keyAtmosphere, atmosphereDictionary);
-    if (success) {
-        if (!atmosphereDictionary.getValue(keyAtmosphereRadius, _atmosphereRadius)) {
-            errorReadingAtmosphereData = true;
-            LWARNINGC(
-                identifier,
-                "No Atmosphere Radius value specified for Atmosphere Effects. "
-                "Disabling atmosphere effects for this planet."
-            );
+    _atmosphereHeight = p.atmosphereHeight;
+    _atmosphereHeight.onChange(updateWithCalculation);
+    addProperty(_atmosphereHeight);
+
+    _planetRadius = p.planetRadius;
+
+    _groundAverageReflectance = p.planetAverageGroundReflectance;
+    _groundAverageReflectance.onChange(updateWithCalculation);
+    addProperty(_groundAverageReflectance);
+
+    _sunIntensity = p.sunIntensity.value_or(_sunIntensity);
+    _sunIntensity.onChange(updateWithoutCalculation);
+    addProperty(_sunIntensity);
+
+    _mieScattExtPropCoefProp =
+        p.mieScatteringExtinctionPropCoefficient.value_or(_mieScattExtPropCoefProp);
+
+    _rayleighScatteringCoeff = p.rayleigh.coefficients.scattering;
+    _rayleighScatteringCoeff.onChange(updateWithCalculation);
+    addProperty(_rayleighScatteringCoeff);
+
+    _rayleighHeightScale = p.rayleigh.heightScale;
+    _rayleighHeightScale.onChange(updateWithCalculation);
+    addProperty(_rayleighHeightScale);
+
+    if (p.ozone.has_value()) {
+        _ozoneHeightScale = p.ozone->heightScale.value_or(_ozoneHeightScale);
+        _ozoneEnabled = p.ozone->heightScale.has_value();
+
+        if (p.ozone->coefficients.has_value()) {
+            _ozoneCoeff = p.ozone->coefficients->extinction.value_or(_ozoneCoeff);
         }
+    }
+    _ozoneEnabled.onChange(updateWithCalculation);
+    addProperty(_ozoneEnabled);
+    _ozoneHeightScale.onChange(updateWithCalculation);
+    addProperty(_ozoneHeightScale);
+    _ozoneCoeff.onChange(updateWithCalculation);
+    addProperty(_ozoneCoeff);
 
-        if (!atmosphereDictionary.getValue(keyPlanetRadius, _atmospherePlanetRadius)) {
-            errorReadingAtmosphereData = true;
-            LWARNINGC(
-                identifier,
-                "No Planet Radius value expecified for Atmosphere Effects. "
-                "Disabling atmosphere effects for this planet."
-            );
-        }
+    _mieHeightScale = p.mie.heightScale;
+    _mieHeightScale.onChange(updateWithCalculation);
+    addProperty(_mieHeightScale);
 
-        if (!atmosphereDictionary.getValue(
-                keyAverageGroundReflectance,
-                _planetAverageGroundReflectance))
-        {
-            errorReadingAtmosphereData = true;
-            LWARNINGC(
-                identifier,
-                "No Average Atmosphere Ground Reflectance value specified for "
-                "Atmosphere Effects. Disabling atmosphere effects for this planet."
-            );
-        }
-        
-        if (atmosphereDictionary.hasKey(SunIntensityInfo.identifier)) {
-            _sunRadianceIntensity =
-                atmosphereDictionary.value<float>(SunIntensityInfo.identifier);
-        }
-        
-        if (atmosphereDictionary.hasKey(MieScatteringExtinctionPropCoeffInfo.identifier)) {
-            _mieScattExtPropCoefProp = atmosphereDictionary.value<float>(
-                MieScatteringExtinctionPropCoeffInfo.identifier
-            );
-        }
+    _mieScatteringCoeff = p.mie.coefficients.scattering;
+    _mieScatteringCoeff.onChange(updateWithCalculation);
+    addProperty(_mieScatteringCoeff);
 
-        if (!atmosphereDictionary.getValue(
-                GroundRadianceEmittioninfo.identifier,
-                _planetGroundRadianceEmittion))
-        {
-            errorReadingAtmosphereData = true;
-            LWARNINGC(
-                identifier,
-                "No Ground Radiance Emitted percentage value specified for Atmosphere "
-                "Effects. Disabling atmosphere effects for this planet."
-            );
-        }
+    _mieExtinctionCoeff = p.mie.coefficients.extinction;
+    _miePhaseConstant = p.mie.phaseConstant;
+    _miePhaseConstant.onChange(updateWithCalculation);
+    addProperty(_miePhaseConstant);
 
-        ghoul::Dictionary rayleighDictionary;
-        success = atmosphereDictionary.getValue(keyRayleigh, rayleighDictionary);
+    _mieScatteringExtinctionPropCoefficient =
+        _mieScattExtPropCoefProp != 1.f ? _mieScattExtPropCoefProp :
+        _mieScatteringCoeff.value().x / _mieExtinctionCoeff.x;
 
-        if (success) {
-            // Not using right now.
-            glm::vec3 rayleighWavelengths = glm::vec3(0.f);
-            rayleighDictionary.getValue(
-                "Coefficients.Wavelengths",
-                rayleighWavelengths
-            );
+    _mieScatteringExtinctionPropCoefficient.onChange(updateWithCalculation);
+    addProperty(_mieScatteringExtinctionPropCoefficient);
+    
+    if (p.debug.has_value()) {
+        _preCalculatedTexturesScale =
+            p.debug->preCalculatedTextureScale.value_or(_preCalculatedTexturesScale);
 
-            if (!rayleighDictionary.getValue(
-                "Coefficients.Scattering",
-                _rayleighScatteringCoeff))
-            {
-                errorReadingAtmosphereData = true;
-                LWARNINGC(
-                    identifier,
-                    "No Rayleigh Scattering parameters specified for Atmosphere Effects. "
-                    "Disabling atmosphere effects for this planet."
-                );
-            }
+        _saveCalculationsToTexture =
+            p.debug->saveCalculatedTextures.value_or(_saveCalculationsToTexture);
+    }
 
-            if (!rayleighDictionary.getValue(
-                keyRayleighHeightScale,
-                _rayleighHeightScale)
-            )
-            {
-                errorReadingAtmosphereData = true;
-                LWARNINGC(
-                    identifier,
-                    "No Rayleigh Height Scale value specified for Atmosphere Effects. "
-                    "Disabling atmosphere effects for this planet."
-                );
-            }
-        }
-        else {
-            errorReadingAtmosphereData = true;
-            LWARNINGC(
-                identifier,
-                "No Rayleigh parameters specified for Atmosphere Effects. "
-                "Disabling atmosphere effects for this planet."
-            );
-        }
+    _groundRadianceEmission = p.groundRadianceEmission;
+    _groundRadianceEmission.onChange(updateWithoutCalculation);
+    addProperty(_groundRadianceEmission);
 
-        ghoul::Dictionary ozoneDictionary;
-        success = atmosphereDictionary.getValue(keyOzone, ozoneDictionary);
-        if (success) {
-            _ozoneLayerEnabled = true;
-            if (!ozoneDictionary.getValue(keyOzoneHeightScale, _ozoneHeightScale)) {
-                _ozoneLayerEnabled = false;
-            }
+    _sunFollowingCameraEnabled.onChange(updateWithoutCalculation);
+    addProperty(_sunFollowingCameraEnabled);
 
-            if (!ozoneDictionary.getValue(
-                "Coefficients.Extinction",
-                _ozoneExtinctionCoeff))
-            {
-                _ozoneLayerEnabled = false;
-            }
-        }
-        else {
-            _ozoneLayerEnabled = false;
-        }
-
-        ghoul::Dictionary mieDictionary;
-        success = atmosphereDictionary.getValue(keyMie, mieDictionary);
-        if (success) {
-            if (!mieDictionary.getValue(keyMieHeightScale, _mieHeightScale)) {
-                errorReadingAtmosphereData = true;
-                LWARNINGC(
-                    identifier,
-                    "No Mie Height Scale value specified for Atmosphere Effects. "
-                    "Disabling atmosphere effects for this planet."
-                );
-            }
-
-            if (!mieDictionary.getValue("Coefficients.Scattering", _mieScatteringCoeff)) {
-                errorReadingAtmosphereData = true;
-                LWARNINGC(
-                    identifier,
-                    "No Mie Scattering parameters specified for Atmosphere Effects. "
-                    "Disabling atmosphere effects for this planet."
-                );
-            }
-
-            if (!mieDictionary.getValue("Coefficients.Extinction", _mieExtinctionCoeff)) {
-                errorReadingAtmosphereData = true;
-                LWARNINGC(
-                    identifier,
-                    "No Mie Extinction parameters specified for Atmosphere Effects. "
-                    "Disabling atmosphere effects for this planet."
-                );
-            }
-
-            if (!mieDictionary.getValue(keyMiePhaseConstant, _miePhaseConstant)) {
-                errorReadingAtmosphereData = true;
-                LWARNINGC(
-                    identifier,
-                    "No Mie Phase Constant value specified for Atmosphere Effects. "
-                    "Disabling atmosphere effects for this planet."
-                );
-            }
-        }
-        else {
-            errorReadingAtmosphereData = true;
-            LWARNINGC(
-                identifier,
-                "No Mie parameters specified for Atmosphere Effects. "
-                "Disabling atmosphere effects for this planet."
-            );
-        }
-
-        ghoul::Dictionary ImageDictionary;
-        success = atmosphereDictionary.getValue(keyImage, ImageDictionary);
-        if (success) {
-            if (ImageDictionary.getValue(keyToneMappingOp, _preCalculatedTexturesScale)) {
-                LDEBUG(fmt::format(
-                    "Atmosphere Texture Scaled to {}",
-                    _preCalculatedTexturesScale
-                ));
-            }
-        }
-
-        ghoul::Dictionary debugDictionary;
-        success = atmosphereDictionary.getValue(keyATMDebug, debugDictionary);
-        if (success) {
-            if (debugDictionary.getValue(keyTextureScale, _preCalculatedTexturesScale)) {
-                LDEBUG(fmt::format(
-                    "Atmosphere Texture Scaled to {}",
-                    _preCalculatedTexturesScale
-                ));
-            }
-
-            if (debugDictionary.getValue(keySaveTextures, _saveCalculationsToTexture)) {
-                LDEBUG("Saving Precalculated Atmosphere Textures.");
-            }
-
-        }
-
-        if (!errorReadingAtmosphereData) {
-            _atmosphereEnabled = true;
-
-            //========================================================
-            //============== Atmosphere Properties ===================
-            //========================================================
-
-            auto updateAtmosphere = [this]() { updateAtmosphereParameters(); };
-
-            _atmosphereHeightP =_atmosphereRadius - _atmospherePlanetRadius;
-            _atmosphereHeightP.onChange(updateAtmosphere);
-            addProperty(_atmosphereHeightP);
-
-            _groundAverageReflectanceP = _planetAverageGroundReflectance;
-            _groundAverageReflectanceP.onChange(updateAtmosphere);
-            addProperty(_groundAverageReflectanceP);
-
-            _groundRadianceEmittionP = _planetGroundRadianceEmittion;
-            _groundRadianceEmittionP.onChange(updateAtmosphere);
-            addProperty(_groundRadianceEmittionP);
-
-            _rayleighHeightScaleP = _rayleighHeightScale;
-            _rayleighHeightScaleP.onChange(updateAtmosphere);
-            addProperty(_rayleighHeightScaleP);
-
-            _rayleighScatteringCoeffXP = _rayleighScatteringCoeff.x * 1000.0f;
-            _rayleighScatteringCoeffXP.onChange(updateAtmosphere);
-            addProperty(_rayleighScatteringCoeffXP);
-
-            _rayleighScatteringCoeffYP = _rayleighScatteringCoeff.y * 1000.0f;
-            _rayleighScatteringCoeffYP.onChange(updateAtmosphere);
-            addProperty(_rayleighScatteringCoeffYP);
-
-            _rayleighScatteringCoeffZP = _rayleighScatteringCoeff.z * 1000.0f;
-            _rayleighScatteringCoeffZP.onChange(updateAtmosphere);
-            addProperty(_rayleighScatteringCoeffZP);
-
-            _ozoneEnabledP = _ozoneLayerEnabled;
-            _ozoneEnabledP.onChange(updateAtmosphere);
-            addProperty(_ozoneEnabledP);
-
-            _ozoneHeightScaleP = _ozoneHeightScale;
-            _ozoneHeightScaleP.onChange(updateAtmosphere);
-            addProperty(_ozoneHeightScaleP);
-
-            _ozoneCoeffXP = _ozoneExtinctionCoeff.x * 100000.0f;
-            _ozoneCoeffXP.onChange(updateAtmosphere);
-            addProperty(_ozoneCoeffXP);
-
-            _ozoneCoeffYP = _ozoneExtinctionCoeff.y * 100000.0f;
-            _ozoneCoeffYP.onChange(updateAtmosphere);
-            addProperty(_ozoneCoeffYP);
-
-
-            _ozoneCoeffZP = _ozoneExtinctionCoeff.z * 100000.0f;
-            _ozoneCoeffZP.onChange(updateAtmosphere);
-            addProperty(_ozoneCoeffZP);
-
-            _mieHeightScaleP = _mieHeightScale;
-            _mieHeightScaleP.onChange(updateAtmosphere);
-            addProperty(_mieHeightScaleP);
-
-            _mieScatteringCoeffXP = _mieScatteringCoeff.x * 1000.0f;
-            _mieScatteringCoeffXP.onChange(updateAtmosphere);
-            addProperty(_mieScatteringCoeffXP);
-
-            _mieScatteringCoeffYP = _mieScatteringCoeff.y * 1000.0f;
-            _mieScatteringCoeffYP.onChange(updateAtmosphere);
-            addProperty(_mieScatteringCoeffYP);
-
-            _mieScatteringCoeffZP = _mieScatteringCoeff.z * 1000.0f;
-            _mieScatteringCoeffZP.onChange(updateAtmosphere);
-            addProperty(_mieScatteringCoeffZP);
-
-            _mieScatteringExtinctionPropCoefficientP = 
-                _mieScattExtPropCoefProp != 1.f ? _mieScattExtPropCoefProp :
-                _mieScatteringCoeff.x / _mieExtinctionCoeff.x;
-
-            _mieScatteringExtinctionPropCoefficientP.onChange(updateAtmosphere);
-            addProperty(_mieScatteringExtinctionPropCoefficientP);
-
-            _mieAsymmetricFactorGP = _miePhaseConstant;
-            _mieAsymmetricFactorGP.onChange(updateAtmosphere);
-            addProperty(_mieAsymmetricFactorGP);
-
-            _sunIntensityP = _sunRadianceIntensity;
-            _sunIntensityP.onChange(updateAtmosphere);
-            addProperty(_sunIntensityP);
-
-            _sunFollowingCameraEnabledP = _sunFollowingCameraEnabled;
-            _sunFollowingCameraEnabledP.onChange(updateAtmosphere);
-            addProperty(_sunFollowingCameraEnabledP);
-
-            _hardShadowsEnabledP = _hardShadows;
-            _hardShadowsEnabledP.onChange(updateAtmosphere);
-            if (_shadowEnabled) {
-                addProperty(_hardShadowsEnabledP);
-            }
-        }
+    if (_shadowEnabled) {
+        _hardShadowsEnabled.onChange(updateWithoutCalculation);
+        addProperty(_hardShadowsEnabled);
     }
 }
 
 void RenderableAtmosphere::deinitializeGL() {
-    if (_deferredcaster) {
-        global::deferredcasterManager->detachDeferredcaster(*_deferredcaster);
-        _deferredcaster = nullptr;
-    }
+    global::deferredcasterManager->detachDeferredcaster(*_deferredcaster);
+    _deferredcaster = nullptr;
 }
 
 void RenderableAtmosphere::initializeGL() {
-    if (_atmosphereEnabled) {
-        _deferredcaster = std::make_unique<AtmosphereDeferredcaster>();
-        if (_deferredcaster) {
-            _deferredcaster->setAtmosphereRadius(_atmosphereRadius);
-            _deferredcaster->setPlanetRadius(_atmospherePlanetRadius);
-            _deferredcaster->setPlanetAverageGroundReflectance(
-                _planetAverageGroundReflectance
-            );
-            _deferredcaster->setPlanetGroundRadianceEmittion(
-                _planetGroundRadianceEmittion
-            );
-            _deferredcaster->setRayleighHeightScale(_rayleighHeightScale);
-            _deferredcaster->enableOzone(_ozoneLayerEnabled);
-            _deferredcaster->setOzoneHeightScale(_ozoneHeightScale);
-            _deferredcaster->setMieHeightScale(_mieHeightScale);
-            _deferredcaster->setMiePhaseConstant(_miePhaseConstant);
-            _deferredcaster->setSunRadianceIntensity(_sunRadianceIntensity);
-            _deferredcaster->setRayleighScatteringCoefficients(_rayleighScatteringCoeff);
-            _deferredcaster->setOzoneExtinctionCoefficients(_ozoneExtinctionCoeff);
-            _deferredcaster->setMieScatteringCoefficients(_mieScatteringCoeff);
-            _deferredcaster->setMieExtinctionCoefficients(_mieExtinctionCoeff);
-            // TODO: Fix the ellipsoid nature of the renderable globe (JCC)
-            //_deferredcaster->setEllipsoidRadii(_ellipsoid.radii());
-            _deferredcaster->enableSunFollowing(_sunFollowingCameraEnabled);
+    _deferredcaster = std::make_unique<AtmosphereDeferredcaster>();
+    _deferredcaster->setAtmosphereRadius(_planetRadius + _atmosphereHeight);
+    _deferredcaster->setPlanetRadius(_planetRadius);
+    _deferredcaster->setPlanetAverageGroundReflectance(_groundAverageReflectance);
+    _deferredcaster->setPlanetGroundRadianceEmittion(_groundRadianceEmission);
+    _deferredcaster->setRayleighHeightScale(_rayleighHeightScale);
+    _deferredcaster->enableOzone(_ozoneEnabled);
+    _deferredcaster->setOzoneHeightScale(_ozoneHeightScale);
+    _deferredcaster->setMieHeightScale(_mieHeightScale);
+    _deferredcaster->setMiePhaseConstant(_miePhaseConstant);
+    _deferredcaster->setSunRadianceIntensity(_sunIntensity);
+    _deferredcaster->setRayleighScatteringCoefficients(_rayleighScatteringCoeff);
+    _deferredcaster->setOzoneExtinctionCoefficients(_ozoneCoeff);
+    _deferredcaster->setMieScatteringCoefficients(_mieScatteringCoeff);
+    _deferredcaster->setMieExtinctionCoefficients(_mieExtinctionCoeff);
+    // TODO: Fix the ellipsoid nature of the renderable globe (JCC)
+    //_deferredcaster->setEllipsoidRadii(_ellipsoid.radii());
+    _deferredcaster->enableSunFollowing(_sunFollowingCameraEnabled);
 
-            _deferredcaster->setPrecalculationTextureScale(_preCalculatedTexturesScale);
-            if (_saveCalculationsToTexture)
-                _deferredcaster->enablePrecalculationTexturesSaving();
+    _deferredcaster->setPrecalculationTextureScale(_preCalculatedTexturesScale);
+    if (_saveCalculationsToTexture)
+        _deferredcaster->enablePrecalculationTexturesSaving();
 
-            if (_shadowEnabled) {
-                _deferredcaster->setShadowConfigArray(_shadowConfArray);
-                _deferredcaster->setHardShadows(_hardShadows);
-            }
-
-            _deferredcaster->initialize();
-        }
-
-        global::deferredcasterManager->attachDeferredcaster(*_deferredcaster);
+    if (_shadowEnabled) {
+        _deferredcaster->setShadowConfigArray(_shadowConfArray);
+        // We no longer need it
+        _shadowConfArray.clear();
+        _deferredcaster->setHardShadows(_hardShadowsEnabled);
     }
 
-    return;
+    _deferredcaster->initialize();
+
+    global::deferredcasterManager->attachDeferredcaster(*_deferredcaster);
 }
 
 bool RenderableAtmosphere::isReady() const {
-    bool ready = true;
-    ready &= (_deferredcaster != nullptr);
-    return ready;
+    return true;
 }
 
 glm::dmat4 RenderableAtmosphere::computeModelTransformMatrix(
-                                            const openspace::TransformData& transformData)
+                                                       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
-        glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(transformData.scale)));
+        glm::scale(glm::dmat4(1.0), glm::dvec3(transformData.scale));
 }
 
 void RenderableAtmosphere::render(const RenderData& data, RendererTasks& renderTask) {
     ZoneScoped
 
-    if (_atmosphereEnabled) {
-        DeferredcasterTask task{ _deferredcaster.get(), data };
-        renderTask.deferredcasterTasks.push_back(task);
-    }
+    DeferredcasterTask task{ _deferredcaster.get(), data };
+    renderTask.deferredcasterTasks.push_back(task);
 }
 
 void RenderableAtmosphere::update(const UpdateData& data) {
-    _stateMatrix = data.modelTransform.rotation;
-
-    if (_deferredcaster) {
-        _deferredcaster->setTime(data.time.j2000Seconds());
-        glm::dmat4 modelTransform = computeModelTransformMatrix(data.modelTransform);
-        _deferredcaster->setModelTransform(modelTransform);
-        _deferredcaster->update(data);
+    if (_deferredCasterNeedsUpdate) {
+        updateAtmosphereParameters();
+        _deferredCasterNeedsUpdate = false;
     }
+    if (_deferredCasterNeedsCalculation) {
+        _deferredcaster->preCalculateAtmosphereParam();
+        _deferredCasterNeedsCalculation = false;
+    }
+
+    _deferredcaster->setTime(data.time.j2000Seconds());
+    glm::dmat4 modelTransform = computeModelTransformMatrix(data.modelTransform);
+    _deferredcaster->setModelTransform(modelTransform);
+    _deferredcaster->update(data);
 }
 
 void RenderableAtmosphere::updateAtmosphereParameters() {
-    bool executeComputation = true;
+    _mieExtinctionCoeff =
+        _mieScatteringCoeff.value() / _mieScatteringExtinctionPropCoefficient.value();
 
-    if (_sunRadianceIntensity != _sunIntensityP ||
-        _planetGroundRadianceEmittion != _groundRadianceEmittionP ||
-        _sunFollowingCameraEnabled != _sunFollowingCameraEnabledP ||
-        _hardShadows != _hardShadowsEnabledP) {
-        executeComputation = false;
-    }
+    _deferredcaster->setAtmosphereRadius(_planetRadius + _atmosphereHeight);
+    _deferredcaster->setPlanetRadius(_planetRadius);
+    _deferredcaster->setPlanetAverageGroundReflectance(_groundAverageReflectance);
+    _deferredcaster->setPlanetGroundRadianceEmittion(_groundRadianceEmission);
+    _deferredcaster->setRayleighHeightScale(_rayleighHeightScale);
+    _deferredcaster->enableOzone(_ozoneEnabled);
+    _deferredcaster->setOzoneHeightScale(_ozoneHeightScale);
+    _deferredcaster->setMieHeightScale(_mieHeightScale);
+    _deferredcaster->setMiePhaseConstant(_miePhaseConstant);
+    _deferredcaster->setSunRadianceIntensity(_sunIntensity);
+    _deferredcaster->setRayleighScatteringCoefficients(_rayleighScatteringCoeff);
+    _deferredcaster->setOzoneExtinctionCoefficients(_ozoneCoeff);
+    _deferredcaster->setMieScatteringCoefficients(_mieScatteringCoeff);
+    _deferredcaster->setMieExtinctionCoefficients(_mieExtinctionCoeff);
+    _deferredcaster->enableSunFollowing(_sunFollowingCameraEnabled);
+    //_deferredcaster->setEllipsoidRadii(_ellipsoid.radii());
 
-    _atmosphereRadius               = _atmospherePlanetRadius + _atmosphereHeightP;
-    _planetAverageGroundReflectance = _groundAverageReflectanceP;
-    _planetGroundRadianceEmittion   = _groundRadianceEmittionP;
-    _rayleighHeightScale            = _rayleighHeightScaleP;
-    _rayleighScatteringCoeff = glm::vec3(
-        _rayleighScatteringCoeffXP * 0.001f,
-        _rayleighScatteringCoeffYP * 0.001f,
-        _rayleighScatteringCoeffZP * 0.001f
-    );
-    _ozoneLayerEnabled    = _ozoneEnabledP;
-    _ozoneHeightScale     = _ozoneHeightScaleP;
-    _ozoneExtinctionCoeff = glm::vec3(_ozoneCoeffXP.value() * 0.00001f,
-        _ozoneCoeffYP.value() * 0.00001f,
-        _ozoneCoeffZP.value() * 0.00001f);
-    _mieHeightScale     = _mieHeightScaleP;
-    _mieScatteringCoeff = glm::vec3(
-        _mieScatteringCoeffXP * 0.001f,
-        _mieScatteringCoeffYP * 0.001f,
-        _mieScatteringCoeffZP * 0.001f
-    );
-    _mieExtinctionCoeff         = _mieScatteringCoeff * (1.0f /
-                            static_cast<float>(_mieScatteringExtinctionPropCoefficientP));
-    _miePhaseConstant           = _mieAsymmetricFactorGP;
-    _sunRadianceIntensity       = _sunIntensityP;
-    _sunFollowingCameraEnabled  = _sunFollowingCameraEnabledP;
-    _hardShadows                = _hardShadowsEnabledP;
-
-
-    if (_deferredcaster) {
-        _deferredcaster->setAtmosphereRadius(_atmosphereRadius);
-        _deferredcaster->setPlanetRadius(_atmospherePlanetRadius);
-        _deferredcaster->setPlanetAverageGroundReflectance(
-            _planetAverageGroundReflectance
-        );
-        _deferredcaster->setPlanetGroundRadianceEmittion(_planetGroundRadianceEmittion);
-        _deferredcaster->setRayleighHeightScale(_rayleighHeightScale);
-        _deferredcaster->enableOzone(_ozoneLayerEnabled);
-        _deferredcaster->setOzoneHeightScale(_ozoneHeightScale);
-        _deferredcaster->setMieHeightScale(_mieHeightScale);
-        _deferredcaster->setMiePhaseConstant(_miePhaseConstant);
-        _deferredcaster->setSunRadianceIntensity(_sunRadianceIntensity);
-        _deferredcaster->setRayleighScatteringCoefficients(_rayleighScatteringCoeff);
-        _deferredcaster->setOzoneExtinctionCoefficients(_ozoneExtinctionCoeff);
-        _deferredcaster->setMieScatteringCoefficients(_mieScatteringCoeff);
-        _deferredcaster->setMieExtinctionCoefficients(_mieExtinctionCoeff);
-        _deferredcaster->enableSunFollowing(_sunFollowingCameraEnabled);
-        //_deferredcaster->setEllipsoidRadii(_ellipsoid.radii());
-
-        if (_shadowEnabled) {
-            _deferredcaster->setHardShadows(_hardShadows);
-        }
-
-        if (executeComputation) {
-            _deferredcaster->preCalculateAtmosphereParam();
-        }
+    if (_shadowEnabled) {
+        _deferredcaster->setHardShadows(_hardShadowsEnabled);
     }
 }
 
diff --git a/modules/atmosphere/rendering/renderableatmosphere.h b/modules/atmosphere/rendering/renderableatmosphere.h
index 685ddf3830..7fe0cbb477 100644
--- a/modules/atmosphere/rendering/renderableatmosphere.h
+++ b/modules/atmosphere/rendering/renderableatmosphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,6 +31,7 @@
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/vector/vec3property.h>
 #include <openspace/util/updatestructures.h>
 
 #include <ghoul/opengl/textureunit.h>
@@ -42,7 +43,7 @@
 namespace ghoul::opengl {
     class ProgramObject;
     class Texture;
-}
+} // namespace ghoul::opengl
 
 namespace openspace {
 
@@ -86,46 +87,26 @@ private:
     glm::dmat4 computeModelTransformMatrix(const openspace::TransformData& transformData);
     void updateAtmosphereParameters();
 
-    properties::FloatProperty _atmosphereHeightP;
-    properties::FloatProperty _groundAverageReflectanceP;
-    properties::FloatProperty _groundRadianceEmittionP;
-    properties::FloatProperty _rayleighHeightScaleP;
-    properties::FloatProperty _rayleighScatteringCoeffXP;
-    properties::FloatProperty _rayleighScatteringCoeffYP;
-    properties::FloatProperty _rayleighScatteringCoeffZP;
-    properties::BoolProperty  _ozoneEnabledP;
-    properties::FloatProperty _ozoneHeightScaleP;
-    properties::FloatProperty _ozoneCoeffXP;
-    properties::FloatProperty _ozoneCoeffYP;
-    properties::FloatProperty _ozoneCoeffZP;
-    properties::FloatProperty _mieHeightScaleP;
-    properties::FloatProperty _mieScatteringCoeffXP;
-    properties::FloatProperty _mieScatteringCoeffYP;
-    properties::FloatProperty _mieScatteringCoeffZP;
-    properties::FloatProperty _mieScatteringExtinctionPropCoefficientP;
-    properties::FloatProperty _mieAsymmetricFactorGP;
-    properties::FloatProperty _sunIntensityP;
-    properties::BoolProperty  _sunFollowingCameraEnabledP;
-    properties::BoolProperty  _hardShadowsEnabledP;
+    properties::FloatProperty _atmosphereHeight;
+    properties::FloatProperty _groundAverageReflectance;
+    properties::FloatProperty _groundRadianceEmission;
+    properties::FloatProperty _rayleighHeightScale;
+    properties::Vec3Property _rayleighScatteringCoeff;
+    properties::BoolProperty _ozoneEnabled;
+    properties::FloatProperty _ozoneHeightScale;
+    properties::Vec3Property _ozoneCoeff;
+    properties::FloatProperty _mieHeightScale;
+    properties::Vec3Property _mieScatteringCoeff;
+    properties::FloatProperty _mieScatteringExtinctionPropCoefficient;
+    properties::FloatProperty _miePhaseConstant;
+    properties::FloatProperty _sunIntensity;
+    properties::BoolProperty _sunFollowingCameraEnabled;
+    properties::BoolProperty _hardShadowsEnabled;
 
-    bool _atmosphereEnabled = false;
-    bool _ozoneLayerEnabled = false;
-    bool _sunFollowingCameraEnabled = false;
-    float _atmosphereRadius = 0.f;
-    float _atmospherePlanetRadius = 0.f;
-    float _planetAverageGroundReflectance = 0.f;
-    float _planetGroundRadianceEmittion = 0.f;
-    float _rayleighHeightScale = 0.f;
-    float _ozoneHeightScale = 0.f;
-    float _mieHeightScale = 0.f;
-    float _miePhaseConstant = 0.f;
-    float _sunRadianceIntensity = 5.f;
+    float _planetRadius = 0.f;
     float _mieScattExtPropCoefProp = 1.f;
 
     glm::vec3 _mieExtinctionCoeff = glm::vec3(0.f);
-    glm::vec3 _rayleighScatteringCoeff = glm::vec3(0.f);
-    glm::vec3 _ozoneExtinctionCoeff = glm::vec3(0.f);
-    glm::vec3 _mieScatteringCoeff = glm::dvec3(0.f);
 
     // Atmosphere Debug
     bool _saveCalculationsToTexture = false;
@@ -134,9 +115,8 @@ private:
     std::unique_ptr<AtmosphereDeferredcaster> _deferredcaster;
 
     bool _shadowEnabled = false;
-    bool _hardShadows = false;
-
-    glm::dmat3 _stateMatrix = glm::dmat3(1.0);
+    bool _deferredCasterNeedsUpdate = false;
+    bool _deferredCasterNeedsCalculation = false;
 
     std::vector<ShadowConfiguration> _shadowConfArray;
 };
diff --git a/modules/atmosphere/shaders/atmosphere_common.glsl b/modules/atmosphere/shaders/atmosphere_common.glsl
index c806dfab8e..fd0ca1eb2f 100644
--- a/modules/atmosphere/shaders/atmosphere_common.glsl
+++ b/modules/atmosphere/shaders/atmosphere_common.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -109,7 +109,7 @@ float invSamplesNu = 1.0f / float(SAMPLES_NU);
 float RtMinusRg = float(Rt - Rg);
 float invRtMinusRg = 1.0f / RtMinusRg;
 
-float opticalDepth(const float localH, const float r, const float mu, const float d) {
+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);
@@ -120,7 +120,7 @@ float opticalDepth(const float localH, const float r, const float mu, const floa
   return sqrt((6.2831*H)*r) * exp((Rg-r)*invH) * (x + dot(y, vec2(1.0, -1.0)));
 }
 
-vec3 analyticTransmittance(const float r, const float mu, const float d) {
+vec3 analyticTransmittance(float r, float mu, float d) {
   if (ozoneLayerEnabled) {
     return exp(-betaRayleigh * opticalDepth(HR, r, mu, d) -
              betaOzoneExtinction * (0.0000006) * opticalDepth(HO, r, mu, d) -
@@ -132,7 +132,7 @@ vec3 analyticTransmittance(const float r, const float mu, const float d) {
   }
 }
 
-vec3 irradiance(sampler2D sampler, const float r, const float muSun) {
+vec3 irradiance(sampler2D sampler, float r, float muSun) {
   float u_r     = (r - Rg) * invRtMinusRg;
   float u_muSun = (muSun + 0.2) / (1.0 + 0.2);
   return texture(sampler, vec2(u_muSun, u_r)).rgb;
@@ -152,7 +152,7 @@ vec3 irradiance(sampler2D sampler, const float r, const float muSun) {
 // 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(const float r, const float mu) {
+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,
@@ -225,7 +225,7 @@ void unmappingRAndMuSunIrradiance(out float r, out float muSun) {
 // 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).
-void unmappingMuMuSunNu(const float r, vec4 dhdH, out float mu, out float muSun, out float nu) {
+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;
@@ -277,7 +277,7 @@ void unmappingMuMuSunNu(const float r, vec4 dhdH, out float mu, out float muSun,
 // 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(const float r, const float mu) {
+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);
@@ -293,7 +293,7 @@ vec3 transmittanceLUT(const float r, const float mu) {
 // 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(const float r, const float mu, const float d) {
+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).
@@ -326,7 +326,7 @@ vec3 transmittance(const float r, const float mu, const float d) {
 // -- 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(const float mu) {
+float rayleighPhaseFunction(float mu) {
     //return (3.0f / (16.0f * M_PI)) * (1.0f + mu * mu);
     return 0.0596831036 * (1.0f + mu * mu);
 }
@@ -334,7 +334,7 @@ float rayleighPhaseFunction(const float 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(const float mu) {
+float miePhaseFunction(float mu) {
   //return (3.0f / (8.0f * M_PI)) * 
   //      ( ( (1.0f - (mieG * mieG) ) * (1.0f + mu * mu) ) / 
   //      ( (2.0f + mieG * mieG) *
@@ -356,9 +356,7 @@ float miePhaseFunction(const float mu) {
 // 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, const float r, const float mu, 
-                const float muSun, const float nu)
-{
+vec4 texture4D(sampler3D table, float r, float mu, float muSun, float nu) {
   //float Rg2    = Rg * Rg;
   //float Rt2    = Rt * Rt;
   float r2     = r * r;
@@ -403,7 +401,7 @@ vec4 texture4D(sampler3D table, const float r, const float mu,
 // 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, const float muSun, const float r) {
+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;
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
index 3fef8ff7a7..6e7872b129 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -106,12 +106,13 @@ uniform ShadowRenderingStruct shadowDataArray[numberOfShadows];
 uniform int shadows;
 uniform bool hardShadows;
 
-vec4 butterworthFunc(const float d, const float r, const float n) {
+vec4 butterworthFunc(float d, float r, float n) {
     return vec4(vec3(sqrt(r/(r + pow(d, 2*n)))), 1.0);    
 }
 
-vec4 calcShadow(const ShadowRenderingStruct shadowInfoArray[numberOfShadows], const dvec3 position,
-                const bool ground) {
+vec4 calcShadow(ShadowRenderingStruct shadowInfoArray[numberOfShadows], dvec3 position,
+                bool ground)
+{
     if (shadowInfoArray[0].isShadowing) {
         dvec3 pc = shadowInfoArray[0].casterPositionVec - position;
         dvec3 sc_norm = shadowInfoArray[0].sourceCasterVec;
@@ -181,7 +182,7 @@ struct dRay {
  *               intersection of the ray with atmosphere when the eye position
  *               is inside atmosphere.
  */
-bool dAtmosphereIntersection(const dvec3 planetPosition, const dRay ray, const double atmRadius,
+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);
@@ -281,10 +282,10 @@ void dCalculateRayRenderableGlobe(out dRay ray,
  * calculating the reflectance R[L].
  */
 vec3 inscatterRadiance(inout vec3 x, inout float t, inout float irradianceFactor,
-                       const vec3 v, const vec3 s, out float r, out float mu,
-                       out vec3 attenuation, const vec3 fragPosObj, out bool groundHit,
-                       const double maxLength, const double pixelDepth,
-                       const vec4 spaceColor, const float sunIntensity) {
+                       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.004f; // precision const from Brunetton
 
@@ -446,10 +447,10 @@ vec3 inscatterRadiance(inout vec3 x, inout float t, inout float irradianceFactor
  * mu := cosine of the zenith view angle
  * attenuationXtoX0 := transmittance T(x,x0)
  */
-vec3 groundColor(const vec3 x, const float t, const vec3 v, const vec3 s, const float r,
-                 const float mu, const vec3 attenuationXtoX0, const vec4 groundColor, 
-                 const vec3 normal, const float irradianceFactor,
-                 const float waterReflectance, const float sunIntensity)
+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 reflectedRadiance = vec3(0.0f);
 
@@ -524,8 +525,8 @@ vec3 groundColor(const vec3 x, const float t, const vec3 v, const vec3 s, const
  * mu := cosine of the zenith view angle
  * attenuation := transmittance T(x,x0)
  */
-vec3 sunColor(const vec3 x, const float t, const vec3 v, const vec3 s, const float r,
-              const float mu, const float irradianceFactor) {
+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
@@ -694,4 +695,3 @@ void main() {
         renderTarget = bColor;
     }
 }
-
diff --git a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
index f211ee9b42..cbe4d8663f 100644
--- a/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
+++ b/modules/atmosphere/shaders/atmosphere_deferred_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,8 +29,7 @@ layout(location = 0) in vec4 in_position;
 out vec3 interpolatedNDCPos;
 out vec2 texCoord;
 
-void main()
-{
+void main() {
     texCoord = 0.5 + in_position.xy * 0.5;
     interpolatedNDCPos       = in_position.xyz;
     gl_Position              = in_position;
diff --git a/modules/atmosphere/shaders/deltaE_calc_fs.glsl b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
index 6ce7053b56..fe0163b6b2 100644
--- a/modules/atmosphere/shaders/deltaE_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaE_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -21,12 +21,13 @@
  * 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;
 
-void main(void) {   
+void main() {   
   renderTableColor = vec4(0.0, 0.0, 0.0, 1.0);
 }
diff --git a/modules/atmosphere/shaders/deltaE_calc_vs.glsl b/modules/atmosphere/shaders/deltaE_calc_vs.glsl
index fad2402e2a..d5a1e43e38 100644
--- a/modules/atmosphere/shaders/deltaE_calc_vs.glsl
+++ b/modules/atmosphere/shaders/deltaE_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
index d39e6e2e15..badfa8934d 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -97,7 +97,7 @@ 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 ) {
+  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;
@@ -133,7 +133,7 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
       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 ) {
+    for (int phi_i = 0; phi_i < INSCATTER_SPHERICAL_INTEGRAL_SAMPLES; ++phi_i) {
       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
@@ -190,7 +190,7 @@ void inscatter(float r, float mu, float muSun, float nu, inout vec3 radianceJ) {
   }
 }
 
-void main(void) {
+void main() {
   // cosine variables to access deltaS textures
   float mu, muSun, nu;
   // InScattering Radiance to be calculated at
diff --git a/modules/atmosphere/shaders/deltaJ_calc_gs.glsl b/modules/atmosphere/shaders/deltaJ_calc_gs.glsl
index 2756507b85..aea1c7db4d 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_gs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,13 +29,11 @@ uniform int layer;
 layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
 
-void main()
-{
-    int n;
-    for (n = 0; n < gl_in.length(); ++n) {
+void main() {
+    for (int n = 0; n < gl_in.length(); ++n) {
         gl_Position = gl_in[n].gl_Position;
         gl_Layer    = layer;
         EmitVertex();
     }
     EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/modules/atmosphere/shaders/deltaJ_calc_vs.glsl b/modules/atmosphere/shaders/deltaJ_calc_vs.glsl
index fad2402e2a..d5a1e43e38 100644
--- a/modules/atmosphere/shaders/deltaJ_calc_vs.glsl
+++ b/modules/atmosphere/shaders/deltaJ_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/atmosphere/shaders/deltaS_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
index 055888f2d5..d337cb18bf 100644
--- a/modules/atmosphere/shaders/deltaS_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,7 +33,7 @@ uniform int layer;
 uniform sampler3D deltaSRTexture;
 uniform sampler3D deltaSMTexture;
 
-void main(void) {
+void main() {
   // First we convert the window's fragment coordinate to
   // texel coordinates
   vec3 rst = vec3(gl_FragCoord.xy, float(layer) + 0.5f) /
diff --git a/modules/atmosphere/shaders/deltaS_calc_gs.glsl b/modules/atmosphere/shaders/deltaS_calc_gs.glsl
index 2756507b85..aea1c7db4d 100644
--- a/modules/atmosphere/shaders/deltaS_calc_gs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,13 +29,11 @@ uniform int layer;
 layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
 
-void main()
-{
-    int n;
-    for (n = 0; n < gl_in.length(); ++n) {
+void main() {
+    for (int n = 0; n < gl_in.length(); ++n) {
         gl_Position = gl_in[n].gl_Position;
         gl_Layer    = layer;
         EmitVertex();
     }
     EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/modules/atmosphere/shaders/deltaS_calc_vs.glsl b/modules/atmosphere/shaders/deltaS_calc_vs.glsl
index fad2402e2a..1ca953fe3c 100644
--- a/modules/atmosphere/shaders/deltaS_calc_vs.glsl
+++ b/modules/atmosphere/shaders/deltaS_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,4 +28,4 @@ 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_sup_calc_fs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
index bc32a189e5..31e6b6670f 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,7 +32,7 @@ uniform int layer;
 
 uniform sampler3D deltaSTexture;
 
-void main(void) {
+void main() {
     float x = gl_FragCoord.x - 0.5f;
     float y = gl_FragCoord.y - 0.5f;
 
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl
index 61f1cd1805..7cccacb76a 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,13 +29,11 @@ uniform int layer;
 layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
 
-void main()
-{
-    int n;
-    for (n = 0; n < gl_in.length(); ++n) {
+void main() {
+    for (int n = 0; n < gl_in.length(); ++n) {
         gl_Position = gl_in[n].gl_Position;
         gl_Layer    = layer;
         EmitVertex();
     }
     EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl b/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl
index 74c77c3837..deb9073c8f 100644
--- a/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl
+++ b/modules/atmosphere/shaders/deltaS_sup_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,4 +28,4 @@ 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/inScattering_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
index 6201fc1acb..be7281bda3 100644
--- a/modules/atmosphere/shaders/inScattering_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,8 +33,8 @@ uniform vec4 dhdH;
 
 //uniform sampler2D transmittanceTexture;
 
-void integrand(const float r, const float mu, const float muSun, const float nu, 
-                const 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
@@ -77,8 +77,7 @@ void integrand(const float r, const float mu, const float muSun, const float nu,
   }
 }
 
-void inscatter(const float r, const float mu, const float muSun, const float nu,
-               out vec3 S_R, out vec3 S_M) {
+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
@@ -108,7 +107,7 @@ void inscatter(const float r, const float mu, const float muSun, const float nu,
   S_M *= betaMieScattering * (rayDist / (2.0f * float(INSCATTER_INTEGRAL_SAMPLES)));
 }
 
-void main(void) {
+void main() {
   vec3 S_R; // First Order Rayleigh InScattering 
   vec3 S_M; // First Order Mie InScattering
   float mu, muSun, nu; // parametrization angles
diff --git a/modules/atmosphere/shaders/inScattering_calc_gs.glsl b/modules/atmosphere/shaders/inScattering_calc_gs.glsl
index 5bdbacc9d9..823cd6a71e 100644
--- a/modules/atmosphere/shaders/inScattering_calc_gs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,13 +29,11 @@ uniform int layer;
 layout (triangles) in;
 layout (triangle_strip, max_vertices=3) out;
 
-void main()
-{
-    int n;
-    for (n = 0; n < gl_in.length(); ++n) {
+void main() {
+    for (int n = 0; n < gl_in.length(); ++n) {
         gl_Position = gl_in[n].gl_Position;
         gl_Layer    = layer;
         EmitVertex();
     }
     EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/modules/atmosphere/shaders/inScattering_calc_vs.glsl b/modules/atmosphere/shaders/inScattering_calc_vs.glsl
index fad2402e2a..1ca953fe3c 100644
--- a/modules/atmosphere/shaders/inScattering_calc_vs.glsl
+++ b/modules/atmosphere/shaders/inScattering_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,4 +28,4 @@ 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/inScattering_sup_calc_fs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
index 8bb50ef4bf..81377100bc 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,7 +35,7 @@ uniform vec4 dhdH;
 uniform sampler3D deltaJTexture;
 
 // The integrand here is the f(y) of the trapezoidal rule:
-vec3 integrand(const float r, const float mu, const float muSun, const float nu, const float dist) {
+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);
   // r_i can be found using the dot product:
@@ -68,7 +68,7 @@ vec3 inscatter(float r, float mu, float muSun, float nu) {
   return inScatteringRadiance;
 }
 
-void main(void) {
+void main() {
   float mu = 0.0f, muSunun = 0.0f, nu = 0.0f;
   // Unmapping the variables from texture texels coordinates
   // to mapped coordinates
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl
index 61f1cd1805..7cccacb76a 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,13 +29,11 @@ uniform int layer;
 layout (triangles) in;
 layout (triangle_strip, max_vertices = 3) out;
 
-void main()
-{
-    int n;
-    for (n = 0; n < gl_in.length(); ++n) {
+void main() {
+    for (int n = 0; n < gl_in.length(); ++n) {
         gl_Position = gl_in[n].gl_Position;
         gl_Layer    = layer;
         EmitVertex();
     }
     EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl b/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl
index 74c77c3837..deb9073c8f 100644
--- a/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl
+++ b/modules/atmosphere/shaders/inScattering_sup_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,4 +28,4 @@ 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/irradiance_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
index 4891fce05b..94ea44c834 100644
--- a/modules/atmosphere/shaders/irradiance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,7 +29,7 @@ out vec4 renderTableColor;
 
 //uniform sampler2D transmittanceTexture;
 
-void main(void) {
+void main() {
   float muSun, r;
   unmappingRAndMuSun(r, muSun);
   // We are calculating the Irradiance for L0, i.e.,
diff --git a/modules/atmosphere/shaders/irradiance_calc_vs.glsl b/modules/atmosphere/shaders/irradiance_calc_vs.glsl
index fad2402e2a..1ca953fe3c 100644
--- a/modules/atmosphere/shaders/irradiance_calc_vs.glsl
+++ b/modules/atmosphere/shaders/irradiance_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,4 +28,4 @@ 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/irradiance_final_fs.glsl b/modules/atmosphere/shaders/irradiance_final_fs.glsl
index 64b0a547e5..f21d74bdba 100644
--- a/modules/atmosphere/shaders/irradiance_final_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_final_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,7 +30,7 @@ out vec4 renderTableColor;
 
 uniform sampler2D deltaETexture;
 
-void main(void) {   
+void main() {   
   vec2 uv = gl_FragCoord.xy / vec2(OTHER_TEXTURES_W, OTHER_TEXTURES_H);
 
   // Update texture E with E plus deltaE textures.
diff --git a/modules/atmosphere/shaders/irradiance_final_vs.glsl b/modules/atmosphere/shaders/irradiance_final_vs.glsl
index fd0c83d4cb..1ca953fe3c 100644
--- a/modules/atmosphere/shaders/irradiance_final_vs.glsl
+++ b/modules/atmosphere/shaders/irradiance_final_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
index 07ba931806..5ac81a7406 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -39,8 +39,7 @@ const float stepTheta = M_PI / (2.0f * float(IRRADIANCE_INTEGRAL_SAMPLES));
 uniform sampler3D deltaSRTexture;
 uniform sampler3D deltaSMTexture;
 
-void main(void) {
-  
+void main() {
   float r     = 0.0f;
   float muSun = 0.0f;
   // Unmapping the variables from texture texels coordinates
diff --git a/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl b/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl
index fad2402e2a..1ca953fe3c 100644
--- a/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl
+++ b/modules/atmosphere/shaders/irradiance_sup_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,4 +28,4 @@ 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/transmittance_calc_fs.glsl b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
index 3413b91e41..0c1dddd0ff 100644
--- a/modules/atmosphere/shaders/transmittance_calc_fs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,7 +35,7 @@ out vec4 renderTableColor;
 // 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.
-float opticalDepth(const float r, const float mu, const float H) {    
+float opticalDepth(float r, float mu, float H) {    
   float r2 = r*r;
   // Is ray below horizon? The transmittance table will have only
   // the values for transmittance starting at r (x) until the
@@ -71,9 +71,8 @@ float opticalDepth(const float r, const float mu, const float H) {
 }
 
 
-void main(void) {
+void main() {
   float r, muSun;    
-
   unmappingRAndMu(r, muSun);
   
   vec3 opDepth = vec3(0.0);
@@ -88,5 +87,5 @@ void main(void) {
     betaRayleigh * opticalDepth(r, muSun, HR);
   }
   
-  renderTableColor = vec4( exp( -opDepth ), 0.0f );
+  renderTableColor = vec4(exp(-opDepth), 0.0f);
 }
diff --git a/modules/atmosphere/shaders/transmittance_calc_vs.glsl b/modules/atmosphere/shaders/transmittance_calc_vs.glsl
index 0f972cb4e3..aead855d65 100644
--- a/modules/atmosphere/shaders/transmittance_calc_vs.glsl
+++ b/modules/atmosphere/shaders/transmittance_calc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/CMakeLists.txt b/modules/base/CMakeLists.txt
index 386e50515f..521cf3f950 100644
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,127 +25,132 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableboxgrid.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablegrid.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableradialgrid.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablesphericalgrid.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablelabels.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablenodeline.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/timelinerotation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/nonuniformstaticscale.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/timelinetranslation.h
-  
+  dashboard/dashboarditemangle.h
+  dashboard/dashboarditemdate.h
+  dashboard/dashboarditemdistance.h
+  dashboard/dashboarditemframerate.h
+  dashboard/dashboarditemmission.h
+  dashboard/dashboarditemparallelconnection.h
+  dashboard/dashboarditempropertyvalue.h
+  dashboard/dashboarditemsimulationincrement.h
+  dashboard/dashboarditemspacing.h
+  dashboard/dashboarditemtext.h
+  dashboard/dashboarditemvelocity.h
+  lightsource/cameralightsource.h
+  lightsource/scenegraphlightsource.h
+  rendering/modelgeometry.h
+  rendering/multimodelgeometry.h
+  rendering/grids/renderableboxgrid.h
+  rendering/grids/renderablegrid.h
+  rendering/grids/renderableradialgrid.h
+  rendering/grids/renderablesphericalgrid.h
+  rendering/renderablecartesianaxes.h
+  rendering/renderabledisc.h
+  rendering/renderablelabels.h
+  rendering/renderablemodel.h
+  rendering/renderablenodeline.h
+  rendering/renderableplane.h
+  rendering/renderableplaneimagelocal.h
+  rendering/renderableplaneimageonline.h
+  rendering/renderablesphere.h
+  rendering/renderabletrail.h
+  rendering/renderabletrailorbit.h
+  rendering/renderabletrailtrajectory.h
+  rendering/screenspacedashboard.h
+  rendering/screenspaceframebuffer.h
+  rendering/screenspaceimagelocal.h
+  rendering/screenspaceimageonline.h
+  rotation/timelinerotation.h
+  rotation/constantrotation.h
+  rotation/fixedrotation.h
+  rotation/luarotation.h
+  rotation/staticrotation.h
+  scale/luascale.h
+  scale/nonuniformstaticscale.h
+  scale/staticscale.h
+  scale/timedependentscale.h
+  timeframe/timeframeinterval.h
+  timeframe/timeframeunion.h
+  translation/luatranslation.h
+  translation/statictranslation.h
+  translation/timelinetranslation.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemangle.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdate.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemdistance.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemframerate.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemmission.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemparallelconnection.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditempropertyvalue.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemsimulationincrement.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemspacing.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditemvelocity.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/cameralightsource.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/lightsource/scenegraphlightsource.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/modelgeometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multimodelgeometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableboxgrid.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablegrid.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderableradialgrid.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/grids/renderablesphericalgrid.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecartesianaxes.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablelabels.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodel.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablenodeline.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplane.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimagelocal.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneimageonline.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesphere.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrail.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailorbit.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletrailtrajectory.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacedashboard.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceframebuffer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimagelocal.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspaceimageonline.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/timelinerotation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/constantrotation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/fixedrotation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/luarotation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/staticrotation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/luascale.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/nonuniformstaticscale.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/staticscale.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/scale/timedependentscale.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeinterval.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/timeframe/timeframeunion.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/luatranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/statictranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/timelinetranslation.cpp
+  dashboard/dashboarditemangle.cpp
+  dashboard/dashboarditemdate.cpp
+  dashboard/dashboarditemdistance.cpp
+  dashboard/dashboarditemframerate.cpp
+  dashboard/dashboarditemmission.cpp
+  dashboard/dashboarditemparallelconnection.cpp
+  dashboard/dashboarditempropertyvalue.cpp
+  dashboard/dashboarditemsimulationincrement.cpp
+  dashboard/dashboarditemspacing.cpp
+  dashboard/dashboarditemtext.cpp
+  dashboard/dashboarditemvelocity.cpp
+  lightsource/cameralightsource.cpp
+  lightsource/scenegraphlightsource.cpp
+  rendering/modelgeometry.cpp
+  rendering/multimodelgeometry.cpp
+  rendering/grids/renderableboxgrid.cpp
+  rendering/grids/renderablegrid.cpp
+  rendering/grids/renderableradialgrid.cpp
+  rendering/grids/renderablesphericalgrid.cpp
+  rendering/renderablecartesianaxes.cpp
+  rendering/renderabledisc.cpp
+  rendering/renderablelabels.cpp
+  rendering/renderablemodel.cpp
+  rendering/renderablenodeline.cpp
+  rendering/renderableplane.cpp
+  rendering/renderableplaneimagelocal.cpp
+  rendering/renderableplaneimageonline.cpp
+  rendering/renderablesphere.cpp
+  rendering/renderabletrail.cpp
+  rendering/renderabletrailorbit.cpp
+  rendering/renderabletrailtrajectory.cpp
+  rendering/screenspacedashboard.cpp
+  rendering/screenspaceframebuffer.cpp
+  rendering/screenspaceimagelocal.cpp
+  rendering/screenspaceimageonline.cpp
+  rotation/timelinerotation.cpp
+  rotation/constantrotation.cpp
+  rotation/fixedrotation.cpp
+  rotation/luarotation.cpp
+  rotation/staticrotation.cpp
+  scale/luascale.cpp
+  scale/nonuniformstaticscale.cpp
+  scale/staticscale.cpp
+  scale/timedependentscale.cpp
+  timeframe/timeframeinterval.cpp
+  timeframe/timeframeunion.cpp
+  translation/luatranslation.cpp
+  translation/statictranslation.cpp
+  translation/timelinetranslation.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/axes_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/grid_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/imageplane_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/line_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/line_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/model_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderabletrail_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/screenspace_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/sphere_vs.glsl
+  shaders/axes_fs.glsl
+  shaders/axes_vs.glsl
+  shaders/disc_fs.glsl
+  shaders/disc_vs.glsl
+  shaders/grid_vs.glsl
+  shaders/grid_fs.glsl
+  shaders/imageplane_fs.glsl
+  shaders/imageplane_vs.glsl
+  shaders/line_fs.glsl
+  shaders/line_vs.glsl
+  shaders/model_fs.glsl
+  shaders/model_vs.glsl
+  shaders/plane_fs.glsl
+  shaders/plane_vs.glsl
+  shaders/renderabletrail_fs.glsl
+  shaders/renderabletrail_vs.glsl
+  shaders/screenspace_fs.glsl
+  shaders/screenspace_vs.glsl
+  shaders/sphere_fs.glsl
+  shaders/sphere_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/base/basemodule.cpp b/modules/base/basemodule.cpp
index 830d528117..09ef673631 100644
--- a/modules/base/basemodule.cpp
+++ b/modules/base/basemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,6 +33,7 @@
 #include <modules/base/dashboard/dashboarditempropertyvalue.h>
 #include <modules/base/dashboard/dashboarditemsimulationincrement.h>
 #include <modules/base/dashboard/dashboarditemspacing.h>
+#include <modules/base/dashboard/dashboarditemtext.h>
 #include <modules/base/dashboard/dashboarditemvelocity.h>
 #include <modules/base/lightsource/cameralightsource.h>
 #include <modules/base/lightsource/scenegraphlightsource.h>
@@ -41,6 +42,7 @@
 #include <modules/base/rendering/grids/renderableradialgrid.h>
 #include <modules/base/rendering/grids/renderablesphericalgrid.h>
 #include <modules/base/rendering/renderablecartesianaxes.h>
+#include <modules/base/rendering/renderabledisc.h>
 #include <modules/base/rendering/renderablelabels.h>
 #include <modules/base/rendering/renderablemodel.h>
 #include <modules/base/rendering/renderablenodeline.h>
@@ -120,6 +122,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
         "DashboardItemSimulationIncrement"
     );
     fDashboard->registerClass<DashboardItemSpacing>("DashboardItemSpacing");
+    fDashboard->registerClass<DashboardItemText>("DashboardItemText");
     fDashboard->registerClass<DashboardItemVelocity>("DashboardItemVelocity");
 
     auto fRenderable = FactoryManager::ref().factory<Renderable>();
@@ -127,6 +130,7 @@ void BaseModule::internalInitialize(const ghoul::Dictionary&) {
 
     fRenderable->registerClass<RenderableBoxGrid>("RenderableBoxGrid");
     fRenderable->registerClass<RenderableCartesianAxes>("RenderableCartesianAxes");
+    fRenderable->registerClass<RenderableDisc>("RenderableDisc");
     fRenderable->registerClass<RenderableGrid>("RenderableGrid");
     fRenderable->registerClass<RenderableLabels>("RenderableLabels");
     fRenderable->registerClass<RenderableModel>("RenderableModel");
@@ -193,7 +197,6 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         DashboardItemDistance::Documentation(),
         DashboardItemFramerate::Documentation(),
         DashboardItemMission::Documentation(),
-        DashboardItemParallelConnection::Documentation(),
         DashboardItemSimulationIncrement::Documentation(),
         DashboardItemSpacing::Documentation(),
         DashboardItemVelocity::Documentation(),
@@ -205,6 +208,7 @@ std::vector<documentation::Documentation> BaseModule::documentations() const {
         RenderableNodeLine::Documentation(),
         RenderablePlane::Documentation(),
         RenderableRadialGrid::Documentation(),
+        RenderableDisc::Documentation(),
         RenderableSphere::Documentation(),
         RenderableSphericalGrid::Documentation(),
         RenderableTrailOrbit::Documentation(),
diff --git a/modules/base/basemodule.h b/modules/base/basemodule.h
index be3e54889c..b757f837fc 100644
--- a/modules/base/basemodule.h
+++ b/modules/base/basemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/dashboard/dashboarditemangle.cpp b/modules/base/dashboard/dashboarditemangle.cpp
index 6ad0945c11..5034b763dc 100644
--- a/modules/base/dashboard/dashboarditemangle.cpp
+++ b/modules/base/dashboard/dashboarditemangle.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -40,23 +40,6 @@
 #include <ghoul/misc/profiling.h>
 
 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 SourceTypeInfo = {
         "SourceType",
         "Source Type",
@@ -102,82 +85,40 @@ namespace {
         "If a scene graph node is selected as type, this value specifies the name of the "
         "node that is to be used as the destination for computing the angle."
     };
+
+    struct [[codegen::Dictionary(DashboardItemAngle)]] Parameters {
+        enum class Type {
+            Node,
+            Focus,
+            Camera
+        };
+
+        // [[codegen::verbatim(SourceTypeInfo.description)]]
+        std::optional<Type> sourceType;
+        // [[codegen::verbatim(SourceNodeNameInfo.description)]]
+        std::optional<std::string> sourceNodeName;
+        // [[codegen::verbatim(ReferenceTypeInfo.description)]]
+        Type referenceType;
+        // [[codegen::verbatim(ReferenceNodeNameInfo.description)]]
+        std::optional<std::string> referenceNodeName;
+        // [[codegen::verbatim(DestinationTypeInfo.description)]]
+        std::optional<Type> destinationType;
+        // [[codegen::verbatim(DestinationNodeNameInfo.description)]]
+        std::optional<std::string> destinationNodeName;
+    };
+#include "dashboarditemangle_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemAngle::Documentation() {
-    using namespace documentation;
-
-    return {
-        "DashboardItem Angle",
-        "base_dashboarditem_angle",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemAngle"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                SourceTypeInfo.identifier,
-                new StringInListVerifier({
-                    "Node", "Focus", "Camera"
-                }),
-                Optional::Yes,
-                SourceTypeInfo.description
-            },
-            {
-                SourceNodeNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                SourceNodeNameInfo.description
-            },
-            {
-                ReferenceTypeInfo.identifier,
-                new StringInListVerifier({
-                    "Node", "Focus", "Camera"
-                }),
-                Optional::No,
-                ReferenceTypeInfo.description
-            },
-            {
-                ReferenceNodeNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                ReferenceNodeNameInfo.description
-            },
-            {
-                DestinationTypeInfo.identifier,
-                new StringInListVerifier({
-                    "Node", "Focus", "Camera"
-                }),
-                Optional::Yes,
-                DestinationTypeInfo.description
-            },
-            {
-                DestinationNodeNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                DestinationNodeNameInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_angle";
+    return doc;
 }
 
 DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
+    : DashboardTextItem(dictionary)
     , _source{
         properties::OptionProperty(
             SourceTypeInfo,
@@ -202,31 +143,8 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
         properties::StringProperty(DestinationNodeNameInfo),
         nullptr
     }
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemAngle"
-    );
-
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-
-    _fontName.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    _fontSize.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _source.type.addOptions({
         { Type::Node, "Node" },
@@ -238,16 +156,17 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
             properties::Property::Visibility(_source.type == Type::Node)
         );
     });
-    if (dictionary.hasKey(SourceTypeInfo.identifier)) {
-        std::string value = dictionary.value<std::string>(SourceTypeInfo.identifier);
-        if (value == "Node") {
-            _source.type = Type::Node;
-        }
-        else if (value == "Focus") {
-            _source.type = Type::Focus;
-        }
-        else {
-            _source.type = Type::Camera;
+    if (p.sourceType.has_value()) {
+        switch (*p.sourceType) {
+            case Parameters::Type::Node:
+                _source.type = Type::Node;
+                break;
+            case Parameters::Type::Focus:
+                _source.type = Type::Focus;
+                break;
+            default:
+                _source.type = Type::Camera;
+                break;
         }
     }
     else {
@@ -257,10 +176,8 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
 
     _source.nodeName.onChange([this]() { _source.node = nullptr; });
     if (_source.type == Type::Node) {
-        if (dictionary.hasKey(SourceNodeNameInfo.identifier)) {
-            _source.nodeName = dictionary.value<std::string>(
-                SourceNodeNameInfo.identifier
-            );
+        if (p.sourceNodeName.has_value()) {
+            _source.nodeName = *p.sourceNodeName;
         }
         else {
             LERRORC(
@@ -282,24 +199,23 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
             properties::Property::Visibility(_reference.type == Type::Node)
         );
     });
-    std::string value = dictionary.value<std::string>(ReferenceTypeInfo.identifier);
-    if (value == "Node") {
-        _reference.type = Type::Node;
-    }
-    else if (value == "Focus") {
-        _reference.type = Type::Focus;
-    }
-    else {
-        _reference.type = Type::Camera;
+    switch (p.referenceType) {
+        case Parameters::Type::Node:
+            _reference.type = Type::Node;
+            break;
+        case Parameters::Type::Focus:
+            _reference.type = Type::Focus;
+            break;
+        default:
+            _reference.type = Type::Camera;
+            break;
     }
     addProperty(_reference.type);
 
     _reference.nodeName.onChange([this]() { _reference.node = nullptr; });
     if (_reference.type == Type::Node) {
-        if (dictionary.hasKey(ReferenceNodeNameInfo.identifier)) {
-            _reference.nodeName = dictionary.value<std::string>(
-                ReferenceNodeNameInfo.identifier
-            );
+        if (p.referenceNodeName.has_value()) {
+            _reference.nodeName = *p.referenceNodeName;
         }
         else {
             LERRORC(
@@ -320,16 +236,17 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
             properties::Property::Visibility(_source.type == Type::Node)
         );
     });
-    if (dictionary.hasKey(DestinationTypeInfo.identifier)) {
-        std::string type = dictionary.value<std::string>(DestinationTypeInfo.identifier);
-        if (type == "Node") {
-            _destination.type = Type::Node;
-        }
-        else if (type == "Focus") {
-            _destination.type = Type::Focus;
-        }
-        else {
-            _destination.type = Type::Camera;
+    if (p.destinationType.has_value()) {
+        switch (*p.destinationType) {
+            case Parameters::Type::Node:
+                _destination.type = Type::Node;
+                break;
+            case Parameters::Type::Focus:
+                _destination.type = Type::Focus;
+                break;
+            default:
+                _destination.type = Type::Camera;
+                break;
         }
     }
     else {
@@ -338,10 +255,8 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
     addProperty(_destination.type);
     _destination.nodeName.onChange([this]() { _destination.node = nullptr; });
     if (_destination.type == Type::Node) {
-        if (dictionary.hasKey(DestinationNodeNameInfo.identifier)) {
-            _destination.nodeName = dictionary.value<std::string>(
-                DestinationNodeNameInfo.identifier
-            );
+        if (p.destinationNodeName.has_value()) {
+            _destination.nodeName = *p.destinationNodeName;
         }
         else {
             LERRORC(
@@ -352,7 +267,6 @@ DashboardItemAngle::DashboardItemAngle(const ghoul::Dictionary& dictionary)
     }
     addProperty(_destination.nodeName);
 
-    _font = global::fontManager->font(_fontName, _fontSize);
     _buffer.resize(128);
 }
 
@@ -402,7 +316,7 @@ void DashboardItemAngle::render(glm::vec2& penPosition) {
     const glm::dvec3 a = referenceInfo.first - sourceInfo.first;
     const glm::dvec3 b = destinationInfo.first - sourceInfo.first;
 
-    std::fill(_buffer.begin(), _buffer.end(), 0);
+    std::fill(_buffer.begin(), _buffer.end(), char(0));
     if (glm::length(a) == 0.0 || glm::length(b) == 0) {
         char* end = fmt::format_to(
             _buffer.data(),
diff --git a/modules/base/dashboard/dashboarditemangle.h b/modules/base/dashboard/dashboarditemangle.h
index 111f1a8a79..b6d234d862 100644
--- a/modules/base/dashboard/dashboarditemangle.h
+++ b/modules/base/dashboard/dashboarditemangle.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,18 +29,15 @@
 
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
 #include <utility>
 
-namespace ghoul::fontrendering { class Font; }
-
 namespace openspace {
 
 class SceneGraphNode;
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemAngle : public DashboardItem {
+class DashboardItemAngle : public DashboardTextItem {
 public:
     DashboardItemAngle(const ghoul::Dictionary& dictionary);
     virtual ~DashboardItemAngle() = default;
@@ -70,11 +67,7 @@ private:
     Component _reference;
     Component _destination;
 
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
-
     std::vector<char> _buffer;
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
 };
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemdate.cpp b/modules/base/dashboard/dashboarditemdate.cpp
index 990df34dda..0067cbbf18 100644
--- a/modules/base/dashboard/dashboarditemdate.cpp
+++ b/modules/base/dashboard/dashboarditemdate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,122 +27,75 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/engine/globals.h>
+#include <openspace/util/spicemanager.h>
 #include <openspace/util/timemanager.h>
 #include <ghoul/font/font.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 
 namespace {
-    constexpr const char* KeyFontMono = "Mono";
-    constexpr const float DefaultFontSize = 15.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 FormatStringInfo = {
+        "FormatString",
+        "Format String",
+        "The format text describing how this dashboard item renders it's text. This text "
+        "must contain exactly one {} which is a placeholder that will contain the date"
     };
 
-    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 TimeFormatInfo = {
+        "TimeFormat",
+        "Time Format",
+        "The format string used for formatting the date/time before being passed to the "
+        "string in FormatString. See "
+        "https://naif.jpl.nasa.gov/pub/naif/toolkit_docs/C/cspice/timout_c.html for full "
+        "information about how to structure this format"
     };
+
+    struct [[codegen::Dictionary(DashboardItemDate)]] Parameters {
+        // [[codegen::verbatim(FormatStringInfo.description)]]
+        std::optional<std::string> formatString;
+        
+        // [[codegen::verbatim(TimeFormatInfo.description)]]
+        std::optional<std::string> timeFormat;
+    };
+#include "dashboarditemdate_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemDate::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Date",
-        "base_dashboarditem_date",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemDate"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_date";
+    return doc;
 }
 
 DashboardItemDate::DashboardItemDate(const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
+    : DashboardTextItem(dictionary, 15.f)
+    , _formatString(FormatStringInfo, "Date: {} UTC")
+    , _timeFormat(TimeFormatInfo, "YYYY MON DDTHR:MN:SC.### ::RND")
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemDate"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    _fontName.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
+    _formatString = p.formatString.value_or(_formatString);
+    addProperty(_formatString);
 
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-    _fontSize.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
-
-    _font = global::fontManager->font(_fontName, _fontSize);
+    _timeFormat = p.timeFormat.value_or(_timeFormat);
+    addProperty(_timeFormat);
 }
 
 void DashboardItemDate::render(glm::vec2& penPosition) {
-//    penPosition.y -= _font->height();
-//    std::string timestring = global::timeManager.time().UTC();
-//   
-//    std::replace(timestring.begin(), timestring.end(), 'T', ' ');
-//    timestring.replace(timestring.begin() + 20, timestring.end(), "");
-//    double deltatime = global::timeManager.deltaTime();
-//   std::string DeltaStringEnd = "";
-//    if (deltatime > 60) {
-//        deltatime = deltatime / 60;
-//        DeltaStringEnd = " MINUTES / SECOND"; 
-//    }
-//    else {
-//        DeltaStringEnd = " SECONDS / SECOND";
-//    }
-//   if (deltatime != 0) {
-//        timestring += '\n';
-//        timestring += std::to_string(int(deltatime)) + DeltaStringEnd;
-//    }
     ZoneScoped
-    
+
     std::string time = SpiceManager::ref().dateFromEphemerisTime(
         global::timeManager->time().j2000Seconds(),
         _timeFormat.value().c_str()
     );
-    try{
-        RenderFont(
-            *_font,
-            penPosition,
-            fmt::format(_formatString.value().c_str(), time)
-        );
+
+    try {
+        RenderFont(*_font, penPosition, fmt::format(_formatString.value().c_str(), time));
     }
-    catch(const fmt::format_error&){
+    catch (const fmt::format_error&) {
         LERRORC("DashboardItemDate", "Illegal format string");
     }
     penPosition.y -= _font->height();
diff --git a/modules/base/dashboard/dashboarditemdate.h b/modules/base/dashboard/dashboarditemdate.h
index 139b03477a..602de7b2c9 100644
--- a/modules/base/dashboard/dashboarditemdate.h
+++ b/modules/base/dashboard/dashboarditemdate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,15 +28,12 @@
 #include <openspace/rendering/dashboarditem.h>
 
 #include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-
-namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemDate : public DashboardItem {
+class DashboardItemDate : public DashboardTextItem {
 public:
     DashboardItemDate(const ghoul::Dictionary& dictionary);
     ~DashboardItemDate() = default;
@@ -48,10 +45,8 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
+    properties::StringProperty _formatString;
+    properties::StringProperty _timeFormat;
 };
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemdistance.cpp b/modules/base/dashboard/dashboarditemdistance.cpp
index e8f83a77bd..bcca68c879 100644
--- a/modules/base/dashboard/dashboarditemdistance.cpp
+++ b/modules/base/dashboard/dashboarditemdistance.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,23 +41,6 @@
 #include <ghoul/misc/profiling.h>
 
 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 distance."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo SourceTypeInfo = {
         "SourceType",
         "Source Type",
@@ -101,6 +84,14 @@ namespace {
         "to convert the meters into."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo FormatStringInfo = {
+        "FormatString",
+        "Format String",
+        "The format string that is used for formatting the distance string.  This format "
+        "receives four parameters:  The name of the source, the name of the destination "
+        "the value of the distance and the unit of the distance"
+    };
+
     std::vector<std::string> unitList() {
         std::vector<std::string> res(openspace::DistanceUnits.size());
         std::transform(
@@ -113,83 +104,52 @@ namespace {
         );
         return res;
     }
+
+    struct [[codegen::Dictionary(DashboardItemDistance)]] Parameters {
+        enum class TypeInfo {
+            Node,
+            NodeSurface [[codegen::key("Node Surface")]],
+            Focus,
+            Camera
+        };
+
+        // [[codegen::verbatim(SourceTypeInfo.description)]]
+        std::optional<TypeInfo> sourceType;
+
+        // [[codegen::verbatim(SourceNodeNameInfo.description)]]
+        std::optional<std::string> sourceNodeName;
+
+        // [[codegen::verbatim(DestinationTypeInfo.description)]]
+        std::optional<TypeInfo> destinationType;
+
+        // [[codegen::verbatim(DestinationNodeNameInfo.description)]]
+        std::optional<std::string> destinationNodeName;
+
+        // [[codegen::verbatim(SimplificationInfo.description)]]
+        std::optional<bool> simplification;
+
+        // [[codegen::verbatim(RequestedUnitInfo.description)]]
+        std::optional<std::string> requestedUnit [[codegen::inlist(unitList())]];
+
+        // [[codegen::verbatim(FormatStringInfo.description)]]
+        std::optional<std::string> formatString;
+    };
+#include "dashboarditemdistance_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemDistance::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Distance",
-        "base_dashboarditem_distance",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemDistance"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                SourceTypeInfo.identifier,
-                new StringInListVerifier({
-                    "Node", "Node Surface", "Focus", "Camera"
-                }),
-                Optional::Yes,
-                    SourceTypeInfo.description
-            },
-            {
-                SourceNodeNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                SourceNodeNameInfo.description
-            },
-            {
-                DestinationTypeInfo.identifier,
-                new StringInListVerifier({
-                    "Node", "Node Surface", "Focus", "Camera"
-                }),
-                Optional::Yes,
-                DestinationTypeInfo.description
-            },
-            {
-                DestinationNodeNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                DestinationNodeNameInfo.description
-            },
-            {
-                SimplificationInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                SimplificationInfo.description
-            },
-            {
-                RequestedUnitInfo.identifier,
-                new StringInListVerifier(unitList()),
-                Optional::Yes,
-                RequestedUnitInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_distance";
+    return doc;
 }
 
 DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
+    : DashboardTextItem(dictionary)
     , _doSimplification(SimplificationInfo, true)
     , _requestedUnit(RequestedUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _formatString(FormatStringInfo, "Distance from {} to {}: {:f} {}")
     , _source{
         properties::OptionProperty(
             SourceTypeInfo,
@@ -207,28 +167,7 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
         nullptr
     }
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemDistance"
-    );
-
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-
-    _fontName.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    _fontSize.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _source.type.addOptions({
         { Type::Node, "Node" },
@@ -243,22 +182,20 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
             )
         );
     });
-    if (dictionary.hasKey(SourceTypeInfo.identifier)) {
-        const std::string& value = dictionary.value<std::string>(
-            SourceTypeInfo.identifier
-        );
-
-        if (value == "Node") {
-            _source.type = Type::Node;
-        }
-        else if (value == "Node Surface") {
-            _source.type = Type::NodeSurface;
-        }
-        else if (value == "Focus") {
-            _source.type = Type::Focus;
-        }
-        else {
-            _source.type = Type::Camera;
+    if (p.sourceType.has_value()) {
+        switch (*p.sourceType) {
+            case Parameters::TypeInfo::Node:
+                _source.type = Type::Node;
+                break;
+            case Parameters::TypeInfo::NodeSurface:
+                _source.type = Type::NodeSurface;
+                break;
+            case Parameters::TypeInfo::Focus:
+                _source.type = Type::Focus;
+                break;
+            case Parameters::TypeInfo::Camera:
+                _source.type = Type::Camera;
+                break;
         }
     }
     else {
@@ -268,10 +205,8 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
 
     _source.nodeName.onChange([this]() { _source.node = nullptr; });
     if (_source.type == Type::Node || _source.type == Type::NodeSurface) {
-        if (dictionary.hasKey(SourceNodeNameInfo.identifier)) {
-            _source.nodeName = dictionary.value<std::string>(
-                SourceNodeNameInfo.identifier
-            );
+        if (p.sourceNodeName.has_value()) {
+            _source.nodeName = *p.sourceNodeName;
         }
         else {
             LERRORC(
@@ -295,21 +230,20 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
             )
         );
     });
-    if (dictionary.hasKey(DestinationTypeInfo.identifier)) {
-        const std::string& value = dictionary.value<std::string>(
-            DestinationTypeInfo.identifier
-        );
-        if (value == "Node") {
-            _destination.type = Type::Node;
-        }
-        else if (value == "Node Surface") {
-            _destination.type = Type::NodeSurface;
-        }
-        else if (value == "Focus") {
-            _destination.type = Type::Focus;
-        }
-        else {
-            _destination.type = Type::Camera;
+    if (p.destinationType.has_value()) {
+        switch (*p.destinationType) {
+            case Parameters::TypeInfo::Node:
+                _destination.type = Type::Node;
+                break;
+            case Parameters::TypeInfo::NodeSurface:
+                _destination.type = Type::NodeSurface;
+                break;
+            case Parameters::TypeInfo::Focus:
+                _destination.type = Type::Focus;
+                break;
+            case Parameters::TypeInfo::Camera:
+                _destination.type = Type::Camera;
+                break;
         }
     }
     else {
@@ -318,10 +252,8 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
     addProperty(_destination.type);
     _destination.nodeName.onChange([this]() { _destination.node = nullptr; });
     if (_destination.type == Type::Node || _destination.type == Type::NodeSurface) {
-        if (dictionary.hasKey(DestinationNodeNameInfo.identifier)) {
-            _destination.nodeName = dictionary.value<std::string>(
-                DestinationNodeNameInfo.identifier
-            );
+        if (p.destinationNodeName.has_value()) {
+            _destination.nodeName = *p.destinationNodeName;
         }
         else {
             LERRORC(
@@ -332,9 +264,7 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
     }
     addProperty(_destination.nodeName);
 
-    if (dictionary.hasKey(SimplificationInfo.identifier)) {
-        _doSimplification = dictionary.value<bool>(SimplificationInfo.identifier);
-    }
+    _doSimplification = p.simplification.value_or(_doSimplification);
     _doSimplification.onChange([this]() {
         _requestedUnit.setVisibility(
             _doSimplification ?
@@ -348,17 +278,15 @@ DashboardItemDistance::DashboardItemDistance(const ghoul::Dictionary& dictionary
         _requestedUnit.addOption(static_cast<int>(u), nameForDistanceUnit(u));
     }
     _requestedUnit = static_cast<int>(DistanceUnit::Meter);
-    if (dictionary.hasKey(RequestedUnitInfo.identifier)) {
-        const std::string& value = dictionary.value<std::string>(
-            RequestedUnitInfo.identifier
-        );
-        DistanceUnit unit = distanceUnitFromString(value.c_str());
+    if (p.requestedUnit.has_value()) {
+        DistanceUnit unit = distanceUnitFromString(p.requestedUnit->c_str());
         _requestedUnit = static_cast<int>(unit);
     }
     _requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
     addProperty(_requestedUnit);
 
-    _font = global::fontManager->font(_fontName, _fontSize);
+    _formatString = p.formatString.value_or(_formatString);
+    addProperty(_formatString);
 
     _buffer.resize(256);
 }
@@ -388,7 +316,7 @@ std::pair<glm::dvec3, std::string> DashboardItemDistance::positionAndLabel(
             return { mainComp.node->worldPosition(), mainComp.node->guiName() };
         case Type::NodeSurface:
         {
-            glm::dvec3 otherPos = glm::dvec3(0.0);
+            glm::dvec3 otherPos;
             if (otherComp.type == Type::NodeSurface) {
                 // We are only interested in the direction, and we want to prevent
                 // infinite recursion
@@ -444,15 +372,20 @@ void DashboardItemDistance::render(glm::vec2& penPosition) {
         dist = { convertedD, nameForDistanceUnit(unit, convertedD != 1.0) };
     }
 
-    std::fill(_buffer.begin(), _buffer.end(), 0);
-    char* end = fmt::format_to(
-        _buffer.data(),
-        "Distance from {} to {}: {:f} {}\0",
-        sourceInfo.second, destinationInfo.second, dist.first, dist.second
-    );
+    std::fill(_buffer.begin(), _buffer.end(), char(0));
+    try {
+        char* end = fmt::format_to(
+            _buffer.data(),
+            _formatString.value().c_str(),
+            sourceInfo.second, destinationInfo.second, dist.first, dist.second
+        );
 
-    std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
-    RenderFont(*_font, penPosition, text);
+        std::string_view text = std::string_view(_buffer.data(), end - _buffer.data());
+        RenderFont(*_font, penPosition, text);
+    }
+    catch (const fmt::format_error&) {
+        LERRORC("DashboardItemDate", "Illegal format string");
+    }
     penPosition.y -= _font->height();
 }
 
diff --git a/modules/base/dashboard/dashboarditemdistance.h b/modules/base/dashboard/dashboarditemdistance.h
index f66cd745c4..bb3b7037ef 100644
--- a/modules/base/dashboard/dashboarditemdistance.h
+++ b/modules/base/dashboard/dashboarditemdistance.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,18 +30,15 @@
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
 #include <utility>
 
-namespace ghoul::fontrendering { class Font; }
-
 namespace openspace {
 
 class SceneGraphNode;
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemDistance : public DashboardItem {
+class DashboardItemDistance : public DashboardTextItem {
 public:
     DashboardItemDistance(const ghoul::Dictionary& dictionary);
     virtual ~DashboardItemDistance() = default;
@@ -71,17 +68,14 @@ private:
     std::pair<glm::dvec3, std::string> positionAndLabel(Component& mainComp,
         Component& otherComp) const;
 
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
     properties::BoolProperty _doSimplification;
     properties::OptionProperty _requestedUnit;
+    properties::StringProperty _formatString;
 
     Component _source;
     Component _destination;
 
     std::vector<char> _buffer;
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
 };
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemframerate.cpp b/modules/base/dashboard/dashboarditemframerate.cpp
index 27e583f6d8..9405cac2c6 100644
--- a/modules/base/dashboard/dashboarditemframerate.cpp
+++ b/modules/base/dashboard/dashboarditemframerate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,24 +32,9 @@
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/misc/profiling.h>
+#include <optional>
 
 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 FrametimeInfo = {
         "FrametimeType",
         "Type of the frame time display",
@@ -63,14 +48,6 @@ namespace {
         "does not use any caching, this trigger does not do anything."
     };
 
-    constexpr const char* ValueDtAvg = "Average Deltatime";
-    constexpr const char* ValueDtExtremes = "Deltatime extremes";
-    constexpr const char* ValueDtStandardDeviation = "Deltatime standard deviation";
-    constexpr const char* ValueDtCov = "Deltatime coefficient of variation";
-    constexpr const char* ValueFps = "Frames per second";
-    constexpr const char* ValueFpsAvg = "Average frames per second";
-    constexpr const char* ValueNone = "None";
-
     [[ nodiscard ]] char* formatDt(std::vector<char>& buffer) {
         return fmt::format_to(
             buffer.data(),
@@ -150,131 +127,74 @@ namespace {
         }
     }
 
-    [[ nodiscard ]] int nLines(
-                           openspace::DashboardItemFramerate::FrametimeType frametimeType)
-    {
-        using FrametimeType = openspace::DashboardItemFramerate::FrametimeType;
-        switch (frametimeType) {
-            case FrametimeType::DtTimeAvg:                return 1;
-            case FrametimeType::DtTimeExtremes:           return 2;
-            case FrametimeType::DtStandardDeviation:      return 1;
-            case FrametimeType::DtCoefficientOfVariation: return 1;
-            case FrametimeType::FPS:                      return 1;
-            case FrametimeType::FPSAvg:                   return 1;
-            default:                                  throw ghoul::MissingCaseException();
-        }
-    }
+    struct [[codegen::Dictionary(DashboardItemFramerate)]] Parameters {
+        enum class Type {
+            DtAvg [[codegen::key("Average Deltatime")]],
+            DtExtremes [[codegen::key("Deltatime extremes")]],
+            DtStandardDeviation [[codegen::key("Deltatime standard deviation")]],
+            DtCoefficientOfVariation [[codegen::key("Deltatime coefficient of variation")]],
+            FPS [[codegen::key("Frames per second")]],
+            FPSAvg [[codegen::key("Average frames per second")]]
+        };
+
+        // [[codegen::verbatim(FrametimeInfo.description)]]
+        std::optional<Type> frametimeType;
+    };
+#include "dashboarditemframerate_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemFramerate::Documentation() {
-    using namespace documentation;
-
-    return {
-        "DashboardItem Framerate",
-        "base_dashboarditem_framerate",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemFramerate"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                FrametimeInfo.identifier,
-                new StringInListVerifier({ ValueDtAvg, ValueDtExtremes,
-                    ValueDtStandardDeviation, ValueDtCov, ValueFps, ValueFpsAvg, ValueNone
-                }),
-                Optional::Yes,
-                FrametimeInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_framerate";
+    return doc;
 }
 
 DashboardItemFramerate::DashboardItemFramerate(const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
+    : DashboardTextItem(dictionary)
     , _frametimeType(FrametimeInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _clearCache(ClearCacheInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemFramerate"
-    );
-
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    _fontName.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(
-            dictionary.value<double>(FontSizeInfo.identifier)
-        );
-    }
-    _fontSize.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _frametimeType.addOptions({
-        { static_cast<int>(FrametimeType::DtTimeAvg), ValueDtAvg },
-        { static_cast<int>(FrametimeType::DtTimeExtremes), ValueDtExtremes },
+        { static_cast<int>(FrametimeType::DtTimeAvg), "Average Deltatime" },
+        { static_cast<int>(FrametimeType::DtTimeExtremes), "Deltatime extremes" },
         {
             static_cast<int>(FrametimeType::DtStandardDeviation),
-            ValueDtStandardDeviation
+            "Deltatime standard deviation"
         },
         {
             static_cast<int>(FrametimeType::DtCoefficientOfVariation),
-            ValueDtCov
+            "Deltatime coefficient of variation"
         },
-        { static_cast<int>(FrametimeType::FPS), ValueFps },
-        { static_cast<int>(FrametimeType::FPSAvg), ValueFpsAvg },
-        { static_cast<int>(FrametimeType::None), ValueNone }
+        { static_cast<int>(FrametimeType::FPS), "Frames per second" },
+        { static_cast<int>(FrametimeType::FPSAvg), "Average frames per second" },
+        { static_cast<int>(FrametimeType::None), "None" }
     });
 
-    if (dictionary.hasKey(FrametimeInfo.identifier)) {
-        const std::string& v = dictionary.value<std::string>(FrametimeInfo.identifier);
-        if (v == ValueDtAvg) {
-            _frametimeType = static_cast<int>(FrametimeType::DtTimeAvg);
-        }
-        else if (v == ValueDtExtremes) {
-            _frametimeType = static_cast<int>(FrametimeType::DtTimeExtremes);
-        }
-        else if (v == ValueDtStandardDeviation) {
-            _frametimeType =
-                static_cast<int>(FrametimeType::DtStandardDeviation);
-        }
-        else if (v == ValueDtCov) {
-            _frametimeType =
-                static_cast<int>(FrametimeType::DtCoefficientOfVariation);
-        }
-        else if (v == ValueFps) {
-            _frametimeType = static_cast<int>(FrametimeType::FPS);
-        }
-        else if (v == ValueFpsAvg) {
-            _frametimeType = static_cast<int>(FrametimeType::FPSAvg);
-        }
-        else {
-            _frametimeType = static_cast<int>(FrametimeType::None);
+    if (p.frametimeType.has_value()) {
+        switch (*p.frametimeType) {
+            case Parameters::Type::DtAvg:
+                _frametimeType = static_cast<int>(FrametimeType::DtTimeAvg);
+                break;
+            case Parameters::Type::DtExtremes:
+                _frametimeType = static_cast<int>(FrametimeType::DtTimeExtremes);
+                break;
+            case Parameters::Type::DtStandardDeviation:
+                _frametimeType = static_cast<int>(FrametimeType::DtStandardDeviation);
+                break;
+            case Parameters::Type::DtCoefficientOfVariation:
+                _frametimeType = static_cast<int>(FrametimeType::DtCoefficientOfVariation);
+                break;
+            case Parameters::Type::FPS:
+                _frametimeType = static_cast<int>(FrametimeType::FPS);
+                break;
+            case Parameters::Type::FPSAvg:
+                _frametimeType = static_cast<int>(FrametimeType::FPSAvg);
+                break;
         }
     }
     else {
@@ -287,8 +207,6 @@ DashboardItemFramerate::DashboardItemFramerate(const ghoul::Dictionary& dictiona
     });
     addProperty(_clearCache);
 
-    _font = global::fontManager->font(_fontName, _fontSize);
-
     _buffer.resize(128);
 }
 
@@ -312,7 +230,7 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) {
 
     FrametimeType frametimeType = FrametimeType(_frametimeType.value());
 
-    std::fill(_buffer.begin(), _buffer.end(), 0);
+    std::fill(_buffer.begin(), _buffer.end(), char(0));
     char* end = format(
         _buffer,
         frametimeType,
diff --git a/modules/base/dashboard/dashboarditemframerate.h b/modules/base/dashboard/dashboarditemframerate.h
index 8fc952f537..17038cc572 100644
--- a/modules/base/dashboard/dashboarditemframerate.h
+++ b/modules/base/dashboard/dashboarditemframerate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,18 +28,15 @@
 #include <openspace/rendering/dashboarditem.h>
 
 #include <openspace/properties/optionproperty.h>
-#include <openspace/properties/stringproperty.h>
 #include <openspace/properties/triggerproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
 
 namespace ghoul { class Dictionary; }
-namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemFramerate : public DashboardItem {
+class DashboardItemFramerate : public DashboardTextItem {
 public:
     enum class FrametimeType {
         DtTimeAvg = 0,
@@ -58,13 +55,9 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
     properties::OptionProperty _frametimeType;
     properties::TriggerProperty _clearCache;
 
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
-
     double _minDeltaTimeCache = 1.0;
     double _maxDeltaTimeCache = -1.0;
     bool _shouldClearCache = true;
diff --git a/modules/base/dashboard/dashboarditemmission.cpp b/modules/base/dashboard/dashboarditemmission.cpp
index 881a12b953..97b2131d85 100644
--- a/modules/base/dashboard/dashboarditemmission.cpp
+++ b/modules/base/dashboard/dashboarditemmission.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -37,22 +37,6 @@
 #include <stack>
 
 namespace {
-    constexpr const char* KeyFontMono = "Mono";
-    constexpr const float DefaultFontSize = 15.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."
-    };
-
     std::string progressToStr(int size, double t) {
         std::string progress = "|";
         int g = static_cast<int>((t * (size - 1)) + 1);
@@ -67,67 +51,13 @@ namespace {
         progress.append("|");
         return progress;
     }
-
 } // namespace
 
 namespace openspace {
 
-documentation::Documentation DashboardItemMission::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Mission",
-        "base_dashboarditem_mission",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemMission"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            }
-        }
-    };
-}
-
 DashboardItemMission::DashboardItemMission(const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
-{
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemMission"
-    );
-
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    _fontName.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-    _fontSize.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
-
-    _font = global::fontManager->font(_fontName, _fontSize);
-}
+    : DashboardTextItem(dictionary, 15.f)
+{}
 
 void DashboardItemMission::render(glm::vec2& penPosition) {
     ZoneScoped
diff --git a/modules/base/dashboard/dashboarditemmission.h b/modules/base/dashboard/dashboarditemmission.h
index bce6364865..bb02551fdf 100644
--- a/modules/base/dashboard/dashboarditemmission.h
+++ b/modules/base/dashboard/dashboarditemmission.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,16 +27,11 @@
 
 #include <openspace/rendering/dashboarditem.h>
 
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-
-namespace ghoul::fontrendering { class Font; }
-
 namespace openspace {
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemMission : public DashboardItem {
+class DashboardItemMission : public DashboardTextItem {
 public:
     DashboardItemMission(const ghoul::Dictionary& dictionary);
     virtual ~DashboardItemMission() = default;
@@ -44,14 +39,6 @@ public:
     void render(glm::vec2& penPosition) override;
 
     glm::vec2 size() const override;
-
-    static documentation::Documentation Documentation();
-
-private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
 };
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.cpp b/modules/base/dashboard/dashboarditemparallelconnection.cpp
index 8f23e4928d..7bdd436a6c 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.cpp
+++ b/modules/base/dashboard/dashboarditemparallelconnection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,83 +36,12 @@
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/misc/profiling.h>
 
-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."
-    };
-} // namespace
-
 namespace openspace {
 
-documentation::Documentation DashboardItemParallelConnection::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Parallel Connection",
-        "base_dashboarditem_parallelconnection",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemParallelConnection"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            }
-        }
-    };
-}
-
 DashboardItemParallelConnection::DashboardItemParallelConnection(
                                                       const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
-{
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemParallelConnection"
-    );
-
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    _fontName.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-    _fontSize.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
-
-    _font = global::fontManager->font(_fontName, _fontSize);
-}
+    : DashboardTextItem(dictionary)
+{}
 
 void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
     ZoneScoped
@@ -146,15 +75,14 @@ void DashboardItemParallelConnection::render(glm::vec2& penPosition) {
     if (status == ParallelConnection::Status::ClientWithHost ||
         status == ParallelConnection::Status::ClientWithoutHost)
     {
-        constexpr const char* Singular = "You and {} more client are tuned in";
-        constexpr const char* Plural = "You and {} more clients are tuned in";
-
         connectionInfo += "\n";
 
         if (nClients > 2) {
+            constexpr const char* Plural = "You and {} more clients are tuned in";
             connectionInfo += fmt::format(Plural, nClients - 1);
         }
         else if (nClients == 2) {
+            constexpr const char* Singular = "You and {} more client are tuned in";
             connectionInfo += fmt::format(Singular, nClients - 1);
         }
         else if (nClients == 1) {
@@ -199,16 +127,13 @@ glm::vec2 DashboardItemParallelConnection::size() const {
     if (status == ParallelConnection::Status::ClientWithHost ||
         status == ParallelConnection::Status::ClientWithoutHost)
     {
-        constexpr const char* Singular = "You and {} more client are tuned in";
-        constexpr const char* Plural = "You and {} more clients are tuned in";
-
         connectionInfo += "\n";
         if (nClients > 2) {
-            std::string c = std::to_string(nClients - 1);
+            constexpr const char* Plural = "You and {} more clients are tuned in";
             connectionInfo += fmt::format(Plural, nClients);
         }
         else if (nClients == 2) {
-            std::string c = std::to_string(nClients - 1);
+            constexpr const char* Singular = "You and {} more client are tuned in";
             connectionInfo += fmt::format(Singular, nClients - 1);
         }
         else if (nClients == 1) {
diff --git a/modules/base/dashboard/dashboarditemparallelconnection.h b/modules/base/dashboard/dashboarditemparallelconnection.h
index 5c0bb7f1f5..7e13459850 100644
--- a/modules/base/dashboard/dashboarditemparallelconnection.h
+++ b/modules/base/dashboard/dashboarditemparallelconnection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,16 +27,11 @@
 
 #include <openspace/rendering/dashboarditem.h>
 
-#include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-
-namespace ghoul::fontrendering { class Font; }
-
 namespace openspace {
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemParallelConnection : public DashboardItem {
+class DashboardItemParallelConnection : public DashboardTextItem {
 public:
     DashboardItemParallelConnection(const ghoul::Dictionary& dictionary);
     virtual ~DashboardItemParallelConnection() = default;
@@ -44,14 +39,6 @@ public:
     void render(glm::vec2& penPosition) override;
 
     glm::vec2 size() const override;
-
-    static documentation::Documentation Documentation();
-
-private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
 };
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.cpp b/modules/base/dashboard/dashboarditempropertyvalue.cpp
index 7040b00a07..663ff6d68f 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.cpp
+++ b/modules/base/dashboard/dashboarditempropertyvalue.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,22 +35,6 @@
 #include <ghoul/misc/profiling.h>
 
 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 PropertyUriInfo = {
         "URI",
         "Property URI",
@@ -64,91 +48,39 @@ namespace {
         "the value itself will be displayed), or it must contain extact one instance of "
         "{}, which will be replaced with the value of the property during rendering."
     };
+
+    struct [[codegen::Dictionary(DashboardItemPropertyValue)]] Parameters {
+        // [[codegen::verbatim(PropertyUriInfo.description)]]
+        std::optional<std::string> uri [[codegen::key("URI")]];
+
+        // [[codegen::verbatim(DisplayStringInfo.description)]]
+        std::optional<std::string> displayString;
+    };
+#include "dashboarditempropertyvalue_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemPropertyValue::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem PropertyValue",
-        "base_dashboarditem_propertyvalue",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemPropertyValue"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                PropertyUriInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                PropertyUriInfo.description
-            },
-            {
-                DisplayStringInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                DisplayStringInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_propertyvalue";
+    return doc;
 }
 
 DashboardItemPropertyValue::DashboardItemPropertyValue(
                                                       const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
+    : DashboardTextItem(dictionary)
     , _propertyUri(PropertyUriInfo)
     , _displayString(DisplayStringInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemPropertyValue"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    _fontName.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-    _fontSize.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
-
-    if (dictionary.hasKey(PropertyUriInfo.identifier)) {
-        _propertyUri = dictionary.value<std::string>(PropertyUriInfo.identifier);
-    }
+    _propertyUri = p.uri.value_or(_propertyUri);
     _propertyUri.onChange([this]() { _propertyIsDirty = true; });
     addProperty(_propertyUri);
 
-    if (dictionary.hasKey(DisplayStringInfo.identifier)) {
-        _displayString = dictionary.value<std::string>(DisplayStringInfo.identifier);
-    }
+    _displayString = p.displayString.value_or(_displayString);
     addProperty(_displayString);
-
-    _font = global::fontManager->font(_fontName, _fontSize);
 }
 
 void DashboardItemPropertyValue::render(glm::vec2& penPosition) {
diff --git a/modules/base/dashboard/dashboarditempropertyvalue.h b/modules/base/dashboard/dashboarditempropertyvalue.h
index 0f5a475e02..2f14a3aeff 100644
--- a/modules/base/dashboard/dashboarditempropertyvalue.h
+++ b/modules/base/dashboard/dashboarditempropertyvalue.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,9 +28,6 @@
 #include <openspace/rendering/dashboarditem.h>
 
 #include <openspace/properties/stringproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-
-namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
 
@@ -38,7 +35,7 @@ namespace properties { class Property; }
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemPropertyValue : public DashboardItem {
+class DashboardItemPropertyValue : public DashboardTextItem {
 public:
     DashboardItemPropertyValue(const ghoul::Dictionary& dictionary);
     ~DashboardItemPropertyValue() = default;
@@ -50,16 +47,11 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
-
     properties::Property* _property = nullptr;
     bool _propertyIsDirty = true;
 
     properties::StringProperty _propertyUri;
     properties::StringProperty _displayString;
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
 };
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.cpp b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
index 503f178d98..6648503c41 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.cpp
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,25 +32,10 @@
 #include <ghoul/font/font.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
 
 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 SimplificationInfo = {
         "Simplification",
         "Time Simplification",
@@ -66,6 +51,26 @@ namespace {
         "convert the seconds into."
     };
 
+    constexpr openspace::properties::Property::PropertyInfo TransitionFormatInfo = {
+        "TransitionFormat",
+        "Transition Format",
+        "Format string used to format the text used while in a delta time transition, "
+        "that is if the current delta time is being interpolated to reach a target "
+        "delta time. This format gets five parameters in this order:  The target delta "
+        "time value, the target delta time unit, the string 'Paused' if the delta time "
+        "is paused or the empty string otherwise, the current delta time value, and the "
+        "current delta time unit"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo RegularFormatInfo = {
+        "RegularFormat",
+        "Regular Format",
+        "The format string used to format the text if the target delta time is the same "
+        "as the current delta time. This format gets three parameters in this order:  "
+        "The target delta value, the target delta unit, and the string 'Paused' if the "
+        "delta time is paused or the empty string otherwise"
+    };
+
     std::vector<std::string> unitList() {
         std::vector<std::string> res(openspace::TimeUnits.size());
         std::transform(
@@ -76,82 +81,45 @@ namespace {
         );
         return res;
     }
+
+    struct [[codegen::Dictionary(DashboardItemSimulationIncrement)]] Parameters {
+        // [[codegen::verbatim(SimplificationInfo.description)]]
+        std::optional<bool> simplification;
+
+        // [[codegen::verbatim(RequestedUnitInfo.description)]]
+        std::optional<std::string> requestedUnit [[codegen::inlist(unitList())]];
+
+        // [[codegen::verbatim(TransitionFormatInfo.description)]]
+        std::optional<std::string> transitionFormat;
+
+        // [[codegen::verbatim(RegularFormatInfo.description)]]
+        std::optional<std::string> regularFormat;
+    };
+#include "dashboarditemsimulationincrement_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemSimulationIncrement::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Simulation Increment",
-        "base_dashboarditem_simulationincrement",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemSimulationIncrement"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                SimplificationInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                SimplificationInfo.description
-            },
-            {
-                RequestedUnitInfo.identifier,
-                new StringInListVerifier(unitList()),
-                Optional::Yes,
-                RequestedUnitInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_simulationincrement";
+    return doc;
 }
 
 DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
                                                       const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
+    : DashboardTextItem(dictionary)
     , _doSimplification(SimplificationInfo, true)
     , _requestedUnit(RequestedUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _transitionFormat(
+        TransitionFormatInfo,
+        "Simulation increment: {:.1f} {:s} / second{:s} (current: {:.1f} {:s})"
+    )
+    , _regularFormat(RegularFormatInfo, "Simulation increment: {:.1f} {:s} / second{:s}")
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemSimulationIncrement"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    _fontName.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-    _fontSize.onChange([this](){
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
-
-    if (dictionary.hasKey(SimplificationInfo.identifier)) {
-        _doSimplification = dictionary.value<bool>(SimplificationInfo.identifier);
-    }
+    _doSimplification = p.simplification.value_or(_doSimplification);
     _doSimplification.onChange([this]() {
         _requestedUnit.setVisibility(
             _doSimplification ?
@@ -165,15 +133,18 @@ DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
         _requestedUnit.addOption(static_cast<int>(u), nameForTimeUnit(u));
     }
     _requestedUnit = static_cast<int>(TimeUnit::Second);
-    if (dictionary.hasKey(RequestedUnitInfo.identifier)) {
-        std::string value = dictionary.value<std::string>(RequestedUnitInfo.identifier);
-        TimeUnit unit = timeUnitFromString(value.c_str());
+    if (p.requestedUnit.has_value()) {
+        TimeUnit unit = timeUnitFromString(p.requestedUnit->c_str());
         _requestedUnit = static_cast<int>(unit);
     }
     _requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
     addProperty(_requestedUnit);
 
-    _font = global::fontManager->font(_fontName, _fontSize);
+    _transitionFormat = p.transitionFormat.value_or(_transitionFormat);
+    addProperty(_transitionFormat);
+
+    _regularFormat = p.regularFormat.value_or(_regularFormat);
+    addProperty(_regularFormat);
 }
 
 void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
@@ -203,28 +174,33 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
 
     std::string pauseText = global::timeManager->isPaused() ? " (Paused)" : "";
 
-    if (targetDt != currentDt && !global::timeManager->isPaused()) {
-        // We are in the middle of a transition
-        RenderFont(
-            *_font,
-            penPosition,
-            fmt::format(
-                "Simulation increment: {:.1f} {:s} / second{:s} (current: {:.1f} {:s})",
-                targetDeltaTime.first, targetDeltaTime.second,
-                pauseText,
-                currentDeltaTime.first, currentDeltaTime.second
-            )
-        );
+    try {
+        if (targetDt != currentDt && !global::timeManager->isPaused()) {
+            // We are in the middle of a transition
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(
+                    _transitionFormat.value().c_str(),
+                    targetDeltaTime.first, targetDeltaTime.second,
+                    pauseText,
+                    currentDeltaTime.first, currentDeltaTime.second
+                )
+            );
+        }
+        else {
+            RenderFont(
+                *_font,
+                penPosition,
+                fmt::format(
+                    _regularFormat.value().c_str(),
+                    targetDeltaTime.first, targetDeltaTime.second, pauseText
+                )
+            );
+        }
     }
-    else {
-        RenderFont(
-            *_font,
-            penPosition,
-            fmt::format(
-                "Simulation increment: {:.1f} {:s} / second{:s}",
-                targetDeltaTime.first, targetDeltaTime.second, pauseText
-            )
-        );
+    catch (const fmt::format_error&) {
+        LERRORC("DashboardItemDate", "Illegal format string");
     }
     penPosition.y -= _font->height();
 }
diff --git a/modules/base/dashboard/dashboarditemsimulationincrement.h b/modules/base/dashboard/dashboarditemsimulationincrement.h
index 389778f0c2..7b3367811f 100644
--- a/modules/base/dashboard/dashboarditemsimulationincrement.h
+++ b/modules/base/dashboard/dashboarditemsimulationincrement.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,15 +30,12 @@
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
-
-namespace ghoul::fontrendering { class Font; }
 
 namespace openspace {
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemSimulationIncrement : public DashboardItem {
+class DashboardItemSimulationIncrement : public DashboardTextItem {
 public:
     DashboardItemSimulationIncrement(const ghoul::Dictionary& dictionary);
     virtual ~DashboardItemSimulationIncrement() = default;
@@ -49,12 +46,11 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
     properties::BoolProperty _doSimplification;
     properties::OptionProperty _requestedUnit;
 
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
+    properties::StringProperty _transitionFormat;
+    properties::StringProperty _regularFormat;
 };
 
 } // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemspacing.cpp b/modules/base/dashboard/dashboarditemspacing.cpp
index 7b9f98977f..5b615f769b 100644
--- a/modules/base/dashboard/dashboarditemspacing.cpp
+++ b/modules/base/dashboard/dashboarditemspacing.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,6 +26,7 @@
 
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo SpacingInfo = {
@@ -34,44 +35,29 @@ namespace {
         "This value determines the spacing (in pixels) that this item represents. The "
         "default value is 15."
     };
+
+    struct [[codegen::Dictionary(DashboardItemSpacing)]] Parameters {
+        // [[codegen::verbatim(SpacingInfo.description)]]
+        std::optional<float> spacing;
+    };
+#include "dashboarditemspacing_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemSpacing::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Spacing",
-        "base_dashboarditem_spacing",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemSpacing"),
-                Optional::No
-            },
-            {
-                SpacingInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                SpacingInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_spacing";
+    return doc;
 }
 
 DashboardItemSpacing::DashboardItemSpacing(const ghoul::Dictionary& dictionary)
     : DashboardItem(dictionary)
     , _spacing(SpacingInfo, 15.f, 0.f, 2048.f)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemSpacing"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKey(SpacingInfo.identifier)) {
-        _spacing = static_cast<float>(dictionary.value<double>(SpacingInfo.identifier));
-    }
+    _spacing = p.spacing.value_or(_spacing);
     addProperty(_spacing);
 }
 
diff --git a/modules/base/dashboard/dashboarditemspacing.h b/modules/base/dashboard/dashboarditemspacing.h
index d3b48199a8..ca0e258b4b 100644
--- a/modules/base/dashboard/dashboarditemspacing.h
+++ b/modules/base/dashboard/dashboarditemspacing.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/dashboard/dashboarditemtext.cpp b/modules/base/dashboard/dashboarditemtext.cpp
new file mode 100644
index 0000000000..690da61c6a
--- /dev/null
+++ b/modules/base/dashboard/dashboarditemtext.cpp
@@ -0,0 +1,80 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/dashboard/dashboarditemtext.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <ghoul/font/font.h>
+#include <ghoul/font/fontmanager.h>
+#include <ghoul/font/fontrenderer.h>
+#include <ghoul/misc/profiling.h>
+#include <optional>
+
+namespace {
+    constexpr openspace::properties::Property::PropertyInfo TextInfo = {
+        "Text",
+        "Text",
+        "The text to be displayed"
+    };
+
+    struct [[codegen::Dictionary(DashboardItemText)]] Parameters {
+        // [[codegen::verbatim(TextInfo.description)]]
+        std::optional<std::string> text;
+    };
+#include "dashboarditemtext_codegen.cpp"
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation DashboardItemText::Documentation() {
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_text";
+    return doc;
+}
+
+DashboardItemText::DashboardItemText(const ghoul::Dictionary& dictionary)
+    : DashboardTextItem(dictionary)
+    , _text(TextInfo, "")
+{
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _text = p.text.value_or(_text);
+    addProperty(_text);
+}
+
+void DashboardItemText::render(glm::vec2& penPosition) {
+    ZoneScoped
+
+    RenderFont(*_font, penPosition, _text.value());
+    penPosition.y -= _font->height();
+}
+
+glm::vec2 DashboardItemText::size() const {
+    ZoneScoped
+
+    return _font->boundingBox(_text.value());
+}
+
+} // namespace openspace
diff --git a/modules/base/dashboard/dashboarditemtext.h b/modules/base/dashboard/dashboarditemtext.h
new file mode 100644
index 0000000000..648b501805
--- /dev/null
+++ b/modules/base/dashboard/dashboarditemtext.h
@@ -0,0 +1,53 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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_BASE___DASHBOARDITEMTEXT___H__
+#define __OPENSPACE_MODULE_BASE___DASHBOARDITEMTEXT___H__
+
+#include <openspace/rendering/dashboarditem.h>
+
+#include <openspace/properties/stringproperty.h>
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+class DashboardItemText : public DashboardTextItem {
+public:
+    DashboardItemText(const ghoul::Dictionary& dictionary);
+    virtual ~DashboardItemText() = default;
+
+    void render(glm::vec2& penPosition) override;
+
+    glm::vec2 size() const override;
+
+    static documentation::Documentation Documentation();
+
+private:
+    properties::StringProperty _text;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___DASHBOARDITEMTEXT___H__
diff --git a/modules/base/dashboard/dashboarditemvelocity.cpp b/modules/base/dashboard/dashboarditemvelocity.cpp
index 5431ba92a0..d71e4c585d 100644
--- a/modules/base/dashboard/dashboarditemvelocity.cpp
+++ b/modules/base/dashboard/dashboarditemvelocity.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,23 +41,6 @@
 #include <ghoul/misc/profiling.h>
 
 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 velocity."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo SimplificationInfo = {
         "Simplification",
         "Simplification",
@@ -85,82 +68,33 @@ namespace {
         );
         return res;
     }
+
+    struct [[codegen::Dictionary(DashboardItemVelocity)]] Parameters {
+        // [[codegen::verbatim(SimplificationInfo.description)]]
+        std::optional<bool> simplification;
+
+        // [[codegen::verbatim(RequestedUnitInfo.description)]]
+        std::optional<std::string> requestedUnit [[codegen::inlist(unitList())]];
+    };
+#include "dashboarditemvelocity_codegen.cpp"
+
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemVelocity::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Velocity",
-        "base_dashboarditem_velocity",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemVelocity"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                SimplificationInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                SimplificationInfo.description
-            },
-            {
-                RequestedUnitInfo.identifier,
-                new StringInListVerifier(unitList()),
-                Optional::Yes,
-                RequestedUnitInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_dashboarditem_velocity";
+    return doc;
 }
 
 DashboardItemVelocity::DashboardItemVelocity(const ghoul::Dictionary& dictionary)
-    : DashboardItem(dictionary)
-    , _fontName(FontNameInfo, KeyFontMono)
-    , _fontSize(FontSizeInfo, DefaultFontSize, 6.f, 144.f, 1.f)
+    : DashboardTextItem(dictionary)
     , _doSimplification(SimplificationInfo, true)
     , _requestedUnit(RequestedUnitInfo, properties::OptionProperty::DisplayType::Dropdown)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemVelocity"
-    );
-
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
-
-    _fontName.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontName);
-
-    _fontSize.onChange([this]() {
-        _font = global::fontManager->font(_fontName, _fontSize);
-    });
-    addProperty(_fontSize);
-
-    if (dictionary.hasKey(SimplificationInfo.identifier)) {
-        _doSimplification = dictionary.value<bool>(SimplificationInfo.identifier);
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _doSimplification = p.simplification.value_or(_doSimplification);
     _doSimplification.onChange([this]() {
         _requestedUnit.setVisibility(
             _doSimplification ?
@@ -174,17 +108,12 @@ DashboardItemVelocity::DashboardItemVelocity(const ghoul::Dictionary& dictionary
         _requestedUnit.addOption(static_cast<int>(u), nameForDistanceUnit(u));
     }
     _requestedUnit = static_cast<int>(DistanceUnit::Meter);
-    if (dictionary.hasKey(RequestedUnitInfo.identifier)) {
-        const std::string& value = dictionary.value<std::string>(
-            RequestedUnitInfo.identifier
-        );
-        DistanceUnit unit = distanceUnitFromString(value.c_str());
+    if (p.requestedUnit.has_value()) {
+        DistanceUnit unit = distanceUnitFromString(p.requestedUnit->c_str());
         _requestedUnit = static_cast<int>(unit);
     }
     _requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
     addProperty(_requestedUnit);
-
-    _font = global::fontManager->font(_fontName, _fontSize);
 }
 
 void DashboardItemVelocity::render(glm::vec2& penPosition) {
@@ -212,7 +141,7 @@ void DashboardItemVelocity::render(glm::vec2& penPosition) {
         *_font,
         penPosition,
         fmt::format(
-            "Camera velocity: {} {}/s", dist.first, dist.second
+            "Camera velocity: {:.4f} {}/s", dist.first, dist.second
         )
     );
     penPosition.y -= _font->height();
diff --git a/modules/base/dashboard/dashboarditemvelocity.h b/modules/base/dashboard/dashboarditemvelocity.h
index 2fcfa4ef16..fa2664b2cf 100644
--- a/modules/base/dashboard/dashboarditemvelocity.h
+++ b/modules/base/dashboard/dashboarditemvelocity.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,20 +28,16 @@
 #include <openspace/rendering/dashboarditem.h>
 
 #include <openspace/properties/optionproperty.h>
-#include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/boolproperty.h>
-#include <openspace/properties/scalar/floatproperty.h>
 #include <utility>
 
-namespace ghoul::fontrendering { class Font; }
-
 namespace openspace {
 
 class SceneGraphNode;
 
 namespace documentation { struct Documentation; }
 
-class DashboardItemVelocity : public DashboardItem {
+class DashboardItemVelocity : public DashboardTextItem {
 public:
     DashboardItemVelocity(const ghoul::Dictionary& dictionary);
     virtual ~DashboardItemVelocity() = default;
@@ -53,14 +49,10 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    properties::StringProperty _fontName;
-    properties::FloatProperty _fontSize;
     properties::BoolProperty _doSimplification;
     properties::OptionProperty _requestedUnit;
 
     glm::dvec3 _prevPosition = glm::dvec3(0.0);
-
-    std::shared_ptr<ghoul::fontrendering::Font> _font;
 };
 
 } // namespace openspace
diff --git a/modules/base/lightsource/cameralightsource.cpp b/modules/base/lightsource/cameralightsource.cpp
index ade1fce643..d878e5cf45 100644
--- a/modules/base/lightsource/cameralightsource.cpp
+++ b/modules/base/lightsource/cameralightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,6 +27,7 @@
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/updatestructures.h>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo IntensityInfo = {
@@ -34,30 +35,20 @@ namespace {
         "Intensity",
         "The intensity of this light source"
     };
+
+    struct [[codegen::Dictionary(CameraLightSource)]] Parameters {
+        // [[codegen::verbatim(IntensityInfo.description)]]
+        std::optional<float> intensity;
+    };
+#include "cameralightsource_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation CameraLightSource::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Camera Light Source",
-        "base_camera_light_source",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("CameraLightSource"),
-                Optional::No,
-                "The type of this light source"
-            },
-            {
-                IntensityInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                IntensityInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_camera_light_source";
+    return doc;
 }
 
 CameraLightSource::CameraLightSource()
@@ -70,18 +61,9 @@ CameraLightSource::CameraLightSource(const ghoul::Dictionary& dictionary)
     : LightSource(dictionary)
     , _intensity(IntensityInfo, 1.f, 0.f, 1.f)
 {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _intensity = p.intensity.value_or(_intensity);
     addProperty(_intensity);
-
-    documentation::testSpecificationAndThrow(Documentation(),
-                                             dictionary,
-                                             "CameraLightSource");
-
-
-    if (dictionary.hasValue<double>(IntensityInfo.identifier)) {
-        _intensity = static_cast<float>(
-            dictionary.value<double>(IntensityInfo.identifier)
-        );
-    }
 }
 
 float CameraLightSource::intensity() const {
diff --git a/modules/base/lightsource/cameralightsource.h b/modules/base/lightsource/cameralightsource.h
index fea98d94a3..06c082212a 100644
--- a/modules/base/lightsource/cameralightsource.h
+++ b/modules/base/lightsource/cameralightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/lightsource/scenegraphlightsource.cpp b/modules/base/lightsource/scenegraphlightsource.cpp
index 50f6695d5b..671f7efd75 100644
--- a/modules/base/lightsource/scenegraphlightsource.cpp
+++ b/modules/base/lightsource/scenegraphlightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,6 +31,7 @@
 #include <openspace/scene/scene.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/misc/profiling.h>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo IntensityInfo = {
@@ -44,36 +45,23 @@ namespace {
         "Node",
         "The identifier of the scene graph node to follow"
     };
+
+    struct [[codegen::Dictionary(SceneGraphLightSource)]] Parameters {
+        // [[codegen::verbatim(IntensityInfo.description)]]
+        std::optional<float> intensity;
+
+        // [[codegen::verbatim(NodeInfo.description)]]
+        std::string node;
+    };
+#include "scenegraphlightsource_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation SceneGraphLightSource::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Scene Graph Light Source",
-        "base_scene_graph_light_source",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("SceneGraphLightSource"),
-                Optional::No,
-                "The type of this light source"
-            },
-            {
-                IntensityInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                IntensityInfo.description
-            },
-            {
-                NodeInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                NodeInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_scene_graph_light_source";
+    return doc;
 }
 
 SceneGraphLightSource::SceneGraphLightSource()
@@ -89,30 +77,17 @@ SceneGraphLightSource::SceneGraphLightSource(const ghoul::Dictionary& dictionary
     , _intensity(IntensityInfo, 1.f, 0.f, 1.f)
     , _sceneGraphNodeReference(NodeInfo, "")
 {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _intensity = p.intensity.value_or(_intensity);
     addProperty(_intensity);
-    addProperty(_sceneGraphNodeReference);
-
-    documentation::testSpecificationAndThrow(Documentation(),
-                                             dictionary,
-                                             "SceneGraphLightSource");
-
-
-    if (dictionary.hasValue<double>(IntensityInfo.identifier)) {
-        _intensity = static_cast<float>(
-            dictionary.value<double>(IntensityInfo.identifier)
-        );
-    }
-
-    if (dictionary.hasValue<std::string>(NodeInfo.identifier)) {
-        _sceneGraphNodeReference =
-            dictionary.value<std::string>(NodeInfo.identifier);
-    }
 
+    _sceneGraphNodeReference = p.node;
     _sceneGraphNodeReference.onChange([this]() {
         _sceneGraphNode =
             global::renderEngine->scene()->sceneGraphNode(_sceneGraphNodeReference);
     });
-
+    addProperty(_sceneGraphNodeReference);
 }
 
 bool SceneGraphLightSource::initialize() {
@@ -137,11 +112,10 @@ glm::vec3 SceneGraphLightSource::directionViewSpace(const RenderData& renderData
 
     const glm::dvec3 renderNodePosition = renderData.modelTransform.translation;
 
-    const glm::dvec3 lightDirectionViewSpace = renderData.camera.viewRotationMatrix() *
-        glm::dvec4((lightPosition - renderNodePosition), 1.0);
+    const glm::dvec3 viewSpace = glm::dvec3(renderData.camera.combinedViewMatrix() *
+        glm::dvec4((lightPosition - renderNodePosition), 1.0));
 
-    return glm::normalize(lightDirectionViewSpace);
+    return glm::normalize(viewSpace);
 }
 
-
 } // namespace openspace
diff --git a/modules/base/lightsource/scenegraphlightsource.h b/modules/base/lightsource/scenegraphlightsource.h
index f1d4ed7b52..3a7b75f12d 100644
--- a/modules/base/lightsource/scenegraphlightsource.h
+++ b/modules/base/lightsource/scenegraphlightsource.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp
index c05f583011..518f87b248 100644
--- a/modules/base/rendering/grids/renderableboxgrid.cpp
+++ b/modules/base/rendering/grids/renderableboxgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,7 +28,6 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 #include <openspace/documentation/verifier.h>
 #include <ghoul/glm.h>
@@ -39,9 +38,9 @@
 namespace {
     constexpr const char* ProgramName = "GridProgram";
 
-    constexpr openspace::properties::Property::PropertyInfo GridColorInfo = {
-        "GridColor",
-        "Grid Color",
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
+        "Color",
+        "Color",
         "This value determines the color of the grid lines that are rendered."
     };
 
@@ -56,75 +55,47 @@ namespace {
         "Grid Size",
         "This value species the size of each dimensions of the box"
     };
+
+    struct [[codegen::Dictionary(RenderableBoxGrid)]] Parameters {
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+
+        // [[codegen::verbatim(SizeInfo.description)]]
+        std::optional<glm::vec3> size;
+    };
+#include "renderableboxgrid_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableBoxGrid::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableBoxGrid",
-        "base_renderable_boxgrid",
-        {
-            {
-                GridColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                GridColorInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            },
-            {
-                SizeInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                SizeInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_boxgrid";
+    return doc;
 }
 
-
 RenderableBoxGrid::RenderableBoxGrid(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _gridColor(
-        GridColorInfo,
-        glm::vec3(0.5f, 0.5, 0.5f),
-        glm::vec3(0.f),
-        glm::vec3(1.f)
-    )
+    , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
     , _lineWidth(LineWidthInfo, 0.5f, 0.f, 20.f)
-    , _size(SizeInfo, glm::vec3(1e20f), glm::vec3(1.f), glm::vec3(1e35f))
+    , _size(SizeInfo, glm::vec3(1.f), glm::vec3(1.f), glm::vec3(100.f))
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableBoxGrid"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    if (dictionary.hasKey(GridColorInfo.identifier)) {
-        _gridColor = dictionary.value<glm::vec3>(GridColorInfo.identifier);
-    }
-    _gridColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_gridColor);
+    _color = p.color.value_or(_color);
+    _color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_color);
 
-    if (dictionary.hasKey(LineWidthInfo.identifier)) {
-        _lineWidth = static_cast<float>(
-            dictionary.value<double>(LineWidthInfo.identifier)
-        );
-    }
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
-    if (dictionary.hasKey(SizeInfo.identifier)) {
-        _size = dictionary.value<glm::vec3>(SizeInfo.identifier);
-    }
+    _size = p.size.value_or(_size);
     _size.onChange([&]() { _gridIsDirty = true; });
     addProperty(_size);
 }
@@ -173,8 +144,6 @@ void RenderableBoxGrid::deinitializeGL() {
 void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
-    _gridProgram->setUniform("opacity", _opacity);
-
     glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
         glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
@@ -187,14 +156,19 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
         "MVPTransform",
         glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
     );
+    _gridProgram->setUniform("opacity", _opacity);
+    _gridProgram->setUniform("gridColor", _color);
 
-    _gridProgram->setUniform("gridColor", _gridColor);
-
-    // Changes GL state:
+    // Change GL state:
+#ifndef __APPLE__
     glLineWidth(_lineWidth);
+#else
+    glLineWidth(1.f);
+#endif
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnablei(GL_BLEND, 0);
     glEnable(GL_LINE_SMOOTH);
+    glDepthMask(false);
 
     glBindVertexArray(_vaoID);
     glDrawArrays(_mode, 0, static_cast<GLsizei>(_varray.size()));
@@ -202,16 +176,14 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){
 
     _gridProgram->deactivate();
 
-    // Restores GL State
+    // Restore GL State
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetLineState();
+    global::renderEngine->openglStateCache().resetDepthState();
 }
 
 void RenderableBoxGrid::update(const UpdateData&) {
     if (_gridIsDirty) {
-        //_vsize = (_segments + 1) * (_segments + 1);
-        //_varray.resize(_vsize);
-
         const glm::vec3 llf = -_size.value() / 2.f;
         const glm::vec3 urb =  _size.value() / 2.f;
 
@@ -244,6 +216,9 @@ void RenderableBoxGrid::update(const UpdateData&) {
         const glm::vec3 v6 = glm::vec3(urb.x, urb.y, urb.z);
         const glm::vec3 v7 = glm::vec3(llf.x, urb.y, urb.z);
 
+        _varray.clear();
+        _varray.reserve(16);
+
         // First add the bounds
         _varray.push_back({ v0.x, v0.y, v0.z });
         _varray.push_back({ v1.x, v1.y, v1.z });
@@ -262,7 +237,6 @@ void RenderableBoxGrid::update(const UpdateData&) {
         _varray.push_back({ v7.x, v7.y, v7.z });
         _varray.push_back({ v3.x, v3.y, v3.z });
 
-
         glBindVertexArray(_vaoID);
         glBindBuffer(GL_ARRAY_BUFFER, _vBufferID);
         glBufferData(
@@ -272,15 +246,7 @@ void RenderableBoxGrid::update(const UpdateData&) {
             GL_STATIC_DRAW
         );
 
-        glVertexAttribPointer(
-            0,
-            3,
-            GL_FLOAT,
-            GL_FALSE,
-            sizeof(Vertex),
-            nullptr 
-        );
-
+        glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
         glBindVertexArray(0);
 
         _gridIsDirty = false;
diff --git a/modules/base/rendering/grids/renderableboxgrid.h b/modules/base/rendering/grids/renderableboxgrid.h
index 69eaed2727..818e570ed6 100644
--- a/modules/base/rendering/grids/renderableboxgrid.h
+++ b/modules/base/rendering/grids/renderableboxgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,6 +27,7 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
@@ -59,7 +60,7 @@ protected:
 
     ghoul::opengl::ProgramObject* _gridProgram = nullptr;
 
-    properties::Vec3Property _gridColor;
+    properties::Vec3Property _color;
     properties::FloatProperty _lineWidth;
     properties::Vec3Property _size;
 
diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp
index e8b8857103..861b54598b 100644
--- a/modules/base/rendering/grids/renderablegrid.cpp
+++ b/modules/base/rendering/grids/renderablegrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,7 +29,6 @@
 #include <openspace/engine/globals.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/glm.h>
@@ -39,9 +38,9 @@
 namespace {
     constexpr const char* ProgramName = "GridProgram";
 
-    constexpr openspace::properties::Property::PropertyInfo GridColorInfo = {
-        "GridColor",
-        "Grid Color",
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
+        "Color",
+        "Color",
         "This value determines the color of the grid lines that are rendered."
     };
 
@@ -63,84 +62,55 @@ namespace {
         "Grid Size",
         "This value species the size of each dimensions of the grid"
     };
+
+    struct [[codegen::Dictionary(RenderableGrid)]] Parameters {
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color;
+
+        // [[codegen::verbatim(SegmentsInfo.description)]]
+        std::optional<glm::ivec2> segments;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+
+        // [[codegen::verbatim(SizeInfo.description)]]
+        std::optional<glm::vec2> size;
+    };
+#include "renderablegrid_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableGrid::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableGrid",
-        "base_renderable_grid",
-        {
-            {
-                GridColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                GridColorInfo.description
-            },
-            {
-                SegmentsInfo.identifier,
-                new DoubleVector2Verifier, // @TODO (emmbr 2020-07-07): should be Int, but specification test fails...
-                Optional::Yes,
-                SegmentsInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            },
-            {
-                SizeInfo.identifier,
-                new DoubleVector2Verifier,
-                Optional::Yes,
-                SizeInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_grid";
+    return doc;
 }
 
 RenderableGrid::RenderableGrid(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _gridColor(GridColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
+    , _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, 0.f, 20.f)
     , _size(SizeInfo, glm::vec2(1e20f), glm::vec2(1.f), glm::vec2(1e35f))
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableGrid"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    if (dictionary.hasKey(GridColorInfo.identifier)) {
-        _gridColor = dictionary.value<glm::vec3>(GridColorInfo.identifier);
-    }
-    _gridColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_gridColor);
+    _color = p.color.value_or(_color);
+    _color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_color);
 
-    if (dictionary.hasKey(SegmentsInfo.identifier)) {
-        _segments = static_cast<glm::uvec2>(
-            dictionary.value<glm::vec2>(SegmentsInfo.identifier)
-        );
-    }
+    _segments = p.segments.value_or(_segments);
     _segments.onChange([&]() { _gridIsDirty = true; });
     addProperty(_segments);
 
-    if (dictionary.hasKey(LineWidthInfo.identifier)) {
-        _lineWidth = static_cast<float>(
-            dictionary.value<double>(LineWidthInfo.identifier)
-        );
-    }
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
-    if (dictionary.hasKey(SizeInfo.identifier)) {
-        _size = dictionary.value<glm::vec2>(SizeInfo.identifier);
-    }
+    _size = p.size.value_or(_size);
     _size.onChange([&]() { _gridIsDirty = true; });
     addProperty(_size);
 }
@@ -189,8 +159,6 @@ void RenderableGrid::deinitializeGL() {
 void RenderableGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
-    _gridProgram->setUniform("opacity", _opacity);
-
     glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
         glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
@@ -203,14 +171,19 @@ void RenderableGrid::render(const RenderData& data, RendererTasks&){
         "MVPTransform",
         glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
     );
+    _gridProgram->setUniform("opacity", _opacity);
+    _gridProgram->setUniform("gridColor", _color);
 
-    _gridProgram->setUniform("gridColor", _gridColor);
-
-    // Changes GL state:
+    // Change GL state:
+#ifndef __APPLE__
     glLineWidth(_lineWidth);
+#else
+    glLineWidth(1.f);
+#endif
     glEnablei(GL_BLEND, 0);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_LINE_SMOOTH);
+    glDepthMask(false);
 
     glBindVertexArray(_vaoID);
     glDrawArrays(_mode, 0, static_cast<GLsizei>(_varray.size()));
@@ -218,9 +191,10 @@ void RenderableGrid::render(const RenderData& data, RendererTasks&){
 
     _gridProgram->deactivate();
 
-    // Restores GL State
+    // Restore GL State
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetLineState();
+    global::renderEngine->openglStateCache().resetDepthState();
 }
 
 void RenderableGrid::update(const UpdateData&) {
@@ -230,13 +204,13 @@ void RenderableGrid::update(const UpdateData&) {
 
     const glm::vec2 halfSize = _size.value() / 2.f;
     const glm::uvec2 nSegments = _segments.value();
-    const glm::vec2 step = _size.value() / static_cast<glm::vec2>(nSegments); 
+    const glm::vec2 step = _size.value() / static_cast<glm::vec2>(nSegments);
 
     const int nLines = (2 * nSegments.x * nSegments.y) + nSegments.x + nSegments.y;
     const int nVertices = 2 * nLines;
     _varray.resize(nVertices);
     // OBS! Could be optimized further by removing duplicate vertices
-       
+
     int nr = 0;
     for (unsigned int i = 0; i < nSegments.x; ++i) {
         for (unsigned int j = 0; j < nSegments.y; ++j) {
diff --git a/modules/base/rendering/grids/renderablegrid.h b/modules/base/rendering/grids/renderablegrid.h
index 79d43df723..c630265517 100644
--- a/modules/base/rendering/grids/renderablegrid.h
+++ b/modules/base/rendering/grids/renderablegrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,14 +28,13 @@
 #include <openspace/rendering/renderable.h>
 
 #include <openspace/properties/stringproperty.h>
-#include <openspace/properties/matrix/dmat4property.h>
-#include <openspace/properties/scalar/intproperty.h>
-#include <openspace/properties/vector/uvec2property.h>
+#include <openspace/properties/vector/ivec2property.h>
+#include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/properties/vector/vec3property.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
-namespace ghoul::opengl { class ProgramObject; } 
+namespace ghoul::opengl { class ProgramObject; }
 namespace openspace::documentation { struct Documentation; }
 
 namespace openspace {
@@ -61,8 +60,10 @@ protected:
 
     ghoul::opengl::ProgramObject* _gridProgram = nullptr;
 
-    properties::Vec3Property _gridColor;
-    properties::UVec2Property _segments;
+    properties::Vec3Property _color;
+    // @TODO (abock, 2021-01-28)  This was a UVec2Property before, but it wasn't supported
+    // be the codegen.  As soon as it does, this should be changed back
+    properties::IVec2Property _segments;
     properties::FloatProperty _lineWidth;
     properties::Vec2Property _size;
 
diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp
index 0b61d9fc56..1c90c090a1 100644
--- a/modules/base/rendering/grids/renderableradialgrid.cpp
+++ b/modules/base/rendering/grids/renderableradialgrid.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,20 +28,20 @@
 #include <modules/base/basemodule.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 #include <openspace/documentation/verifier.h>
 #include <ghoul/glm.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
+#include <optional>
 
 namespace {
     constexpr const char* ProgramName = "GridProgram";
 
-    constexpr openspace::properties::Property::PropertyInfo GridColorInfo = {
-        "GridColor",
-        "Grid Color",
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
+        "Color",
+        "Color",
         "This value determines the color of the grid lines that are rendered."
     };
 
@@ -49,7 +49,7 @@ namespace {
         "GridSegments",
         "Number of Grid Segments",
         "Specifies the number of segments for the grid, in the radial and angular "
-        " direction respectively"
+        "direction respectively"
     };
 
     constexpr openspace::properties::Property::PropertyInfo CircleSegmentsInfo = {
@@ -77,98 +77,60 @@ namespace {
         "The inner radius of the circular grid, that is the radius of the inmost ring. "
         "Must be smaller than the outer radius."
     };
+
+    struct [[codegen::Dictionary(RenderableRadialGrid)]] Parameters {
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color;
+
+        // [[codegen::verbatim(GridSegmentsInfo.description)]]
+        std::optional<glm::ivec2> gridSegments;
+
+        // [[codegen::verbatim(CircleSegmentsInfo.description)]]
+        std::optional<int> circleSegments;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+
+        // [[codegen::verbatim(OuterRadiusInfo.description)]]
+        std::optional<float> outerRadius;
+
+        // [[codegen::verbatim(InnerRadiusInfo.description)]]
+        std::optional<float> innerRadius;
+    };
+#include "renderableradialgrid_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableRadialGrid::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableRadialGrid",
-        "base_renderable_radialgrid",
-        {
-            {
-                GridColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                GridColorInfo.description
-            },
-            {
-                GridSegmentsInfo.identifier,
-                new DoubleVector2Verifier,
-                Optional::Yes,
-                GridSegmentsInfo.description
-            },
-            {
-                CircleSegmentsInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                CircleSegmentsInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            },
-            {
-                OuterRadiusInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                OuterRadiusInfo.description
-            },
-            {
-                InnerRadiusInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                InnerRadiusInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_radialgrid";
+    return doc;
 }
 
 RenderableRadialGrid::RenderableRadialGrid(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _gridColor(GridColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
-    , _gridSegments(
-        GridSegmentsInfo, 
-        glm::ivec2(1, 1),  
-        glm::ivec2(1),
-        glm::ivec2(200)
-    )
+    , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
+    , _gridSegments(GridSegmentsInfo, glm::ivec2(1), glm::ivec2(1), glm::ivec2(200))
     , _circleSegments(CircleSegmentsInfo, 36, 4, 200)
     , _lineWidth(LineWidthInfo, 0.5f, 0.f, 20.f)
     , _maxRadius(OuterRadiusInfo, 1.f, 0.f, 20.f)
     , _minRadius(InnerRadiusInfo, 0.f, 0.f, 20.f)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableRadialGrid"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    if (dictionary.hasKey(GridColorInfo.identifier)) {
-        _gridColor = dictionary.value<glm::vec3>(GridColorInfo.identifier);
-    }
-    _gridColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_gridColor);
+    _color = p.color.value_or(_color);
+    _color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_color);
 
-    if (dictionary.hasKey(GridSegmentsInfo.identifier)) {
-        _gridSegments = static_cast<glm::ivec2>(
-            dictionary.value<glm::vec2>(GridSegmentsInfo.identifier)
-        );
-    }
+    _gridSegments = p.gridSegments.value_or(_gridSegments);
     _gridSegments.onChange([&]() { _gridIsDirty = true; });
     addProperty(_gridSegments);
 
-    if (dictionary.hasKey(CircleSegmentsInfo.identifier)) {
-        _circleSegments = static_cast<int>(
-            dictionary.value<double>(CircleSegmentsInfo.identifier)
-        );
-    }
+    _circleSegments = p.circleSegments.value_or(_circleSegments);
     _circleSegments.onChange([&]() {
         if (_circleSegments.value() % 2 == 1) {
             _circleSegments = _circleSegments - 1;
@@ -177,24 +139,11 @@ RenderableRadialGrid::RenderableRadialGrid(const ghoul::Dictionary& dictionary)
     });
     addProperty(_circleSegments);
 
-    if (dictionary.hasKey(LineWidthInfo.identifier)) {
-        _lineWidth = static_cast<float>(
-            dictionary.value<double>(LineWidthInfo.identifier)
-        );
-    }
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
-    if (dictionary.hasKey(OuterRadiusInfo.identifier)) {
-        _maxRadius = static_cast<float>(
-            dictionary.value<double>(OuterRadiusInfo.identifier)
-        );
-    }
-
-    if (dictionary.hasKey(InnerRadiusInfo.identifier)) {
-        _minRadius = static_cast<float>(
-            dictionary.value<double>(InnerRadiusInfo.identifier)
-        );
-    }
+    _minRadius = p.innerRadius.value_or(_minRadius);
+    _maxRadius = p.outerRadius.value_or(_maxRadius);
 
     _maxRadius.setMinValue(_minRadius);
     _minRadius.setMaxValue(_maxRadius);
@@ -243,8 +192,6 @@ void RenderableRadialGrid::deinitializeGL() {
 void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
     _gridProgram->activate();
 
-    _gridProgram->setUniform("opacity", _opacity);
-
     const glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
         glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
@@ -258,21 +205,20 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
         "MVPTransform",
         glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
     );
-    
-    _gridProgram->setUniform("gridColor", _gridColor);
-
-    float adjustedLineWidth = 1.f;
+    _gridProgram->setUniform("opacity", _opacity);
+    _gridProgram->setUniform("gridColor", _color);
 
+    // Change GL state:
 #ifndef __APPLE__
-    adjustedLineWidth = _lineWidth;
+    glLineWidth(_lineWidth);
+#else
+    glLineWidth(1.f);
 #endif
-
-    // Changes GL state:
-    glLineWidth(adjustedLineWidth);
     glEnablei(GL_BLEND, 0);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_LINE_SMOOTH);
-    
+    glDepthMask(false);
+
     for (GeometryData& c : _circles) {
         c.render();
     }
@@ -281,9 +227,10 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) {
 
     _gridProgram->deactivate();
 
-    // Restores GL State
+    // Restore GL State
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetLineState();
+    global::renderEngine->openglStateCache().resetDepthState();
 }
 
 void RenderableRadialGrid::update(const UpdateData&) {
@@ -324,7 +271,6 @@ void RenderableRadialGrid::update(const UpdateData&) {
     // Lines
     const int nLines = _gridSegments.value()[1];
     const int nVertices = 2 * nLines;
-    const float fsegments = static_cast<float>(nLines);
 
     _lines.varray.clear();
     _lines.varray.reserve(nVertices);
@@ -337,9 +283,9 @@ void RenderableRadialGrid::update(const UpdateData&) {
             rendering::helper::createRing(nLines, _minRadius);
 
         for (int i = 0; i < nLines; ++i) {
-            const rendering::helper::VertexXYZ vOut = 
+            const rendering::helper::VertexXYZ vOut =
                 rendering::helper::convertToXYZ(outerVertices[i]);
-            
+
             const rendering::helper::VertexXYZ vIn =
                 rendering::helper::convertToXYZ(innerVertices[i]);
 
@@ -352,7 +298,7 @@ void RenderableRadialGrid::update(const UpdateData&) {
     _gridIsDirty = false;
 }
 
-RenderableRadialGrid::GeometryData::GeometryData(GLenum renderMode) 
+RenderableRadialGrid::GeometryData::GeometryData(GLenum renderMode)
     : mode(renderMode)
 {
     glGenVertexArrays(1, &vao);
@@ -375,8 +321,8 @@ RenderableRadialGrid::GeometryData::GeometryData(GeometryData&& other) noexcept
     other.vbo = 0;
 }
 
-RenderableRadialGrid::GeometryData& 
-RenderableRadialGrid::GeometryData::operator=(GeometryData&& other) noexcept 
+RenderableRadialGrid::GeometryData&
+RenderableRadialGrid::GeometryData::operator=(GeometryData&& other) noexcept
 {
     if (this != &other) {
         vao = other.vao;
@@ -409,11 +355,11 @@ void RenderableRadialGrid::GeometryData::update() {
     );
 
     glVertexAttribPointer(
-        0, 
-        3, 
-        GL_FLOAT, 
-        GL_FALSE, 
-        sizeof(rendering::helper::VertexXYZ), 
+        0,
+        3,
+        GL_FLOAT,
+        GL_FALSE,
+        sizeof(rendering::helper::VertexXYZ),
         nullptr
     );
 }
diff --git a/modules/base/rendering/grids/renderableradialgrid.h b/modules/base/rendering/grids/renderableradialgrid.h
index cc2abfb7dd..f719808f3d 100644
--- a/modules/base/rendering/grids/renderableradialgrid.h
+++ b/modules/base/rendering/grids/renderableradialgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,7 +27,6 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/ivec2property.h>
@@ -75,7 +74,7 @@ protected:
 
     ghoul::opengl::ProgramObject* _gridProgram;
 
-    properties::Vec3Property _gridColor;
+    properties::Vec3Property _color;
     properties::IVec2Property _gridSegments;
     properties::IntProperty _circleSegments;
     properties::FloatProperty _lineWidth;
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp
index 76e2467944..1580276c27 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.cpp
+++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,20 +27,20 @@
 #include <modules/base/basemodule.h>
 #include <openspace/engine/globals.h>
 #include <openspace/rendering/renderengine.h>
-#include <openspace/util/spicemanager.h>
 #include <openspace/util/updatestructures.h>
 #include <openspace/documentation/verifier.h>
 #include <ghoul/glm.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
+#include <optional>
 
 namespace {
     constexpr const char* ProgramName = "GridProgram";
 
-    constexpr openspace::properties::Property::PropertyInfo GridColorInfo = {
-        "GridColor",
-        "Grid Color",
+    constexpr openspace::properties::Property::PropertyInfo ColorInfo = {
+        "Color",
+        "Color",
         "This value determines the color of the grid lines that are rendered."
     };
 
@@ -56,69 +56,45 @@ namespace {
         "Line Width",
         "This value specifies the line width of the spherical grid."
     };
+
+    struct [[codegen::Dictionary(RenderableSphericalGrid)]] Parameters {
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color;
+
+        // [[codegen::verbatim(SegmentsInfo.description)]]
+        std::optional<int> segments;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+    };
+#include "renderablesphericalgrid_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableSphericalGrid::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableSphericalGrid",
-        "base_renderable_sphericalgrid",
-        {
-            {
-                GridColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                GridColorInfo.description
-            },
-            {
-                SegmentsInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                SegmentsInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_sphericalgrid";
+    return doc;
 }
 
-
 RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _gridProgram(nullptr)
-    , _gridColor(
-        GridColorInfo,
-        glm::vec3(0.5f, 0.5, 0.5f),
-        glm::vec3(0.f),
-        glm::vec3(1.f)
-    )
+    , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f))
     , _segments(SegmentsInfo, 36, 4, 200)
     , _lineWidth(LineWidthInfo, 0.5f, 0.f, 20.f)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableSphericalGrid"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    if (dictionary.hasKey(GridColorInfo.identifier)) {
-        _gridColor = dictionary.value<glm::vec3>(GridColorInfo.identifier);
-    }
-    _gridColor.setViewOption(properties::Property::ViewOptions::Color);
-    addProperty(_gridColor);
+    _color = p.color.value_or(_color);
+    _color.setViewOption(properties::Property::ViewOptions::Color);
+    addProperty(_color);
 
-    if (dictionary.hasKey(SegmentsInfo.identifier)) {
-        _segments = static_cast<int>(dictionary.value<double>(SegmentsInfo.identifier));
-    }
+    _segments = p.segments.value_or(_segments);
     _segments.onChange([&]() {
         if (_segments.value() % 2 == 1) {
             _segments = _segments - 1;
@@ -127,11 +103,7 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio
     });
     addProperty(_segments);
 
-    if (dictionary.hasKey(LineWidthInfo.identifier)) {
-        _lineWidth = static_cast<float>(
-            dictionary.value<double>(LineWidthInfo.identifier)
-        );
-    }
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 }
 
@@ -186,8 +158,6 @@ void RenderableSphericalGrid::deinitializeGL() {
 void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
     _gridProgram->activate();
 
-    _gridProgram->setUniform("opacity", _opacity);
-
     const glm::dmat4 modelTransform =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) * // Translation
         glm::dmat4(data.modelTransform.rotation) *  // Spice rotation
@@ -201,21 +171,20 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
         "MVPTransform",
         glm::dmat4(data.camera.projectionMatrix()) * modelViewTransform
     );
-    
-    _gridProgram->setUniform("gridColor", _gridColor);
-
-    float adjustedLineWidth = 1.f;
+    _gridProgram->setUniform("opacity", _opacity);
+    _gridProgram->setUniform("gridColor", _color);
 
+    // Change GL state:
 #ifndef __APPLE__
-    adjustedLineWidth = _lineWidth;
+    glLineWidth(_lineWidth);
+#else
+    glLineWidth(1.f);
 #endif
-
-    // Changes GL state:
-    glLineWidth(adjustedLineWidth);
     glEnablei(GL_BLEND, 0);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable(GL_LINE_SMOOTH);
-    
+    glDepthMask(false);
+
     glBindVertexArray(_vaoID);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
     glDrawElements(_mode, _isize, GL_UNSIGNED_INT, nullptr);
@@ -223,9 +192,10 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){
 
     _gridProgram->deactivate();
 
-    // Restores GL State
+    // Restore GL State
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetLineState();
+    global::renderEngine->openglStateCache().resetDepthState();
 }
 
 void RenderableSphericalGrid::update(const UpdateData&) {
diff --git a/modules/base/rendering/grids/renderablesphericalgrid.h b/modules/base/rendering/grids/renderablesphericalgrid.h
index 15639132af..99efc7dafb 100644
--- a/modules/base/rendering/grids/renderablesphericalgrid.h
+++ b/modules/base/rendering/grids/renderablesphericalgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,7 +27,6 @@
 
 #include <openspace/rendering/renderable.h>
 
-#include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/vector/vec3property.h>
@@ -61,7 +60,7 @@ protected:
 
     ghoul::opengl::ProgramObject* _gridProgram;
 
-    properties::Vec3Property _gridColor;
+    properties::Vec3Property _color;
     properties::IntProperty _segments;
     properties::FloatProperty _lineWidth;
 
diff --git a/modules/base/rendering/modelgeometry.cpp b/modules/base/rendering/modelgeometry.cpp
index f6a2e8424f..25baaa777a 100644
--- a/modules/base/rendering/modelgeometry.cpp
+++ b/modules/base/rendering/modelgeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -82,11 +82,10 @@ documentation:: Documentation ModelGeometry::Documentation() {
     };
 }
 
-// Create with ghoul::mm_unique_ptr 
 ghoul::mm_unique_ptr<ModelGeometry> ModelGeometry::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
-    if (!dictionary.hasKeyAndValue<std::string>(KeyType)) {
+    if (!dictionary.hasValue<std::string>(KeyType)) {
         throw ghoul::RuntimeError("Dictionary did not contain a key 'Type'");
     }
 
diff --git a/modules/base/rendering/modelgeometry.h b/modules/base/rendering/modelgeometry.h
index c087d57d7e..4e27ddec04 100644
--- a/modules/base/rendering/modelgeometry.h
+++ b/modules/base/rendering/modelgeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/multimodelgeometry.cpp b/modules/base/rendering/multimodelgeometry.cpp
index 96bed213a3..714dd767b9 100644
--- a/modules/base/rendering/multimodelgeometry.cpp
+++ b/modules/base/rendering/multimodelgeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/multimodelgeometry.h b/modules/base/rendering/multimodelgeometry.h
index c8d2c116a9..d5a2d0d1de 100644
--- a/modules/base/rendering/multimodelgeometry.h
+++ b/modules/base/rendering/multimodelgeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp
index e188f362ac..67b4f00783 100644
--- a/modules/base/rendering/renderablecartesianaxes.cpp
+++ b/modules/base/rendering/renderablecartesianaxes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,6 +34,7 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
+#include <optional>
 
 namespace {
     constexpr const char* ProgramName = "CartesianAxesProgram";
@@ -56,39 +57,29 @@ namespace {
         "Z Color",
         "This value determines the color of the z axis."
     };
+
+    struct [[codegen::Dictionary(RenderableCartesianAxes)]] Parameters {
+        // [[codegen::verbatim(XColorInfo.description)]]
+        std::optional<glm::vec3> xColor;
+
+        // [[codegen::verbatim(YColorInfo.description)]]
+        std::optional<glm::vec3> yColor;
+
+        // [[codegen::verbatim(ZColorInfo.description)]]
+        std::optional<glm::vec3> zColor;
+
+    };
+#include "renderablecartesianaxes_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableCartesianAxes::Documentation() {
-    using namespace documentation;
-    return {
-        "CartesianAxesProgram",
-        "base_renderable_cartesianaxes",
-        {
-            {
-                XColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                XColorInfo.description
-            },
-            {
-                YColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                YColorInfo.description
-            },
-            {
-                ZColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                ZColorInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_cartesianaxes";
+    return doc;
 }
 
-
 RenderableCartesianAxes::RenderableCartesianAxes(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _program(nullptr)
@@ -111,27 +102,16 @@ RenderableCartesianAxes::RenderableCartesianAxes(const ghoul::Dictionary& dictio
         glm::vec3(1.f)
     )
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableCartesianAxes"
-    );
-
-    if (dictionary.hasKey(XColorInfo.identifier)) {
-        _xColor = dictionary.value<glm::vec3>(XColorInfo.identifier);
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _xColor = p.xColor.value_or(_xColor);
     _xColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_xColor);
 
-    if (dictionary.hasKey(XColorInfo.identifier)) {
-        _yColor = dictionary.value<glm::vec3>(YColorInfo.identifier);
-    }
+    _yColor = p.yColor.value_or(_yColor);
     _yColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_yColor);
 
-    if (dictionary.hasKey(ZColorInfo.identifier)) {
-        _zColor = dictionary.value<glm::vec3>(ZColorInfo.identifier);
-    }
+    _zColor = p.zColor.value_or(_zColor);
     _zColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_zColor);
 }
diff --git a/modules/base/rendering/renderablecartesianaxes.h b/modules/base/rendering/renderablecartesianaxes.h
index 99741b9fb6..1d3df373bc 100644
--- a/modules/base/rendering/renderablecartesianaxes.h
+++ b/modules/base/rendering/renderablecartesianaxes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderabledisc.cpp b/modules/base/rendering/renderabledisc.cpp
new file mode 100644
index 0000000000..c3de8be2b1
--- /dev/null
+++ b/modules/base/rendering/renderabledisc.cpp
@@ -0,0 +1,230 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/renderabledisc.h>
+
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globals.h>
+#include <openspace/rendering/renderengine.h>
+#include <openspace/scene/scene.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 <ghoul/opengl/textureunit.h>
+
+namespace {
+    constexpr const char _loggerCat[] = "RenderableDisc";
+
+    constexpr const std::array<const char*, 4> UniformNames = {
+        "modelViewProjectionTransform", "opacity", "width", "colorTexture"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
+        "Texture",
+        "Texture",
+        "This value is the path to a texture on disk that contains a one-dimensional "
+        "texture to be used for the color."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo SizeInfo = {
+        "Size",
+        "Size",
+        "This value specifies the outer radius of the disc in meter."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo WidthInfo = {
+        "Width",
+        "Width",
+        "This value is used to set the width of the disc. The actual width is set "
+        "based on the given size and this value should be set between 0 and 1. A value "
+        "of 1 results in a full circle and 0.5 a disc with an inner radius of 0.5*size."
+    };
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderableDisc::Documentation() {
+    using namespace documentation;
+    return {
+        "Renderable Disc",
+        "renderable_disc",
+        {
+            {
+                TextureInfo.identifier,
+                new StringVerifier,
+                Optional::No,
+                TextureInfo.description
+            },
+            {
+                SizeInfo.identifier,
+                new DoubleVerifier,
+                Optional::Yes,
+                SizeInfo.description
+            },
+            {
+                WidthInfo.identifier,
+                new DoubleVerifier,
+                Optional::Yes,
+                WidthInfo.description
+            }
+        }
+    };
+}
+
+RenderableDisc::RenderableDisc(const ghoul::Dictionary& dictionary)
+    : Renderable(dictionary)
+    , _texturePath(TextureInfo)
+    , _size(SizeInfo, 1.f, 0.f, 1e13f)
+    , _width(WidthInfo, 0.5f, 0.f, 1.f)
+{
+    documentation::testSpecificationAndThrow(
+        Documentation(),
+        dictionary,
+        "RenderableDisc"
+    );
+
+    _texturePath = absPath(dictionary.value<std::string>(TextureInfo.identifier));
+    _texturePath.onChange([&]() { _texture->loadFromFile(_texturePath); });
+    addProperty(_texturePath);
+
+    if (dictionary.hasKey(SizeInfo.identifier)) {
+        _size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
+    }
+    setBoundingSphere(_size);
+    _size.onChange([&]() { _planeIsDirty = true; });
+    addProperty(_size);
+
+    if (dictionary.hasKey(WidthInfo.identifier)) {
+        _width = static_cast<float>(dictionary.value<double>(WidthInfo.identifier));
+    }
+    addProperty(_width);
+    addProperty(_opacity);
+
+    setRenderBin(Renderable::RenderBin::PostDeferredTransparent);
+}
+
+bool RenderableDisc::isReady() const {
+    return _shader && _texture && _plane;
+}
+
+void RenderableDisc::initialize() {
+    _texture = std::make_unique<TextureComponent>();
+    _texture->setFilterMode(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
+    _texture->setWrapping(ghoul::opengl::Texture::WrappingMode::ClampToEdge);
+    _texture->setShouldWatchFileForChanges(true);
+
+    _plane = std::make_unique<PlaneGeometry>(planeSize());
+}
+
+void RenderableDisc::initializeGL() {
+    initializeShader();
+
+    _texture->loadFromFile(_texturePath);
+    _texture->uploadToGpu();
+
+    _plane->initialize();
+}
+
+void RenderableDisc::deinitializeGL() {
+    _plane->deinitialize();
+    _plane = nullptr;
+    _texture = nullptr;
+
+    global::renderEngine->removeRenderProgram(_shader.get());
+    _shader = nullptr;
+}
+
+void RenderableDisc::render(const RenderData& data, RendererTasks&) {
+    _shader->activate();
+
+    glm::dmat4 modelTransform =
+        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
+        glm::dmat4(data.modelTransform.rotation) *
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+
+    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+
+    _shader->setUniform(
+        _uniformCache.modelViewProjection,
+        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+    );
+    _shader->setUniform(_uniformCache.width, _width);
+
+    _shader->setUniform(_uniformCache.opacity, _opacity);
+
+    ghoul::opengl::TextureUnit unit;
+    unit.activate();
+    _texture->bind();
+    _shader->setUniform(_uniformCache.texture, unit);
+
+    glEnablei(GL_BLEND, 0);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glDepthMask(false);
+    glDisable(GL_CULL_FACE);
+
+    _plane->render();
+
+    _shader->deactivate();
+
+    // Restores GL State
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
+    global::renderEngine->openglStateCache().resetPolygonAndClippingState();
+}
+
+void RenderableDisc::update(const UpdateData&) {
+    if (_shader->isDirty()) {
+        _shader->rebuildFromFile();
+        updateUniformLocations();
+    }
+
+    if (_planeIsDirty) {
+        _plane->updateSize(planeSize());
+        _planeIsDirty = false;
+    }
+
+    _texture->update();
+}
+
+void RenderableDisc::initializeShader() {
+    _shader = global::renderEngine->buildRenderProgram(
+        "DiscProgram",
+        absPath("${MODULE_BASE}/shaders/disc_vs.glsl"),
+        absPath("${MODULE_BASE}/shaders/disc_fs.glsl")
+    );
+    updateUniformLocations();
+}
+
+void RenderableDisc::updateUniformLocations() {
+   ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+}
+
+float RenderableDisc::planeSize() const {
+    return _size;
+}
+
+} // namespace openspace
diff --git a/modules/base/rendering/renderabledisc.h b/modules/base/rendering/renderabledisc.h
new file mode 100644
index 0000000000..ccd5d52288
--- /dev/null
+++ b/modules/base/rendering/renderabledisc.h
@@ -0,0 +1,81 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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_BASE___RENDERABLEDISC___H__
+#define __OPENSPACE_MODULE_BASE___RENDERABLEDISC___H__
+
+#include <openspace/properties/stringproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/rendering/texturecomponent.h>
+#include <openspace/util/planegeometry.h>
+#include <ghoul/opengl/uniformcache.h>
+#include <ghoul/opengl/ghoul_gl.h>
+
+namespace ghoul::filesystem { class File; }
+namespace ghoul::opengl { class ProgramObject; }
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+class RenderableDisc : public Renderable {
+public:
+    RenderableDisc(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();
+
+protected:
+    virtual void initializeShader();
+    virtual void updateUniformLocations();
+
+    virtual float planeSize() const;
+
+    properties::StringProperty _texturePath;
+    properties::FloatProperty _size;
+    properties::FloatProperty _width;
+
+    std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
+
+    std::unique_ptr<PlaneGeometry> _plane;
+    std::unique_ptr<TextureComponent> _texture;
+
+private:
+    UniformCache(modelViewProjection, opacity, width, texture) _uniformCache;
+
+    bool _planeIsDirty = false;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_BASE___RENDERABLEDISC___H__
diff --git a/modules/base/rendering/renderablelabels.cpp b/modules/base/rendering/renderablelabels.cpp
index efadca6ec9..d5a240cc74 100644
--- a/modules/base/rendering/renderablelabels.cpp
+++ b/modules/base/rendering/renderablelabels.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -46,10 +46,9 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/string_cast.hpp>
+#include <optional>
 
 namespace {
-    constexpr const char* _loggerCat = "base::RenderableLabels";
-
     constexpr const char* MeterUnit = "m";
     constexpr const char* KilometerUnit = "Km";
     constexpr const char* MegameterUnit = "Mm";
@@ -176,122 +175,91 @@ namespace {
         "Fade-In/-Out ending speed.",
         "Fade-In/-Out ending speed."
     };
+
+    struct [[codegen::Dictionary(RenderableLabels)]] Parameters {
+        enum class BlendMode {
+            Normal,
+            Additive
+        };
+
+        // [[codegen::verbatim(BlendModeInfo.description)]]
+        std::optional<BlendMode> blendMode;
+
+        enum class Orientation {
+            ViewDirection [[codegen::key("Camera View Direction")]],
+            PositionNormal [[codegen::key("Camera Position Normal")]]
+        };
+
+        // [[codegen::verbatim(LabelOrientationOptionInfo.description)]]
+        std::optional<Orientation> labelOrientationOption;
+
+        // [[codegen::verbatim(LabelColorInfo.description)]]
+        std::optional<glm::vec3> labelColor;
+
+        // [[codegen::verbatim(LabelTextInfo.description)]]
+        std::optional<std::string> labelText;
+
+        // [[codegen::verbatim(FontSizeInfo.description)]]
+        std::optional<float> fontSize;
+
+        // [[codegen::verbatim(LabelSizeInfo.description)]]
+        std::optional<float> labelSize;
+
+        // [[codegen::verbatim(LabelMinSizeInfo.description)]]
+        std::optional<float> labelMinSize;
+
+        // [[codegen::verbatim(LabelMaxSizeInfo.description)]]
+        std::optional<float> labelMaxSize;
+
+        // [[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;
+
+        enum class Unit {
+            Meter [[codegen::key("m")]],
+            Kilometer [[codegen::key("Km")]],
+            Megameter [[codegen::key("Mm")]],
+            Gigameter [[codegen::key("Gm")]],
+            Terameter [[codegen::key("Tm")]],
+            Petameter [[codegen::key("Pm")]],
+            AstronomicalUnit [[codegen::key("au")]],
+            Parsec [[codegen::key("pc")]],
+            KiloParsec [[codegen::key("Kpc")]],
+            MegaParsec [[codgen::key("Mpc")]],
+            GigaParsec [[codegen::key("Gpc")]],
+            GigaLightyear [[codegen::key("Gly")]]
+        };
+
+        // [[codegen::verbatim(FadeStartUnitOptionInfo.description)]]
+        std::optional<Unit> fadeStartUnit;
+
+        // [[codegen::verbatim(FadeEndUnitOptionInfo.description)]]
+        std::optional<Unit> fadeEndUnit;
+
+        // [[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;
+    };
+#include "renderablelabels_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableLabels::Documentation() {
-    using namespace documentation;
-    return {
-        "Renderable Labels",
-        "base_renderable_labels",
-        {
-            {
-                BlendModeInfo.identifier,
-                new StringInListVerifier({ "Normal", "Additive" }),
-                Optional::Yes,
-                BlendModeInfo.description, // + " The default value is 'Normal'.",
-            },
-            {
-                LabelOrientationOptionInfo.identifier,
-                new StringInListVerifier(
-                    { "Camera View Direction", "Camera Position Normal" }
-                ),
-                Optional::Yes,
-                LabelOrientationOptionInfo.description,
-            },
-            {
-                LabelColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                LabelColorInfo.description,
-            },
-            {
-                LabelTextInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                LabelTextInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                LabelSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LabelSizeInfo.description
-            },
-            {
-                LabelMinSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LabelMinSizeInfo.description
-            },
-            {
-                LabelMaxSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LabelMaxSizeInfo.description
-            },
-            {
-                EnableFadingEffectInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                EnableFadingEffectInfo.description
-            },
-            {
-                PixelSizeControlInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                PixelSizeControlInfo.description
-            },
-            {
-                FadeStartUnitOptionInfo.identifier,
-                new StringInListVerifier(
-                    { "m", "Km", "Mm", "Gm", "au", "Tm", "Pm", "pc", "Kpc", "Mpc",
-                      "Gpc", "Gly"}
-                ),
-                Optional::Yes,
-                FadeStartUnitOptionInfo.description,
-            },
-            {
-                FadeEndUnitOptionInfo.identifier,
-                new StringInListVerifier(
-                    {"m", "Km", "Mm", "Gm", "au", "Tm", "Pm", "pc", "Kpc", "Mpc",
-                     "Gpc", "Gly"}
-                ),
-                Optional::Yes,
-                FadeEndUnitOptionInfo.description,
-            },
-            {
-                FadeStartDistInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                FadeStartDistInfo.description
-            },
-            {
-                FadeEndDistInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                FadeEndDistInfo.description
-            },
-            {
-                FadeStartSpeedInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                FadeStartSpeedInfo.description
-            },
-            {
-                FadeEndSpeedInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                FadeEndSpeedInfo.description
-            },
-        }
-    };
+    return codegen::doc<Parameters>();
 }
 
 RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
@@ -327,11 +295,7 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
         properties::OptionProperty::DisplayType::Dropdown
     )
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableLabels"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
@@ -353,13 +317,14 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
         }
     });
 
-    if (dictionary.hasKey(BlendModeInfo.identifier)) {
-        const std::string v = dictionary.value<std::string>(BlendModeInfo.identifier);
-        if (v == "Normal") {
-            _blendMode = BlendModeNormal;
-        }
-        else if (v == "Additive") {
-            _blendMode = BlendModeAdditive;
+    if (p.blendMode.has_value()) {
+        switch (*p.blendMode) {
+            case Parameters::BlendMode::Normal:
+                _blendMode = BlendModeNormal;
+                break;
+            case Parameters::BlendMode::Additive:
+                _blendMode = BlendModeAdditive;
+                break;
         }
     }
 
@@ -369,35 +334,26 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
     _labelOrientationOption.addOption(NormalDirection, "Camera Position Normal");
 
     _labelOrientationOption = NormalDirection;
-    if (dictionary.hasKeyAndValue<std::string>(LabelOrientationOptionInfo.identifier)) {
-        const std::string o = dictionary.value<std::string>(
-            LabelOrientationOptionInfo.identifier
-            );
-
-        if (o == "Camera View Direction") {
-            _labelOrientationOption = ViewDirection;
-        }
-        else if (o == "Camera Position Normal") {
-            _labelOrientationOption = NormalDirection;
+    if (p.labelOrientationOption.has_value()) {
+        switch (*p.labelOrientationOption) {
+            case Parameters::Orientation::ViewDirection:
+                _labelOrientationOption = ViewDirection;
+                break;
+            case Parameters::Orientation::PositionNormal:
+                _labelOrientationOption = NormalDirection;
+                break;
         }
     }
-
-    if (dictionary.hasKey(LabelTextInfo.identifier)) {
-        _labelText = dictionary.value<std::string>(LabelTextInfo.identifier);
-    }
-    addProperty(_labelText);
-
     addProperty(_labelOrientationOption);
 
+    _labelText = p.labelText.value_or(_labelText);
+    addProperty(_labelText);
+
+    _labelColor = p.labelColor.value_or(_labelColor);
     _labelColor.setViewOption(properties::Property::ViewOptions::Color);
-    if (dictionary.hasKey(LabelColorInfo.identifier)) {
-        _labelColor = dictionary.value<glm::vec3>(LabelColorInfo.identifier);
-    }
     addProperty(_labelColor);
 
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = dictionary.value<float>(FontSizeInfo.identifier);
-    }
+    _fontSize = p.fontSize.value_or(_fontSize);
     _fontSize.onChange([&]() {
         _font = global::fontManager->font(
             "Mono",
@@ -408,41 +364,28 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
     });
     addProperty(_fontSize);
 
-    if (dictionary.hasKey(LabelSizeInfo.identifier)) {
-        _labelSize = dictionary.value<float>(LabelSizeInfo.identifier);
-    }
+    _labelSize = p.labelSize.value_or(_labelSize);
     addProperty(_labelSize);
 
-    if (dictionary.hasKey(LabelMinSizeInfo.identifier)) {
-        _labelMinSize = dictionary.value<float>(LabelMinSizeInfo.identifier);
-    }
+    _labelMinSize = p.labelMinSize.value_or(_labelMinSize);
     addProperty(_labelMinSize);
 
-    if (dictionary.hasKey(LabelMaxSizeInfo.identifier)) {
-        _labelMaxSize = dictionary.value<float>(LabelMaxSizeInfo.identifier);
-    }
+    _labelMaxSize = p.labelMaxSize.value_or(_labelMaxSize);
     addProperty(_labelMaxSize);
 
-    if (dictionary.hasKey(TransformationMatrixInfo.identifier)) {
-        _transformationMatrix = dictionary.value<glm::dmat4>(
-            TransformationMatrixInfo.identifier
-            );
-    }
+    _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
-    if (dictionary.hasKey(PixelSizeControlInfo.identifier)) {
-        _pixelSizeControl = dictionary.value<bool>(PixelSizeControlInfo.identifier);
+    _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);
     }
 
-    if (dictionary.hasKey(EnableFadingEffectInfo.identifier)) {
-        _enableFadingEffect = dictionary.value<bool>(EnableFadingEffectInfo.identifier);
-    }
+    _enableFadingEffect = p.enableFading.value_or(_enableFadingEffect);
     addProperty(_enableFadingEffect);
 
-    if (dictionary.hasKey(FadeStartDistInfo.identifier)) {
-        _fadeStartDistance = dictionary.value<float>(FadeStartDistInfo.identifier);
-    }
-
+    _fadeStartDistance = p.fadeStartDistance.value_or(_fadeStartDistance);
     addProperty(_fadeStartDistance);
 
     _fadeStartUnitOption.addOption(Meter, MeterUnit);
@@ -458,68 +401,56 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
     _fadeStartUnitOption.addOption(Gigaparsec, GigaparsecUnit);
     _fadeStartUnitOption.addOption(GigalightYears, GigalightyearUnit);
 
-    _fadeStartUnitOption = AU;
 
-    if (dictionary.hasKey(FadeStartUnitOptionInfo.identifier)) {
-        std::string unit = dictionary.value<std::string>(
-            FadeStartUnitOptionInfo.identifier
-        );
-        if (unit == MeterUnit) {
-            _fadeStartUnitOption = Meter;
-        }
-        else if (unit == KilometerUnit) {
-            _fadeStartUnitOption = Kilometer;
-        }
-        else if (unit == MegameterUnit) {
-            _fadeStartUnitOption = Megameter;
-        }
-        else if (unit == GigameterUnit) {
-            _fadeStartUnitOption = Gigameter;
-        }
-        else if (unit == AstronomicalUnit) {
-            _fadeStartUnitOption = AU;
-        }
-        else if (unit == TerameterUnit) {
-            _fadeStartUnitOption = Terameter;
-        }
-        else if (unit == PetameterUnit) {
-            _fadeStartUnitOption = Petameter;
-        }
-        else if (unit == ParsecUnit) {
-            _fadeStartUnitOption = Parsec;
-        }
-        else if (unit == KiloparsecUnit) {
-            _fadeStartUnitOption = Kiloparsec;
-        }
-        else if (unit == MegaparsecUnit) {
-            _fadeStartUnitOption = Megaparsec;
-        }
-        else if (unit == GigaparsecUnit) {
-            _fadeStartUnitOption = Gigaparsec;
-        }
-        else if (unit == GigalightyearUnit) {
-            _fadeStartUnitOption = GigalightYears;
-        }
-        else {
-            LWARNING(
-                "No unit given for RenderableLabels. Using kilometer as units."
-            );
-            _fadeStartUnitOption = Kilometer;
+    if (p.fadeStartUnit.has_value()) {
+        switch (*p.fadeStartUnit) {
+            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:
+                _fadeStartUnitOption = Kiloparsec;
+                break;
+            case Parameters::Unit::MegaParsec:
+                _fadeStartUnitOption = Megaparsec;
+                break;
+            case Parameters::Unit::GigaParsec:
+                _fadeStartUnitOption = Gigaparsec;
+                break;
+            case Parameters::Unit::GigaLightyear:
+                _fadeStartUnitOption = GigalightYears;
+                break;
         }
     }
-
+    else {
+        _fadeStartUnitOption = AU;
+    }
     addProperty(_fadeStartUnitOption);
 
-    if (dictionary.hasKey(FadeStartSpeedInfo.identifier)) {
-        _fadeStartSpeed = dictionary.value<float>(FadeStartSpeedInfo.identifier);
-    }
-
+    _fadeStartSpeed = p.fadeStartSpeed.value_or(_fadeStartSpeed);
     addProperty(_fadeStartSpeed);
 
-    if (dictionary.hasKey(FadeEndDistInfo.identifier)) {
-        _fadeEndDistance = dictionary.value<float>(FadeEndDistInfo.identifier);
-    }
-
+    _fadeEndDistance = p.fadeEndDistance.value_or(_fadeEndDistance);
     addProperty(_fadeEndDistance);
 
     _fadeEndUnitOption.addOption(Meter, MeterUnit);
@@ -535,62 +466,53 @@ RenderableLabels::RenderableLabels(const ghoul::Dictionary& dictionary)
     _fadeEndUnitOption.addOption(Gigaparsec, GigaparsecUnit);
     _fadeEndUnitOption.addOption(GigalightYears, GigalightyearUnit);
 
-    _fadeEndUnitOption = AU;
 
-    if (dictionary.hasKey(FadeEndUnitOptionInfo.identifier)) {
-        std::string unit = dictionary.value<std::string>(
-            FadeEndUnitOptionInfo.identifier
-        );
-        if (unit == MeterUnit) {
-            _fadeEndUnitOption = Meter;
-        }
-        else if (unit == KilometerUnit) {
-            _fadeEndUnitOption = Kilometer;
-        }
-        else if (unit == MegameterUnit) {
-            _fadeEndUnitOption = Megameter;
-        }
-        else if (unit == GigameterUnit) {
-            _fadeEndUnitOption = Gigameter;
-        }
-        else if (unit == AstronomicalUnit) {
-            _fadeEndUnitOption = AU;
-        }
-        else if (unit == TerameterUnit) {
-            _fadeEndUnitOption = Terameter;
-        }
-        else if (unit == PetameterUnit) {
-            _fadeEndUnitOption = Petameter;
-        }
-        else if (unit == ParsecUnit) {
-            _fadeEndUnitOption = Parsec;
-        }
-        else if (unit == KiloparsecUnit) {
-            _fadeEndUnitOption = Kiloparsec;
-        }
-        else if (unit == MegaparsecUnit) {
-            _fadeEndUnitOption = Megaparsec;
-        }
-        else if (unit == GigaparsecUnit) {
-            _fadeEndUnitOption = Gigaparsec;
-        }
-        else if (unit == GigalightyearUnit) {
-            _fadeEndUnitOption = GigalightYears;
-        }
-        else {
-            LWARNING(
-                "No unit given for RenderableLabels. Using kilometer as units."
-            );
-            _fadeEndUnitOption = Kilometer;
+    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);
-
-    if (dictionary.hasKey(FadeEndSpeedInfo.identifier)) {
-        _fadeEndSpeed = dictionary.value<float>(FadeEndSpeedInfo.identifier);
-    }
-
+    
+    _fadeEndSpeed = p.fadeEndSpeed.value_or(_fadeEndSpeed);
     addProperty(_fadeEndSpeed);
 }
 
@@ -601,11 +523,6 @@ bool RenderableLabels::isReady() const {
 void RenderableLabels::initialize() {
     ZoneScoped
 
-    bool success = true;// loadData();
-    if (!success) {
-        throw ghoul::RuntimeError("Error loading objects labels data.");
-    }
-
     setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
 }
 
diff --git a/modules/base/rendering/renderablelabels.h b/modules/base/rendering/renderablelabels.h
index af3b90ece5..a1cad2dd6d 100644
--- a/modules/base/rendering/renderablelabels.h
+++ b/modules/base/rendering/renderablelabels.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp
index 0aa9bb2273..ec98dc83e8 100644
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,11 +34,11 @@
 #include <openspace/util/updatestructures.h>
 #include <openspace/scene/scene.h>
 #include <openspace/scene/lightsource.h>
-
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/invariants.h>
 #include <ghoul/misc/profiling.h>
+#include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
 
@@ -46,11 +46,25 @@ namespace {
     constexpr const char* ProgramName = "ModelProgram";
     constexpr const char* KeyGeometry = "Geometry";
 
-    constexpr const std::array<const char*, 12> UniformNames = {
+    constexpr const int DefaultBlending = 0;
+    constexpr const int AdditiveBlending = 1;
+    constexpr const int PointsAndLinesBlending = 2;
+    constexpr const int PolygonBlending = 3;
+    constexpr const int ColorAddingBlending = 4;
+
+    std::map<std::string, int> BlendingMapping = {
+        { "Default", DefaultBlending },
+        { "Additive", AdditiveBlending },
+        { "Points and Lines", PointsAndLinesBlending },
+        { "Polygon", PolygonBlending },
+        { "Color Adding", ColorAddingBlending }
+    };
+
+    constexpr const std::array<const char*, 13> UniformNames = {
         "opacity", "nLightSources", "lightDirectionsViewSpace", "lightIntensities",
-        "modelViewTransform", "crippedModelViewTransform", "projectionTransform", 
-        "performShading", "texture1", "ambientIntensity", "diffuseIntensity", 
-        "specularIntensity"
+        "modelViewTransform", "normalTransform", "projectionTransform",
+        "performShading", "texture1", "ambientIntensity", "diffuseIntensity",
+        "specularIntensity", "opacityBlending"
     };
 
     constexpr openspace::properties::Property::PropertyInfo AmbientIntensityInfo = {
@@ -102,6 +116,24 @@ namespace {
         "Light Sources",
         "A list of light sources that this model should accept light from."
     };
+
+    constexpr openspace::properties::Property::PropertyInfo DisableDepthTestInfo = {
+        "DisableDepthTest",
+        "Disable Depth Test",
+        "Disable Depth Testing for the Model."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo BlendingOptionInfo = {
+        "BledingOption",
+        "Blending Options",
+        "Debug option for blending colors."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo EnableOpacityBlendingInfo = {
+        "EnableOpacityBlending",
+        "Enable Opacity Blending",
+        "Enable Opacity Blending."
+    };
 } // namespace
 
 namespace openspace {
@@ -177,7 +209,25 @@ documentation::Documentation RenderableModel::Documentation() {
                 }),
                 Optional::Yes,
                 LightSourcesInfo.description
-            }
+            },
+            {
+                DisableDepthTestInfo.identifier,
+                new BoolVerifier,
+                Optional::Yes,
+                DisableDepthTestInfo.description
+            },
+            {
+                BlendingOptionInfo.identifier,
+                new StringVerifier,
+                Optional::Yes,
+                BlendingOptionInfo.description
+            },
+            {
+                EnableOpacityBlendingInfo.identifier,
+                new BoolVerifier,
+                Optional::Yes,
+                EnableOpacityBlendingInfo.description
+            },
         }
     };
 }
@@ -196,6 +246,12 @@ 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)
+    , _blendingFuncOption(
+        BlendingOptionInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
     , _lightSourcePropertyOwner({ "LightSources", "Light Sources" })
 {
     documentation::testSpecificationAndThrow(
@@ -222,19 +278,23 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
     }
 
     if (dictionary.hasKey(AmbientIntensityInfo.identifier)) {
-        _ambientIntensity = dictionary.value<float>(AmbientIntensityInfo.identifier);
+        _ambientIntensity = dictionary.value<double>(AmbientIntensityInfo.identifier);
     }
     if (dictionary.hasKey(DiffuseIntensityInfo.identifier)) {
-        _diffuseIntensity = dictionary.value<float>(DiffuseIntensityInfo.identifier);
+        _diffuseIntensity = dictionary.value<double>(DiffuseIntensityInfo.identifier);
     }
     if (dictionary.hasKey(SpecularIntensityInfo.identifier)) {
-        _specularIntensity = dictionary.value<float>(SpecularIntensityInfo.identifier);
+        _specularIntensity = dictionary.value<double>(SpecularIntensityInfo.identifier);
     }
 
     if (dictionary.hasKey(ShadingInfo.identifier)) {
         _performShading = dictionary.value<bool>(ShadingInfo.identifier);
     }
 
+    if (dictionary.hasKey(DisableDepthTestInfo.identifier)) {
+        _disableDepthTest = dictionary.value<bool>(DisableDepthTestInfo.identifier);
+    }
+
     if (dictionary.hasKey(DisableFaceCullingInfo.identifier)) {
         _disableFaceCulling = dictionary.value<bool>(DisableFaceCullingInfo.identifier);
     }
@@ -243,7 +303,7 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         const ghoul::Dictionary& lsDictionary =
             dictionary.value<ghoul::Dictionary>(LightSourcesInfo.identifier);
 
-        for (const std::string& k : lsDictionary.keys()) {
+        for (std::string_view k : lsDictionary.keys()) {
             std::unique_ptr<LightSource> lightSource = LightSource::createFromDictionary(
                 lsDictionary.value<ghoul::Dictionary>(k)
             );
@@ -252,14 +312,13 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
         }
     }
 
-
     addPropertySubOwner(_lightSourcePropertyOwner);
-
     addProperty(_ambientIntensity);
     addProperty(_diffuseIntensity);
     addProperty(_specularIntensity);
     addProperty(_performShading);
     addProperty(_disableFaceCulling);
+    addProperty(_disableDepthTest);
     addProperty(_modelTransform);
     addProperty(_rotationVec);
 
@@ -269,8 +328,31 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary)
 
 
     if (dictionary.hasKey(RotationVecInfo.identifier)) {
-        _rotationVec = dictionary.value<glm::vec3>(RotationVecInfo.identifier);
+        _rotationVec = dictionary.value<glm::dvec3>(RotationVecInfo.identifier);
     }
+
+    _blendingFuncOption.addOption(DefaultBlending, "Default");
+    _blendingFuncOption.addOption(AdditiveBlending, "Additive");
+    _blendingFuncOption.addOption(PointsAndLinesBlending, "Points and Lines");
+    _blendingFuncOption.addOption(PolygonBlending, "Polygon");
+    _blendingFuncOption.addOption(ColorAddingBlending, "Color Adding");
+
+    addProperty(_blendingFuncOption);
+
+    if (dictionary.hasKey(BlendingOptionInfo.identifier)) {
+        const std::string blendingOpt = dictionary.value<std::string>(
+            BlendingOptionInfo.identifier
+        );
+        _blendingFuncOption.set(BlendingMapping[blendingOpt]);
+    }
+
+    if (dictionary.hasKey(DisableDepthTestInfo.identifier)) {
+        _enableOpacityBlending = dictionary.value<bool>(
+            EnableOpacityBlendingInfo.identifier
+        );
+    }
+
+    addProperty(_enableOpacityBlending);
 }
 
 bool RenderableModel::isReady() const {
@@ -369,13 +451,11 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
         glm::mat4(modelViewTransform)
     );
 
-    glm::dmat4 crippedModelViewTransform = glm::transpose(glm::inverse(
-        glm::dmat4(glm::inverse(data.camera.sgctInternal.viewMatrix())) * modelViewTransform
-    ));
+    glm::dmat4 normalTransform = glm::transpose(glm::inverse(modelViewTransform));
 
     _program->setUniform(
-        _uniformCache.crippedModelViewTransform,
-        glm::mat4(crippedModelViewTransform)
+        _uniformCache.normalTransform,
+        glm::mat4(normalTransform)
     );
 
     _program->setUniform(
@@ -386,11 +466,35 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
     _program->setUniform(_uniformCache.diffuseIntensity, _diffuseIntensity);
     _program->setUniform(_uniformCache.specularIntensity, _specularIntensity);
     _program->setUniform(_uniformCache.performShading, _performShading);
+    _program->setUniform(_uniformCache.opacityBlending, _enableOpacityBlending);
 
     if (_disableFaceCulling) {
         glDisable(GL_CULL_FACE);
     }
 
+    glEnablei(GL_BLEND, 0);
+    switch (_blendingFuncOption) {
+        case DefaultBlending:
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            break;
+        case AdditiveBlending:
+            glBlendFunc(GL_ONE, GL_ONE);
+            break;
+        case PointsAndLinesBlending:
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            break;
+        case PolygonBlending:
+            glBlendFunc(GL_SRC_ALPHA_SATURATE, GL_ONE);
+            break;
+        case ColorAddingBlending:
+            glBlendFunc(GL_SRC_COLOR, GL_DST_COLOR);
+            break;
+    };
+
+    if (_disableDepthTest) {
+        glDisable(GL_DEPTH_TEST);
+    }
+
     ghoul::opengl::TextureUnit unit;
     unit.activate();
     _program->setUniform(_uniformCache.texture, unit);
@@ -403,6 +507,12 @@ void RenderableModel::render(const RenderData& data, RendererTasks&) {
         glEnable(GL_CULL_FACE);
     }
 
+    global::renderEngine->openglStateCache().resetBlendState();
+
+    if (_disableDepthTest) {
+        glEnable(GL_DEPTH_TEST);
+    }
+
     _program->deactivate();
 }
 
diff --git a/modules/base/rendering/renderablemodel.h b/modules/base/rendering/renderablemodel.h
index 721de33f44..67db1e1c39 100644
--- a/modules/base/rendering/renderablemodel.h
+++ b/modules/base/rendering/renderablemodel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,7 +26,8 @@
 #define __OPENSPACE_MODULE_BASE___RENDERABLEMODEL___H__
 
 #include <openspace/rendering/renderable.h>
-
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/stringproperty.h>
 #include <openspace/properties/matrix/dmat4property.h>
 #include <openspace/properties/matrix/mat3property.h>
 #include <openspace/properties/scalar/boolproperty.h>
@@ -79,11 +80,15 @@ private:
     properties::DMat4Property _modelTransform;
     properties::Vec3Property _rotationVec;
 
+    properties::BoolProperty _disableDepthTest;
+    properties::BoolProperty _enableOpacityBlending;
+    properties::OptionProperty _blendingFuncOption;
+
     ghoul::opengl::ProgramObject* _program = nullptr;
     UniformCache(opacity, nLightSources, lightDirectionsViewSpace, lightIntensities,
-        modelViewTransform, crippedModelViewTransform, projectionTransform, 
-        performShading, texture, ambientIntensity, diffuseIntensity, 
-        specularIntensity) _uniformCache;
+        modelViewTransform, normalTransform, projectionTransform,
+        performShading, texture, ambientIntensity, diffuseIntensity,
+        specularIntensity, opacityBlending) _uniformCache;
 
     std::vector<std::unique_ptr<LightSource>> _lightSources;
 
diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp
index fe875fd7df..779c28e226 100644
--- a/modules/base/rendering/renderablenodeline.cpp
+++ b/modules/base/rendering/renderablenodeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -84,81 +84,54 @@ namespace {
         glm::dvec3 diffPos = worldPos - anchorNodePos;
         return diffPos;
     }
+
+    struct [[codegen::Dictionary(RenderableNodeLine)]] Parameters {
+        // [[codegen::verbatim(StartNodeInfo.description)]]
+        std::optional<std::string> startNode;
+
+        // [[codegen::verbatim(EndNodeInfo.description)]]
+        std::optional<std::string> endNode;
+
+        // [[codegen::verbatim(LineColorInfo.description)]]
+        std::optional<glm::vec3> color;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+    };
+#include "renderablenodeline_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableNodeLine::Documentation() {
-    using namespace documentation;
-    return {
-        "Renderable Node Line",
-        "base_renderable_renderablenodeline",
-        {
-            {
-                StartNodeInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                StartNodeInfo.description
-            },
-            {
-                EndNodeInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                EndNodeInfo.description
-            },
-            {
-                LineColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                LineColorInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_renderablenodeline";
+    return doc;
 }
 
 RenderableNodeLine::RenderableNodeLine(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
-    , _lineWidth(LineWidthInfo, 2.f, 1.f, 20.f)
     , _start(StartNodeInfo, Root)
     , _end(EndNodeInfo, Root)
+    , _lineColor(LineColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
+    , _lineWidth(LineWidthInfo, 2.f, 1.f, 20.f)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableNodeLine"
-    );
-
-    if (dictionary.hasKey(StartNodeInfo.identifier)) {
-        _start = dictionary.value<std::string>(StartNodeInfo.identifier);
-    }
-
-    if (dictionary.hasKey(EndNodeInfo.identifier)) {
-        _end = dictionary.value<std::string>(EndNodeInfo.identifier);
-    }
-
-    if (dictionary.hasKey(LineColorInfo.identifier)) {
-        _lineColor = dictionary.value<glm::vec3>(LineColorInfo.identifier);
-    }
-    if (dictionary.hasKey(LineWidthInfo.identifier)) {
-        _lineWidth = static_cast<float>(
-            dictionary.value<double>(LineWidthInfo.identifier)
-        );
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    _start = p.startNode.value_or(_start);
     _start.onChange([&]() { validateNodes(); });
-    _end.onChange([&]() { validateNodes(); });
-
     addProperty(_start);
+
+    _end = p.endNode.value_or(_end);
+    _end.onChange([&]() { validateNodes(); });
     addProperty(_end);
+
+    _lineColor = p.color.value_or(_lineColor);
     addProperty(_lineColor);
+    
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
+
     addProperty(_opacity);
 }
 
@@ -249,8 +222,6 @@ void RenderableNodeLine::updateVertexData() {
     _vertexArray.push_back(static_cast<float>(_endPos.y));
     _vertexArray.push_back(static_cast<float>(_endPos.z));
 
-    _vertexArray;
-
     bindGL();
     glBufferData(
         GL_ARRAY_BUFFER,
diff --git a/modules/base/rendering/renderablenodeline.h b/modules/base/rendering/renderablenodeline.h
index 075f59eea0..fbeddba723 100644
--- a/modules/base/rendering/renderablenodeline.h
+++ b/modules/base/rendering/renderablenodeline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderableplane.cpp b/modules/base/rendering/renderableplane.cpp
index 93202d9578..b718506c3e 100644
--- a/modules/base/rendering/renderableplane.cpp
+++ b/modules/base/rendering/renderableplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -40,6 +40,7 @@
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/glm.h>
 #include <glm/gtx/string_cast.hpp>
+#include <optional>
 
 namespace {
     constexpr const char* ProgramName = "Plane";
@@ -68,58 +69,45 @@ namespace {
         "Blending Mode",
         "This determines the blending mode that is applied to this plane."
     };
+
+    struct [[codegen::Dictionary(RenderablePlane)]] Parameters {
+        // [[codegen::verbatim(BillboardInfo.description)]]
+        std::optional<bool> billboard;
+
+        // [[codegen::verbatim(SizeInfo.description)]]
+        float size;
+        
+        enum class BlendMode {
+            Normal,
+            Additive
+        };
+        // [[codegen::verbatim(BlendModeInfo.description)]]
+        std::optional<BlendMode> blendMode;
+    };
+#include "renderableplane_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderablePlane::Documentation() {
-    using namespace documentation;
-    return {
-        "Renderable Plane",
-        "base_renderable_plane",
-        {
-            {
-                SizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::No,
-                SizeInfo.description
-            },
-            {
-                BillboardInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                BillboardInfo.description
-            },
-            {
-                BlendModeInfo.identifier,
-                new StringInListVerifier({ "Normal", "Additive" }),
-                Optional::Yes,
-                BlendModeInfo.description, // + " The default value is 'Normal'.",
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_plane";
+    return doc;
 }
 
 RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
+    , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _billboard(BillboardInfo, false)
     , _size(SizeInfo, 10.f, 0.f, 1e25f)
-    , _blendMode(BlendModeInfo, properties::OptionProperty::DisplayType::Dropdown)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderablePlane"
-    );
+    Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    _size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
-
-    if (dictionary.hasKey(BillboardInfo.identifier)) {
-        _billboard = dictionary.value<bool>(BillboardInfo.identifier);
-    }
+    _size = p.size;
+    _billboard = p.billboard.value_or(_billboard);
 
     _blendMode.addOptions({
         { BlendModeNormal, "Normal" },
@@ -144,12 +132,11 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
         }
     });
 
-    if (dictionary.hasKey(BlendModeInfo.identifier)) {
-        const std::string v = dictionary.value<std::string>(BlendModeInfo.identifier);
-        if (v == "Normal") {
+    if (p.blendMode.has_value()) {
+        if (*p.blendMode == Parameters::BlendMode::Normal) {
             _blendMode = BlendModeNormal;
         }
-        else if (v == "Additive") {
+        else if (*p.blendMode == Parameters::BlendMode::Additive) {
             _blendMode = BlendModeAdditive;
         }
     }
diff --git a/modules/base/rendering/renderableplane.h b/modules/base/rendering/renderableplane.h
index 4f29066be1..12d9d50ab1 100644
--- a/modules/base/rendering/renderableplane.h
+++ b/modules/base/rendering/renderableplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderableplaneimagelocal.cpp b/modules/base/rendering/renderableplaneimagelocal.cpp
index a6d711a046..c3a7279bde 100644
--- a/modules/base/rendering/renderableplaneimagelocal.cpp
+++ b/modules/base/rendering/renderableplaneimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,10 +35,9 @@
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/texture.h>
 #include <fstream>
+#include <optional>
 
 namespace {
-    constexpr const char* KeyLazyLoading = "LazyLoading";
-
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
@@ -52,54 +51,47 @@ namespace {
        "This value specifies if the plane should be rendered in the Background,"
        "Opaque, Transparent, or Overlay rendering step."
     };
+
+    struct [[codegen::Dictionary(RenderablePlaneImageLocal)]] Parameters {
+        // [[codegen::verbatim(TextureInfo.description)]]
+        std::string texture;
+
+        enum class RenderType {
+            Background,
+            Opaque,
+            PreDeferredTransparency,
+            PostDeferredTransparency,
+            Overlay
+        };
+
+        // [[codegen::verbatim(RenderableTypeInfo.description)]]
+        std::optional<RenderType> renderType [[codegen::key("RenderableType")]];
+
+        // If this value is set to 'true', the image for this plane will not be loaded at
+        // startup but rather when image is shown for the first time. Additionally, if the
+        // plane is hidden, the image will automatically be unloaded
+        std::optional<bool> lazyLoading;
+    };
+#include "renderableplaneimagelocal_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderablePlaneImageLocal::Documentation() {
-    using namespace documentation;
-    return {
-        "Renderable Plane Image Local",
-        "base_renderable_plane_image_local",
-        {
-            {
-                TextureInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                TextureInfo.description
-            },
-            {
-                RenderableTypeInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                RenderableTypeInfo.description
-            },
-            {
-                KeyLazyLoading,
-                new BoolVerifier,
-                Optional::Yes,
-                "If this value is set to 'true', the image for this plane will not be "
-                "loaded at startup but rather when image is shown for the first time. "
-                "Additionally, if the plane is hidden, the image will automatically be "
-                "unloaded"
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_plane_image_local";
+    return doc;
 }
 
 RenderablePlaneImageLocal::RenderablePlaneImageLocal(const ghoul::Dictionary& dictionary)
     : RenderablePlane(dictionary)
     , _texturePath(TextureInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderablePlaneImageLocal"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_blendMode);
 
-    _texturePath = absPath(dictionary.value<std::string>(TextureInfo.identifier));
+    _texturePath = absPath(p.texture);
     _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
 
     addProperty(_texturePath);
@@ -108,44 +100,40 @@ RenderablePlaneImageLocal::RenderablePlaneImageLocal(const ghoul::Dictionary& di
         [this](const ghoul::filesystem::File&) { _textureIsDirty = true; }
     );
 
-    if (dictionary.hasKey(RenderableTypeInfo.identifier)) {
-        std::string renderType = dictionary.value<std::string>(
-            RenderableTypeInfo.identifier
-        );
-        if (renderType == "Background") {
-            setRenderBin(Renderable::RenderBin::Background);
-        }
-        else if (renderType == "Opaque") {
-            setRenderBin(Renderable::RenderBin::Opaque);
-        }
-        else if (renderType == "PreDeferredTransparent") {
-            setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
-        }
-        else if (renderType == "PostDeferredTransparent") {
-            setRenderBin(Renderable::RenderBin::PostDeferredTransparent);
-        }
-        else if (renderType == "Overlay") {
-            setRenderBin(Renderable::RenderBin::Overlay);
+    if (p.renderType.has_value()) {
+        switch (*p.renderType) {
+            case Parameters::RenderType::Background:
+                setRenderBin(Renderable::RenderBin::Background);
+                break;
+            case Parameters::RenderType::Opaque:
+                setRenderBin(Renderable::RenderBin::Opaque);
+                break;
+            case Parameters::RenderType::PreDeferredTransparency:
+                setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
+                break;
+            case Parameters::RenderType::PostDeferredTransparency:
+                setRenderBin(Renderable::RenderBin::PostDeferredTransparent);
+                break;
+            case Parameters::RenderType::Overlay:
+                setRenderBin(Renderable::RenderBin::Overlay);
+                break;
         }
     }
     else {
         setRenderBin(Renderable::RenderBin::Opaque);
     }
 
-    if (dictionary.hasKey(KeyLazyLoading)) {
-        _isLoadingLazily = dictionary.value<bool>(KeyLazyLoading);
-
-        if (_isLoadingLazily) {
-            _enabled.onChange([this]() {
-                if (!_enabled) {
-                    BaseModule::TextureManager.release(_texture);
-                    _texture = nullptr;
-                }
-                if (_enabled) {
-                    _textureIsDirty = true;
-                }
-            });
-        }
+    _isLoadingLazily = p.lazyLoading.value_or(_isLoadingLazily);
+    if (_isLoadingLazily) {
+        _enabled.onChange([this]() {
+            if (!_enabled) {
+                BaseModule::TextureManager.release(_texture);
+                _texture = nullptr;
+            }
+            if (_enabled) {
+                _textureIsDirty = true;
+            }
+        });
     }
 }
 
diff --git a/modules/base/rendering/renderableplaneimagelocal.h b/modules/base/rendering/renderableplaneimagelocal.h
index 0e428296de..42e7e178c1 100644
--- a/modules/base/rendering/renderableplaneimagelocal.h
+++ b/modules/base/rendering/renderableplaneimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderableplaneimageonline.cpp b/modules/base/rendering/renderableplaneimageonline.cpp
index 86b93d5bd2..c99eb90755 100644
--- a/modules/base/rendering/renderableplaneimageonline.cpp
+++ b/modules/base/rendering/renderableplaneimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,24 +41,20 @@ namespace {
         "this value is changed, the image at the new path will automatically be loaded "
         "and displayed."
     };
+
+    struct [[codegen::Dictionary(RenderablePlaneImageOnline)]] Parameters {
+        // [[codegen::verbatim(TextureInfo.description)]]
+        std::string url [[codegen::key("URL")]];
+    };
+#include "renderableplaneimageonline_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderablePlaneImageOnline::Documentation() {
-    using namespace documentation;
-    return {
-        "Renderable Plane Image Online",
-        "base_renderable_plane_image_online",
-        {
-            {
-                TextureInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                TextureInfo.description,
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_plane_image_online";
+    return doc;
 }
 
 RenderablePlaneImageOnline::RenderablePlaneImageOnline(
@@ -66,20 +62,12 @@ RenderablePlaneImageOnline::RenderablePlaneImageOnline(
     : RenderablePlane(dictionary)
     , _texturePath(TextureInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderablePlaneImageOnline"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _texturePath.onChange([this]() { _textureIsDirty = true; });
     addProperty(_texturePath);
 
-    std::string texturePath;
-    if (dictionary.hasKey(TextureInfo.identifier)) {
-        _texturePath = dictionary.value<std::string>(TextureInfo.identifier);
-    }
-
+    _texturePath = p.url;
     addProperty(_texturePath);
 }
 
diff --git a/modules/base/rendering/renderableplaneimageonline.h b/modules/base/rendering/renderableplaneimageonline.h
index 10060d8cfb..34c2bc3b1d 100644
--- a/modules/base/rendering/renderableplaneimageonline.h
+++ b/modules/base/rendering/renderableplaneimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderablesphere.cpp b/modules/base/rendering/renderablesphere.cpp
index f097a5a806..4f20d37fc2 100644
--- a/modules/base/rendering/renderablesphere.cpp
+++ b/modules/base/rendering/renderablesphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,6 +38,7 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/programobject.h>
+#include <optional>
 
 namespace {
     constexpr const char* ProgramName = "Sphere";
@@ -117,81 +118,55 @@ namespace {
         "Sets the current sphere rendering as a background rendering type",
         "Enables/Disables background rendering."
     };
+
+    struct [[codegen::Dictionary(RenderableSphere)]] Parameters {
+        // [[codegen::verbatim(SizeInfo.description)]]
+        float size;
+
+        // [[codegen::verbatim(SegmentsInfo.description)]]
+        int segments;
+
+        // [[codegen::verbatim(TextureInfo.description)]]
+        std::string texture;
+
+        enum class Orientation {
+            Outside,
+            Inside,
+            Both
+        };
+
+        // [[codegen::verbatim(OrientationInfo.description)]]
+        std::optional<Orientation> orientation;
+
+        // [[codegen::verbatim(UseAdditiveBlendingInfo.description)]]
+        std::optional<bool> useAdditiveBlending;
+
+        // [[codegen::verbatim(MirrorTextureInfo.description)]]
+        std::optional<bool> mirrorTexture;
+
+        // [[codegen::verbatim(FadeOutThresholdInfo.description)]]
+        std::optional<float> fadeOutThreshold [[codegen::inrange(0.0, 1.0)]];
+
+        // [[codegen::verbatim(FadeInThresholdInfo.description)]]
+        std::optional<float> fadeInThreshold;
+
+        // [[codegen::verbatim(DisableFadeInOutInfo.description)]]
+        std::optional<bool> disableFadeInOut;
+
+        // [[codegen::verbatim(BackgroundInfo.description)]]
+        std::optional<bool> background;
+    };
+#include "renderablesphere_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableSphere::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableSphere",
-        "base_renderable_sphere",
-        {
-            {
-                SizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::No,
-                SizeInfo.description
-            },
-            {
-                SegmentsInfo.identifier,
-                new IntVerifier,
-                Optional::No,
-                SegmentsInfo.description
-            },
-            {
-                TextureInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                TextureInfo.description
-            },
-            {
-                OrientationInfo.identifier,
-                new StringInListVerifier({ "Inside", "Outside", "Both" }),
-                Optional::Yes,
-                OrientationInfo.description
-            },
-            {
-                UseAdditiveBlendingInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                UseAdditiveBlendingInfo.description
-            },
-            {
-                MirrorTextureInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                MirrorTextureInfo.description
-            },
-            {
-                FadeOutThresholdInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 1.0),
-                Optional::Yes,
-                FadeOutThresholdInfo.description
-            },
-            {
-                FadeInThresholdInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                FadeInThresholdInfo.description
-            },
-            {
-                DisableFadeInOutInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                DisableFadeInOutInfo.description
-            },
-            {
-                BackgroundInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                BackgroundInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_renderable_sphere";
+    return doc;
 }
 
-
 RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _texturePath(TextureInfo)
@@ -205,18 +180,14 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     , _fadeInThreshold(FadeInThresholdInfo, -1.f, 0.f, 1.f)
     , _fadeOutThreshold(FadeOutThresholdInfo, -1.f, 0.f, 1.f)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableSphere"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    _size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
-    _segments = static_cast<int>(dictionary.value<double>(SegmentsInfo.identifier));
-    _texturePath = absPath(dictionary.value<std::string>(TextureInfo.identifier));
+    _size = p.size;
+    _segments = p.segments;
+    _texturePath = p.texture;
 
     _orientation.addOptions({
         { static_cast<int>(Orientation::Outside), "Outside" },
@@ -224,19 +195,19 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
         { static_cast<int>(Orientation::Both), "Both" }
     });
 
-    if (dictionary.hasKey(OrientationInfo.identifier)) {
-        const std::string& v = dictionary.value<std::string>(OrientationInfo.identifier);
-        if (v == "Inside") {
-            _orientation = static_cast<int>(Orientation::Inside);
-        }
-        else if (v == "Outside") {
-            _orientation = static_cast<int>(Orientation::Outside);
-        }
-        else if (v == "Both") {
-            _orientation = static_cast<int>(Orientation::Both);
-        }
-        else {
-            throw ghoul::MissingCaseException();
+    if (p.orientation.has_value()) {
+        switch (*p.orientation) {
+            case Parameters::Orientation::Inside:
+                _orientation = static_cast<int>(Orientation::Inside);
+                break;
+            case Parameters::Orientation::Outside:
+                _orientation = static_cast<int>(Orientation::Outside);
+                break;
+            case Parameters::Orientation::Both:
+                _orientation = static_cast<int>(Orientation::Both);
+                break;
+            default:
+                throw ghoul::MissingCaseException();
         }
     }
     else {
@@ -256,44 +227,34 @@ RenderableSphere::RenderableSphere(const ghoul::Dictionary& dictionary)
     addProperty(_mirrorTexture);
     addProperty(_useAdditiveBlending);
 
+    _mirrorTexture = p.mirrorTexture.value_or(_mirrorTexture);
+    _useAdditiveBlending = p.useAdditiveBlending.value_or(_useAdditiveBlending);
 
-    if (dictionary.hasKey(MirrorTextureInfo.identifier)) {
-       _mirrorTexture = dictionary.value<bool>(MirrorTextureInfo.identifier);
-    }
-    if (dictionary.hasKey(UseAdditiveBlendingInfo.identifier)) {
-        _useAdditiveBlending = dictionary.value<bool>(UseAdditiveBlendingInfo.identifier);
-
-        if (_useAdditiveBlending) {
-            setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
-        }
+    if (_useAdditiveBlending) {
+        setRenderBin(Renderable::RenderBin::PreDeferredTransparent);
     }
 
-    if (dictionary.hasKey(FadeOutThresholdInfo.identifier)) {
-        _fadeOutThreshold = static_cast<float>(
-            dictionary.value<double>(FadeOutThresholdInfo.identifier)
-        );
+    bool hasGivenFadeOut = p.fadeOutThreshold.has_value();
+    if (hasGivenFadeOut) {
+        _fadeOutThreshold = *p.fadeOutThreshold;
         addProperty(_fadeOutThreshold);
     }
 
-    if (dictionary.hasKey(FadeInThresholdInfo.identifier)) {
-        _fadeInThreshold = static_cast<float>(
-            dictionary.value<double>(FadeInThresholdInfo.identifier)
-        );
+    bool hasGivenFadeIn = p.fadeInThreshold.has_value();
+    if (hasGivenFadeIn) {
+        _fadeInThreshold = *p.fadeInThreshold;
         addProperty(_fadeInThreshold);
     }
 
-    if (dictionary.hasKey(FadeOutThresholdInfo.identifier) ||
-        dictionary.hasKey(FadeInThresholdInfo.identifier)) {
-        _disableFadeInDistance.set(false);
+    if (hasGivenFadeIn || hasGivenFadeOut) {
+        _disableFadeInDistance = false;
         addProperty(_disableFadeInDistance);
     }
 
-    if (dictionary.hasKey(BackgroundInfo.identifier)) {
-        _backgroundRendering = dictionary.value<bool>(BackgroundInfo.identifier);
+    _backgroundRendering = p.background.value_or(_backgroundRendering);
 
-        if (_backgroundRendering) {
-            setRenderBin(Renderable::RenderBin::Background);
-        }
+    if (_backgroundRendering) {
+        setRenderBin(Renderable::RenderBin::Background);
     }
 
     setRenderBinFromOpacity();
@@ -370,7 +331,9 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
             const float startLogFadeDistance = glm::log(_size * _fadeInThreshold);
             const float stopLogFadeDistance = startLogFadeDistance + 1.f;
 
-            if (logDistCamera > startLogFadeDistance && logDistCamera < stopLogFadeDistance) {
+            if (logDistCamera > startLogFadeDistance && logDistCamera <
+                stopLogFadeDistance)
+            {
                 const float fadeFactor = glm::clamp(
                     (logDistCamera - startLogFadeDistance) /
                     (stopLogFadeDistance - startLogFadeDistance),
@@ -391,7 +354,9 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
             const float startLogFadeDistance = glm::log(_size * _fadeOutThreshold);
             const float stopLogFadeDistance = startLogFadeDistance + 1.f;
 
-            if (logDistCamera > startLogFadeDistance && logDistCamera < stopLogFadeDistance) {
+            if (logDistCamera > startLogFadeDistance && logDistCamera <
+                stopLogFadeDistance)
+            {
                 const float fadeFactor = glm::clamp(
                     (logDistCamera - startLogFadeDistance) /
                     (stopLogFadeDistance - startLogFadeDistance),
diff --git a/modules/base/rendering/renderablesphere.h b/modules/base/rendering/renderablesphere.h
index 8369aca051..733e906fa4 100644
--- a/modules/base/rendering/renderablesphere.h
+++ b/modules/base/rendering/renderablesphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp
index 9c96849da0..12fd349498 100644
--- a/modules/base/rendering/renderabletrail.cpp
+++ b/modules/base/rendering/renderabletrail.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,7 +34,6 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/programobject.h>
-
 #include <cmath>
 
 namespace {
@@ -71,11 +70,17 @@ namespace {
     };
 
     // Fragile! Keep in sync with documentation
-    const std::map<std::string, openspace::Renderable::RenderBin> RenderBinModeConversion = {
+    const std::map<std::string, openspace::Renderable::RenderBin> RenderBinConversion = {
         { "Background", openspace::Renderable::RenderBin::Background },
         { "Opaque", openspace::Renderable::RenderBin::Opaque },
-        { "PreDeferredTransparent", openspace::Renderable::RenderBin::PreDeferredTransparent},
-        { "PostDeferredTransparent", openspace::Renderable::RenderBin::PostDeferredTransparent}
+        {
+            "PreDeferredTransparent",
+            openspace::Renderable::RenderBin::PreDeferredTransparent
+        },
+        {
+            "PostDeferredTransparent",
+            openspace::Renderable::RenderBin::PostDeferredTransparent
+        }
     };
 
     static const openspace::properties::PropertyOwner::PropertyOwnerInfo
@@ -236,25 +241,25 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
     );
     addPropertySubOwner(_translation.get());
 
-    _appearance.lineColor = dictionary.value<glm::vec3>(LineColorInfo.identifier);
+    _appearance.lineColor = dictionary.value<glm::dvec3>(LineColorInfo.identifier);
 
-    if (dictionary.hasKeyAndValue<bool>(EnableFadeInfo.identifier)) {
+    if (dictionary.hasValue<bool>(EnableFadeInfo.identifier)) {
         _appearance.useLineFade = dictionary.value<bool>(EnableFadeInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<double>(FadeInfo.identifier)) {
+    if (dictionary.hasValue<double>(FadeInfo.identifier)) {
         _appearance.lineFade = static_cast<float>(
             dictionary.value<double>(FadeInfo.identifier)
         );
     }
 
-    if (dictionary.hasKeyAndValue<double>(LineWidthInfo.identifier)) {
+    if (dictionary.hasValue<double>(LineWidthInfo.identifier)) {
         _appearance.lineWidth = static_cast<float>(dictionary.value<double>(
             LineWidthInfo.identifier
         ));
     }
 
-    if (dictionary.hasKeyAndValue<double>(PointSizeInfo.identifier)) {
+    if (dictionary.hasValue<double>(PointSizeInfo.identifier)) {
         _appearance.pointSize = static_cast<int>(
             dictionary.value<double>(PointSizeInfo.identifier)
         );
@@ -262,7 +267,7 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
 
     // This map is not accessed out of order as long as the Documentation is adapted
     // whenever the map changes. The documentation will check for valid values
-    if (dictionary.hasKeyAndValue<std::string>(RenderingModeInfo.identifier)) {
+    if (dictionary.hasValue<std::string>(RenderingModeInfo.identifier)) {
         _appearance.renderingModes = RenderingModeConversion.at(
             dictionary.value<std::string>(RenderingModeInfo.identifier)
         );
@@ -273,8 +278,8 @@ RenderableTrail::RenderableTrail(const ghoul::Dictionary& dictionary)
 
     addPropertySubOwner(_appearance);
 
-    if (dictionary.hasKeyAndValue<std::string>(RenderBinModeInfo.identifier)) {
-        openspace::Renderable::RenderBin cfgRenderBin = RenderBinModeConversion.at(
+    if (dictionary.hasValue<std::string>(RenderBinModeInfo.identifier)) {
+        openspace::Renderable::RenderBin cfgRenderBin = RenderBinConversion.at(
             dictionary.value<std::string>(RenderBinModeInfo.identifier)
         );
         setRenderBin(cfgRenderBin);
@@ -327,7 +332,7 @@ bool RenderableTrail::isReady() const {
 
 void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
                                      const RenderData& data,
-                                     const glm::dmat4& modelTransform, 
+                                     const glm::dmat4& modelTransform,
                                      RenderInformation& info, int nVertices, int offset)
 {
     ZoneScoped
@@ -340,11 +345,12 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
         data.camera.combinedViewMatrix() * modelTransform * info._localTransform
     );
 
-    const int sorting = [](RenderInformation::VertexSorting sorting) {
-        switch (sorting) {
+    const int sorting = [](RenderInformation::VertexSorting s) {
+        switch (s) {
             case RenderInformation::VertexSorting::NewestFirst: return 0;
             case RenderInformation::VertexSorting::OldestFirst: return 1;
-            case RenderInformation::VertexSorting::NoSorting: return 2;
+            case RenderInformation::VertexSorting::NoSorting:   return 2;
+            default:                                  throw ghoul::MissingCaseException();
         }
     }(info.sorting);
 
@@ -420,7 +426,7 @@ void RenderableTrail::internalRender(bool renderLines, bool renderPoints,
         }
     }
 }
-#pragma optimize("", off)
+
 void RenderableTrail::render(const RenderData& data, RendererTasks&) {
     ZoneScoped
 
diff --git a/modules/base/rendering/renderabletrail.h b/modules/base/rendering/renderabletrail.h
index 41c7437409..a65fc7fa18 100644
--- a/modules/base/rendering/renderabletrail.h
+++ b/modules/base/rendering/renderabletrail.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderabletrailorbit.cpp b/modules/base/rendering/renderabletrailorbit.cpp
index e2c182744a..7430b52092 100644
--- a/modules/base/rendering/renderabletrailorbit.cpp
+++ b/modules/base/rendering/renderabletrailorbit.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderabletrailorbit.h b/modules/base/rendering/renderabletrailorbit.h
index 49c2257e5f..c42ae56d1b 100644
--- a/modules/base/rendering/renderabletrailorbit.h
+++ b/modules/base/rendering/renderabletrailorbit.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/renderabletrailtrajectory.cpp b/modules/base/rendering/renderabletrailtrajectory.cpp
index 5efe975a24..1a5284650a 100644
--- a/modules/base/rendering/renderabletrailtrajectory.cpp
+++ b/modules/base/rendering/renderabletrailtrajectory.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -166,7 +166,7 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di
     _sampleInterval.onChange([this] { _needsFullSweep = true; });
     addProperty(_sampleInterval);
 
-    if (dictionary.hasKeyAndValue<double>(TimeSubSampleInfo.identifier)) {
+    if (dictionary.hasValue<double>(TimeSubSampleInfo.identifier)) {
         _timeStampSubsamplingFactor = static_cast<int>(
             dictionary.value<double>(TimeSubSampleInfo.identifier)
         );
@@ -174,7 +174,7 @@ RenderableTrailTrajectory::RenderableTrailTrajectory(const ghoul::Dictionary& di
     _timeStampSubsamplingFactor.onChange([this] { _subsamplingIsDirty = true; });
     addProperty(_timeStampSubsamplingFactor);
 
-    if (dictionary.hasKeyAndValue<bool>(RenderFullPathInfo.identifier)) {
+    if (dictionary.hasValue<bool>(RenderFullPathInfo.identifier)) {
         _renderFullTrail = dictionary.value<bool>(RenderFullPathInfo.identifier);
     }
     addProperty(_renderFullTrail);
diff --git a/modules/base/rendering/renderabletrailtrajectory.h b/modules/base/rendering/renderabletrailtrajectory.h
index 82a97bb968..a06b5298d5 100644
--- a/modules/base/rendering/renderabletrailtrajectory.h
+++ b/modules/base/rendering/renderabletrailtrajectory.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/screenspacedashboard.cpp b/modules/base/rendering/screenspacedashboard.cpp
index 2ddcb82b82..4cb9cf591b 100644
--- a/modules/base/rendering/screenspacedashboard.cpp
+++ b/modules/base/rendering/screenspacedashboard.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,6 +34,7 @@
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/font/fontrenderer.h>
 #include <ghoul/logging/logmanager.h>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo UseMainInfo = {
@@ -42,6 +43,15 @@ namespace {
         "If this value is set to 'true', this ScreenSpaceDashboard will use the "
         "main dashboard instead of creating an independent one."
     };
+
+    struct [[codegen::Dictionary(ScreenSpaceDashboard)]] Parameters {
+        // Specifies the GUI name of the ScreenSpaceDashboard
+        std::optional<std::string> name;
+
+        // [[codegen::verbatim(UseMainInfo.description)]]
+        std::optional<bool> useMainDashboard;
+    };
+#include "screenspacedashboard_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -115,44 +125,24 @@ int removeDashboardItemsFromScreenSpace(lua_State* L) {
     dash->dashboard().clearDashboardItems();
     return 0;
 }
-
 } // namespace luascriptfunctions
 
-
 documentation::Documentation ScreenSpaceDashboard::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "ScreenSpace Dashboard",
-        "base_screenspace_dashboard",
-        {
-            {
-                KeyName,
-                new StringVerifier,
-                Optional::Yes,
-                "Specifies the GUI name of the ScreenSpaceDashboard"
-            },
-            {
-                UseMainInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                UseMainInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_screenspace_dashboard";
+    return doc;
 }
 
 ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
     : ScreenSpaceFramebuffer(dictionary)
     , _useMainDashboard(UseMainInfo, false)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "ScreenSpaceDashboard"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    // @TODO (abock, 2021-01-29) Should this be the name variable? The identifier wasn't
+    // declared in the documentation
     std::string identifier;
-    if (dictionary.hasKeyAndValue<std::string>(KeyIdentifier)) {
+    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
         identifier = dictionary.value<std::string>(KeyIdentifier);
     }
     else {
@@ -161,9 +151,7 @@ ScreenSpaceDashboard::ScreenSpaceDashboard(const ghoul::Dictionary& dictionary)
     identifier = makeUniqueIdentifier(identifier);
     setIdentifier(std::move(identifier));
 
-    if (dictionary.hasKey(UseMainInfo.identifier)) {
-        _useMainDashboard = dictionary.value<bool>(UseMainInfo.identifier);
-    }
+    _useMainDashboard = p.useMainDashboard.value_or(_useMainDashboard);
     addProperty(_useMainDashboard);
 
     _scale = 1.f;
diff --git a/modules/base/rendering/screenspacedashboard.h b/modules/base/rendering/screenspacedashboard.h
index 49b2a8fbed..27b780fc6f 100644
--- a/modules/base/rendering/screenspacedashboard.h
+++ b/modules/base/rendering/screenspacedashboard.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp
index e2d0e6a409..e4b5898bab 100644
--- a/modules/base/rendering/screenspaceframebuffer.cpp
+++ b/modules/base/rendering/screenspaceframebuffer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/screenspaceframebuffer.h b/modules/base/rendering/screenspaceframebuffer.h
index e824179bb6..e754ed0513 100644
--- a/modules/base/rendering/screenspaceframebuffer.h
+++ b/modules/base/rendering/screenspaceframebuffer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/screenspaceimagelocal.cpp b/modules/base/rendering/screenspaceimagelocal.cpp
index 4239bb5b9a..3c74143c2f 100644
--- a/modules/base/rendering/screenspaceimagelocal.cpp
+++ b/modules/base/rendering/screenspaceimagelocal.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,6 +32,7 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureconversion.h>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo TexturePathInfo = {
@@ -42,44 +43,35 @@ namespace {
         "and displayed. The size of the image will also automatically set the default "
         "size of this plane."
     };
+
+    struct [[codegen::Dictionary(ScreenSpaceImageLocal)]] Parameters {
+        // Specifies the GUI name of the ScreenspaceImage
+        std::optional<std::string> name;
+
+        // [[codegen::verbatim(TexturePathInfo.description)]]
+        std::optional<std::string> texturePath;
+    };
+#include "screenspaceimagelocal_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation ScreenSpaceImageLocal::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "ScreenSpace Local Image",
-        "base_screenspace_image_local",
-        {
-            {
-                KeyName,
-                new StringVerifier,
-                Optional::Yes,
-                "Specifies the GUI name of the ScreenspaceImage"
-            },
-            {
-                TexturePathInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                TexturePathInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_screenspace_image_local";
+    return doc;
 }
 
 ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary)
     : ScreenSpaceRenderable(dictionary)
     , _texturePath(TexturePathInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "ScreenSpaceImageLocal"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
+    // @TODO (abock, 2021-02-02) Should this be the name variable? The identifier wasn't
+    // declared in the documentation
     std::string identifier;
-    if (dictionary.hasKeyAndValue<std::string>(KeyIdentifier)) {
+    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
         identifier = dictionary.value<std::string>(KeyIdentifier);
     }
     else {
@@ -101,16 +93,15 @@ ScreenSpaceImageLocal::ScreenSpaceImageLocal(const ghoul::Dictionary& dictionary
     });
     addProperty(_texturePath);
 
-    if (dictionary.hasKey(TexturePathInfo.identifier)) {
-        std::string path = dictionary.value<std::string>(TexturePathInfo.identifier);
-        if (!FileSys.fileExists(FileSys.absolutePath(path))) {
-            LWARNINGC(
-                "ScreenSpaceImageLocal",
-                fmt::format("Image {} did not exist for {}", path, _identifier)
-            );
+    if (p.texturePath.has_value()) {
+        if (FileSys.fileExists(FileSys.absolutePath(*p.texturePath))) {
+            _texturePath = FileSys.absolutePath(*p.texturePath);
         }
         else {
-            _texturePath = path;
+            LWARNINGC(
+                "ScreenSpaceImageLocal",
+                fmt::format("Image {} did not exist for {}", *p.texturePath, _identifier)
+            );
         }
     }
 }
diff --git a/modules/base/rendering/screenspaceimagelocal.h b/modules/base/rendering/screenspaceimagelocal.h
index 0c1fbc711e..615305e746 100644
--- a/modules/base/rendering/screenspaceimagelocal.h
+++ b/modules/base/rendering/screenspaceimagelocal.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rendering/screenspaceimageonline.cpp b/modules/base/rendering/screenspaceimageonline.cpp
index 8597122c44..ef5c527175 100644
--- a/modules/base/rendering/screenspaceimageonline.cpp
+++ b/modules/base/rendering/screenspaceimageonline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,6 +33,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/programobject.h>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
@@ -43,30 +44,23 @@ namespace {
         "and displayed. The size of the image will also automatically set the default "
         "size of this plane."
     };
+
+    struct [[codegen::Dictionary(ScreenSpaceImageOnline)]] Parameters {
+        // Specifies the GUI name of the ScreenspaceImage
+        std::optional<std::string> name;
+
+        // [[codegen::verbatim(TextureInfo.description)]]
+        std::optional<std::string> url [[codegen::key("URL")]];
+    };
+#include "screenspaceimageonline_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation ScreenSpaceImageOnline::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "ScreenSpace Online Image",
-        "base_screenspace_image_online",
-        {
-            {
-                KeyName,
-                new StringVerifier,
-                Optional::Yes,
-                "Specifies the GUI name of the ScreenspaceImage"
-            },
-            {
-                TextureInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                TextureInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_screenspace_image_online";
+    return doc;
 }
 
 ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictionary)
@@ -74,14 +68,10 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
     , _textureIsDirty(false)
     , _texturePath(TextureInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "ScreenSpaceImageOnline"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     std::string identifier;
-    if (dictionary.hasKeyAndValue<std::string>(KeyIdentifier)) {
+    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
         identifier = dictionary.value<std::string>(KeyIdentifier);
     }
     else {
@@ -92,11 +82,7 @@ ScreenSpaceImageOnline::ScreenSpaceImageOnline(const ghoul::Dictionary& dictiona
 
     _texturePath.onChange([this]() { _textureIsDirty = true; });
     addProperty(_texturePath);
-
-    std::string texturePath;
-    if (dictionary.hasKey(TextureInfo.identifier)) {
-        _texturePath = dictionary.value<std::string>(TextureInfo.identifier);
-    }
+    _texturePath = p.url.value_or(_texturePath);
 }
 
 ScreenSpaceImageOnline::~ScreenSpaceImageOnline() {} // NOLINT
diff --git a/modules/base/rendering/screenspaceimageonline.h b/modules/base/rendering/screenspaceimageonline.h
index 428bee0c3d..2301bc0302 100644
--- a/modules/base/rendering/screenspaceimageonline.h
+++ b/modules/base/rendering/screenspaceimageonline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rotation/constantrotation.cpp b/modules/base/rotation/constantrotation.cpp
index 3696f09910..d72f524f40 100644
--- a/modules/base/rotation/constantrotation.cpp
+++ b/modules/base/rotation/constantrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/updatestructures.h>
 #include <glm/gtx/quaternion.hpp>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo RotationInfo = {
@@ -41,35 +42,22 @@ namespace {
         "Rotation Rate",
         "This value determines the number of revolutions per in-game second"
     };
+
+    struct [[codegen::Dictionary(ConstantRotation)]] Parameters {
+        // [[codegen::verbatim(RotationInfo.description)]]
+        std::optional<glm::dvec3> rotationAxis;
+        // [[codegen::verbatim(RotationRateInfo.description)]]
+        std::optional<float> rotationRate;
+    };
+#include "constantrotation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation ConstantRotation::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Static Rotation",
-        "base_transform_rotation_constant",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("ConstantRotation"),
-                Optional::No
-            },
-            {
-                RotationInfo.identifier,
-                new DoubleVector3Verifier(),
-                Optional::Yes,
-                RotationInfo.description
-            },
-            {
-                RotationRateInfo.identifier,
-                new DoubleVerifier(),
-                Optional::Yes,
-                RotationRateInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_transform_rotation_constant";
+    return doc;
 }
 
 ConstantRotation::ConstantRotation(const ghoul::Dictionary& dictionary)
@@ -81,18 +69,13 @@ ConstantRotation::ConstantRotation(const ghoul::Dictionary& dictionary)
     )
     , _rotationRate(RotationRateInfo, 1.f, -1000.f, 1000.f)
 {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    _rotationAxis = p.rotationAxis.value_or(_rotationAxis);
     addProperty(_rotationAxis);
+
+    _rotationRate = p.rotationRate.value_or(_rotationRate);
     addProperty(_rotationRate);
-
-    if (dictionary.hasKeyAndValue<glm::dvec3>(RotationInfo.identifier)) {
-        _rotationAxis = dictionary.value<glm::dvec3>(RotationInfo.identifier);
-    }
-
-    if (dictionary.hasKeyAndValue<double>(RotationRateInfo.identifier)) {
-        _rotationRate = static_cast<float>(
-            dictionary.value<double>(RotationRateInfo.identifier)
-        );
-    }
 }
 
 glm::dmat3 ConstantRotation::matrix(const UpdateData& data) const {
diff --git a/modules/base/rotation/constantrotation.h b/modules/base/rotation/constantrotation.h
index 91faf7c80f..3b1d0b8ec4 100644
--- a/modules/base/rotation/constantrotation.h
+++ b/modules/base/rotation/constantrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rotation/fixedrotation.cpp b/modules/base/rotation/fixedrotation.cpp
index 6ebf88d97c..5d0d864ad0 100644
--- a/modules/base/rotation/fixedrotation.cpp
+++ b/modules/base/rotation/fixedrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,16 +32,11 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
+#include <optional>
 #include <string>
+#include <variant>
 
 namespace {
-    constexpr const char* KeyXAxis = "XAxis";
-    constexpr const char* KeyXAxisOrthogonal = "XAxisOrthogonal";
-    constexpr const char* KeyYAxis = "YAxis";
-    constexpr const char* KeyYAxisOrthogonal = "YAxisOrthogonal";
-    constexpr const char* KeyZAxis = "ZAxis";
-    constexpr const char* KeyZAxisOrthogonal = "ZAxisOrthogonal";
-
     constexpr const openspace::properties::Property::PropertyInfo EnableInfo = {
         "Enable",
         "Enabled",
@@ -186,98 +181,59 @@ namespace {
         "only needed if any of the three axis uses the Object type. In this case, the "
         "location of the attached node is required to compute the relative direction."
     };
+
+    struct [[codegen::Dictionary(FixedRotation)]] Parameters {
+        // This value specifies the direction of the new X axis. If this value is not
+        // specified, it will be computed by completing a right handed coordinate system
+        // from the Y and Z axis, which must be specified instead. If this value is a 
+        // string, it is interpreted as the identifier of another scenegraph node. If this
+        // value is a 3-vector, it is interpreted as a direction vector
+        std::optional<std::variant<std::string, glm::vec3>> xAxis;
+
+        // [[codegen::verbatim(XAxisOrthogonalVectorInfo.description)]]
+        std::optional<bool> xAxisOrthogonal;
+
+        // [[codegen::verbatim(XAxisInvertObjectInfo.description)]]
+        std::optional<bool> xAxisInvert [[codegen::key("xAxis - InvertObject")]];
+
+        // 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
+        // from the X and Z axis, which must be specified instead. If this value is a
+        // string, it is interpreted as the identifier of another scenegraph node. If this
+        // value is a 3-vector, it is interpreted as a direction vector
+        std::optional<std::variant<std::string, glm::vec3>> yAxis;
+
+        // [[codegen::verbatim(YAxisOrthogonalVectorInfo.description)]]
+        std::optional<bool> yAxisOrthogonal;
+
+        // [[codegen::verbatim(YAxisInvertObjectInfo.description)]]
+        std::optional<bool> yAxisInvert [[codegen::key("yAxis - InvertObject")]];
+
+        // 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
+        // from the X and Y axis, which must be specified instead. If this value is a
+        // string, it is interpreted as the identifier of another scenegraph node. If this
+        // value is a 3-vector, it is interpreted as a direction vector
+        std::optional<std::variant<std::string, glm::vec3>> zAxis;
+
+        // [[codegen::verbatim(ZAxisOrthogonalVectorInfo.description)]]
+        std::optional<bool> zAxisOrthogonal;
+
+        // [[codegen::verbatim(ZAxisInvertObjectInfo.description)]]
+        std::optional<bool> zAxisInvert [[codegen::key("zAxis - InvertObject")]];
+
+        // [[codegen::verbatim(AttachedInfo.description)]]
+        std::optional<std::string> attached;
+    };
+#include "fixedrotation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation FixedRotation::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Fixed Rotation",
-        "base_transform_rotation_fixed",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("FixedRotation"),
-                Optional::No
-            },
-            {
-                KeyXAxis,
-                new OrVerifier({ new StringVerifier, new DoubleVector3Verifier, }),
-                Optional::Yes,
-                "This value specifies the direction of the new X axis. If this value is "
-                "not specified, it will be computed by completing a right handed "
-                "coordinate system from the Y and Z axis, which must be specified "
-                "instead. If this value is a string, it is interpreted as the identifier "
-                "of another scenegraph node. If this value is a 3-vector, it is "
-                "interpreted as a direction vector."
-            },
-            {
-                KeyXAxisOrthogonal,
-                new BoolVerifier,
-                Optional::Yes,
-                XAxisOrthogonalVectorInfo.description
-            },
-            {
-                XAxisInvertObjectInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                XAxisInvertObjectInfo.description
-            },
-            {
-                KeyYAxis,
-                new OrVerifier({ new StringVerifier, new DoubleVector3Verifier, }),
-                Optional::Yes,
-                "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 from the X and Z axis, which must be specified "
-                "instead. If this value is a string, it is interpreted as the identifier "
-                "of another scenegraph node. If this value is a 3-vector, it is "
-                "interpreted as a direction vector."
-            },
-            {
-                KeyYAxisOrthogonal,
-                new BoolVerifier,
-                Optional::Yes,
-                YAxisOrthogonalVectorInfo.description
-            },
-            {
-                YAxisInvertObjectInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                YAxisInvertObjectInfo.description
-            },
-            {
-                KeyZAxis,
-                new OrVerifier({ new StringVerifier, new DoubleVector3Verifier, }),
-                Optional::Yes,
-                "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 from the X and Y axis, which must be specified "
-                "instead. If this value is a string, it is interpreted as the identifier "
-                "of another scenegraph node. If this value is a 3-vector, it is "
-                "interpreted as a direction vector."
-            },
-            {
-                KeyZAxisOrthogonal,
-                new BoolVerifier,
-                Optional::Yes,
-                ZAxisOrthogonalVectorInfo.description
-            },
-            {
-                ZAxisInvertObjectInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                ZAxisInvertObjectInfo.description
-            },
-            {
-                AttachedInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                AttachedInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_transform_rotation_fixed";
+    return doc;
 }
 
 FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
@@ -332,6 +288,9 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
     }
     , _attachedObject(AttachedInfo, "")
 {
+    // We check the Dictionary here in order to detect the errors early
+    codegen::bake<Parameters>(dictionary);
+
     documentation::testSpecificationAndThrow(
         Documentation(),
         dictionary,
@@ -447,103 +406,79 @@ FixedRotation::FixedRotation(const ghoul::Dictionary& dictionary)
 bool FixedRotation::initialize() {
     ZoneScoped
 
+    // We have already checked this before, but still
+    const Parameters p = codegen::bake<Parameters>(_constructorDictionary);
+
     // We need to do this in the initialize and not the constructor as the scene graph
     // nodes referenced in the dictionary might not exist yet at construction time. At
     // initialization time, however, we know that they already have been created
 
     const bool res = Rotation::initialize();
 
-    if (_constructorDictionary.hasKey(AttachedInfo.identifier)) {
-        _attachedObject = _constructorDictionary.value<std::string>(
-            AttachedInfo.identifier
-        );
-    }
+    _attachedObject = p.attached.value_or(_attachedObject);
 
-    const bool hasXAxis = _constructorDictionary.hasKey(KeyXAxis);
-    if (hasXAxis) {
-        if (_constructorDictionary.hasKeyAndValue<std::string>(KeyXAxis)) {
+    if (p.xAxis.has_value()) {
+        if (std::holds_alternative<std::string>(*p.xAxis)) {
             _xAxis.type = Axis::Type::Object;
-            _xAxis.object = _constructorDictionary.value<std::string>(KeyXAxis);
+            _xAxis.object = std::get<std::string>(*p.xAxis);
         }
         else {
-            // We know it has to be a vector now
+            ghoul_assert(std::holds_alternative<glm::vec3>(*p.xAxis), "");
             _xAxis.type = Axis::Type::Vector;
-            _xAxis.vector = _constructorDictionary.value<glm::dvec3>(KeyXAxis);
+            _xAxis.vector = std::get<glm::vec3>(*p.xAxis);
         }
     }
-
-    if (_constructorDictionary.hasKey(KeyXAxisOrthogonal)) {
-        _xAxis.isOrthogonal = _constructorDictionary.value<bool>(KeyXAxisOrthogonal);
-    }
-    if (_constructorDictionary.hasKey(XAxisInvertObjectInfo.identifier)) {
-        _xAxis.invertObject = _constructorDictionary.value<bool>(
-            XAxisInvertObjectInfo.identifier
-        );
-    }
+    _xAxis.isOrthogonal = p.xAxisOrthogonal.value_or(_xAxis.isOrthogonal);
     if (_xAxis.isOrthogonal) {
         _xAxis.type = Axis::Type::OrthogonalVector;
     }
+    _xAxis.invertObject = p.xAxisInvert.value_or(_xAxis.invertObject);
 
-    const bool hasYAxis = _constructorDictionary.hasKey(KeyYAxis);
-    if (hasYAxis) {
-        if (_constructorDictionary.hasKeyAndValue<std::string>(KeyYAxis)) {
+    if (p.yAxis.has_value()) {
+        if (std::holds_alternative<std::string>(*p.yAxis)) {
             _yAxis.type = Axis::Type::Object;
-            _yAxis.object = _constructorDictionary.value<std::string>(KeyYAxis);
+            _yAxis.object = std::get<std::string>(*p.yAxis);
         }
         else {
-            // We know it has to be a vector now
+            ghoul_assert(std::holds_alternative<glm::vec3>(*p.yAxis), "");
             _yAxis.type = Axis::Type::Vector;
-            _yAxis.vector = _constructorDictionary.value<glm::dvec3>(KeyYAxis);
+            _yAxis.vector = std::get<glm::vec3>(*p.yAxis);
         }
     }
-
-    if (_constructorDictionary.hasKey(KeyYAxisOrthogonal)) {
-        _yAxis.isOrthogonal = _constructorDictionary.value<bool>(KeyYAxisOrthogonal);
-    }
-    if (_constructorDictionary.hasKey(YAxisInvertObjectInfo.identifier)) {
-        _yAxis.invertObject = _constructorDictionary.value<bool>(
-            YAxisInvertObjectInfo.identifier
-        );
-    }
+    _yAxis.isOrthogonal = p.yAxisOrthogonal.value_or(_yAxis.isOrthogonal);
     if (_yAxis.isOrthogonal) {
         _yAxis.type = Axis::Type::OrthogonalVector;
     }
+    _yAxis.invertObject = p.yAxisInvert.value_or(_yAxis.invertObject);
 
-    const bool hasZAxis = _constructorDictionary.hasKey(KeyZAxis);
-    if (hasZAxis) {
-        if (_constructorDictionary.hasKeyAndValue<std::string>(KeyZAxis)) {
+    if (p.zAxis.has_value()) {
+        if (std::holds_alternative<std::string>(*p.zAxis)) {
             _zAxis.type = Axis::Type::Object;
-            _zAxis.object = _constructorDictionary.value<std::string>(KeyZAxis);
+            _zAxis.object = std::get<std::string>(*p.zAxis);
         }
         else {
-            // We know it has to be a vector now
+            ghoul_assert(std::holds_alternative<glm::vec3>(*p.zAxis), "");
             _zAxis.type = Axis::Type::Vector;
-            _zAxis.vector = _constructorDictionary.value<glm::dvec3>(KeyZAxis);
+            _zAxis.vector = std::get<glm::vec3>(*p.zAxis);
         }
     }
-
-    if (_constructorDictionary.hasKey(KeyZAxisOrthogonal)) {
-        _zAxis.isOrthogonal = _constructorDictionary.value<bool>(KeyZAxisOrthogonal);
-    }
-    if (_constructorDictionary.hasKey(ZAxisInvertObjectInfo.identifier)) {
-        _yAxis.invertObject = _constructorDictionary.value<bool>(
-            ZAxisInvertObjectInfo.identifier
-        );
-    }
+    _zAxis.isOrthogonal = p.zAxisOrthogonal.value_or(_zAxis.isOrthogonal);
     if (_zAxis.isOrthogonal) {
         _zAxis.type = Axis::Type::OrthogonalVector;
     }
+    _zAxis.invertObject = p.zAxisInvert.value_or(_zAxis.invertObject);
 
 
-    if (!hasXAxis && hasYAxis && hasZAxis) {
+
+    if (!p.xAxis.has_value() && p.yAxis.has_value() && p.zAxis.has_value()) {
         _xAxis.type = Axis::Type::CoordinateSystemCompletion;
     }
 
-    if (hasXAxis && !hasYAxis && hasZAxis) {
+    if (p.xAxis.has_value() && !p.yAxis.has_value() && p.zAxis.has_value()) {
         _yAxis.type = Axis::Type::CoordinateSystemCompletion;
     }
 
-    if (hasXAxis && hasYAxis && !hasZAxis) {
+    if (p.xAxis.has_value() && p.yAxis.has_value() && !p.zAxis.has_value()) {
         _zAxis.type = Axis::Type::CoordinateSystemCompletion;
     }
 
@@ -569,7 +504,11 @@ glm::dmat3 FixedRotation::matrix(const UpdateData&) const {
     {
         LWARNINGC(
             "FixedRotation",
-            fmt::format("Near-collinear vectors detected: x ({}) y ({}) z ({})", x, y, z)
+            fmt::format(
+                "Near-collinear vectors detected: "
+                "x ({}, {}, {}) y ({}, {}, {}) z ({}, {}, {})",
+                x.x, x.y, x.z, y.x, y.y, y.z, z.x, z.y, z.z
+            )
         );
         return glm::dmat3();
     }
diff --git a/modules/base/rotation/fixedrotation.h b/modules/base/rotation/fixedrotation.h
index 6c59047c90..5c83657679 100644
--- a/modules/base/rotation/fixedrotation.h
+++ b/modules/base/rotation/fixedrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rotation/luarotation.cpp b/modules/base/rotation/luarotation.cpp
index 7fa81592d1..f6f0f822a5 100644
--- a/modules/base/rotation/luarotation.cpp
+++ b/modules/base/rotation/luarotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -45,29 +45,20 @@ namespace {
         "J2000 epoch as the second argument and computes the rotation returned as 9 "
         "values."
     };
+
+    struct [[codegen::Dictionary(LuaRotation)]] Parameters {
+        // [[codegen::verbatim(ScriptInfo.description)]]
+        std::string script;
+    };
+#include "luarotation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation LuaRotation::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Lua Rotation",
-        "base_transform_rotation_lua",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("LuaRotation"),
-                Optional::No
-            },
-            {
-                ScriptInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                ScriptInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_transform_rotation_lua";
+    return doc;
 }
 
 LuaRotation::LuaRotation()
@@ -86,13 +77,9 @@ LuaRotation::LuaRotation()
 }
 
 LuaRotation::LuaRotation(const ghoul::Dictionary& dictionary) : LuaRotation() {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "LuaRotation"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _luaScriptFile = absPath(dictionary.value<std::string>(ScriptInfo.identifier));
+    _luaScriptFile = absPath(p.script);
 }
 
 glm::dmat3 LuaRotation::matrix(const UpdateData& data) const {
diff --git a/modules/base/rotation/luarotation.h b/modules/base/rotation/luarotation.h
index 74248480ac..099c7fc06c 100644
--- a/modules/base/rotation/luarotation.h
+++ b/modules/base/rotation/luarotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rotation/staticrotation.cpp b/modules/base/rotation/staticrotation.cpp
index 9cdba21e3a..1da7e72f6f 100644
--- a/modules/base/rotation/staticrotation.cpp
+++ b/modules/base/rotation/staticrotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -55,34 +55,21 @@ namespace {
         }
         return res;
     }
+
+    struct [[codegen::Dictionary(StaticRotation)]] Parameters {
+        // Stores the static rotation as a vector containing Euler angles, a quaternion
+        // or a rotation matrix
+        std::variant<glm::dvec3, glm::dvec4, glm::dmat3x3> rotation;
+    };
+#include "staticrotation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation StaticRotation::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Static Rotation",
-        "base_transform_rotation_static",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("StaticRotation"),
-                Optional::No
-            },
-            {
-                RotationInfo.identifier,
-                new OrVerifier({
-                    new DoubleVector3Verifier(),
-                    new DoubleVector4Verifier(),
-                    new DoubleMatrix3Verifier()
-                }),
-                Optional::No,
-                "Stores the static rotation as a vector containing Euler angles, "
-                " a quaternion or a rotation matrix."
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_transform_rotation_static";
+    return doc;
 }
 
 StaticRotation::StaticRotation()
@@ -94,38 +81,28 @@ StaticRotation::StaticRotation()
     )
 {
     addProperty(_eulerRotation);
-    _eulerRotation.onChange([this]() { 
+    _eulerRotation.onChange([this]() {
         _matrixIsDirty = true;
-        requireUpdate(); 
+        requireUpdate();
     });
 }
 
 StaticRotation::StaticRotation(const ghoul::Dictionary& dictionary) : StaticRotation() {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "StaticRotation"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKeyAndValue<glm::dvec3>(RotationInfo.identifier)) {
-        _eulerRotation = static_cast<glm::vec3>(
-            dictionary.value<glm::dvec3>(RotationInfo.identifier)
-        );
-        _matrixIsDirty = true;
+    if (std::holds_alternative<glm::dvec3>(p.rotation)) {
+        _eulerRotation = std::get<glm::dvec3>(p.rotation);
     }
-    else if (dictionary.hasKeyAndValue<glm::dvec4>(RotationInfo.identifier)) {
-        glm::dvec4 data = dictionary.value<glm::dvec4>(RotationInfo.identifier);
+    else if (std::holds_alternative<glm::dvec4>(p.rotation)) {
+        glm::dvec4 data = std::get<glm::dvec4>(p.rotation);
         _eulerRotation = rotationMatrixToEulerAngles(
             glm::mat3_cast(glm::dquat(data.w, data.x, data.y, data.z))
         );
-        _matrixIsDirty = true;
     }
-    else if (dictionary.hasKeyAndValue<glm::dmat3>(RotationInfo.identifier)) {
-        _eulerRotation = rotationMatrixToEulerAngles(
-            dictionary.value<glm::dmat3>(RotationInfo.identifier)
-        );
-        _matrixIsDirty = true;
+    else if (std::holds_alternative<glm::dmat3>(p.rotation)) {
+        _eulerRotation = rotationMatrixToEulerAngles(std::get<glm::dmat3>(p.rotation));
     }
+    _matrixIsDirty = true;
 }
 
 glm::dmat3 StaticRotation::matrix(const UpdateData&) const {
diff --git a/modules/base/rotation/staticrotation.h b/modules/base/rotation/staticrotation.h
index c9a647bdec..2c27cdece2 100644
--- a/modules/base/rotation/staticrotation.h
+++ b/modules/base/rotation/staticrotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/rotation/timelinerotation.cpp b/modules/base/rotation/timelinerotation.cpp
index 53657cc1cf..39ef1dec06 100644
--- a/modules/base/rotation/timelinerotation.cpp
+++ b/modules/base/rotation/timelinerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,7 +30,6 @@
 #include <openspace/util/time.h>
 
 namespace {
-    constexpr const char* KeyType = "Type";
     constexpr const char* KeyKeyframes = "Keyframes";
 } // namespace
 
@@ -42,11 +41,6 @@ documentation::Documentation TimelineRotation::Documentation() {
         "Timeline Rotation",
         "base_transform_rotation_keyframe",
         {
-            {
-                KeyType,
-                new StringEqualVerifier("TimelineRotation"),
-                Optional::No
-            },
             {
                 KeyKeyframes,
                 new TableVerifier({
@@ -70,9 +64,8 @@ TimelineRotation::TimelineRotation(const ghoul::Dictionary& dictionary) {
     const ghoul::Dictionary& keyframes =
         dictionary.value<ghoul::Dictionary>(KeyKeyframes);
 
-    std::vector<std::string> timeStrings = keyframes.keys();
-    for (const std::string& timeString : timeStrings) {
-        const double t = Time::convertTime(timeString);
+    for (std::string_view timeString : keyframes.keys()) {
+        const double t = Time::convertTime(std::string(timeString));
 
         ghoul::mm_unique_ptr<Rotation> rotation =
             Rotation::createFromDictionary(
diff --git a/modules/base/rotation/timelinerotation.h b/modules/base/rotation/timelinerotation.h
index 7e1a7d9132..14e18424ae 100644
--- a/modules/base/rotation/timelinerotation.h
+++ b/modules/base/rotation/timelinerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/scale/luascale.cpp b/modules/base/scale/luascale.cpp
index f13b485c9a..8ea195e15c 100644
--- a/modules/base/scale/luascale.cpp
+++ b/modules/base/scale/luascale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,7 +32,6 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-
 #include <chrono>
 
 namespace {
@@ -45,24 +44,20 @@ namespace {
         "as the first argument, the current wall time as milliseconds past the J2000 "
         "epoch the second argument and computes the three scaling factors."
     };
+
+    struct [[codegen::Dictionary(LuaScale)]] Parameters {
+        // [[codegen::verbatim(ScriptInfo.description)]]
+        std::string script;
+    };
+#include "luascale_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation LuaScale::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Lua Scaling",
-        "base_scale_lua",
-        {
-            {
-                ScriptInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                ScriptInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_scale_lua";
+    return doc;
 }
 
 LuaScale::LuaScale()
@@ -81,9 +76,8 @@ LuaScale::LuaScale()
 }
 
 LuaScale::LuaScale(const ghoul::Dictionary& dictionary) : LuaScale() {
-    documentation::testSpecificationAndThrow(Documentation(), dictionary, "LuaScale");
-
-    _luaScriptFile = absPath(dictionary.value<std::string>(ScriptInfo.identifier));
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _luaScriptFile = absPath(p.script);
 }
 
 glm::dvec3 LuaScale::scaleValue(const UpdateData& data) const {
diff --git a/modules/base/scale/luascale.h b/modules/base/scale/luascale.h
index 1306ec476b..1cfde19c76 100644
--- a/modules/base/scale/luascale.h
+++ b/modules/base/scale/luascale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/scale/nonuniformstaticscale.cpp b/modules/base/scale/nonuniformstaticscale.cpp
index cc9a2d487d..19bc7ca349 100644
--- a/modules/base/scale/nonuniformstaticscale.cpp
+++ b/modules/base/scale/nonuniformstaticscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,24 +34,20 @@ namespace {
         "These values are used as scaling factors for the scene graph node that this "
         "transformation is attached to relative to its parent."
     };
+
+    struct [[codegen::Dictionary(NonUniformStaticScale)]] Parameters {
+        // [[codegen::verbatim(ScaleInfo.description)]]
+        glm::dvec3 scale;
+    };
+#include "nonuniformstaticscale_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation NonUniformStaticScale::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Static Scaling",
-        "base_scale_static",
-        {
-            {
-                ScaleInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::No,
-                ScaleInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_scale_nonuniformstatic";
+    return doc;
 }
 
 glm::dvec3 NonUniformStaticScale::scaleValue(const UpdateData&) const {
@@ -71,9 +67,8 @@ NonUniformStaticScale::NonUniformStaticScale()
 NonUniformStaticScale::NonUniformStaticScale(const ghoul::Dictionary& dictionary)
     : NonUniformStaticScale()
 {
-    documentation::testSpecificationAndThrow(Documentation(), dictionary, "StaticScale");
-
-    _scaleValue = dictionary.value<glm::dvec3>(ScaleInfo.identifier);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _scaleValue = p.scale;
 }
 
 } // namespace openspace
diff --git a/modules/base/scale/nonuniformstaticscale.h b/modules/base/scale/nonuniformstaticscale.h
index ded7951c11..ffc7b9b7d5 100644
--- a/modules/base/scale/nonuniformstaticscale.h
+++ b/modules/base/scale/nonuniformstaticscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/scale/staticscale.cpp b/modules/base/scale/staticscale.cpp
index 4c15f70fae..59b5a96c57 100644
--- a/modules/base/scale/staticscale.cpp
+++ b/modules/base/scale/staticscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,24 +34,20 @@ namespace {
         "This value is used as a scaling factor for the scene graph node that this "
         "transformation is attached to relative to its parent."
     };
+
+    struct [[codegen::Dictionary(StaticScale)]] Parameters {
+        // [[codegen::verbatim(ScaleInfo.description)]]
+        float scale;
+    };
+#include "staticscale_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation StaticScale::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Static Scaling",
-        "base_scale_static",
-        {
-            {
-                ScaleInfo.identifier,
-                new DoubleVerifier,
-                Optional::No,
-                ScaleInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_scale_static";
+    return doc;
 }
 
 glm::dvec3 StaticScale::scaleValue(const UpdateData&) const {
@@ -67,9 +63,8 @@ StaticScale::StaticScale() : _scaleValue(ScaleInfo, 1.f, 0.1f, 100.f) {
 }
 
 StaticScale::StaticScale(const ghoul::Dictionary& dictionary) : StaticScale() {
-    documentation::testSpecificationAndThrow(Documentation(), dictionary, "StaticScale");
-
-    _scaleValue = static_cast<float>(dictionary.value<double>(ScaleInfo.identifier));
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _scaleValue = p.scale;
 }
 
 } // namespace openspace
diff --git a/modules/base/scale/staticscale.h b/modules/base/scale/staticscale.h
index f11e95a4ed..197dacbfb7 100644
--- a/modules/base/scale/staticscale.h
+++ b/modules/base/scale/staticscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/scale/timedependentscale.cpp b/modules/base/scale/timedependentscale.cpp
index e6e731d667..168146ef0c 100644
--- a/modules/base/scale/timedependentscale.cpp
+++ b/modules/base/scale/timedependentscale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
+#include <optional>
 
 namespace {
     constexpr openspace::properties::Property::PropertyInfo ReferenceDateInfo = {
@@ -53,36 +54,26 @@ namespace {
         "negative values. This is useful for instantaneous events that only propagate "
         "forwards. The default value is 'true'."
     };
+
+    struct [[codegen::Dictionary(TimeDependentScale)]] Parameters {
+        // [[codegen::verbatim(ReferenceDateInfo.description)]]
+        std::string referenceDate;
+
+        // [[codegen::verbatim(SpeedInfo.description)]]
+        std::optional<double> speed;
+
+        // [[codegen::verbatim(ClampToPositiveInfo.description)]]
+        std::optional<bool> clampToPositive;
+    };
+#include "timedependentscale_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation TimeDependentScale::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Timedependent Scaling",
-        "base_scale_timedependent",
-        {
-            {
-                ReferenceDateInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                ReferenceDateInfo.description
-            },
-            {
-                SpeedInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                SpeedInfo.description
-            },
-            {
-                ClampToPositiveInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                ClampToPositiveInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_scale_timedependent";
+    return doc;
 }
 
 TimeDependentScale::TimeDependentScale(const ghoul::Dictionary& dictionary)
@@ -90,21 +81,17 @@ TimeDependentScale::TimeDependentScale(const ghoul::Dictionary& dictionary)
     , _speed(SpeedInfo, 1.0, 0.0, 1e12)
     , _clampToPositive(ClampToPositiveInfo, true)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "TimeDependentScale"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _referenceDate = dictionary.value<std::string>(ReferenceDateInfo.identifier);
+    _referenceDate = p.referenceDate;
     _referenceDate.onChange([this]() { _cachedReferenceDirty = true; });
     addProperty(_referenceDate);
 
-    if (dictionary.value<double>(SpeedInfo.identifier)) {
-        _speed = dictionary.value<double>(SpeedInfo.identifier);
-    }
+    _speed = p.speed.value_or(_speed);
     addProperty(_speed);
 
+    // @TODO (abock, 2021-01-09) The clamp to positive value from the dictionary was never
+    // actually read. I think this should probably be done here?
     addProperty(_clampToPositive);
 }
 
diff --git a/modules/base/scale/timedependentscale.h b/modules/base/scale/timedependentscale.h
index 3fda4e19ed..f7db93d5e5 100644
--- a/modules/base/scale/timedependentscale.h
+++ b/modules/base/scale/timedependentscale.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/axes_fs.glsl b/modules/base/shaders/axes_fs.glsl
index 8540409131..6bbcd9b84b 100644
--- a/modules/base/shaders/axes_fs.glsl
+++ b/modules/base/shaders/axes_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -23,7 +23,6 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
-#include "PowerScaling/powerScaling_fs.hglsl"
 
 in float vs_screenSpaceDepth;
 in vec4 vs_positionViewSpace;
diff --git a/modules/base/shaders/axes_vs.glsl b/modules/base/shaders/axes_vs.glsl
index 6ae73a55eb..b7d5caae03 100644
--- a/modules/base/shaders/axes_vs.glsl
+++ b/modules/base/shaders/axes_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/disc_fs.glsl b/modules/base/shaders/disc_fs.glsl
new file mode 100644
index 0000000000..839d6464f5
--- /dev/null
+++ b/modules/base/shaders/disc_fs.glsl
@@ -0,0 +1,58 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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 "fragment.glsl"
+
+in vec2 vs_st;
+in float vs_screenSpaceDepth;
+
+uniform sampler1D colorTexture;
+uniform float width;
+uniform float opacity;
+
+Fragment getFragment() {
+    // The length of the texture coordinates vector is our distance from the center
+    float radius = length(vs_st);
+
+    // 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],
+    float inner = 1.0 - width;
+    float texCoord = (radius - inner) / (1.0 - inner);
+    if (texCoord < 0.0 || texCoord > 1.0) {
+        discard;
+    }
+
+    vec4 diffuse = texture(colorTexture, texCoord);
+    diffuse.a *= opacity;
+
+    Fragment frag;
+    frag.color = diffuse;
+    frag.depth = vs_screenSpaceDepth;
+    return frag;
+}
diff --git a/modules/globebrowsing/src/rawtile.cpp b/modules/base/shaders/disc_vs.glsl
similarity index 76%
rename from modules/globebrowsing/src/rawtile.cpp
rename to modules/base/shaders/disc_vs.glsl
index 9e626a2d61..d5796d62d9 100644
--- a/modules/globebrowsing/src/rawtile.cpp
+++ b/modules/base/shaders/disc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -22,17 +22,26 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/globebrowsing/src/rawtile.h>
+#version __CONTEXT__
 
-namespace openspace::globebrowsing {
+#include "PowerScaling/powerScaling_vs.hglsl"
 
-RawTile createDefaultTile(TileTextureInitData initData) {
-    RawTile defaultRes;
-    std::byte* data = new std::byte[initData.totalNumBytes];
-    defaultRes.imageData = std::unique_ptr<std::byte[]>(data);
-    std::fill_n(defaultRes.imageData.get(), initData.totalNumBytes, std::byte(0));
-    defaultRes.textureInitData = std::move(initData);
-    return defaultRes;
+layout(location = 0) in vec2 in_position;
+layout(location = 1) in vec2 in_st;
+
+out vec2 vs_st;
+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);
+
+    // Moving the origin to the center
+    vs_st = (in_st - vec2(0.5)) * 2.0;
+
+    vs_screenSpaceDepth = positionScreenSpace.w;
+
+    gl_Position = positionScreenSpace;
 }
-
-} // namespace openspace::globebrowsing
diff --git a/modules/base/shaders/grid_fs.glsl b/modules/base/shaders/grid_fs.glsl
index e0f676a74d..06d83fa764 100644
--- a/modules/base/shaders/grid_fs.glsl
+++ b/modules/base/shaders/grid_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -23,7 +23,6 @@
  ****************************************************************************************/
 
 #include "fragment.glsl"
-#include "PowerScaling/powerScaling_fs.hglsl"
 
 in float vs_depthClipSpace;
 in vec4 vs_positionViewSpace;
diff --git a/modules/base/shaders/grid_vs.glsl b/modules/base/shaders/grid_vs.glsl
index 587048960c..30351ea566 100644
--- a/modules/base/shaders/grid_vs.glsl
+++ b/modules/base/shaders/grid_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,8 +24,6 @@
 
 #version __CONTEXT__
 
-#include "PowerScaling/powerScaling_vs.hglsl"
-
 layout(location = 0) in vec3 in_position;
 
 out float vs_depthClipSpace;
diff --git a/modules/base/shaders/imageplane_fs.glsl b/modules/base/shaders/imageplane_fs.glsl
index 2ebb17f323..7c1e1fd019 100644
--- a/modules/base/shaders/imageplane_fs.glsl
+++ b/modules/base/shaders/imageplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/imageplane_vs.glsl b/modules/base/shaders/imageplane_vs.glsl
index 585154a73f..b8160cadee 100644
--- a/modules/base/shaders/imageplane_vs.glsl
+++ b/modules/base/shaders/imageplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/line_fs.glsl b/modules/base/shaders/line_fs.glsl
index 0b8309c319..0045d65d15 100644
--- a/modules/base/shaders/line_fs.glsl
+++ b/modules/base/shaders/line_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/line_vs.glsl b/modules/base/shaders/line_vs.glsl
index af629e75a2..e83e3a8260 100644
--- a/modules/base/shaders/line_vs.glsl
+++ b/modules/base/shaders/line_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/model_fs.glsl b/modules/base/shaders/model_fs.glsl
index 628c87b2d4..33af4938b9 100644
--- a/modules/base/shaders/model_fs.glsl
+++ b/modules/base/shaders/model_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,6 +34,7 @@ uniform float diffuseIntensity = 1.0;
 uniform float specularIntensity = 1.0;
 
 uniform bool performShading = true;
+uniform bool opacityBlending = false;
 
 uniform sampler2D texture1;
 
@@ -46,6 +47,10 @@ uniform float opacity = 1.0;
 const vec3 SpecularAlbedo = vec3(1.0);
 
 Fragment getFragment() {
+    if (opacity == 0.0) {
+        discard;
+    }
+
     vec3 diffuseAlbedo = texture(texture1, vs_st).rgb;
 
     Fragment frag;
@@ -84,12 +89,22 @@ Fragment getFragment() {
         frag.color.rgb = diffuseAlbedo;
     }
 
-    frag.color.a        = opacity;
+    if (opacityBlending) {
+        // frag.color.a = opacity * (frag.color.r + frag.color.g + frag.color.b)/3.0;
+        frag.color.a = opacity * max(max(frag.color.r, frag.color.g), frag.color.b);
+    }
+    else {
+        frag.color.a = opacity;
+    }
+
+    if (frag.color.a < 0.1) {
+        discard;
+    }
+
     frag.depth          = vs_screenSpaceDepth;
     frag.gPosition      = vs_positionCameraSpace;
     frag.gNormal        = vec4(vs_normalViewSpace, 0.0);
     frag.disableLDR2HDR = true;
 
-
     return frag;
-}
+}
\ No newline at end of file
diff --git a/modules/base/shaders/model_vs.glsl b/modules/base/shaders/model_vs.glsl
index 8b55a1a7ba..de916ada58 100644
--- a/modules/base/shaders/model_vs.glsl
+++ b/modules/base/shaders/model_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -37,7 +37,7 @@ out vec4 vs_positionCameraSpace;
 
 uniform mat4 modelViewTransform;
 uniform mat4 projectionTransform;
-uniform mat4 crippedModelViewTransform;
+uniform mat4 normalTransform;
 
 void main() {
     vs_positionCameraSpace = modelViewTransform * in_position;
@@ -48,6 +48,5 @@ void main() {
     vs_st = in_st;
     vs_screenSpaceDepth = positionScreenSpace.w;
     
-    //vs_normalViewSpace = normalize(transpose(inverse(mat3(crippedModelViewTransform))) * in_normal);
-    vs_normalViewSpace = normalize(mat3(crippedModelViewTransform) * in_normal);
+    vs_normalViewSpace = normalize(mat3(normalTransform) * in_normal);
 }
diff --git a/modules/base/shaders/plane_fs.glsl b/modules/base/shaders/plane_fs.glsl
index a3a84d9ab7..f739d6ac32 100644
--- a/modules/base/shaders/plane_fs.glsl
+++ b/modules/base/shaders/plane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/plane_vs.glsl b/modules/base/shaders/plane_vs.glsl
index a702df7eee..e93dd95a92 100644
--- a/modules/base/shaders/plane_vs.glsl
+++ b/modules/base/shaders/plane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/renderabletrail_apple_fs.glsl b/modules/base/shaders/renderabletrail_apple_fs.glsl
index d89b3cc720..5dfc81231f 100644
--- a/modules/base/shaders/renderabletrail_apple_fs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/renderabletrail_apple_vs.glsl b/modules/base/shaders/renderabletrail_apple_vs.glsl
index aa6224c3af..da699581e9 100644
--- a/modules/base/shaders/renderabletrail_apple_vs.glsl
+++ b/modules/base/shaders/renderabletrail_apple_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/renderabletrail_fs.glsl b/modules/base/shaders/renderabletrail_fs.glsl
index d08f19b371..27e1402b06 100644
--- a/modules/base/shaders/renderabletrail_fs.glsl
+++ b/modules/base/shaders/renderabletrail_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/renderabletrail_vs.glsl b/modules/base/shaders/renderabletrail_vs.glsl
index f7f0804fd8..3a6b56ce62 100644
--- a/modules/base/shaders/renderabletrail_vs.glsl
+++ b/modules/base/shaders/renderabletrail_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/screenspace_fs.glsl b/modules/base/shaders/screenspace_fs.glsl
index dc7d73b601..7c0f7e1b57 100644
--- a/modules/base/shaders/screenspace_fs.glsl
+++ b/modules/base/shaders/screenspace_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/screenspace_vs.glsl b/modules/base/shaders/screenspace_vs.glsl
index f5c345f7e2..2f057ce33d 100644
--- a/modules/base/shaders/screenspace_vs.glsl
+++ b/modules/base/shaders/screenspace_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/sphere_fs.glsl b/modules/base/shaders/sphere_fs.glsl
index 3aecbe4355..0a3a97acec 100644
--- a/modules/base/shaders/sphere_fs.glsl
+++ b/modules/base/shaders/sphere_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/shaders/sphere_vs.glsl b/modules/base/shaders/sphere_vs.glsl
index cf747e4a51..873646d23a 100644
--- a/modules/base/shaders/sphere_vs.glsl
+++ b/modules/base/shaders/sphere_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/timeframe/timeframeinterval.cpp b/modules/base/timeframe/timeframeinterval.cpp
index 2627d44e6e..e0a18079b2 100644
--- a/modules/base/timeframe/timeframeinterval.cpp
+++ b/modules/base/timeframe/timeframeinterval.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
+#include <optional>
 
 namespace {
     constexpr const openspace::properties::Property::PropertyInfo HasStartInfo = {
@@ -53,42 +54,23 @@ namespace {
         "End",
         "Specifies the time when this TimeFrame becomes inactive"
     };
+
+    struct [[codegen::Dictionary(TimeFrameInterval)]] Parameters {
+        // [[codegen::verbatim(StartInfo.description)]]
+        std::optional<std::variant<double, std::string>> start;
+
+        // [[codegen::verbatim(EndInfo.description)]]
+        std::optional<std::variant<double, std::string>> end;
+    };
+#include "timeframeinterval_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation TimeFrameInterval::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Time Frame Interval",
-        "base_time_frame_interval",
-        {
-            {
-                HasStartInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                HasStartInfo.description
-            },
-            {
-                StartInfo.identifier,
-                new OrVerifier({ new DoubleVerifier, new StringVerifier }),
-                Optional::Yes,
-                StartInfo.description
-            },
-            {
-                HasEndInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                HasEndInfo.description
-            },
-            {
-                EndInfo.identifier,
-                new OrVerifier({ new DoubleVerifier, new StringVerifier }),
-                Optional::Yes,
-                EndInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_time_frame_interval";
+    return doc;
 }
 
 bool TimeFrameInterval::isActive(const Time& time) const {
@@ -119,38 +101,35 @@ TimeFrameInterval::TimeFrameInterval(const ghoul::Dictionary& dictionary)
     , _hasEnd(HasEndInfo, false)
     , _end(EndInfo, 0, 0, 1E9)
 {
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+
+    if (p.start.has_value()) {
+        if (std::holds_alternative<double>(*p.start)) {
+            _start = std::get<double>(*p.start);
+        }
+        else {
+            _start = SpiceManager::ref().ephemerisTimeFromDate(
+                std::get<std::string>(*p.start)
+            );
+        }
+    }
+    _hasStart = p.start.has_value();
     addProperty(_hasStart);
     addProperty(_start);
+
+    if (p.end.has_value()) {
+        if (std::holds_alternative<double>(*p.end)) {
+            _end = std::get<double>(*p.end);
+        }
+        else {
+            _end = SpiceManager::ref().ephemerisTimeFromDate(
+                std::get<std::string>(*p.end)
+            );
+        }
+    }
+    _hasEnd = p.end.has_value();
     addProperty(_hasEnd);
     addProperty(_end);
-
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "TimeFrameInterval"
-    );
-
-    if (dictionary.hasValue<std::string>(StartInfo.identifier)) {
-        _start = SpiceManager::ref().ephemerisTimeFromDate(
-            dictionary.value<std::string>(StartInfo.identifier)
-        );
-        _hasStart = true;
-    }
-    else if (dictionary.hasValue<double>(StartInfo.identifier)) {
-        _start = dictionary.value<double>(StartInfo.identifier);
-        _hasStart = true;
-    }
-
-    if (dictionary.hasValue<std::string>(EndInfo.identifier)) {
-        _end = SpiceManager::ref().ephemerisTimeFromDate(
-            dictionary.value<std::string>(EndInfo.identifier)
-        );
-        _hasEnd = true;
-    }
-    else if (dictionary.hasValue<double>(EndInfo.identifier)) {
-        _end = dictionary.value<double>(EndInfo.identifier);
-        _hasEnd = true;
-    }
 }
 
 } // namespace openspace
diff --git a/modules/base/timeframe/timeframeinterval.h b/modules/base/timeframe/timeframeinterval.h
index 04b5f54cfc..f623285c35 100644
--- a/modules/base/timeframe/timeframeinterval.h
+++ b/modules/base/timeframe/timeframeinterval.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/timeframe/timeframeunion.cpp b/modules/base/timeframe/timeframeunion.cpp
index 2a2af962fe..05f7da7028 100644
--- a/modules/base/timeframe/timeframeunion.cpp
+++ b/modules/base/timeframe/timeframeunion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,30 +38,20 @@ namespace {
         "The time frame is active when any of the contained time frames are, "
         "but not in gaps between contained time frames."
     };
+
+    struct [[codegen::Dictionary(TimeFrameUnion)]] Parameters {
+        // [[codegen::verbatim(TimeFramesInfo.description)]]
+        std::vector<std::monostate> timeFrames [[codegen::reference("core_time_frame")]];
+    };
+#include "timeframeunion_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation TimeFrameUnion::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Time Frame Union",
-        "base_time_frame_union",
-        {
-            {
-                TimeFramesInfo.identifier,
-                new TableVerifier({
-                    {
-                        "*",
-                        new ReferencingVerifier("core_time_frame"),
-                        Optional::Yes
-                    }
-                }),
-                Optional::No,
-                TimeFramesInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_time_frame_union";
+    return doc;
 }
 
 bool TimeFrameUnion::isActive(const Time& time) const {
@@ -76,20 +66,21 @@ bool TimeFrameUnion::isActive(const Time& time) const {
 TimeFrameUnion::TimeFrameUnion(const ghoul::Dictionary& dictionary)
     : TimeFrame()
 {
-    documentation::testSpecificationAndThrow(Documentation(),
-                                             dictionary,
-                                             "TimeFrameUnion");
+    // I don't know how we can actually help the reference attribute properly. Since the
+    // Parameter list only contains the monostate, there is no need to actually create
+    // the object here
+    codegen::bake<Parameters>(dictionary);
 
     ghoul::Dictionary frames =
         dictionary.value<ghoul::Dictionary>(TimeFramesInfo.identifier);
 
-    for (const std::string& k : frames.keys()) {
+    for (std::string_view k : frames.keys()) {
         const ghoul::Dictionary& subDictionary = frames.value<ghoul::Dictionary>(k);
         _timeFrames.push_back(TimeFrame::createFromDictionary(subDictionary));
         TimeFrame& subFrame = *_timeFrames.back();
-        subFrame.setIdentifier(k);
-        subFrame.setGuiName(k);
-        subFrame.setDescription(k);
+        subFrame.setIdentifier(std::string(k));
+        subFrame.setGuiName(std::string(k));
+        subFrame.setDescription(std::string(k));
         addPropertySubOwner(*_timeFrames.back());
     }
 }
diff --git a/modules/base/timeframe/timeframeunion.h b/modules/base/timeframe/timeframeunion.h
index 27a0344e7b..1346a66809 100644
--- a/modules/base/timeframe/timeframeunion.h
+++ b/modules/base/timeframe/timeframeunion.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/translation/luatranslation.cpp b/modules/base/translation/luatranslation.cpp
index 1c3d1610b2..8f850d1f28 100644
--- a/modules/base/translation/luatranslation.cpp
+++ b/modules/base/translation/luatranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,7 +33,6 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <ghoul/lua/lua_helper.h>
-
 #include <chrono>
 
 namespace {
@@ -46,32 +45,22 @@ namespace {
         "epoch as the first argument, the current wall time as milliseconds past the "
         "J2000 epoch as the second argument and computes the translation."
     };
+
+    struct [[codegen::Dictionary(LuaTranslation)]] Parameters {
+        // [[codegen::verbatim(ScriptInfo.description)]]
+        std::string script;
+    };
+#include "luatranslation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation LuaTranslation::Documentation() {
-    using namespace documentation;
-    return {
-        "Lua Translation",
-        "base_transform_translation_lua",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("LuaTranslation"),
-                Optional::No
-            },
-            {
-                ScriptInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                ScriptInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_transform_translation_lua";
+    return doc;
 }
 
-
 LuaTranslation::LuaTranslation()
     : _luaScriptFile(ScriptInfo)
     , _state(ghoul::lua::LuaState::IncludeStandardLibrary::No)
@@ -89,13 +78,8 @@ LuaTranslation::LuaTranslation()
 }
 
 LuaTranslation::LuaTranslation(const ghoul::Dictionary& dictionary) : LuaTranslation() {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "StaticTranslation"
-    );
-
-    _luaScriptFile = absPath(dictionary.value<std::string>(ScriptInfo.identifier));
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _luaScriptFile = absPath(p.script);
 }
 
 glm::dvec3 LuaTranslation::position(const UpdateData& data) const {
diff --git a/modules/base/translation/luatranslation.h b/modules/base/translation/luatranslation.h
index 2951c7e45d..d4a5031ee2 100644
--- a/modules/base/translation/luatranslation.h
+++ b/modules/base/translation/luatranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/translation/statictranslation.cpp b/modules/base/translation/statictranslation.cpp
index 00efb611b4..7cdaa8cee6 100644
--- a/modules/base/translation/statictranslation.cpp
+++ b/modules/base/translation/statictranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,32 +34,22 @@ namespace {
         "This value is used as a static offset (in meters) that is applied to the scene "
         "graph node that this transformation is attached to relative to its parent."
     };
+
+    struct [[codegen::Dictionary(StaticTranslation)]] Parameters {
+        // [[codegen::verbatim(PositionInfo.description)]]
+        glm::dvec3 position;
+    };
+#include "statictranslation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation StaticTranslation::Documentation() {
-    using namespace documentation;
-    return {
-        "Static Translation",
-        "base_transform_translation_static",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("StaticTranslation"),
-                Optional::No
-            },
-            {
-                PositionInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::No,
-                PositionInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_transform_translation_static";
+    return doc;
 }
 
-
 StaticTranslation::StaticTranslation()
     : _position(
         PositionInfo,
@@ -79,13 +69,8 @@ StaticTranslation::StaticTranslation()
 StaticTranslation::StaticTranslation(const ghoul::Dictionary& dictionary)
     : StaticTranslation()
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "StaticTranslation"
-    );
-
-    _position = dictionary.value<glm::dvec3>(PositionInfo.identifier);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _position = p.position;
 }
 
 glm::dvec3 StaticTranslation::position(const UpdateData&) const {
diff --git a/modules/base/translation/statictranslation.h b/modules/base/translation/statictranslation.h
index a786bddfd6..3ad3094f98 100644
--- a/modules/base/translation/statictranslation.h
+++ b/modules/base/translation/statictranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/base/translation/timelinetranslation.cpp b/modules/base/translation/timelinetranslation.cpp
index 6cf6da3195..fb6dafb14e 100644
--- a/modules/base/translation/timelinetranslation.cpp
+++ b/modules/base/translation/timelinetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,7 +30,6 @@
 #include <openspace/util/time.h>
 
 namespace {
-    constexpr const char* KeyType = "Type";
     constexpr const char* KeyKeyframes = "Keyframes";
 } // namespace
 
@@ -42,11 +41,6 @@ documentation::Documentation TimelineTranslation::Documentation() {
         "Timeline Translation",
         "base_transform_translation_keyframe",
         {
-            {
-                KeyType,
-                new StringEqualVerifier("TimelineTranslation"),
-                Optional::No
-            },
             {
                 KeyKeyframes,
                 new TableVerifier({
@@ -70,9 +64,8 @@ TimelineTranslation::TimelineTranslation(const ghoul::Dictionary& dictionary) {
     const ghoul::Dictionary& keyframes =
         dictionary.value<ghoul::Dictionary>(KeyKeyframes);
 
-    std::vector<std::string> timeStrings = keyframes.keys();
-    for (const std::string& timeString : timeStrings) {
-        const double t = Time::convertTime(timeString);
+    for (std::string_view timeString : keyframes.keys()) {
+        const double t = Time::convertTime(std::string(timeString));
 
         ghoul::mm_unique_ptr<Translation> translation =
             Translation::createFromDictionary(
diff --git a/modules/base/translation/timelinetranslation.h b/modules/base/translation/timelinetranslation.h
index 238922edd0..33e528d9da 100644
--- a/modules/base/translation/timelinetranslation.h
+++ b/modules/base/translation/timelinetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/cefwebgui/CMakeLists.txt b/modules/cefwebgui/CMakeLists.txt
index 0fcab73536..54d6033373 100644
--- a/modules/cefwebgui/CMakeLists.txt
+++ b/modules/cefwebgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -41,8 +41,6 @@ set(OPENSPACE_SOURCE_FILES
 )
 source_group("Source Files" FILES ${OPENSPACE_SOURCE_FILES})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 create_new_module(
   CefWebGui
   cefwebgui_module
diff --git a/modules/cefwebgui/cefwebguimodule.cpp b/modules/cefwebgui/cefwebguimodule.cpp
index ceecc0e650..9812606e11 100644
--- a/modules/cefwebgui/cefwebguimodule.cpp
+++ b/modules/cefwebgui/cefwebguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -196,8 +196,10 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
         }
     );
 
-    if (configuration.hasValue<float>(GuiScaleInfo.identifier)) {
-        _guiScale = configuration.value<float>(GuiScaleInfo.identifier);
+    if (configuration.hasValue<double>(GuiScaleInfo.identifier)) {
+        _guiScale = static_cast<float>(
+            configuration.value<double>(GuiScaleInfo.identifier)
+        );
     }
 
     _enabled = configuration.hasValue<bool>(EnabledInfo.identifier) &&
@@ -206,11 +208,11 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
     _visible = configuration.hasValue<bool>(VisibleInfo.identifier) &&
                configuration.value<bool>(VisibleInfo.identifier);
 
-    global::callback::initializeGL.emplace_back([this]() {
+    global::callback::initializeGL->emplace_back([this]() {
         startOrStopGui();
     });
 
-    global::callback::draw2D.emplace_back([this](){
+    global::callback::draw2D->emplace_back([this](){
         ZoneScopedN("CefWebGuiModule")
 
         const bool isGuiWindow =
@@ -233,7 +235,7 @@ void CefWebGuiModule::internalInitialize(const ghoul::Dictionary& configuration)
         }
     });
 
-    global::callback::deinitializeGL.emplace_back([this]() {
+    global::callback::deinitializeGL->emplace_back([this]() {
         ZoneScopedN("CefWebGuiModule")
 
         if (_endpointCallback != -1) {
diff --git a/modules/cefwebgui/cefwebguimodule.h b/modules/cefwebgui/cefwebguimodule.h
index 2d42ed3c66..6f230fd57f 100644
--- a/modules/cefwebgui/cefwebguimodule.h
+++ b/modules/cefwebgui/cefwebguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/cefwebgui/include.cmake b/modules/cefwebgui/include.cmake
index 188c9c1068..d904a7eb24 100644
--- a/modules/cefwebgui/include.cmake
+++ b/modules/cefwebgui/include.cmake
@@ -7,6 +7,4 @@ endif ()
 
 set(OPENSPACE_DEPENDENCIES
   webbrowser
-  webgui
-  server
 )
diff --git a/modules/cefwebgui/include/guikeyboardhandler.h b/modules/cefwebgui/include/guikeyboardhandler.h
index 2a74407adc..051a0ed187 100644
--- a/modules/cefwebgui/include/guikeyboardhandler.h
+++ b/modules/cefwebgui/include/guikeyboardhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/cefwebgui/include/guirenderhandler.h b/modules/cefwebgui/include/guirenderhandler.h
index e03c5cfe1c..8e75b82dfc 100644
--- a/modules/cefwebgui/include/guirenderhandler.h
+++ b/modules/cefwebgui/include/guirenderhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/cefwebgui/shaders/gui_fs.glsl b/modules/cefwebgui/shaders/gui_fs.glsl
index 3b31cb9184..08a149d55a 100644
--- a/modules/cefwebgui/shaders/gui_fs.glsl
+++ b/modules/cefwebgui/shaders/gui_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/cefwebgui/shaders/gui_vs.glsl b/modules/cefwebgui/shaders/gui_vs.glsl
index f8ee811e0a..6044288f45 100644
--- a/modules/cefwebgui/shaders/gui_vs.glsl
+++ b/modules/cefwebgui/shaders/gui_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/cefwebgui/src/guikeyboardhandler.cpp b/modules/cefwebgui/src/guikeyboardhandler.cpp
index ef534d0095..c22faa6490 100644
--- a/modules/cefwebgui/src/guikeyboardhandler.cpp
+++ b/modules/cefwebgui/src/guikeyboardhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,7 +31,7 @@ namespace openspace {
 GUIKeyboardHandler::GUIKeyboardHandler() {
     _keyConsumed = false;
 
-    global::callback::keyboard.emplace_back(
+    global::callback::keyboard->emplace_back(
         [&](Key, KeyModifier, KeyAction) -> bool {
             const bool previous = _keyConsumed;
             _keyConsumed = false;
diff --git a/modules/cefwebgui/src/guirenderhandler.cpp b/modules/cefwebgui/src/guirenderhandler.cpp
index 325210abb8..6ee0c1c5de 100644
--- a/modules/cefwebgui/src/guirenderhandler.cpp
+++ b/modules/cefwebgui/src/guirenderhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/debugging/CMakeLists.txt b/modules/debugging/CMakeLists.txt
index 41dfdd2605..74baa55988 100644
--- a/modules/debugging/CMakeLists.txt
+++ b/modules/debugging/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,20 +25,20 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledebugplane.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugrenderer.h
+  rendering/renderabledebugplane.h
+  rendering/debugrenderer.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledebugplane.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugrenderer.cpp
+  rendering/renderabledebugplane.cpp
+  rendering/debugrenderer.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugshader_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/debugshader_fs.glsl
+  rendering/debugshader_vs.glsl
+  rendering/debugshader_fs.glsl
 )
 
 source_group("Shader Files" FILES ${SHADER_FILES})
diff --git a/modules/debugging/debuggingmodule.cpp b/modules/debugging/debuggingmodule.cpp
index 6e00c47158..d6b60e2439 100644
--- a/modules/debugging/debuggingmodule.cpp
+++ b/modules/debugging/debuggingmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/debugging/debuggingmodule.h b/modules/debugging/debuggingmodule.h
index 2d30ebcdc9..4bc2056fc8 100644
--- a/modules/debugging/debuggingmodule.h
+++ b/modules/debugging/debuggingmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/debugging/rendering/debugrenderer.cpp b/modules/debugging/rendering/debugrenderer.cpp
index 56058fe9eb..50721f9987 100644
--- a/modules/debugging/rendering/debugrenderer.cpp
+++ b/modules/debugging/rendering/debugrenderer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -225,24 +225,4 @@ void DebugRenderer::renderCameraFrustum(const RenderData& data, const Camera& ot
     glEnable(GL_CULL_FACE);
 }
 
-#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
-const DebugRenderer::Vertices DebugRenderer::verticesFor(
-                                        const globebrowsing::AABB3& screenSpaceAABB) const
-{
-    Vertices vertices(8);
-    for (size_t i = 0; i < 8; i++) {
-        const bool cornerIsRight = i % 2 == 0;
-        const bool cornerIsUp = i > 3;
-        const bool cornerIsFar = (i / 2) % 2 == 1;
-
-        const double x = cornerIsRight ? screenSpaceAABB.max.x : screenSpaceAABB.min.x;
-        const double y = cornerIsUp ? screenSpaceAABB.max.y : screenSpaceAABB.min.y;
-        const double z = cornerIsFar ? screenSpaceAABB.max.z : screenSpaceAABB.min.z;
-
-        vertices[i] = glm::vec4(x, y, z, 1);
-    }
-    return vertices;
-}
-#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
-
 } // namespace openspace
diff --git a/modules/debugging/rendering/debugrenderer.h b/modules/debugging/rendering/debugrenderer.h
index 37729510e7..62ba47e600 100644
--- a/modules/debugging/rendering/debugrenderer.h
+++ b/modules/debugging/rendering/debugrenderer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,10 +27,6 @@
 
 #include <openspace/util/updatestructures.h>
 
-#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
-#include <modules/globebrowsing/src/basictypes.h>
-#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
-
 #include <ghoul/glm.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include <memory>
@@ -132,15 +128,6 @@ public:
     void renderCameraFrustum(const RenderData& data, const Camera& otherCamera,
         const glm::vec4& rgba = { 1.f, 1.f, 1.f, 0.3f }) const;
 
-#ifdef OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
-    /**
-      * Takes a AABB3 in screen space and returns vertices representing the corner points
-      * of the AABB. The ordering of the corner points is compatible with the box
-      * rendering methods in this class.
-      */
-    const Vertices verticesFor(const globebrowsing::AABB3& screenSpaceAABB) const;
-#endif // OPENSPACE_MODULE_GLOBEBROWSING_ENABLED
-
 protected:
     std::unique_ptr<ghoul::opengl::ProgramObject> _programObject;
 
diff --git a/modules/debugging/rendering/debugshader_fs.glsl b/modules/debugging/rendering/debugshader_fs.glsl
index 0baca40150..fe3dded6a5 100644
--- a/modules/debugging/rendering/debugshader_fs.glsl
+++ b/modules/debugging/rendering/debugshader_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/debugging/rendering/debugshader_vs.glsl b/modules/debugging/rendering/debugshader_vs.glsl
index 359cb7cbc6..33de8fc52f 100644
--- a/modules/debugging/rendering/debugshader_vs.glsl
+++ b/modules/debugging/rendering/debugshader_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp
index a54ab4504d..3b2d0767a5 100644
--- a/modules/debugging/rendering/renderabledebugplane.cpp
+++ b/modules/debugging/rendering/renderabledebugplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/debugging/rendering/renderabledebugplane.h b/modules/debugging/rendering/renderabledebugplane.h
index 95d003d435..27294e2a02 100644
--- a/modules/debugging/rendering/renderabledebugplane.h
+++ b/modules/debugging/rendering/renderabledebugplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/CMakeLists.txt b/modules/digitaluniverse/CMakeLists.txt
index e2f68ab6fa..8eb459ec5e 100644
--- a/modules/digitaluniverse/CMakeLists.txt
+++ b/modules/digitaluniverse/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,38 +25,38 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepoints.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledumeshes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablebillboardscloud.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanescloud.h
+  rendering/renderablepoints.h
+  rendering/renderabledumeshes.h
+  rendering/renderablebillboardscloud.h
+  rendering/renderableplanescloud.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablepoints.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledumeshes.cpp 
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablebillboardscloud.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanescloud.cpp
+  rendering/renderablepoints.cpp
+  rendering/renderabledumeshes.cpp 
+  rendering/renderablebillboardscloud.cpp
+  rendering/renderableplanescloud.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/pointssprite_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/pointssprite_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_sprite_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboardpolygon_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dumesh_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dumesh_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/plane_fs.glsl
+  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
+  shaders/billboardpolygon_fs.glsl
+  shaders/billboardpolygon_gs.glsl
+  shaders/billboardpolygon_vs.glsl
+  shaders/dumesh_vs.glsl
+  shaders/dumesh_fs.glsl
+  shaders/plane_vs.glsl
+  shaders/plane_fs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/digitaluniverse/digitaluniversemodule.cpp b/modules/digitaluniverse/digitaluniversemodule.cpp
index a49031dbd4..df89332339 100644
--- a/modules/digitaluniverse/digitaluniversemodule.cpp
+++ b/modules/digitaluniverse/digitaluniversemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/digitaluniversemodule.h b/modules/digitaluniverse/digitaluniversemodule.h
index 9f1b46c7f8..7890e58082 100644
--- a/modules/digitaluniverse/digitaluniversemodule.h
+++ b/modules/digitaluniverse/digitaluniversemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
index ef9aaf92bd..7ee516e26b 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -50,6 +50,7 @@
 #include <fstream>
 #include <cstdint>
 #include <locale>
+#include <optional>
 #include <string>
 
 namespace {
@@ -65,17 +66,6 @@ namespace {
         "hasColorMap", "enabledRectSizeControl", "hasDvarScaling"
     };
 
-    constexpr const char* KeyFile = "File";
-    constexpr const char* keyColor = "Color";
-    constexpr const char* keyUnit = "Unit";
-    constexpr const char* MeterUnit = "m";
-    constexpr const char* KilometerUnit = "Km";
-    constexpr const char* ParsecUnit = "pc";
-    constexpr const char* KiloparsecUnit = "Kpc";
-    constexpr const char* MegaparsecUnit = "Mpc";
-    constexpr const char* GigaparsecUnit = "Gpc";
-    constexpr const char* GigalightyearUnit = "Gly";
-
     constexpr int8_t CurrentCacheVersion = 1;
     constexpr double PARSEC = 0.308567756E17;
 
@@ -107,26 +97,6 @@ namespace {
         "The path to the color map file of the astronomical object."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo ExactColorMapInfo = {
-        "ExactColorMap",
-        "Exact Color Map File",
-        "Set a 1 to 1 relationship between the color index variable and the colormap"
-        " entrered value."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo ColorRangeInfo = {
-        "ColorRange",
-        "Color Range",
-        "This value determines the colormap ranges for the color parameters of the "
-        "astronomical objects."
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo PolygonSidesInfo = {
-        "PolygonSides",
-        "Polygon Sides",
-        "The number of sides for the polygon used to represent the astronomical object."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo TextColorInfo = {
         "TextColor",
         "Text Color",
@@ -146,13 +116,6 @@ namespace {
         "The text size for the astronomical object labels."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo LabelFileInfo = {
-        "LabelFile",
-        "Label File",
-        "The path to the label file that contains information about the astronomical "
-        "objects being rendered."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo LabelMinSizeInfo = {
         "TextMinSize",
         "Text Min Size",
@@ -199,12 +162,6 @@ namespace {
         "of the astronomical objects."
     };
 
-    constexpr openspace::properties::Property::PropertyInfo TransformationMatrixInfo = {
-        "TransformationMatrix",
-        "Transformation Matrix",
-        "Transformation matrix to be applied to each astronomical object."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo RenderOptionInfo = {
         "RenderOption",
         "Render Option",
@@ -270,180 +227,120 @@ namespace {
         "Set Data Range from Data",
         "Set the data range based on the available data"
     };
+
+    struct [[codegen::Dictionary(RenderableBillboardsCloud)]] Parameters {
+        // The path to the SPECK file that contains information about the astronomical
+        // object being rendered
+        std::optional<std::string> file;
+
+        // [[codegen::verbatim(ColorInfo.description)]]
+        glm::vec3 color;
+
+        // [[codegen::verbatim(SpriteTextureInfo.description)]]
+        std::optional<std::string> texture;
+
+        // [[codegen::verbatim(DrawElementsInfo.description)]]
+        std::optional<bool> drawElements;
+
+        enum class RenderOption {
+            ViewDirection [[codegen::key("Camera View Direction")]],
+            PositionNormal [[codegen::key("Camera Position Normal")]]
+        };
+        // [[codegen::verbatim(RenderOptionInfo.description)]]
+        std::optional<RenderOption> renderOption;
+
+        enum class Unit {
+            Meter [[codegen::key("m")]],
+            Kilometer [[codegen::key("Km")]],
+            Parsec [[codegen::key("pc")]],
+            Kiloparsec [[codegen::key("Kpc")]],
+            Megaparsec [[codegen::key("Mpc")]],
+            Gigaparsec [[codegen::key("Gpc")]],
+            GigalightYears [[codegen::key("Gly")]]
+        };
+        std::optional<Unit> unit;
+
+        // [[codegen::verbatim(ScaleFactorInfo.description)]]
+        std::optional<float> scaleFactor;
+
+        // [[codegen::verbatim(ColorMapInfo.description)]]
+        std::optional<std::string> colorMap;
+
+        // Set a 1 to 1 relationship between the color index variable and the colormap
+        // entrered value
+        std::optional<bool> exactColorMap;
+
+        // The number of sides for the polygon used to represent the astronomical object
+        std::optional<int> polygonSides;
+
+        // [[codgen::verbatim(DrawLabelInfo.description)]]
+        std::optional<bool> drawLabels;
+
+        // [[codgen::verbatim(TextColorInfo.description)]]
+        std::optional<glm::vec3> textColor;
+
+        // [[codgen::verbatim(TextOpacityInfo.description)]]
+        std::optional<float> textOpacity;
+
+        // [[codgen::verbatim(TextSizeInfo.description)]]
+        std::optional<float> textSize;
+
+        // The path to the label file that contains information about the astronomical
+        // objects being rendered
+        std::optional<std::string> labelFile;
+
+        // [[codgen::verbatim(LabelMinSizeInfo.description)]]
+        std::optional<float> textMinSize;
+
+        // [[codgen::verbatim(LabelMaxSizeInfo.description)]]
+        std::optional<float> textMaxSize;
+
+        // [[codgen::verbatim(ColorOptionInfo.description)]]
+        std::optional<std::vector<std::string>> colorOption;
+
+        // [[codgen::verbatim(SizeOptionInfo.description)]]
+        std::optional<std::vector<std::string>> sizeOption;
+
+        // This value determines the colormap ranges for the color parameters of the
+        // astronomical objects
+        std::optional<std::vector<glm::vec2>> colorRange;
+
+        // Transformation matrix to be applied to each astronomical object
+        std::optional<glm::dmat4x4> transformationMatrix;
+
+        // [[codgen::verbatim(FadeInDistancesInfo.description)]]
+        std::optional<glm::dvec2> fadeInDistances;
+
+        // [[codgen::verbatim(DisableFadeInInfo.description)]]
+        std::optional<bool> disableFadeIn;
+
+        // [[codgen::verbatim(BillboardMaxSizeInfo.description)]]
+        std::optional<float> billboardMaxSize;
+
+        // [[codgen::verbatim(BillboardMinSizeInfo.description)]]
+        std::optional<float> billboardMinSize;
+
+        // [[codgen::verbatim(CorrectionSizeEndDistanceInfo.description)]]
+        std::optional<float> correctionSizeEndDistance;
+
+        // [[codgen::verbatim(CorrectionSizeFactorInfo.description)]]
+        std::optional<float> correctionSizeFactor;
+
+        // [[codgen::verbatim(PixelSizeControlInfo.description)]]
+        std::optional<bool> enablePixelSizeControl;
+
+        // [[codgen::verbatim(UseLinearFiltering.description)]]
+        std::optional<bool> useLinearFiltering;
+    };
+#include "renderablebillboardscloud_codegen.cpp"
 }  // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableBillboardsCloud::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableBillboardsCloud",
-        "digitaluniverse_RenderableBillboardsCloud",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableBillboardsCloud"),
-                Optional::No
-            },
-            {
-                KeyFile,
-                new StringVerifier,
-                Optional::Yes,
-                "The path to the SPECK file that contains information about the "
-                "astronomical object being rendered."
-            },
-            {
-                keyColor,
-                new Vector3Verifier<float>,
-                Optional::No,
-                "Astronomical Object Color (r,g,b)."
-            },
-            {
-                SpriteTextureInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                SpriteTextureInfo.description
-            },
-            {
-                ScaleFactorInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                ScaleFactorInfo.description
-            },
-            {
-                ColorMapInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                ColorMapInfo.description
-            },
-            {
-                ExactColorMapInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                ExactColorMapInfo.description
-            },
-            {
-                PolygonSidesInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                PolygonSidesInfo.description
-            },
-            {
-                DrawLabelInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                DrawLabelInfo.description
-            },
-            {
-                TextColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                TextColorInfo.description
-            },
-            {
-                TextOpacityInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TextOpacityInfo.description
-            },
-            {
-                TextSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TextSizeInfo.description
-            },
-            {
-                LabelFileInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                LabelFileInfo.description
-            },
-            {
-                LabelMinSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LabelMinSizeInfo.description
-            },
-            {
-                LabelMaxSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LabelMaxSizeInfo.description
-            },
-            {
-                ColorOptionInfo.identifier,
-                new StringListVerifier,
-                Optional::Yes,
-                ColorOptionInfo.description
-            },
-            {
-                SizeOptionInfo.identifier,
-                new StringListVerifier,
-                Optional::Yes,
-                SizeOptionInfo.description
-            },
-            {
-                ColorRangeInfo.identifier,
-                new Vector2ListVerifier<float>,
-                Optional::Yes,
-                ColorRangeInfo.description
-            },
-            {
-                TransformationMatrixInfo.identifier,
-                new Matrix4x4Verifier<double>,
-                Optional::Yes,
-                TransformationMatrixInfo.description
-            },
-            {
-                FadeInDistancesInfo.identifier,
-                new Vector2Verifier<double>,
-                Optional::Yes,
-                FadeInDistancesInfo.description
-            },
-            {
-                DisableFadeInInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                DisableFadeInInfo.description
-            },
-            {
-                BillboardMaxSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                BillboardMaxSizeInfo.description
-            },
-            {
-                BillboardMinSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                BillboardMinSizeInfo.description
-            },
-            {
-                CorrectionSizeEndDistanceInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                CorrectionSizeEndDistanceInfo.description
-            },
-            {
-                CorrectionSizeFactorInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                CorrectionSizeFactorInfo.description
-            },
-            {
-                PixelSizeControlInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                PixelSizeControlInfo.description
-            },
-            {
-                UseLinearFiltering.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                UseLinearFiltering.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "digitaluniverse_RenderableBillboardsCloud";
+    return doc;
 }
 
 RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& dictionary)
@@ -477,102 +374,91 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
     , _billboardMinSize(BillboardMinSizeInfo, 0.f, 0.f, 100.f)
     , _correctionSizeEndDistance(CorrectionSizeEndDistanceInfo, 17.f, 12.f, 25.f)
     , _correctionSizeFactor(CorrectionSizeFactorInfo, 8.f, 0.f, 20.f)
-    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _setRangeFromData(SetRangeFromData)
     , _useLinearFiltering(UseLinearFiltering, false)
+    , _setRangeFromData(SetRangeFromData)
+    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableBillboardsCloud"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKey(KeyFile)) {
-        _speckFile = absPath(dictionary.value<std::string>(KeyFile));
-        _hasSpeckFile = true;
-    }
-
-    if (dictionary.hasKey(DrawElementsInfo.identifier)) {
-        _drawElements = dictionary.value<bool>(DrawElementsInfo.identifier);
+    if (p.file.has_value()) {
+        _speckFile = absPath(*p.file);
     }
+    _hasSpeckFile = p.file.has_value();
 
+    _drawElements = p.drawElements.value_or(_drawElements);
     _drawElements.onChange([&]() { _hasSpeckFile = !_hasSpeckFile; });
     addProperty(_drawElements);
 
     _renderOption.addOption(RenderOptionViewDirection, "Camera View Direction");
     _renderOption.addOption(RenderOptionPositionNormal, "Camera Position Normal");
 
-    _renderOption = RenderOptionViewDirection;
-    if (dictionary.hasKeyAndValue<std::string>(RenderOptionInfo.identifier)) {
-        const std::string o = dictionary.value<std::string>(RenderOptionInfo.identifier);
-
-        if (o == "Camera View Direction") {
-            _renderOption = RenderOptionViewDirection;
-        }
-        else if (o == "Camera Position Normal") {
-            _renderOption = RenderOptionPositionNormal;
+    if (p.renderOption.has_value()) {
+        switch (*p.renderOption) {
+            case Parameters::RenderOption::ViewDirection:
+                _renderOption = RenderOptionViewDirection;
+                break;
+            case Parameters::RenderOption::PositionNormal:
+                _renderOption = RenderOptionPositionNormal;
+                break;
         }
     }
-
+    else {
+        _renderOption = RenderOptionViewDirection;
+    }
     addProperty(_renderOption);
 
-    if (dictionary.hasKey(keyUnit)) {
-        std::string unit = dictionary.value<std::string>(keyUnit);
-        if (unit == MeterUnit) {
-            _unit = Meter;
-        }
-        else if (unit == KilometerUnit) {
-            _unit = Kilometer;
-        }
-        else if (unit == ParsecUnit) {
-            _unit = Parsec;
-        }
-        else if (unit == KiloparsecUnit) {
-            _unit = Kiloparsec;
-        }
-        else if (unit == MegaparsecUnit) {
-            _unit = Megaparsec;
-        }
-        else if (unit == GigaparsecUnit) {
-            _unit = Gigaparsec;
-        }
-        else if (unit == GigalightyearUnit) {
-            _unit = GigalightYears;
-        }
-        else {
-            LWARNING(
-                "No unit given for RenderableBillboardsCloud. Using meters as units."
-            );
-            _unit = Meter;
+    if (p.unit.has_value()) {
+        switch (*p.unit) {
+            case Parameters::Unit::Meter:
+                _unit = Meter;
+                break;
+            case Parameters::Unit::Kilometer:
+                _unit = Kilometer;
+                break;
+            case Parameters::Unit::Parsec:
+                _unit = Parsec;
+                break;
+            case Parameters::Unit::Kiloparsec:
+                _unit = Kiloparsec;
+                break;
+            case Parameters::Unit::Megaparsec:
+                _unit = Megaparsec;
+                break;
+            case Parameters::Unit::Gigaparsec:
+                _unit = Gigaparsec;
+                break;
+            case Parameters::Unit::GigalightYears:
+                _unit = GigalightYears;
+                break;
         }
     }
+    else {
+        LWARNING("No unit given for RenderableBillboardsCloud. Using meters as units.");
+        _unit = Meter;
+    }
 
-    if (dictionary.hasKey(SpriteTextureInfo.identifier)) {
-        _spriteTexturePath = absPath(dictionary.value<std::string>(
-            SpriteTextureInfo.identifier
-        ));
-
+    if (p.texture.has_value()) {
+        _spriteTexturePath = absPath(*p.texture);
         _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
         addProperty(_spriteTexturePath);
 
-        _hasSpriteTexture = true;
     }
+    _hasSpriteTexture = p.texture.has_value();
 
-    if (dictionary.hasKey(ColorMapInfo.identifier)) {
-        _colorMapFile = absPath(dictionary.value<std::string>(ColorMapInfo.identifier));
+
+    if (p.colorMap.has_value()) {
+        _colorMapFile = absPath(*p.colorMap);
         _hasColorMapFile = true;
 
-        if (dictionary.hasKey(ColorOptionInfo.identifier)) {
-            ghoul::Dictionary colorOptionDataDic = dictionary.value<ghoul::Dictionary>(
-                ColorOptionInfo.identifier
-            );
-            for (int i = 0; i < static_cast<int>(colorOptionDataDic.size()); ++i) {
-                std::string colorMapInUseName(
-                    colorOptionDataDic.value<std::string>(std::to_string(i + 1))
-                );
-                _colorOption.addOption(i, colorMapInUseName);
-                _optionConversionMap.insert({ i, colorMapInUseName });
-                _colorOptionString = colorMapInUseName;
+        if (p.colorOption.has_value()) {
+            std::vector<std::string> opts = *p.colorOption;
+            for (size_t i = 0; i < opts.size(); ++i) {
+                _colorOption.addOption(static_cast<int>(i), opts[i]);
+                _optionConversionMap.insert({ static_cast<int>(i), opts[i] });
+                _colorOptionString = opts[i];
             }
         }
         _colorOption.onChange([&]() {
@@ -583,15 +469,8 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
         });
         addProperty(_colorOption);
 
-        if (dictionary.hasKey(ColorRangeInfo.identifier)) {
-            ghoul::Dictionary rangeDataDict = dictionary.value<ghoul::Dictionary>(
-                ColorRangeInfo.identifier
-            );
-            for (size_t i = 0; i < rangeDataDict.size(); ++i) {
-                _colorRangeData.push_back(
-                    rangeDataDict.value<glm::vec2>(std::to_string(i + 1))
-                );
-            }
+        _colorRangeData = p.colorRange.value_or(_colorRangeData);
+        if (!_colorRangeData.empty()) {
             _optionColorRangeData = _colorRangeData[_colorRangeData.size() - 1];
         }
         _optionColorRangeData.onChange([&]() {
@@ -601,36 +480,25 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
         });
         addProperty(_optionColorRangeData);
 
-        if (dictionary.hasKey(ExactColorMapInfo.identifier)) {
-            _isColorMapExact = dictionary.value<bool>(ExactColorMapInfo.identifier);
-        }
+        _isColorMapExact = p.exactColorMap.value_or(_isColorMapExact);
     }
-    else if (dictionary.hasKey(keyColor)) {
-        _pointColor = dictionary.value<glm::vec3>(keyColor);
+    else {
+        _pointColor = p.color;
         _pointColor.setViewOption(properties::Property::ViewOptions::Color);
         addProperty(_pointColor);
     }
 
     addProperty(_opacity);
 
-    if (dictionary.hasKey(ScaleFactorInfo.identifier)) {
-        _scaleFactor = static_cast<float>(
-            dictionary.value<double>(ScaleFactorInfo.identifier)
-        );
-    }
+    _scaleFactor = p.scaleFactor.value_or(_scaleFactor);
     addProperty(_scaleFactor);
 
-    if (dictionary.hasKey(SizeOptionInfo.identifier)) {
-        ghoul::Dictionary sizeOptionDataDic = dictionary.value<ghoul::Dictionary>(
-            SizeOptionInfo.identifier
-            );
-        for (int i = 0; i < static_cast<int>(sizeOptionDataDic.size()); ++i) {
-            std::string datavarSizeInUseName(
-                sizeOptionDataDic.value<std::string>(std::to_string(i + 1))
-            );
-            _datavarSizeOption.addOption(i, datavarSizeInUseName);
-            _optionConversionSizeMap.insert({ i, datavarSizeInUseName });
-            _datavarSizeOptionString = datavarSizeInUseName;
+    if (p.sizeOption.has_value()) {
+        std::vector<std::string> opts = *p.sizeOption;
+        for (size_t i = 0; i < opts.size(); ++i) {
+            _datavarSizeOption.addOption(static_cast<int>(i), opts[i]);
+            _optionConversionSizeMap.insert({ static_cast<int>(i), opts[i] });
+            _datavarSizeOptionString = opts[i];
         }
 
         _datavarSizeOption.onChange([&]() {
@@ -642,96 +510,62 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
         _hasDatavarSize = true;
     }
 
-    if (dictionary.hasKey(PolygonSidesInfo.identifier)) {
-        _polygonSides = static_cast<int>(
-            dictionary.value<double>(PolygonSidesInfo.identifier)
-        );
-        _hasPolygon = true;
-    }
+    _polygonSides = p.polygonSides.value_or(_polygonSides);
+    _hasPolygon = p.polygonSides.has_value();
 
-    if (dictionary.hasKey(LabelFileInfo.identifier)) {
-        if (dictionary.hasKey(DrawLabelInfo.identifier)) {
-            _drawLabels = dictionary.value<bool>(DrawLabelInfo.identifier);
-        }
+    if (p.labelFile.has_value()) {
+        _drawLabels = p.drawLabels.value_or(_drawLabels);
         addProperty(_drawLabels);
 
-        _labelFile = absPath(dictionary.value<std::string>(LabelFileInfo.identifier));
+        _labelFile = absPath(*p.labelFile);
         _hasLabel = true;
 
-        if (dictionary.hasKey(TextColorInfo.identifier)) {
-            _textColor = dictionary.value<glm::vec3>(TextColorInfo.identifier);
-            _hasLabel = true;
-        }
+        _textColor = p.textColor.value_or(_textColor);
+        _hasLabel = p.textColor.has_value();
         _textColor.setViewOption(properties::Property::ViewOptions::Color);
         addProperty(_textColor);
         _textColor.onChange([&]() { _textColorIsDirty = true; });
 
-        if (dictionary.hasKey(TextOpacityInfo.identifier)) {
-            _textOpacity = dictionary.value<float>(TextOpacityInfo.identifier);
-        }
+        _textOpacity = p.textOpacity.value_or(_textOpacity);
         addProperty(_textOpacity);
 
-        if (dictionary.hasKey(TextSizeInfo.identifier)) {
-            _textSize = dictionary.value<float>(TextSizeInfo.identifier);
-        }
+        _textSize = p.textSize.value_or(_textSize);
         addProperty(_textSize);
 
-        if (dictionary.hasKey(LabelMinSizeInfo.identifier)) {
-            _textMinSize = dictionary.value<float>(LabelMinSizeInfo.identifier);
-        }
+        _textMinSize = p.textMinSize.value_or(_textMinSize);
         addProperty(_textMinSize);
 
-        if (dictionary.hasKey(LabelMaxSizeInfo.identifier)) {
-            _textMaxSize = dictionary.value<float>(LabelMaxSizeInfo.identifier);
-        }
+        _textMaxSize = p.textMaxSize.value_or(_textMaxSize);
         addProperty(_textMaxSize);
     }
 
-    if (dictionary.hasKey(TransformationMatrixInfo.identifier)) {
-        _transformationMatrix = dictionary.value<glm::dmat4>(
-            TransformationMatrixInfo.identifier
-        );
-    }
+    _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
-    if (dictionary.hasKey(FadeInDistancesInfo.identifier)) {
-        glm::vec2 v = dictionary.value<glm::vec2>(FadeInDistancesInfo.identifier);
-        _fadeInDistance = v;
-        _disableFadeInDistance = false;
+    if (p.fadeInDistances.has_value()) {
+        _fadeInDistance = *p.fadeInDistances;
         addProperty(_fadeInDistance);
+
+        _disableFadeInDistance = false;
         addProperty(_disableFadeInDistance);
     }
 
-    if (dictionary.hasKey(BillboardMaxSizeInfo.identifier)) {
-        _billboardMaxSize = static_cast<float>(
-            dictionary.value<double>(BillboardMaxSizeInfo.identifier)
-        );
-    }
+    _billboardMaxSize = p.billboardMaxSize.value_or(_billboardMaxSize);
     addProperty(_billboardMaxSize);
 
-    if (dictionary.hasKey(BillboardMinSizeInfo.identifier)) {
-        _billboardMinSize = static_cast<float>(
-            dictionary.value<double>(BillboardMinSizeInfo.identifier)
-        );
-    }
+    _billboardMinSize = p.billboardMinSize.value_or(_billboardMinSize);
     addProperty(_billboardMinSize);
 
-    if (dictionary.hasKey(CorrectionSizeEndDistanceInfo.identifier)) {
-        _correctionSizeEndDistance = static_cast<float>(
-            dictionary.value<double>(CorrectionSizeEndDistanceInfo.identifier)
-        );
-    }
+    _correctionSizeEndDistance =
+        p.correctionSizeEndDistance.value_or(_correctionSizeEndDistance);
     addProperty(_correctionSizeEndDistance);
 
-    if (dictionary.hasKey(CorrectionSizeFactorInfo.identifier)) {
-        _correctionSizeFactor = static_cast<float>(
-            dictionary.value<double>(CorrectionSizeFactorInfo.identifier)
-        );
-
+    _correctionSizeFactor = p.correctionSizeFactor.value_or(_correctionSizeFactor);
+    if (p.correctionSizeFactor.has_value()) {
         addProperty(_correctionSizeFactor);
     }
 
-    if (dictionary.hasKey(PixelSizeControlInfo.identifier)) {
-        _pixelSizeControl = dictionary.value<bool>(PixelSizeControlInfo.identifier);
+    _pixelSizeControl = p.enablePixelSizeControl.value_or(_pixelSizeControl);
+    if (p.enablePixelSizeControl.has_value()) {
         addProperty(_pixelSizeControl);
     }
 
@@ -751,9 +585,7 @@ RenderableBillboardsCloud::RenderableBillboardsCloud(const ghoul::Dictionary& di
     });
     addProperty(_setRangeFromData);
 
-    if (dictionary.hasKey(UseLinearFiltering.identifier)) {
-        _useLinearFiltering = dictionary.value<bool>(UseLinearFiltering.identifier);
-    }
+    _useLinearFiltering = p.useLinearFiltering.value_or(_useLinearFiltering);
     _useLinearFiltering.onChange([&]() { _dataIsDirty = true; });
     addProperty(_useLinearFiltering);
 }
@@ -1208,7 +1040,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
         ZoneScopedN("Sprite texture")
         TracyGpuZone("Sprite texture")
 
-        ghoul::opengl::Texture* t = _spriteTexture;
+        ghoul::opengl::Texture* texture = _spriteTexture;
 
         unsigned int hash = ghoul::hashCRC32File(_spriteTexturePath);
 
@@ -1225,7 +1057,7 @@ void RenderableBillboardsCloud::update(const UpdateData&) {
             }
         );
 
-        DigitalUniverseModule::TextureManager.release(t);
+        DigitalUniverseModule::TextureManager.release(texture);
         _spriteTextureIsDirty = false;
     }
 }
diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.h b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
index e4e6d40d9b..8bbbf556fc 100644
--- a/modules/digitaluniverse/rendering/renderablebillboardscloud.h
+++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
index afff95f42d..64b6dbc467 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -43,8 +43,9 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <array>
-#include <fstream>
 #include <cstdint>
+#include <fstream>
+#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "RenderableDUMeshes";
@@ -54,16 +55,6 @@ namespace {
         "modelViewTransform", "projectionTransform", "alphaValue", "color"
     };
 
-    constexpr const char* KeyFile = "File";
-    constexpr const char* keyUnit = "Unit";
-    constexpr const char* MeterUnit = "m";
-    constexpr const char* KilometerUnit = "Km";
-    constexpr const char* ParsecUnit = "pc";
-    constexpr const char* KiloparsecUnit = "Kpc";
-    constexpr const char* MegaparsecUnit = "Mpc";
-    constexpr const char* GigaparsecUnit = "Gpc";
-    constexpr const char* GigalightyearUnit = "Gly";
-
     constexpr const int RenderOptionViewDirection = 0;
     constexpr const int RenderOptionPositionNormal = 1;
 
@@ -139,84 +130,59 @@ namespace {
         "Render Option",
         "Debug option for rendering of billboards and texts."
     };
+
+    struct [[codegen::Dictionary(RenderableDUMeshes)]] Parameters {
+        // The path to the SPECK file that contains information about the astronomical
+        // object being rendered
+        std::string file;
+
+        // [[codegen::verbatim(DrawLabelInfo.description)]]
+        std::optional<bool> drawLabels;
+
+        enum class Unit {
+            Meter [[codegen::key("m")]],
+            Kilometer [[codegen::key("Km")]],
+            Parsec [[codegen::key("pc")]],
+            Kiloparsec [[codegen::key("Kpc")]],
+            MegaParsec [[codegen::key("Mpc")]],
+            Gigaparsec [[codegen::key("Gpc")]],
+            Gigalightyears [[codegen::key("Gly")]]
+        };
+        std::optional<Unit> unit;
+
+        // [[codegen::verbatim(TextColorInfo.description)]]
+        std::optional<glm::vec3> textColor;
+
+        // [[codegen::verbatim(TextOpacityInfo.description)]]
+        std::optional<float> textOpacity;
+
+        // [[codegen::verbatim(TextSizeInfo.description)]]
+        std::optional<float> textSize;
+
+        // [[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(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+
+        // [[codegen::verbatim(MeshColorInfo.description)]]
+        std::optional<std::vector<glm::vec3>> meshColor;
+    };
+#include "renderabledumeshes_codegen.cpp"
 }  // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableDUMeshes::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableDUMeshes",
-        "digitaluniverse_renderabledumeshes",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableDUMeshes"),
-                Optional::No
-            },
-            {
-                KeyFile,
-                new StringVerifier,
-                Optional::No,
-                "The path to the SPECK file that contains information about the "
-                "astronomical object being rendered."
-            },
-            {
-                DrawLabelInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                DrawLabelInfo.description
-            },
-            {
-                TextColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                TextColorInfo.description
-            },
-            {
-                TextOpacityInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TextOpacityInfo.description
-            },
-            {
-                TextSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TextSizeInfo.description
-            },
-            {
-                LabelFileInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                LabelFileInfo.description
-            },
-            {
-                LabelMinSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LabelMinSizeInfo.description
-            },
-            {
-                LabelMaxSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LabelMaxSizeInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            },
-            {
-                MeshColorInfo.identifier,
-                new Vector3ListVerifier<float>,
-                Optional::No,
-                MeshColorInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "digitaluniverse_renderabledumeshes";
+    return doc;
 }
 
 RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
@@ -231,24 +197,20 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     , _lineWidth(LineWidthInfo, 2.f, 0.f, 16.f)
     , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableDUMeshes"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    if (dictionary.hasKey(KeyFile)) {
-        _speckFile = absPath(dictionary.value<std::string>(KeyFile));
-        _hasSpeckFile = true;
-        _drawElements.onChange([&]() { _hasSpeckFile = !_hasSpeckFile; });
-        addProperty(_drawElements);
-    }
+    _speckFile = absPath(p.file);
+    _hasSpeckFile = true;
+    _drawElements.onChange([&]() { _hasSpeckFile = !_hasSpeckFile; });
+    addProperty(_drawElements);
 
     _renderOption.addOption(RenderOptionViewDirection, "Camera View Direction");
     _renderOption.addOption(RenderOptionPositionNormal, "Camera Position Normal");
+    // @TODO (abock. 2021-01-31) In the other DU classes, this is done with an enum, and
+    // doing it based on the fisheye rendering seems a bit brittle?
     if (global::windowDelegate->isFisheyeRendering()) {
         _renderOption = RenderOptionPositionNormal;
     }
@@ -257,88 +219,69 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
     }
     addProperty(_renderOption);
 
-    if (dictionary.hasKey(keyUnit)) {
-        std::string unit = dictionary.value<std::string>(keyUnit);
-        if (unit == MeterUnit) {
-            _unit = Meter;
-        }
-        else if (unit == KilometerUnit) {
-            _unit = Kilometer;
-        }
-        else if (unit == ParsecUnit) {
-            _unit = Parsec;
-        }
-        else if (unit == KiloparsecUnit) {
-            _unit = Kiloparsec;
-        }
-        else if (unit == MegaparsecUnit) {
-            _unit = Megaparsec;
-        }
-        else if (unit == GigaparsecUnit) {
-            _unit = Gigaparsec;
-        }
-        else if (unit == GigalightyearUnit) {
-            _unit = GigalightYears;
-        }
-        else {
-            LWARNING("No unit given for RenderableDUMeshes. Using meters as units.");
-            _unit = Meter;
+    if (p.unit.has_value()) {
+        switch (*p.unit) {
+            case Parameters::Unit::Meter:
+                _unit = Meter;
+                break;
+            case Parameters::Unit::Kilometer:
+                _unit = Kilometer;
+                break;
+            case Parameters::Unit::Parsec:
+                _unit = Parsec;
+                break;
+            case Parameters::Unit::Kiloparsec:
+                _unit = Kiloparsec;
+                break;
+            case Parameters::Unit::MegaParsec:
+                _unit = Megaparsec;
+                break;
+            case Parameters::Unit::Gigaparsec:
+                _unit = Gigaparsec;
+                break;
+            case Parameters::Unit::Gigalightyears:
+                _unit = GigalightYears;
+                break;
         }
     }
+    else {
+        LWARNING("No unit given for RenderableDUMeshes. Using meters as units.");
+        _unit = Meter;
+    }
 
-    if (dictionary.hasKeyAndValue<double>(LineWidthInfo.identifier)) {
-        _lineWidth = static_cast<float>(
-            dictionary.value<double>(LineWidthInfo.identifier)
-        );
-    }
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
 
-    if (dictionary.hasKey(DrawLabelInfo.identifier)) {
-        _drawLabels = dictionary.value<bool>(DrawLabelInfo.identifier);
-    }
+    _drawLabels = p.drawLabels.value_or(_drawLabels);
     addProperty(_drawLabels);
 
-    if (dictionary.hasKey(LabelFileInfo.identifier)) {
-        _labelFile = absPath(dictionary.value<std::string>(LabelFileInfo.identifier));
+    if (p.labelFile.has_value()) {
+        _labelFile = absPath(*p.labelFile);
         _hasLabel = true;
 
-        if (dictionary.hasKey(TextColorInfo.identifier)) {
-            _textColor = dictionary.value<glm::vec3>(TextColorInfo.identifier);
-            _hasLabel = true;
-        }
+        _textColor = p.textColor.value_or(_textColor);
+        _hasLabel = p.textColor.has_value();
         _textColor.setViewOption(properties::Property::ViewOptions::Color);
         addProperty(_textColor);
         _textColor.onChange([&]() { _textColorIsDirty = true; });
 
-        if (dictionary.hasKey(TextOpacityInfo.identifier)) {
-            _textOpacity = dictionary.value<float>(TextOpacityInfo.identifier);
-        }
+        _textOpacity = p.textOpacity.value_or(_textOpacity);
         addProperty(_textOpacity);
 
-        if (dictionary.hasKey(TextSizeInfo.identifier)) {
-            _textSize = dictionary.value<float>(TextSizeInfo.identifier);
-        }
+        _textSize = p.textSize.value_or(_textSize);
         addProperty(_textSize);
 
-        if (dictionary.hasKey(LabelMinSizeInfo.identifier)) {
-            _textMinSize = floor(dictionary.value<float>(LabelMinSizeInfo.identifier));
-        }
+        _textMinSize = p.textMinSize.value_or(_textMinSize);
         addProperty(_textMinSize);
 
-        if (dictionary.hasKey(LabelMaxSizeInfo.identifier)) {
-            _textMaxSize = floor(dictionary.value<float>(LabelMaxSizeInfo.identifier));
-        }
+        _textMaxSize = p.textMaxSize.value_or(_textMaxSize);
         addProperty(_textMaxSize);
     }
 
-    if (dictionary.hasKey(MeshColorInfo.identifier)) {
-        ghoul::Dictionary colorDict = dictionary.value<ghoul::Dictionary>(
-            MeshColorInfo.identifier
-        );
-        for (int i = 0; i < static_cast<int>(colorDict.size()); ++i) {
-            _meshColorMap.insert(
-                { i + 1, colorDict.value<glm::vec3>(std::to_string(i + 1)) }
-            );
+    if (p.meshColor.has_value()) {
+        std::vector<glm::vec3> ops = *p.meshColor;
+        for (size_t i = 0; i < ops.size(); ++i) {
+            _meshColorMap.insert({ static_cast<int>(i) + 1, ops[i] });
         }
     }
 }
@@ -485,7 +428,7 @@ void RenderableDUMeshes::renderLabels(const RenderData& data,
     labelInfo.scale = pow(10.f, _textSize);
     labelInfo.enableDepth = true;
     labelInfo.enableFalseDepth = false;
-   
+
     glm::vec4 textColor = glm::vec4(glm::vec3(_textColor), _textOpacity);
 
     for (const std::pair<glm::vec3, std::string>& pair : _labelData) {
diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.h b/modules/digitaluniverse/rendering/renderabledumeshes.h
index 3a1fa603eb..04d32ae50f 100644
--- a/modules/digitaluniverse/rendering/renderabledumeshes.h
+++ b/modules/digitaluniverse/rendering/renderabledumeshes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
index 04aaa90d06..97f27b3264 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -42,6 +42,7 @@
 #include <ghoul/opengl/textureunit.h>
 #include <array>
 #include <fstream>
+#include <optional>
 #include <string>
 
 namespace {
@@ -52,16 +53,6 @@ namespace {
         "modelViewProjectionTransform", "alphaValue", "fadeInValue", "galaxyTexture"
     };
 
-    constexpr const char* KeyFile = "File";
-    constexpr const char* keyUnit = "Unit";
-    constexpr const char* MeterUnit = "m";
-    constexpr const char* KilometerUnit = "Km";
-    constexpr const char* ParsecUnit = "pc";
-    constexpr const char* KiloparsecUnit = "Kpc";
-    constexpr const char* MegaparsecUnit = "Mpc";
-    constexpr const char* GigaparsecUnit = "Gpc";
-    constexpr const char* GigalightyearUnit = "Gly";
-
     constexpr int8_t CurrentCacheVersion = 2;
     constexpr double PARSEC = 0.308567756E17;
 
@@ -180,126 +171,86 @@ namespace {
         "object."
     };
 
+    struct [[codegen::Dictionary(RenderablePlanesCloud)]] Parameters {
+        // The path to the SPECK file that contains information about the astronomical
+        // object being rendered
+        std::optional<std::string> file;
+
+        // [[codegen::verbatim(ScaleFactorInfo.description)]]
+        std::optional<float> scaleFactor;
+
+        // [[codegen::verbatim(TextColorInfo.description)]]
+        std::optional<glm::vec3> textColor;
+
+        // [[codegen::verbatim(TextOpacityInfo.description)]]
+        std::optional<float> textOpacity;
+
+        // [[codegen::verbatim(TextSizeInfo.description)]]
+        std::optional<float> textSize;
+
+        // [[codegen::verbatim(LabelFileInfo.description)]]
+        std::optional<std::string> labelFile;
+
+        // [[codegen::verbatim(LabelMinSizeInfo.description)]]
+        std::optional<int> textMinSize;
+
+        // [[codegen::verbatim(LabelMaxSizeInfo.description)]]
+        std::optional<int> textMaxSize;
+
+        // [[codegen::verbatim(TransformationMatrixInfo.description)]]
+        std::optional<glm::dmat4x4> transformationMatrix;
+
+        enum class BlendMode {
+            Normal,
+            Additive
+        };
+
+        // [[codegen::verbatim(BlendModeInfo.description)]]
+        std::optional<BlendMode> blendMode;
+
+        enum class Unit {
+            Meter [[codegen::key("m")]],
+            Kilometer [[codegen::key("Km")]],
+            Parsec [[codegen::key("pc")]],
+            Kiloparsec [[codegen::key("Kpc")]],
+            Megaparsec [[codegen::key("Mpc")]],
+            Gigaparsec [[codegen::key("Gpc")]],
+            Gigalightyears [[codegen::key("Gly")]]
+        };
+        std::optional<Unit> unit;
+
+        // [[codegen::verbatim(TexturePathInfo.description)]]
+        std::string texturePath;
+
+        // [[codegen::verbatim(LuminosityInfo.description)]]
+        std::optional<std::string> luminosity;
+
+        // [[codegen::verbatim(ScaleLuminosityInfo.description)]]
+        std::optional<float> scaleLuminosity;
+
+        // [[codegen::verbatim(FadeInDistancesInfo.description)]]
+        std::optional<glm::vec2> fadeInDistances;
+
+        // [[codegen::verbatim(DisableFadeInInfo.description)]]
+        std::optional<bool> disableFadeIn;
+
+        // [[codegen::verbatim(PlaneMinSizeInfo.description)]]
+        std::optional<float> planeMinSize;
+    };
+#include "renderableplanescloud_codegen.cpp"
 }  // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderablePlanesCloud::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderablePlanesCloud",
-        "digitaluniverse_RenderablePlanesCloud",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("RenderablePlanesCloud"),
-                Optional::No
-            },
-            {
-                KeyFile,
-                new StringVerifier,
-                Optional::Yes,
-                "The path to the SPECK file that contains information about the "
-                "astronomical object being rendered."
-            },
-            {
-                ScaleFactorInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                ScaleFactorInfo.description
-            },
-            {
-                TextColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                TextColorInfo.description
-            },
-            {
-                TextOpacityInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TextOpacityInfo.description
-            },
-            {
-                TextSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TextSizeInfo.description
-            },
-            {
-                LabelFileInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                LabelFileInfo.description
-            },
-            {
-                LabelMinSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                LabelMinSizeInfo.description
-            },
-            {
-                LabelMaxSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                LabelMaxSizeInfo.description
-            },
-            {
-                TransformationMatrixInfo.identifier,
-                new Matrix4x4Verifier<double>,
-                Optional::Yes,
-                TransformationMatrixInfo.description
-            },
-            {
-                BlendModeInfo.identifier,
-                new StringInListVerifier({ "Normal", "Additive" }),
-                Optional::Yes,
-                BlendModeInfo.description, // + " The default value is 'Normal'.",
-            },
-            {
-                TexturePathInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                TexturePathInfo.description,
-            },
-            {
-                LuminosityInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                LuminosityInfo.description,
-            },
-            {
-                ScaleFactorInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                ScaleFactorInfo.description,
-            },
-            {
-                FadeInDistancesInfo.identifier,
-                new Vector2Verifier<float>,
-                Optional::Yes,
-                FadeInDistancesInfo.description
-            },
-            {
-                DisableFadeInInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                DisableFadeInInfo.description
-            },
-            {
-                PlaneMinSizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                PlaneMinSizeInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "digitaluniverse_RenderablePlanesCloud";
+    return doc;
 }
 
-
 RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
-    , _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 100.f)
+    , _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 300000.f)
     , _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.0, 0.5, 24.0)
@@ -315,16 +266,12 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
     , _planeMinSize(PlaneMinSizeInfo, 0.5, 0.0, 500.0)
     , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderablePlanesCloud"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
 
-    if (dictionary.hasKey(KeyFile)) {
-        _speckFile = absPath(dictionary.value<std::string>(KeyFile));
+    if (p.file.has_value()) {
+        _speckFile = absPath(*p.file);
         _hasSpeckFile = true;
         _drawElements.onChange([&]() { _hasSpeckFile = !_hasSpeckFile; });
         addProperty(_drawElements);
@@ -337,32 +284,29 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
     addProperty(_renderOption);
     //_renderOption.set(1);
 
-    if (dictionary.hasKey(keyUnit)) {
-        const std::string& unit = dictionary.value<std::string>(keyUnit);
-        if (unit == MeterUnit) {
-            _unit = Meter;
-        }
-        else if (unit == KilometerUnit) {
-            _unit = Kilometer;
-        }
-        else if (unit == ParsecUnit) {
-            _unit = Parsec;
-        }
-        else if (unit == KiloparsecUnit) {
-            _unit = Kiloparsec;
-        }
-        else if (unit == MegaparsecUnit) {
-            _unit = Megaparsec;
-        }
-        else if (unit == GigaparsecUnit) {
-            _unit = Gigaparsec;
-        }
-        else if (unit == GigalightyearUnit) {
-            _unit = GigalightYears;
-        }
-        else {
-            LWARNING("No unit given for RenderablePlanesCloud. Using meters as units.");
-            _unit = Meter;
+    if (p.unit.has_value()) {
+        switch (*p.unit) {
+            case Parameters::Unit::Meter:
+                _unit = Meter;
+                break;
+            case Parameters::Unit::Kilometer:
+                _unit = Kilometer;
+                break;
+            case Parameters::Unit::Parsec:
+                _unit = Parsec;
+                break;
+            case Parameters::Unit::Kiloparsec:
+                _unit = Kiloparsec;
+                break;
+            case Parameters::Unit::Megaparsec:
+                _unit = Megaparsec;
+                break;
+            case Parameters::Unit::Gigaparsec:
+                _unit = Gigaparsec;
+                break;
+            case Parameters::Unit::Gigalightyears:
+                _unit = GigalightYears;
+                break;
         }
     }
     else {
@@ -370,56 +314,30 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
         _unit = Meter;
     }
 
-    if (dictionary.hasKey(ScaleFactorInfo.identifier)) {
-        _scaleFactor = static_cast<float>(
-            dictionary.value<double>(ScaleFactorInfo.identifier)
-        );
-    }
+    _scaleFactor = p.scaleFactor.value_or(_scaleFactor);
     addProperty(_scaleFactor);
-    _scaleFactor.onChange([&]() {
-        _dataIsDirty = true;
-    });
+    _scaleFactor.onChange([&]() { _dataIsDirty = true; });
 
-    if (dictionary.hasKey(LabelFileInfo.identifier)) {
-        _labelFile = absPath(dictionary.value<std::string>(LabelFileInfo.identifier));
+    if (p.labelFile.has_value()) {
+        _labelFile = absPath(*p.labelFile);
         _hasLabel = true;
 
-        if (dictionary.hasKey(TextColorInfo.identifier)) {
-            _textColor = dictionary.value<glm::vec3>(TextColorInfo.identifier);
-            _hasLabel = true;
-        }
+        _textColor = p.textColor.value_or(_textColor);
         _textColor.setViewOption(properties::Property::ViewOptions::Color);
         addProperty(_textColor);
         _textColor.onChange([&]() { _textColorIsDirty = true; });
 
-        if (dictionary.hasKey(TextOpacityInfo.identifier)) {
-            _textOpacity = dictionary.value<float>(TextOpacityInfo.identifier);
-        }
+        _textOpacity = p.textOpacity.value_or(_textOpacity);
         addProperty(_textOpacity);
 
-        if (dictionary.hasKey(TextSizeInfo.identifier)) {
-            _textSize = dictionary.value<float>(TextSizeInfo.identifier);
-        }
+        _textSize = p.textSize.value_or(_textSize);
         addProperty(_textSize);
 
-        if (dictionary.hasKey(LabelMinSizeInfo.identifier)) {
-            _textMinSize = static_cast<int>(
-                dictionary.value<float>(LabelMinSizeInfo.identifier)
-            );
-        }
-
-        if (dictionary.hasKey(LabelMaxSizeInfo.identifier)) {
-            _textMaxSize = static_cast<int>(
-                dictionary.value<float>(LabelMaxSizeInfo.identifier)
-            );
-        }
+        _textMinSize = p.textMinSize.value_or(_textMinSize);
+        _textMaxSize = p.textMaxSize.value_or(_textMaxSize);
     }
 
-    if (dictionary.hasKey(TransformationMatrixInfo.identifier)) {
-        _transformationMatrix = dictionary.value<glm::dmat4>(
-            TransformationMatrixInfo.identifier
-        );
-    }
+    _transformationMatrix = p.transformationMatrix.value_or(_transformationMatrix);
 
     _blendMode.addOptions({
         { BlendModeNormal, "Normal" },
@@ -438,39 +356,33 @@ RenderablePlanesCloud::RenderablePlanesCloud(const ghoul::Dictionary& dictionary
         }
     });
 
-    if (dictionary.hasKey(BlendModeInfo.identifier)) {
-        const std::string& v = dictionary.value<std::string>(BlendModeInfo.identifier);
-        if (v == "Normal") {
-            _blendMode = BlendModeNormal;
-        }
-        else if (v == "Additive") {
-            _blendMode = BlendModeAdditive;
+    if (p.blendMode.has_value()) {
+        switch (*p.blendMode) {
+            case Parameters::BlendMode::Normal:
+                _blendMode = BlendModeNormal;
+                break;
+            case Parameters::BlendMode::Additive:
+                _blendMode = BlendModeAdditive;
+                break;
         }
     }
 
-    _texturesPath = absPath(dictionary.value<std::string>(TexturePathInfo.identifier));
+    _texturesPath = absPath(p.texturePath);
 
-    if (dictionary.hasKey(LuminosityInfo.identifier)) {
-        _luminosityVar = dictionary.value<std::string>(LuminosityInfo.identifier);
-    }
+    _luminosityVar = p.luminosity.value_or(_luminosityVar);
+    _sluminosity = p.scaleLuminosity.value_or(_sluminosity);
 
-    if (dictionary.hasKey(ScaleLuminosityInfo.identifier)) {
-        _sluminosity = static_cast<float>(
-            dictionary.value<double>(ScaleLuminosityInfo.identifier)
-        );
-    }
 
-    if (dictionary.hasKey(FadeInDistancesInfo.identifier)) {
-        _fadeInDistance = dictionary.value<glm::vec2>(FadeInDistancesInfo.identifier);
+    if (p.fadeInDistances.has_value()) {
+        _fadeInDistance = *p.fadeInDistances;
         _disableFadeInDistance = false;
         addProperty(_fadeInDistance);
         addProperty(_disableFadeInDistance);
     }
 
-    if (dictionary.hasKey(PlaneMinSizeInfo.identifier)) {
-        _planeMinSize = static_cast<float>(
-            dictionary.value<double>(PlaneMinSizeInfo.identifier)
-        );
+    _planeMinSize = p.planeMinSize.value_or(_planeMinSize);
+    
+    if (p.planeMinSize.has_value()) {
         addProperty(_planeMinSize);
     }
 }
@@ -562,8 +474,10 @@ void RenderablePlanesCloud::renderPlanes(const RenderData&,
     _program->setUniform(_uniformCache.alphaValue, _opacity);
     _program->setUniform(_uniformCache.fadeInValue, fadeInVariable);
 
+    glDisable(GL_CULL_FACE);
+
     GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
+    global::renderEngine->openglStateCache().viewport(viewport);
 
     ghoul::opengl::TextureUnit unit;
     unit.activate();
@@ -592,6 +506,7 @@ void RenderablePlanesCloud::renderPlanes(const RenderData&,
     // Restores OpenGL Rendering State
     global::renderEngine->openglStateCache().resetBlendState();
     global::renderEngine->openglStateCache().resetDepthState();
+    global::renderEngine->openglStateCache().resetPolygonAndClippingState();
 }
 
 void RenderablePlanesCloud::renderLabels(const RenderData& data,
@@ -625,15 +540,15 @@ void RenderablePlanesCloud::renderLabels(const RenderData& data,
     }
 
     glm::vec4 textColor = glm::vec4(
-        glm::vec3(_textColor), 
+        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 = _textMinSize;
+    labelInfo.maxSize = _textMaxSize;
     labelInfo.cameraPos = data.camera.positionVec3();
     labelInfo.cameraLookUp = data.camera.lookUpVectorWorldSpace();
     labelInfo.renderType = _renderOption;
@@ -989,7 +904,6 @@ bool RenderablePlanesCloud::readSpeckFile() {
 
         glm::vec3 u(0.f);
         glm::vec3 v(0.f);
-        int textureIndex = 0;
 
         std::vector<float> values(_nValuesPerAstronomicalObject);
 
@@ -1019,11 +933,6 @@ bool RenderablePlanesCloud::readSpeckFile() {
                         break;
                 }
             }
-
-            // JCC: This should be moved to the RenderablePlanesCloud:
-            if (i == _textureVariableIndex) {
-                textureIndex = static_cast<int>(values[i]);
-            }
         }
         _fullData.insert(_fullData.end(), values.begin(), values.end());
 
diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.h b/modules/digitaluniverse/rendering/renderableplanescloud.h
index 96d2813edb..2180769f03 100644
--- a/modules/digitaluniverse/rendering/renderableplanescloud.h
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/rendering/renderablepoints.cpp b/modules/digitaluniverse/rendering/renderablepoints.cpp
index ebfc9fff45..e56a454603 100644
--- a/modules/digitaluniverse/rendering/renderablepoints.cpp
+++ b/modules/digitaluniverse/rendering/renderablepoints.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -44,6 +44,7 @@
 #include <locale>
 #include <cstdint>
 #include <string>
+#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "RenderablePoints";
@@ -53,17 +54,6 @@ namespace {
         "spriteTexture", "hasColorMap"
     };
 
-    constexpr const char* KeyFile = "File";
-    constexpr const char* keyColor = "Color";
-    constexpr const char* keyUnit = "Unit";
-    constexpr const char* MeterUnit = "m";
-    constexpr const char* KilometerUnit = "Km";
-    constexpr const char* ParsecUnit = "pc";
-    constexpr const char* KiloparsecUnit = "Kpc";
-    constexpr const char* MegaparsecUnit = "Mpc";
-    constexpr const char* GigaparsecUnit = "Gpc";
-    constexpr const char* GigalightyearUnit = "Gly";
-
     constexpr int8_t CurrentCacheVersion = 1;
     constexpr double PARSEC = 0.308567756E17;
 
@@ -91,58 +81,46 @@ namespace {
         "Color Map File",
         "The path to the color map file of the astronomical onject."
     };
+
+    struct [[codegen::Dictionary(RenderablePoints)]] Parameters {
+        // The path to the SPECK file that contains information about the astronomical
+        // object being rendered
+        std::string file;
+
+        // Astronomical Object Color (r,g,b)
+        glm::vec3 color;
+
+        enum class Unit {
+            Meter [[codegen::key("m")]],
+            Kilometer [[codegen::key("Km")]],
+            Parsec [[codegen::key("pc")]],
+            Kiloparsec [[codegen::key("Kpc")]],
+            Megaparsec [[codegen::key("Mpc")]],
+            Gigaparsec [[codegen::key("Gpc")]],
+            Gigalightyears [[codegen::key("Gly")]]
+        };
+        std::optional<Unit> unit;
+
+        // [[codegen::verbatim(SpriteTextureInfo.description)]]
+        std::optional<std::string> texture;
+
+        // [[codegen::verbatim(ScaleFactorInfo.description)]]
+        std::optional<float> scaleFactor;
+
+        // [[codegen::verbatim(ColorMapInfo.description)]]
+        std::optional<std::string> colorMap;
+    };
+#include "renderablepoints_codegen.cpp"
 }  // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderablePoints::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderablePoints",
-        "digitaluniverse_renderablepoints",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("RenderablePoints"),
-                Optional::No
-            },
-            {
-                KeyFile,
-                new StringVerifier,
-                Optional::No,
-                "The path to the SPECK file that contains information about the "
-                "astronomical object being rendered."
-            },
-            {
-                keyColor,
-                new Vector3Verifier<float>,
-                Optional::No,
-                "Astronomical Object Color (r,g,b)."
-            },
-            {
-                SpriteTextureInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                SpriteTextureInfo.description
-            },
-            {
-                ScaleFactorInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                ScaleFactorInfo.description
-            },
-            {
-                ColorMapInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                ColorMapInfo.description
-            },
-
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "digitaluniverse_renderablepoints";
+    return doc;
 }
 
-
 RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _scaleFactor(ScaleFactorInfo, 1.f, 0.f, 64.f)
@@ -150,59 +128,52 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
         ColorInfo,
         glm::vec3(1.f, 0.4f, 0.2f),
         glm::vec3(0.f, 0.f, 0.f),
-        glm::vec3(1.0f, 1.0f, 1.0f)
+        glm::vec3(1.f, 1.f, 1.f)
     )
     , _spriteTexturePath(SpriteTextureInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderablePoints"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    _speckFile = absPath(dictionary.value<std::string>(KeyFile));
+    _speckFile = absPath(p.file);
 
-    if (dictionary.hasKey(keyUnit)) {
-        const std::string& unit = dictionary.value<std::string>(keyUnit);
-        if (unit == MeterUnit) {
-            _unit = Meter;
-        }
-        else if (unit == KilometerUnit) {
-            _unit = Kilometer;
-        }
-        else if (unit == ParsecUnit) {
-            _unit = Parsec;
-        }
-        else if (unit == KiloparsecUnit) {
-            _unit = Kiloparsec;
-        }
-        else if (unit == MegaparsecUnit) {
-            _unit = Megaparsec;
-        }
-        else if (unit == GigaparsecUnit) {
-            _unit = Gigaparsec;
-        }
-        else if (unit == GigalightyearUnit) {
-            _unit = GigalightYears;
-        }
-        else {
-            LWARNING("No unit given for RenderablePoints. Using meters as units.");
-            _unit = Meter;
+    if (p.unit.has_value()) {
+        switch (*p.unit) {
+            case Parameters::Unit::Meter:
+                _unit = Meter;
+                break;
+            case Parameters::Unit::Kilometer:
+                _unit = Kilometer;
+                break;
+            case Parameters::Unit::Parsec:
+                _unit = Parsec;
+                break;
+            case Parameters::Unit::Kiloparsec:
+                _unit = Kiloparsec;
+                break;
+            case Parameters::Unit::Megaparsec:
+                _unit = Megaparsec;
+                break;
+            case Parameters::Unit::Gigaparsec:
+                _unit = Gigaparsec;
+                break;
+            case Parameters::Unit::Gigalightyears:
+                _unit = GigalightYears;
+                break;
         }
     }
-
-    if (dictionary.hasKey(keyColor)) {
-        _pointColor = dictionary.value<glm::vec3>(keyColor);
+    else {
+        LWARNING("No unit given for RenderablePoints. Using meters as units.");
+        _unit = Meter;
     }
+
+    _pointColor = p.color;
     addProperty(_pointColor);
 
-    if (dictionary.hasKey(SpriteTextureInfo.identifier)) {
-        _spriteTexturePath = absPath(dictionary.value<std::string>(
-            SpriteTextureInfo.identifier
-        ));
+    if (p.texture.has_value()) {
+        _spriteTexturePath = absPath(*p.texture);
         _spriteTextureFile = std::make_unique<ghoul::filesystem::File>(
             _spriteTexturePath
         );
@@ -216,18 +187,12 @@ RenderablePoints::RenderablePoints(const ghoul::Dictionary& dictionary)
         _hasSpriteTexture = true;
     }
 
-    if (dictionary.hasKey(ColorMapInfo.identifier)) {
-        _colorMapFile = absPath(dictionary.value<std::string>(
-            ColorMapInfo.identifier
-        ));
+    if (p.colorMap.has_value()) {
+        _colorMapFile = absPath(*p.colorMap);
         _hasColorMapFile = true;
     }
 
-    if (dictionary.hasKey(ScaleFactorInfo.identifier)) {
-        _scaleFactor = static_cast<float>(
-            dictionary.value<double>(ScaleFactorInfo.identifier)
-        );
-    }
+    _scaleFactor = p.scaleFactor.value_or(_scaleFactor);
     addProperty(_scaleFactor);
 }
 
diff --git a/modules/digitaluniverse/rendering/renderablepoints.h b/modules/digitaluniverse/rendering/renderablepoints.h
index 1b27786097..b842a90deb 100644
--- a/modules/digitaluniverse/rendering/renderablepoints.h
+++ b/modules/digitaluniverse/rendering/renderablepoints.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/billboard_fs.glsl b/modules/digitaluniverse/shaders/billboard_fs.glsl
index d0fd92a9d2..678b20592a 100644
--- a/modules/digitaluniverse/shaders/billboard_fs.glsl
+++ b/modules/digitaluniverse/shaders/billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/billboard_gs.glsl b/modules/digitaluniverse/shaders/billboard_gs.glsl
index 2ee4ea61cd..e2f7fb4fc7 100644
--- a/modules/digitaluniverse/shaders/billboard_gs.glsl
+++ b/modules/digitaluniverse/shaders/billboard_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -107,11 +107,11 @@ void main() {
     
     vec4 initialPosition, secondPosition, thirdPosition, crossCorner;
   
-    if (renderOption == 0) {
+    if (renderOption == 0) { // Camera View Direction
         scaledRight = scaleMultiply * right * 0.5f;
         scaledUp    = scaleMultiply * up * 0.5f;
     }
-    else if (renderOption == 1) {
+    else if (renderOption == 1) { // Camera Position Normal
         vec3 normal   = vec3(normalize(cameraPosition - dpos.xyz));
         vec3 newRight = normalize(cross(cameraLookUp, normal));
         vec3 newUp    = cross(normal, newRight);
@@ -144,12 +144,8 @@ void main() {
         // width and height
         vec2 sizes = abs(halfViewSize * (topRight - bottomLeft));
         
-        if (enabledRectSizeControl && ((sizes.y > maxBillboardSize) ||
-            (sizes.x > maxBillboardSize))) {        
-            //Set maximum size as Carter's instructions
-            float correctionScale = 
-                sizes.y > maxBillboardSize ? maxBillboardSize / sizes.y :
-                                             maxBillboardSize / sizes.x;
+        if (enabledRectSizeControl && (length(sizes) > maxBillboardSize)) {
+            float correctionScale = maxBillboardSize / length(sizes);
             
             scaledRight *= correctionScale;
             scaledUp    *= correctionScale;
@@ -198,4 +194,4 @@ void main() {
     EmitVertex();
     
     EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/modules/digitaluniverse/shaders/billboard_vs.glsl b/modules/digitaluniverse/shaders/billboard_vs.glsl
index 2a8a25f8ba..98517afeb5 100644
--- a/modules/digitaluniverse/shaders/billboard_vs.glsl
+++ b/modules/digitaluniverse/shaders/billboard_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl
index 44b6b55b04..bcea223fd0 100644
--- a/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl
+++ b/modules/digitaluniverse/shaders/billboardpolygon_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -21,13 +21,13 @@
  * 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 vec4 finalColor;
 
 uniform vec3 polygonColor;
 
-void main(void) {
-  
+void main() {
   finalColor = vec4(polygonColor, 1.0 );
 }
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
index 7592e9d685..2bd88f5b90 100644
--- a/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
+++ b/modules/digitaluniverse/shaders/billboardpolygon_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,8 +32,7 @@ uniform int sides;
 
 const float PI = 3.1415926;
 
-void main()
-{
+void main() {
     // for (int i = 0; i <= sides; i++) {
     //     // Angle between each side in radians
     //     float ang = PI * 2.0 / float(sides) * i;
@@ -71,4 +70,4 @@ void main()
 
         EndPrimitive();
     }
-}
\ No newline at end of file
+}
diff --git a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl b/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl
index 0f972cb4e3..aead855d65 100644
--- a/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl
+++ b/modules/digitaluniverse/shaders/billboardpolygon_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/dumesh_fs.glsl b/modules/digitaluniverse/shaders/dumesh_fs.glsl
index 6997b13fc1..1e28d7ce69 100644
--- a/modules/digitaluniverse/shaders/dumesh_fs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/dumesh_vs.glsl b/modules/digitaluniverse/shaders/dumesh_vs.glsl
index ebbdf31643..281d1d0a64 100644
--- a/modules/digitaluniverse/shaders/dumesh_vs.glsl
+++ b/modules/digitaluniverse/shaders/dumesh_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/plane_fs.glsl b/modules/digitaluniverse/shaders/plane_fs.glsl
index 51b0a869fe..5282ce582e 100644
--- a/modules/digitaluniverse/shaders/plane_fs.glsl
+++ b/modules/digitaluniverse/shaders/plane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/plane_vs.glsl b/modules/digitaluniverse/shaders/plane_vs.glsl
index e4e2dd04f6..cb84739b05 100644
--- a/modules/digitaluniverse/shaders/plane_vs.glsl
+++ b/modules/digitaluniverse/shaders/plane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/points_fs.glsl b/modules/digitaluniverse/shaders/points_fs.glsl
index ff55cd58d8..a38eb2d5fb 100644
--- a/modules/digitaluniverse/shaders/points_fs.glsl
+++ b/modules/digitaluniverse/shaders/points_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/points_gs.glsl b/modules/digitaluniverse/shaders/points_gs.glsl
index e2b63ded8d..dc074d0484 100644
--- a/modules/digitaluniverse/shaders/points_gs.glsl
+++ b/modules/digitaluniverse/shaders/points_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,8 +38,7 @@ out float gs_screenSpaceDepth;
 
 const float PI = 3.1415926;
 
-void main()
-{
+void main() {
     gs_screenSpaceDepth = vs_screenSpaceDepth[0];
     
     for (int i = 0; i <= sides; i++) {
@@ -61,4 +60,4 @@ void main()
     //EmitVertex();
 
     EndPrimitive();
-}
\ No newline at end of file
+}
diff --git a/modules/digitaluniverse/shaders/points_sprite_fs.glsl b/modules/digitaluniverse/shaders/points_sprite_fs.glsl
index f47d8beba2..03fdcfd916 100644
--- a/modules/digitaluniverse/shaders/points_sprite_fs.glsl
+++ b/modules/digitaluniverse/shaders/points_sprite_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,7 +30,6 @@ in float vs_screenSpaceDepth;
 uniform vec3 color;
 uniform float alphaValue;
 
-// Sprite
 uniform sampler2D spriteTexture;
 
 Fragment getFragment() {
diff --git a/modules/digitaluniverse/shaders/points_vs.glsl b/modules/digitaluniverse/shaders/points_vs.glsl
index 63d4aa0992..a741bea69e 100644
--- a/modules/digitaluniverse/shaders/points_vs.glsl
+++ b/modules/digitaluniverse/shaders/points_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/pointssprite_fs.glsl b/modules/digitaluniverse/shaders/pointssprite_fs.glsl
index 6dbf377174..6a6cfdb647 100644
--- a/modules/digitaluniverse/shaders/pointssprite_fs.glsl
+++ b/modules/digitaluniverse/shaders/pointssprite_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/digitaluniverse/shaders/pointssprite_vs.glsl b/modules/digitaluniverse/shaders/pointssprite_vs.glsl
index a6627b5ad1..7f06ce0d6a 100644
--- a/modules/digitaluniverse/shaders/pointssprite_vs.glsl
+++ b/modules/digitaluniverse/shaders/pointssprite_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/exoplanets/CMakeLists.txt b/modules/exoplanets/CMakeLists.txt
index fff4edca01..85d59b86a9 100644
--- a/modules/exoplanets/CMakeLists.txt
+++ b/modules/exoplanets/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,25 +25,25 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/exoplanetshelper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/exoplanetsmodule.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableorbitdisc.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/tasks/exoplanetsdatapreparationtask.h
+    exoplanetshelper.h
+    exoplanetsmodule.h
+    rendering/renderableorbitdisc.h
+    tasks/exoplanetsdatapreparationtask.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/exoplanetshelper.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/exoplanetsmodule.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/exoplanetsmodule_lua.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableorbitdisc.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/tasks/exoplanetsdatapreparationtask.cpp
+    exoplanetshelper.cpp
+    exoplanetsmodule.cpp
+    exoplanetsmodule_lua.inl
+    rendering/renderableorbitdisc.cpp
+    tasks/exoplanetsdatapreparationtask.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/shaders/orbitdisc_fs.glsl
-    ${CMAKE_CURRENT_SOURCE_DIR}/shaders/orbitdisc_vs.glsl
+    shaders/orbitdisc_fs.glsl
+    shaders/orbitdisc_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/exoplanets/exoplanetshelper.cpp b/modules/exoplanets/exoplanetshelper.cpp
index ed624d67de..17bf9b5fe8 100644
--- a/modules/exoplanets/exoplanetshelper.cpp
+++ b/modules/exoplanets/exoplanetshelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -42,58 +42,21 @@ namespace {
 
 namespace openspace::exoplanets {
 
-std::string_view speckStarName(std::string_view csvName) {
-    if (csvName == "MOA-2009-BLG-387L") { return "MOA 2009-BLG-387L"; }
-    if (csvName == "OGLE-2007-BLG-368L") { return "OGLE 2007-BLG-368L"; }
-    if (csvName == "OGLE-2005-BLG-169L") { return "OGLE 2005-BLG-169L"; }
-    if (csvName == "OGLE-2005-BLG-071L") { return "OGLE 2005-BLG-71L"; }
-    if (csvName == "OGLE-2003-BLG-235L") { return "OGLE 2003-BLG-235L"; }
-    if (csvName == "MOA-2008-BLG-310L") { return "MOA 2008-BLG-310L"; }
-    if (csvName == "OGLE-2006-BLG-109L") { return "OGLE 2006-BLG-109L"; }
-    if (csvName == "HD 137388") { return "HD 137388 A"; }
-    if (csvName == "MOA-2010-BLG-477L") { return "MOA 2010-BLG-477L"; }
-    if (csvName == "MOA-2009-BLG-266L") { return "MOA 2009-BLG-266L"; }
-    if (csvName == "iot Dra") { return "HIP 75458"; }
-    if (csvName == "MOA-2007-BLG-400L") { return "MOA 2007-BLG-400L"; }
-    if (csvName == "OGLE-2011-BLG-0251L") { return "OGLE 2011-BLG-251L"; }
-    if (csvName == "OGLE-2005-BLG-390L") { return "OGLE 2005-BLG-390L"; }
-    if (csvName == "MOA-2007-BLG-192L") { return "MOA 2007-BLG-192L"; }
-    if (csvName == "MOA-2009-BLG-319L") { return "MOA 2009-BLG-319L"; }
-    return csvName;
+bool isValidPosition(const glm::vec3& pos) {
+    return !glm::any(glm::isnan(pos));
 }
 
-std::string_view csvStarName(std::string_view name) {
-    if (name == "MOA 2009-BLG-387L") { return "MOA-2009-BLG-387L"; }
-    if (name == "OGLE 2007-BLG-368L") { return "OGLE-2007-BLG-368L"; }
-    if (name == "OGLE 2005-BLG-169L") { return "OGLE-2005-BLG-169L"; }
-    if (name == "OGLE 2005-BLG-71L") { return "OGLE-2005-BLG-071L"; }
-    if (name == "OGLE 2003-BLG-235L") { return "OGLE-2003-BLG-235L"; }
-    if (name == "MOA 2008-BLG-310L") { return "MOA-2008-BLG-310L"; }
-    if (name == "OGLE 2006-BLG-109L") { return "OGLE-2006-BLG-109L"; }
-    if (name == "HD 137388 A") { return "HD 137388"; }
-    if (name == "MOA 2010-BLG-477L") { return "MOA-2010-BLG-477L"; }
-    if (name == "MOA 2009-BLG-266L") { return "MOA-2009-BLG-266L"; }
-    if (name == "HIP 75458") { return "iot Dra"; }
-    if (name == "MOA 2007-BLG-400L") { return "MOA-2007-BLG-400L"; }
-    if (name == "OGLE 2011-BLG-251L") { return "OGLE-2011-BLG-0251L"; }
-    if (name == "OGLE 2005-BLG-390L") { return "OGLE-2005-BLG-390L"; }
-    if (name == "MOA 2007-BLG-192L") { return "MOA-2007-BLG-192L"; }
-    if (name == "MOA 2009-BLG-319L") { return "MOA-2009-BLG-319L"; }
-    return name;
-}
-
-bool hasSufficientData(const Exoplanet& p) {
-    bool invalidPos = std::isnan(p.positionX)
-        || std::isnan(p.positionY)
-        || std::isnan(p.positionZ);
+bool hasSufficientData(const ExoplanetDataEntry& p) {
+    const glm::vec3 starPosition{ p.positionX , p.positionY, p.positionZ };
 
+    bool validStarPosition = isValidPosition(starPosition);
     bool hasSemiMajorAxis = !std::isnan(p.a);
     bool hasOrbitalPeriod = !std::isnan(p.per);
 
-    return !invalidPos && hasSemiMajorAxis && hasOrbitalPeriod;
+    return validStarPosition && hasSemiMajorAxis && hasOrbitalPeriod;
 }
 
-std::string starColor(float bv) {
+glm::vec3 starColor(float bv) {
     std::ifstream colorMap(absPath(BvColormapPath), std::ios::in);
 
     if (!colorMap.good()) {
@@ -101,7 +64,7 @@ std::string starColor(float bv) {
             "Failed to open colormap data file: '{}'",
             absPath(BvColormapPath)
         ));
-        return "";
+        return glm::vec3(0.f, 0.f, 0.f);
     }
 
     const int t = static_cast<int>(round(((bv + 0.4) / (2.0 + 0.4)) * 255));
@@ -112,12 +75,10 @@ std::string starColor(float bv) {
     colorMap.close();
 
     std::istringstream colorStream(color);
-    std::string r, g, b;
-    getline(colorStream, r, ' ');
-    getline(colorStream, g, ' ');
-    getline(colorStream, b, ' ');
+    float r, g, b;
+    colorStream >> r >> g >> b;
 
-    return fmt::format("{{ {}, {}, {} }}", r, g, b);
+    return glm::vec3(r, g, b);
 }
 
 glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom, float omega) {
@@ -177,6 +138,7 @@ glm::dmat3 computeSystemRotation(glm::dvec3 starPosition) {
 
 std::string createIdentifier(std::string name) {
     std::replace(name.begin(), name.end(), ' ', '_');
+    std::replace(name.begin(), name.end(), '.', '-');
     sanitizeNameString(name);
     return name;
 }
diff --git a/modules/exoplanets/exoplanetshelper.h b/modules/exoplanets/exoplanetshelper.h
index 29e6b5a7ac..527bdf4b01 100644
--- a/modules/exoplanets/exoplanetshelper.h
+++ b/modules/exoplanets/exoplanetshelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -22,15 +22,17 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#ifndef __OPENSPACE_MODULE_EXOPLANETS___EXOPLANET_HELPER___H__
-#define __OPENSPACE_MODULE_EXOPLANETS___EXOPLANET_HELPER___H__
+#ifndef __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSHELPER___H__
+#define __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSHELPER___H__
 
 #include <ghoul/glm.h>
+#include <optional>
 #include <string>
+#include <vector>
 
 namespace openspace::exoplanets {
 
-struct Exoplanet {
+struct ExoplanetDataEntry {
     float a;            // Orbital semi-major axis in AU
     double aUpper;      // Upper uncertainty of orbital semi-major axis
     double aLower;      // Lower uncertainty of orbital semi-major axis
@@ -38,14 +40,15 @@ struct Exoplanet {
     float bigOmegaUpper; // Upper uncertainty of longitude of ascending node
     float bigOmegaLower; // Lower uncertainty of longitude of ascending node
     bool binary;        // Star known to be binary?
-    float bmv;          // B − V color
+    float bmv;          // Star B − V color
     float ecc;          // Orbital eccentricity
     float eccUpper;     // Upper uncertainty of orbital eccentricity
     float eccLower;     // Lower uncertainty of orbital eccentricity
     float i;            // Orbital inclination in degrees (for transiting systems only)
     float iUpper;       // Upper uncertainty of orbital inclination
     float iLower;       // Lower uncertainty of orbital inclination
-    int nComp;          // Number of planetary companions known
+    int nPlanets;       // Number of known planets in the planetary system
+    int nStars;         // Number of stars in the planetary system
     float omega;        // Argument of periastron in degrees
     float omegaUpper;   // Upper uncertainty of argument of periastron
     float omegaLower;   // Lower uncertainty of argument of periastron
@@ -58,27 +61,48 @@ struct Exoplanet {
     float rStar;        // Estimated radius of the star in solar radii
     float rStarUpper;   // Upper uncertainty of estimated star radius
     float rStarLower;   // Lower uncertainty of estimated star radius
+    float luminosity;      // Star luminosity, in units of solar luminosities
+    float luminosityUpper; // Upper uncertainty of star luminosity
+    float luminosityLower; // Lower uncertainty of star luminosity
+    float teff;         // Star's effective temperature in Kelvin
+    float teffUpper;    // Upper uncertainty of effective temperature
+    float teffLower;    // Lower uncertainty of effective temperature
     double tt;          // Epoch of transit center in HJD-2440000
     float ttUpper;      // Upper uncertainty of epoch of transit center
     float ttLower;      // Lower uncertainty of epoch of transit center
-    float positionX;    // Star position's X-coordinate in parsec
-    float positionY;    // Star position's Y-coordinate in parsec
-    float positionZ;    // Star position's Z-coordinate in parsec
+    // Star position's X-coordinate in parsec
+    float positionX = std::numeric_limits<float>::quiet_NaN();
+    // Star position's Y-coordinate in parsec
+    float positionY = std::numeric_limits<float>::quiet_NaN();
+    // Star position's Z-coordinate in parsec
+    float positionZ = std::numeric_limits<float>::quiet_NaN();
 };
 
-// Convert csv-file specific names to the corresponding name in the speck data file
-std::string_view speckStarName(std::string_view name);
+struct StarData {
+    glm::vec3 position = glm::vec3(std::numeric_limits<float>::quiet_NaN()); // In parsec
+    float radius = std::numeric_limits<float>::quiet_NaN(); // In solar radii
+    float bv = std::numeric_limits<float>::quiet_NaN();
+    float teff = std::numeric_limits<float>::quiet_NaN(); // In Kelvin
+    float luminosity = std::numeric_limits<float>::quiet_NaN(); // In solar luminosities
+};
 
-// Convert speck-file specific names to the corresponding name in the csv data file
-std::string_view csvStarName(std::string_view name);
+struct ExoplanetSystem {
+    std::string starName;
+    StarData starData;
+    std::vector<std::string> planetNames;
+    std::vector<ExoplanetDataEntry> planetsData;
+};
+
+bool isValidPosition(const glm::vec3& pos);
 
 // Check if the exoplanet p has sufficient data for visualization
-bool hasSufficientData(const Exoplanet& p);
+bool hasSufficientData(const ExoplanetDataEntry& p);
 
 // Compute star color in RGB from b-v color index
-std::string starColor(float bv);
+glm::vec3 starColor(float bv);
 
-glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom, float omega);
+glm::dmat4 computeOrbitPlaneRotationMatrix(float i, float bigom = 180.f,
+    float omega = 90.f);
 
 // Rotate the original coordinate system (where x is pointing to First Point of Aries)
 // so that x is pointing from star to the sun.
@@ -91,4 +115,4 @@ void sanitizeNameString(std::string& s);
 
 } // namespace openspace::exoplanets
 
-#endif // __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSMODULE___H__
+#endif // __OPENSPACE_MODULE_EXOPLANETS___EXOPLANETSHELPER___H__
diff --git a/modules/exoplanets/exoplanetsmodule.cpp b/modules/exoplanets/exoplanetsmodule.cpp
index 3a9305d206..b962f758e1 100644
--- a/modules/exoplanets/exoplanetsmodule.cpp
+++ b/modules/exoplanets/exoplanetsmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -54,14 +54,14 @@ scripting::LuaLibrary ExoplanetsModule::luaLibrary() const {
             {},
             "string or list of strings",
             "Add one or multiple exoplanet systems to the scene, as specified by the "
-            "input. An input string should be the name of the system host star."
+            "input. An input string should be the name of the system host star"
         },
         {
             "removeExoplanetSystem",
             &exoplanets::luascriptfunctions::removeExoplanetSystem,
             {},
             "string",
-            "Removes the nodes of the specified exoplanet system from the scene graph."
+            "Removes the nodes of the specified exoplanet system from the scene graph"
         },
         {
             "listAvailableExoplanetSystems",
@@ -69,14 +69,14 @@ scripting::LuaLibrary ExoplanetsModule::luaLibrary() const {
             {},
             "",
             "Prints a list with the names of all exoplanet systems that can be added to "
-            "the scene graph to the OpenSpace Log. "
+            "the scene graph to the OpenSpace Log"
         },
         {
             "getListOfExoplanets",
             &exoplanets::luascriptfunctions::getListOfExoplanets,
             {},
             "",
-            "Gets a list with the names of all exoplanet systems, that can be used by a GUI."
+            "Gets a list with the names of all exoplanet systems"
         }
     };
 
@@ -93,7 +93,8 @@ void ExoplanetsModule::internalInitialize(const ghoul::Dictionary&) {
 
 std::vector<documentation::Documentation> ExoplanetsModule::documentations() const {
     return {
-        ExoplanetsDataPreparationTask::documentation()
+        ExoplanetsDataPreparationTask::documentation(),
+        RenderableOrbitDisc::Documentation()
     };
 }
 
diff --git a/modules/exoplanets/exoplanetsmodule.h b/modules/exoplanets/exoplanetsmodule.h
index 3a9ea264f4..76058f99b5 100644
--- a/modules/exoplanets/exoplanetsmodule.h
+++ b/modules/exoplanets/exoplanetsmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/exoplanets/exoplanetsmodule_lua.inl b/modules/exoplanets/exoplanetsmodule_lua.inl
index cd73664631..a92408f154 100644
--- a/modules/exoplanets/exoplanetsmodule_lua.inl
+++ b/modules/exoplanets/exoplanetsmodule_lua.inl
@@ -1,26 +1,26 @@
 /*****************************************************************************************
-*                                                                                       *
-* OpenSpace                                                                             *
-*                                                                                       *
-* Copyright (c) 2014-2020                                                               *
-*                                                                                       *
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
-* software and associated documentation files (the "Software"), to deal in the Software *
-* without restriction, including without limitation the rights to use, copy, modify,    *
-* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
-* permit persons to whom the Software is furnished to do so, subject to the following   *
-* conditions:                                                                           *
-*                                                                                       *
-* The above copyright notice and this permission notice shall be included in all copies *
-* or substantial portions of the Software.                                              *
-*                                                                                       *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
-* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
-* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
-* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
-* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
-* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
-****************************************************************************************/
+ *                                                                                       *
+ * 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/exoplanets/exoplanetshelper.h>
 #include <openspace/engine/globals.h>
@@ -39,48 +39,38 @@
 #include <sstream>
 
 namespace {
-    constexpr const char* _loggerCat = "ExoplanetsModule";
+    constexpr const char _loggerCat[] = "ExoplanetsModule";
 } // namespace
 
 namespace openspace::exoplanets::luascriptfunctions {
 
-constexpr const char* ExoplanetsGuiPath = "/Milky Way/Exoplanets/Exoplanet Systems/";
+constexpr const char ExoplanetsGuiPath[] = "/Milky Way/Exoplanets/Exoplanet Systems/";
 
-constexpr const char* LookUpTablePath = "${SYNC}/http/exoplanets_data/1/lookup.txt";
-constexpr const char* ExoplanetsDataPath =
-    "${SYNC}/http/exoplanets_data/1/exoplanets_data.bin";
+constexpr const char LookUpTablePath[] = "${SYNC}/http/exoplanets_data/2/lookup.txt";
+constexpr const char ExoplanetsDataPath[] =
+    "${SYNC}/http/exoplanets_data/2/exoplanets_data.bin";
 
-constexpr const char* StarTextureFile = "${SYNC}/http/exoplanets_textures/1/sun.jpg";
-constexpr const char* DiscTextureFile =
-    "${SYNC}/http/exoplanets_textures/1/disc_texture.png";
+constexpr const char StarTextureFile[] = "${SYNC}/http/exoplanets_textures/2/sun.jpg";
+constexpr const char NoDataTextureFile[] =
+    "${SYNC}/http/exoplanets_textures/2/grid-32.png";
+constexpr const char DiscTextureFile[] =
+    "${SYNC}/http/exoplanets_textures/2/disc_bw_texture.png";
+constexpr const char HabitableZoneTextureFile[] =
+    "${SYNC}/http/habitable_zone_textures/1/hot_to_cold_faded.png";
 
-void createExoplanetSystem(std::string_view starName) {
-    // If user have given name as in EOD, change it to speck-name
-    const std::string starNameSpeck = std::string(speckStarName(starName));
+constexpr const float AU = static_cast<float>(distanceconstants::AstronomicalUnit);
+constexpr const float SolarRadius = static_cast<float>(distanceconstants::SolarRadius);
+constexpr const float JupiterRadius = static_cast<float>(distanceconstants::JupiterRadius);
 
-    const std::string starIdentifier = createIdentifier(starNameSpeck);
-
-    std::string sanitizedStarName = starNameSpeck;
-    sanitizeNameString(sanitizedStarName);
-
-    const std::string guiPath = ExoplanetsGuiPath + sanitizedStarName;
-
-    SceneGraphNode* existingStarNode = sceneGraphNode(starIdentifier);
-    if (existingStarNode) {
-        LERROR(fmt::format(
-            "Adding of exoplanet system '{}' failed. The system has already been added.",
-            starName
-        ));
-        return;
-    }
+ExoplanetSystem findExoplanetSystemInData(std::string_view starName) {
+    ExoplanetSystem system;
 
     std::ifstream data(absPath(ExoplanetsDataPath), std::ios::in | std::ios::binary);
-
     if (!data.good()) {
         LERROR(fmt::format(
             "Failed to open exoplanets data file: '{}'", absPath(ExoplanetsDataPath)
         ));
-        return;
+        return ExoplanetSystem();
     }
 
     std::ifstream lut(absPath(LookUpTablePath));
@@ -88,107 +78,147 @@ void createExoplanetSystem(std::string_view starName) {
         LERROR(fmt::format(
             "Failed to open exoplanets look-up table: '{}'", absPath(LookUpTablePath)
         ));
-        return;
+        return ExoplanetSystem();
     }
 
     // 1. search lut for the starname and return the corresponding location
     // 2. go to that location in the data file
     // 3. read sizeof(exoplanet) bytes into an exoplanet object.
-    Exoplanet p;
+    ExoplanetDataEntry p;
     std::string line;
-    bool found = false;
-
-    std::vector<Exoplanet> planetSystem;
-    std::vector<std::string> planetNames;
-
-    while (getline(lut, line)) {
+    while (std::getline(lut, line)) {
         std::istringstream ss(line);
         std::string name;
-        getline(ss, name, ',');
+        std::getline(ss, name, ',');
 
-        if (name.compare(0, name.length() - 2, starNameSpeck) == 0) {
+        if (name.substr(0, name.length() - 2) == starName) {
             std::string location_s;
-            getline(ss, location_s);
+            std::getline(ss, location_s);
             long location = std::stol(location_s.c_str());
 
             data.seekg(location);
-            data.read(reinterpret_cast<char*>(&p), sizeof(Exoplanet));
+            data.read(reinterpret_cast<char*>(&p), sizeof(ExoplanetDataEntry));
 
             sanitizeNameString(name);
-            planetNames.push_back(name);
-            planetSystem.push_back(p);
-            found = true;
 
             if (!hasSufficientData(p)) {
-                LERROR(fmt::format(
-                    "Insufficient data available for visualizion of exoplanet system: '{}'",
-                    starName
-                ));
-                return;
+                LWARNING(fmt::format("Insufficient data for exoplanet: '{}'", name));
+                continue;
+            }
+
+            system.planetNames.push_back(name);
+            system.planetsData.push_back(p);
+
+            // Star data - Should not vary between planets, but one data entry might
+            // lack data for the host star while another does not. So for every planet,
+            // update star data if needed
+            const glm::vec3 pos{ p.positionX, p.positionY, p.positionZ };
+            if (system.starData.position != pos && isValidPosition(pos)) {
+                system.starData.position = pos;
+            }
+            if (system.starData.radius != p.rStar && !std::isnan(p.rStar)) {
+                system.starData.radius = p.rStar;
+            }
+            if (system.starData.bv != p.bmv && !std::isnan(p.bmv)) {
+                system.starData.bv = p.bmv;
+            }
+            if (system.starData.teff != p.teff && !std::isnan(p.teff)) {
+                system.starData.teff = p.teff;
+            }
+            if (system.starData.luminosity != p.luminosity && !std::isnan(p.luminosity)) {
+                system.starData.luminosity = p.luminosity;
             }
         }
     }
 
-    data.close();
-    lut.close();
+    system.starName = starName;
+    return system;
+}
 
-    if (!found) {
-        LERROR(fmt::format("No star with the provided name was found: '{}'", starName));
+void createExoplanetSystem(const std::string& starName) {
+    const std::string starIdentifier = createIdentifier(starName);
+
+    std::string sanitizedStarName = starName;
+    sanitizeNameString(sanitizedStarName);
+
+    const std::string guiPath = ExoplanetsGuiPath + sanitizedStarName;
+
+    SceneGraphNode* existingStarNode = sceneGraphNode(starIdentifier);
+    if (existingStarNode) {
+        LERROR(fmt::format(
+            "Adding of exoplanet system '{}' failed. The system has already been added",
+            starName
+        ));
         return;
     }
 
-    const glm::dvec3 starPosition = glm::dvec3(
-        p.positionX * distanceconstants::Parsec,
-        p.positionY * distanceconstants::Parsec,
-        p.positionZ * distanceconstants::Parsec
-    );
-
-    const glm::dmat3 exoplanetSystemRotation = computeSystemRotation(starPosition);
-
-    // Star renderable globe, if we have a radius and bv color index
-    std::string starGlobeRenderableString;
-    if (!std::isnan(p.rStar)) {
-        const float radiusInMeter =
-            p.rStar * static_cast<float>(distanceconstants::SolarRadius);
-
-        std::string layers = "";
-        if (!std::isnan(p.bmv)) {
-            // @TODO (emmbr, 2020-10-12) should also check the bv value for the siblings.
-            // The data on the planets is derived from different sources, so while this
-            // planet has a nan value, another might not
-            const std::string color = starColor(p.bmv);
-
-            if (color.empty()) {
-                LERROR("Error occurred when computing star color");
-                return;
-            }
-
-            layers = "ColorLayers = {"
-                "{"
-                    "Identifier = 'StarColor',"
-                    "Type = 'SolidColor',"
-                    "Color = " + color + ","
-                    "BlendMode = 'Normal',"
-                    "Enabled = true"
-                "},"
-                "{"
-                    "Identifier = 'StarTexture',"
-                    "FilePath = openspace.absPath('" + StarTextureFile + "'),"
-                    "BlendMode = 'Color',"
-                    "Enabled = true"
-                "}"
-            "}";
-        }
-
-        starGlobeRenderableString = "Renderable = {"
-            "Type = 'RenderableGlobe',"
-            "Radii = " + std::to_string(radiusInMeter) + ","
-            "SegmentsPerPatch = 64,"
-            "PerformShading = false,"
-            "Layers = {" + layers + "}"
-        "},";
+    ExoplanetSystem system = findExoplanetSystemInData(starName);
+    if (system.planetsData.empty()) {
+        LERROR(fmt::format("Exoplanet system '{}' could not be found", starName));
+        return;
     }
 
+    const glm::vec3 starPosInParsec = system.starData.position;
+    if (!isValidPosition(starPosInParsec)) {
+        LERROR(fmt::format(
+            "Insufficient data available for exoplanet system: '{}'. "
+            "Could not determine star position", starName
+        ));
+        return;
+    }
+
+    const glm::dvec3 starPos =
+        static_cast<glm::dvec3>(starPosInParsec) * distanceconstants::Parsec;
+    const glm::dmat3 exoplanetSystemRotation = computeSystemRotation(starPos);
+
+    // Star
+    float radiusInMeter = SolarRadius;
+    if (!std::isnan(system.starData.radius)) {
+        radiusInMeter *= system.starData.radius;
+    }
+
+    std::string colorLayers;
+    const float bv = system.starData.bv;
+
+    if (!std::isnan(bv)) {
+        const glm::vec3 color = starColor(bv);
+        colorLayers =
+            "{"
+                "Identifier = 'StarColor',"
+                "Type = 'SolidColor',"
+                "Color = " + ghoul::to_string(color) + ","
+                "BlendMode = 'Normal',"
+                "Enabled = true"
+            "},"
+            "{"
+                "Identifier = 'StarTexture',"
+                "FilePath = " +
+                    fmt::format("openspace.absPath('{}')", StarTextureFile) + ","
+                "BlendMode = 'Color',"
+                "Enabled = true"
+            "}";
+    }
+    else {
+        colorLayers =
+            "{"
+                "Identifier = 'NoDataStarTexture',"
+                "FilePath = " +
+                    fmt::format("openspace.absPath('{}')", NoDataTextureFile) + ","
+                "BlendMode = 'Color',"
+                "Enabled = true"
+            "}";
+    }
+
+    const std::string starGlobeRenderableString = "Renderable = {"
+        "Type = 'RenderableGlobe',"
+        "Radii = " + std::to_string(radiusInMeter) + ","
+        "SegmentsPerPatch = 64,"
+        "PerformShading = false,"
+        "Layers = {"
+            "ColorLayers = { " + colorLayers + "}"
+        "}"
+    "},";
+
     const std::string starParent = "{"
         "Identifier = '" + starIdentifier + "',"
         "Parent = 'SolarSystemBarycenter',"
@@ -200,7 +230,7 @@ void createExoplanetSystem(std::string_view starName) {
             "},"
             "Translation = {"
                 "Type = 'StaticTranslation',"
-                "Position = " + ghoul::to_string(starPosition) + ""
+                "Position = " + ghoul::to_string(starPos) + ""
             "}"
         "},"
         "Tag = {'exoplanet_system'},"
@@ -216,9 +246,9 @@ void createExoplanetSystem(std::string_view starName) {
     );
 
     // Planets
-    for (size_t i = 0; i < planetSystem.size(); i++) {
-        Exoplanet planet = planetSystem[i];
-        const std::string planetName = planetNames[i];
+    for (size_t i = 0; i < system.planetNames.size(); i++) {
+        ExoplanetDataEntry& planet = system.planetsData[i];
+        const std::string planetName = system.planetNames[i];
 
         if (std::isnan(planet.ecc)) {
             planet.ecc = 0.f;
@@ -248,41 +278,36 @@ void createExoplanetSystem(std::string_view starName) {
 
         float planetRadius;
         std::string enabled;
-
-        const float astronomicalUnit = static_cast<float>(distanceconstants::AstronomicalUnit);
-        const float solarRadius = static_cast<float>(distanceconstants::SolarRadius);
-        const float jupiterRadius = static_cast<float>(distanceconstants::JupiterRadius);
-
         if (std::isnan(planet.r)) {
             if (std::isnan(planet.rStar)) {
-                planetRadius = planet.a * 0.001f * astronomicalUnit;
+                planetRadius = planet.a * 0.001f * AU;
             }
             else {
-                planetRadius = planet.rStar * 0.1f * solarRadius;
+                planetRadius = planet.rStar * 0.1f * SolarRadius;
             }
             enabled = "false";
         }
         else {
-            planetRadius = static_cast<float>(planet.r) * jupiterRadius;
+            planetRadius = static_cast<float>(planet.r) * JupiterRadius;
             enabled = "true";
         }
 
-        const float period = static_cast<float>(planet.per * SecondsPerDay);
-        const float semiMajorAxisInMeter = planet.a * astronomicalUnit;
+        const float periodInSeconds = static_cast<float>(planet.per * SecondsPerDay);
+        const float semiMajorAxisInMeter = planet.a * AU;
         const float semiMajorAxisInKm = semiMajorAxisInMeter * 0.001f;
 
         const std::string planetIdentifier = createIdentifier(planetName);
 
         const std::string planetKeplerTranslation = "{"
             "Type = 'KeplerTranslation',"
-            "Eccentricity = " + std::to_string(planet.ecc) + "," //ECC
+            "Eccentricity = " + std::to_string(planet.ecc) + ","
             "SemiMajorAxis = " + std::to_string(semiMajorAxisInKm) + ","
-            "Inclination = " + std::to_string(planet.i) + "," //I
-            "AscendingNode = " + std::to_string(planet.bigOmega) + "," //BIGOM
-            "ArgumentOfPeriapsis = " + std::to_string(planet.omega) + "," //OM
+            "Inclination = " + std::to_string(planet.i) + ","
+            "AscendingNode = " + std::to_string(planet.bigOmega) + ","
+            "ArgumentOfPeriapsis = " + std::to_string(planet.omega) + ","
             "MeanAnomaly = 0.0,"
             "Epoch = '" + sEpoch + "'," //TT. JD to YYYY MM DD hh:mm:ss
-            "Period = " + std::to_string(period) + ""
+            "Period = " + std::to_string(periodInSeconds) + ""
         "}";
 
         const std::string planetNode = "{"
@@ -292,7 +317,7 @@ void createExoplanetSystem(std::string_view starName) {
             "Renderable = {"
                 "Type = 'RenderableGlobe',"
                 "Enabled = " + enabled + ","
-                "Radii = " + std::to_string(planetRadius) + "," //R. in meters.
+                "Radii = " + std::to_string(planetRadius) + "," // in meters
                 "SegmentsPerPatch = 64,"
                 "PerformShading = false,"
                 "Layers = {}"
@@ -308,17 +333,12 @@ void createExoplanetSystem(std::string_view starName) {
 
         int trailResolution = 1000;
 
-        // increase the resolution for highly eccentric orbits
+        // Increase the resolution for highly eccentric orbits
         const float eccentricityThreshold = 0.85f;
         if (planet.ecc > eccentricityThreshold) {
             trailResolution *= 2;
         }
 
-        openspace::global::scriptEngine->queueScript(
-            "openspace.addSceneGraphNode(" + planetNode + ");",
-            scripting::ScriptEngine::RemoteScripting::Yes
-        );
-
         const std::string planetTrailNode = "{"
             "Identifier = '" + planetIdentifier + "_Trail',"
             "Parent = '" + starIdentifier + "',"
@@ -337,21 +357,24 @@ void createExoplanetSystem(std::string_view starName) {
         "}";
 
         openspace::global::scriptEngine->queueScript(
-            "openspace.addSceneGraphNode(" + planetTrailNode + ");",
-            openspace::scripting::ScriptEngine::RemoteScripting::Yes
+            "openspace.addSceneGraphNode(" + planetTrailNode + ");"
+            "openspace.addSceneGraphNode(" + planetNode + ");",
+            scripting::ScriptEngine::RemoteScripting::Yes
         );
 
         bool hasUpperAUncertainty = !std::isnan(planet.aUpper);
         bool hasLowerAUncertainty = !std::isnan(planet.aLower);
 
         if (hasUpperAUncertainty && hasLowerAUncertainty) {
-            // Get the orbit plane of the planet trail orbit from the KeplerTranslation
-            const glm::dmat4 orbitPlaneRotationMatrix = computeOrbitPlaneRotationMatrix(
+            const glm::dmat4 rotation = computeOrbitPlaneRotationMatrix(
                 planet.i,
                 planet.bigOmega,
                 planet.omega
             );
-            const glm::dmat3 rotation = orbitPlaneRotationMatrix;
+            const glm::dmat3 rotationMat3 = static_cast<glm::dmat3>(rotation);
+
+            const float lowerOffset = static_cast<float>(planet.aLower / planet.a);
+            const float upperOffset = static_cast<float>(planet.aUpper / planet.a);
 
             const std::string discNode = "{"
                 "Identifier = '" + planetIdentifier + "_Disc',"
@@ -363,15 +386,15 @@ void createExoplanetSystem(std::string_view starName) {
                     "Size = " + std::to_string(semiMajorAxisInMeter) + ","
                     "Eccentricity = " + std::to_string(planet.ecc) + ","
                     "Offset = { " +
-                        std::to_string(planet.aLower) + ", " +
-                        std::to_string(planet.aUpper) +
+                        std::to_string(lowerOffset) + ", " +
+                        std::to_string(upperOffset) +
                     "}," //min / max extend
-                    "Opacity = 0.3"
+                    "Opacity = 0.25"
                 "},"
                 "Transform = {"
                     "Rotation = {"
                         "Type = 'StaticRotation',"
-                        "Rotation = " + ghoul::to_string(rotation) + ""
+                        "Rotation = " + ghoul::to_string(rotationMat3) + ""
                     "}"
                 "},"
                 "GUI = {"
@@ -386,6 +409,90 @@ void createExoplanetSystem(std::string_view starName) {
             );
         }
     }
+
+
+    float meanInclination = 0.f;
+    for (const ExoplanetDataEntry& p : system.planetsData) {
+        meanInclination += p.i;
+    }
+    meanInclination /= static_cast<float>(system.planetsData.size());
+    const glm::dmat4 rotation = computeOrbitPlaneRotationMatrix(meanInclination);
+    const glm::dmat3 meanOrbitPlaneRotationMatrix = static_cast<glm::dmat3>(rotation);
+
+    // 1 AU Size Comparison Ring
+    const std::string ringIdentifier = starIdentifier + "_1AU_Ring";
+    const std::string ring = "{"
+        "Identifier = '" + starIdentifier + "_1AU_Ring',"
+        "Parent = '" + starIdentifier + "',"
+        "Enabled = false,"
+        "Renderable = {"
+            "Type = 'RenderableRadialGrid',"
+            "OuterRadius = " + std::to_string(AU) + ","
+            "CircleSegments = 64,"
+            "LineWidth = 2.0,"
+        "},"
+        "Transform = {"
+            "Rotation = {"
+                "Type = 'StaticRotation',"
+                "Rotation = " + ghoul::to_string(meanOrbitPlaneRotationMatrix) + ""
+            "}"
+        "},"
+        "GUI = {"
+            "Name = '1 AU Size Comparison Ring',"
+            "Path = '" + guiPath + "'"
+        "}"
+    "}";
+
+    openspace::global::scriptEngine->queueScript(
+        "openspace.addSceneGraphNode(" + ring + ");",
+        scripting::ScriptEngine::RemoteScripting::Yes
+    );
+
+    // Habitable Zone
+    bool hasTeff = !std::isnan(system.starData.teff);
+    bool hasLuminosity = !std::isnan(system.starData.luminosity);
+
+    if (hasTeff && hasLuminosity) {
+        constexpr const char* description =
+            "The habitable zone is the region around a star in which an Earth-like "
+            "planet can potentially have liquid water on its surface."
+            "<br><br>"
+            "The inner boundary is where the greenhouse gases in the atmosphere "
+            "would trap any incoming infrared radiation, leading to the planet "
+            "surface becoming so hot that water boils away. The outer boundary is where "
+            "the greenhouse effect would not be able to maintain surface temperature "
+            "above freezing anywhere on the planet.";
+
+        const std::string zoneDiscNode = "{"
+            "Identifier = '" + starIdentifier + "_HZ_Disc',"
+            "Parent = '" + starIdentifier + "',"
+            "Enabled = true,"
+            "Renderable = {"
+                "Type = 'RenderableHabitableZone',"
+                "Texture = openspace.absPath('" + HabitableZoneTextureFile + "'),"
+                "Luminosity = " + std::to_string(system.starData.luminosity) + ","
+                "EffectiveTemperature = " + std::to_string(system.starData.teff) + ","
+                "Optimistic = true,"
+                "Opacity = 0.07"
+            "},"
+            "Transform = {"
+                "Rotation = {"
+                    "Type = 'StaticRotation',"
+                    "Rotation = " + ghoul::to_string(meanOrbitPlaneRotationMatrix) + ""
+                "}"
+            "},"
+            "GUI = {"
+                "Name = '" + starName + " Habitable Zone',"
+                "Path = '" + guiPath + "',"
+                "Description = '" + description + "'"
+            "}"
+        "}";
+
+        openspace::global::scriptEngine->queueScript(
+            "openspace.addSceneGraphNode(" + zoneDiscNode + ");",
+            scripting::ScriptEngine::RemoteScripting::Yes
+        );
+    }
 }
 
 int addExoplanetSystem(lua_State* L) {
@@ -403,7 +510,7 @@ int addExoplanetSystem(lua_State* L) {
         ghoul::lua::luaDictionaryFromState(L, d);
 
         for (size_t i = 1; i <= d.size(); ++i) {
-            if (!d.hasKeyAndValue<std::string>(std::to_string(i))) {
+            if (!d.hasValue<std::string>(std::to_string(i))) {
                 return ghoul::lua::luaError(
                     L, fmt::format("List item {} is of invalid type", i)
                 );
@@ -427,8 +534,7 @@ int removeExoplanetSystem(lua_State* L) {
 
     const int StringLocation = -1;
     const std::string starName = luaL_checkstring(L, StringLocation);
-    const std::string starNameSpeck = std::string(speckStarName(starName));
-    const std::string starIdentifier = createIdentifier(starNameSpeck);
+    const std::string starIdentifier = createIdentifier(starName);
 
     openspace::global::scriptEngine->queueScript(
         "openspace.removeSceneGraphNode('" + starIdentifier + "');",
@@ -456,29 +562,29 @@ std::vector<std::string> hostStarsWithSufficientData() {
 
     // Read number of lines
     int nExoplanets = 0;
-    while (getline(lookupTableFile, line)) {
+    while (std::getline(lookupTableFile, line)) {
         ++nExoplanets;
     }
     lookupTableFile.clear();
     lookupTableFile.seekg(0);
     names.reserve(nExoplanets);
 
-    Exoplanet p;
-    while (getline(lookupTableFile, line)) {
+    ExoplanetDataEntry p;
+    while (std::getline(lookupTableFile, line)) {
         std::stringstream ss(line);
         std::string name;
-        getline(ss, name, ',');
+        std::getline(ss, name, ',');
         // Remove the last two characters, that specify the planet
         name = name.substr(0, name.size() - 2);
 
         // Don't want to list systems where there is not enough data to visualize.
         // So, test if there is before adding the name to the list.
         std::string location_s;
-        getline(ss, location_s);
+        std::getline(ss, location_s);
         long location = std::stol(location_s.c_str());
 
         data.seekg(location);
-        data.read(reinterpret_cast<char*>(&p), sizeof(Exoplanet));
+        data.read(reinterpret_cast<char*>(&p), sizeof(ExoplanetDataEntry));
 
         if (hasSufficientData(p)) {
             names.push_back(name);
@@ -527,4 +633,5 @@ int listAvailableExoplanetSystems(lua_State* L) {
 
     return 0;
 }
+
 } //namespace openspace::exoplanets::luascriptfunctions
diff --git a/modules/exoplanets/include.cmake b/modules/exoplanets/include.cmake
index ffea0ac430..c186634837 100644
--- a/modules/exoplanets/include.cmake
+++ b/modules/exoplanets/include.cmake
@@ -1 +1,4 @@
 set(DEFAULT_MODULE ON)
+set (OPENSPACE_DEPENDENCIES
+  space
+)
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.cpp b/modules/exoplanets/rendering/renderableorbitdisc.cpp
index 216d8c16fa..1ad0e6a85b 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.cpp
+++ b/modules/exoplanets/rendering/renderableorbitdisc.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,24 +33,27 @@
 #include <openspace/util/distanceconstants.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <ghoul/io/texture/texturereader.h>
 #include <ghoul/opengl/openglstatecache.h>
 #include <ghoul/opengl/programobject.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 
 namespace {
+    constexpr const std::array<const char*, 6> UniformNames = {
+        "modelViewProjectionTransform", "offset", "opacity",
+        "discTexture", "eccentricity", "semiMajorAxis"
+    };
+
     static const openspace::properties::Property::PropertyInfo TextureInfo = {
         "Texture",
         "Texture",
         "This value is the path to a texture on disk that contains a one-dimensional "
-        "texture which is used for these rings."
+        "texture which is used for the color."
     };
 
     static const openspace::properties::Property::PropertyInfo SizeInfo = {
         "Size",
         "Size",
-        "This value specifies the semi-major axis of the orbit in meter."
+        "This value specifies the semi-major axis of the orbit, in meter."
     };
 
     static const openspace::properties::Property::PropertyInfo EccentricityInfo = {
@@ -63,8 +66,10 @@ namespace {
     static const openspace::properties::Property::PropertyInfo OffsetInfo = {
         "Offset",
         "Offset",
-        "This value is used to limit the width of the rings. Each of the two values is "
-        "the lower and the upper uncertainties of the semi-major axis. "
+        "This property determines the width of the disc. The values specify the lower "
+        "and upper deviation from the semi major axis, respectively. The values are "
+        "relative to the size of the semi-major axis. That is, 0 means no deviation "
+        "from the semi-major axis and 1 is a whole semi-major axis's worth of deviation."
     };
 } // namespace
 
@@ -76,11 +81,6 @@ documentation::Documentation RenderableOrbitDisc::Documentation() {
         "Renderable Orbit Disc",
         "exoplanets_renderable_orbit_disc",
         {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableOrbitDisc"),
-                Optional::No
-            },
             {
                 TextureInfo.identifier,
                 new StringVerifier,
@@ -114,10 +114,8 @@ RenderableOrbitDisc::RenderableOrbitDisc(const ghoul::Dictionary& dictionary)
     , _texturePath(TextureInfo)
     , _size(SizeInfo, 1.f, 0.f, 3.0e12f)
     , _eccentricity(EccentricityInfo, 0.f, 0.f, 1.f)
-    , _offset(OffsetInfo, glm::vec2(0.f, 1.f), glm::vec2(0.f), glm::vec2(1.f))
+    , _offset(OffsetInfo, glm::vec2(0.f), glm::vec2(0.f), glm::vec2(1.f))
 {
-    using ghoul::filesystem::File;
-
     documentation::testSpecificationAndThrow(
         Documentation(),
         dictionary,
@@ -125,24 +123,21 @@ RenderableOrbitDisc::RenderableOrbitDisc(const ghoul::Dictionary& dictionary)
     );
 
     if (dictionary.hasKey(OffsetInfo.identifier)) {
-        _offset = dictionary.value<glm::vec2>(OffsetInfo.identifier);
+        _offset = dictionary.value<glm::dvec2>(OffsetInfo.identifier);
     }
+    _offset.onChange([&]() { _planeIsDirty = true; });
     addProperty(_offset);
 
     _size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
-    _size = _size + (_offset.value().y * distanceconstants::AstronomicalUnit);
-    setBoundingSphere(_size);
     _size.onChange([&]() { _planeIsDirty = true; });
     addProperty(_size);
 
+    setBoundingSphere(_size + _offset.value().y * _size);
+
     _texturePath = absPath(dictionary.value<std::string>(TextureInfo.identifier));
-    _textureFile = std::make_unique<File>(_texturePath);
-
-    _texturePath.onChange([&]() { _textureIsDirty = true; });
+    _texturePath.onChange([&]() { _texture->loadFromFile(_texturePath); });
     addProperty(_texturePath);
 
-    _textureFile->setCallback([&](const File&) { _textureIsDirty = true; });
-
     _eccentricity = static_cast<float>(
         dictionary.value<double>(EccentricityInfo.identifier)
     );
@@ -153,40 +148,34 @@ RenderableOrbitDisc::RenderableOrbitDisc(const ghoul::Dictionary& dictionary)
 }
 
 bool RenderableOrbitDisc::isReady() const {
-    return _shader && _texture;
+    return _shader && _texture && _plane;
+}
+
+void RenderableOrbitDisc::initialize() {
+    _texture = std::make_unique<TextureComponent>();
+    _texture->setFilterMode(ghoul::opengl::Texture::FilterMode::AnisotropicMipMap);
+    _texture->setWrapping(ghoul::opengl::Texture::WrappingMode::ClampToEdge);
+    _plane = std::make_unique<PlaneGeometry>(planeSize());
 }
 
 void RenderableOrbitDisc::initializeGL() {
     _shader = global::renderEngine->buildRenderProgram(
-        "OrbitdiscProgram",
+        "OrbitDiscProgram",
         absPath("${BASE}/modules/exoplanets/shaders/orbitdisc_vs.glsl"),
         absPath("${BASE}/modules/exoplanets/shaders/orbitdisc_fs.glsl")
     );
 
-    _uniformCache.modelViewProjection = _shader->uniformLocation(
-        "modelViewProjectionTransform"
-    );
-    _uniformCache.textureOffset = _shader->uniformLocation("textureOffset");
-    _uniformCache.opacity = _shader->uniformLocation("opacity");
-    _uniformCache.texture = _shader->uniformLocation("discTexture");
-    _uniformCache.eccentricity = _shader->uniformLocation("eccentricity");
-    _uniformCache.semiMajorAxis = _shader->uniformLocation("semiMajorAxis");
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
 
-    glGenVertexArrays(1, &_quad);
-    glGenBuffers(1, &_vertexPositionBuffer);
+    _texture->loadFromFile(_texturePath);
+    _texture->uploadToGpu();
 
-    createPlane();
-    loadTexture();
+    _plane->initialize();
 }
 
 void RenderableOrbitDisc::deinitializeGL() {
-    glDeleteVertexArrays(1, &_quad);
-    _quad = 0;
-
-    glDeleteBuffers(1, &_vertexPositionBuffer);
-    _vertexPositionBuffer = 0;
-
-    _textureFile = nullptr;
+    _plane->deinitialize();
+    _plane = nullptr;
     _texture = nullptr;
 
     global::renderEngine->removeRenderProgram(_shader.get());
@@ -207,7 +196,7 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
         _uniformCache.modelViewProjection,
         data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
     );
-    _shader->setUniform(_uniformCache.textureOffset, _offset);
+    _shader->setUniform(_uniformCache.offset, _offset);
     _shader->setUniform(_uniformCache.opacity, _opacity);
     _shader->setUniform(_uniformCache.eccentricity, _eccentricity);
     _shader->setUniform(_uniformCache.semiMajorAxis, _size);
@@ -222,8 +211,7 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
     glDepthMask(false);
     glDisable(GL_CULL_FACE);
 
-    glBindVertexArray(_quad);
-    glDrawArrays(GL_TRIANGLES, 0, 6);
+    _plane->render();
 
     _shader->deactivate();
 
@@ -233,93 +221,24 @@ void RenderableOrbitDisc::render(const RenderData& data, RendererTasks&) {
     global::renderEngine->openglStateCache().resetPolygonAndClippingState();
 }
 
-void RenderableOrbitDisc::update(const UpdateData& data) {
+void RenderableOrbitDisc::update(const UpdateData&) {
     if (_shader->isDirty()) {
         _shader->rebuildFromFile();
-        _uniformCache.modelViewProjection = _shader->uniformLocation(
-            "modelViewProjectionTransform"
-        );
-        _uniformCache.textureOffset = _shader->uniformLocation("textureOffset");
-        _uniformCache.opacity = _shader->uniformLocation("opacity");
-        _uniformCache.texture = _shader->uniformLocation("discTexture");
-        _uniformCache.eccentricity = _shader->uniformLocation("eccentricity");
-        _uniformCache.semiMajorAxis = _shader->uniformLocation("semiMajorAxis");
+        ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
     }
 
     if (_planeIsDirty) {
-        createPlane();
+        _plane->updateSize(planeSize());
         _planeIsDirty = false;
     }
 
-    if (_textureIsDirty) {
-        loadTexture();
-        _textureIsDirty = false;
-    }
+    _texture->update();
 }
 
-void RenderableOrbitDisc::loadTexture() {
-    if (!_texturePath.value().empty()) {
-        std::unique_ptr<ghoul::opengl::Texture> texture =
-            ghoul::io::TextureReader::ref().loadTexture(absPath(_texturePath));
-
-        if (texture) {
-            LDEBUGC(
-                "RenderableOrbitDisc",
-                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; }
-            );
-        }
-    }
-}
-
-void RenderableOrbitDisc::createPlane() {
-    const GLfloat size = _size * (1.f + _eccentricity);
-
-    struct VertexData {
-        GLfloat x;
-        GLfloat y;
-        GLfloat s;
-        GLfloat t;
-    };
-
-    VertexData data[] = {
-        { -size, -size, 0.f, 0.f },
-        {  size,  size, 1.f, 1.f },
-        { -size,  size, 0.f, 1.f },
-        { -size, -size, 0.f, 0.f },
-        {  size, -size, 1.f, 0.f },
-        {  size,  size, 1.f, 1.f },
-    };
-
-    glBindVertexArray(_quad);
-    glBindBuffer(GL_ARRAY_BUFFER, _vertexPositionBuffer);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(data), data, GL_STATIC_DRAW);
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(
-        0,
-        2,
-        GL_FLOAT,
-        GL_FALSE,
-        sizeof(VertexData),
-        nullptr
-    );
-    glEnableVertexAttribArray(1);
-    glVertexAttribPointer(
-        1,
-        2,
-        GL_FLOAT,
-        GL_FALSE,
-        sizeof(VertexData),
-        reinterpret_cast<void*>(offsetof(VertexData, s))
-    );
+float RenderableOrbitDisc::planeSize() const {
+    float maxRadius = _size + _offset.value().y * _size;
+    maxRadius *= (1.f + _eccentricity);
+    return maxRadius;
 }
 
 } // namespace openspace
diff --git a/modules/exoplanets/rendering/renderableorbitdisc.h b/modules/exoplanets/rendering/renderableorbitdisc.h
index b7d55b6268..b467a9cb90 100644
--- a/modules/exoplanets/rendering/renderableorbitdisc.h
+++ b/modules/exoplanets/rendering/renderableorbitdisc.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,14 +29,13 @@
 #include <openspace/properties/scalar/floatproperty.h>
 #include <openspace/properties/vector/vec2property.h>
 #include <openspace/rendering/renderable.h>
+#include <openspace/rendering/texturecomponent.h>
+#include <openspace/util/planegeometry.h>
 #include <openspace/util/updatestructures.h>
-#include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/uniformcache.h>
 
 namespace ghoul::filesystem { class File; }
-namespace ghoul::opengl {
-    class ProgramObject;
-} // namespace ghoul::opengl
+namespace ghoul::opengl { class ProgramObject; } // namespace ghoul::opengl
 
 namespace openspace {
 
@@ -46,6 +45,7 @@ class RenderableOrbitDisc : public Renderable {
 public:
     RenderableOrbitDisc(const ghoul::Dictionary& dictionary);
 
+    void initialize() override;
     void initializeGL() override;
     void deinitializeGL() override;
 
@@ -57,8 +57,8 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    void loadTexture();
-    void createPlane();
+    // Computes the size of the plane quad using the relevant properties
+    float planeSize() const;
 
     properties::StringProperty _texturePath;
     properties::FloatProperty _size;
@@ -66,15 +66,13 @@ private:
     properties::Vec2Property _offset;
 
     std::unique_ptr<ghoul::opengl::ProgramObject> _shader = nullptr;
-    UniformCache(modelViewProjection, textureOffset, opacity,
-         texture, eccentricity, semiMajorAxis) _uniformCache;
-    std::unique_ptr<ghoul::opengl::Texture> _texture = nullptr;
-    std::unique_ptr<ghoul::filesystem::File> _textureFile;
+    UniformCache(modelViewProjection, offset, opacity, texture,
+        eccentricity, semiMajorAxis) _uniformCache;
+
+    std::unique_ptr<PlaneGeometry> _plane;
+    std::unique_ptr<TextureComponent> _texture;
 
-    bool _textureIsDirty = false;
     bool _planeIsDirty = false;
-    GLuint _quad = 0;
-    GLuint _vertexPositionBuffer = 0;
 };
 
 } // namespace openspace
diff --git a/modules/exoplanets/shaders/orbitdisc_fs.glsl b/modules/exoplanets/shaders/orbitdisc_fs.glsl
index bf8cb01c5c..0f56ee08a1 100644
--- a/modules/exoplanets/shaders/orbitdisc_fs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,12 +29,11 @@ in vec2 vs_st;
 in vec4 vs_position;
 
 uniform sampler1D discTexture;
-uniform vec2 textureOffset;
+uniform vec2 offset; // relative to semi major axis
 uniform float opacity;
 uniform float eccentricity;
 uniform float semiMajorAxis;
 
-const float AstronomicalUnit = 149597870700.0; // m
 const float Epsilon = 0.0000001;
 
 // Compute semi minor axis from major axis, a, and eccentricity, e
@@ -56,16 +55,15 @@ Fragment getFragment() {
     // Moving the origin to the center
     vec2 st = (vs_st - vec2(0.5)) * 2.0;
 
-    float offsetLower = textureOffset.x;
-    float offsetUpper = textureOffset.y;
-    float offsetIntervalSize = offsetLower + offsetUpper;
+    float offsetLower = offset.x * semiMajorAxis;
+    float offsetUpper = offset.y * semiMajorAxis;
 
-    float AUpper = semiMajorAxis;
+    float AUpper = semiMajorAxis + offsetUpper;
     float BUpper = semiMinorAxis(AUpper, eccentricity);
     float CUpper = sqrt(AUpper*AUpper - BUpper*BUpper);
     float outerApoapsisDistance = AUpper * (1 + eccentricity);
 
-    float ALower = AUpper - AstronomicalUnit * offsetIntervalSize;
+    float ALower = semiMajorAxis - offsetLower;
     float BLower = semiMinorAxis(ALower, eccentricity);
     float CLower = sqrt(ALower*ALower - BLower*BLower);
     float innerApoapsisDistance = ALower * (1 + eccentricity);
@@ -106,16 +104,19 @@ Fragment getFragment() {
 
     float discWidth = distance(outerPoint, innerPoint);
     float distanceFromOuterEdge = distance(outerPoint, st);
-    float textureCoord = distanceFromOuterEdge / discWidth;
+    float relativeDistance = distanceFromOuterEdge / discWidth;
 
-    // Scale texture coordinate to handle asymmetric offset intervals
-    float textureMid = offsetUpper / offsetIntervalSize;
+    // Compute texture coordinate based on the distance to outer edge
+    float textureCoord = 0.0;
 
-    if(textureCoord > textureMid) {
-        textureCoord = 0.5 + 0.5 * (textureCoord - textureMid) / (1.0 - textureMid);
+    // 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 * textureCoord / textureMid;
+        textureCoord = 0.5 * (relativeDistance / midPoint);
     }
 
     vec4 diffuse = texture(discTexture, textureCoord);
diff --git a/modules/exoplanets/shaders/orbitdisc_vs.glsl b/modules/exoplanets/shaders/orbitdisc_vs.glsl
index e998350ce7..80a55c613d 100644
--- a/modules/exoplanets/shaders/orbitdisc_vs.glsl
+++ b/modules/exoplanets/shaders/orbitdisc_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
index 8b66c057b7..058122d86f 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -48,7 +48,9 @@ namespace {
 
 namespace openspace::exoplanets {
 
-ExoplanetsDataPreparationTask::ExoplanetsDataPreparationTask(const ghoul::Dictionary& dictionary) {
+ExoplanetsDataPreparationTask::ExoplanetsDataPreparationTask(
+                                                      const ghoul::Dictionary& dictionary)
+{
     openspace::documentation::testSpecificationAndThrow(
         documentation(),
         dictionary,
@@ -71,7 +73,9 @@ std::string ExoplanetsDataPreparationTask::description() {
     );
 }
 
-void ExoplanetsDataPreparationTask::perform(const Task::ProgressCallback& progressCallback) {
+void ExoplanetsDataPreparationTask::perform(
+                                           const Task::ProgressCallback& progressCallback)
+{
     std::ifstream inputDataFile(_inputDataPath);
     if (!inputDataFile.good()) {
         LERROR(fmt::format("Failed to open input file '{}'", _inputDataPath));
@@ -84,25 +88,36 @@ void ExoplanetsDataPreparationTask::perform(const Task::ProgressCallback& progre
     int version = 1;
     binFile.write(reinterpret_cast<char*>(&version), sizeof(int));
 
-    std::string planetRow;
-    getline(inputDataFile, planetRow); // The first line, containing the data names
+    auto readFirstDataRow = [](std::ifstream& file, std::string& line) -> void {
+        while (std::getline(file, line)) {
+            bool shouldSkip = line[0] == '#' || line.empty();
+            if (!shouldSkip) break;
+        }
+    };
+
+    // Find the line containing the data names
+    std::string columnNamesRow;
+    readFirstDataRow(inputDataFile, columnNamesRow);
 
     // Read column names into a vector, for later access
     std::vector<std::string> columnNames;
-    std::stringstream sStream(planetRow);
+    std::stringstream sStream(columnNamesRow);
     std::string colName;
-    while (getline(sStream, colName, ',')) {
+    while (std::getline(sStream, colName, ',')) {
         columnNames.push_back(colName);
     }
 
     // Read total number of items
     int total = 0;
-    while (getline(inputDataFile, planetRow)) {
+    std::string row;
+    while (std::getline(inputDataFile, row)) {
         ++total;
     }
     inputDataFile.clear();
     inputDataFile.seekg(0);
-    getline(inputDataFile, planetRow); // The first line, containing the data names
+
+    // Read past the first line, containing the data names
+    readFirstDataRow(inputDataFile, row);
 
     LINFO(fmt::format("Loading {} exoplanets", total));
 
@@ -149,23 +164,23 @@ void ExoplanetsDataPreparationTask::perform(const Task::ProgressCallback& progre
         return result;
     };
 
-    Exoplanet p;
+    ExoplanetDataEntry p;
     std::string data;
     int exoplanetCount = 0;
-    while (getline(inputDataFile, planetRow)) {
+    while (std::getline(inputDataFile, row)) {
         ++exoplanetCount;
         progressCallback(static_cast<float>(exoplanetCount) / static_cast<float>(total));
 
         std::string component;
-        std::string speckStarname;
+        std::string starName;
 
-        float ra = std::numeric_limits<float>::quiet_NaN();     // decimal degrees
-        float dec = std::numeric_limits<float>::quiet_NaN();    // decimal degrees
+        float ra = std::numeric_limits<float>::quiet_NaN(); // decimal degrees
+        float dec = std::numeric_limits<float>::quiet_NaN(); // decimal degrees
         float distanceInParsec = std::numeric_limits<float>::quiet_NaN();
 
-        std::istringstream lineStream(planetRow);
+        std::istringstream lineStream(row);
         int columnIndex = 0;
-        while (getline(lineStream, data, ',')) {
+        while (std::getline(lineStream, data, ',')) {
             const std::string& column = columnNames[columnIndex];
             columnIndex++;
 
@@ -244,9 +259,8 @@ void ExoplanetsDataPreparationTask::perform(const Task::ProgressCallback& progre
             }
             // Star - name and position
             else if (column == "hostname") {
-                std::string name = readStringData(data);
-                speckStarname = std::string(speckStarName(name));
-                glm::vec3 position = starPosition(speckStarname);
+                starName = readStringData(data);
+                glm::vec3 position = starPosition(starName);
                 p.positionX = position[0];
                 p.positionY = position[1];
                 p.positionZ = position[2];
@@ -270,18 +284,42 @@ void ExoplanetsDataPreparationTask::perform(const Task::ProgressCallback& progre
             else if (column == "st_raderr2") {
                 p.rStarLower = -readFloatData(data);
             }
-            // Color of star (B-V color index computed from star's effective temperature)
+            // Effective temperature and color of star
+            // (B-V color index computed from star's effective temperature)
             else if (column == "st_teff") {
-                float teff = readFloatData(data);
-                p.bmv = bvFromTeff(teff);
+                p.teff = readFloatData(data);
+                p.bmv = bvFromTeff(p.teff);
+            }
+            else if (column == "st_tefferr1") {
+                p.teffUpper = readFloatData(data);
+            }
+            else if (column == "st_tefferr2") {
+                p.teffLower = -readFloatData(data);
+            }
+            // Star luminosity
+            else if (column == "st_lum") {
+                float dataInLogSolar = readFloatData(data);
+                p.luminosity = static_cast<float>(std::pow(10, dataInLogSolar));
+            }
+            else if (column == "st_lumerr1") {
+                float dataInLogSolar = readFloatData(data);
+                p.luminosityUpper = static_cast<float>(std::pow(10, dataInLogSolar));
+            }
+            else if (column == "st_lumerr2") {
+                float dataInLogSolar = readFloatData(data);
+                p.luminosityLower = static_cast<float>(-std::pow(10, dataInLogSolar));
             }
             // Is the planet orbiting a binary system?
             else if (column == "cb_flag") {
                 p.binary = static_cast<bool>(readIntegerData(data));
             }
+            // Number of stars in the system
+            else if (column == "sy_snum") {
+                p.nStars = readIntegerData(data);
+            }
             // Number of planets in the system
             else if (column == "sy_pnum") {
-                p.nComp = readIntegerData(data);
+                p.nPlanets = readIntegerData(data);
             }
         }
 
@@ -304,10 +342,10 @@ void ExoplanetsDataPreparationTask::perform(const Task::ProgressCallback& progre
 
         // Create look-up table
         long pos = static_cast<long>(binFile.tellp());
-        std::string planetName = speckStarname + " " + component;
+        std::string planetName = starName + " " + component;
         lutFile << planetName << "," << pos << std::endl;
 
-        binFile.write(reinterpret_cast<char*>(&p), sizeof(Exoplanet));
+        binFile.write(reinterpret_cast<char*>(&p), sizeof(ExoplanetDataEntry));
     }
 
     progressCallback(1.f);
@@ -322,7 +360,7 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
     glm::vec3 position{ std::numeric_limits<float>::quiet_NaN() };
     std::string line;
 
-    while (getline(exoplanetsFile, line)) {
+    while (std::getline(exoplanetsFile, line)) {
         bool shouldSkipLine = (
             line.empty() || line[0] == '#' || line.substr(0, 7) == "datavar" ||
             line.substr(0, 10) == "texturevar" || line.substr(0, 7) == "texture"
@@ -335,18 +373,18 @@ glm::vec3 ExoplanetsDataPreparationTask::starPosition(const std::string& starNam
         std::string data;
         std::string name;
         std::istringstream linestream(line);
-        getline(linestream, data, '#');
-        getline(linestream, name);
+        std::getline(linestream, data, '#');
+        std::getline(linestream, name);
         name.erase(0, 1);
 
         std::string coord;
         if (name == starName) {
             std::stringstream dataStream(data);
-            getline(dataStream, coord, ' ');
+            std::getline(dataStream, coord, ' ');
             position[0] = std::stof(coord.c_str(), nullptr);
-            getline(dataStream, coord, ' ');
+            std::getline(dataStream, coord, ' ');
             position[1] = std::stof(coord.c_str(), nullptr);
-            getline(dataStream, coord, ' ');
+            std::getline(dataStream, coord, ' ');
             position[2] = std::stof(coord.c_str(), nullptr);
             break;
         }
@@ -369,12 +407,15 @@ float ExoplanetsDataPreparationTask::bvFromTeff(float teff) {
     float bv = 0.f;
     float bvUpper = 0.f;
     float bvLower = 0.f;
-    float teffLower, teffUpper;
-    std::string row, teffString, bvString;
-    while (getline(teffToBvFile, row)) {
+    float teffLower = 0.f;
+    float teffUpper;
+    std::string row;
+    while (std::getline(teffToBvFile, row)) {
         std::istringstream lineStream(row);
-        getline(lineStream, teffString, ',');
-        getline(lineStream, bvString);
+        std::string teffString;
+        std::getline(lineStream, teffString, ',');
+        std::string bvString;
+        std::getline(lineStream, bvString);
 
         float teffCurrent = std::stof(teffString.c_str(), nullptr);
         float bvCurrent = std::stof(bvString.c_str(), nullptr);
@@ -406,12 +447,6 @@ documentation::Documentation ExoplanetsDataPreparationTask::documentation() {
         "ExoplanetsDataPreparationTask",
         "exoplanets_data_preparation_task",
         {
-            {
-                "Type",
-                new StringEqualVerifier("ExoplanetsDataPreparationTask"),
-                Optional::No,
-                ""
-            },
             {
                 KeyInputDataFile,
                 new StringAnnotationVerifier("A valid filepath"),
diff --git a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
index 15bf3d5d07..ec3c7d823e 100644
--- a/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
+++ b/modules/exoplanets/tasks/exoplanetsdatapreparationtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlines/CMakeLists.txt b/modules/fieldlines/CMakeLists.txt
index 9a887da930..d44e7571a1 100644
--- a/modules/fieldlines/CMakeLists.txt
+++ b/modules/fieldlines/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,19 +25,19 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlines.h
+  rendering/renderablefieldlines.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlines.cpp
+  rendering/renderablefieldlines.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_gs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldline_vs.glsl
+  shaders/fieldline_fs.glsl
+  shaders/fieldline_gs.glsl
+  shaders/fieldline_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/fieldlines/fieldlinesmodule.cpp b/modules/fieldlines/fieldlinesmodule.cpp
index 52aeab21f3..22bece4bde 100644
--- a/modules/fieldlines/fieldlinesmodule.cpp
+++ b/modules/fieldlines/fieldlinesmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlines/fieldlinesmodule.h b/modules/fieldlines/fieldlinesmodule.h
index e9652bd508..d77a777343 100644
--- a/modules/fieldlines/fieldlinesmodule.h
+++ b/modules/fieldlines/fieldlinesmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlines/include.cmake b/modules/fieldlines/include.cmake
deleted file mode 100644
index 947e563af0..0000000000
--- a/modules/fieldlines/include.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-set (OPENSPACE_DEPENDENCIES
-  kameleon
-  space
-)
\ No newline at end of file
diff --git a/modules/fieldlines/rendering/renderablefieldlines.cpp b/modules/fieldlines/rendering/renderablefieldlines.cpp
index e75f6de397..78a3e8dd51 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.cpp
+++ b/modules/fieldlines/rendering/renderablefieldlines.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -120,19 +120,25 @@ RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary)
     std::string identifier = dictionary.value<std::string>(SceneGraphNode::KeyIdentifier);
     setIdentifier(identifier);
 
-    bool success = dictionary.getValue(KeyVectorField, _vectorFieldInfo);
-    if (!success) {
+    if (!dictionary.hasValue<ghoul::Dictionary>(KeyVectorField)) {
         LERROR(fmt::format("Renderable does not contain a key for '{}'", KeyVectorField));
     }
-
-    success = dictionary.getValue(KeyFieldlines, _fieldlineInfo);
-    if (!success) {
+    else {
+        _vectorFieldInfo = dictionary.value<ghoul::Dictionary>(KeyVectorField);
+    }
+    
+    if (!dictionary.hasValue<ghoul::Dictionary>(KeyFieldlines)) {
         LERROR(fmt::format("Renderable does not contain a key for '{}'", KeyFieldlines));
     }
+    else {
+        _fieldlineInfo = dictionary.value<ghoul::Dictionary>(KeyFieldlines);
+    }
 
-    success = dictionary.getValue(KeySeedPoints, _seedPointsInfo);
-    if (!success) {
-        LERROR(fmt::format("Renderable does not contain a key for '{}", KeySeedPoints));
+    if (!dictionary.hasValue<ghoul::Dictionary>(KeySeedPoints)) {
+        LERROR(fmt::format("Renderable does not contain a key for '{}'", KeySeedPoints));
+    }
+    else {
+        _seedPointsInfo = dictionary.value<ghoul::Dictionary>(KeySeedPoints);
     }
 
     // @TODO a non-magic number perhaps ---abock
@@ -145,8 +151,8 @@ RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary)
 
     // @TODO hook up visibility changes ---abock
 
-    auto dirtyFieldlines = [this]() { this->_fieldLinesAreDirty = true; };
-    auto dirtySeedpoints = [this]() { this->_seedPointsAreDirty = true; };
+    auto dirtyFieldlines = [this]() { _fieldLinesAreDirty = true; };
+    auto dirtySeedpoints = [this]() { _seedPointsAreDirty = true; };
 
     _stepSize.onChange(dirtyFieldlines);
     addProperty(_stepSize);
@@ -164,17 +170,25 @@ RenderableFieldlines::RenderableFieldlines(const ghoul::Dictionary& dictionary)
 }
 
 void RenderableFieldlines::initializeDefaultPropertyValues() {
-    _fieldlineInfo.getValue(KeyFieldlinesStepSize, _stepSize);
-    _fieldlineInfo.getValue(KeyFieldlinesClassification, _classification);
-    _fieldlineInfo.getValue(KeyFieldlinesColor, _fieldlineColor);
+    if (_fieldlineInfo.hasKey(KeyFieldlinesStepSize)) {
+        _stepSize = static_cast<float>(
+            _fieldlineInfo.value<double>(KeyFieldlinesStepSize)
+        );
+    }
+    if (_fieldlineInfo.hasKey(KeyFieldlinesClassification)) {
+        _classification = _fieldlineInfo.value<bool>(KeyFieldlinesClassification);
+    }
+    if (_fieldlineInfo.hasKey(KeyFieldlinesColor)) {
+        _fieldlineColor = _fieldlineInfo.value<glm::dvec4>(KeyFieldlinesColor);
+    }
 
-    if (_seedPointsInfo.hasKeyAndValue<std::string>(KeySeedPointsType)) {
+    if (_seedPointsInfo.hasValue<std::string>(KeySeedPointsType)) {
         std::string sourceType = _seedPointsInfo.value<std::string>(KeySeedPointsType);
 
         if (sourceType == SeedPointsSourceFile) {
             _seedPointSource = SeedPointSourceFile;
 
-            if (_seedPointsInfo.hasKeyAndValue<std::string>(KeySeedPointsFile)) {
+            if (_seedPointsInfo.hasValue<std::string>(KeySeedPointsFile)) {
                 std::string seedPointSourceFile = _seedPointsInfo.value<std::string>(
                     KeySeedPointsFile
                 );
@@ -189,14 +203,16 @@ void RenderableFieldlines::initializeDefaultPropertyValues() {
 
 bool RenderableFieldlines::isReady() const {
     const bool programReady = _program != nullptr;
-    const bool vectorFieldReady = !_vectorFieldInfo.empty();
-    const bool fieldlineReady = !_fieldlineInfo.empty();
-    const bool seedPointsReady = !_seedPointsInfo.empty();
+    const bool vectorFieldReady = !_vectorFieldInfo.isEmpty();
+    const bool fieldlineReady = !_fieldlineInfo.isEmpty();
+    const bool seedPointsReady = !_seedPointsInfo.isEmpty();
     return programReady && vectorFieldReady && fieldlineReady && seedPointsReady;
 }
 
 void RenderableFieldlines::initializeGL() {
-    if (_vectorFieldInfo.empty() || _fieldlineInfo.empty() || _seedPointsInfo.empty()) {
+    if (_vectorFieldInfo.isEmpty() || _fieldlineInfo.isEmpty() ||
+        _seedPointsInfo.isEmpty())
+    {
         throw ghoul::RuntimeError("Error initializing");
     }
 
@@ -368,26 +384,31 @@ void RenderableFieldlines::loadSeedPointsFromFile() {
 
 void RenderableFieldlines::loadSeedPointsFromTable() {
     // @TODO needs testing ---abock
+    if (!_seedPointsInfo.hasValue<ghoul::Dictionary>(KeySeedPointsTable)) {
+        return;
+    }
     LINFO("Loading provided list of seed points");
-    ghoul::Dictionary seedpointsDictionary;
-    _seedPointsInfo.getValue(KeySeedPointsTable, seedpointsDictionary);
-    for (const std::string& index : seedpointsDictionary.keys()) {
-        glm::vec3 seedPos = glm::vec3(0.f);
-        _fieldlineInfo.getValue(std::string(KeySeedPointsTable) + "." + index, seedPos);
-        _seedPoints.push_back(seedPos);
+    ghoul::Dictionary seedpointsDictionary =
+        _seedPointsInfo.value<ghoul::Dictionary>(KeySeedPointsType);
+    for (std::string_view index : seedpointsDictionary.keys()) {
+        std::string key = fmt::format("{}.{}", KeySeedPointsTable, index);
+        // (2020-12-31, abock)  Looks to me as if this should be seedpointsDictionary
+        if (_fieldlineInfo.hasValue<glm::dvec3>(key)) {
+            glm::dvec3 seedPos = _fieldlineInfo.value<glm::dvec3>(key);
+            _seedPoints.push_back(seedPos);
+        }
     }
 }
 
 std::vector<RenderableFieldlines::Line> RenderableFieldlines::generateFieldlines() {
-    std::string type;
-    bool success = _vectorFieldInfo.getValue(KeyVectorFieldType, type);
-    if (!success) {
+    if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldType)) {
         LERROR(fmt::format(
             "{} does not contain a '{}' key", KeyVectorField, KeyVectorFieldType
         ));
         return {};
     }
 
+    std::string type = _vectorFieldInfo.value<std::string>(KeyVectorFieldType);
     if (type == VectorFieldTypeVolumeKameleon) {
         return generateFieldlinesVolumeKameleon();
     }
@@ -402,19 +423,18 @@ std::vector<RenderableFieldlines::Line> RenderableFieldlines::generateFieldlines
 std::vector<RenderableFieldlines::Line>
 RenderableFieldlines::generateFieldlinesVolumeKameleon()
 {
-    std::string model;
-    bool success = _vectorFieldInfo.getValue(KeyVectorFieldVolumeModel, model);
-    if (!success) {
+    if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldVolumeModel)) {
         LERROR(fmt::format("{} does not name a model", KeyVectorField));
         return {};
     }
 
-    std::string fileName;
-    success = _vectorFieldInfo.getValue(KeyVectorFieldFile, fileName);
-    if (!success) {
+    std::string model = _vectorFieldInfo.value<std::string>(KeyVectorFieldVolumeModel);
+
+    if (!_vectorFieldInfo.hasValue<std::string>(KeyVectorFieldFile)) {
         LERROR(fmt::format("{} does not name a file", KeyVectorField));
         return {};
     }
+    std::string fileName = _vectorFieldInfo.value<std::string>(KeyVectorFieldFile);
     fileName = absPath(fileName);
 
     //KameleonWrapper::Model modelType;
@@ -432,12 +452,13 @@ RenderableFieldlines::generateFieldlinesVolumeKameleon()
     const std::string v2 = std::string(KeyVectorFieldVolumeVariable) + ".2";
     const std::string v3 = std::string(KeyVectorFieldVolumeVariable) + ".3";
 
-    const bool threeVariables = _vectorFieldInfo.hasKeyAndValue<std::string>(v1) &&
-                          _vectorFieldInfo.hasKeyAndValue<std::string>(v2) &&
-                          _vectorFieldInfo.hasKeyAndValue<std::string>(v3);
+    const bool threeVariables =
+        _vectorFieldInfo.hasValue<std::string>(v1) &&
+        _vectorFieldInfo.hasValue<std::string>(v2) &&
+        _vectorFieldInfo.hasValue<std::string>(v3);
 
-    const bool lorentzForce = _vectorFieldInfo.hasKeyAndValue<std::string>(v1) &&
-          (_vectorFieldInfo.value<std::string>(v1) == VectorFieldKameleonVariableLorentz);
+    const bool lorentzForce = _vectorFieldInfo.hasValue<std::string>(v1) &&
+        (_vectorFieldInfo.value<std::string>(v1) == VectorFieldKameleonVariableLorentz);
 
     if (!threeVariables && !lorentzForce) {
         LERROR(fmt::format("'{}' does not name variables", KeyVectorField));
diff --git a/modules/fieldlines/rendering/renderablefieldlines.h b/modules/fieldlines/rendering/renderablefieldlines.h
index cc73bd60cf..32142e7116 100644
--- a/modules/fieldlines/rendering/renderablefieldlines.h
+++ b/modules/fieldlines/rendering/renderablefieldlines.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlines/shaders/fieldline_fs.glsl b/modules/fieldlines/shaders/fieldline_fs.glsl
index 71b7525467..06e1c73932 100644
--- a/modules/fieldlines/shaders/fieldline_fs.glsl
+++ b/modules/fieldlines/shaders/fieldline_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlines/shaders/fieldline_gs.glsl b/modules/fieldlines/shaders/fieldline_gs.glsl
index 16310196d6..e35e7334f5 100644
--- a/modules/fieldlines/shaders/fieldline_gs.glsl
+++ b/modules/fieldlines/shaders/fieldline_gs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlines/shaders/fieldline_vs.glsl b/modules/fieldlines/shaders/fieldline_vs.glsl
index ceba91ab1f..17b81be056 100644
--- a/modules/fieldlines/shaders/fieldline_vs.glsl
+++ b/modules/fieldlines/shaders/fieldline_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/CMakeLists.txt b/modules/fieldlinessequence/CMakeLists.txt
index 9af2549997..f1a938ea8e 100644
--- a/modules/fieldlinessequence/CMakeLists.txt
+++ b/modules/fieldlinessequence/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,24 +25,24 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlinessequence.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/fieldlinesstate.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/commons.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/kameleonfieldlinehelper.h
+  rendering/renderablefieldlinessequence.h
+  util/fieldlinesstate.h
+  util/commons.h
+  util/kameleonfieldlinehelper.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefieldlinessequence.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/fieldlinesstate.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/commons.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/kameleonfieldlinehelper.cpp
+  rendering/renderablefieldlinessequence.cpp
+  util/fieldlinesstate.cpp
+  util/commons.cpp
+  util/kameleonfieldlinehelper.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldlinessequence_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fieldlinessequence_fs.glsl
+  shaders/fieldlinessequence_vs.glsl
+  shaders/fieldlinessequence_fs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.cpp b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
index 6fd64755c1..35959eb514 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.cpp
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/fieldlinessequencemodule.h b/modules/fieldlinessequence/fieldlinessequencemodule.h
index c88ba9f5d5..0ff5276850 100644
--- a/modules/fieldlinessequence/fieldlinessequencemodule.h
+++ b/modules/fieldlinessequence/fieldlinessequencemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/include.cmake b/modules/fieldlinessequence/include.cmake
index a746e4569e..f6e8111e4e 100644
--- a/modules/fieldlinessequence/include.cmake
+++ b/modules/fieldlinessequence/include.cmake
@@ -1,3 +1,3 @@
 set (OPENSPACE_DEPENDENCIES
-  space
+  kameleon
 )
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
index 3bb1edd3ef..c4cb147769 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -231,7 +231,7 @@ namespace {
         Invalid
     };
 
-    float stringToFloat(const std::string input, const float backupValue = 0.f) {
+    float stringToFloat(const std::string& input, float backupValue = 0.f) {
         float tmp;
         try {
             tmp = std::stof(input);
@@ -383,15 +383,17 @@ void RenderableFieldlinesSequence::initializeGL() {
 bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
                                                            SourceFileType& sourceFileType)
 {
-
-    _dictionary->getValue(SceneGraphNode::KeyIdentifier, _identifier);
+    if (_dictionary->hasValue<std::string>(SceneGraphNode::KeyIdentifier)) {
+        _identifier = _dictionary->value<std::string>(SceneGraphNode::KeyIdentifier);
+    }
 
     // ------------------- EXTRACT MANDATORY VALUES FROM DICTIONARY ------------------- //
     std::string inputFileTypeString;
-    if (!_dictionary->getValue(KeyInputFileType, inputFileTypeString)) {
+    if (!_dictionary->hasValue<std::string>(KeyInputFileType)) {
         LERROR(fmt::format("{}: The field {} is missing", _identifier, KeyInputFileType));
     }
     else {
+        inputFileTypeString = _dictionary->value<std::string>(KeyInputFileType);
         std::transform(
             inputFileTypeString.begin(),
             inputFileTypeString.end(),
@@ -418,11 +420,11 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
         }
     }
 
-    std::string sourceFolderPath;
-    if (!_dictionary->getValue(KeySourceFolder, sourceFolderPath)) {
+    if (!_dictionary->hasValue<std::string>(KeySourceFolder)) {
         LERROR(fmt::format("{}: The field {} is missing", _identifier, KeySourceFolder));
         return false;
     }
+    std::string sourceFolderPath = _dictionary->value<std::string>(KeySourceFolder);
 
     // Ensure that the source folder exists and then extract
     // the files with the same extension as <inputFileTypeString>
@@ -502,8 +504,9 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
         }
     }
 
-    ghoul::Dictionary colorTablesPathsDictionary;
-    if (_dictionary->getValue(KeyColorTablePaths, colorTablesPathsDictionary)) {
+    if (_dictionary->hasValue<ghoul::Dictionary>(KeyColorTablePaths)) {
+        ghoul::Dictionary colorTablesPathsDictionary =
+            _dictionary->value<ghoul::Dictionary>(KeyColorTablePaths);
         const size_t nProvidedPaths = colorTablesPathsDictionary.size();
         if (nProvidedPaths > 0) {
             // Clear the default! It is already specified in the transferFunction
@@ -515,28 +518,30 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
         }
     }
 
-    ghoul::Dictionary colorTablesRangesDictionary;
-    if (_dictionary->getValue(KeyColorTableRanges, colorTablesRangesDictionary)) {
+    if (_dictionary->hasValue<ghoul::Dictionary>(KeyColorTableRanges)) {
+        ghoul::Dictionary colorTablesRangesDictionary =
+            _dictionary->value<ghoul::Dictionary>(KeyColorTableRanges);
         const size_t nProvidedRanges = colorTablesRangesDictionary.size();
         for (size_t i = 1; i <= nProvidedRanges; ++i) {
             _colorTableRanges.push_back(
-                colorTablesRangesDictionary.value<glm::vec2>(std::to_string(i)));
+                colorTablesRangesDictionary.value<glm::dvec2>(std::to_string(i)));
         }
     }
     else {
-        _colorTableRanges.push_back(glm::vec2(0, 1));
+        _colorTableRanges.push_back(glm::vec2(0.f, 1.f));
     }
 
-    ghoul::Dictionary maskingRangesDictionary;
-    if (_dictionary->getValue(KeyMaskingRanges, maskingRangesDictionary)) {
+    if (_dictionary->hasValue<ghoul::Dictionary>(KeyMaskingRanges)) {
+        ghoul::Dictionary maskingRangesDictionary =
+            _dictionary->value<ghoul::Dictionary>(KeyMaskingRanges);
         const size_t nProvidedRanges = maskingRangesDictionary.size();
         for (size_t i = 1; i <= nProvidedRanges; ++i) {
             _maskingRanges.push_back(
-                maskingRangesDictionary.value<glm::vec2>(std::to_string(i)));
+                maskingRangesDictionary.value<glm::dvec2>(std::to_string(i)));
         }
     }
     else {
-        _maskingRanges.push_back(glm::vec2(-100000, 100000)); // Just some default values!
+        _maskingRanges.push_back(glm::dvec2(-100000, 100000)); // Just some default values
     }
 }
 
@@ -544,8 +549,8 @@ void RenderableFieldlinesSequence::extractOptionalInfoFromDictionary(
  * Returns false if it fails to extract mandatory information!
  */
 bool RenderableFieldlinesSequence::extractJsonInfoFromDictionary(fls::Model& model) {
-    std::string modelStr;
-    if (_dictionary->getValue(KeyJsonSimulationModel, modelStr)) {
+    if (_dictionary->hasValue<std::string>(KeyJsonSimulationModel)) {
+        std::string modelStr = _dictionary->value<std::string>(KeyJsonSimulationModel);
         std::transform(
             modelStr.begin(),
             modelStr.end(),
@@ -561,9 +566,10 @@ bool RenderableFieldlinesSequence::extractJsonInfoFromDictionary(fls::Model& mod
         return false;
     }
 
-    float scaleFactor;
-    if (_dictionary->getValue(KeyJsonScalingFactor, scaleFactor)) {
-        _scalingFactor = scaleFactor;
+    if (_dictionary->hasValue<double>(KeyJsonScalingFactor)) {
+        _scalingFactor = static_cast<float>(
+            _dictionary->value<double>(KeyJsonScalingFactor)
+        );
     }
     else {
         LWARNING(fmt::format(
@@ -630,9 +636,8 @@ void RenderableFieldlinesSequence::loadOsflsStatesIntoRAM(const std::string& out
 }
 
 void RenderableFieldlinesSequence::extractOsflsInfoFromDictionary() {
-    bool shouldLoadInRealtime = false;
-    if (_dictionary->getValue(KeyOslfsLoadAtRuntime, shouldLoadInRealtime)) {
-        _loadingStatesDynamically = shouldLoadInRealtime;
+    if (_dictionary->hasValue<bool>(KeyOslfsLoadAtRuntime)) {
+        _loadingStatesDynamically = _dictionary->value<bool>(KeyOslfsLoadAtRuntime);
     }
     else {
         LWARNING(fmt::format(
@@ -930,8 +935,8 @@ bool RenderableFieldlinesSequence::extractCdfInfoFromDictionary(std::string& see
                                                                 std::string& tracingVar,
                                                       std::vector<std::string>& extraVars)
 {
-
-    if (_dictionary->getValue(KeyCdfSeedPointFile, seedFilePath)) {
+    if (_dictionary->hasValue<std::string>(KeyCdfSeedPointFile)) {
+        seedFilePath = _dictionary->value<std::string>(KeyCdfSeedPointFile);
         ghoul::filesystem::File seedPointFile(seedFilePath);
         if (FileSys.fileExists(seedPointFile)) {
             seedFilePath = absPath(seedFilePath);
@@ -949,7 +954,10 @@ bool RenderableFieldlinesSequence::extractCdfInfoFromDictionary(std::string& see
         return false;
     }
 
-    if (!_dictionary->getValue(KeyCdfTracingVariable, tracingVar)) {
+    if (_dictionary->hasValue<std::string>(KeyCdfTracingVariable)) {
+        tracingVar = _dictionary->value<std::string>(KeyCdfTracingVariable);
+    }
+    else {
         tracingVar = "b"; //  Magnetic field variable as default
         LWARNING(fmt::format(
             "{}: No '{}', using default '{}'",
@@ -957,8 +965,9 @@ bool RenderableFieldlinesSequence::extractCdfInfoFromDictionary(std::string& see
         ));
     }
 
-    ghoul::Dictionary extraQuantityNamesDictionary;
-    if (_dictionary->getValue(KeyCdfExtraVariables, extraQuantityNamesDictionary)) {
+    if (_dictionary->hasValue<ghoul::Dictionary>(KeyCdfExtraVariables)) {
+        ghoul::Dictionary extraQuantityNamesDictionary =
+            _dictionary->value<ghoul::Dictionary>(KeyCdfExtraVariables);
         const size_t nProvidedExtras = extraQuantityNamesDictionary.size();
         for (size_t i = 1; i <= nProvidedExtras; ++i) {
             extraVars.push_back(
diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
index b310a549f4..d7408f8aa6 100644
--- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
+++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
index fc3d4c47c3..4afde1c7c2 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,6 +29,7 @@ in float vs_depth;
 
 uniform bool usingAdditiveBlending;
 
+
 Fragment getFragment() {
     if (vs_color.a == 0) {
         discard;
@@ -46,8 +47,6 @@ Fragment getFragment() {
     // TODO: Add the correct normal if necessary (JCC)
     frag.gNormal = vec4(0.0, 0.0, -1.0, 1.0);
 
-
-
     if (usingAdditiveBlending) {
         frag.blend = BLEND_MODE_ADDITIVE;
     }
diff --git a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
index 400b69a0c5..75157cd9c9 100644
--- a/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
+++ b/modules/fieldlinessequence/shaders/fieldlinessequence_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -72,18 +72,19 @@ vec4 getTransferFunctionColor() {
     return texture(colorTable, lookUpVal);
 }
 
-bool isPartOfParticle(const double time, const int vertexId, const int particleSize,
-                      const int particleSpeed, const int particleSpacing) {
+bool isPartOfParticle(double time, int vertexId, int particleSize,
+                      int particleSpeed, int particleSpacing)
+{
     int modulusResult = int(double(particleSpeed) * time + vertexId) % particleSpacing;
     return modulusResult > 0 && modulusResult <= particleSize;
 }
 
 void main() {
-
     bool hasColor = true;
 
     if (usingMasking && (in_masking_scalar < maskingRange.x ||
-                         in_masking_scalar > maskingRange.y )) {
+                         in_masking_scalar > maskingRange.y ))
+    {
         hasColor = false;
     }
 
@@ -93,8 +94,8 @@ void main() {
         if (in_position.x < domainLimX.x || in_position.x > domainLimX.y ||
             in_position.y < domainLimY.x || in_position.y > domainLimY.y ||
             in_position.z < domainLimZ.x || in_position.z > domainLimZ.y ||
-            radius        < domainLimR.x || radius        > domainLimR.y) {
-
+            radius        < domainLimR.x || radius        > domainLimR.y)
+        {
             hasColor = false;
         }
     }
diff --git a/modules/fieldlinessequence/util/commons.cpp b/modules/fieldlinessequence/util/commons.cpp
index 9602b52b9b..9edd49070e 100644
--- a/modules/fieldlinessequence/util/commons.cpp
+++ b/modules/fieldlinessequence/util/commons.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/util/commons.h b/modules/fieldlinessequence/util/commons.h
index 7e0d125985..eb85d2c31c 100644
--- a/modules/fieldlinessequence/util/commons.h
+++ b/modules/fieldlinessequence/util/commons.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.cpp b/modules/fieldlinessequence/util/fieldlinesstate.cpp
index 7327514e37..48b9a2b23b 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.cpp
+++ b/modules/fieldlinessequence/util/fieldlinesstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/util/fieldlinesstate.h b/modules/fieldlinessequence/util/fieldlinesstate.h
index 656403b33b..5277464014 100644
--- a/modules/fieldlinessequence/util/fieldlinesstate.h
+++ b/modules/fieldlinessequence/util/fieldlinesstate.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
index 76daab2b7a..7b18d0579d 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
index 39fa5d7212..1b287914cc 100644
--- a/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
+++ b/modules/fieldlinessequence/util/kameleonfieldlinehelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fitsfilereader/CMakeLists.txt b/modules/fitsfilereader/CMakeLists.txt
index bea007310d..f2c2f1bc46 100644
--- a/modules/fitsfilereader/CMakeLists.txt
+++ b/modules/fitsfilereader/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -26,14 +26,14 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/fitsfilereader.h
+  fitsfilereadermodule.h
+  include/fitsfilereader.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES 
-  ${CMAKE_CURRENT_SOURCE_DIR}/fitsfilereadermodule.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/fitsfilereader.cpp
+  fitsfilereadermodule.cpp
+  src/fitsfilereader.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
@@ -59,10 +59,8 @@ add_subdirectory(${CCFITS_ROOT_DIR})
 set_folder_location(CCfits "External")
 set(CCfits_BUILD_SHARED_LIBS OFF)
 
-if (GHOUL_DISABLE_EXTERNAL_WARNINGS)
-    disable_external_warnings(cfitsio)
-    disable_external_warnings(CCfits)
-endif ()
+disable_external_warnings(cfitsio)
+disable_external_warnings(CCfits)
 
-target_include_directories(${MODULE_NAME} SYSTEM PUBLIC ${INCLUDES_FOR_TARGET})
-target_link_libraries(${MODULE_NAME} PRIVATE CCfits)
+target_include_directories(openspace-module-fitsfilereader SYSTEM PRIVATE ${INCLUDES_FOR_TARGET})
+target_link_libraries(openspace-module-fitsfilereader PRIVATE cfitsio CCfits)
diff --git a/modules/fitsfilereader/fitsfilereadermodule.cpp b/modules/fitsfilereader/fitsfilereadermodule.cpp
index e0c66c7882..f88687aeb0 100644
--- a/modules/fitsfilereader/fitsfilereadermodule.cpp
+++ b/modules/fitsfilereader/fitsfilereadermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fitsfilereader/fitsfilereadermodule.h b/modules/fitsfilereader/fitsfilereadermodule.h
index a16cfaba75..e441eeb5ac 100644
--- a/modules/fitsfilereader/fitsfilereadermodule.h
+++ b/modules/fitsfilereader/fitsfilereadermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fitsfilereader/include/fitsfilereader.h b/modules/fitsfilereader/include/fitsfilereader.h
index 5c7bbd77be..9418fc42fb 100644
--- a/modules/fitsfilereader/include/fitsfilereader.h
+++ b/modules/fitsfilereader/include/fitsfilereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/fitsfilereader/src/fitsfilereader.cpp b/modules/fitsfilereader/src/fitsfilereader.cpp
index f35a51aa9f..26e945fad3 100644
--- a/modules/fitsfilereader/src/fitsfilereader.cpp
+++ b/modules/fitsfilereader/src/fitsfilereader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,9 +28,22 @@
 #include <ghoul/fmt.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
-#include <CCfits>
 #include <fstream>
 
+#ifdef WIN32
+#pragma warning (push)
+#pragma warning (disable : 4100) // unreferenced formal parameter
+#pragma warning (disable : 4267) // conversion from 'size_t' to 'int'
+#pragma warning (disable : 4456) // declaration of 'col' hides previous local declaration
+#endif // WIN32
+
+#include <CCfits>
+
+#ifdef WIN32
+#pragma warning (pop)
+#endif // WIN32
+
+
 using namespace CCfits;
 
 namespace {
@@ -325,7 +338,7 @@ std::vector<float> FitsFileReader::readFitsFile(std::string filePath, int& nValu
         values[idx++] = tycho_v_err[i % nStars];
 
         // Read extra columns, if any. This will slow down the sorting tremendously!
-        for (size_t col = defaultCols; col < nColumnsRead; ++col) {
+        for (int col = defaultCols; col < nColumnsRead; ++col) {
             std::vector<float> vecData = std::move(tableContent[allColumnNames[col]]);
             values[idx++] = vecData[i];
         }
@@ -616,9 +629,9 @@ std::vector<float> FitsFileReader::readSpeckFile(const std::string& filePath,
             // RenderableGaiaStars expects kiloParsec (because fits file from Vienna had
             // in kPc).
             // Thus we need to convert positions twice atm.
-            renderValues[0] = readValues[0] / 1000.0; // PosX
-            renderValues[1] = readValues[1] / 1000.0; // PosY
-            renderValues[2] = readValues[2] / 1000.0; // PosZ
+            renderValues[0] = readValues[0] / 1000.f; // PosX
+            renderValues[1] = readValues[1] / 1000.f; // PosY
+            renderValues[2] = readValues[2] / 1000.f; // PosZ
             renderValues[3] = readValues[6]; // AbsMag
             renderValues[4] = readValues[3]; // color
             renderValues[5] = readValues[13] * readValues[16]; // Vel X
diff --git a/modules/gaia/CMakeLists.txt b/modules/gaia/CMakeLists.txt
index 782b9ced23..34e442f7d3 100644
--- a/modules/gaia/CMakeLists.txt
+++ b/modules/gaia/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,41 +25,41 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/gaiamodule.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegaiastars.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreemanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreeculler.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfilejob.h 
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfitstask.h 
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readspecktask.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/constructoctreetask.h 
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/gaiaoptions.h
+  gaiamodule.h
+  rendering/renderablegaiastars.h
+  rendering/octreemanager.h
+  rendering/octreeculler.h
+  tasks/readfilejob.h 
+  tasks/readfitstask.h 
+  tasks/readspecktask.h
+  tasks/constructoctreetask.h 
+  rendering/gaiaoptions.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/gaiamodule.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegaiastars.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreemanager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/octreeculler.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfilejob.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readfitstask.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/readspecktask.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/constructoctreetask.cpp
+  gaiamodule.cpp
+  rendering/renderablegaiastars.cpp
+  rendering/octreemanager.cpp
+  rendering/octreeculler.cpp
+  tasks/readfilejob.cpp
+  tasks/readfitstask.cpp
+  tasks/readspecktask.cpp
+  tasks/constructoctreetask.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_vbo_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_ssbo_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_nofbo_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_billboard_ge.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_point_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_point_ge.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_point_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/gaia_tonemapping_billboard_fs.glsl
+  shaders/gaia_vbo_vs.glsl
+  shaders/gaia_ssbo_vs.glsl
+  shaders/gaia_billboard_nofbo_fs.glsl
+  shaders/gaia_billboard_fs.glsl
+  shaders/gaia_billboard_ge.glsl
+  shaders/gaia_point_fs.glsl
+  shaders/gaia_point_ge.glsl
+  shaders/gaia_tonemapping_vs.glsl
+  shaders/gaia_tonemapping_point_fs.glsl
+  shaders/gaia_tonemapping_billboard_fs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/gaia/gaiamodule.cpp b/modules/gaia/gaiamodule.cpp
index 7174ca6705..d6293c6059 100644
--- a/modules/gaia/gaiamodule.cpp
+++ b/modules/gaia/gaiamodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/gaiamodule.h b/modules/gaia/gaiamodule.h
index 657ac52f04..c3db3b3a8c 100644
--- a/modules/gaia/gaiamodule.h
+++ b/modules/gaia/gaiamodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/include.cmake b/modules/gaia/include.cmake
index 98bffaa6bf..a3db024daf 100644
--- a/modules/gaia/include.cmake
+++ b/modules/gaia/include.cmake
@@ -2,5 +2,4 @@ set(DEFAULT_MODULE ON)
 
 set(OPENSPACE_DEPENDENCIES
   fitsfilereader
-  globebrowsing
 )
diff --git a/modules/gaia/rendering/gaiaoptions.h b/modules/gaia/rendering/gaiaoptions.h
index b1740b7cb5..265b3ef013 100644
--- a/modules/gaia/rendering/gaiaoptions.h
+++ b/modules/gaia/rendering/gaiaoptions.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/rendering/octreeculler.cpp b/modules/gaia/rendering/octreeculler.cpp
index 0ffef8d717..d08d994ee0 100644
--- a/modules/gaia/rendering/octreeculler.cpp
+++ b/modules/gaia/rendering/octreeculler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/rendering/octreeculler.h b/modules/gaia/rendering/octreeculler.h
index c8a2e2362f..06d7741390 100644
--- a/modules/gaia/rendering/octreeculler.h
+++ b/modules/gaia/rendering/octreeculler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/rendering/octreemanager.cpp b/modules/gaia/rendering/octreemanager.cpp
index 5b56c62816..55aca88b83 100644
--- a/modules/gaia/rendering/octreemanager.cpp
+++ b/modules/gaia/rendering/octreemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -407,7 +407,7 @@ std::map<int, std::vector<float>> OctreeManager::traverseData(const glm::dmat4&
          removedKey != _removedKeysInPrevCall.rend(); ++removedKey) {
 
         // Uses a reverse loop to try to decrease the biggest chunk.
-        if (*removedKey == _biggestChunkIndexInUse - 1) {
+        if (*removedKey == static_cast<int>(_biggestChunkIndexInUse) - 1) {
             _biggestChunkIndexInUse = *removedKey;
             LDEBUG(fmt::format(
                 "Decreased size to: {} Free Spots in VBO: {}",
@@ -611,7 +611,7 @@ int OctreeManager::readFromFile(std::ifstream& inFileStream, bool readData,
     ));
 
     // Octree Manager root halfDistance must be updated before any nodes are created!
-    if (MAX_DIST != oldMaxdist) {
+    if (static_cast<int>(MAX_DIST) != oldMaxdist) {
         for (size_t i = 0; i < 8; ++i) {
             _root->Children[i]->halfDimension = MAX_DIST / 2.f;
             _root->Children[i]->originX = (i % 2 == 0) ?
@@ -963,7 +963,7 @@ bool OctreeManager::insertInNode(OctreeNode& node, const std::vector<float>& sta
         // Node is a leaf and it's not yet full -> insert star.
         storeStarData(node, starValues);
 
-        if (depth > _totalDepth) {
+        if (depth > static_cast<int>(_totalDepth)) {
             _totalDepth = depth;
         }
         return true;
@@ -1355,7 +1355,7 @@ bool OctreeManager::updateBufferIndex(OctreeNode& node) {
     if (_freeSpotsInBuffer.empty()) {
         _biggestChunkIndexInUse++;
     }
-    else if (_freeSpotsInBuffer.top() > _biggestChunkIndexInUse) {
+    else if (_freeSpotsInBuffer.top() > static_cast<int>(_biggestChunkIndexInUse)) {
         _biggestChunkIndexInUse = _freeSpotsInBuffer.top();
     }
     return true;
diff --git a/modules/gaia/rendering/octreemanager.h b/modules/gaia/rendering/octreemanager.h
index 031e9e3630..dda4b00148 100644
--- a/modules/gaia/rendering/octreemanager.h
+++ b/modules/gaia/rendering/octreemanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/rendering/renderablegaiastars.cpp b/modules/gaia/rendering/renderablegaiastars.cpp
index ff10f2a3f1..722f90f8b2 100644
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -310,11 +310,6 @@ documentation::Documentation RenderableGaiaStars::Documentation() {
         "RenderableGaiaStars",
         "gaiamission_renderablegaiastars",
         {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableGaiaStars"),
-                Optional::No
-            },
             {
                 FilePathInfo.identifier,
                 new StringVerifier,
@@ -503,12 +498,6 @@ documentation::Documentation RenderableGaiaStars::Documentation() {
 RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
     : Renderable(dictionary)
     , _filePath(FilePathInfo)
-    , _fileReaderOption(
-        FileReaderOptionInfo,
-        properties::OptionProperty::DisplayType::Dropdown
-    )
-    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
-    , _shaderOption(ShaderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _pointSpreadFunctionTexturePath(PsfTextureInfo)
     , _colorTexturePath(ColorTextureInfo)
     , _luminosityMultiplier(LuminosityMultiplierInfo, 35.f, 1.f, 1000.f)
@@ -522,8 +511,6 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
     , _additionalNodes(AdditionalNodesInfo, glm::ivec2(1), glm::ivec2(0), glm::ivec2(4))
     , _tmPointPixelWeightThreshold(TmPointPxThresholdInfo, 0.001f, 0.000001f, 0.01f)
     , _lodPixelThreshold(LodPixelThresholdInfo, 250.f, 0.f, 5000.f)
-    , _maxGpuMemoryPercent(MaxGpuMemoryPercentInfo, 0.45f, 0.f, 1.f)
-    , _maxCpuMemoryPercent(MaxCpuMemoryPercentInfo, 0.5f, 0.f, 1.f)
     , _posXThreshold(FilterPosXInfo, glm::vec2(0.f), glm::vec2(-10.f), glm::vec2(10.f))
     , _posYThreshold(FilterPosYInfo, glm::vec2(0.f), glm::vec2(-10.f), glm::vec2(10.f))
     , _posZThreshold(FilterPosZInfo, glm::vec2(0.f), glm::vec2(-10.f), glm::vec2(10.f))
@@ -533,9 +520,17 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
     , _firstRow(FirstRowInfo, 0, 0, 2539913) // DR1-max: 2539913
     , _lastRow(LastRowInfo, 0, 0, 2539913)
     , _columnNamesList(ColumnNamesInfo)
+    , _fileReaderOption(
+        FileReaderOptionInfo,
+        properties::OptionProperty::DisplayType::Dropdown
+    )
+    , _renderOption(RenderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
+    , _shaderOption(ShaderOptionInfo, properties::OptionProperty::DisplayType::Dropdown)
     , _nRenderedStars(NumRenderedStarsInfo, 0, 0, 2000000000) // 2 Billion stars
     , _cpuRamBudgetProperty(CpuRamBudgetInfo, 0.f, 0.f, 1.f)
     , _gpuStreamBudgetProperty(GpuStreamBudgetInfo, 0.f, 0.f, 1.f)
+    , _maxGpuMemoryPercent(MaxGpuMemoryPercentInfo, 0.45f, 0.f, 1.f)
+    , _maxCpuMemoryPercent(MaxCpuMemoryPercentInfo, 0.5f, 0.f, 1.f)
     , _reportGlErrors(ReportGlErrorsInfo, false)
     , _accumulatedIndices(1, 0)
 {
@@ -726,7 +721,7 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
 
     if (dictionary.hasKey(AdditionalNodesInfo.identifier)) {
         _additionalNodes = static_cast<glm::ivec2>(
-            dictionary.value<glm::vec2>(AdditionalNodesInfo.identifier)
+            dictionary.value<glm::dvec2>(AdditionalNodesInfo.identifier)
         );
     }
 
@@ -773,32 +768,32 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
     }
 
     if (dictionary.hasKey(FilterPosXInfo.identifier)) {
-        _posXThreshold = dictionary.value<glm::vec2>(FilterPosXInfo.identifier);
+        _posXThreshold = dictionary.value<glm::dvec2>(FilterPosXInfo.identifier);
     }
     addProperty(_posXThreshold);
 
     if (dictionary.hasKey(FilterPosYInfo.identifier)) {
-        _posXThreshold = dictionary.value<glm::vec2>(FilterPosYInfo.identifier);
+        _posXThreshold = dictionary.value<glm::dvec2>(FilterPosYInfo.identifier);
     }
     addProperty(_posYThreshold);
 
     if (dictionary.hasKey(FilterPosZInfo.identifier)) {
-        _posZThreshold = dictionary.value<glm::vec2>(FilterPosZInfo.identifier);
+        _posZThreshold = dictionary.value<glm::dvec2>(FilterPosZInfo.identifier);
     }
     addProperty(_posZThreshold);
 
     if (dictionary.hasKey(FilterGMagInfo.identifier)) {
-        _gMagThreshold = dictionary.value<glm::vec2>(FilterGMagInfo.identifier);
+        _gMagThreshold = dictionary.value<glm::dvec2>(FilterGMagInfo.identifier);
     }
     addProperty(_gMagThreshold);
 
     if (dictionary.hasKey(FilterBpRpInfo.identifier)) {
-        _bpRpThreshold = dictionary.value<glm::vec2>(FilterBpRpInfo.identifier);
+        _bpRpThreshold = dictionary.value<glm::dvec2>(FilterBpRpInfo.identifier);
     }
     addProperty(_bpRpThreshold);
 
     if (dictionary.hasKey(FilterDistInfo.identifier)) {
-        _distThreshold = dictionary.value<glm::vec2>(FilterDistInfo.identifier);
+        _distThreshold = dictionary.value<glm::dvec2>(FilterDistInfo.identifier);
     }
     addProperty(_distThreshold);
 
@@ -825,8 +820,8 @@ RenderableGaiaStars::RenderableGaiaStars(const ghoul::Dictionary& dictionary)
 
             // Ugly fix for ASCII sorting when there are more columns read than 10.
             std::set<int> intKeys;
-            for (const std::string& key : tmpDict.keys()) {
-                intKeys.insert(std::stoi(key));
+            for (std::string_view key : tmpDict.keys()) {
+                intKeys.insert(std::stoi(std::string(key)));
             }
 
             for (int key : intKeys) {
@@ -1142,7 +1137,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
 
     glm::dmat4 model = glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) *
-        glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)));
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
 
     float viewScaling = data.camera.scaling();
     glm::dmat4 view = data.camera.combinedViewMatrix();
diff --git a/modules/gaia/rendering/renderablegaiastars.h b/modules/gaia/rendering/renderablegaiastars.h
index dfde5abc04..2f1e327c08 100644
--- a/modules/gaia/rendering/renderablegaiastars.h
+++ b/modules/gaia/rendering/renderablegaiastars.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/scripts/filtering.lua b/modules/gaia/scripts/filtering.lua
index 1ab5ef2232..d1b3179863 100644
--- a/modules/gaia/scripts/filtering.lua
+++ b/modules/gaia/scripts/filtering.lua
@@ -39,7 +39,7 @@ openspace.gaia.addClippingBox = function (name, size, position)
         },
         Renderable = {
             Type = "RenderableBoxGrid",
-            GridColor = { 0.6, 0.5, 0.7 },
+            Color = { 0.6, 0.5, 0.7 },
             LineWidth = 2.0,
             Size = { size[1] * kilo_parsec_in_meter, size[2] * kilo_parsec_in_meter, size[3] * kilo_parsec_in_meter}
         },
@@ -84,7 +84,7 @@ openspace.gaia.addClippingSphere = function (name, radius)
         },
         Renderable = {
             Type = "RenderableSphericalGrid",
-            GridColor = { 0.6, 0.5, 0.7 },
+            Color = { 0.6, 0.5, 0.7 },
             LineWidth = 1.0,
         },
         GUI = {
diff --git a/modules/gaia/shaders/gaia_billboard_fs.glsl b/modules/gaia/shaders/gaia_billboard_fs.glsl
index d9b9ebbbd5..fd11914e7e 100644
--- a/modules/gaia/shaders/gaia_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -60,7 +60,6 @@ vec3 color2rgb(float color) {
 }
 
 void main() {
-
     // Assume all stars has equal luminosity as the Sun when no magnitude is loaded.
     float luminosity = 0.05;
     vec3 color = vec3(luminosity);
diff --git a/modules/gaia/shaders/gaia_billboard_ge.glsl b/modules/gaia/shaders/gaia_billboard_ge.glsl
index 3296ae1fa2..fb894c44cc 100644
--- a/modules/gaia/shaders/gaia_billboard_ge.glsl
+++ b/modules/gaia/shaders/gaia_billboard_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -67,7 +67,6 @@ const vec2 corners[4] = vec2[4](
 
 
 void main() {
-
     ge_brightness = vs_brightness[0];
     ge_starDistFromSun = vs_starDistFromSun[0];
     ge_cameraDistFromSun = vs_cameraDistFromSun[0];
@@ -80,7 +79,7 @@ void main() {
     float initStarSize = billboardSize;
 
     // Use magnitude for size boost as well.
-    if ( renderOption != RENDEROPTION_STATIC ) {
+    if (renderOption != RENDEROPTION_STATIC) {
         // DR1 magnitudes are [4, 20], but could be [-15, 20] according to this chart:
         // https://qph.fs.quoracdn.net/main-qimg-317a18e3b228efc7d7f67a1632a55961
         // Negative magnitude => Giants
diff --git a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
index 2e67386300..a350a561ae 100644
--- a/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
+++ b/modules/gaia/shaders/gaia_billboard_nofbo_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -57,7 +57,6 @@ vec3 color2rgb(float color) {
 }
 
 Fragment getFragment() {
-
     // Assume all stars has equal luminosity as the Sun when no magnitude is loaded.
     float luminosity = 1.0;
     vec3 color = vec3(luminosity);
@@ -70,7 +69,7 @@ Fragment getFragment() {
     }
 
     // Calculate the color and luminosity if we have the magnitude and B-V color.
-    if ( renderOption != RENDEROPTION_STATIC ) {
+    if (renderOption != RENDEROPTION_STATIC) {
         color = color2rgb(ge_brightness.y);
         ratioMultiplier = 0.5;
 
@@ -95,7 +94,7 @@ Fragment getFragment() {
     color *= luminosity * pow(luminosityMultiplier, 3.0);
 
     // Decrease contributing brightness for stars in central cluster.
-    if ( ge_cameraDistFromSun > ge_starDistFromSun ) {
+    if (ge_cameraDistFromSun > ge_starDistFromSun) {
         float ratio = ge_starDistFromSun / ge_cameraDistFromSun;
         //color *= ratio * ratioMultiplier;
     }
@@ -120,4 +119,3 @@ Fragment getFragment() {
 
     return frag;
 }
-
diff --git a/modules/gaia/shaders/gaia_point_fs.glsl b/modules/gaia/shaders/gaia_point_fs.glsl
index 22fa3fafb9..a8402a6d02 100644
--- a/modules/gaia/shaders/gaia_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_point_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -57,14 +57,13 @@ vec3 color2rgb(float color) {
 }
 
 void main() {
-
     // Assume all stars has equal luminosity as the Sun when no magnitude is loaded.
     float luminosity = 0.05;
     vec3 color = vec3(luminosity);
     float ratioMultiplier = 1.0;
 
     // Calculate the color and luminosity if we have the magnitude and B-V color.
-    if ( renderOption != RENDEROPTION_STATIC ) {
+    if (renderOption != RENDEROPTION_STATIC) {
         color = color2rgb(ge_brightness.y);
         ratioMultiplier = 0.01;
 
@@ -89,7 +88,7 @@ void main() {
     color *= luminosity * pow(luminosityMultiplier, 3.0);
 
     // Decrease contributing brightness for stars in central cluster.
-    if ( ge_cameraDistFromSun > ge_starDistFromSun ) {
+    if (ge_cameraDistFromSun > ge_starDistFromSun) {
         float ratio = ge_starDistFromSun / ge_cameraDistFromSun;
         //color *= ratio * ratioMultiplier;
     }
diff --git a/modules/gaia/shaders/gaia_point_ge.glsl b/modules/gaia/shaders/gaia_point_ge.glsl
index b36e18f5bb..553917ec86 100644
--- a/modules/gaia/shaders/gaia_point_ge.glsl
+++ b/modules/gaia/shaders/gaia_point_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -46,7 +46,6 @@ uniform float viewScaling;
 uniform float cutOffThreshold;
 
 void main() {
-
     ge_brightness = vs_brightness[0];
     ge_starDistFromSun = vs_starDistFromSun[0];
     ge_cameraDistFromSun = vs_cameraDistFromSun[0];
diff --git a/modules/gaia/shaders/gaia_ssbo_vs.glsl b/modules/gaia/shaders/gaia_ssbo_vs.glsl
index ecd6f1b064..67b09bdbdd 100644
--- a/modules/gaia/shaders/gaia_ssbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_ssbo_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -67,8 +67,7 @@ uniform vec2 distThreshold;
 
 // Use binary search to find the chunk containing our star ID.
 int findChunkId(int left, int right, int id) {
-    
-    while ( left <= right ) {
+    while (left <= right) {
         int middle = (left + right) / 2;
         int firstStarInChunk = starsPerChunk[middle];
         if (left == right || (firstStarInChunk <= id && id < starsPerChunk[middle+1])) {
@@ -111,14 +110,15 @@ void main() {
     vec3 in_velocity = vec3(0.0);
 
     // Check if we should filter this star by position.
-    if ( (abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) || 
+    if ((abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) || 
         (abs(posXThreshold.y) > EPS && in_position.x > posXThreshold.y) || 
         (abs(posYThreshold.x) > EPS && in_position.y < posYThreshold.x) || 
         (abs(posYThreshold.y) > EPS && in_position.y > posYThreshold.y) || 
         (abs(posZThreshold.x) > EPS && in_position.z < posZThreshold.x) || 
         (abs(posZThreshold.y) > EPS && in_position.z > posZThreshold.y) || 
         (abs(distThreshold.x - distThreshold.y) < EPS 
-        && abs(length(in_position) - distThreshold.y) < EPS) ) {
+        && abs(length(in_position) - distThreshold.y) < EPS))
+    {
         // Discard star in geometry shader.
         vs_gPosition = vec4(0.0);    
         gl_Position = vec4(0.0);
@@ -126,24 +126,25 @@ void main() {
     }
 
 
-    if ( renderOption != RENDEROPTION_STATIC ) {
+    if (renderOption != RENDEROPTION_STATIC) {
         int startOfCol = firstStarInChunk + nStarsInChunk * 3 + placeInChunk * 2;
         in_brightness = vec2(allData[startOfCol], allData[startOfCol + 1]);
 
         // Check if we should filter this star by magnitude or color.
-        if ( (abs(gMagThreshold.x - gMagThreshold.y) < EPS && abs(gMagThreshold.x - in_brightness.x) < EPS) ||
+        if ((abs(gMagThreshold.x - gMagThreshold.y) < EPS && abs(gMagThreshold.x - in_brightness.x) < EPS) ||
             (abs(gMagThreshold.x - 20.0f) > EPS && in_brightness.x < gMagThreshold.x) || 
             (abs(gMagThreshold.y - 20.0f) > EPS && in_brightness.x > gMagThreshold.y) ||
             (abs(bpRpThreshold.x - bpRpThreshold.y) < EPS && abs(bpRpThreshold.x - in_brightness.y) < EPS) ||
             (abs(bpRpThreshold.x) > EPS && in_brightness.y < bpRpThreshold.x) || 
-            (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y) ) {
+            (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y))
+        {
             // Discard star in geometry shader.
             vs_gPosition = vec4(0.0);    
             gl_Position = vec4(0.0);
             return;
         }
 
-        if ( renderOption == RENDEROPTION_MOTION ) {
+        if (renderOption == RENDEROPTION_MOTION) {
             int startOfVel = firstStarInChunk + nStarsInChunk * 5 + placeInChunk * 3;
             in_velocity = vec3(allData[startOfVel], allData[startOfVel + 1], allData[startOfVel + 2]);
         } 
@@ -157,10 +158,11 @@ void main() {
     objectPosition.xyz += time * in_velocity;
 
     // Thres moving stars by their new position.
-    float distPosition = length(objectPosition.xyz / (1000.0 * Parsec) );
-    if ( (abs(distThreshold.x - distThreshold.y) > EPS && 
+    float distPosition = length(objectPosition.xyz / (1000.0 * Parsec));
+    if ((abs(distThreshold.x - distThreshold.y) > EPS && 
         ((abs(distThreshold.x) > EPS && distPosition < distThreshold.x) || 
-        (abs(distThreshold.y) > EPS && distPosition > distThreshold.y))) ) {
+        (abs(distThreshold.y) > EPS && distPosition > distThreshold.y))))
+    {
         // Discard star in geometry shader.
         vs_gPosition = vec4(0.0);    
         gl_Position = vec4(0.0);
@@ -176,7 +178,7 @@ void main() {
 
     // Remove stars without position, happens when VBO chunk is stuffed with zeros.
     // Has to be done in Geometry shader because Vertices cannot be discarded here.
-    if ( length(in_position) > EPS ){
+    if (length(in_position) > EPS){
         vs_gPosition = vec4(model * objectPosition);    
         gl_Position = vec4(projection * viewPosition);
     }
diff --git a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
index 3cf794162f..f69f3e3b00 100644
--- a/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,7 +32,6 @@ const float DEFAULT_DEPTH = 3.08567758e19; // 1000 Pc
 
 
 Fragment getFragment() {
-
     vec4 color = vec4(0.0);
     
     // BILLBOARDS
diff --git a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
index f2da517b0b..c6c0f45539 100644
--- a/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_point_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -37,7 +37,6 @@ const float M_PI = 3.141592653589793238462;
 const float DEFAULT_DEPTH = 3.08567758e19; // 1000 Pc
 
 Fragment getFragment() {
-
     vec4 color = vec4(0.0);
     
     // GL_POINTS
diff --git a/modules/gaia/shaders/gaia_tonemapping_vs.glsl b/modules/gaia/shaders/gaia_tonemapping_vs.glsl
index 2f9122836d..b6cefb308e 100644
--- a/modules/gaia/shaders/gaia_tonemapping_vs.glsl
+++ b/modules/gaia/shaders/gaia_tonemapping_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/shaders/gaia_vbo_vs.glsl b/modules/gaia/shaders/gaia_vbo_vs.glsl
index f5a635c3d2..e2e5cf1b29 100644
--- a/modules/gaia/shaders/gaia_vbo_vs.glsl
+++ b/modules/gaia/shaders/gaia_vbo_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -59,7 +59,7 @@ void main() {
     vs_brightness = in_brightness;
 
     // Check if we should filter this star by position. Thres depending on original values.
-    if ( (abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) || 
+    if ((abs(posXThreshold.x) > EPS && in_position.x < posXThreshold.x) || 
         (abs(posXThreshold.y) > EPS && in_position.x > posXThreshold.y) || 
         (abs(posYThreshold.x) > EPS && in_position.y < posYThreshold.x) || 
         (abs(posYThreshold.y) > EPS && in_position.y > posYThreshold.y) || 
@@ -73,7 +73,8 @@ void main() {
         (abs(gMagThreshold.y - 20.0f) > EPS && in_brightness.x > gMagThreshold.y) ||
         (abs(bpRpThreshold.x - bpRpThreshold.y) < EPS && abs(bpRpThreshold.x - in_brightness.y) < EPS) ||
         (abs(bpRpThreshold.x) > EPS && in_brightness.y < bpRpThreshold.x) || 
-        (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y))) ) {
+        (abs(bpRpThreshold.y) > EPS && in_brightness.y > bpRpThreshold.y))))
+    {
         // Discard star in geometry shader.
         vs_gPosition = vec4(0.0);    
         gl_Position = vec4(0.0);
@@ -84,16 +85,17 @@ void main() {
     vec4 objectPosition = vec4(in_position * 1000 * Parsec, 1.0);
 
     // Add velocity if we've read any.
-    if ( renderOption == RENDEROPTION_MOTION ) {
+    if (renderOption == RENDEROPTION_MOTION) {
         // Velocity is already in [m/s].
         objectPosition.xyz += time * in_velocity;
     }
 
     // Thres moving stars by their new position.
     float distPosition = length(objectPosition.xyz / (1000.0 * Parsec) );
-    if ( (abs(distThreshold.x - distThreshold.y) > EPS && 
+    if ((abs(distThreshold.x - distThreshold.y) > EPS && 
         ((abs(distThreshold.x) > EPS && distPosition< distThreshold.x) || 
-        (abs(distThreshold.y) > EPS && distPosition > distThreshold.y))) ) {
+        (abs(distThreshold.y) > EPS && distPosition > distThreshold.y))))
+    {
         // Discard star in geometry shader.
         vs_gPosition = vec4(0.0);    
         gl_Position = vec4(0.0);
@@ -109,7 +111,7 @@ void main() {
 
     // Remove stars without position, happens when VBO chunk is stuffed with zeros.
     // Has to be done in Geometry shader because Vertices cannot be discarded here.
-    if ( length(in_position) > EPS ){
+    if (length(in_position) > EPS) {
         vs_gPosition = vec4(model * objectPosition);    
         gl_Position = vec4(projection * viewPosition);
     }
diff --git a/modules/gaia/tasks/constructoctreetask.cpp b/modules/gaia/tasks/constructoctreetask.cpp
index 725d86963c..a4edef1372 100644
--- a/modules/gaia/tasks/constructoctreetask.cpp
+++ b/modules/gaia/tasks/constructoctreetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -98,99 +98,99 @@ ConstructOctreeTask::ConstructOctreeTask(const ghoul::Dictionary& dictionary) {
 
     // Check for filter params.
     if (dictionary.hasKey(KeyFilterPosX)) {
-        _posX = dictionary.value<glm::vec2>(KeyFilterPosX);
+        _posX = dictionary.value<glm::dvec2>(KeyFilterPosX);
         _filterPosX = true;
     }
     if (dictionary.hasKey(KeyFilterPosY)) {
-        _posY = dictionary.value<glm::vec2>(KeyFilterPosY);
+        _posY = dictionary.value<glm::dvec2>(KeyFilterPosY);
         _filterPosY = true;
     }
     if (dictionary.hasKey(KeyFilterPosZ)) {
-        _posZ = dictionary.value<glm::vec2>(KeyFilterPosZ);
+        _posZ = dictionary.value<glm::dvec2>(KeyFilterPosZ);
         _filterPosZ = true;
     }
     if (dictionary.hasKey(KeyFilterGMag)) {
-        _gMag = dictionary.value<glm::vec2>(KeyFilterGMag);
+        _gMag = dictionary.value<glm::dvec2>(KeyFilterGMag);
         _filterGMag = true;
     }
     if (dictionary.hasKey(KeyFilterBpRp)) {
-        _bpRp = dictionary.value<glm::vec2>(KeyFilterBpRp);
+        _bpRp = dictionary.value<glm::dvec2>(KeyFilterBpRp);
         _filterBpRp = true;
     }
     if (dictionary.hasKey(KeyFilterVelX)) {
-        _velX = dictionary.value<glm::vec2>(KeyFilterVelX);
+        _velX = dictionary.value<glm::dvec2>(KeyFilterVelX);
         _filterVelX = true;
     }
     if (dictionary.hasKey(KeyFilterVelY)) {
-        _velY = dictionary.value<glm::vec2>(KeyFilterVelY);
+        _velY = dictionary.value<glm::dvec2>(KeyFilterVelY);
         _filterVelY = true;
     }
     if (dictionary.hasKey(KeyFilterVelZ)) {
-        _velZ = dictionary.value<glm::vec2>(KeyFilterVelZ);
+        _velZ = dictionary.value<glm::dvec2>(KeyFilterVelZ);
         _filterVelZ = true;
     }
     if (dictionary.hasKey(KeyFilterBpMag)) {
-        _bpMag = dictionary.value<glm::vec2>(KeyFilterBpMag);
+        _bpMag = dictionary.value<glm::dvec2>(KeyFilterBpMag);
         _filterBpMag = true;
     }
     if (dictionary.hasKey(KeyFilterRpMag)) {
-        _rpMag = dictionary.value<glm::vec2>(KeyFilterRpMag);
+        _rpMag = dictionary.value<glm::dvec2>(KeyFilterRpMag);
         _filterRpMag = true;
     }
     if (dictionary.hasKey(KeyFilterBpG)) {
-        _bpG = dictionary.value<glm::vec2>(KeyFilterBpG);
+        _bpG = dictionary.value<glm::dvec2>(KeyFilterBpG);
         _filterBpG = true;
     }
     if (dictionary.hasKey(KeyFilterGRp)) {
-        _gRp = dictionary.value<glm::vec2>(KeyFilterGRp);
+        _gRp = dictionary.value<glm::dvec2>(KeyFilterGRp);
         _filterGRp = true;
     }
     if (dictionary.hasKey(KeyFilterRa)) {
-        _ra = dictionary.value<glm::vec2>(KeyFilterRa);
+        _ra = dictionary.value<glm::dvec2>(KeyFilterRa);
         _filterRa = true;
     }
     if (dictionary.hasKey(KeyFilterRaError)) {
-        _raError = dictionary.value<glm::vec2>(KeyFilterRaError);
+        _raError = dictionary.value<glm::dvec2>(KeyFilterRaError);
         _filterRaError = true;
     }
     if (dictionary.hasKey(KeyFilterDec)) {
-        _dec = dictionary.value<glm::vec2>(KeyFilterDec);
+        _dec = dictionary.value<glm::dvec2>(KeyFilterDec);
         _filterDec = true;
     }
     if (dictionary.hasKey(KeyFilterDecError)) {
-        _decError = dictionary.value<glm::vec2>(KeyFilterDecError);
+        _decError = dictionary.value<glm::dvec2>(KeyFilterDecError);
         _filterDecError = true;
     }
     if (dictionary.hasKey(KeyFilterParallax)) {
-        _parallax = dictionary.value<glm::vec2>(KeyFilterParallax);
+        _parallax = dictionary.value<glm::dvec2>(KeyFilterParallax);
         _filterParallax = true;
     }
     if (dictionary.hasKey(KeyFilterParallaxError)) {
-        _parallaxError = dictionary.value<glm::vec2>(KeyFilterParallaxError);
+        _parallaxError = dictionary.value<glm::dvec2>(KeyFilterParallaxError);
         _filterParallaxError = true;
     }
     if (dictionary.hasKey(KeyFilterPmra)) {
-        _pmra = dictionary.value<glm::vec2>(KeyFilterPmra);
+        _pmra = dictionary.value<glm::dvec2>(KeyFilterPmra);
         _filterPmra = true;
     }
     if (dictionary.hasKey(KeyFilterPmraError)) {
-        _pmraError = dictionary.value<glm::vec2>(KeyFilterPmraError);
+        _pmraError = dictionary.value<glm::dvec2>(KeyFilterPmraError);
         _filterPmraError = true;
     }
     if (dictionary.hasKey(KeyFilterPmdec)) {
-        _pmdec = dictionary.value<glm::vec2>(KeyFilterPmdec);
+        _pmdec = dictionary.value<glm::dvec2>(KeyFilterPmdec);
         _filterPmdec = true;
     }
     if (dictionary.hasKey(KeyFilterPmdecError)) {
-        _pmdecError = dictionary.value<glm::vec2>(KeyFilterPmdecError);
+        _pmdecError = dictionary.value<glm::dvec2>(KeyFilterPmdecError);
         _filterPmdecError = true;
     }
     if (dictionary.hasKey(KeyFilterRv)) {
-        _rv = dictionary.value<glm::vec2>(KeyFilterRv);
+        _rv = dictionary.value<glm::dvec2>(KeyFilterRv);
         _filterRv = true;
     }
     if (dictionary.hasKey(KeyFilterRvError)) {
-        _rvError = dictionary.value<glm::vec2>(KeyFilterRvError);
+        _rvError = dictionary.value<glm::dvec2>(KeyFilterRvError);
         _filterRvError = true;
     }
 }
@@ -548,11 +548,6 @@ documentation::Documentation ConstructOctreeTask::Documentation() {
         "ConstructOctreeTask",
         "gaiamission_constructoctreefrombin",
         {
-            {
-                "Type",
-                new StringEqualVerifier("ConstructOctreeTask"),
-                Optional::No
-            },
             {
                 KeyInFileOrFolderPath,
                 new StringVerifier,
diff --git a/modules/gaia/tasks/constructoctreetask.h b/modules/gaia/tasks/constructoctreetask.h
index 824521e340..e4be13457d 100644
--- a/modules/gaia/tasks/constructoctreetask.h
+++ b/modules/gaia/tasks/constructoctreetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/tasks/readfilejob.cpp b/modules/gaia/tasks/readfilejob.cpp
index ac15d85d87..12e0ea1b08 100644
--- a/modules/gaia/tasks/readfilejob.cpp
+++ b/modules/gaia/tasks/readfilejob.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -39,11 +39,11 @@ ReadFileJob::ReadFileJob(std::string filePath, std::vector<std::string> allColum
                          int firstRow, int lastRow, size_t nDefaultCols,
                          int nValuesPerStar, std::shared_ptr<FitsFileReader> fitsReader)
     : _inFilePath(std::move(filePath))
-    , _allColumns(std::move(allColumns))
     , _firstRow(firstRow)
     , _lastRow(lastRow)
     , _nDefaultCols(nDefaultCols)
     , _nValuesPerStar(nValuesPerStar)
+    , _allColumns(std::move(allColumns))
     , _fitsFileReader(std::move(fitsReader))
     , _octants(8)
 {}
@@ -203,9 +203,15 @@ void ReadFileJob::execute() {
             float radVelZ = 1000.f * radial_vel[i] * rGal.z;
 
             // Use Pythagoras theorem for the final Space Velocity [m/s].
-            values[idx++] = sqrt(pow(radVelX, 2) + pow(tanVelX, 2)); // Vel X [U]
-            values[idx++] = sqrt(pow(radVelY, 2) + pow(tanVelY, 2)); // Vel Y [V]
-            values[idx++] = sqrt(pow(radVelZ, 2) + pow(tanVelZ, 2)); // Vel Z [W]
+            values[idx++] = static_cast<float>(
+                std::sqrt(std::pow(radVelX, 2) + std::pow(tanVelX, 2)) // Vel X [U]
+            );
+            values[idx++] = static_cast<float>(
+                std::sqrt(std::pow(radVelY, 2) + std::pow(tanVelY, 2)) // Vel Y [V]
+            );
+            values[idx++] = static_cast<float>(
+                std::sqrt(std::pow(radVelZ, 2) + std::pow(tanVelZ, 2)) // Vel Z [W]
+            );
         }
         // Otherwise use the vector [m/s] we got from proper motion.
         else {
diff --git a/modules/gaia/tasks/readfilejob.h b/modules/gaia/tasks/readfilejob.h
index 13f3cfc38b..49089ad139 100644
--- a/modules/gaia/tasks/readfilejob.h
+++ b/modules/gaia/tasks/readfilejob.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/tasks/readfitstask.cpp b/modules/gaia/tasks/readfitstask.cpp
index 5cbe1cf384..5139ab6366 100644
--- a/modules/gaia/tasks/readfitstask.cpp
+++ b/modules/gaia/tasks/readfitstask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -89,8 +89,8 @@ ReadFitsTask::ReadFitsTask(const ghoul::Dictionary& dictionary) {
 
         // Ugly fix for ASCII sorting when there are more columns read than 10.
         std::set<int> intKeys;
-        for (const std::string& key : d.keys()) {
-            intKeys.insert(std::stoi(key));
+        for (std::string_view key : d.keys()) {
+            intKeys.insert(std::stoi(std::string(key)));
         }
 
         for (int key : intKeys) {
@@ -327,11 +327,6 @@ documentation::Documentation ReadFitsTask::Documentation() {
         "ReadFitsFile",
         "gaiamission_fitsfiletorawdata",
         {
-            {
-                "Type",
-                new StringEqualVerifier("ReadFitsTask"),
-                Optional::No
-            },
             {
                 KeyInFileOrFolderPath,
                 new StringVerifier,
diff --git a/modules/gaia/tasks/readfitstask.h b/modules/gaia/tasks/readfitstask.h
index ba3981fa0b..ee965cc71c 100644
--- a/modules/gaia/tasks/readfitstask.h
+++ b/modules/gaia/tasks/readfitstask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/gaia/tasks/readspecktask.cpp b/modules/gaia/tasks/readspecktask.cpp
index d30d39d058..8db543c2de 100644
--- a/modules/gaia/tasks/readspecktask.cpp
+++ b/modules/gaia/tasks/readspecktask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -98,11 +98,6 @@ documentation::Documentation ReadSpeckTask::Documentation() {
         "ReadSpeckTask",
         "gaiamission_speckfiletorawdata",
         {
-            {
-                "Type",
-                new StringEqualVerifier("ReadSpeckTask"),
-                Optional::No
-            },
             {
                 KeyInFilePath,
                 new StringVerifier,
diff --git a/modules/gaia/tasks/readspecktask.h b/modules/gaia/tasks/readspecktask.h
index e9c6517dfb..f42b07a81f 100644
--- a/modules/gaia/tasks/readspecktask.h
+++ b/modules/gaia/tasks/readspecktask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/CMakeLists.txt b/modules/galaxy/CMakeLists.txt
index 065f3971bc..434b320ca2 100644
--- a/modules/galaxy/CMakeLists.txt
+++ b/modules/galaxy/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,33 +25,35 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/galaxymodule.h  
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/galaxyraycaster.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegalaxy.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywayconversiontask.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywaypointsconversiontask.h
+  galaxymodule.h  
+  rendering/galaxyraycaster.h
+  rendering/renderablegalaxy.h
+  tasks/milkywayconversiontask.h
+  tasks/milkywaypointsconversiontask.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/galaxymodule.cpp  
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/galaxyraycaster.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablegalaxy.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywayconversiontask.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/milkywaypointsconversiontask.cpp
+  galaxymodule.cpp  
+  rendering/galaxyraycaster.cpp
+  rendering/renderablegalaxy.cpp
+  tasks/milkywayconversiontask.cpp
+  tasks/milkywaypointsconversiontask.cpp
 )
+
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/galaxyraycast.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/billboard_ge.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/points_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/raycasterbounds_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/raycasterbounds_vs.glsl
+  shaders/galaxyraycast.glsl
+  shaders/billboard_vs.glsl
+  shaders/billboard_fs.glsl
+  shaders/billboard_ge.glsl
+  shaders/points_fs.glsl
+  shaders/points_vs.glsl
+  shaders/raycasterbounds_fs.glsl
+  shaders/raycasterbounds_vs.glsl
 )
+
 source_group("Shader Files" FILES ${SHADER_FILES})
 
 create_new_module(
diff --git a/modules/galaxy/galaxymodule.cpp b/modules/galaxy/galaxymodule.cpp
index 504c807102..45dd335106 100644
--- a/modules/galaxy/galaxymodule.cpp
+++ b/modules/galaxy/galaxymodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/galaxymodule.h b/modules/galaxy/galaxymodule.h
index bc72bcf948..f5433281ce 100644
--- a/modules/galaxy/galaxymodule.h
+++ b/modules/galaxy/galaxymodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/include.cmake b/modules/galaxy/include.cmake
index 586a4f7717..ffea0ac430 100644
--- a/modules/galaxy/include.cmake
+++ b/modules/galaxy/include.cmake
@@ -1,6 +1 @@
 set(DEFAULT_MODULE ON)
-
-set (OPENSPACE_DEPENDENCIES
-  volume
-  space
-)
\ No newline at end of file
diff --git a/modules/galaxy/rendering/galaxyraycaster.cpp b/modules/galaxy/rendering/galaxyraycaster.cpp
index 3faa00b483..0f11505f9d 100644
--- a/modules/galaxy/rendering/galaxyraycaster.cpp
+++ b/modules/galaxy/rendering/galaxyraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -100,7 +100,6 @@ glm::dmat4 GalaxyRaycaster::modelViewTransform(const RenderData& data) {
 void GalaxyRaycaster::preRaycast(const RaycastData& data,
                                  ghoul::opengl::ProgramObject& program)
 {
-    const std::string colorUniformName = "color" + std::to_string(data.id);
     const std::string stepSizeUniformName = "maxStepSize" + std::to_string(data.id);
     const std::string galaxyTextureUniformName = "galaxyTexture" +
                                                  std::to_string(data.id);
diff --git a/modules/galaxy/rendering/galaxyraycaster.h b/modules/galaxy/rendering/galaxyraycaster.h
index cb8cf6de12..42ff62d82f 100644
--- a/modules/galaxy/rendering/galaxyraycaster.h
+++ b/modules/galaxy/rendering/galaxyraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp
index 34cf343446..5964eff426 100644
--- a/modules/galaxy/rendering/renderablegalaxy.cpp
+++ b/modules/galaxy/rendering/renderablegalaxy.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -52,12 +52,6 @@
 namespace {
     constexpr int8_t CurrentCacheVersion = 1;
 
-    constexpr const char* GlslRaycastPath =
-        "${MODULE_GALAXY}/shaders/galaxyraycast.glsl";
-    constexpr const char* GlslBoundsVsPath =
-        "${MODULE_GALAXY}/shaders/raycasterbounds_vs.glsl";
-    constexpr const char* GlslBoundsFsPath =
-        "${MODULE_GALAXY}/shaders/raycasterbounds_fs.glsl";
     constexpr const char* _loggerCat = "Renderable Galaxy";
 
     constexpr const std::array<const char*, 4> UniformNamesPoints = {
@@ -157,13 +151,13 @@ namespace {
         );
         fileStream.write(reinterpret_cast<const char*>(&nPoints), sizeof(int64_t));
         fileStream.write(reinterpret_cast<const char*>(&pointsRatio), sizeof(float));
-        uint64_t nPositions = static_cast<uint64_t>(positions.size());
+        uint64_t nPositions = positions.size();
         fileStream.write(reinterpret_cast<const char*>(&nPositions), sizeof(uint64_t));
         fileStream.write(
             reinterpret_cast<const char*>(positions.data()),
             positions.size() * sizeof(glm::vec3)
         );
-        uint64_t nColors = static_cast<uint64_t>(colors.size());
+        uint64_t nColors = colors.size();
         fileStream.write(reinterpret_cast<const char*>(&nColors), sizeof(uint64_t));
         fileStream.write(
             reinterpret_cast<const char*>(colors.data()),
@@ -197,61 +191,38 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
     , _downScaleVolumeRendering(DownscaleVolumeRenderingInfo, 1.f, 0.1f, 1.f)
     , _numberOfRayCastingSteps(NumberOfRayCastingStepsInfo, 1000.f, 1.f, 1000.f)
 {
-    dictionary.getValue("VolumeRenderingEnabled", _volumeRenderingEnabled);
-    dictionary.getValue("StarRenderingEnabled", _starRenderingEnabled);
-    {
-        double stepSize;
-        dictionary.getValue("StepSize", stepSize);
-        _stepSize = static_cast<float>(stepSize);
+    if (dictionary.hasKey("VolumeRenderingEnabled")) {
+        _volumeRenderingEnabled = dictionary.value<bool>("VolumeRenderingEnabled");
     }
-    {
-        double absorptionMultiply = _absorptionMultiply;
-        dictionary.getValue("AbsorptionMultiply", absorptionMultiply);
-        _absorptionMultiply = static_cast<float>(absorptionMultiply);
-    }
-    {
-        double emissionMultiply = _emissionMultiply;
-        dictionary.getValue("EmissionMultiply", emissionMultiply);
-        _emissionMultiply = static_cast<float>(emissionMultiply);
-    }
-    dictionary.getValue("StarRenderingMethod", _starRenderingMethod);
-    {
-        double enabledPointsRatio = _enabledPointsRatio;
-        dictionary.getValue("EnabledPointsRatio", enabledPointsRatio);
-        _enabledPointsRatio = static_cast<float>(enabledPointsRatio);
-    }
-    {
-        glm::dvec3 translation = glm::vec3(_translation);
-        dictionary.getValue("Translation", translation);
-        _translation = glm::vec3(translation);
-    }
-    {
-        glm::dvec3 rotation = glm::vec3(_rotation);
-        dictionary.getValue("Rotation", rotation);
-        _rotation = glm::vec3(rotation);
+    if (dictionary.hasKey("StarRenderingEnabled")) {
+        _starRenderingEnabled = dictionary.value<bool>("StarRenderingEnabled");
     }
 
-    if (dictionary.hasKeyAndValue<bool>(VolumeRenderingEnabledInfo.identifier)) {
+    if (dictionary.hasKey("StarRenderingMethod")) {
+        _starRenderingMethod = dictionary.value<int>("StarRenderingMethod");
+    }
+
+    if (dictionary.hasValue<bool>(VolumeRenderingEnabledInfo.identifier)) {
         _volumeRenderingEnabled = dictionary.value<bool>(
             VolumeRenderingEnabledInfo.identifier
         );
     }
 
-    if (dictionary.hasKeyAndValue<bool>(StarRenderingEnabledInfo.identifier)) {
+    if (dictionary.hasValue<bool>(StarRenderingEnabledInfo.identifier)) {
         _starRenderingEnabled = static_cast<bool>(StarRenderingEnabledInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<double>(StepSizeInfo.identifier)) {
+    if (dictionary.hasValue<double>(StepSizeInfo.identifier)) {
         _stepSize = static_cast<float>(dictionary.value<double>(StepSizeInfo.identifier));
     }
 
-    if (dictionary.hasKeyAndValue<double>(AbsorptionMultiplyInfo.identifier)) {
+    if (dictionary.hasValue<double>(AbsorptionMultiplyInfo.identifier)) {
         _absorptionMultiply = static_cast<float>(
             dictionary.value<double>(AbsorptionMultiplyInfo.identifier)
         );
     }
 
-    if (dictionary.hasKeyAndValue<double>(EmissionMultiplyInfo.identifier)) {
+    if (dictionary.hasValue<double>(EmissionMultiplyInfo.identifier)) {
         _emissionMultiply = static_cast<float>(
             dictionary.value<double>(EmissionMultiplyInfo.identifier)
         );
@@ -273,37 +244,36 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
         }
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(TranslationInfo.identifier)) {
-        _translation = dictionary.value<glm::vec3>(TranslationInfo.identifier);
+    if (dictionary.hasValue<glm::dvec3>(TranslationInfo.identifier)) {
+        _translation = dictionary.value<glm::dvec3>(TranslationInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(RotationInfo.identifier)) {
-        _rotation = dictionary.value<glm::vec3>(RotationInfo.identifier);
+    if (dictionary.hasValue<glm::dvec3>(RotationInfo.identifier)) {
+        _rotation = dictionary.value<glm::dvec3>(RotationInfo.identifier);
     }
 
-    if (!dictionary.hasKeyAndValue<ghoul::Dictionary>("Volume")) {
+    if (!dictionary.hasValue<ghoul::Dictionary>("Volume")) {
         LERROR("No volume dictionary specified.");
     }
 
     ghoul::Dictionary volumeDictionary = dictionary.value<ghoul::Dictionary>("Volume");
 
-    std::string volumeFilename;
-    if (volumeDictionary.getValue("Filename", volumeFilename)) {
-        _volumeFilename = absPath(volumeFilename);
+    if (volumeDictionary.hasValue<std::string>("Filename")) {
+        _volumeFilename = absPath(volumeDictionary.value<std::string>("Filename"));
     }
     else {
-        LERROR("No volume filename specified.");
+        LERROR("No volume filename specified");
     }
-    glm::vec3 volumeDimensions = glm::vec3(0.f);
-    if (volumeDictionary.getValue("Dimensions", volumeDimensions)) {
-        _volumeDimensions = static_cast<glm::ivec3>(volumeDimensions);
+
+    if (volumeDictionary.hasValue<glm::dvec3>("Dimensions")) {
+        _volumeDimensions = volumeDictionary.value<glm::dvec3>("Dimensions");
     }
     else {
-        LERROR("No volume dimensions specified.");
+        LERROR("No volume dimensions specifieds");
     }
-    glm::vec3 volumeSize = glm::vec3(0.f);
-    if (volumeDictionary.getValue("Size", volumeSize)) {
-        _volumeSize = volumeSize;
+
+    if (volumeDictionary.hasValue<glm::dvec3>("Size")) {
+        _volumeSize = volumeDictionary.value<glm::dvec3>("Size");
     }
     else {
         LERROR("No volume dimensions specified.");
@@ -320,32 +290,32 @@ RenderableGalaxy::RenderableGalaxy(const ghoul::Dictionary& dictionary)
 
     _downScaleVolumeRendering.setVisibility(properties::Property::Visibility::Developer);
     if (volumeDictionary.hasKey(DownscaleVolumeRenderingInfo.identifier)) {
-        _downScaleVolumeRendering =
-            volumeDictionary.value<float>(DownscaleVolumeRenderingInfo.identifier);
+        _downScaleVolumeRendering = static_cast<float>(
+            volumeDictionary.value<double>(DownscaleVolumeRenderingInfo.identifier)
+        );
     }
 
-    if (!dictionary.hasKeyAndValue<ghoul::Dictionary>("Points")) {
+    if (!dictionary.hasValue<ghoul::Dictionary>("Points")) {
         LERROR("No points dictionary specified.");
     }
 
     ghoul::Dictionary pointsDictionary = dictionary.value<ghoul::Dictionary>("Points");
-    std::string pointsFilename;
-    if (pointsDictionary.getValue("Filename", pointsFilename)) {
-        _pointsFilename = absPath(pointsFilename);
+    if (pointsDictionary.hasValue<std::string>("Filename")) {
+        _pointsFilename = absPath(pointsDictionary.value<std::string>("Filename"));
     }
     else {
         LERROR("No points filename specified.");
     }
 
-    if (pointsDictionary.hasKeyAndValue<double>(EnabledPointsRatioInfo.identifier)) {
+    if (pointsDictionary.hasValue<double>(EnabledPointsRatioInfo.identifier)) {
         _enabledPointsRatio = static_cast<float>(
             pointsDictionary.value<double>(EnabledPointsRatioInfo.identifier)
         );
     }
 
-    std::string pointSpreadFunctionTexturePath;
-    if (pointsDictionary.getValue("Texture", pointSpreadFunctionTexturePath)) {
-        _pointSpreadFunctionTexturePath = absPath(pointSpreadFunctionTexturePath);
+    if (pointsDictionary.hasValue<std::string>("Texture")) {
+        _pointSpreadFunctionTexturePath =
+            absPath(pointsDictionary.value<std::string>("Texture"));
         _pointSpreadFunctionFile = std::make_unique<ghoul::filesystem::File>(
             _pointSpreadFunctionTexturePath
         );
@@ -685,7 +655,7 @@ void RenderableGalaxy::renderPoints(const RenderData& data) {
     glm::dmat4 modelMatrix =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) * rotMatrix *
-        glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)));
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
 
     glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
 
@@ -725,24 +695,7 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
         return;
     }
 
-    // Saving current OpenGL state
-    GLenum blendEquationRGB;
-    GLenum blendEquationAlpha;
-    GLenum blendDestAlpha;
-    GLenum blendDestRGB;
-    GLenum blendSrcAlpha;
-    GLenum blendSrcRGB;
-    GLboolean depthMask;
-
-    glGetIntegerv(GL_BLEND_EQUATION_RGB, &blendEquationRGB);
-    glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &blendEquationAlpha);
-    glGetIntegerv(GL_BLEND_DST_ALPHA, &blendDestAlpha);
-    glGetIntegerv(GL_BLEND_DST_RGB, &blendDestRGB);
-    glGetIntegerv(GL_BLEND_SRC_ALPHA, &blendSrcAlpha);
-    glGetIntegerv(GL_BLEND_SRC_RGB, &blendSrcRGB);
-
-    glGetBooleanv(GL_DEPTH_WRITEMASK, &depthMask);
-
+    // Change OpenGL Blending and Depth states
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     glDepthMask(false);
     glDisable(GL_DEPTH_TEST);
@@ -760,7 +713,7 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
     glm::dmat4 modelMatrix =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) * rotMatrix *
-        glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)));
+        glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
 
     glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
 
@@ -794,14 +747,9 @@ void RenderableGalaxy::renderBillboards(const RenderData& data) {
 
     _billboardsProgram->deactivate();
 
-    glEnable(GL_DEPTH_TEST);
-    glDepthMask(true);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-    // Restores OpenGL blending state
-    glBlendEquationSeparate(blendEquationRGB, blendEquationAlpha);
-    glBlendFuncSeparate(blendSrcRGB, blendDestRGB, blendSrcAlpha, blendDestAlpha);
-    glDepthMask(depthMask);
+    // Restores OpenGL Rendering State
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
 }
 
 float RenderableGalaxy::safeLength(const glm::vec3& vector) const {
diff --git a/modules/galaxy/rendering/renderablegalaxy.h b/modules/galaxy/rendering/renderablegalaxy.h
index f89090c5d0..889f2953a2 100644
--- a/modules/galaxy/rendering/renderablegalaxy.h
+++ b/modules/galaxy/rendering/renderablegalaxy.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/shaders/billboard_fs.glsl b/modules/galaxy/shaders/billboard_fs.glsl
index 8d6bb8086d..69931514a8 100644
--- a/modules/galaxy/shaders/billboard_fs.glsl
+++ b/modules/galaxy/shaders/billboard_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/shaders/billboard_ge.glsl b/modules/galaxy/shaders/billboard_ge.glsl
index f6d1514312..0cd652d36f 100644
--- a/modules/galaxy/shaders/billboard_ge.glsl
+++ b/modules/galaxy/shaders/billboard_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/shaders/billboard_vs.glsl b/modules/galaxy/shaders/billboard_vs.glsl
index ee5fff53fb..36e1cb8f56 100644
--- a/modules/galaxy/shaders/billboard_vs.glsl
+++ b/modules/galaxy/shaders/billboard_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,7 +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/points_fs.glsl b/modules/galaxy/shaders/points_fs.glsl
index 702046e45a..025834723f 100644
--- a/modules/galaxy/shaders/points_fs.glsl
+++ b/modules/galaxy/shaders/points_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/shaders/points_vs.glsl b/modules/galaxy/shaders/points_vs.glsl
index c8be748996..9b7612e4c5 100644
--- a/modules/galaxy/shaders/points_vs.glsl
+++ b/modules/galaxy/shaders/points_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,18 +41,18 @@ uniform dvec3 eyePosition;
 const double PARSEC = 3.08567756E16;
 
 void main() {
-	  vs_position = vec4(in_position, 1.0);
-		dvec4 dpos = dvec4(vs_position);
+	vs_position = vec4(in_position, 1.0);
+	dvec4 dpos = dvec4(vs_position);
 
-		double distanceToStar = length((dpos.xyz - eyePosition));
-		vs_starBrightness = clamp(float(8000*PARSEC/distanceToStar), 0.0, 1.0);
+	double distanceToStar = length((dpos.xyz - eyePosition));
+	vs_starBrightness = clamp(float(8000*PARSEC/distanceToStar), 0.0, 1.0);
 
-		dpos.xyz *= 8.0;
-		dpos = modelMatrix * dpos;
-		dpos /= PARSEC;
+	dpos.xyz *= 8.0;
+	dpos = modelMatrix * dpos;
+	dpos /= PARSEC;
 
-		vec4 positionScreenSpace = z_normalization(vec4(cameraViewProjectionMatrix * dpos));
-		vs_color = in_color;
-		vs_screenSpaceDepth = positionScreenSpace.w;
-		gl_Position = positionScreenSpace;
+	vec4 positionScreenSpace = z_normalization(vec4(cameraViewProjectionMatrix * 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 2ff99f2c5a..50013a0642 100644
--- a/modules/galaxy/shaders/raycasterbounds_fs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/shaders/raycasterbounds_vs.glsl b/modules/galaxy/shaders/raycasterbounds_vs.glsl
index 5e1ddaed80..acd3fb47b2 100644
--- a/modules/galaxy/shaders/raycasterbounds_vs.glsl
+++ b/modules/galaxy/shaders/raycasterbounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/tasks/milkywayconversiontask.cpp b/modules/galaxy/tasks/milkywayconversiontask.cpp
index ec985ad917..49a6de9aef 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywayconversiontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -49,12 +49,24 @@ MilkywayConversionTask::MilkywayConversionTask(const ghoul::Dictionary& dictiona
     : _inFirstIndex(0)
     , _inNSlices(0)
 {
-    dictionary.getValue(KeyInFilenamePrefix, _inFilenamePrefix);
-    dictionary.getValue(KeyInFilenameSuffix, _inFilenameSuffix);
-    dictionary.getValue(KeyInFirstIndex, _inFirstIndex);
-    dictionary.getValue(KeyInNSlices, _inNSlices);
-    dictionary.getValue(KeyOutFilename, _outFilename);
-    dictionary.getValue(KeyOutDimensions, _outDimensions);
+    if (dictionary.hasKey(KeyInFilenamePrefix)) {
+        _inFilenamePrefix = dictionary.value<std::string>(KeyInFilenamePrefix);
+    }
+    if (dictionary.hasKey(KeyInFilenameSuffix)) {
+        _inFilenameSuffix = dictionary.value<std::string>(KeyInFilenameSuffix);
+    }
+    if (dictionary.hasKey(KeyInFirstIndex)) {
+        _inFirstIndex = static_cast<size_t>(dictionary.value<int>(KeyInFirstIndex));
+    }
+    if (dictionary.hasKey(KeyInNSlices)) {
+        _inNSlices = static_cast<size_t>(dictionary.value<int>(KeyInNSlices));
+    }
+    if (dictionary.hasKey(KeyOutFilename)) {
+        _outFilename = dictionary.value<std::string>(KeyOutFilename);
+    }
+    if (dictionary.hasKey(KeyOutDimensions)) {
+        _outDimensions = dictionary.value<glm::ivec3>(KeyOutDimensions);
+    }
 }
 
 std::string MilkywayConversionTask::description() {
diff --git a/modules/galaxy/tasks/milkywayconversiontask.h b/modules/galaxy/tasks/milkywayconversiontask.h
index 47ff0707aa..f00d2e0b62 100644
--- a/modules/galaxy/tasks/milkywayconversiontask.h
+++ b/modules/galaxy/tasks/milkywayconversiontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
index a79de9153e..756bb369df 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/galaxy/tasks/milkywaypointsconversiontask.h b/modules/galaxy/tasks/milkywaypointsconversiontask.h
index e2a1be4a4f..0f9f774b31 100644
--- a/modules/galaxy/tasks/milkywaypointsconversiontask.h
+++ b/modules/galaxy/tasks/milkywaypointsconversiontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/CMakeLists.txt b/modules/globebrowsing/CMakeLists.txt
index a609917a01..ccf3df87ce 100644
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,86 +25,85 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/asynctiledataprovider.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/basictypes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/dashboarditemglobelocation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ellipsoid.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/gdalwrapper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/geodeticpatch.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/globelabelscomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/globetranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/gpulayergroup.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layeradjustment.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroup.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroupid.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layermanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layerrendersettings.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/lrucache.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/lrucache.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/lruthreadpool.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/lruthreadpool.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryawaretilecache.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/prioritizingconcurrentjobmanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/prioritizingconcurrentjobmanager.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtile.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtiledatareader.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/renderableglobe.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ringscomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/shadowcomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/skirtedgrid.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tileindex.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tileloadjob.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tileprovider.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tiletextureinitdata.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/timequantizer.h
+  globebrowsingmodule.h
+  src/asynctiledataprovider.h
+  src/basictypes.h
+  src/dashboarditemglobelocation.h
+  src/ellipsoid.h
+  src/gdalwrapper.h
+  src/geodeticpatch.h
+  src/globelabelscomponent.h
+  src/globetranslation.h
+  src/gpulayergroup.h
+  src/layer.h
+  src/layeradjustment.h
+  src/layergroup.h
+  src/layergroupid.h
+  src/layermanager.h
+  src/layerrendersettings.h
+  src/lrucache.h
+  src/lrucache.inl
+  src/lruthreadpool.h
+  src/lruthreadpool.inl
+  src/memoryawaretilecache.h
+  src/prioritizingconcurrentjobmanager.h
+  src/prioritizingconcurrentjobmanager.inl
+  src/rawtile.h
+  src/rawtiledatareader.h
+  src/renderableglobe.h
+  src/ringscomponent.h
+  src/shadowcomponent.h
+  src/skirtedgrid.h
+  src/tileindex.h
+  src/tileloadjob.h
+  src/tileprovider.h
+  src/tiletextureinitdata.h
+  src/timequantizer.h
 )
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/globebrowsingmodule_lua.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/asynctiledataprovider.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/dashboarditemglobelocation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ellipsoid.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/gdalwrapper.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/geodeticpatch.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/globelabelscomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/globetranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/gpulayergroup.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layeradjustment.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layergroup.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layermanager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/layerrendersettings.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/memoryawaretilecache.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtile.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/rawtiledatareader.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/renderableglobe.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/ringscomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/shadowcomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/skirtedgrid.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tileindex.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tileloadjob.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tileprovider.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tiletextureinitdata.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/timequantizer.cpp
+  globebrowsingmodule.cpp
+  globebrowsingmodule_lua.inl
+  src/asynctiledataprovider.cpp
+  src/dashboarditemglobelocation.cpp
+  src/ellipsoid.cpp
+  src/gdalwrapper.cpp
+  src/geodeticpatch.cpp
+  src/globelabelscomponent.cpp
+  src/globetranslation.cpp
+  src/gpulayergroup.cpp
+  src/layer.cpp
+  src/layeradjustment.cpp
+  src/layergroup.cpp
+  src/layermanager.cpp
+  src/layerrendersettings.cpp
+  src/memoryawaretilecache.cpp
+  src/rawtiledatareader.cpp
+  src/renderableglobe.cpp
+  src/ringscomponent.cpp
+  src/shadowcomponent.cpp
+  src/skirtedgrid.cpp
+  src/tileindex.cpp
+  src/tileloadjob.cpp
+  src/tileprovider.cpp
+  src/tiletextureinitdata.cpp
+  src/timequantizer.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/blending.hglsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/globalrenderer_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/localrenderer_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderer_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_geom_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_geom_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/texturetilemapping.hglsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tile.hglsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tileheight.hglsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/tilevertexskirt.hglsl
+  shaders/blending.hglsl
+  shaders/globalrenderer_vs.glsl
+  shaders/localrenderer_vs.glsl
+  shaders/renderer_fs.glsl
+  shaders/rings_vs.glsl
+  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
 )
 
 source_group("Shader Files" FILES ${SHADER_FILES})
@@ -119,28 +118,13 @@ create_new_module(
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/gdal_data DESTINATION modules/globebrowsing)
 
 if (WIN32)
-  target_include_directories(
-    openspace-module-globebrowsing
-    SYSTEM PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include
-  )
-
-  target_link_libraries(
-    openspace-module-globebrowsing
-    PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib
-  )
+  target_include_directories(openspace-module-globebrowsing SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/include)
+  target_link_libraries(openspace-module-globebrowsing PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal_i.lib)
   register_external_libraries("${CMAKE_CURRENT_SOURCE_DIR}/ext/gdal/lib/gdal241.dll")
 else (WIN32)
   find_package(GDAL REQUIRED)
 
-  target_include_directories(
-    openspace-module-globebrowsing
-    SYSTEM PUBLIC
-    ${GDAL_INCLUDE_DIR}
-  )
-
+  target_include_directories(openspace-module-globebrowsing SYSTEM PRIVATE ${GDAL_INCLUDE_DIR})
   target_link_libraries(openspace-module-globebrowsing PRIVATE ${GDAL_LIBRARY})
-
   mark_as_advanced(GDAL_CONFIG GDAL_INCLUDE_DIR GDAL_LIBRARY)
 endif () # WIN32
diff --git a/modules/globebrowsing/globebrowsingmodule.cpp b/modules/globebrowsing/globebrowsingmodule.cpp
index e7e36ddaa1..bdfdd16a6f 100644
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,9 +35,10 @@
 #include <modules/globebrowsing/src/layermanager.h>
 #include <modules/globebrowsing/src/memoryawaretilecache.h>
 #include <modules/globebrowsing/src/tileprovider.h>
+#include <openspace/documentation/verifier.h>
+#include <openspace/engine/globalscallbacks.h>
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/interaction/orbitalnavigator.h>
-#include <openspace/engine/globalscallbacks.h>
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/util/factorymanager.h>
 #include <ghoul/filesystem/filesystem.h>
@@ -66,8 +67,8 @@
 #include "globebrowsingmodule_lua.inl"
 
 namespace {
-    constexpr const char* _loggerCat = "GlobeBrowsingModule";
-    constexpr const char* _factoryName = "TileProvider";
+    constexpr const char _loggerCat[] = "GlobeBrowsingModule";
+    constexpr const char _factoryName[] = "TileProvider";
 
     constexpr const openspace::properties::Property::PropertyInfo WMSCacheEnabledInfo = {
         "WMSCacheEnabled",
@@ -121,12 +122,13 @@ namespace {
         Layer currentLayer;
         for (int i = 0; i < nSubdatasets; ++i) {
             int iDataset = -1;
-            static char IdentifierBuffer[64];
+            std::array<char, 256> IdentifierBuffer;
+            std::fill(IdentifierBuffer.begin(), IdentifierBuffer.end(), '\0');
             sscanf(
                 subDatasets[i],
-                "SUBDATASET_%i_%[^=]",
+                "SUBDATASET_%i_%256[^=]",
                 &iDataset,
-                IdentifierBuffer
+                IdentifierBuffer.data()
             );
 
 
@@ -137,7 +139,7 @@ namespace {
                 currentLayerNumber = iDataset;
             }
 
-            const std::string identifier = std::string(IdentifierBuffer);
+            const std::string identifier = std::string(IdentifierBuffer.data());
             const std::string ds(subDatasets[i]);
             const std::string value = ds.substr(ds.find_first_of('=') + 1);
 
@@ -157,6 +159,29 @@ namespace {
 
         return result;
     }
+
+    struct [[codegen::Dictionary(GlobeBrowsingModule)]] Parameters {
+        // [[codegen::verbatim(WMSCacheEnabledInfo.description)]]
+        std::optional<bool> cacheEnabled [[codegen::key("WMSCacheEnabled")]];
+
+        // [[codegen::verbatim(OfflineModeInfo.description)]]
+        std::optional<bool> offlineMode;
+
+        // [[codegen::verbatim(WMSCacheLocationInfo.description)]]
+        std::optional<std::string> cacheLocation [[codegen::key("WMSCacheLocation")]];
+
+        // [[codegen::verbatim(WMSCacheSizeInfo.description)]]
+        std::optional<int> wmsCacheSize [[codegen::key("WMSCacheSize")]];
+
+        // [[codegen::verbatim(TileCacheSizeInfo.description)]]
+        std::optional<int> tileCacheSize;
+
+        // If you know what you are doing and you have WMS caching *disabled* but offline
+        // mode *enabled*, you can set this value to 'true' to silence a warning that you
+        // would otherwise get at startup
+        std::optional<bool> noWarning;
+    };
+#include "globebrowsingmodule_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -179,30 +204,13 @@ GlobeBrowsingModule::GlobeBrowsingModule()
 void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
     using namespace globebrowsing;
 
-    if (dict.hasKeyAndValue<bool>(WMSCacheEnabledInfo.identifier)) {
-        _wmsCacheEnabled = dict.value<bool>(WMSCacheEnabledInfo.identifier);
-    }
-    if (dict.hasKeyAndValue<bool>(OfflineModeInfo.identifier)) {
-        _offlineMode = dict.value<bool>(OfflineModeInfo.identifier);
-    }
-    if (dict.hasKeyAndValue<std::string>(WMSCacheLocationInfo.identifier)) {
-        _wmsCacheLocation = dict.value<std::string>(WMSCacheLocationInfo.identifier);
-    }
-    if (dict.hasKeyAndValue<double>(WMSCacheSizeInfo.identifier)) {
-        _wmsCacheSizeMB = static_cast<int>(
-            dict.value<double>(WMSCacheSizeInfo.identifier)
-        );
-    }
-    if (dict.hasKeyAndValue<double>(TileCacheSizeInfo.identifier)) {
-        _tileCacheSizeMB = static_cast<int>(
-            dict.value<double>(TileCacheSizeInfo.identifier)
-        );
-    }
-
-    // Sanity check
-    const bool noWarning = dict.hasKeyAndValue<bool>("NoWarning") ?
-        dict.value<bool>("NoWarning") :
-        false;
+    const Parameters p = codegen::bake<Parameters>(dict);
+    _wmsCacheEnabled = p.cacheEnabled.value_or(_wmsCacheEnabled);
+    _offlineMode = p.offlineMode.value_or(_offlineMode);
+    _wmsCacheLocation = p.cacheLocation.value_or(_wmsCacheLocation);
+    _wmsCacheSizeMB = p.wmsCacheSize.value_or(_wmsCacheSizeMB);
+    _tileCacheSizeMB = p.tileCacheSize.value_or(_tileCacheSizeMB);
+    const bool noWarning = p.noWarning.value_or(false);
 
     if (!_wmsCacheEnabled && _offlineMode && !noWarning) {
         LWARNINGC(
@@ -216,7 +224,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
 
 
     // Initialize
-    global::callback::initializeGL.emplace_back([&]() {
+    global::callback::initializeGL->emplace_back([&]() {
         ZoneScopedN("GlobeBrowsingModule")
 
         _tileCache = std::make_unique<cache::MemoryAwareTileCache>(_tileCacheSizeMB);
@@ -232,7 +240,7 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
         addPropertySubOwner(GdalWrapper::ref());
     });
 
-    global::callback::deinitializeGL.emplace_back([]() {
+    global::callback::deinitializeGL->emplace_back([]() {
         ZoneScopedN("GlobeBrowsingModule")
 
         tileprovider::deinitializeDefaultTile();
@@ -240,14 +248,14 @@ void GlobeBrowsingModule::internalInitialize(const ghoul::Dictionary& dict) {
 
 
     // Render
-    global::callback::render.emplace_back([&]() {
+    global::callback::render->emplace_back([&]() {
         ZoneScopedN("GlobeBrowsingModule")
 
         _tileCache->update();
     });
 
     // Deinitialize
-    global::callback::deinitialize.emplace_back([&]() {
+    global::callback::deinitialize->emplace_back([&]() {
         ZoneScopedN("GlobeBrowsingModule")
 
         GdalWrapper::destroy();
@@ -452,7 +460,13 @@ std::vector<documentation::Documentation> GlobeBrowsingModule::documentations()
 void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
                                     int x, int y, int level)
 {
-    goToChunk(globe, globebrowsing::TileIndex(x, y, level), glm::vec2(0.5f, 0.5f), true);
+    ghoul_assert(level < std::numeric_limits<uint8_t>::max(), "Level way too big");
+    goToChunk(
+        globe,
+        globebrowsing::TileIndex(x, y, static_cast<uint8_t>(level)),
+        glm::vec2(0.5f, 0.5f),
+        true
+    );
 }
 
 void GlobeBrowsingModule::goToGeo(const globebrowsing::RenderableGlobe& globe,
@@ -528,10 +542,6 @@ void GlobeBrowsingModule::goToChunk(const globebrowsing::RenderableGlobe& globe,
         cameraPositionModelSpace
     );
 
-    const Geodetic2 geo2 = globe.ellipsoid().cartesianToGeodetic2(
-        posHandle.centerToReferenceSurface
-    );
-
     const double altitude = glm::length(
         cameraPositionModelSpace - posHandle.centerToReferenceSurface
     );
@@ -595,9 +605,6 @@ glm::dquat GlobeBrowsingModule::lookDownCameraRotation(
 {
     using namespace globebrowsing;
 
-    // Camera is described in world space
-    const glm::dmat4 modelTransform = globe.modelTransform();
-
     // Lookup vector
     const glm::dvec3 positionModelSpace = globe.ellipsoid().cartesianSurfacePosition(
         geo2
diff --git a/modules/globebrowsing/globebrowsingmodule.h b/modules/globebrowsing/globebrowsingmodule.h
index cf3612ca66..e40c06bdc5 100644
--- a/modules/globebrowsing/globebrowsingmodule.h
+++ b/modules/globebrowsing/globebrowsingmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/globebrowsingmodule_lua.inl b/modules/globebrowsing/globebrowsingmodule_lua.inl
index 8bd0fb47a3..4ed196188c 100644
--- a/modules/globebrowsing/globebrowsingmodule_lua.inl
+++ b/modules/globebrowsing/globebrowsingmodule_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/include.cmake b/modules/globebrowsing/include.cmake
index 7f45a2d151..5667e647fb 100644
--- a/modules/globebrowsing/include.cmake
+++ b/modules/globebrowsing/include.cmake
@@ -1,6 +1,5 @@
-set (DEFAULT_MODULE ON)
-
 set (OPENSPACE_DEPENDENCIES
   debugging
-  space
-)
\ No newline at end of file
+)
+
+set (DEFAULT_MODULE ON)
diff --git a/modules/globebrowsing/scripts/layer_support.lua b/modules/globebrowsing/scripts/layer_support.lua
index 28b2447d00..9771fd8b3f 100644
--- a/modules/globebrowsing/scripts/layer_support.lua
+++ b/modules/globebrowsing/scripts/layer_support.lua
@@ -205,11 +205,22 @@ openspace.globebrowsing.parseInfoFile = function (file)
     HeightFile = nil
 
     local dir = openspace.directoryForPath(file)
-    dofile(file)
+    file_func, error = loadfile(file)
+    if file_func then
+        file_func()
+    else
+        openspace.printError('Error loading file "' .. file .. '": '.. error)
+        return nil, nil, nil, nil
+    end
 
     local name = Name or Identifier
     local identifier = Identifier or Name
 
+    if name == nil and identifier == nil then
+        openspace.printError('Error loading file "' .. file .. '": No "Name" or "Identifier" found')
+        return nil, nil, nil, nil
+    end
+
     local color = nil
     if ColorFile then
         color = {
diff --git a/modules/globebrowsing/shaders/blending.hglsl b/modules/globebrowsing/shaders/blending.hglsl
index 166ec948d1..aff6b667d9 100644
--- a/modules/globebrowsing/shaders/blending.hglsl
+++ b/modules/globebrowsing/shaders/blending.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/globalrenderer_vs.glsl b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
index a72d20dc96..7f1755f19d 100644
--- a/modules/globebrowsing/shaders/globalrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/globalrenderer_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/localrenderer_vs.glsl b/modules/globebrowsing/shaders/localrenderer_vs.glsl
index 22a8930f8d..5c1439139d 100644
--- a/modules/globebrowsing/shaders/localrenderer_vs.glsl
+++ b/modules/globebrowsing/shaders/localrenderer_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/renderer_fs.glsl b/modules/globebrowsing/shaders/renderer_fs.glsl
index 463ab78042..09d291cc93 100644
--- a/modules/globebrowsing/shaders/renderer_fs.glsl
+++ b/modules/globebrowsing/shaders/renderer_fs.glsl
@@ -1,26 +1,26 @@
 /*****************************************************************************************
- *                                                                                       *
- * OpenSpace                                                                             *
- *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
- *                                                                                       *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
- * software and associated documentation files (the "Software"), to deal in the Software *
- * without restriction, including without limitation the rights to use, copy, modify,    *
- * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
- * permit persons to whom the Software is furnished to do so, subject to the following   *
- * conditions:                                                                           *
- *                                                                                       *
- * The above copyright notice and this permission notice shall be included in all copies *
- * or substantial portions of the Software.                                              *
- *                                                                                       *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
- * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
- * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
- ****************************************************************************************/
+    *                                                                                       *
+    * 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 "fragment.glsl"
 
@@ -71,13 +71,13 @@ uniform float zFightingPercentage;
 
 #if USE_ECLIPSE_SHADOWS
 
-/*******************************************************************************
- ***** ALL CALCULATIONS FOR ECLIPSE ARE IN METERS AND IN WORLD SPACE SYSTEM ****
- *******************************************************************************/
-// JCC: Remove and use dictionary to 
-// decides the number of shadows
-const uint numberOfShadows = 1;
 
+#define NSEclipseShadowsMinusOne #{nEclipseShadows}
+#define NSEclipseShadows (NSEclipseShadowsMinusOne + 1)
+
+/*******************************************************************************
+    ***** ALL CALCULATIONS FOR ECLIPSE ARE IN METERS AND IN WORLD SPACE SYSTEM ****
+    *******************************************************************************/
 struct ShadowRenderingStruct {
     double xu, xp;
     double rs, rc;
@@ -89,51 +89,54 @@ struct ShadowRenderingStruct {
 // Eclipse shadow data
 // JCC: Remove and use dictionary to
 // decides the number of shadows
-uniform ShadowRenderingStruct shadowDataArray[numberOfShadows];
+uniform ShadowRenderingStruct shadowDataArray[NSEclipseShadows];
 uniform int shadows;
 uniform bool hardShadows;
 
-vec4 calcShadow(const ShadowRenderingStruct shadowInfoArray[numberOfShadows],
+vec4 calcShadow(const ShadowRenderingStruct shadowInfoArray[NSEclipseShadows],
                 const dvec3 position, const 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;
+    #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 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);
+            float length_d = float(length(d));
+            double length_pc_proj = length(pc_proj);
 
-        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
+            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 USE_ECLIPSE_HARD_SHADOWS
-                return vec4(0.5, 0.5, 0.5, 1.0);
-#else
+            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
+    #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
diff --git a/modules/globebrowsing/shaders/rings_fs.glsl b/modules/globebrowsing/shaders/rings_fs.glsl
index 04cf03d2cc..d3fb2bc9e4 100644
--- a/modules/globebrowsing/shaders/rings_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -78,7 +78,7 @@ Fragment getFragment() {
 
     // shadow == 1.0 means it is not in shadow
     float shadow = 1.0;
-    if ( shadowCoords.z >= 0 ) {
+    if (shadowCoords.z >= 0) {
         vec4 normalizedShadowCoords = shadowCoords;
         normalizedShadowCoords.z    = normalizeFloat(zFightingPercentage * normalizedShadowCoords.w);
         normalizedShadowCoords.xy   = normalizedShadowCoords.xy / normalizedShadowCoords.w;
diff --git a/modules/globebrowsing/shaders/rings_geom_fs.glsl b/modules/globebrowsing/shaders/rings_geom_fs.glsl
index 48b1174baa..6d2126b842 100644
--- a/modules/globebrowsing/shaders/rings_geom_fs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/rings_geom_vs.glsl b/modules/globebrowsing/shaders/rings_geom_vs.glsl
index 63f7eda7a8..7698109c5b 100644
--- a/modules/globebrowsing/shaders/rings_geom_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_geom_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/rings_vs.glsl b/modules/globebrowsing/shaders/rings_vs.glsl
index 64b7b474dd..8b43a60571 100644
--- a/modules/globebrowsing/shaders/rings_vs.glsl
+++ b/modules/globebrowsing/shaders/rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/smviewer_fs.glsl b/modules/globebrowsing/shaders/smviewer_fs.glsl
index 62719a89a5..56d518a85e 100644
--- a/modules/globebrowsing/shaders/smviewer_fs.glsl
+++ b/modules/globebrowsing/shaders/smviewer_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/smviewer_vs.glsl b/modules/globebrowsing/shaders/smviewer_vs.glsl
index c5bb033b36..208ce361c4 100644
--- a/modules/globebrowsing/shaders/smviewer_vs.glsl
+++ b/modules/globebrowsing/shaders/smviewer_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/texturetilemapping.hglsl b/modules/globebrowsing/shaders/texturetilemapping.hglsl
index b6bcf749fd..5cf2214291 100644
--- a/modules/globebrowsing/shaders/texturetilemapping.hglsl
+++ b/modules/globebrowsing/shaders/texturetilemapping.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/tile.hglsl b/modules/globebrowsing/shaders/tile.hglsl
index 25db3772e8..d074581c8c 100644
--- a/modules/globebrowsing/shaders/tile.hglsl
+++ b/modules/globebrowsing/shaders/tile.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/tileheight.hglsl b/modules/globebrowsing/shaders/tileheight.hglsl
index ef08825538..47865f9bb5 100644
--- a/modules/globebrowsing/shaders/tileheight.hglsl
+++ b/modules/globebrowsing/shaders/tileheight.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/shaders/tilevertexskirt.hglsl b/modules/globebrowsing/shaders/tilevertexskirt.hglsl
index 3545797091..37bcce883c 100644
--- a/modules/globebrowsing/shaders/tilevertexskirt.hglsl
+++ b/modules/globebrowsing/shaders/tilevertexskirt.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/asynctiledataprovider.cpp b/modules/globebrowsing/src/asynctiledataprovider.cpp
index 98f0e35161..dd6f54a39f 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.cpp
+++ b/modules/globebrowsing/src/asynctiledataprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,7 +24,6 @@
 
 #include <modules/globebrowsing/src/asynctiledataprovider.h>
 
-#include <modules/globebrowsing/globebrowsingmodule.h>
 #include <modules/globebrowsing/src/memoryawaretilecache.h>
 #include <modules/globebrowsing/src/rawtiledatareader.h>
 #include <modules/globebrowsing/src/tileloadjob.h>
@@ -48,7 +47,6 @@ AsyncTileDataProvider::AsyncTileDataProvider(std::string name,
 {
     ZoneScoped
 
-    _globeBrowsingModule = global::moduleEngine->module<GlobeBrowsingModule>();
     performReset(ResetRawTileDataReader::No);
 }
 
diff --git a/modules/globebrowsing/src/asynctiledataprovider.h b/modules/globebrowsing/src/asynctiledataprovider.h
index 00d8230749..79ff1da66b 100644
--- a/modules/globebrowsing/src/asynctiledataprovider.h
+++ b/modules/globebrowsing/src/asynctiledataprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,8 +33,6 @@
 #include <optional>
 #include <set>
 
-namespace openspace { class GlobeBrowsingModule; }
-
 namespace openspace::globebrowsing {
 
 struct RawTile;
@@ -103,7 +101,6 @@ protected:
 
 private:
     const std::string _name;
-    GlobeBrowsingModule* _globeBrowsingModule;
     /// The reader used for asynchronous reading
     std::unique_ptr<RawTileDataReader> _rawTileDataReader;
 
diff --git a/modules/globebrowsing/src/basictypes.h b/modules/globebrowsing/src/basictypes.h
index 049ce3d8ed..b509837fc2 100644
--- a/modules/globebrowsing/src/basictypes.h
+++ b/modules/globebrowsing/src/basictypes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -89,8 +89,8 @@ enum Quad {
 
 
 struct TileDepthTransform {
-    float scale;
-    float offset;
+    float scale = 1.f;
+    float offset = 0.f;
 };
 
 
@@ -104,7 +104,7 @@ struct TileMetaData {
     std::array<float, 4> maxValues;
     std::array<float, 4> minValues;
     std::array<bool, 4> hasMissingData;
-    uint8_t nValues;
+    uint8_t nValues = 0;
 };
 
 
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.cpp b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
index cd19cfb440..8c53564982 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.cpp
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -72,11 +72,6 @@ documentation::Documentation DashboardItemGlobeLocation::Documentation() {
         "DashboardItem Globe Location",
         "globebrowsing_dashboarditem_globelocation",
         {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemGlobeLocation"),
-                Optional::No
-            },
             {
                 FontNameInfo.identifier,
                 new StringVerifier,
@@ -199,7 +194,7 @@ void DashboardItemGlobeLocation::render(glm::vec2& penPosition) {
 
     std::pair<double, std::string> dist = simplifyDistance(altitude);
 
-    std::fill(_buffer.begin(), _buffer.end(), 0);
+    std::fill(_buffer.begin(), _buffer.end(), char(0));
     char* end = fmt::format_to(
         _buffer.data(),
         _formatString.c_str(),
diff --git a/modules/globebrowsing/src/dashboarditemglobelocation.h b/modules/globebrowsing/src/dashboarditemglobelocation.h
index 47f8cafce3..13400ead72 100644
--- a/modules/globebrowsing/src/dashboarditemglobelocation.h
+++ b/modules/globebrowsing/src/dashboarditemglobelocation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/ellipsoid.cpp b/modules/globebrowsing/src/ellipsoid.cpp
index 8045bfb63a..a7ff2508a5 100644
--- a/modules/globebrowsing/src/ellipsoid.cpp
+++ b/modules/globebrowsing/src/ellipsoid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/ellipsoid.h b/modules/globebrowsing/src/ellipsoid.h
index 44376ceda0..06ef119547 100644
--- a/modules/globebrowsing/src/ellipsoid.h
+++ b/modules/globebrowsing/src/ellipsoid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/gdalwrapper.cpp b/modules/globebrowsing/src/gdalwrapper.cpp
index 054f3786fe..0e845581da 100644
--- a/modules/globebrowsing/src/gdalwrapper.cpp
+++ b/modules/globebrowsing/src/gdalwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -84,14 +84,6 @@ GdalWrapper& GdalWrapper::ref() {
     return *_singleton;
 }
 
-int64_t GDALCacheUsed() {
-    return GDALGetCacheUsed64();
-}
-
-int64_t GDALMaximumCacheSize() {
-    return GDALGetCacheMax64();
-}
-
 bool GdalWrapper::logGdalErrors() const {
     return _logGdalErrors;
 }
diff --git a/modules/globebrowsing/src/gdalwrapper.h b/modules/globebrowsing/src/gdalwrapper.h
index afbbe2d211..db589bba7c 100644
--- a/modules/globebrowsing/src/gdalwrapper.h
+++ b/modules/globebrowsing/src/gdalwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -51,18 +51,6 @@ public:
 
     static GdalWrapper& ref();
 
-    /**
-     * Get the current size of the GDAL in memory cache.
-     * \returns the number of bytes currently in the GDAL memory cache.
-     */
-    static int64_t GDALCacheUsed();
-
-    /**
-     * Get the maximum GDAL in memory cache size.
-     * \returns the maximum number of bytes allowed for the GDAL cache.
-     */
-    static int64_t GDALMaximumCacheSize();
-
     bool logGdalErrors() const;
 
 private:
diff --git a/modules/globebrowsing/src/geodeticpatch.cpp b/modules/globebrowsing/src/geodeticpatch.cpp
index 5dc5725426..41d5372bca 100644
--- a/modules/globebrowsing/src/geodeticpatch.cpp
+++ b/modules/globebrowsing/src/geodeticpatch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/geodeticpatch.h b/modules/globebrowsing/src/geodeticpatch.h
index 7ade7987ac..b8614f936f 100644
--- a/modules/globebrowsing/src/geodeticpatch.h
+++ b/modules/globebrowsing/src/geodeticpatch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/globelabelscomponent.cpp b/modules/globebrowsing/src/globelabelscomponent.cpp
index 2eb2e0f97e..7632011bbd 100644
--- a/modules/globebrowsing/src/globelabelscomponent.cpp
+++ b/modules/globebrowsing/src/globelabelscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -50,7 +50,7 @@ namespace {
 
     constexpr const char* KeyLabelsFileName = "FileName";
 
-    constexpr const double LabelFadeRangeConst = 1500.0;
+    constexpr const double LabelFadeOutLimitAltitudeMeters = 25000.0;
     constexpr const double RangeAngularCoefConst = 0.8;
     constexpr const float MinOpacityValueConst = 0.009f;
 
@@ -334,14 +334,14 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
     _globe = globe;
 
     // Reads labels' file and build cache file if necessary
-    if (dictionary.empty()) {
+    if (dictionary.isEmpty()) {
         return;
     }
-    std::string labelsFile;
-    bool successLabels = dictionary.getValue(KeyLabelsFileName, labelsFile);
-    if (!successLabels) {
+    if (!dictionary.hasValue<std::string>(KeyLabelsFileName)) {
         return;
     }
+
+    std::string labelsFile = dictionary.value<std::string>(KeyLabelsFileName);
     bool loadSuccess = loadLabelsData(absPath(labelsFile));
     if (!loadSuccess) {
         return;
@@ -357,7 +357,9 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
     }
 
     if (dictionary.hasKey(LabelsFontSizeInfo.identifier)) {
-        _labelsFontSize = dictionary.value<float>(LabelsFontSizeInfo.identifier);
+        _labelsFontSize = static_cast<float>(
+            dictionary.value<double>(LabelsFontSizeInfo.identifier)
+        );
         _labelsFontSize.onChange([this]() { initializeFonts(); });
     }
 
@@ -368,15 +370,19 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
     }
 
     if (dictionary.hasKey(LabelsMinHeightInfo.identifier)) {
-        _labelsMinHeight = dictionary.value<float>(LabelsMinHeightInfo.identifier);
+        _labelsMinHeight = static_cast<float>(
+            dictionary.value<double>(LabelsMinHeightInfo.identifier)
+        );
     }
 
     if (dictionary.hasKey(LabelsColorInfo.identifier)) {
-        _labelsColor = dictionary.value<glm::vec3>(LabelsColorInfo.identifier);
+        _labelsColor = dictionary.value<glm::dvec3>(LabelsColorInfo.identifier);
     }
 
     if (dictionary.hasKey(LabelsOpacityInfo.identifier)) {
-        _labelsOpacity = dictionary.value<float>(LabelsOpacityInfo.identifier);
+        _labelsOpacity = static_cast<float>(
+            dictionary.value<double>(LabelsOpacityInfo.identifier)
+        );
     }
 
     if (dictionary.hasKey(LabelsFadeInEnabledInfo.identifier)) {
@@ -384,8 +390,8 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
     }
 
     if (dictionary.hasKey(LabelsFadeInStartingDistanceInfo.identifier)) {
-        _labelsFadeInDist = dictionary.value<float>(
-            LabelsFadeInStartingDistanceInfo.identifier
+        _labelsFadeInDist = static_cast<float>(
+            dictionary.value<double>(LabelsFadeInStartingDistanceInfo.identifier)
         );
     }
 
@@ -396,20 +402,20 @@ void GlobeLabelsComponent::initialize(const ghoul::Dictionary& dictionary,
     }
 
     if (dictionary.hasKey(LabelsFadeOutStartingDistanceInfo.identifier)) {
-        _labelsFadeOutDist = dictionary.value<float>(
-            LabelsFadeOutStartingDistanceInfo.identifier
+        _labelsFadeOutDist = static_cast<float>(
+            dictionary.value<double>(LabelsFadeOutStartingDistanceInfo.identifier)
         );
     }
 
     if (dictionary.hasKey(LabelsMinSizeInfo.identifier)) {
         _labelsMinSize = static_cast<int>(
-            dictionary.value<float>(LabelsMinSizeInfo.identifier)
+            dictionary.value<double>(LabelsMinSizeInfo.identifier)
         );
     }
 
     if (dictionary.hasKey(LabelsMaxSizeInfo.identifier)) {
         _labelsMaxSize = static_cast<int>(
-            dictionary.value<float>(LabelsMaxSizeInfo.identifier)
+            dictionary.value<double>(LabelsMaxSizeInfo.identifier)
         );
     }
 
@@ -524,9 +530,7 @@ bool GlobeLabelsComponent::readLabelsFile(const std::string& file) {
             strncpy(lEntry.feature, token.c_str(), 256);
             int tokenChar = 0;
             while (tokenChar < 256) {
-                if ((lEntry.feature[tokenChar] < 0 || lEntry.feature[tokenChar] > 127) &&
-                    lEntry.feature[tokenChar] != '\0')
-                {
+                if (lEntry.feature[tokenChar] < 0 && lEntry.feature[tokenChar] != '\0') {
                     lEntry.feature[tokenChar] = '*';
                 }
                 else if (lEntry.feature[tokenChar] == '\"') {
@@ -670,10 +674,10 @@ void GlobeLabelsComponent::draw(const RenderData& data) {
 
     if (_labelsFadeOutEnabled) {
         glm::dvec2 fadeRange = glm::dvec2(
-            averageRadius + _labelsMinHeight + LabelFadeRangeConst
+            averageRadius + _labelsMinHeight + LabelFadeOutLimitAltitudeMeters
         );
         fadeRange.x += _labelsFadeOutDist;
-        double a = RangeAngularCoefConst / (fadeRange.x - fadeRange.y);
+        double a = 1.0 / (fadeRange.x - fadeRange.y);
         double b = -(fadeRange.y / (fadeRange.x - fadeRange.y));
         double funcValue = a * distanceCameraGlobeWorld + b;
         varyingOpacity *= static_cast<float>(std::min(funcValue, 1.0));
@@ -692,12 +696,10 @@ void GlobeLabelsComponent::renderLabels(const RenderData& data,
                                         float fadeInVariable
 ) {
     glm::vec4 textColor = glm::vec4(
-        glm::vec3(_labelsColor), 
+        glm::vec3(_labelsColor),
         _labelsOpacity * fadeInVariable
     );
 
-    glm::dvec4 cameraUpVecWorld = glm::dvec4(data.camera.lookUpVectorWorldSpace(), 0.0);
-
     glm::dmat4 VP = glm::dmat4(data.camera.sgctInternal.projectionMatrix()) *
                     data.camera.combinedViewMatrix();
 
diff --git a/modules/globebrowsing/src/globelabelscomponent.h b/modules/globebrowsing/src/globelabelscomponent.h
index 1bded12791..9c7bc4eb6f 100644
--- a/modules/globebrowsing/src/globelabelscomponent.h
+++ b/modules/globebrowsing/src/globelabelscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/globetranslation.cpp b/modules/globebrowsing/src/globetranslation.cpp
index 8317d7c65a..633198ba48 100644
--- a/modules/globebrowsing/src/globetranslation.cpp
+++ b/modules/globebrowsing/src/globetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -85,11 +85,6 @@ documentation::Documentation GlobeTranslation::Documentation() {
         "Globe Translation",
         "space_translation_globetranslation",
         {
-            {
-                "Type",
-                new StringEqualVerifier("GlobeTranslation"),
-                Optional::No
-            },
             {
                 GlobeInfo.identifier,
                 new StringAnnotationVerifier(
diff --git a/modules/globebrowsing/src/globetranslation.h b/modules/globebrowsing/src/globetranslation.h
index 9d5c130537..8ad737c994 100644
--- a/modules/globebrowsing/src/globetranslation.h
+++ b/modules/globebrowsing/src/globetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/gpulayergroup.cpp b/modules/globebrowsing/src/gpulayergroup.cpp
index 512727089d..7511d5ef90 100644
--- a/modules/globebrowsing/src/gpulayergroup.cpp
+++ b/modules/globebrowsing/src/gpulayergroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/gpulayergroup.h b/modules/globebrowsing/src/gpulayergroup.h
index 796cbb46fb..6b5c8676c8 100644
--- a/modules/globebrowsing/src/gpulayergroup.h
+++ b/modules/globebrowsing/src/gpulayergroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/layer.cpp b/modules/globebrowsing/src/layer.cpp
index cb84f810ed..51a3ebc990 100644
--- a/modules/globebrowsing/src/layer.cpp
+++ b/modules/globebrowsing/src/layer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -42,15 +42,7 @@ namespace {
     constexpr const char* KeyName = "Name";
     constexpr const char* KeyDesc = "Description";
     constexpr const char* KeyLayerGroupID = "LayerGroupID";
-    constexpr const char* KeySettings = "Settings";
     constexpr const char* KeyAdjustment = "Adjustment";
-    constexpr const char* KeyPadTiles = "PadTiles";
-
-    constexpr const char* KeyOpacity = "Opacity";
-    constexpr const char* KeyGamma = "Gamma";
-    constexpr const char* KeyMultiplier = "Multiplier";
-    constexpr const char* KeyOffset = "Offset";
-
 
     constexpr openspace::properties::Property::PropertyInfo TypeInfo = {
         "Type",
@@ -102,114 +94,94 @@ namespace {
         "example: Earth is a special place",
         openspace::properties::Property::Visibility::Hidden
     };
+
+    struct [[codegen::Dictionary(Layer), codegen::noexhaustive()]] Parameters {
+        // The unique identifier for this layer. May not contain '.' or spaces
+        std::string identifier;
+
+        // A human-readable name for the user interface. If this is omitted, the
+        // identifier is used instead
+        std::optional<std::string> name;
+
+        // A human-readable description of the layer to be used in informational texts
+        // presented to the user
+        std::optional<std::string> description;
+
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color;
+
+        // Specifies the type of layer that is to be added. If this value is not
+        // specified, the layer is a DefaultTileLayer
+        std::optional<std::string> type [[codegen::inlist("DefaultTileLayer",
+            "SingleImageTileLayer", "SizeReferenceTileLayer", "TemporalTileLayer",
+            "TileIndexTileLayer", "ByIndexTileLayer", "ByLevelTileLayer", "SolidColor")]];
+
+        // Determine whether the layer is enabled or not. If this value is not specified,
+        // the layer is disabled
+        std::optional<bool> enabled;
+
+        // Determines whether the downloaded tiles should have a padding added to the
+        // borders
+        std::optional<bool> padTiles;
+
+        struct Settings {
+            // The opacity value of the layer
+            std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
+
+            // The gamma value that is applied to each pixel of the layer
+            std::optional<float> gamma;
+
+            // The multiplicative factor that is applied to each pixel of the layer
+            std::optional<float> multiplier;
+
+            // An additive offset that is applied to each pixel of the layer
+            std::optional<float> offset;
+        };
+        // Specifies the render settings that should be applied to this layer
+        std::optional<Settings> settings;
+
+        struct LayerAdjustment {
+            enum class Type {
+                None,
+                ChromaKey,
+                TransferFunction
+            };
+
+            // Specifies the type of the adjustment that is applied
+            std::optional<Type> type;
+
+            // Specifies the chroma key used when selecting 'ChromaKey' for the 'Type'
+            std::optional<glm::dvec3> chromaKeyColor;
+
+            // Specifies the tolerance to match the color to the chroma key when the
+            // 'ChromaKey' type is selected for the 'Type'
+            std::optional<double> chromaKeyTolerance;
+        };
+        // Parameters that set individual adjustment parameters for this layer
+        std::optional<LayerAdjustment> adjustment;
+
+        enum class BlendMode {
+            Normal,
+            Multiply,
+            Add,
+            Subtract,
+            Color
+        };
+        // Sets the blend mode of this layer to determine how it interacts with other
+        // layers on top of this
+        std::optional<BlendMode> blendMode;
+
+        // If the primary layer creation fails, this layer is used as a fallback
+        std::optional<std::monostate>
+            fallback [[codegen::reference("globebrowsing_layer")]];
+    };
+#include "layer_codegen.cpp"
 } // namespace
 
 documentation::Documentation Layer::Documentation() {
-    using namespace documentation;
-    return {
-        "Layer",
-        "globebrowsing_layer",
-        {
-            {
-                KeyIdentifier,
-                new StringVerifier,
-                Optional::No,
-                "The unique identifier for this layer. May not contain '.' or spaces."
-            },
-            {
-                KeyName,
-                new StringVerifier,
-                Optional::Yes,
-                "A human-readable name for the user interface. If this is omitted, the "
-                "identifier is used instead."
-            },
-            {
-                KeyDesc,
-                new StringVerifier,
-                Optional::Yes,
-                "A human-readable description of the layer to be used in informational "
-                "texts presented to the user."
-            },
-            {
-                "Type",
-                new StringInListVerifier({
-                    "DefaultTileLayer", "SingleImageTileLayer", "SizeReferenceTileLayer",
-                    "TemporalTileLayer", "TileIndexTileLayer", "ByIndexTileLayer",
-                    "ByLevelTileLayer", "SolidColor"
-                }),
-                Optional::Yes,
-                "Specifies the type of layer that is to be added. If this value is not "
-                "specified, the layer is a DefaultTileLayer."
-            },
-            {
-                EnabledInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                "Determine whether the layer is enabled or not. If this value is not "
-                "specified, the layer is disabled."
-            },
-            {
-                KeyPadTiles,
-                new BoolVerifier,
-                Optional::Yes,
-                "Determines whether the downloaded tiles should have a padding added to "
-                "the borders."
-            },
-            {
-                KeySettings,
-                new TableVerifier({
-                    {
-                        KeyOpacity,
-                        new DoubleInRangeVerifier(0.0, 1.0),
-                        Optional::Yes,
-                        "The opacity value of the layer."
-                    },
-                    {
-                        KeyGamma,
-                        new DoubleVerifier,
-                        Optional::Yes,
-                        "The gamma value that is applied to each pixel of the layer."
-                    },
-                    {
-                        KeyMultiplier,
-                        new DoubleVerifier,
-                        Optional::Yes,
-                        "The multiplicative factor that is applied to each pixel of the "
-                        "layer."
-                    },
-                    {
-                        KeyOffset,
-                        new DoubleVerifier,
-                        Optional::Yes,
-                        "An additive offset that is applied to each pixel of the layer."
-                    }
-                }),
-                Optional::Yes,
-                "Specifies the render settings that should be applied to this layer."
-            },
-            {
-                KeyAdjustment,
-                new ReferencingVerifier("globebrowsing_layeradjustment"),
-                Optional::Yes,
-                ""
-            },
-            {
-                BlendModeInfo.identifier,
-                new StringInListVerifier({
-                    "Normal", "Multiply", "Add", "Subtract", "Color"
-                }),
-                Optional::Yes,
-                "Sets the blend mode of this layer to determine how it interacts with "
-                "other layers on top of this."
-            },
-            {
-                "Fallback",
-                new ReferencingVerifier("globebrowsing_layer"),
-                Optional::Yes,
-                "If the primary layer creation fails, this layer is used as a fallback"
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "globebrowsing_layer";
+    return doc;
 }
 
 Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
@@ -225,64 +197,47 @@ Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
     , _enabled(EnabledInfo, false)
     , _reset(ResetInfo)
     , _remove(RemoveInfo)
+    , _guiDescription(GuiDescriptionInfo)
     , _solidColor(ColorInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(1.f))
     , _layerGroupId(id)
-    , _guiDescription(GuiDescriptionInfo)
 
 {
-    documentation::testSpecificationAndThrow(Documentation(), layerDict, "Layer");
+    const Parameters p = codegen::bake<Parameters>(layerDict);
 
     layergroupid::TypeID typeID;
-    if (layerDict.hasKeyAndValue<std::string>("Type")) {
-        const std::string& typeString = layerDict.value<std::string>("Type");
-        typeID = ghoul::from_string<layergroupid::TypeID>(typeString);
+    if (p.type.has_value()) {
+        typeID = ghoul::from_string<layergroupid::TypeID>(*p.type);
+        if (typeID == layergroupid::TypeID::Unknown) {
+            throw ghoul::RuntimeError("Unknown layer type!");
+        }
     }
     else {
         typeID = layergroupid::TypeID::DefaultTileLayer;
     }
-    if (typeID == layergroupid::TypeID::Unknown) {
-        throw ghoul::RuntimeError("Unknown layer type!");
-    }
 
     initializeBasedOnType(typeID, layerDict);
 
-    if (layerDict.hasKeyAndValue<bool>(EnabledInfo.identifier)) {
-        _enabled = layerDict.value<bool>(EnabledInfo.identifier);
-    }
+    _enabled = p.enabled.value_or(_enabled);
 
-    if (layerDict.hasKey(KeyDesc)) {
+    if (p.description.has_value()) {
         _guiDescription = description();
         addProperty(_guiDescription);
     }
 
-    bool padTiles = true;
-    if (layerDict.hasKeyAndValue<bool>(KeyPadTiles)) {
-        padTiles = layerDict.value<bool>(KeyPadTiles);
-    }
+    const bool padTiles = p.padTiles.value_or(true);
 
     TileTextureInitData initData = tileTextureInitData(_layerGroupId, padTiles);
     _padTilePixelStartOffset = initData.tilePixelStartOffset;
     _padTilePixelSizeDifference = initData.tilePixelSizeDifference;
 
-    if (layerDict.hasKeyAndValue<ghoul::Dictionary>(KeySettings)) {
-        ghoul::Dictionary dict = layerDict.value<ghoul::Dictionary>(KeySettings);
-        if (dict.hasKeyAndValue<float>(KeyOpacity)) {
-            _renderSettings.opacity = dict.value<float>(KeyOpacity);
-        }
-
-        if (dict.hasKeyAndValue<float>(KeyGamma)) {
-            _renderSettings.gamma = dict.value<float>(KeyGamma);
-        }
-
-        if (dict.hasKeyAndValue<float>(KeyMultiplier)) {
-            _renderSettings.multiplier = dict.value<float>(KeyMultiplier);
-        }
-
-        if (dict.hasKeyAndValue<float>(KeyOffset)) {
-            _renderSettings.offset = dict.value<float>(KeyOffset);
-        }
+    if (p.settings.has_value()) {
+        _renderSettings.opacity = p.settings->opacity.value_or(_renderSettings.opacity);
+        _renderSettings.gamma = p.settings->gamma.value_or(_renderSettings.gamma);
+        _renderSettings.multiplier =
+            p.settings->multiplier.value_or(_renderSettings.multiplier);
+        _renderSettings.offset = p.settings->offset.value_or(_renderSettings.offset);
     }
-    if (layerDict.hasKeyAndValue<ghoul::Dictionary>(KeyAdjustment)) {
+    if (layerDict.hasValue<ghoul::Dictionary>(KeyAdjustment)) {
         _layerAdjustment.setValuesFromDictionary(
             layerDict.value<ghoul::Dictionary>(KeyAdjustment)
         );
@@ -300,11 +255,24 @@ Layer::Layer(layergroupid::GroupID id, const ghoul::Dictionary& layerDict,
     }
 
     // Initialize blend mode
-    if (layerDict.hasKeyAndValue<std::string>(BlendModeInfo.identifier)) {
-        using namespace layergroupid;
-        std::string blendMode = layerDict.value<std::string>(BlendModeInfo.identifier);
-        BlendModeID blendModeID = ghoul::from_string<BlendModeID>(blendMode);
-        _blendModeOption = static_cast<int>(blendModeID);
+    if (p.blendMode.has_value()) {
+        switch (*p.blendMode) {
+            case Parameters::BlendMode::Normal:
+                _blendModeOption = static_cast<int>(layergroupid::BlendModeID::Normal);
+                break;
+            case Parameters::BlendMode::Multiply:
+                _blendModeOption = static_cast<int>(layergroupid::BlendModeID::Multiply);
+                break;
+            case Parameters::BlendMode::Add:
+                _blendModeOption = static_cast<int>(layergroupid::BlendModeID::Add);
+                break;
+            case Parameters::BlendMode::Subtract:
+                _blendModeOption = static_cast<int>(layergroupid::BlendModeID::Subtract);
+                break;
+            case Parameters::BlendMode::Color:
+                _blendModeOption = static_cast<int>(layergroupid::BlendModeID::Color);
+                break;
+        }
     }
     else {
         _blendModeOption = static_cast<int>(layergroupid::BlendModeID::Normal);
@@ -412,9 +380,9 @@ ChunkTilePile Layer::chunkTilePile(const TileIndex& tileIndex, int pileSize) con
         ChunkTilePile chunkTilePile;
         std::fill(chunkTilePile.begin(), chunkTilePile.end(), std::nullopt);
         for (int i = 0; i < pileSize; ++i) {
-            chunkTilePile[i] = ChunkTile {
-                Tile(), TileUvTransform { { 0, 0 }, { 1, 1 } }
-            };
+            ChunkTile tile;
+            tile.uvTransform = TileUvTransform{ { 0, 0 }, { 1, 1 } };
+            chunkTilePile[i] = tile;
         }
         return chunkTilePile;
     }
@@ -512,19 +480,17 @@ void Layer::initializeBasedOnType(layergroupid::TypeID id, ghoul::Dictionary ini
         case layergroupid::TypeID::ByLevelTileLayer: {
             // We add the id to the dictionary since it needs to be known by
             // the tile provider
-            initDict.setValue(KeyLayerGroupID, _layerGroupId);
-            if (initDict.hasKeyAndValue<std::string>(KeyName)) {
+            initDict.setValue(KeyLayerGroupID, static_cast<int>(_layerGroupId));
+            if (initDict.hasKey(KeyName) && initDict.hasValue<std::string>(KeyName)) {
                 std::string name = initDict.value<std::string>(KeyName);
                 LDEBUG("Initializing tile provider for layer: '" + name + "'");
             }
-            _tileProvider = std::unique_ptr<tileprovider::TileProvider>(
-                tileprovider::createFromDictionary(id, std::move(initDict))
-            );
+            _tileProvider = tileprovider::createFromDictionary(id, std::move(initDict));
             break;
         }
         case layergroupid::TypeID::SolidColor: {
-            if (initDict.hasKeyAndValue<glm::vec3>(ColorInfo.identifier)) {
-                _solidColor = initDict.value<glm::vec3>(ColorInfo.identifier);
+            if (initDict.hasValue<glm::dvec3>(ColorInfo.identifier)) {
+                _solidColor = initDict.value<glm::dvec3>(ColorInfo.identifier);
             }
             break;
         }
diff --git a/modules/globebrowsing/src/layer.h b/modules/globebrowsing/src/layer.h
index ec78efb292..d0f6402270 100644
--- a/modules/globebrowsing/src/layer.h
+++ b/modules/globebrowsing/src/layer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/layeradjustment.cpp b/modules/globebrowsing/src/layeradjustment.cpp
index 2497b4ac2c..b459122329 100644
--- a/modules/globebrowsing/src/layeradjustment.cpp
+++ b/modules/globebrowsing/src/layeradjustment.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -127,20 +127,23 @@ void LayerAdjustment::setValuesFromDictionary(const ghoul::Dictionary& adjustmen
         "LayerAdjustment"
     );
 
-    if (adjustmentDict.hasKeyAndValue<std::string>(KeyType)) {
+    if (adjustmentDict.hasValue<std::string>(KeyType)) {
         std::string dictType = adjustmentDict.value<std::string>(KeyType);
         _typeOption = static_cast<int>(
             ghoul::from_string<layergroupid::AdjustmentTypeID>(dictType)
         );
     }
 
-    if (adjustmentDict.hasKeyAndValue<glm::vec3>(KeyChromaKeyColor)) {
-        glm::vec3 dictChromaKeyColor = adjustmentDict.value<glm::vec3>(KeyChromaKeyColor);
+    if (adjustmentDict.hasValue<glm::dvec3>(KeyChromaKeyColor)) {
+        glm::vec3 dictChromaKeyColor =
+            adjustmentDict.value<glm::dvec3>(KeyChromaKeyColor);
         _chromaKeyColor = std::move(dictChromaKeyColor);
     }
 
-    if (adjustmentDict.hasKeyAndValue<float>(KeyChromaKeyTolerance)) {
-        float dictChromaKeyTolerance = adjustmentDict.value<float>(KeyChromaKeyTolerance);
+    if (adjustmentDict.hasValue<double>(KeyChromaKeyTolerance)) {
+        float dictChromaKeyTolerance = static_cast<float>(
+            adjustmentDict.value<double>(KeyChromaKeyTolerance)
+        );
         _chromaKeyTolerance = dictChromaKeyTolerance;
     }
 }
diff --git a/modules/globebrowsing/src/layeradjustment.h b/modules/globebrowsing/src/layeradjustment.h
index 5993366d77..791a23d070 100644
--- a/modules/globebrowsing/src/layeradjustment.h
+++ b/modules/globebrowsing/src/layeradjustment.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/layergroup.cpp b/modules/globebrowsing/src/layergroup.cpp
index b546ae894e..dc67b2e62b 100644
--- a/modules/globebrowsing/src/layergroup.cpp
+++ b/modules/globebrowsing/src/layergroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -66,7 +66,7 @@ void LayerGroup::setLayersFromDict(const ghoul::Dictionary& dict) {
         catch (const ghoul::RuntimeError& e) {
             LERRORC(e.component, e.message);
 
-            if (layerDict.hasKeyAndValue<ghoul::Dictionary>(KeyFallback)) {
+            if (layerDict.hasValue<ghoul::Dictionary>(KeyFallback))  {
                 LWARNING("Unable to create layer. Initializing fallback layer.");
                 ghoul::Dictionary fallbackLayerDict =
                     layerDict.value<ghoul::Dictionary>(KeyFallback);
@@ -124,7 +124,7 @@ Layer* LayerGroup::addLayer(const ghoul::Dictionary& layerDict) {
         LERROR("Error adding layer. " + ghoul::to_string(res));
     }
 
-    if (!layerDict.hasKeyAndValue<std::string>("Identifier")) {
+    if (!layerDict.hasValue<std::string>("Identifier")) {
         LERROR("'Identifier' must be specified for layer.");
         return nullptr;
     }
diff --git a/modules/globebrowsing/src/layergroup.h b/modules/globebrowsing/src/layergroup.h
index 3f69e4705e..8aa83d4b9a 100644
--- a/modules/globebrowsing/src/layergroup.h
+++ b/modules/globebrowsing/src/layergroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/layergroupid.h b/modules/globebrowsing/src/layergroupid.h
index e2c28e503b..1679803143 100644
--- a/modules/globebrowsing/src/layergroupid.h
+++ b/modules/globebrowsing/src/layergroupid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -140,7 +140,8 @@ constexpr openspace::globebrowsing::layergroupid::GroupID from_string(
                                                                   std::string_view string)
 {
     for (int i = 0; i < openspace::globebrowsing::layergroupid::NUM_LAYER_GROUPS; ++i) {
-        if (string == openspace::globebrowsing::layergroupid::LAYER_GROUP_IDENTIFIERS[i]) {
+        if (string == openspace::globebrowsing::layergroupid::LAYER_GROUP_IDENTIFIERS[i])
+        {
             return static_cast<openspace::globebrowsing::layergroupid::GroupID>(i);
         }
     }
@@ -151,9 +152,11 @@ template <>
 constexpr openspace::globebrowsing::layergroupid::AdjustmentTypeID from_string(
                                                                   std::string_view string)
 {
-    for (int i = 0; i < openspace::globebrowsing::layergroupid::NUM_ADJUSTMENT_TYPES; ++i) {
+    for (int i = 0; i < openspace::globebrowsing::layergroupid::NUM_ADJUSTMENT_TYPES; ++i)
+    {
         if (string == openspace::globebrowsing::layergroupid::ADJUSTMENT_TYPE_NAMES[i]) {
-            return static_cast<openspace::globebrowsing::layergroupid::AdjustmentTypeID>(i);
+            return
+                static_cast<openspace::globebrowsing::layergroupid::AdjustmentTypeID>(i);
         }
     }
     return openspace::globebrowsing::layergroupid::AdjustmentTypeID::None;
diff --git a/modules/globebrowsing/src/layermanager.cpp b/modules/globebrowsing/src/layermanager.cpp
index 76178af1ea..7aa19c6e60 100644
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -61,10 +61,8 @@ void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
         _layerGroups[i] = std::make_unique<LayerGroup>(layergroupid::GroupID(i));
     }
 
-    const std::vector<std::string>& layerGroupNamesInDict = layerGroupsDict.keys();
-
     // Create all the layer groups
-    for (const std::string& groupName : layerGroupNamesInDict) {
+    for (std::string_view groupName : layerGroupsDict.keys()) {
         layergroupid::GroupID id = ghoul::from_string<layergroupid::GroupID>(groupName);
 
         if (id != layergroupid::GroupID::Unknown) {
@@ -72,7 +70,7 @@ void LayerManager::initialize(const ghoul::Dictionary& layerGroupsDict) {
             _layerGroups[static_cast<int>(id)]->setLayersFromDict(d);
         }
         else {
-            LWARNINGC("LayerManager", "Unknown layer group: " + groupName);
+            LWARNINGC("LayerManager", fmt::format("Unknown layer group: {}", groupName));
         }
     }
 
diff --git a/modules/globebrowsing/src/layermanager.h b/modules/globebrowsing/src/layermanager.h
index 1d9889069e..25fbde482f 100644
--- a/modules/globebrowsing/src/layermanager.h
+++ b/modules/globebrowsing/src/layermanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/layerrendersettings.cpp b/modules/globebrowsing/src/layerrendersettings.cpp
index 79c27dcbd4..b03314a8dd 100644
--- a/modules/globebrowsing/src/layerrendersettings.cpp
+++ b/modules/globebrowsing/src/layerrendersettings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/layerrendersettings.h b/modules/globebrowsing/src/layerrendersettings.h
index 5577fa965f..d76b82290b 100644
--- a/modules/globebrowsing/src/layerrendersettings.h
+++ b/modules/globebrowsing/src/layerrendersettings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/lrucache.h b/modules/globebrowsing/src/lrucache.h
index 7753737248..54bce548fc 100644
--- a/modules/globebrowsing/src/lrucache.h
+++ b/modules/globebrowsing/src/lrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/lrucache.inl b/modules/globebrowsing/src/lrucache.inl
index 5144250b6d..56213de22a 100644
--- a/modules/globebrowsing/src/lrucache.inl
+++ b/modules/globebrowsing/src/lrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/lruthreadpool.h b/modules/globebrowsing/src/lruthreadpool.h
index 943781bdea..ce5a3973bd 100644
--- a/modules/globebrowsing/src/lruthreadpool.h
+++ b/modules/globebrowsing/src/lruthreadpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/lruthreadpool.inl b/modules/globebrowsing/src/lruthreadpool.inl
index 8522ce9cb2..0597640189 100644
--- a/modules/globebrowsing/src/lruthreadpool.inl
+++ b/modules/globebrowsing/src/lruthreadpool.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/memoryawaretilecache.cpp b/modules/globebrowsing/src/memoryawaretilecache.cpp
index 79af26375d..1f42d9d69a 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.cpp
+++ b/modules/globebrowsing/src/memoryawaretilecache.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/memoryawaretilecache.h b/modules/globebrowsing/src/memoryawaretilecache.h
index 83771c3996..76c00504e0 100644
--- a/modules/globebrowsing/src/memoryawaretilecache.h
+++ b/modules/globebrowsing/src/memoryawaretilecache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
index ec90b4139c..c4a6e07a70 100644
--- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
+++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
index 3c7668823b..771321fa42 100644
--- a/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
+++ b/modules/globebrowsing/src/prioritizingconcurrentjobmanager.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/rawtile.h b/modules/globebrowsing/src/rawtile.h
index d992466ff6..a8dcdbe9b6 100644
--- a/modules/globebrowsing/src/rawtile.h
+++ b/modules/globebrowsing/src/rawtile.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -55,8 +55,6 @@ struct RawTile {
     GLuint pbo = 0;
 };
 
-RawTile createDefaultTile(TileTextureInitData initData);
-
 } // namespace openspace::globebrowsing
 
 #endif // __OPENSPACE_MODULE_GLOBEBROWSING___RAWTILE___H__
diff --git a/modules/globebrowsing/src/rawtiledatareader.cpp b/modules/globebrowsing/src/rawtiledatareader.cpp
index bbbee1d771..4da0f4732a 100644
--- a/modules/globebrowsing/src/rawtiledatareader.cpp
+++ b/modules/globebrowsing/src/rawtiledatareader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -197,25 +197,25 @@ int calculateTileLevelDifference(GDALDataset* dataset, int minimumPixelSize) {
  * Example: Side = left and pos = 16:
  *                 start.x = 16 and keep the size the same
  */
-void alignPixelRegion(PixelRegion& pr, Side side, int pos) {
+void alignPixelRegion(PixelRegion& pixelRegion, Side side, int pos) {
     switch (side) {
         case Side::Left:
-            pr.start.x = pos;
+            pixelRegion.start.x = pos;
             break;
         case Side::Top:
-            pr.start.y = pos;
+            pixelRegion.start.y = pos;
             break;
         case Side::Right:
-            pr.start.x = pos - pr.numPixels.x;
+            pixelRegion.start.x = pos - pixelRegion.numPixels.x;
             break;
         case Side::Bottom:
-            pr.start.y = pos - pr.numPixels.y;
+            pixelRegion.start.y = pos - pixelRegion.numPixels.y;
             break;
     }
 }
 
-PixelRegion globalCut(PixelRegion& pr, Side side, int p) {
-    const bool lineIntersect = [pr, side, p]() {
+PixelRegion globalCut(PixelRegion& pixelRegion, Side side, int p) {
+    const bool lineIntersect = [pr = pixelRegion, side, p]() {
         switch (side) {
             case Side::Left:
             case Side::Right:
@@ -232,8 +232,8 @@ PixelRegion globalCut(PixelRegion& pr, Side side, int p) {
         return PixelRegion();
     }
 
-    auto setSide = [](PixelRegion& pr, Side side, int pos) {
-        switch (side) {
+    auto setSide = [](PixelRegion& pr, Side s, int pos) {
+        switch (s) {
             case Side::Left:
                 pr.numPixels.x += (pr.start.x - pos);
                 pr.start.x = pos;
@@ -251,35 +251,35 @@ PixelRegion globalCut(PixelRegion& pr, Side side, int p) {
         }
     };
 
-    PixelRegion cutOff(pr);
+    PixelRegion cutOff(pixelRegion);
     int cutSize = 0;
     switch (side) {
         case Side::Left:
-            setSide(pr, Side::Left, p);
+            setSide(pixelRegion, Side::Left, p);
             setSide(cutOff, Side::Right, p - cutSize);
             break;
         case Side::Top:
-            setSide(pr, Side::Top, p);
+            setSide(pixelRegion, Side::Top, p);
             setSide(cutOff, Side::Bottom, p - cutSize);
             break;
         case Side::Right:
-            setSide(pr, Side::Right, p);
+            setSide(pixelRegion, Side::Right, p);
             setSide(cutOff, Side::Left, p + cutSize);
             break;
         case Side::Bottom:
-            setSide(pr, Side::Bottom, p);
+            setSide(pixelRegion, Side::Bottom, p);
             setSide(cutOff, Side::Top, p + cutSize);
             break;
     }
     return cutOff;
 }
 
-int edge(const PixelRegion& pr, Side side) {
+int edge(const PixelRegion& pixelRegion, Side side) {
     switch (side) {
-        case Side::Left:   return pr.start.x;
-        case Side::Top:    return pr.start.y;
-        case Side::Right:  return pr.start.x + pr.numPixels.x;
-        case Side::Bottom: return pr.start.y + pr.numPixels.y;
+        case Side::Left:   return pixelRegion.start.x;
+        case Side::Top:    return pixelRegion.start.y;
+        case Side::Right:  return pixelRegion.start.x + pixelRegion.numPixels.x;
+        case Side::Bottom: return pixelRegion.start.y + pixelRegion.numPixels.y;
         default:           throw ghoul::MissingCaseException();
     }
 }
@@ -650,7 +650,7 @@ RawTile RawTileDataReader::readTileData(TileIndex tileIndex) const {
 
     for (const MemoryLocation& ml : NoDataAvailableData) {
         std::byte* ptr = rawTile.imageData.get();
-        if (ml.offset >= numBytes || ptr[ml.offset] != ml.value) {
+        if (ml.offset >= static_cast<int>(numBytes) || ptr[ml.offset] != ml.value) {
             // Bail out as early as possible
             break;
         }
@@ -946,7 +946,6 @@ TileMetaData RawTileDataReader::tileMetaData(RawTile& rawTile,
     std::fill(ppData.maxValues.begin(), ppData.maxValues.end(), -FLT_MAX);
     std::fill(ppData.minValues.begin(), ppData.minValues.end(), FLT_MAX);
     std::fill(ppData.hasMissingData.begin(), ppData.hasMissingData.end(), false);
-    std::vector<float> noDataValues(_initData.nRasters, noDataValueAsFloat());
 
     bool allIsMissing = true;
     for (int y = 0; y < region.numPixels.y; ++y) {
diff --git a/modules/globebrowsing/src/rawtiledatareader.h b/modules/globebrowsing/src/rawtiledatareader.h
index 94f437199c..0aaf494053 100644
--- a/modules/globebrowsing/src/rawtiledatareader.h
+++ b/modules/globebrowsing/src/rawtiledatareader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/renderableglobe.cpp b/modules/globebrowsing/src/renderableglobe.cpp
index 0c774885df..9f089d8a46 100644
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -82,8 +82,6 @@ namespace {
     constexpr const char* KeyRadii = "Radii";
     constexpr const char* KeyLayers = "Layers";
     constexpr const char* KeyShadowGroup = "ShadowGroup";
-    constexpr const char* KeyShadowSource = "Source";
-    constexpr const char* KeyShadowCaster = "Caster";
     constexpr const char* KeyLabels = "Labels";
 
     const openspace::globebrowsing::AABB3 CullingFrustum{
@@ -123,12 +121,6 @@ namespace {
         "" // @TODO Missing documentation
     };
 
-    constexpr openspace::properties::Property::PropertyInfo ShowChunkAABBInfo = {
-        "ShowChunkAABB",
-        "Show chunk AABB",
-        "" // @TODO Missing documentation
-    };
-
     constexpr openspace::properties::Property::PropertyInfo HeightResolutionInfo = {
         "ShowHeightResolution",
         "Show height resolution",
@@ -273,7 +265,8 @@ const Chunk& findChunkNode(const Chunk& node, const Geodetic2& location) {
 #if defined(__APPLE__) || (defined(__linux__) && defined(__clang__))
 using ChunkTileVector = std::vector<std::pair<ChunkTile, const LayerRenderSettings*>>;
 #else
-using ChunkTileVector = std::pmr::vector<std::pair<ChunkTile, const LayerRenderSettings*>>;
+using ChunkTileVector =
+    std::pmr::vector<std::pair<ChunkTile, const LayerRenderSettings*>>;
 #endif
 
 ChunkTileVector tilesAndSettingsUnsorted(const LayerGroup& layerGroup,
@@ -473,12 +466,6 @@ documentation::Documentation RenderableGlobe::Documentation() {
         "RenderableGlobe",
         "globebrowsing_renderableglobe",
         {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableGlobe"),
-                Optional::No,
-                ""
-            },
             {
                 KeyRadii,
                 new OrVerifier({ new DoubleVector3Verifier, new DoubleVerifier }),
@@ -523,7 +510,6 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     , _debugProperties({
         BoolProperty(ShowChunkEdgeInfo, false),
         BoolProperty(ShowChunkBoundsInfo, false),
-        BoolProperty(ShowChunkAABBInfo, false),
         BoolProperty(HeightResolutionInfo, false),
         BoolProperty(HeightIntensityInfo, false),
         BoolProperty(LevelProjectedAreaInfo, true),
@@ -556,25 +542,26 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     _generalProperties.currentLodScaleFactor.setReadOnly(true);
 
     // Read the radii in to its own dictionary
-    if (dictionary.hasKeyAndValue<glm::dvec3>(KeyRadii)) {
-        _ellipsoid = Ellipsoid(dictionary.value<glm::vec3>(KeyRadii));
+    if (dictionary.hasValue<glm::dvec3>(KeyRadii)) {
+        _ellipsoid = Ellipsoid(dictionary.value<glm::dvec3>(KeyRadii));
         setBoundingSphere(static_cast<float>(_ellipsoid.maximumRadius()));
     }
-    else if (dictionary.hasKeyAndValue<double>(KeyRadii)) {
+    else if (dictionary.hasValue<double>(KeyRadii)) {
         const double radius = dictionary.value<double>(KeyRadii);
         _ellipsoid = Ellipsoid({ radius, radius, radius });
         setBoundingSphere(static_cast<float>(_ellipsoid.maximumRadius()));
     }
 
-    if (dictionary.hasValue<bool>("PerformShading")) {
+    if (dictionary.hasKey("PerformShading")) {
         _generalProperties.performShading = dictionary.value<bool>("PerformShading");
     }
 
     // Init layer manager
     ghoul::Dictionary layersDictionary;
-    if (!dictionary.getValue(KeyLayers, layersDictionary)) {
+    if (!dictionary.hasValue<ghoul::Dictionary>(KeyLayers)) {
         throw ghoul::RuntimeError(std::string(KeyLayers) + " must be specified");
     }
+    layersDictionary = dictionary.value<ghoul::Dictionary>(KeyLayers);
 
     _layerManager.initialize(layersDictionary);
 
@@ -638,92 +625,55 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
     _localChunkBuffer.resize(2048);
     _traversalMemory.resize(512);
 
-    //================================================================
-    //======== Reads Shadow (Eclipses) Entries in mod file ===========
-    //================================================================
-    ghoul::Dictionary shadowDictionary;
-    bool success = dictionary.getValue(KeyShadowGroup, shadowDictionary);
-    bool disableShadows = false;
-    if (success) {
+    // ================================================================
+    // ======== Reads Shadow (Eclipses) Entries in asset file =========
+    // ================================================================
+    if (dictionary.hasValue<ghoul::Dictionary>(KeyShadowGroup)) {
+        ghoul::Dictionary shadowDictionary =
+            dictionary.value<ghoul::Dictionary>(KeyShadowGroup);
+
         std::vector<std::pair<std::string, double>> sourceArray;
-        unsigned int sourceCounter = 1;
-        while (success) {
-            std::string sourceName;
-            success = shadowDictionary.getValue(KeyShadowSource +
-                std::to_string(sourceCounter) + ".Name", sourceName);
-            if (success) {
-                double sourceRadius;
-                success = shadowDictionary.getValue(KeyShadowSource +
-                    std::to_string(sourceCounter) + ".Radius", sourceRadius);
-                if (success) {
-                    sourceArray.emplace_back(sourceName, sourceRadius);
-                }
-                else {
-                    //LWARNING("No Radius value expecified for Shadow Source Name "
-                    //    << sourceName << " from " << name
-                    //    << " planet.\nDisabling shadows for this planet.");
-                    disableShadows = true;
-                    break;
-                }
-            }
-            sourceCounter++;
+        ghoul::Dictionary sources = shadowDictionary.value<ghoul::Dictionary>("Sources");
+        for (std::string_view k : sources.keys()) {
+            ghoul::Dictionary source = sources.value<ghoul::Dictionary>(k);
+
+            std::string name = source.value<std::string>("Name");
+            double radius = source.value<double>("Radius");
+            sourceArray.emplace_back(name, radius);
         }
 
-        if (!disableShadows && !sourceArray.empty()) {
-            success = true;
-            std::vector<std::pair<std::string, double>> casterArray;
-            unsigned int casterCounter = 1;
-            while (success) {
-                std::string casterName;
-                success = shadowDictionary.getValue(KeyShadowCaster +
-                    std::to_string(casterCounter) + ".Name", casterName);
-                if (success) {
-                    double casterRadius;
-                    success = shadowDictionary.getValue(KeyShadowCaster +
-                        std::to_string(casterCounter) + ".Radius", casterRadius);
-                    if (success) {
-                        casterArray.emplace_back(casterName, casterRadius);
-                    }
-                    else {
-                        //LWARNING("No Radius value expecified for Shadow Caster Name "
-                        //    << casterName << " from " << name
-                        //    << " planet.\nDisabling shadows for this planet.");
-                        disableShadows = true;
-                        break;
-                    }
-                }
+        std::vector<std::pair<std::string, double>> casterArray;
+        ghoul::Dictionary casters = shadowDictionary.value<ghoul::Dictionary>("Casters");
+        for (std::string_view k : casters.keys()) {
+            ghoul::Dictionary caster = casters.value<ghoul::Dictionary>(k);
 
-                casterCounter++;
-            }
+            std::string name = caster.value<std::string>("Name");
+            double radius = caster.value<double>("Radius");
+            casterArray.emplace_back(name, radius);
+        }
 
-            std::vector<Ellipsoid::ShadowConfiguration> shadowConfArray;
-            if (!disableShadows && (!sourceArray.empty() && !casterArray.empty())) {
-                for (const std::pair<std::string, double>& source : sourceArray) {
-                    for (const std::pair<std::string, double>& caster : casterArray) {
-                        Ellipsoid::ShadowConfiguration sc;
-                        sc.source = source;
-                        sc.caster = caster;
-                        shadowConfArray.push_back(sc);
-                    }
-                }
-                _ellipsoid.setShadowConfigurationArray(shadowConfArray);
+        std::vector<Ellipsoid::ShadowConfiguration> shadowConfArray;
+        for (const std::pair<std::string, double>& source : sourceArray) {
+            for (const std::pair<std::string, double>& caster : casterArray) {
+                Ellipsoid::ShadowConfiguration sc;
+                sc.source = source;
+                sc.caster = caster;
+                shadowConfArray.push_back(sc);
             }
         }
+        _ellipsoid.setShadowConfigurationArray(shadowConfArray);
     }
 
     // Labels Dictionary
-    if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeyLabels)) {
+    if (dictionary.hasValue<ghoul::Dictionary>(KeyLabels)) {
         _labelsDictionary = dictionary.value<ghoul::Dictionary>(KeyLabels);
     }
 
     // Components
-    if (dictionary.hasKey("Rings")) {
+    if (dictionary.hasValue<ghoul::Dictionary>("Rings")) {
         _ringsComponent.initialize();
         addPropertySubOwner(_ringsComponent);
         _hasRings = true;
-
-        ghoul::Dictionary ringsDic;
-        dictionary.getValue("Rings", ringsDic);
     }
 
     if (dictionary.hasKey("Shadows")) {
@@ -736,7 +686,7 @@ RenderableGlobe::RenderableGlobe(const ghoul::Dictionary& dictionary)
 }
 
 void RenderableGlobe::initializeGL() {
-    if (!_labelsDictionary.empty()) {
+    if (!_labelsDictionary.isEmpty()) {
         _globeLabelsComponent.initialize(_labelsDictionary, this);
         addPropertySubOwner(_globeLabelsComponent);
     }
@@ -1139,14 +1089,6 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         modelViewProjectionTransform
     );
 
-    const bool hasNightLayers = !_layerManager.layerGroup(
-        layergroupid::GroupID::NightLayers
-    ).activeLayers().empty();
-
-    const bool hasWaterLayer = !_layerManager.layerGroup(
-        layergroupid::GroupID::WaterMasks
-    ).activeLayers().empty();
-
     _globalRenderer.program->setUniform("modelViewTransform", modelViewTransform);
 
     const bool hasHeightLayer = !_layerManager.layerGroup(
@@ -1223,7 +1165,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     int localCount = 0;
 
     auto traversal = [](const Chunk& node, std::vector<const Chunk*>& global,
-        int& globalCount, std::vector<const Chunk*>& local, int& localCount, int cutoff,
+        int& iGlobal, std::vector<const Chunk*>& local, int& iLocal, int cutoff,
         std::vector<const Chunk*>& traversalMemory)
     {
         ZoneScopedN("traversal")
@@ -1238,12 +1180,12 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
 
             if (isLeaf(*n) && n->isVisible) {
                 if (n->tileIndex.level < cutoff) {
-                    global[globalCount] = n;
-                    ++globalCount;
+                    global[iGlobal] = n;
+                    ++iGlobal;
                 }
                 else {
-                    local[localCount] = n;
-                    ++localCount;
+                    local[iLocal] = n;
+                    ++iLocal;
                 }
             }
 
@@ -1290,13 +1232,12 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     }
     _localRenderer.program->deactivate();
 
-    if (_debugProperties.showChunkBounds || _debugProperties.showChunkAABB) {
+    if (_debugProperties.showChunkBounds) {
         for (int i = 0; i < globalCount; ++i) {
             debugRenderChunk(
                 *_globalChunkBuffer[i],
                 mvp,
-                _debugProperties.showChunkBounds,
-                _debugProperties.showChunkAABB
+                _debugProperties.showChunkBounds
             );
         }
 
@@ -1304,8 +1245,7 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
             debugRenderChunk(
                 *_localChunkBuffer[i],
                 mvp,
-                _debugProperties.showChunkBounds,
-                _debugProperties.showChunkAABB
+                _debugProperties.showChunkBounds
             );
         }
     }
@@ -1315,7 +1255,8 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
     // 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 = _iterationsOfUnavailableData > iterCount;
+    const bool exceededIterations =
+        static_cast<int>(_iterationsOfUnavailableData) > iterCount;
     const float clf = _generalProperties.currentLodScaleFactor;
     const float clfMin = _generalProperties.currentLodScaleFactor.minValue();
     const float targetLod = _generalProperties.targetLodScaleFactor;
@@ -1326,7 +1267,9 @@ void RenderableGlobe::renderChunks(const RenderData& data, RendererTasks&,
         _iterationsOfUnavailableData = 0;
         _lodScaleFactorDirty = true;
     } // Make 2 times the iterations with available data to move it up again
-    else if (_iterationsOfAvailableData > (iterCount * 2) && clf < targetLod) {
+    else if (static_cast<int>(_iterationsOfAvailableData) >
+             (iterCount * 2) && clf < targetLod)
+    {
         _generalProperties.currentLodScaleFactor =
             _generalProperties.currentLodScaleFactor + 0.1f;
         _iterationsOfAvailableData = 0;
@@ -1403,6 +1346,13 @@ void RenderableGlobe::renderChunkGlobally(const Chunk& chunk, const RenderData&
         program.setUniform("shadowMapTexture", shadowMapUnit);
         program.setUniform("zFightingPercentage", _generalProperties.zFightingPercentage);
     }
+    else if (_generalProperties.shadowMapping) {
+        shadowMapUnit.activate();
+        // JCC: Avoiding a to recompiling the shaders or having more than one
+        // set of shaders for this step.
+        glBindTexture(GL_TEXTURE_2D, _shadowComponent.dDepthTexture());
+        program.setUniform("shadowMapTexture", shadowMapUnit);
+    }
 
     glEnable(GL_DEPTH_TEST);
 
@@ -1534,6 +1484,13 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
 
         program.setUniform("shadowMapTexture", shadowMapUnit);
         program.setUniform("zFightingPercentage", _generalProperties.zFightingPercentage);
+    } 
+    else if (_generalProperties.shadowMapping) {
+        shadowMapUnit.activate();
+        // JCC: Avoiding a to recompiling the shaders or having more than one
+        // set of shaders for this step.
+        glBindTexture(GL_TEXTURE_2D, _shadowComponent.dDepthTexture());
+        program.setUniform("shadowMapTexture", shadowMapUnit);
     }
 
     glEnable(GL_DEPTH_TEST);
@@ -1550,7 +1507,7 @@ void RenderableGlobe::renderChunkLocally(const Chunk& chunk, const RenderData& d
 }
 
 void RenderableGlobe::debugRenderChunk(const Chunk& chunk, const glm::dmat4& mvp,
-                                       bool renderBounds, bool renderAABB) const
+                                       bool renderBounds) const
 {
     ZoneScoped
 
@@ -1579,12 +1536,6 @@ void RenderableGlobe::debugRenderChunk(const Chunk& chunk, const glm::dmat4& mvp
     if (renderBounds) {
         DebugRenderer::ref().renderNiceBox(clippingSpaceCorners, color);
     }
-
-    if (renderAABB) {
-        const std::vector<glm::vec4>& screenSpacePoints =
-            DebugRenderer::ref().verticesFor(screenSpaceBounds);
-        DebugRenderer::ref().renderNiceBox(screenSpacePoints, color);
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -1695,8 +1646,12 @@ void RenderableGlobe::recompileShaders() {
     std::vector<std::pair<std::string, std::string>>& pairs =
         preprocessingData.keyValuePairs;
 
+    const bool hasHeightLayer = !_layerManager.layerGroup(
+        layergroupid::HeightLayers
+    ).activeLayers().empty();
+
     pairs.emplace_back("useAccurateNormals",
-        std::to_string(_generalProperties.useAccurateNormals)
+        std::to_string(_generalProperties.useAccurateNormals && hasHeightLayer)
     );
     pairs.emplace_back(
         "performShading",
@@ -1797,7 +1752,7 @@ void RenderableGlobe::recompileShaders() {
     for (int i = 0; i < layergroupid::NUM_LAYER_GROUPS; ++i) {
         layerGroupNames.setValue(
             std::to_string(i),
-            layergroupid::LAYER_GROUP_IDENTIFIERS[i]
+            std::string(layergroupid::LAYER_GROUP_IDENTIFIERS[i])
         );
     }
     shaderDictionary.setValue("layerGroups", layerGroupNames);
@@ -1810,6 +1765,9 @@ void RenderableGlobe::recompileShaders() {
     // Shadow Mapping Samples
     shaderDictionary.setValue("nShadowSamples", _generalProperties.nShadowSamples - 1);
 
+    // Exclise Shadow Samples
+    int nEclipseShadows = static_cast<int>(_ellipsoid.shadowConfigurationArray().size());
+    shaderDictionary.setValue("nEclipseShadows", nEclipseShadows - 1);
     //
     // Create local shader
     //
@@ -1961,7 +1919,8 @@ float RenderableGlobe::getHeight(const glm::dvec3& position) const {
     const int x = static_cast<int>(floor(xIndexSpace));
     const int y = static_cast<int>(floor(yIndexSpace));
 
-    const TileIndex tileIndex(x, y, chunkLevel);
+    ghoul_assert(chunkLevel < std::numeric_limits<uint8_t>::max(), "Too high level");
+    const TileIndex tileIndex(x, y, static_cast<uint8_t>(chunkLevel));
     const GeodeticPatch patch = GeodeticPatch(tileIndex);
 
     const Geodetic2 northEast = patch.corner(Quad::NORTH_EAST);
@@ -2396,7 +2355,7 @@ int RenderableGlobe::desiredLevelByAvailableTileData(const Chunk& chunk) const {
 //////////////////////////////////////////////////////////////////////////////////////////
 
 bool RenderableGlobe::isCullableByFrustum(const Chunk& chunk,
-                                          const RenderData& renderData,
+                                          const RenderData&,
                                           const glm::dmat4& mvp) const
 {
     ZoneScoped
diff --git a/modules/globebrowsing/src/renderableglobe.h b/modules/globebrowsing/src/renderableglobe.h
index f632d38e59..c1ce8d7a98 100644
--- a/modules/globebrowsing/src/renderableglobe.h
+++ b/modules/globebrowsing/src/renderableglobe.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -124,7 +124,6 @@ private:
     struct {
         properties::BoolProperty showChunkEdges;
         properties::BoolProperty showChunkBounds;
-        properties::BoolProperty showChunkAABB;
         properties::BoolProperty showHeightResolution;
         properties::BoolProperty showHeightIntensities;
         properties::BoolProperty levelByProjectedAreaElseDistance;
@@ -220,9 +219,10 @@ private:
     );
 
     void debugRenderChunk(const Chunk& chunk, const glm::dmat4& mvp,
-        bool renderBounds, bool renderAABB) const;
+        bool renderBounds) const;
 
-    bool isCullableByFrustum(const Chunk& chunk, const RenderData& renderData, const glm::dmat4& mvp) const;
+    bool isCullableByFrustum(const Chunk& chunk, const RenderData& renderData,
+        const glm::dmat4& mvp) const;
     bool isCullableByHorizon(const Chunk& chunk, const RenderData& renderData,
         const BoundingHeights& heights) const;
 
diff --git a/modules/globebrowsing/src/ringscomponent.cpp b/modules/globebrowsing/src/ringscomponent.cpp
index 53f0e08ec9..7db25fe528 100644
--- a/modules/globebrowsing/src/ringscomponent.cpp
+++ b/modules/globebrowsing/src/ringscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -182,12 +182,12 @@ RingsComponent::RingsComponent(const ghoul::Dictionary& dictionary)
 {
     using ghoul::filesystem::File;
 
-    if (dictionary.hasKey("Rings")) {
+    if (dictionary.hasValue<ghoul::Dictionary>("Rings")) {
         // @TODO (abock, 2019-12-16) It would be better to not store the dictionary long
         // term and rather extract the values directly here.  This would require a bit of
         // a rewrite in the RenderableGlobe class to not create the RingsComponent in the
         // class-initializer list though
-        dictionary.getValue("Rings", _ringsDictionary);
+        _ringsDictionary = dictionary.value<ghoul::Dictionary>("Rings");
     }
 
     documentation::testSpecificationAndThrow(
@@ -214,8 +214,8 @@ void RingsComponent::initialize() {
     );
     _textureFile = std::make_unique<File>(_texturePath);
 
-    if (_ringsDictionary.hasKeyAndValue<glm::vec2>(OffsetInfo.identifier)) {
-        _offset = _ringsDictionary.value<glm::vec2>(OffsetInfo.identifier);
+    if (_ringsDictionary.hasValue<glm::dvec2>(OffsetInfo.identifier)) {
+        _offset = _ringsDictionary.value<glm::dvec2>(OffsetInfo.identifier);
     }
     addProperty(_offset);
 
@@ -224,14 +224,14 @@ void RingsComponent::initialize() {
 
     _textureFile->setCallback([&](const File&) { _textureIsDirty = true; });
 
-    if (_ringsDictionary.hasKeyAndValue<double>(NightFactorInfo.identifier)) {
+    if (_ringsDictionary.hasValue<double>(NightFactorInfo.identifier)) {
         _nightFactor = static_cast<float>(
             _ringsDictionary.value<double>(NightFactorInfo.identifier)
         );
     }
     addProperty(_nightFactor);
 
-    if (_ringsDictionary.hasKeyAndValue<double>(ColorFilterInfo.identifier)) {
+    if (_ringsDictionary.hasValue<double>(ColorFilterInfo.identifier)) {
         _colorFilter = static_cast<float>(
             _ringsDictionary.value<double>(ColorFilterInfo.identifier)
         );
@@ -239,8 +239,8 @@ void RingsComponent::initialize() {
 
     // Shadow Mapping Quality Controls
     if (_ringsDictionary.hasKey(ZFightingPercentageInfo.identifier)) {
-        _zFightingPercentage = _ringsDictionary.value<float>(
-            ZFightingPercentageInfo.identifier
+        _zFightingPercentage = static_cast<float>(
+            _ringsDictionary.value<double>(ZFightingPercentageInfo.identifier)
         );
     }
     addProperty(_zFightingPercentage);
@@ -364,7 +364,7 @@ void RingsComponent::draw(const RenderData& data,
 
         ringTextureUnit.activate();
         _texture->bind();
-        _shader->setUniform(_geomUniformCache.ringTexture, ringTextureUnit);
+        _geometryOnlyShader->setUniform(_geomUniformCache.ringTexture, ringTextureUnit);
     }
 
     glEnable(GL_DEPTH_TEST);
diff --git a/modules/globebrowsing/src/ringscomponent.h b/modules/globebrowsing/src/ringscomponent.h
index d6c7351a90..7bc348b8ba 100644
--- a/modules/globebrowsing/src/ringscomponent.h
+++ b/modules/globebrowsing/src/ringscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/shadowcomponent.cpp b/modules/globebrowsing/src/shadowcomponent.cpp
index b9615037cb..ab237291c4 100644
--- a/modules/globebrowsing/src/shadowcomponent.cpp
+++ b/modules/globebrowsing/src/shadowcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -44,6 +44,7 @@
 #include <ghoul/io/texture/texturereader.h>
 #include <ghoul/misc/dictionary.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>
@@ -158,7 +159,7 @@ documentation::Documentation ShadowComponent::Documentation() {
             },
             {
                 DepthMapSizeInfo.identifier,
-                new Vector2ListVerifier<float>,
+                new Vector2ListVerifier<double>,
                 Optional::Yes,
                 DepthMapSizeInfo.description
             }
@@ -175,12 +176,12 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
 {
     using ghoul::filesystem::File;
 
-    if (dictionary.hasKey("Shadows")) {
+    if (dictionary.hasValue<ghoul::Dictionary>("Shadows")) {
         // @TODO (abock, 2019-12-16) It would be better to not store the dictionary long
         // term and rather extract the values directly here.  This would require a bit of
         // a rewrite in the RenderableGlobe class to not create the ShadowComponent in the
         // class-initializer list though
-        dictionary.getValue("Shadows", _shadowMapDictionary);
+        _shadowMapDictionary = dictionary.value<ghoul::Dictionary>("Shadows");
     }
 
     documentation::testSpecificationAndThrow(
@@ -191,15 +192,15 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
 
     if (_shadowMapDictionary.hasKey(DistanceFractionInfo.identifier)) {
         _distanceFraction = static_cast<int>(
-            _shadowMapDictionary.value<float>(DistanceFractionInfo.identifier)
+            _shadowMapDictionary.value<double>(DistanceFractionInfo.identifier)
         );
     }
     _saveDepthTexture.onChange([&]() { _executeDepthTextureSave = true; });
 
 
     if (_shadowMapDictionary.hasKey(DepthMapSizeInfo.identifier)) {
-        glm::vec2 depthMapSize =
-            _shadowMapDictionary.value<glm::vec2>(DepthMapSizeInfo.identifier);
+        glm::dvec2 depthMapSize =
+            _shadowMapDictionary.value<glm::dvec2>(DepthMapSizeInfo.identifier);
         _shadowDepthTextureWidth = static_cast<int>(depthMapSize.x);
         _shadowDepthTextureHeight = static_cast<int>(depthMapSize.y);
         _dynamicDepthTextureRes = false;
@@ -220,7 +221,9 @@ ShadowComponent::ShadowComponent(const ghoul::Dictionary& dictionary)
     addProperty(_distanceFraction);
 }
 
-void ShadowComponent::initialize() {}
+void ShadowComponent::initialize() {
+    buildDDepthTexture();
+}
 
 bool ShadowComponent::isReady() const {
     return true;
@@ -236,6 +239,7 @@ void ShadowComponent::initializeGL() {
 void ShadowComponent::deinitializeGL() {
     glDeleteTextures(1, &_shadowDepthTexture);
     glDeleteTextures(1, &_positionInLightSpaceTexture);
+    glDeleteTextures(1, &_dDepthTexture);
     glDeleteFramebuffers(1, &_shadowFBO);
 }
 
@@ -298,7 +302,7 @@ RenderData ShadowComponent::begin(const RenderData& data) {
     //matrix[14] = -glm::dot(cameraZ, lightPosition);
 
 
-    _lightCamera = std::move(std::unique_ptr<Camera>(new Camera(data.camera)));
+    _lightCamera = std::make_unique<Camera>(data.camera);
     _lightCamera->setPositionVec3(lightPosition);
     _lightCamera->setRotation(glm::dquat(glm::inverse(cameraRotationMatrix)));
     //=======================================================================
@@ -317,20 +321,9 @@ RenderData ShadowComponent::begin(const RenderData& data) {
 
 
     // Saves current state
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
-    glGetIntegerv(GL_VIEWPORT, _mViewport);
-    _faceCulling = glIsEnabled(GL_CULL_FACE);
-    glGetIntegerv(GL_CULL_FACE_MODE, &_faceToCull);
-    _polygonOffSet = glIsEnabled(GL_POLYGON_OFFSET_FILL);
-    glGetFloatv(GL_POLYGON_OFFSET_FACTOR, &_polygonOffSetFactor);
-    glGetFloatv(GL_POLYGON_OFFSET_UNITS, &_polygonOffSetUnits);
-    glGetFloatv(GL_COLOR_CLEAR_VALUE, _colorClearValue);
-    glGetFloatv(GL_DEPTH_CLEAR_VALUE, &_depthClearValue);
-    _depthIsEnabled = glIsEnabled(GL_DEPTH_TEST);
-    glGetIntegerv(GL_DEPTH_FUNC, &_depthFunction);
-    _blendIsEnabled = glIsEnabled(GL_BLEND);
-
-
+    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_currentFBO);
+    global::renderEngine->openglStateCache().viewport(_mViewport);
+    
     glBindFramebuffer(GL_FRAMEBUFFER, _shadowFBO);
     GLenum drawBuffers[] = { GL_COLOR_ATTACHMENT0, GL_NONE, GL_NONE };
     glDrawBuffers(3, drawBuffers);
@@ -367,45 +360,18 @@ void ShadowComponent::end() {
     }
 
     // Restores system state
-    glBindFramebuffer(GL_FRAMEBUFFER, _defaultFBO);
+    glBindFramebuffer(GL_FRAMEBUFFER, _currentFBO);
     GLenum drawBuffers[] = {
         GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2
     };
     glDrawBuffers(3, drawBuffers);
     glViewport(_mViewport[0], _mViewport[1], _mViewport[2], _mViewport[3]);
 
-    if (_faceCulling) {
-        glEnable(GL_CULL_FACE);
-        glCullFace(_faceToCull);
-    }
-    else {
-        glDisable(GL_CULL_FACE);
-    }
-
-    if (_depthIsEnabled) {
-        glEnable(GL_DEPTH_TEST);
-    }
-    else {
-        glDisable(GL_DEPTH_TEST);
-    }
-
-    glDepthFunc(_depthFunction);
-
-    if (_polygonOffSet) {
-        glEnable(GL_POLYGON_OFFSET_FILL);
-        glPolygonOffset(_polygonOffSetFactor, _polygonOffSetUnits);
-    }
-    else {
-        glDisable(GL_POLYGON_OFFSET_FILL);
-    }
-
-    glClearColor(
-        _colorClearValue[0],
-        _colorClearValue[1],
-        _colorClearValue[2],
-        _colorClearValue[3]
-    );
-    glClearDepth(_depthClearValue);
+    // Restores OpenGL Rendering State
+    global::renderEngine->openglStateCache().resetColorState();
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
+    global::renderEngine->openglStateCache().resetPolygonAndClippingState();
 
     if (_blendIsEnabled) {
         glEnable(GL_BLEND);
@@ -464,7 +430,7 @@ void ShadowComponent::createDepthTexture() {
 
 void ShadowComponent::createShadowFBO() {
     // Saves current FBO first
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
+    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_currentFBO);
 
     glGenFramebuffers(1, &_shadowFBO);
     glBindFramebuffer(GL_FRAMEBUFFER, _shadowFBO);
@@ -489,7 +455,7 @@ void ShadowComponent::createShadowFBO() {
     checkFrameBufferState("createShadowFBO()");
 
     // Restores system state
-    glBindFramebuffer(GL_FRAMEBUFFER, _defaultFBO);
+    glBindFramebuffer(GL_FRAMEBUFFER, _currentFBO);
 }
 
 void ShadowComponent::updateDepthTexture() {
@@ -512,7 +478,7 @@ void ShadowComponent::updateDepthTexture() {
         0,
         GL_DEPTH_COMPONENT,
         GL_FLOAT,
-        0
+        nullptr
     );
 
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -544,6 +510,31 @@ void ShadowComponent::updateDepthTexture() {
     glBindTexture(GL_TEXTURE_2D, 0);
 }
 
+void ShadowComponent::buildDDepthTexture() {
+    glGenTextures(1, &_dDepthTexture);
+    glBindTexture(GL_TEXTURE_2D, _dDepthTexture);
+    glTexImage2D(
+        GL_TEXTURE_2D,
+        0,
+        GL_DEPTH_COMPONENT32F,
+        1,
+        1,
+        0,
+        GL_DEPTH_COMPONENT,
+        GL_FLOAT,
+        nullptr
+    );
+
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL);
+
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
 void ShadowComponent::saveDepthBuffer() {
     int size = _shadowDepthTextureWidth * _shadowDepthTextureHeight;
     std::vector<GLubyte> buffer(size);
@@ -652,4 +643,8 @@ void ShadowComponent::setViewDepthMap(bool enable) {
     _viewDepthMap = enable;
 }
 
+GLuint ShadowComponent::dDepthTexture() const {
+    return _dDepthTexture;
+}
+
 } // namespace openspace
diff --git a/modules/globebrowsing/src/shadowcomponent.h b/modules/globebrowsing/src/shadowcomponent.h
index 3c39293697..30aabbe057 100644
--- a/modules/globebrowsing/src/shadowcomponent.h
+++ b/modules/globebrowsing/src/shadowcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -79,10 +79,13 @@ public:
 
     void setViewDepthMap(bool enable);
 
+    GLuint dDepthTexture() const;
+
 private:
     void createDepthTexture();
     void createShadowFBO();
     void updateDepthTexture();
+    void buildDDepthTexture();
 
     // Debug
     void saveDepthBuffer();
@@ -109,9 +112,12 @@ private:
     bool _dynamicDepthTextureRes = true;
 
     GLuint _shadowDepthTexture = 0;
+    // JCC: Used to avoid recompilation of Globebrowsing's shaders
+    // and incorrect binding of texture type
+    GLuint _dDepthTexture = 0;
     GLuint _positionInLightSpaceTexture = 0;
     GLuint _shadowFBO = 0;
-    GLint _defaultFBO = 0;
+    GLint _currentFBO = 0;
     GLint _mViewport[4];
 
     GLboolean _faceCulling;
diff --git a/modules/globebrowsing/src/skirtedgrid.cpp b/modules/globebrowsing/src/skirtedgrid.cpp
index 4d897c9920..df6f36b5c2 100644
--- a/modules/globebrowsing/src/skirtedgrid.cpp
+++ b/modules/globebrowsing/src/skirtedgrid.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/skirtedgrid.h b/modules/globebrowsing/src/skirtedgrid.h
index 5bcbf4e710..f8b9da1b38 100644
--- a/modules/globebrowsing/src/skirtedgrid.h
+++ b/modules/globebrowsing/src/skirtedgrid.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/tileindex.cpp b/modules/globebrowsing/src/tileindex.cpp
index 56a2738b8a..b6616fa88a 100644
--- a/modules/globebrowsing/src/tileindex.cpp
+++ b/modules/globebrowsing/src/tileindex.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/tileindex.h b/modules/globebrowsing/src/tileindex.h
index 65d35150a9..af76b085e9 100644
--- a/modules/globebrowsing/src/tileindex.h
+++ b/modules/globebrowsing/src/tileindex.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/tileloadjob.cpp b/modules/globebrowsing/src/tileloadjob.cpp
index a9bdb36700..ef3abc95e9 100644
--- a/modules/globebrowsing/src/tileloadjob.cpp
+++ b/modules/globebrowsing/src/tileloadjob.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/tileloadjob.h b/modules/globebrowsing/src/tileloadjob.h
index df0486aad1..c7ad657916 100644
--- a/modules/globebrowsing/src/tileloadjob.h
+++ b/modules/globebrowsing/src/tileloadjob.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/tileprovider.cpp b/modules/globebrowsing/src/tileprovider.cpp
index a8fa393b0e..379857325d 100644
--- a/modules/globebrowsing/src/tileprovider.cpp
+++ b/modules/globebrowsing/src/tileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -213,7 +213,7 @@ Tile tile(TextTileProvider& t, const TileIndex& tileIndex) {
         // Keep track of defaultFBO and viewport to be able to reset state when done
         GLint defaultFBO;
         //GLint viewport[4];
-        glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
+        defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer();
         //glGetIntegerv(GL_VIEWPORT, viewport);
 
         // Render to texture
@@ -349,7 +349,7 @@ std::unique_ptr<TileProvider> initTileProvider(TemporalTileProvider& t,
 
     FileSys.expandPathTokens(gdalDatasetXml, IgnoredTokens);
 
-    t.initDict.setValue<std::string>(KeyFilePath, gdalDatasetXml);
+    t.initDict.setValue(KeyFilePath, gdalDatasetXml);
     return std::make_unique<DefaultTileProvider>(t.initDict);
 }
 
@@ -460,10 +460,12 @@ std::string consumeTemporalMetaData(TemporalTileProvider& t, const std::string&
     else {
         gdalNode = CPLSearchXMLNode(node, "FilePath");
         if (gdalNode) {
+            std::string gdalDescription = std::string(gdalNode->psChild->pszValue);
+            return gdalDescription;
+        }
+        else {
             return "";
         }
-        std::string gdalDescription = std::string(gdalNode->psChild->pszValue);
-        return gdalDescription;
     }
 }
 
@@ -487,7 +489,7 @@ 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<std::string>(temporal::KeyBasePath, f.directoryName());
+        t.initDict.setValue(temporal::KeyBasePath, f.directoryName());
     }
 
     t.gdalXmlTemplate = consumeTemporalMetaData(t, xml);
@@ -558,26 +560,27 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
 
     tileCache = global::moduleEngine->module<GlobeBrowsingModule>()->tileCache();
     name = "Name unspecified";
-    if (dictionary.hasKeyAndValue<std::string>("Name")) {
+    if (dictionary.hasValue<std::string>("Name")) {
         name = dictionary.value<std::string>("Name");
     }
     std::string _loggerCat = "DefaultTileProvider (" + name + ")";
 
     // 1. Get required Keys
     filePath = dictionary.value<std::string>(KeyFilePath);
-    layerGroupID = dictionary.value<layergroupid::GroupID>("LayerGroupID");
+    layerGroupID =
+        static_cast<layergroupid::GroupID>(dictionary.value<int>("LayerGroupID"));
 
     // 2. Initialize default values for any optional Keys
     // getValue does not work for integers
     int pixelSize = 0;
-    if (dictionary.hasKeyAndValue<double>(defaultprovider::KeyTilePixelSize)) {
+    if (dictionary.hasValue<double>(defaultprovider::KeyTilePixelSize)) {
         pixelSize = static_cast<int>(
             dictionary.value<double>(defaultprovider::KeyTilePixelSize)
         );
         LDEBUG(fmt::format("Default pixel size overridden: {}", pixelSize));
     }
 
-    if (dictionary.hasKeyAndValue<bool>(defaultprovider::KeyPadTiles)) {
+    if (dictionary.hasValue<bool>(defaultprovider::KeyPadTiles)) {
         padTiles = dictionary.value<bool>(defaultprovider::KeyPadTiles);
     }
 
@@ -593,7 +596,7 @@ DefaultTileProvider::DefaultTileProvider(const ghoul::Dictionary& dictionary)
         default:                                  performPreProcessing = false; break;
     }
 
-    if (dictionary.hasKeyAndValue<bool>(defaultprovider::KeyPerformPreProcessing)) {
+    if (dictionary.hasValue<bool>(defaultprovider::KeyPerformPreProcessing)) {
         performPreProcessing = dictionary.value<bool>(
             defaultprovider::KeyPerformPreProcessing
         );
@@ -629,9 +632,9 @@ SingleImageProvider::SingleImageProvider(const ghoul::Dictionary& dictionary)
 
 
 
-TextTileProvider::TextTileProvider(TileTextureInitData initData, size_t fontSize)
-    : initData(std::move(initData))
-    , fontSize(fontSize)
+TextTileProvider::TextTileProvider(TileTextureInitData initData_, size_t fontSize_)
+    : initData(std::move(initData_))
+    , fontSize(fontSize_)
 {
     ZoneScoped
 
@@ -651,7 +654,7 @@ SizeReferenceTileProvider::SizeReferenceTileProvider(const ghoul::Dictionary& di
 
     font = global::fontManager->font("Mono", static_cast<float>(fontSize));
 
-    if (dictionary.hasKeyAndValue<glm::dvec3>(sizereferenceprovider::KeyRadii)) {
+    if (dictionary.hasValue<glm::dvec3>(sizereferenceprovider::KeyRadii)) {
         ellipsoid = dictionary.value<glm::dvec3>(sizereferenceprovider::KeyRadii);
     }
 }
@@ -682,7 +685,7 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
     );
 
     layergroupid::TypeID typeID;
-    if (defaultProviderDict.hasKeyAndValue<std::string>("Type")) {
+    if (defaultProviderDict.hasValue<std::string>("Type")) {
         const std::string& t = defaultProviderDict.value<std::string>("Type");
         typeID = ghoul::from_string<layergroupid::TypeID>(t);
 
@@ -715,12 +718,14 @@ TileProviderByIndex::TileProviderByIndex(const ghoul::Dictionary& dictionary) {
         constexpr const char* KeyY = "Y";
 
         int level = static_cast<int>(tileIndexDict.value<double>(KeyLevel));
+        ghoul_assert(level < std::numeric_limits<uint8_t>::max(), "Level too large");
         int x = static_cast<int>(tileIndexDict.value<double>(KeyX));
         int y = static_cast<int>(tileIndexDict.value<double>(KeyY));
-        const TileIndex tileIndex(x, y, level);
+
+        const TileIndex tileIndex(x, y, static_cast<uint8_t>(level));
 
         layergroupid::TypeID providerTypeID = layergroupid::TypeID::DefaultTileLayer;
-        if (defaultProviderDict.hasKeyAndValue<std::string>("Type")) {
+        if (defaultProviderDict.hasValue<std::string>("Type")) {
             const std::string& t = defaultProviderDict.value<std::string>("Type");
             providerTypeID = ghoul::from_string<layergroupid::TypeID>(t);
 
@@ -747,11 +752,11 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
 
     type = Type::ByLevelTileProvider;
 
-    layergroupid::GroupID layerGroupID = dictionary.value<layergroupid::GroupID>(
-        bylevelprovider::KeyLayerGroupID
+    layergroupid::GroupID layerGroupID = static_cast<layergroupid::GroupID>(
+        dictionary.value<int>(bylevelprovider::KeyLayerGroupID)
     );
 
-    if (dictionary.hasKeyAndValue<ghoul::Dictionary>(bylevelprovider::KeyProviders)) {
+    if (dictionary.hasValue<ghoul::Dictionary>(bylevelprovider::KeyProviders)) {
         ghoul::Dictionary providers = dictionary.value<ghoul::Dictionary>(
             bylevelprovider::KeyProviders
         );
@@ -768,10 +773,14 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
             ghoul::Dictionary providerDict = levelProviderDict.value<ghoul::Dictionary>(
                 bylevelprovider::KeyTileProvider
             );
-            providerDict.setValue(bylevelprovider::KeyLayerGroupID, layerGroupID);
+            providerDict.setValue(
+                bylevelprovider::KeyLayerGroupID,
+                static_cast<int>(layerGroupID)
+            );
 
             layergroupid::TypeID typeID;
-            if (providerDict.hasKeyAndValue<std::string>("Type")) {
+            if (providerDict.hasValue<std::string>("Type"))
+            {
                 const std::string& typeString = providerDict.value<std::string>("Type");
                 typeID = ghoul::from_string<layergroupid::TypeID>(typeString);
 
@@ -783,9 +792,7 @@ TileProviderByLevel::TileProviderByLevel(const ghoul::Dictionary& dictionary) {
                 typeID = layergroupid::TypeID::DefaultTileLayer;
             }
 
-            std::unique_ptr<TileProvider> tp = std::unique_ptr<TileProvider>(
-                createFromDictionary(typeID, providerDict)
-            );
+            std::unique_ptr<TileProvider> tp = createFromDictionary(typeID, providerDict);
 
             std::string provId = providerDict.value<std::string>("Identifier");
             tp->setIdentifier(provId);
@@ -845,14 +852,14 @@ bool initialize(TileProvider& tp) {
 
     ghoul_assert(!tp.isInitialized, "TileProvider can only be initialized once.");
 
-    if (TileProvider::NumTileProviders > std::numeric_limits<uint16_t>::max()) {
+    if (TileProvider::NumTileProviders > std::numeric_limits<uint16_t>::max() - 1) {
         LERRORC(
             "TileProvider",
             "Number of tile providers exceeds 65535. Something will break soon"
         );
         TileProvider::NumTileProviders = 0;
     }
-    tp.uniqueIdentifier = TileProvider::NumTileProviders++;
+    tp.uniqueIdentifier = static_cast<uint16_t>(TileProvider::NumTileProviders++);
     if (TileProvider::NumTileProviders == std::numeric_limits<unsigned int>::max()) {
         --TileProvider::NumTileProviders;
         return false;
@@ -1411,15 +1418,15 @@ ChunkTile chunkTile(TileProvider& tp, TileIndex tileIndex, int parents, int maxP
 
     ghoul_assert(tp.isInitialized, "TileProvider was not initialized.");
 
-    auto ascendToParent = [](TileIndex& tileIndex, TileUvTransform& uv) {
+    auto ascendToParent = [](TileIndex& ti, TileUvTransform& uv) {
         uv.uvOffset *= 0.5;
         uv.uvScale *= 0.5;
 
-        uv.uvOffset += tileIndex.positionRelativeParent();
+        uv.uvOffset += ti.positionRelativeParent();
 
-        tileIndex.x /= 2;
-        tileIndex.y /= 2;
-        tileIndex.level--;
+        ti.x /= 2;
+        ti.y /= 2;
+        ti.level--;
     };
 
     TileUvTransform uvTransform = { glm::vec2(0.f, 0.f), glm::vec2(1.f, 1.f) };
diff --git a/modules/globebrowsing/src/tileprovider.h b/modules/globebrowsing/src/tileprovider.h
index 909380f0a0..2d70e8dd0c 100644
--- a/modules/globebrowsing/src/tileprovider.h
+++ b/modules/globebrowsing/src/tileprovider.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/tiletextureinitdata.cpp b/modules/globebrowsing/src/tiletextureinitdata.cpp
index a77e92bcc3..b47d838548 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.cpp
+++ b/modules/globebrowsing/src/tiletextureinitdata.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -186,18 +186,18 @@ TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLenum typ
 
 TileTextureInitData TileTextureInitData::operator=(const TileTextureInitData& rhs) {
     if (this == &rhs) {
-        return TileTextureInitData(*this);
+        return *this;
     }
 
-    return TileTextureInitData(rhs);
+    return rhs;
 }
 
 TileTextureInitData TileTextureInitData::operator=(TileTextureInitData&& rhs) {
     if (this == &rhs) {
-        return TileTextureInitData(*this);
+        return *this;
     }
 
-    return TileTextureInitData(rhs);
+    return std::move(rhs);
 }
 
 } // namespace openspace::globebrowsing
diff --git a/modules/globebrowsing/src/tiletextureinitdata.h b/modules/globebrowsing/src/tiletextureinitdata.h
index 6a0984f4cf..2a311a81f5 100644
--- a/modules/globebrowsing/src/tiletextureinitdata.h
+++ b/modules/globebrowsing/src/tiletextureinitdata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/globebrowsing/src/timequantizer.cpp b/modules/globebrowsing/src/timequantizer.cpp
index 64aab1b640..a931db8a23 100644
--- a/modules/globebrowsing/src/timequantizer.cpp
+++ b/modules/globebrowsing/src/timequantizer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -148,7 +148,7 @@ std::string_view RangedTime::end() const {
 
 DateTime::DateTime(std::string_view initDateTime) {
     setTime(initDateTime);
-};
+}
 
 void DateTime::setTime(std::string_view input) {
     // Indices into an ISO8601 YYYY-MM-ddTHH:mm:ss string
@@ -172,7 +172,7 @@ std::string DateTime::ISO8601() const {
         "{:0>4}-{:0>2}-{:0>2}T{:0>2}:{:0>2}:{:0>2}",
         _year, _month, _day, _hour, _minute, _second
     );
-};
+}
 
 double DateTime::J2000() const {
     char Buffer[20];
@@ -185,15 +185,6 @@ double DateTime::J2000() const {
     return Time::convertTime(Buffer);
 }
 
-void DateTime::operator=(DateTime& src) {
-    _year = src.year();
-    _month = src.month();
-    _day = src.day();
-    _hour = src.hour();
-    _minute = src.minute();
-    _second = src.second();
-}
-
 int DateTime::increment(int value, char unit, double error, double resolution) {
     unsigned int nIncrements = std::abs(static_cast<int>(error / resolution));
     if (nIncrements == 0) {
@@ -259,30 +250,26 @@ void DateTime::decrementOnce(int value, char unit) {
             if (singleDecrement(_minute, value, 0, 59)) {
                 break;
             }
-            // else fall-through if underflow...
-
+            [[ fallthrough ]];
         case 'h':
             if (singleDecrement(_hour, value, 0, 23)) {
                 break;
             }
-            // else fall-through if underflow...
-
+            [[ fallthrough ]];
         case 'd':
             if (singleDecrement(_day, value, 1,
                 monthSize(_month == 1 ? 12 : _month - 1, _year)))
             {
                 break;
             }
-            // else fall-through if underflow...
-
+            [[ fallthrough ]];
         case 'M':
             inBounds = singleDecrement(_month, value, 1, 12);
             _day = std::clamp(_day, 1, monthSize(_month, _year));
             if (inBounds) {
                 break;
             }
-            // else fall-through if underflow...
-
+            [[ fallthrough ]];
         case 'y':
             _year -= value;
             break;
@@ -417,7 +404,7 @@ void TimeQuantizer::verifyResolutionRestrictions(const int value, const char uni
             }
             break;
         case 'h':
-            if (!(value >= 1 && value <= 4 || value == 6 || value == 12)) {
+            if (!((value >= 1 && value <= 4) || value == 6 || value == 12)) {
                 throw ghoul::RuntimeError(fmt::format(
                     "Invalid resolution count of {} for (h)our option. Valid counts are "
                     "1, 2, 3, 4, 6, or 12", value
@@ -490,11 +477,11 @@ bool TimeQuantizer::quantize(Time& t, bool clamp) {
     // resolutionFraction helps to improve iteration performance
     constexpr const double ResolutionFraction = 0.7;
     constexpr const int IterationLimit = 50;
-    int iterations = 0;
-    int lastIncr = 0;
-    int lastDecr = 0;
 
     if (_timerange.includes(t)) {
+        int iterations = 0;
+        int lastIncr = 0;
+        int lastDecr = 0;
         DateTime quantized = DateTime(_timerange.start());
         doFirstApproximation(quantized, unquantized, _resolutionValue, _resolutionUnit);
         double error = unquantized.J2000() - quantized.J2000();
@@ -631,7 +618,6 @@ std::vector<std::string> TimeQuantizer::quantized(Time& start, Time& end) {
         static_cast<int>(delta) % static_cast<int>(_resolution) == 0,
         "Quantization error"
     );
-    const int nSteps = static_cast<int>(delta / _resolution);
 
     std::vector<std::string> result;
     DateTime itr = s;
diff --git a/modules/globebrowsing/src/timequantizer.h b/modules/globebrowsing/src/timequantizer.h
index b940c8fe43..0c0ec5d94a 100644
--- a/modules/globebrowsing/src/timequantizer.h
+++ b/modules/globebrowsing/src/timequantizer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -131,13 +131,6 @@ public:
      */
     void setTime(std::string_view input);
 
-    /*
-     * Used to deep-copy from another DateTime instance
-     *
-     * \params src the DateTime object to copy from
-     */
-    void operator=(DateTime& src);
-
     /*
      * Get the date/time value in ISO8601 format
      *
diff --git a/modules/imgui/CMakeLists.txt b/modules/imgui/CMakeLists.txt
index 4ea3d8d0d8..9f5ca89163 100644
--- a/modules/imgui/CMakeLists.txt
+++ b/modules/imgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -24,47 +24,44 @@
 
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
-# include(GenerateExportHeader)
-
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/gui.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guiassetcomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guicomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guifilepathcomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guigibscomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guiglobebrowsingcomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guihelpcomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guijoystickcomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guimemorycomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guimissioncomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guiparallelcomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guipropertycomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guishortcutscomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guispacetimecomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/guiiswacomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/imgui_include.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/renderproperties.h
+  include/gui.h
+  include/guiassetcomponent.h
+  include/guicomponent.h
+  include/guifilepathcomponent.h
+  include/guigibscomponent.h
+  include/guiglobebrowsingcomponent.h
+  include/guihelpcomponent.h
+  include/guijoystickcomponent.h
+  include/guimemorycomponent.h
+  include/guimissioncomponent.h
+  include/guiparallelcomponent.h
+  include/guipropertycomponent.h
+  include/guishortcutscomponent.h
+  include/guispacetimecomponent.h
+  include/guiiswacomponent.h
+  include/imgui_include.h
+  include/renderproperties.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/gui.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guiassetcomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guicomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guifilepathcomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guigibscomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guiglobebrowsingcomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guihelpcomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guijoystickcomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guimemorycomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guimissioncomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guiparallelcomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guipropertycomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guishortcutscomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guispacetimecomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/guiiswacomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/renderproperties.cpp
-
+  src/gui.cpp
+  src/guiassetcomponent.cpp
+  src/guicomponent.cpp
+  src/guifilepathcomponent.cpp
+  src/guigibscomponent.cpp
+  src/guiglobebrowsingcomponent.cpp
+  src/guihelpcomponent.cpp
+  src/guijoystickcomponent.cpp
+  src/guimemorycomponent.cpp
+  src/guimissioncomponent.cpp
+  src/guiparallelcomponent.cpp
+  src/guipropertycomponent.cpp
+  src/guishortcutscomponent.cpp
+  src/guispacetimecomponent.cpp
+  src/guiiswacomponent.cpp
+  src/renderproperties.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
@@ -74,8 +71,6 @@ set(SHADER_FILES
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
-# set(openspace-module-imgui_LIBRARY_MODE SHARED)
-
 create_new_module(
   "ImGUI"
   imgui_module
@@ -84,5 +79,3 @@ create_new_module(
 )
 
 include_external_library(${imgui_module} PRIVATE Imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui)
-
-# generate_export_header(${imgui_module} EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/_generated/include/imgui_export.h)
diff --git a/modules/imgui/ext/imgui/CMakeLists.txt b/modules/imgui/ext/imgui/CMakeLists.txt
index a800bb0548..b955a01c21 100644
--- a/modules/imgui/ext/imgui/CMakeLists.txt
+++ b/modules/imgui/ext/imgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
diff --git a/modules/imgui/imguimodule.cpp b/modules/imgui/imguimodule.cpp
index 50bc8dbe78..cc9f132ccb 100644
--- a/modules/imgui/imguimodule.cpp
+++ b/modules/imgui/imguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -44,7 +44,7 @@ namespace openspace {
 ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
     addPropertySubOwner(gui);
 
-    global::callback::initialize.emplace_back([&]() {
+    global::callback::initialize->emplace_back([&]() {
         LDEBUGC("ImGUIModule", "Initializing GUI");
         gui.initialize();
 
@@ -130,28 +130,28 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         );
     });
 
-    global::callback::deinitialize.emplace_back([&]() {
+    global::callback::deinitialize->emplace_back([&]() {
         ZoneScopedN("ImGUI")
 
         LDEBUGC("ImGui", "Deinitialize GUI");
         gui.deinitialize();
     });
 
-    global::callback::initializeGL.emplace_back([&]() {
+    global::callback::initializeGL->emplace_back([&]() {
         ZoneScopedN("ImGUI")
 
         LDEBUGC("ImGui", "Initializing GUI OpenGL");
         gui.initializeGL();
     });
 
-    global::callback::deinitializeGL.emplace_back([&]() {
+    global::callback::deinitializeGL->emplace_back([&]() {
         ZoneScopedN("ImGUI")
 
         LDEBUGC("ImGui", "Deinitialize GUI OpenGL");
         gui.deinitializeGL();
     });
 
-    global::callback::draw2D.emplace_back([&]() {
+    global::callback::draw2D->emplace_back([&]() {
         ZoneScopedN("ImGUI")
 
         WindowDelegate& delegate = *global::windowDelegate;
@@ -179,7 +179,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         }
     });
 
-    global::callback::keyboard.emplace_back(
+    global::callback::keyboard->emplace_back(
         [&](Key key, KeyModifier mod, KeyAction action) -> bool {
             ZoneScopedN("ImGUI")
 
@@ -193,7 +193,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         }
     );
 
-    global::callback::character.emplace_back(
+    global::callback::character->emplace_back(
         [&](unsigned int codepoint, KeyModifier modifier) -> bool {
             ZoneScopedN("ImGUI")
 
@@ -207,13 +207,13 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         }
     );
 
-    global::callback::mousePosition.emplace_back(
+    global::callback::mousePosition->emplace_back(
         [&](double x, double y) {
             _mousePosition = glm::vec2(static_cast<float>(x), static_cast<float>(y));
         }
     );
 
-    global::callback::mouseButton.emplace_back(
+    global::callback::mouseButton->emplace_back(
         [&](MouseButton button, MouseAction action, KeyModifier) -> bool {
             ZoneScopedN("ImGUI")
 
@@ -234,7 +234,7 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         }
     );
 
-    global::callback::mouseScrollWheel.emplace_back(
+    global::callback::mouseScrollWheel->emplace_back(
         [&](double, double posY) -> bool {
             ZoneScopedN("ImGUI")
 
@@ -248,19 +248,19 @@ ImGUIModule::ImGUIModule() : OpenSpaceModule(Name) {
         }
     );
 
-    global::callback::touchDetected.emplace_back(
+    global::callback::touchDetected->emplace_back(
         [&](TouchInput input) -> bool {
             return gui.touchDetectedCallback(input);
         }
     );
 
-    global::callback::touchUpdated.emplace_back(
+    global::callback::touchUpdated->emplace_back(
         [&](TouchInput input) -> bool {
             return gui.touchUpdatedCallback(input);
         }
     );
 
-    global::callback::touchExit.emplace_back(
+    global::callback::touchExit->emplace_back(
         [&](TouchInput input) {
             gui.touchExitCallback(input);
         }
diff --git a/modules/imgui/imguimodule.h b/modules/imgui/imguimodule.h
index e08556ffa8..9a1502bdae 100644
--- a/modules/imgui/imguimodule.h
+++ b/modules/imgui/imguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/gui.h b/modules/imgui/include/gui.h
index 0ec6ef76cd..2714eb52df 100644
--- a/modules/imgui/include/gui.h
+++ b/modules/imgui/include/gui.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guiassetcomponent.h b/modules/imgui/include/guiassetcomponent.h
index ff22b7b7f2..cd8b2bf6cc 100644
--- a/modules/imgui/include/guiassetcomponent.h
+++ b/modules/imgui/include/guiassetcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guicomponent.h b/modules/imgui/include/guicomponent.h
index cde49685cd..bb071aed95 100644
--- a/modules/imgui/include/guicomponent.h
+++ b/modules/imgui/include/guicomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guifilepathcomponent.h b/modules/imgui/include/guifilepathcomponent.h
index 05d678edc7..d6ad3478a1 100644
--- a/modules/imgui/include/guifilepathcomponent.h
+++ b/modules/imgui/include/guifilepathcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guigibscomponent.h b/modules/imgui/include/guigibscomponent.h
index 4f5b13569b..8d5449ded0 100644
--- a/modules/imgui/include/guigibscomponent.h
+++ b/modules/imgui/include/guigibscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guiglobebrowsingcomponent.h b/modules/imgui/include/guiglobebrowsingcomponent.h
index 3e0a5f1b6c..3bae875308 100644
--- a/modules/imgui/include/guiglobebrowsingcomponent.h
+++ b/modules/imgui/include/guiglobebrowsingcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guihelpcomponent.h b/modules/imgui/include/guihelpcomponent.h
index ba3ed2af5e..23fa1f6cdb 100644
--- a/modules/imgui/include/guihelpcomponent.h
+++ b/modules/imgui/include/guihelpcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guiiswacomponent.h b/modules/imgui/include/guiiswacomponent.h
index 468d1b0cc7..379a0e7af6 100644
--- a/modules/imgui/include/guiiswacomponent.h
+++ b/modules/imgui/include/guiiswacomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guijoystickcomponent.h b/modules/imgui/include/guijoystickcomponent.h
index 3ed79a2523..16b23ef622 100644
--- a/modules/imgui/include/guijoystickcomponent.h
+++ b/modules/imgui/include/guijoystickcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guimemorycomponent.h b/modules/imgui/include/guimemorycomponent.h
index 8f08bec8db..e3f6c065e3 100644
--- a/modules/imgui/include/guimemorycomponent.h
+++ b/modules/imgui/include/guimemorycomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guimissioncomponent.h b/modules/imgui/include/guimissioncomponent.h
index 3b10530dcc..2c5fe1135e 100644
--- a/modules/imgui/include/guimissioncomponent.h
+++ b/modules/imgui/include/guimissioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guiparallelcomponent.h b/modules/imgui/include/guiparallelcomponent.h
index 982c18bf18..0dec61fd2f 100644
--- a/modules/imgui/include/guiparallelcomponent.h
+++ b/modules/imgui/include/guiparallelcomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guipropertycomponent.h b/modules/imgui/include/guipropertycomponent.h
index b226cbbf30..fc5fcf6a56 100644
--- a/modules/imgui/include/guipropertycomponent.h
+++ b/modules/imgui/include/guipropertycomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guishortcutscomponent.h b/modules/imgui/include/guishortcutscomponent.h
index c6e95205a1..f6d02da055 100644
--- a/modules/imgui/include/guishortcutscomponent.h
+++ b/modules/imgui/include/guishortcutscomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/guispacetimecomponent.h b/modules/imgui/include/guispacetimecomponent.h
index 34f576d0d3..888fffd820 100644
--- a/modules/imgui/include/guispacetimecomponent.h
+++ b/modules/imgui/include/guispacetimecomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/include/imgui_include.h b/modules/imgui/include/imgui_include.h
index 3aafc34c8c..a41e22c3f6 100644
--- a/modules/imgui/include/imgui_include.h
+++ b/modules/imgui/include/imgui_include.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,8 +30,9 @@
 #pragma clang diagnostic ignored "-Wold-style-cast"
 #elif (defined __GNUC__)
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
 #endif // __clang__
 
 #include <imgui.h>
diff --git a/modules/imgui/include/renderproperties.h b/modules/imgui/include/renderproperties.h
index 566931b87d..16e0059a68 100644
--- a/modules/imgui/include/renderproperties.h
+++ b/modules/imgui/include/renderproperties.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/shaders/gui_fs.glsl b/modules/imgui/shaders/gui_fs.glsl
index f75b2cee35..55266b7681 100644
--- a/modules/imgui/shaders/gui_fs.glsl
+++ b/modules/imgui/shaders/gui_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/shaders/gui_vs.glsl b/modules/imgui/shaders/gui_vs.glsl
index f6d606f9bb..aed40bd172 100644
--- a/modules/imgui/shaders/gui_vs.glsl
+++ b/modules/imgui/shaders/gui_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/gui.cpp b/modules/imgui/src/gui.cpp
index 85868ef5c3..2b58331303 100644
--- a/modules/imgui/src/gui.cpp
+++ b/modules/imgui/src/gui.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -512,7 +512,7 @@ void GUI::endFrame() {
         glBindBuffer(GL_ARRAY_BUFFER, vbo);
         glBufferData(
             GL_ARRAY_BUFFER,
-            static_cast<GLsizeiptr>(cmdList->VtxBuffer.size() * sizeof(ImDrawVert)),
+            cmdList->VtxBuffer.size() * sizeof(ImDrawVert),
             reinterpret_cast<const GLvoid*>(&cmdList->VtxBuffer.front()),
             GL_STREAM_DRAW
         );
@@ -520,7 +520,7 @@ void GUI::endFrame() {
         glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, vboElements);
         glBufferData(
             GL_ELEMENT_ARRAY_BUFFER,
-            static_cast<GLsizeiptr>(cmdList->IdxBuffer.size() * sizeof(ImDrawIdx)),
+            cmdList->IdxBuffer.size() * sizeof(ImDrawIdx),
             reinterpret_cast<const GLvoid*>(&cmdList->IdxBuffer.front()),
             GL_STREAM_DRAW
         );
diff --git a/modules/imgui/src/guiassetcomponent.cpp b/modules/imgui/src/guiassetcomponent.cpp
index 7ab2c37365..92b6eedaa5 100644
--- a/modules/imgui/src/guiassetcomponent.cpp
+++ b/modules/imgui/src/guiassetcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guicomponent.cpp b/modules/imgui/src/guicomponent.cpp
index dfebb0b162..da394b7940 100644
--- a/modules/imgui/src/guicomponent.cpp
+++ b/modules/imgui/src/guicomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guifilepathcomponent.cpp b/modules/imgui/src/guifilepathcomponent.cpp
index fe4c7cdb0e..bfee3703ad 100644
--- a/modules/imgui/src/guifilepathcomponent.cpp
+++ b/modules/imgui/src/guifilepathcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guigibscomponent.cpp b/modules/imgui/src/guigibscomponent.cpp
index 779cf00de6..69c9acfac9 100644
--- a/modules/imgui/src/guigibscomponent.cpp
+++ b/modules/imgui/src/guigibscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,7 +28,7 @@
 #include <openspace/engine/globals.h>
 #include <openspace/scripting/scriptengine.h>
 #include <array>
-#pragma optimize ("", off)
+
 namespace {
     const ImVec2 WindowSize = ImVec2(350, 500);
 } // namespace
diff --git a/modules/imgui/src/guiglobebrowsingcomponent.cpp b/modules/imgui/src/guiglobebrowsingcomponent.cpp
index 70a712a4f5..963e290d8e 100644
--- a/modules/imgui/src/guiglobebrowsingcomponent.cpp
+++ b/modules/imgui/src/guiglobebrowsingcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -188,7 +188,7 @@ void GuiGlobeBrowsingComponent::render() {
         urlInfo.cbegin(),
         urlInfo.cend(),
         std::string(),
-        [](std::string lhs, const UrlInfo& i) {
+        [](const std::string& lhs, const UrlInfo& i) {
             return lhs + i.name + ": (" + i.url + ")" + '\0';
         }
     );
@@ -257,17 +257,11 @@ void GuiGlobeBrowsingComponent::render() {
 
     }
 
-    if (iServer < 0) {
-        return;
-    }
-    _currentServer = urlInfo[iServer].name;
-
-
-    // Can't use urlIt here since it might have been invalidated before
-    if (urlInfo.empty()) {
+    if (iServer < 0 || urlInfo.empty()) {
         // There are no server so we have to bail
         return;
     }
+    _currentServer = urlInfo[iServer].name;
 
     ImGui::Separator();
 
diff --git a/modules/imgui/src/guihelpcomponent.cpp b/modules/imgui/src/guihelpcomponent.cpp
index 6da9e9b35b..58d19ceae1 100644
--- a/modules/imgui/src/guihelpcomponent.cpp
+++ b/modules/imgui/src/guihelpcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guiiswacomponent.cpp b/modules/imgui/src/guiiswacomponent.cpp
index 21a7d366c1..3c117b3fcc 100644
--- a/modules/imgui/src/guiiswacomponent.cpp
+++ b/modules/imgui/src/guiiswacomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -185,7 +185,7 @@ void GuiIswaComponent::render() {
         const std::map<int, std::shared_ptr<CygnetInfo>>& map =
             IswaManager::ref().cygnetInformation();
 
-        for (const std::pair<int, std::shared_ptr<CygnetInfo>>& cygnetInfo : map) {
+        for (const std::pair<const int, std::shared_ptr<CygnetInfo>>& cygnetInfo : map) {
             int id = cygnetInfo.first;
             CygnetInfo& info = *cygnetInfo.second;
 
diff --git a/modules/imgui/src/guijoystickcomponent.cpp b/modules/imgui/src/guijoystickcomponent.cpp
index 3b4609d406..090594065a 100644
--- a/modules/imgui/src/guijoystickcomponent.cpp
+++ b/modules/imgui/src/guijoystickcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guimemorycomponent.cpp b/modules/imgui/src/guimemorycomponent.cpp
index 04a6e6f6a4..87809b53fd 100644
--- a/modules/imgui/src/guimemorycomponent.cpp
+++ b/modules/imgui/src/guimemorycomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -39,7 +39,7 @@ namespace {
         for (size_t i = 0; i < occupancies.size(); ++i) {
             ImGui::Text(
                 "  %i: %i/%i (%.2f/%.2f kiB)",
-                i,
+                static_cast<int>(i),
                 occupancies[i],
                 p._bucketSize,
                 occupancies[i] / 1024.f,
diff --git a/modules/imgui/src/guimissioncomponent.cpp b/modules/imgui/src/guimissioncomponent.cpp
index a91eb86dbc..8b82896e95 100644
--- a/modules/imgui/src/guimissioncomponent.cpp
+++ b/modules/imgui/src/guimissioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guiparallelcomponent.cpp b/modules/imgui/src/guiparallelcomponent.cpp
index b854f05697..68641b74c5 100644
--- a/modules/imgui/src/guiparallelcomponent.cpp
+++ b/modules/imgui/src/guiparallelcomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guipropertycomponent.cpp b/modules/imgui/src/guipropertycomponent.cpp
index 96ca7bcd26..f59d77a9c3 100644
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -83,7 +83,7 @@ namespace {
     }
 
     struct TreeNode {
-        TreeNode(std::string p)
+        explicit TreeNode(std::string p)
             : path(std::move(p))
 #ifdef Debugging_ImGui_TreeNode_Indices
             , index(nextIndex++)
diff --git a/modules/imgui/src/guishortcutscomponent.cpp b/modules/imgui/src/guishortcutscomponent.cpp
index 17e0aaca94..4b066bf0aa 100644
--- a/modules/imgui/src/guishortcutscomponent.cpp
+++ b/modules/imgui/src/guishortcutscomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/imgui/src/guispacetimecomponent.cpp b/modules/imgui/src/guispacetimecomponent.cpp
index 2508abef96..9e296d4280 100644
--- a/modules/imgui/src/guispacetimecomponent.cpp
+++ b/modules/imgui/src/guispacetimecomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -393,7 +393,7 @@ void GuiSpaceTimeComponent::render() {
             // value to the new unit
 
             _deltaTime = static_cast<float>(
-                convertTime(dt, TimeUnit::Second, static_cast<TimeUnit>(_deltaTimeUnit))
+                convertTime(dt, TimeUnit::Second, _deltaTimeUnit)
             );
         }
     }
@@ -461,7 +461,7 @@ void GuiSpaceTimeComponent::render() {
             const double newDeltaTime = convertTime(
                 _deltaTime +
                     _accelerationDelta * global::windowDelegate->deltaTime() * 10,
-                static_cast<TimeUnit>(_deltaTimeUnit),
+                _deltaTimeUnit,
                 TimeUnit::Second
             );
 
diff --git a/modules/imgui/src/renderproperties.cpp b/modules/imgui/src/renderproperties.cpp
index 4d20ef70f0..a74be8c3d7 100644
--- a/modules/imgui/src/renderproperties.cpp
+++ b/modules/imgui/src/renderproperties.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -125,7 +125,9 @@ void renderOptionProperty(Property* prop, const std::string& ownerName,
     const std::string& name = p->guiName();
     ImGui::PushID((ownerName + "." + name).c_str());
     bool isReadOnly = false;
-    p->metaData().getValue("isReadOnly", isReadOnly);
+    if (p->metaData().hasValue<bool>("isReadOnly")) {
+        isReadOnly = p->metaData().value<bool>("isReadOnly");
+    }
 
     int value = *p;
     const std::vector<OptionProperty::Option>& options = p->options();
diff --git a/modules/iswa/CMakeLists.txt b/modules/iswa/CMakeLists.txt
index 1edcd9d964..ef7da79de0 100644
--- a/modules/iswa/CMakeLists.txt
+++ b/modules/iswa/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,51 +25,51 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datacygnet.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswabasegroup.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswadatagroup.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswakameleongroup.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texturecygnet.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessor.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorjson.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorkameleon.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessortext.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager_lua.inl
+  rendering/datacygnet.h
+  rendering/dataplane.h
+  rendering/datasphere.h
+  rendering/kameleonplane.h
+  rendering/iswabasegroup.h
+  rendering/iswacygnet.h
+  rendering/iswadatagroup.h
+  rendering/iswakameleongroup.h
+  rendering/screenspacecygnet.h
+  rendering/texturecygnet.h
+  rendering/textureplane.h
+  util/dataprocessor.h
+  util/dataprocessorjson.h
+  util/dataprocessorkameleon.h
+  util/dataprocessortext.h
+  util/iswamanager.h
+  util/iswamanager_lua.inl
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessor.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorjson.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessorkameleon.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/dataprocessortext.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/iswamanager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datacygnet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/dataplane.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/datasphere.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswabasegroup.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswacygnet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswadatagroup.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/iswakameleongroup.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/kameleonplane.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/screenspacecygnet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/texturecygnet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/textureplane.cpp
+  util/dataprocessor.cpp
+  util/dataprocessorjson.cpp
+  util/dataprocessorkameleon.cpp
+  util/dataprocessortext.cpp
+  util/iswamanager.cpp
+  rendering/datacygnet.cpp
+  rendering/dataplane.cpp
+  rendering/datasphere.cpp
+  rendering/iswabasegroup.cpp
+  rendering/iswacygnet.cpp
+  rendering/iswadatagroup.cpp
+  rendering/iswakameleongroup.cpp
+  rendering/kameleonplane.cpp
+  rendering/screenspacecygnet.cpp
+  rendering/texturecygnet.cpp
+  rendering/textureplane.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dataplane_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/dataplane_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/textureplane_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/textureplane_vs.glsl
+  shaders/dataplane_fs.glsl
+  shaders/dataplane_vs.glsl
+  shaders/textureplane_fs.glsl
+  shaders/textureplane_vs.glsl
 )
 
 source_group("Shader Files" FILES ${SHADER_FILES})
diff --git a/modules/iswa/include.cmake b/modules/iswa/include.cmake
index 9c6bb4a938..f6e8111e4e 100644
--- a/modules/iswa/include.cmake
+++ b/modules/iswa/include.cmake
@@ -1,5 +1,3 @@
 set (OPENSPACE_DEPENDENCIES
-  base
   kameleon
-  space
-)
\ No newline at end of file
+)
diff --git a/modules/iswa/iswamodule.cpp b/modules/iswa/iswamodule.cpp
index fa2869a174..bc473674c7 100644
--- a/modules/iswa/iswamodule.cpp
+++ b/modules/iswa/iswamodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -43,7 +43,7 @@
 namespace openspace {
 
 IswaModule::IswaModule() : OpenSpaceModule(Name) {
-    global::callback::initialize.push_back([]() {
+    global::callback::initialize->push_back([]() {
         ZoneScopedN("IswaModule")
         IswaManager::initialize();
     });
diff --git a/modules/iswa/iswamodule.h b/modules/iswa/iswamodule.h
index 365d24a0b4..da7641640b 100644
--- a/modules/iswa/iswamodule.h
+++ b/modules/iswa/iswamodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/datacygnet.cpp b/modules/iswa/rendering/datacygnet.cpp
index 35e17aae52..8db4963ef7 100644
--- a/modules/iswa/rendering/datacygnet.cpp
+++ b/modules/iswa/rendering/datacygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -331,7 +331,7 @@ void DataCygnet::subscribeToGroup() {
         "dataOptionsChanged",
         [&](const ghoul::Dictionary& dict) {
             LDEBUG(identifier() + " Event dataOptionsChanged");
-            if (dict.hasKeyAndValue<std::vector<int>>("dataOptions")) {
+            if (dict.hasValue<std::vector<int>>("dataOptions")) {
                 _dataOptions = dict.value<std::vector<int>>("dataOptions");
             }
         }
@@ -342,8 +342,8 @@ void DataCygnet::subscribeToGroup() {
         "normValuesChanged",
         [&](const ghoul::Dictionary& dict) {
             LDEBUG(identifier() + " Event normValuesChanged");
-            if (dict.hasKeyAndValue<glm::vec2>("normValues")) {
-                _normValues = dict.value<glm::vec2>("normValues");
+            if (dict.hasValue<glm::dvec2>("normValues")) {
+                _normValues = dict.value<glm::dvec2>("normValues");
             }
         }
     );
@@ -353,8 +353,8 @@ void DataCygnet::subscribeToGroup() {
         "backgroundValuesChanged",
         [&](const ghoul::Dictionary& dict) {
             LDEBUG(identifier() + " Event backgroundValuesChanged");
-            if (dict.hasKeyAndValue<glm::vec2>("backgroundValues")) {
-                _backgroundValues = dict.value<glm::vec2>("backgroundValues");
+            if (dict.hasValue<glm::dvec2>("backgroundValues")) {
+                _backgroundValues = dict.value<glm::dvec2>("backgroundValues");
             }
         }
     );
diff --git a/modules/iswa/rendering/datacygnet.h b/modules/iswa/rendering/datacygnet.h
index f568d47e35..abc1c9c58f 100644
--- a/modules/iswa/rendering/datacygnet.h
+++ b/modules/iswa/rendering/datacygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp
index 5128c9606b..72f976647c 100644
--- a/modules/iswa/rendering/dataplane.cpp
+++ b/modules/iswa/rendering/dataplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h
index 38c808957f..4f004174c0 100644
--- a/modules/iswa/rendering/dataplane.h
+++ b/modules/iswa/rendering/dataplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/datasphere.cpp b/modules/iswa/rendering/datasphere.cpp
index 208e3af6ef..3dde3381c9 100644
--- a/modules/iswa/rendering/datasphere.cpp
+++ b/modules/iswa/rendering/datasphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,7 +38,7 @@ namespace openspace {
 DataSphere::DataSphere(const ghoul::Dictionary& dictionary)
     : DataCygnet(dictionary)
 {
-    _radius = dictionary.value<float>("Radius");
+    _radius = static_cast<float>(dictionary.value<double>("Radius"));
 }
 
 DataSphere::~DataSphere() {}
diff --git a/modules/iswa/rendering/datasphere.h b/modules/iswa/rendering/datasphere.h
index 33a40bb562..1b986f0b81 100644
--- a/modules/iswa/rendering/datasphere.h
+++ b/modules/iswa/rendering/datasphere.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/iswabasegroup.cpp b/modules/iswa/rendering/iswabasegroup.cpp
index 43963773c5..3accaedab0 100644
--- a/modules/iswa/rendering/iswabasegroup.cpp
+++ b/modules/iswa/rendering/iswabasegroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -95,12 +95,16 @@ ghoul::Event<ghoul::Dictionary>& IswaBaseGroup::groupEvent() {
 void IswaBaseGroup::registerProperties() {
     _enabled.onChange([this]() {
         LDEBUG("Group " + identifier() + " published enabledChanged");
-        _groupEvent.publish("enabledChanged", ghoul::Dictionary({{"enabled", _enabled}}));
+        ghoul::Dictionary d;
+        d.setValue("enabled", _enabled.value());
+        _groupEvent.publish("enabledChanged", d);
     });
 
     _alpha.onChange([this]() {
         LDEBUG("Group " + identifier() + " published alphaChanged");
-        _groupEvent.publish("alphaChanged", ghoul::Dictionary({ { "alpha", _alpha } }));
+        ghoul::Dictionary d;
+        d.setValue("alpha", static_cast<double>(_alpha));
+        _groupEvent.publish("alphaChanged", d);
     });
 
 
diff --git a/modules/iswa/rendering/iswabasegroup.h b/modules/iswa/rendering/iswabasegroup.h
index f78dbca28e..0409360be6 100644
--- a/modules/iswa/rendering/iswabasegroup.h
+++ b/modules/iswa/rendering/iswabasegroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/iswacygnet.cpp b/modules/iswa/rendering/iswacygnet.cpp
index 651ff8561b..267f00ac53 100644
--- a/modules/iswa/rendering/iswacygnet.cpp
+++ b/modules/iswa/rendering/iswacygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -63,39 +63,60 @@ IswaCygnet::IswaCygnet(const ghoul::Dictionary& dictionary)
 {
     // This changed from setIdentifier to setGuiName, 2018-03-14 ---abock
     std::string name;
-    dictionary.getValue("Name", name);
+    if (dictionary.hasValue<std::string>("Name")) {
+        name = dictionary.value<std::string>("Name");
+    }
     setGuiName(name);
 
-    float renderableId;
-    dictionary.getValue("Id", renderableId);
-    float updateTime;
-    dictionary.getValue("UpdateTime", updateTime);
-    glm::vec4 spatialScale = glm::vec4(0.f);
-    dictionary.getValue("SpatialScale", spatialScale);
-    glm::vec3 min = glm::vec3(0.f);
-    dictionary.getValue("GridMin", min);
-    glm::vec3 max = glm::vec3(0.f);
-    dictionary.getValue("GridMax", max);
-    dictionary.getValue("Frame",_data.frame);
-    dictionary.getValue("CoordinateType", _data.coordinateType);
-    float xOffset = 0.f;
-    dictionary.getValue("XOffset", xOffset);
+    _data.id = static_cast<int>(dictionary.value<double>("Id"));
+    _data.updateTime = static_cast<int>(dictionary.value<double>("UpdateTime"));
 
-    dictionary.getValue("Group", _data.groupName);
+    _data.spatialScale = glm::dvec4(0.f);
+    if (dictionary.hasValue<glm::dvec4>("SpatialScale")) {
+        _data.spatialScale = dictionary.value<glm::dvec4>("SpatialScale");
+    }
 
-    _data.id = static_cast<int>(renderableId);
-    _data.updateTime = static_cast<int>(updateTime);
-    _data.spatialScale = spatialScale;
-    _data.gridMin = min;
-    _data.gridMax = max;
+    _data.gridMin = glm::dvec3(0.f);
+    if (dictionary.hasValue<glm::dvec3>("GridMin")) {
+        _data.gridMin = dictionary.value<glm::dvec3>("GridMin");
+    }
 
-    glm::vec3 scale = glm::vec3((max.x - min.x), (max.y - min.y), (max.z - min.z));
+    _data.gridMax = glm::dvec3(0.f);
+    if (dictionary.hasValue<glm::dvec3>("GridMax")) {
+        _data.gridMax = dictionary.value<glm::dvec3>("GridMax");
+    }
+
+    if (dictionary.hasKey("Frame") && dictionary.hasValue<std::string>("Frame")) {
+        _data.frame = dictionary.value<std::string>("Frame");
+    }
+    if (dictionary.hasValue<std::string>("CoordinateType")) {
+        _data.coordinateType = dictionary.value<std::string>("CoordinateType");
+    }
+
+
+    double xOffset = 0.f;
+    if (dictionary.hasValue<double>("XOffset")) {
+        xOffset = dictionary.value<double>("XOffset");
+    }
+    if (dictionary.hasValue<std::string>("Group")) {
+        _data.groupName = dictionary.value<std::string>("Group");
+    }
+
+
+    glm::vec3 scale = glm::vec3(
+        _data.gridMax.x - _data.gridMin.x,
+        _data.gridMax.y - _data.gridMin.y,
+        _data.gridMax.z - _data.gridMin.z
+    );
     _data.scale = scale;
 
     glm::vec3 offset = glm::vec3(
-        (min.x + (std::abs(min.x) + std::abs(max.x)) / 2.f) + xOffset,
-        (min.y + (std::abs(min.y) + std::abs(max.y)) / 2.f),
-        (min.z + (std::abs(min.z) + std::abs(max.z)) / 2.f)
+        (_data.gridMin.x +
+            (std::abs(_data.gridMin.x) + std::abs(_data.gridMax.x)) / 2.f) + xOffset,
+        (_data.gridMin.y +
+            (std::abs(_data.gridMin.y) + std::abs(_data.gridMax.y)) / 2.f),
+        (_data.gridMin.z +
+            (std::abs(_data.gridMin.z) + std::abs(_data.gridMax.z)) / 2.f)
     );
     _data.offset = offset;
 
@@ -163,7 +184,7 @@ void IswaCygnet::render(const RenderData& data, RendererTasks&) {
             _data.spatialScale.x * _data.offset,
             _data.spatialScale.w
         );
-    glm::vec3 position = glm::vec3(pposition) * pow(10.f, pposition.w);
+    glm::vec3 position = glm::vec3(pposition) * static_cast<float>(pow(10.f, pposition.w));
 
     // Activate shader
     _shader->activate();
@@ -271,7 +292,7 @@ void IswaCygnet::initializeGroup() {
         "alphaChanged",
         [&](const ghoul::Dictionary& dict) {
             LDEBUG(identifier() + " Event alphaChanged");
-            _alpha = dict.value<float>("alpha");
+            _alpha = static_cast<float>(dict.value<double>("alpha"));
         }
     );
 
diff --git a/modules/iswa/rendering/iswacygnet.h b/modules/iswa/rendering/iswacygnet.h
index c8b93701c4..811a64e733 100644
--- a/modules/iswa/rendering/iswacygnet.h
+++ b/modules/iswa/rendering/iswacygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/iswadatagroup.cpp b/modules/iswa/rendering/iswadatagroup.cpp
index 33a6275dab..86b8c44510 100644
--- a/modules/iswa/rendering/iswadatagroup.cpp
+++ b/modules/iswa/rendering/iswadatagroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -110,21 +110,19 @@ IswaDataGroup::~IswaDataGroup() {}
 void IswaDataGroup::registerProperties() {
     _useLog.onChange([this]() {
         LDEBUG("Group " + identifier() + " published useLogChanged");
-        _groupEvent.publish(
-            "useLogChanged",
-            ghoul::Dictionary({ { "useLog", _useLog.value() } })
-        );
+        ghoul::Dictionary d;
+        d.setValue("useLog", _useLog.value());
+        _groupEvent.publish("useLogChanged", d);
     });
 
     _useHistogram.onChange([this]() {
         LDEBUG("Group " + identifier() + " published useHistogramChanged");
-        _groupEvent.publish(
-            "useHistogramChanged",
-            ghoul::Dictionary({ { "useHistogram", _useHistogram.value() } })
-        );
+        ghoul::Dictionary d;
+        d.setValue("useHistogram", _useHistogram.value());
+        _groupEvent.publish("useHistogramChanged", d);
     });
 
-    //If autofiler is on, background values property should be hidden
+    // If autofiler is on, background values property should be hidden
     _autoFilter.onChange([this]() {
         LDEBUG("Group " + identifier() + " published autoFilterChanged");
         // If autofiler is selected, use _dataProcessor to set backgroundValues
@@ -139,40 +137,36 @@ void IswaDataGroup::registerProperties() {
             _backgroundValues.setVisibility(properties::Property::Visibility::All);
             //_backgroundValues.setVisible(true);
         }
-        _groupEvent.publish(
-            "autoFilterChanged",
-            ghoul::Dictionary({ { "autoFilter", _autoFilter.value() } })
-        );
+        ghoul::Dictionary d;
+        d.setValue("autoFilter", _autoFilter.value());
+        _groupEvent.publish("autoFilterChanged", d);
     });
 
     _normValues.onChange([this]() {
         LDEBUG("Group " + identifier() + " published normValuesChanged");
-        _groupEvent.publish(
-            "normValuesChanged",
-            ghoul::Dictionary({ { "normValues", _normValues.value() } })
-        );
+        ghoul::Dictionary d;
+        d.setValue("normValues", glm::dvec2(_normValues.value()));
+        _groupEvent.publish("normValuesChanged", d);
     });
 
     _backgroundValues.onChange([this]() {
         LDEBUG("Group " + identifier() + " published backgroundValuesChanged");
-        _groupEvent.publish(
-            "backgroundValuesChanged",
-            ghoul::Dictionary({ { "backgroundValues", _backgroundValues.value() } })
-        );
+        ghoul::Dictionary d;
+        d.setValue("backgroundValues", glm::dvec2(_backgroundValues.value()));
+        _groupEvent.publish("backgroundValuesChanged", d);
     });
 
     _transferFunctionsFile.onChange([this]() {
         LDEBUG("Group " + identifier() + " published transferFunctionsChanged");
-        _groupEvent.publish(
-            "transferFunctionsChanged",
-            ghoul::Dictionary({ { "transferFunctions", _transferFunctionsFile.value() } })
-        );
+        ghoul::Dictionary d;
+        d.setValue("transferFunctionsChanged", _transferFunctionsFile.value());
+        _groupEvent.publish("transferFunctionsChanged", d);
     });
 
     _dataOptions.onChange([this]() {
         LDEBUG("Group " + identifier() + " published dataOptionsChanged");
         ghoul::Dictionary dict;
-        dict.setValue<std::vector<int>>("dataOptions", _dataOptions.value());
+        dict.setValue("dataOptions", _dataOptions.value());
         _groupEvent.publish("dataOptionsChanged", dict);
     });
 }
diff --git a/modules/iswa/rendering/iswadatagroup.h b/modules/iswa/rendering/iswadatagroup.h
index b9c437c9c5..af34271e1a 100644
--- a/modules/iswa/rendering/iswadatagroup.h
+++ b/modules/iswa/rendering/iswadatagroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/iswakameleongroup.cpp b/modules/iswa/rendering/iswakameleongroup.cpp
index 8d6928ba93..1f35bb5d06 100644
--- a/modules/iswa/rendering/iswakameleongroup.cpp
+++ b/modules/iswa/rendering/iswakameleongroup.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -89,10 +89,9 @@ void IswaKameleonGroup::setFieldlineInfo(std::string fieldlineIndexFile,
 void IswaKameleonGroup::registerProperties() {
     _resolution.onChange([this]() {
         LDEBUG("Group " + identifier() + " published resolutionChanged");
-        _groupEvent.publish(
-            "resolutionChanged",
-            ghoul::Dictionary({ { "resolution", _resolution.value() } })
-        );
+        ghoul::Dictionary d;
+        d.setValue("resolution", static_cast<double>(_resolution));
+        _groupEvent.publish("resolutionChanged", d);
     });
 
     _fieldlines.onChange([this]() { updateFieldlineSeeds(); });
@@ -190,7 +189,9 @@ void IswaKameleonGroup::changeCdf(std::string path) {
     clearFieldlines();
     updateFieldlineSeeds();
 
-    _groupEvent.publish("cdfChanged", ghoul::Dictionary({ { "path", std::move(path) } }));
+    ghoul::Dictionary d;
+    d.setValue("path", std::move(path));
+    _groupEvent.publish("cdfChanged", d);
 }
 
 } //namespace openspace
diff --git a/modules/iswa/rendering/iswakameleongroup.h b/modules/iswa/rendering/iswakameleongroup.h
index 9194b528f9..c692ba4d5d 100644
--- a/modules/iswa/rendering/iswakameleongroup.h
+++ b/modules/iswa/rendering/iswakameleongroup.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/kameleonplane.cpp b/modules/iswa/rendering/kameleonplane.cpp
index 93a42400d8..cdbaa9eb1f 100644
--- a/modules/iswa/rendering/kameleonplane.cpp
+++ b/modules/iswa/rendering/kameleonplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -74,13 +74,18 @@ KameleonPlane::KameleonPlane(const ghoul::Dictionary& dictionary)
     addProperty(_slice);
     addProperty(_fieldlines);
 
-    dictionary.getValue("kwPath", _kwPath);
+    if (dictionary.hasValue<std::string>("kwPath")) {
+        _kwPath = dictionary.value<std::string>("kwPath");
+    }
 
-    std::string fieldlineIndexFile;
-    dictionary.getValue("fieldlineSeedsIndexFile", _fieldlineIndexFile);
+    if (dictionary.hasValue<std::string>("fieldlineSeedsIndexFile")) {
+        _fieldlineIndexFile = dictionary.value<std::string>("fieldlineSeedsIndexFile");
+    }
 
     std::string axis;
-    dictionary.getValue("axisCut", axis);
+    if (dictionary.hasValue<std::string>("axisCut")) {
+        axis = dictionary.value<std::string>("axisCut");
+    }
 
     if (axis == "x") {
         _cut = Cut::X;
@@ -356,14 +361,14 @@ void KameleonPlane::subscribeToGroup() {
     ghoul::Event<ghoul::Dictionary>& groupEvent = _group->groupEvent();
     groupEvent.subscribe(identifier(), "resolutionChanged", [&](ghoul::Dictionary dict) {
         LDEBUG(identifier() + " Event resolutionChanged");
-        if (dict.hasKeyAndValue<float>("resolution")) {
-            _resolution = dict.value<float>("resolution");
+        if (dict.hasKey("resolution") && dict.hasValue<double>("resolution")) {
+            _resolution = static_cast<float>(dict.value<double>("resolution"));
         }
     });
 
     groupEvent.subscribe(identifier(), "cdfChanged", [&](ghoul::Dictionary dict) {
         LDEBUG(identifier() + " Event cdfChanged");
-        if (dict.hasKeyAndValue<std::string>("path")) {
+        if (dict.hasKey("path") && dict.hasValue<std::string>("path")) {
             const std::string& path = dict.value<std::string>("path");
             changeKwPath(path);
         }
diff --git a/modules/iswa/rendering/kameleonplane.h b/modules/iswa/rendering/kameleonplane.h
index 3bc453fe76..e6699fc952 100644
--- a/modules/iswa/rendering/kameleonplane.h
+++ b/modules/iswa/rendering/kameleonplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/screenspacecygnet.cpp b/modules/iswa/rendering/screenspacecygnet.cpp
index fc378db93b..e82672b91b 100644
--- a/modules/iswa/rendering/screenspacecygnet.cpp
+++ b/modules/iswa/rendering/screenspacecygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/screenspacecygnet.h b/modules/iswa/rendering/screenspacecygnet.h
index 8f29c0098b..d1d18b180b 100644
--- a/modules/iswa/rendering/screenspacecygnet.h
+++ b/modules/iswa/rendering/screenspacecygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/texturecygnet.cpp b/modules/iswa/rendering/texturecygnet.cpp
index 7f21ffb29d..a9c08e9323 100644
--- a/modules/iswa/rendering/texturecygnet.cpp
+++ b/modules/iswa/rendering/texturecygnet.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/texturecygnet.h b/modules/iswa/rendering/texturecygnet.h
index 56237965c6..b008259243 100644
--- a/modules/iswa/rendering/texturecygnet.h
+++ b/modules/iswa/rendering/texturecygnet.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/textureplane.cpp b/modules/iswa/rendering/textureplane.cpp
index 57d1ef7cf9..1e6883e68c 100644
--- a/modules/iswa/rendering/textureplane.cpp
+++ b/modules/iswa/rendering/textureplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/rendering/textureplane.h b/modules/iswa/rendering/textureplane.h
index 9495f18c52..48eef12d63 100644
--- a/modules/iswa/rendering/textureplane.h
+++ b/modules/iswa/rendering/textureplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/shaders/dataplane_fs.glsl b/modules/iswa/shaders/dataplane_fs.glsl
index 9e53abf9cb..b7ffbc360f 100644
--- a/modules/iswa/shaders/dataplane_fs.glsl
+++ b/modules/iswa/shaders/dataplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/shaders/dataplane_vs.glsl b/modules/iswa/shaders/dataplane_vs.glsl
index 24404321c0..6329933b4e 100644
--- a/modules/iswa/shaders/dataplane_vs.glsl
+++ b/modules/iswa/shaders/dataplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/shaders/datasphere_fs.glsl b/modules/iswa/shaders/datasphere_fs.glsl
index a374bd57c2..7c6d57670f 100644
--- a/modules/iswa/shaders/datasphere_fs.glsl
+++ b/modules/iswa/shaders/datasphere_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -62,7 +62,8 @@ Fragment getFragment() {
         }
 
         diffuse = color;
-    } else {
+    }
+    else {
         for (int i = 0; i < numTextures; i++) {
             float v = texture(textures[i], vec2(vs_st.t, vs_st.s)).r;
             vec4 color = texture(transferFunctions[i], vec2(v, 0.0));
diff --git a/modules/iswa/shaders/datasphere_vs.glsl b/modules/iswa/shaders/datasphere_vs.glsl
index af4b217a9b..0c7246dd76 100644
--- a/modules/iswa/shaders/datasphere_vs.glsl
+++ b/modules/iswa/shaders/datasphere_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/shaders/textureplane_fs.glsl b/modules/iswa/shaders/textureplane_fs.glsl
index 5835f23da9..c911dcaff6 100644
--- a/modules/iswa/shaders/textureplane_fs.glsl
+++ b/modules/iswa/shaders/textureplane_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/shaders/textureplane_vs.glsl b/modules/iswa/shaders/textureplane_vs.glsl
index cfab2d9c0d..2c8dc25627 100644
--- a/modules/iswa/shaders/textureplane_vs.glsl
+++ b/modules/iswa/shaders/textureplane_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/dataprocessor.cpp b/modules/iswa/util/dataprocessor.cpp
index 0bda04e042..ae00d224d7 100644
--- a/modules/iswa/util/dataprocessor.cpp
+++ b/modules/iswa/util/dataprocessor.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -182,7 +182,9 @@ void DataProcessor::add(const std::vector<std::vector<float>>& optionValues,
             values.begin(),
             values.end(),
             0.f,
-            [mean](float l, float r) { return l + pow(r - mean, 2); }
+            [mean](float l, float r) {
+                return l + static_cast<float>(std::pow(r - mean, 2));
+            }
         );
         const float standardDeviation = sqrt(variance / numValues);
 
@@ -190,8 +192,9 @@ void DataProcessor::add(const std::vector<std::vector<float>>& optionValues,
         const float oldMean = (1.f / _numValues[i]) * _sum[i];
 
         _sum[i] += sum[i];
-        _standardDeviation[i] = sqrt(pow(standardDeviation, 2) +
-                                pow(_standardDeviation[i], 2));
+        _standardDeviation[i] = static_cast<float>(
+            std::sqrt(std::pow(standardDeviation, 2) + std::pow(_standardDeviation[i], 2))
+        );
         _numValues[i] += numValues;
 
         const float min = normalizeWithStandardScore(
diff --git a/modules/iswa/util/dataprocessor.h b/modules/iswa/util/dataprocessor.h
index b3f083dde8..d6c934e8fc 100644
--- a/modules/iswa/util/dataprocessor.h
+++ b/modules/iswa/util/dataprocessor.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/dataprocessorjson.cpp b/modules/iswa/util/dataprocessorjson.cpp
index 70cc3af559..5c02653433 100644
--- a/modules/iswa/util/dataprocessorjson.cpp
+++ b/modules/iswa/util/dataprocessorjson.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/dataprocessorjson.h b/modules/iswa/util/dataprocessorjson.h
index 5c6ca80db7..1faaa810b9 100644
--- a/modules/iswa/util/dataprocessorjson.h
+++ b/modules/iswa/util/dataprocessorjson.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/dataprocessorkameleon.cpp b/modules/iswa/util/dataprocessorkameleon.cpp
index 6028d535cc..95b3f6c217 100644
--- a/modules/iswa/util/dataprocessorkameleon.cpp
+++ b/modules/iswa/util/dataprocessorkameleon.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/dataprocessorkameleon.h b/modules/iswa/util/dataprocessorkameleon.h
index f0f03a4a65..24c0f366e7 100644
--- a/modules/iswa/util/dataprocessorkameleon.h
+++ b/modules/iswa/util/dataprocessorkameleon.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/dataprocessortext.cpp b/modules/iswa/util/dataprocessortext.cpp
index 2d5b0942c5..bcd02f0125 100644
--- a/modules/iswa/util/dataprocessortext.cpp
+++ b/modules/iswa/util/dataprocessortext.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/dataprocessortext.h b/modules/iswa/util/dataprocessortext.h
index c08167461f..cdb08053b7 100644
--- a/modules/iswa/util/dataprocessortext.h
+++ b/modules/iswa/util/dataprocessortext.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/iswamanager.cpp b/modules/iswa/util/iswamanager.cpp
index 2d5cec6064..ff0655fdbc 100644
--- a/modules/iswa/util/iswamanager.cpp
+++ b/modules/iswa/util/iswamanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -268,10 +268,8 @@ std::string IswaManager::iswaUrl(int id, double timestamp, const std::string& ty
               "window=-1&cygnetId="+ std::to_string(id) +"&timestamp=";
     }
 
-    //std::string t = Time::ref().currentTimeUTC();
-    std::string_view t = SpiceManager::ref().dateFromEphemerisTime(timestamp);
     std::stringstream ss;
-    ss << t;
+    ss << SpiceManager::ref().dateFromEphemerisTime(timestamp);;
     std::string token;
 
     std::getline(ss, token, ' ');
@@ -483,8 +481,6 @@ std::string IswaManager::jsonSphereToLuaTable(MetadataFuture& data) {
     float updateTime = j["output_time_interval"];
     float radius = j["radius"];
 
-    glm::vec4 spatialScale(6.371f, 6.371f, 6.371f, 6);
-
     glm::vec3 max(
         j["x"]["actual_max"],
         j["y"]["actual_max"],
diff --git a/modules/iswa/util/iswamanager.h b/modules/iswa/util/iswamanager.h
index 66da61f1c3..3c675dddab 100644
--- a/modules/iswa/util/iswamanager.h
+++ b/modules/iswa/util/iswamanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/iswa/util/iswamanager_lua.inl b/modules/iswa/util/iswamanager_lua.inl
index b5e8dbbc70..8e8e618e40 100644
--- a/modules/iswa/util/iswamanager_lua.inl
+++ b/modules/iswa/util/iswamanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -91,8 +91,8 @@ int iswa_addScreenSpaceCygnet(lua_State* L) {
     }
     else {
         d.setValue("Name", name);
-        d.setValue("Type", "ScreenSpaceCygnet");
-        d.setValue("UpdateInterval", static_cast<float>(updateInterval));
+        d.setValue("Type", std::string("ScreenSpaceCygnet"));
+        d.setValue("UpdateInterval", static_cast<double>(updateInterval));
 
         std::unique_ptr<ScreenSpaceRenderable> s(
             ScreenSpaceRenderable::createFromDictionary(d)
diff --git a/modules/kameleon/CMakeLists.txt b/modules/kameleon/CMakeLists.txt
index c82a216b5a..c59773d216 100644
--- a/modules/kameleon/CMakeLists.txt
+++ b/modules/kameleon/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,15 +25,19 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
 
+# Use <PackageName>_ROOT variables
+# https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
+cmake_policy(SET CMP0074 NEW)
+
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/kameleonwrapper.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/kameleonhelper.h
+  include/kameleonwrapper.h
+  include/kameleonhelper.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/kameleonwrapper.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/kameleonhelper.cpp
+  src/kameleonwrapper.cpp
+  src/kameleonhelper.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
@@ -60,29 +64,16 @@ target_link_libraries(${kameleon_module} PRIVATE ccmc)
 mark_as_advanced(CDF_BUILD_ZLIB CDF_INCLUDES CDF_LIBRARY CDF_USE_STATIC_LIBS
   CDF_USE_ZLIB HDF5_DIR HDF5_USE_STATIC_LIBRARIES KAMELEON_LIBRARY_ONLY KAMELEON_USE_HDF5
 )
-
-if (GHOUL_DISABLE_EXTERNAL_WARNINGS)
-  if (MSVC)
-    target_compile_options(ccmc PRIVATE "/W0" "/MP")
-    target_compile_definitions(ccmc PRIVATE "_SCL_SECURE_NO_WARNINGS")
-  else ()
-    target_compile_options(ccmc PRIVATE "-w")
-  endif ()
-endif ()
+disable_external_warnings(ccmc)
 set_folder_location(ccmc "External")
 if (TARGET cdf)
-  if (GHOUL_DISABLE_EXTERNAL_WARNINGS)
-    if (MSVC)
-      target_compile_options(cdf PRIVATE "/W0" "/MP")
-      target_compile_definitions(cdf PRIVATE "_SCL_SECURE_NO_WARNINGS")
-    else ()
-      target_compile_options(cdf PRIVATE "-w")
-    endif ()
-  endif ()
+  disable_external_warnings(cdf)
   set_folder_location(cdf "External")
 endif ()
 
-# Boost
-find_package(Boost REQUIRED)
-target_include_directories(openspace-module-kameleon SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
-#include_external_library(${onscreengui_module} Imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/kameleon)
+if (WIN32)
+  target_compile_options(ccmc PRIVATE /MP)
+  if (TARGET cdf)
+    target_compile_options(cdf PRIVATE /MP)
+  endif ()
+endif ()
diff --git a/modules/kameleon/ext/kameleon b/modules/kameleon/ext/kameleon
index 1b4549edc7..606edb945b 160000
--- a/modules/kameleon/ext/kameleon
+++ b/modules/kameleon/ext/kameleon
@@ -1 +1 @@
-Subproject commit 1b4549edc74ef371730ef9d39c1ffa0efe90a985
+Subproject commit 606edb945b62d0151f20270ddb2db4a9f558aaa1
diff --git a/modules/kameleon/include.cmake b/modules/kameleon/include.cmake
deleted file mode 100644
index 63c20b8181..0000000000
--- a/modules/kameleon/include.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set (OPENSPACE_DEPENDENCIES
-  space
-)
\ No newline at end of file
diff --git a/modules/kameleon/include/kameleonhelper.h b/modules/kameleon/include/kameleonhelper.h
index 4f4a75e726..2b1d5dc03b 100644
--- a/modules/kameleon/include/kameleonhelper.h
+++ b/modules/kameleon/include/kameleonhelper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/kameleon/include/kameleonwrapper.h b/modules/kameleon/include/kameleonwrapper.h
index 6c5e728553..b966f7bc1a 100644
--- a/modules/kameleon/include/kameleonwrapper.h
+++ b/modules/kameleon/include/kameleonwrapper.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -88,7 +88,7 @@ public:
         const glm::size3_t& outDimensions) const;
 
     float* uniformSliceValues(const std::string& var, const glm::size3_t& outDimensions,
-        const float& zSlice) const;
+        float zSlice) const;
 
     float* uniformSampledVectorValues(const std::string& xVar, const std::string& yVar,
         const std::string& zVar, const glm::size3_t& outDimensions) const;
@@ -116,7 +116,6 @@ public:
 
     std::array<std::string, 3> gridVariables() const;
 
-
     Model model() const;
     GridType gridType() const;
     std::string parent() const;
diff --git a/modules/kameleon/kameleonmodule.cpp b/modules/kameleon/kameleonmodule.cpp
index 267885a71b..156112bb77 100644
--- a/modules/kameleon/kameleonmodule.cpp
+++ b/modules/kameleon/kameleonmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/kameleon/kameleonmodule.h b/modules/kameleon/kameleonmodule.h
index 616c4aba2b..539267c5c6 100644
--- a/modules/kameleon/kameleonmodule.h
+++ b/modules/kameleon/kameleonmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/kameleon/src/kameleonhelper.cpp b/modules/kameleon/src/kameleonhelper.cpp
index 53bbf3f08a..d3f6056505 100644
--- a/modules/kameleon/src/kameleonhelper.cpp
+++ b/modules/kameleon/src/kameleonhelper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -77,7 +77,6 @@ double getTime(ccmc::Kameleon* kameleon) {
     // redundant!
 
         std::string seqStartStr;
-        double seqStartDbl;
         if (kameleon->doesAttributeExist("start_time")){
             seqStartStr =
                     kameleon->getGlobalAttribute("start_time").getAttributeString();
@@ -126,13 +125,13 @@ double getTime(ccmc::Kameleon* kameleon) {
                 "No starting time attribute could be found in the .cdf file. Starting "
                 "time is set to 01.JAN.2000 12:00."
             );
-            seqStartDbl = 0.0;
         }
 
         if (seqStartStr.length() == 19) {
             seqStartStr += ".000Z";
         }
 
+        double seqStartDbl;
         if (seqStartStr.length() == 24) {
             seqStartDbl = Time::convertTime(
                 seqStartStr.substr(0, seqStartStr.length() - 2)
diff --git a/modules/kameleon/src/kameleonwrapper.cpp b/modules/kameleon/src/kameleonwrapper.cpp
index 6f725b1c2b..5528881746 100644
--- a/modules/kameleon/src/kameleonwrapper.cpp
+++ b/modules/kameleon/src/kameleonwrapper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -81,20 +81,20 @@ std::array<std::string, 3> gridVariables(ccmc::Model* model) {
     std::string z = std::move(tokens.at(2));
 
     std::transform(
-        x.begin(),
-        x.end(),
+        x.cbegin(),
+        x.cend(),
         x.begin(),
         [](char c) { return static_cast<char>(tolower(c)); }
     );
     std::transform(
-        y.begin(),
-        y.end(),
+        y.cbegin(),
+        y.cend(),
         y.begin(),
         [](char c) { return static_cast<char>(tolower(c)); }
     );
     std::transform(
-        z.begin(),
-        z.end(),
+        z.cbegin(),
+        z.cend(),
         z.begin(),
         [](char c) { return static_cast<char>(tolower(c)); }
     );
@@ -331,7 +331,7 @@ float* KameleonWrapper::uniformSampledValues(const std::string& var,
 // This method returns new'd memory,  turn into std::vector<float> instead?
 float* KameleonWrapper::uniformSliceValues(const std::string& var,
                                            const glm::size3_t& outDimensions,
-                                           const float& slice) const
+                                           float slice) const
 {
     ghoul_assert(_model && _interpolator, "Model and interpolator must exist");
     LINFO(fmt::format(
diff --git a/modules/kameleonvolume/CMakeLists.txt b/modules/kameleonvolume/CMakeLists.txt
index 37897ab5e5..4d3a2f981f 100644
--- a/modules/kameleonvolume/CMakeLists.txt
+++ b/modules/kameleonvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,20 +25,20 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/kameleonvolumereader.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablekameleonvolume.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/kameleondocumentationtask.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/kameleonmetadatatojsontask.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/kameleonvolumetorawtask.h
+  kameleonvolumereader.h
+  rendering/renderablekameleonvolume.h
+  tasks/kameleondocumentationtask.h
+  tasks/kameleonmetadatatojsontask.h
+  tasks/kameleonvolumetorawtask.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/kameleonvolumereader.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablekameleonvolume.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/kameleondocumentationtask.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/kameleonmetadatatojsontask.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/kameleonvolumetorawtask.cpp
+  kameleonvolumereader.cpp
+  rendering/renderablekameleonvolume.cpp
+  tasks/kameleondocumentationtask.cpp
+  tasks/kameleonmetadatatojsontask.cpp
+  tasks/kameleonvolumetorawtask.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/kameleonvolume/kameleonvolumemodule.cpp b/modules/kameleonvolume/kameleonvolumemodule.cpp
index 2cdbb125c3..d474f73dc2 100644
--- a/modules/kameleonvolume/kameleonvolumemodule.cpp
+++ b/modules/kameleonvolume/kameleonvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/kameleonvolume/kameleonvolumemodule.h b/modules/kameleonvolume/kameleonvolumemodule.h
index 41c47dbc58..79a957671a 100644
--- a/modules/kameleonvolume/kameleonvolumemodule.h
+++ b/modules/kameleonvolume/kameleonvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,6 +26,7 @@
 #define __OPENSPACE_MODULE_KAMELEONVOLUME___KAMELEONVOLUMEMODULE___H__
 
 #include <openspace/util/openspacemodule.h>
+
 #include <vector>
 
 namespace openspace {
diff --git a/modules/kameleonvolume/kameleonvolumereader.cpp b/modules/kameleonvolume/kameleonvolumereader.cpp
index 0df6caca5d..63301ba596 100644
--- a/modules/kameleonvolume/kameleonvolumereader.cpp
+++ b/modules/kameleonvolume/kameleonvolumereader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -39,6 +39,7 @@
 #pragma warning (disable : 4800) // #pragma warning: there is no warning number '4800'
 #endif // WIN32
 
+#include <ccmc/Kameleon.h>
 #include <ccmc/Model.h>
 #include <ccmc/BATSRUS.h>
 #include <ccmc/ENLIL.h>
@@ -78,7 +79,7 @@ KameleonVolumeReader::KameleonVolumeReader(std::string path) : _path(std::move(p
         throw ghoul::FileNotFoundError(_path);
     }
 
-    const long status = _kameleon.open(_path);
+    const long status = _kameleon->open(_path);
     if (status != ccmc::FileReader::OK) {
         LERROR(fmt::format("Failed to open file '{}' with Kameleon", _path));
         throw ghoul::RuntimeError("Failed to open file: " + _path + " with Kameleon");
@@ -86,10 +87,12 @@ KameleonVolumeReader::KameleonVolumeReader(std::string path) : _path(std::move(p
 
     // Possibly use a kameleon interpolator instead of a model interpolator?
     _interpolator = std::unique_ptr<ccmc::Interpolator>(
-        _kameleon.model->createNewInterpolator()
+        _kameleon->model->createNewInterpolator()
     );
 }
 
+KameleonVolumeReader::~KameleonVolumeReader() {}
+
 std::unique_ptr<volume::RawVolume<float>> KameleonVolumeReader::readFloatVolume(
                                                             const glm::uvec3 & dimensions,
                                                               const std::string& variable,
@@ -145,28 +148,28 @@ std::unique_ptr<volume::RawVolume<float>> KameleonVolumeReader::readFloatVolume(
 
 std::vector<std::string> KameleonVolumeReader::variableNames() const {
     std::vector<std::string> variableNames;
-    const int nVariables = _kameleon.model->getNumberOfVariables();
+    const int nVariables = _kameleon->model->getNumberOfVariables();
     for (int i = 0; i < nVariables; ++i) {
-        variableNames.push_back(_kameleon.model->getVariableName(i));
+        variableNames.push_back(_kameleon->model->getVariableName(i));
     }
     return variableNames;
 }
 
 std::vector<std::string> KameleonVolumeReader::variableAttributeNames() const {
-    return _kameleon.model->getVariableAttributeNames();
+    return _kameleon->model->getVariableAttributeNames();
 }
 
 std::vector<std::string> KameleonVolumeReader::globalAttributeNames() const {
     std::vector<std::string> attributeNames;
-    const int nAttributes = _kameleon.model->getNumberOfGlobalAttributes();
+    const int nAttributes = _kameleon->model->getNumberOfGlobalAttributes();
     for (int i = 0; i < nAttributes; ++i) {
-        attributeNames.push_back(_kameleon.model->getGlobalAttributeName(i));
+        attributeNames.push_back(_kameleon->model->getGlobalAttributeName(i));
     }
     return attributeNames;
 }
 
 std::array<std::string, 3> KameleonVolumeReader::gridVariableNames() const {
-    return openspace::gridVariables(_kameleon.model);
+    return openspace::gridVariables(_kameleon->model);
 }
 
 void KameleonVolumeReader::addAttributeToDictionary(ghoul::Dictionary& dictionary,
@@ -176,13 +179,13 @@ void KameleonVolumeReader::addAttributeToDictionary(ghoul::Dictionary& dictionar
     ccmc::Attribute::AttributeType type = attr.getAttributeType();
     switch (type) {
         case ccmc::Attribute::AttributeType::FLOAT:
-            dictionary.setValue<float>(key, attr.getAttributeFloat());
+            dictionary.setValue(key, static_cast<double>(attr.getAttributeFloat()));
             return;
         case ccmc::Attribute::AttributeType::INT:
-            dictionary.setValue<int>(key, attr.getAttributeInt());
+            dictionary.setValue(key, attr.getAttributeInt());
             return;
         case ccmc::Attribute::AttributeType::STRING:
-            dictionary.setValue<std::string>(key, attr.getAttributeString());
+            dictionary.setValue(key, attr.getAttributeString());
             return;
     }
 }
@@ -190,7 +193,7 @@ void KameleonVolumeReader::addAttributeToDictionary(ghoul::Dictionary& dictionar
 ghoul::Dictionary KameleonVolumeReader::readMetaData() const {
     ghoul::Dictionary globalAttributesDictionary;
     for (const std::string& attributeName : globalAttributeNames()) {
-        ccmc::Attribute attribute = _kameleon.model->getGlobalAttribute(attributeName);
+        ccmc::Attribute attribute = _kameleon->model->getGlobalAttribute(attributeName);
         addAttributeToDictionary(globalAttributesDictionary, attributeName, attribute);
     }
 
@@ -199,7 +202,7 @@ ghoul::Dictionary KameleonVolumeReader::readMetaData() const {
     for (const std::string& variableName : variableNames()) {
         ghoul::Dictionary variableAttributesDictionary;
         for (const std::string& attributeName : varAttrNames) {
-            ccmc::Attribute attribute = _kameleon.model->getVariableAttribute(
+            ccmc::Attribute attribute = _kameleon->model->getVariableAttribute(
                 variableName,
                 attributeName
             );
@@ -212,19 +215,19 @@ ghoul::Dictionary KameleonVolumeReader::readMetaData() const {
         variableDictionary.setValue(variableName, variableAttributesDictionary);
     }
 
-    return {
-        { "globalAttributes", std::move(globalAttributesDictionary) },
-        { "variableAttributes", std::move(variableDictionary) }
-    };
+    ghoul::Dictionary res;
+    res.setValue("globalAttributes", std::move(globalAttributesDictionary));
+    res.setValue("variableAttributes", std::move(variableDictionary));
+    return res;
 }
 
 std::string KameleonVolumeReader::simulationStart() const {
     std::string startTime;
-    if (_kameleon.model->doesAttributeExist("start_time")) {
-        startTime = globalAttribute<std::string>(*_kameleon.model, "start_time");
+    if (_kameleon->model->doesAttributeExist("start_time")) {
+        startTime = globalAttribute<std::string>(*_kameleon->model, "start_time");
     }
-    else if (_kameleon.model->doesAttributeExist("tim_rundate_cal")) {
-        startTime = globalAttribute<std::string>(*_kameleon.model, "tim_rundate_cal");
+    else if (_kameleon->model->doesAttributeExist("tim_rundate_cal")) {
+        startTime = globalAttribute<std::string>(*_kameleon->model, "tim_rundate_cal");
         size_t numChars = startTime.length();
         if (numChars < 19) {
             // Fall through to add the required characters
@@ -249,11 +252,11 @@ std::string KameleonVolumeReader::simulationStart() const {
             }
         }
     }
-    else if (_kameleon.model->doesAttributeExist("tim_obsdate_cal")) {
-        startTime = globalAttribute<std::string>(*_kameleon.model, "tim_obsdate_cal");
+    else if (_kameleon->model->doesAttributeExist("tim_obsdate_cal")) {
+        startTime = globalAttribute<std::string>(*_kameleon->model, "tim_obsdate_cal");
     }
-    else if (_kameleon.model->doesAttributeExist("tim_crstart_cal")) {
-        startTime = globalAttribute<std::string>(*_kameleon.model, "tim_crstart_cal");
+    else if (_kameleon->model->doesAttributeExist("tim_crstart_cal")) {
+        startTime = globalAttribute<std::string>(*_kameleon->model, "tim_crstart_cal");
     }
 
     if (startTime.length() == 19) {
@@ -264,21 +267,21 @@ std::string KameleonVolumeReader::simulationStart() const {
 }
 
 float KameleonVolumeReader::elapsedTime() const {
-    if (_kameleon.model->doesAttributeExist("elapsed_time_in_seconds")) {
-        return globalAttribute<float>(*_kameleon.model, "elapsed_time_in_seconds");
+    if (_kameleon->model->doesAttributeExist("elapsed_time_in_seconds")) {
+        return globalAttribute<float>(*_kameleon->model, "elapsed_time_in_seconds");
     }
-    else if (_kameleon.model->doesAttributeExist("time_physical_time")) {
-        return globalAttribute<float>(*_kameleon.model, "time_physical_time");
+    else if (_kameleon->model->doesAttributeExist("time_physical_time")) {
+        return globalAttribute<float>(*_kameleon->model, "time_physical_time");
     }
     return 0.f;
 }
 
 std::string KameleonVolumeReader::simulationEnd() const {
-    return globalAttribute<std::string>(*_kameleon.model, "end_time");
+    return globalAttribute<std::string>(*_kameleon->model, "end_time");
 }
 
 std::string KameleonVolumeReader::getVisUnit(const std::string& variable) const {
-    return _kameleon.model->getNativeUnit(variable);
+    return _kameleon->model->getNativeUnit(variable);
 }
 
 std::string KameleonVolumeReader::time() const {
@@ -290,12 +293,12 @@ std::string KameleonVolumeReader::time() const {
 }
 
 double KameleonVolumeReader::minValue(const std::string & variable) const {
-    ccmc::Model& m = *_kameleon.model;
+    ccmc::Model& m = *_kameleon->model;
     return m.getVariableAttribute(variable, "actual_min").getAttributeFloat();
 }
 
 double KameleonVolumeReader::maxValue(const std::string & variable) const {
-    ccmc::Model& m = *_kameleon.model;
+    ccmc::Model& m = *_kameleon->model;
     return m.getVariableAttribute(variable, "actual_max").getAttributeFloat();
 }
 
diff --git a/modules/kameleonvolume/kameleonvolumereader.h b/modules/kameleonvolume/kameleonvolumereader.h
index 47c09cccb4..b03c02bdca 100644
--- a/modules/kameleonvolume/kameleonvolumereader.h
+++ b/modules/kameleonvolume/kameleonvolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,21 +28,13 @@
 #include <ghoul/glm.h>
 #include <memory>
 #include <string>
+#include <vector>
 
-#ifdef WIN32
-#pragma warning (push)
-#pragma warning (disable : 4619) // #pragma warning: there is no warning number '4619'
-#pragma warning (disable : 4675) // #pragma warning: there is no warning number '4675'
-#pragma warning (disable : 4800) // #pragma warning: there is no warning number '4800'
-#endif // WIN32
-
-#include <ccmc/Kameleon.h>
-
-#ifdef WIN32
-#pragma warning (pop)
-#endif // WIN32
-
-namespace ccmc { class Interpolator; }
+namespace ccmc {
+    class Attribute;
+    class Interpolator;
+    class Kameleon;
+} // namespce ccmc
 
 namespace ghoul { class Dictionary; }
 namespace openspace::volume { template <typename T> class RawVolume; }
@@ -52,6 +44,7 @@ namespace openspace::kameleonvolume {
 class KameleonVolumeReader {
 public:
     KameleonVolumeReader(std::string path);
+    ~KameleonVolumeReader();
 
     std::unique_ptr<volume::RawVolume<float>> readFloatVolume(
         const glm::uvec3& dimensions, const std::string& variable,
@@ -83,7 +76,7 @@ private:
         const std::string& key, ccmc::Attribute& attr);
 
     std::string _path;
-    ccmc::Kameleon _kameleon;
+    std::unique_ptr<ccmc::Kameleon> _kameleon;
     std::unique_ptr<ccmc::Interpolator> _interpolator;
 };
 
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
index 76af40a5d4..b12c28ac9f 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,6 +24,10 @@
 
 #include <modules/kameleonvolume/rendering/renderablekameleonvolume.h>
 
+#include <modules/volume/rendering/basicvolumeraycaster.h>
+#include <modules/volume/rawvolume.h>
+#include <modules/kameleon/include/kameleonwrapper.h>
+#include <openspace/rendering/transferfunction.h>
 #include <modules/kameleon/include/kameleonwrapper.h>
 #include <modules/kameleonvolume/kameleonvolumereader.h>
 #include <modules/volume/rawvolumereader.h>
@@ -150,70 +154,76 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     , _transferFunctionPath(TransferFunctionInfo)
     , _cache(CacheInfo)
 {
-    if (dictionary.hasKeyAndValue<glm::vec3>(KeyDimensions)) {
-        _dimensions = dictionary.value<glm::vec3>(KeyDimensions);
+    if (dictionary.hasValue<glm::dvec3>(KeyDimensions)) {
+        _dimensions = dictionary.value<glm::dvec3>(KeyDimensions);
     }
     else {
         LWARNING("No dimensions specified for volumetric data, falling back to 32^3");
         _dimensions = glm::uvec3(32);
     }
 
-    _stepSize = dictionary.value<float>(KeyStepSize);
+    _stepSize = static_cast<float>(dictionary.value<double>(KeyStepSize));
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyTransferFunction)) {
+    if (dictionary.hasValue<std::string>(KeyTransferFunction)) {
         _transferFunctionPath = dictionary.value<std::string>(KeyTransferFunction);
         _transferFunction = std::make_shared<openspace::TransferFunction>(
             _transferFunctionPath, [](const openspace::TransferFunction&) {}
         );
     }
 
-    if (dictionary.hasKeyAndValue<std::string>(KeySource)) {
+    if (dictionary.hasValue<std::string>(KeySource)) {
         _sourcePath = absPath(dictionary.value<std::string>(KeySource));
     }
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyVariable)) {
+    if (dictionary.hasValue<std::string>(KeyVariable)) {
         _variable = dictionary.value<std::string>(KeyVariable);
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(KeyLowerDomainBound)) {
-        _lowerDomainBound = dictionary.value<glm::vec3>(KeyLowerDomainBound);
+    if (dictionary.hasValue<glm::dvec3>(KeyLowerDomainBound)) {
+        _lowerDomainBound = dictionary.value<glm::dvec3>(KeyLowerDomainBound);
     }
     else {
         _autoDomainBounds = true;
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(KeyUpperDomainBound)) {
-        _upperDomainBound = dictionary.value<glm::vec3>(KeyUpperDomainBound);
+    if (dictionary.hasValue<glm::dvec3>(KeyUpperDomainBound)) {
+        _upperDomainBound = dictionary.value<glm::dvec3>(KeyUpperDomainBound);
     }
     else {
         _autoDomainBounds = true;
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(KeyDomainScale)) {
-        _domainScale = dictionary.value<glm::vec3>(KeyDomainScale);
+    if (dictionary.hasValue<glm::dvec3>(KeyDomainScale)) {
+        _domainScale = dictionary.value<glm::dvec3>(KeyDomainScale);
     }
 
-    if (dictionary.hasKeyAndValue<float>(KeyLowerValueBound)) {
-        _lowerValueBound = dictionary.value<float>(KeyLowerValueBound);
+    if (dictionary.hasValue<double>(KeyLowerValueBound)) {
+        _lowerValueBound = static_cast<float>(
+            dictionary.value<double>(KeyLowerValueBound)
+        );
     }
     else {
         _autoValueBounds = true;
     }
 
-    if (dictionary.hasKeyAndValue<float>(KeyUpperValueBound)) {
-        _upperValueBound = dictionary.value<float>(KeyUpperValueBound);
+    if (dictionary.hasValue<double>(KeyUpperValueBound)) {
+        _upperValueBound = static_cast<float>(
+            dictionary.value<double>(KeyUpperValueBound)
+        );
     }
     else {
         _autoValueBounds = true;
     }
 
     ghoul::Dictionary clipPlanesDictionary;
-    dictionary.getValue(KeyClipPlanes, clipPlanesDictionary);
+    if (dictionary.hasValue<ghoul::Dictionary>(KeyClipPlanes)) {
+        clipPlanesDictionary = dictionary.value<ghoul::Dictionary>(KeyClipPlanes);
+    }
     _clipPlanes = std::make_shared<volume::VolumeClipPlanes>(clipPlanesDictionary);
     _clipPlanes->setIdentifier("clipPlanes");
     _clipPlanes->setGuiName("Clip Planes");
 
-    if (dictionary.hasKeyAndValue<bool>(KeyCache)) {
+    if (dictionary.hasValue<bool>(KeyCache)) {
         _cache = dictionary.value<bool>(KeyCache);
     }
 
@@ -227,7 +237,7 @@ RenderableKameleonVolume::RenderableKameleonVolume(const ghoul::Dictionary& dict
     );
     _gridType.setValue(static_cast<int>(volume::VolumeGridType::Cartesian));
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyGridType)) {
+    if (dictionary.hasValue<std::string>(KeyGridType)) {
         const std::string& gridType = dictionary.value<std::string>(KeyGridType);
         if (gridType == ValueSphericalGridType) {
             _gridType.setValue(static_cast<int>(volume::VolumeGridType::Spherical));
@@ -389,7 +399,7 @@ void RenderableKameleonVolume::loadCdf(const std::string& path) {
     }
 
     if (_autoGridType) {
-        if (variables[0] == "r" && variables[0] == "theta" && variables[0] == "phi") {
+        if (variables[0] == "r" && variables[1] == "theta" && variables[2] == "phi") {
             _gridType.setValue(static_cast<int>(volume::VolumeGridType::Spherical));
         }
         else {
diff --git a/modules/kameleonvolume/rendering/renderablekameleonvolume.h b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
index 6fb43aeff9..e4eacd4647 100644
--- a/modules/kameleonvolume/rendering/renderablekameleonvolume.h
+++ b/modules/kameleonvolume/rendering/renderablekameleonvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,10 +26,6 @@
 #define __OPENSPACE_MODULE_KAMELEONVOLUME___RENDERABLEKAMELEONVOLUME___H__
 
 #include <openspace/rendering/renderable.h>
-#include <openspace/rendering/transferfunction.h>
-#include <modules/kameleon/include/kameleonwrapper.h>
-#include <modules/volume/rawvolume.h>
-#include <modules/volume/rendering/basicvolumeraycaster.h>
 
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
@@ -37,7 +33,10 @@
 #include <openspace/properties/vector/vec3property.h>
 #include <ghoul/opengl/ghoul_gl.h>
 
-namespace openspace { struct RenderData; }
+namespace openspace {
+    struct RenderData;
+    class TransferFunction;
+} // namespace openspace
 
 namespace openspace::volume {
     class BasicVolumeRaycaster;
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
index f4939a794d..9e4cac12a5 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,7 +27,6 @@
 #include <modules/kameleonvolume/kameleonvolumereader.h>
 #include <openspace/openspace.h>
 #include <openspace/documentation/verifier.h>
-#include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionaryjsonformatter.h>
 #include <fstream>
@@ -68,15 +67,10 @@ void KameleonDocumentationTask::perform(const Task::ProgressCallback & progressC
     ghoul::Dictionary kameleonDictionary = reader.readMetaData();
     progressCallback(0.33f);
 
-    ghoul::Dictionary dictionary = {
-        { "kameleon", std::move(kameleonDictionary) },
-        { "version",
-            std::to_string(OPENSPACE_VERSION_MAJOR) + "." +
-            std::to_string(OPENSPACE_VERSION_MINOR) + "." +
-            std::to_string(OPENSPACE_VERSION_PATCH)
-        },
-        { "input", _inputPath }
-    };
+    ghoul::Dictionary dictionary;
+    dictionary.setValue("kameleon", std::move(kameleonDictionary));
+    dictionary.setValue("version", std::string(OPENSPACE_VERSION_NUMBER));
+    dictionary.setValue("input", _inputPath);
 
     std::string json = ghoul::formatJson(dictionary);
     progressCallback(0.66f);
@@ -158,12 +152,6 @@ documentation::Documentation KameleonDocumentationTask::documentation() {
         "KameleonDocumentationTask",
         "kameleon_documentation_task",
         {
-            {
-                "Type",
-                new StringEqualVerifier("KameleonDocumentationTask"),
-                Optional::No,
-                "The type of this task"
-            },
             {
                 KeyInput,
                 new StringAnnotationVerifier("A file path to a cdf file"),
diff --git a/modules/kameleonvolume/tasks/kameleondocumentationtask.h b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
index a6cd323800..566f28b8a5 100644
--- a/modules/kameleonvolume/tasks/kameleondocumentationtask.h
+++ b/modules/kameleonvolume/tasks/kameleondocumentationtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
index c732813161..ecd1bcccf5 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -75,12 +75,6 @@ documentation::Documentation KameleonMetadataToJsonTask::documentation() {
         "KameleonMetadataToJsonTask",
         "kameleon_metadata_to_json_task",
         {
-            {
-                "Type",
-                new StringEqualVerifier("KameleonMetadataToJsonTask"),
-                Optional::No,
-                "The type of this task"
-            },
             {
                 KeyInput,
                 new StringAnnotationVerifier("A file path to a cdf file"),
diff --git a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
index 1daadcb3f9..2e392116ce 100644
--- a/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
+++ b/modules/kameleonvolume/tasks/kameleonmetadatatojsontask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
index 8f5f9be5b3..fd9c342afe 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,6 +30,7 @@
 #include <ghoul/fmt.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/misc/dictionaryluaformatter.h>
+#include <array>
 
 namespace {
     constexpr const char* KeyInput = "Input";
@@ -55,12 +56,6 @@ documentation::Documentation KameleonVolumeToRawTask::documentation() {
         "KameleonVolumeToRawTask",
         "kameleon_metadata_to_json_task",
         {
-            {
-                "Type",
-                new StringEqualVerifier("KameleonVolumeToRawTask"),
-                Optional::No,
-                "The type of this task",
-            },
             {
                 KeyInput,
                 new StringAnnotationVerifier("A file path to a cdf file"),
@@ -127,12 +122,18 @@ KameleonVolumeToRawTask::KameleonVolumeToRawTask(const ghoul::Dictionary& dictio
     _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::vec3>(KeyDimensions));
+    _dimensions = glm::uvec3(dictionary.value<glm::dvec3>(KeyDimensions));
 
-    if (!dictionary.getValue<glm::vec3>(KeyLowerDomainBound, _lowerDomainBound)) {
+    if (dictionary.hasKey(KeyLowerDomainBound)) {
+        _lowerDomainBound = dictionary.value<glm::dvec3>(KeyLowerDomainBound);
+    }
+    else {
         _autoDomainBounds = true;
     }
-    if (!dictionary.getValue<glm::vec3>(KeyUpperDomainBound, _upperDomainBound)) {
+    if (dictionary.hasKey(KeyUpperDomainBound)) {
+        _upperDomainBound = dictionary.value<glm::dvec3>(KeyUpperDomainBound);
+    }
+    else {
         _autoDomainBounds = true;
     }
 }
@@ -189,13 +190,13 @@ void KameleonVolumeToRawTask::perform(const Task::ProgressCallback& progressCall
     }
 
     outputMetadata.setValue(KeyTime, time);
-    outputMetadata.setValue(KeyDimensions, glm::vec3(_dimensions));
-    outputMetadata.setValue(KeyLowerDomainBound, _lowerDomainBound);
-    outputMetadata.setValue(KeyUpperDomainBound, _upperDomainBound);
+    outputMetadata.setValue(KeyDimensions, glm::dvec3(_dimensions));
+    outputMetadata.setValue(KeyLowerDomainBound, glm::dvec3(_lowerDomainBound));
+    outputMetadata.setValue(KeyUpperDomainBound, glm::dvec3(_upperDomainBound));
 
-    outputMetadata.setValue(KeyMinValue, static_cast<float>(reader.minValue(_variable)));
-    outputMetadata.setValue(KeyMaxValue, static_cast<float>(reader.maxValue(_variable)));
-    outputMetadata.setValue<std::string>(KeyVisUnit, reader.getVisUnit(_variable));
+    outputMetadata.setValue(KeyMinValue, reader.minValue(_variable));
+    outputMetadata.setValue(KeyMaxValue, reader.maxValue(_variable));
+    outputMetadata.setValue(KeyVisUnit, reader.getVisUnit(_variable));
 
     std::string metadataString = ghoul::formatLua(outputMetadata);
 
diff --git a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
index c8524db19e..b187bfcc59 100644
--- a/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
+++ b/modules/kameleonvolume/tasks/kameleonvolumetorawtask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/CMakeLists.txt b/modules/multiresvolume/CMakeLists.txt
index 18733b9f4f..8bef6a60c7 100644
--- a/modules/multiresvolume/CMakeLists.txt
+++ b/modules/multiresvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,39 +25,39 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atlasmanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickmanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickcover.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselection.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multiresvolumeraycaster.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shenbrickselector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tfbrickselector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localtfbrickselector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simpletfbrickselector.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemultiresvolume.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tsp.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/histogrammanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/errorhistogrammanager.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localerrorhistogrammanager.h
+  rendering/atlasmanager.h
+  rendering/brickmanager.h
+  rendering/brickselector.h
+  rendering/brickcover.h
+  rendering/brickselection.h
+  rendering/multiresvolumeraycaster.h
+  rendering/shenbrickselector.h
+  rendering/tfbrickselector.h
+  rendering/localtfbrickselector.h
+  rendering/simpletfbrickselector.h
+  rendering/renderablemultiresvolume.h
+  rendering/tsp.h
+  rendering/histogrammanager.h
+  rendering/errorhistogrammanager.h
+  rendering/localerrorhistogrammanager.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/atlasmanager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickcover.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickmanager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/brickselection.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/multiresvolumeraycaster.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/shenbrickselector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tfbrickselector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localtfbrickselector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simpletfbrickselector.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemultiresvolume.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/tsp.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/histogrammanager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/errorhistogrammanager.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/localerrorhistogrammanager.cpp
+  rendering/atlasmanager.cpp
+  rendering/brickcover.cpp
+  rendering/brickmanager.cpp
+  rendering/brickselection.cpp
+  rendering/multiresvolumeraycaster.cpp
+  rendering/shenbrickselector.cpp
+  rendering/tfbrickselector.cpp
+  rendering/localtfbrickselector.cpp
+  rendering/simpletfbrickselector.cpp
+  rendering/renderablemultiresvolume.cpp
+  rendering/tsp.cpp
+  rendering/histogrammanager.cpp
+  rendering/errorhistogrammanager.cpp
+  rendering/localerrorhistogrammanager.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/multiresvolume/include.cmake b/modules/multiresvolume/include.cmake
deleted file mode 100644
index 63c20b8181..0000000000
--- a/modules/multiresvolume/include.cmake
+++ /dev/null
@@ -1,3 +0,0 @@
-set (OPENSPACE_DEPENDENCIES
-  space
-)
\ No newline at end of file
diff --git a/modules/multiresvolume/multiresvolumemodule.cpp b/modules/multiresvolume/multiresvolumemodule.cpp
index 1836ad2eda..039c7e409b 100644
--- a/modules/multiresvolume/multiresvolumemodule.cpp
+++ b/modules/multiresvolume/multiresvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/multiresvolumemodule.h b/modules/multiresvolume/multiresvolumemodule.h
index 71f8aceff0..d97ba8a358 100644
--- a/modules/multiresvolume/multiresvolumemodule.h
+++ b/modules/multiresvolume/multiresvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/atlasmanager.cpp b/modules/multiresvolume/rendering/atlasmanager.cpp
index 2f0642fc4d..d35740429e 100644
--- a/modules/multiresvolume/rendering/atlasmanager.cpp
+++ b/modules/multiresvolume/rendering/atlasmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -182,7 +182,7 @@ void AtlasManager::addToAtlas(int firstBrickIndex, int lastBrickIndex,
             unsigned int atlasCoords = _freeAtlasCoords.back();
             _freeAtlasCoords.pop_back();
             int level = _nOtLevels - static_cast<int>(
-                floor(log((7.0 * (float(brickIndex % _nOtNodes)) + 1.0))/log(8)) - 1
+                floor(log1p((7.0 * (float(brickIndex % _nOtNodes))))/log(8)) - 1
             );
             ghoul_assert(atlasCoords <= 0x0FFFFFFF, "@MISSING");
             unsigned int atlasData = (level << 28) + atlasCoords;
diff --git a/modules/multiresvolume/rendering/atlasmanager.h b/modules/multiresvolume/rendering/atlasmanager.h
index 190205fd97..514a417443 100644
--- a/modules/multiresvolume/rendering/atlasmanager.h
+++ b/modules/multiresvolume/rendering/atlasmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/brickcover.cpp b/modules/multiresvolume/rendering/brickcover.cpp
index 045057eb65..438857cfd9 100644
--- a/modules/multiresvolume/rendering/brickcover.cpp
+++ b/modules/multiresvolume/rendering/brickcover.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/brickcover.h b/modules/multiresvolume/rendering/brickcover.h
index 47912052e8..89a9e63e85 100644
--- a/modules/multiresvolume/rendering/brickcover.h
+++ b/modules/multiresvolume/rendering/brickcover.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/brickmanager.cpp b/modules/multiresvolume/rendering/brickmanager.cpp
index 998ec1e599..0e72a9977c 100644
--- a/modules/multiresvolume/rendering/brickmanager.cpp
+++ b/modules/multiresvolume/rendering/brickmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/brickmanager.h b/modules/multiresvolume/rendering/brickmanager.h
index 521861886f..5587d295c3 100644
--- a/modules/multiresvolume/rendering/brickmanager.h
+++ b/modules/multiresvolume/rendering/brickmanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/brickselection.cpp b/modules/multiresvolume/rendering/brickselection.cpp
index fa37a64ec7..457a3e6084 100644
--- a/modules/multiresvolume/rendering/brickselection.cpp
+++ b/modules/multiresvolume/rendering/brickselection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/brickselection.h b/modules/multiresvolume/rendering/brickselection.h
index c74b3de86d..274afdb12a 100644
--- a/modules/multiresvolume/rendering/brickselection.h
+++ b/modules/multiresvolume/rendering/brickselection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/brickselector.h b/modules/multiresvolume/rendering/brickselector.h
index 498d0d8177..e60a52a1c8 100644
--- a/modules/multiresvolume/rendering/brickselector.h
+++ b/modules/multiresvolume/rendering/brickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.cpp b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
index 726ea4b21c..3f4824ba65 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -301,7 +301,7 @@ int ErrorHistogramManager::parentOffset(int offset, int base) const {
         return -1;
     }
     const int depth = static_cast<int>(
-        floor(log(((base - 1) * offset + 1.0)) / log(base))
+        floor(log1p(((base - 1) * offset)) / log(base))
     );
     const int firstInLevel = static_cast<int>((pow(base, depth) - 1) / (base - 1));
     const int inLevelOffset = offset - firstInLevel;
diff --git a/modules/multiresvolume/rendering/errorhistogrammanager.h b/modules/multiresvolume/rendering/errorhistogrammanager.h
index 8a116351df..31dc829bf5 100644
--- a/modules/multiresvolume/rendering/errorhistogrammanager.h
+++ b/modules/multiresvolume/rendering/errorhistogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/histogrammanager.cpp b/modules/multiresvolume/rendering/histogrammanager.cpp
index d0ad4a8ed7..cc3293e253 100644
--- a/modules/multiresvolume/rendering/histogrammanager.cpp
+++ b/modules/multiresvolume/rendering/histogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/histogrammanager.h b/modules/multiresvolume/rendering/histogrammanager.h
index 5215a2a0e2..2cda97e5e7 100644
--- a/modules/multiresvolume/rendering/histogrammanager.h
+++ b/modules/multiresvolume/rendering/histogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
index 39f53d52c1..c13500c7fd 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -82,8 +82,6 @@ bool LocalErrorHistogramManager::buildHistograms(int numBins) {
             success &= buildFromOctreeChild(bst, ot);
             if (!success) {
                 LERROR("Failed in buildFromOctreeChild");
-            }
-            if (!success) {
                 return false;
             }
             pb1.print(processedLeaves++);
@@ -99,8 +97,6 @@ bool LocalErrorHistogramManager::buildHistograms(int numBins) {
             success &= buildFromBstChild(bst, ot);
             if (!success) {
                 LERROR("Failed in buildFromBstChild");
-            }
-            if (!success) {
                 return false;
             }
             pb2.print(processedLeaves++);
@@ -464,7 +460,7 @@ int LocalErrorHistogramManager::parentOffset(int offset, int base) const {
         return -1;
     }
     const int depth = static_cast<int>(
-        floor(log(((base - 1) * offset + 1.0)) / log(base))
+        floor(log1p(((base - 1) * offset)) / log(base))
     );
     const int firstInLevel = static_cast<int>((pow(base, depth) - 1) / (base - 1));
     const int inLevelOffset = offset - firstInLevel;
diff --git a/modules/multiresvolume/rendering/localerrorhistogrammanager.h b/modules/multiresvolume/rendering/localerrorhistogrammanager.h
index cac8bbbc68..b6f54177c4 100644
--- a/modules/multiresvolume/rendering/localerrorhistogrammanager.h
+++ b/modules/multiresvolume/rendering/localerrorhistogrammanager.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.cpp b/modules/multiresvolume/rendering/localtfbrickselector.cpp
index b663438232..6bb8e80dab 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/localtfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -345,9 +345,6 @@ bool LocalTfBrickSelector::calculateBrickErrors() {
     }
 
     size_t tfWidth = tf->width();
-    if (tfWidth <= 0) {
-        return false;
-    }
 
     std::vector<float> gradients(tfWidth - 1);
     for (size_t offset = 0; offset < tfWidth - 1; offset++) {
diff --git a/modules/multiresvolume/rendering/localtfbrickselector.h b/modules/multiresvolume/rendering/localtfbrickselector.h
index 7ed6695797..740b8abbe3 100644
--- a/modules/multiresvolume/rendering/localtfbrickselector.h
+++ b/modules/multiresvolume/rendering/localtfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
index 50a3ede0dc..ef77138d1d 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -151,7 +151,9 @@ bool MultiresVolumeRaycaster::isCameraInside(const RenderData& data,
 
     float divisor = 1.0;
     for (int i = 0; i < 4; i++) for (int j = 0; j < 4; j++) {
-        if (abs(modelTransform[i][j] > divisor)) divisor = modelTransform[i][j];
+        if (abs(modelTransform[i][j]) > divisor) {
+            divisor = modelTransform[i][j];
+        }
     }
 
     glm::mat4 scaledModelTransform = modelTransform / divisor;
diff --git a/modules/multiresvolume/rendering/multiresvolumeraycaster.h b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
index e6ca7a8a43..c36811d1b0 100644
--- a/modules/multiresvolume/rendering/multiresvolumeraycaster.h
+++ b/modules/multiresvolume/rendering/multiresvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
index b35de6e4ee..6e75384f79 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -61,19 +61,11 @@ namespace {
     constexpr const char* _loggerCat = "RenderableMultiresVolume";
     constexpr const char* KeyDataSource = "Source";
     constexpr const char* KeyErrorHistogramsSource = "ErrorHistogramsSource";
-    constexpr const char* KeyHints = "Hints";
     constexpr const char* KeyTransferFunction = "TransferFunction";
 
-    constexpr const char* KeyVolumeName = "VolumeName";
     constexpr const char* KeyBrickSelector = "BrickSelector";
     constexpr const char* KeyStartTime = "StartTime";
     constexpr const char* KeyEndTime = "EndTime";
-    constexpr const char* GlslHelpersPath =
-        "${MODULES}/multiresvolume/shaders/helpers_fs.glsl";
-    constexpr const char* GlslHelperPath =
-        "${MODULES}/multiresvolume/shaders/helper.glsl";
-    constexpr const char* GlslHeaderPath =
-        "${MODULES}/multiresvolume/shaders/header.glsl";
 
     constexpr openspace::properties::Property::PropertyInfo StepSizeCoefficientInfo = {
         "StepSizeCoefficient",
@@ -177,7 +169,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
     )
     , _scaling(ScalingInfo, glm::vec3(1.f), glm::vec3(0.f), glm::vec3(10.f))
 {
-    if (dictionary.hasKeyAndValue<std::string>(KeyDataSource)) {
+    if (dictionary.hasValue<std::string>(KeyDataSource)) {
         _filename = absPath(dictionary.value<std::string>(KeyDataSource));
     }
     else {
@@ -185,39 +177,39 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
         return;
     }
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyErrorHistogramsSource)) {
+    if (dictionary.hasValue<std::string>(KeyErrorHistogramsSource)) {
         _errorHistogramsPath = absPath(
             dictionary.value<std::string>(KeyErrorHistogramsSource)
         );
     }
 
-    if (dictionary.hasKeyAndValue<double>("ScalingExponent")) {
+    if (dictionary.hasValue<double>("ScalingExponent")) {
         _scalingExponent = static_cast<int>(dictionary.value<double>("ScalingExponent"));
     }
 
-    if (dictionary.hasKeyAndValue<double>("StepSizeCoefficient")) {
+    if (dictionary.hasValue<double>("StepSizeCoefficient")) {
         _stepSizeCoefficient = static_cast<float>(
             dictionary.value<double>("StepSizeCoefficient")
         );
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>("Scaling")) {
-        _scaling = dictionary.value<glm::vec3>("Scaling");
+    if (dictionary.hasValue<glm::dvec3>("Scaling")) {
+        _scaling = dictionary.value<glm::dvec3>("Scaling");
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>("Translation")) {
-        _translation = dictionary.value<glm::vec3>("Translation");
+    if (dictionary.hasValue<glm::dvec3>("Translation")) {
+        _translation = dictionary.value<glm::dvec3>("Translation");
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>("Rotation")) {
-        _rotation = dictionary.value<glm::vec3>("Rotation");
+    if (dictionary.hasValue<glm::dvec3>("Rotation")) {
+        _rotation = dictionary.value<glm::dvec3>("Rotation");
     }
 
-    std::string startTimeString, endTimeString;
-
-    bool hasTimeData = dictionary.getValue(KeyStartTime, startTimeString) &&
-                       dictionary.getValue(KeyEndTime, endTimeString);
-    if (hasTimeData) {
+    if (dictionary.hasValue<std::string>(KeyStartTime) &&
+        dictionary.hasValue<std::string>(KeyEndTime))
+    {
+        std::string startTimeString = dictionary.value<std::string>(KeyStartTime);
+        std::string endTimeString = dictionary.value<std::string>(KeyEndTime);
         _startTime = SpiceManager::ref().ephemerisTimeFromDate(startTimeString);
         _endTime = SpiceManager::ref().ephemerisTimeFromDate(endTimeString);
         _loop = false;
@@ -227,7 +219,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
         LWARNING("Node does not provide time information. Viewing one image / frame");
     }
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyTransferFunction)) {
+    if (dictionary.hasValue<std::string>(KeyTransferFunction)) {
         _transferFunctionPath = absPath(
             dictionary.value<std::string>(KeyTransferFunction)
         );
@@ -262,7 +254,7 @@ RenderableMultiresVolume::RenderableMultiresVolume(const ghoul::Dictionary& dict
     _tsp = std::make_shared<TSP>(_filename);
     _atlasManager = std::make_shared<AtlasManager>(_tsp.get());
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyBrickSelector)) {
+    if (dictionary.hasValue<std::string>(KeyBrickSelector)) {
         _selectorName = dictionary.value<std::string>(KeyBrickSelector);
     }
 
@@ -472,7 +464,6 @@ bool RenderableMultiresVolume::initializeSelector() {
                     ghoul::filesystem::CacheManager::Persistent::Yes
                 );
                 std::ifstream cacheFile(cacheFilename, std::ios::in | std::ios::binary);
-                std::string errorHistogramsPath = _errorHistogramsPath;
                 if (cacheFile.is_open()) {
                     // Read histograms from cache.
                     cacheFile.close();
diff --git a/modules/multiresvolume/rendering/renderablemultiresvolume.h b/modules/multiresvolume/rendering/renderablemultiresvolume.h
index d09eedaa7d..28a9d56994 100644
--- a/modules/multiresvolume/rendering/renderablemultiresvolume.h
+++ b/modules/multiresvolume/rendering/renderablemultiresvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -126,12 +126,8 @@ private:
 
     std::shared_ptr<TransferFunction> _transferFunction;
 
-    float _spatialTolerance;
-    float _temporalTolerance;
-
     std::shared_ptr<TSP> _tsp;
     std::vector<int> _brickIndices;
-    int _atlasMapSize = 0;
 
     std::shared_ptr<AtlasManager> _atlasManager;
 
diff --git a/modules/multiresvolume/rendering/shenbrickselector.cpp b/modules/multiresvolume/rendering/shenbrickselector.cpp
index c05553a661..de0c7b46f3 100644
--- a/modules/multiresvolume/rendering/shenbrickselector.cpp
+++ b/modules/multiresvolume/rendering/shenbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/shenbrickselector.h b/modules/multiresvolume/rendering/shenbrickselector.h
index 8abcc760ad..0b34d79c8f 100644
--- a/modules/multiresvolume/rendering/shenbrickselector.h
+++ b/modules/multiresvolume/rendering/shenbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.cpp b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
index 90acc37e7b..24605786bc 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/simpletfbrickselector.h b/modules/multiresvolume/rendering/simpletfbrickselector.h
index 89a25509c2..fabb9aafbd 100644
--- a/modules/multiresvolume/rendering/simpletfbrickselector.h
+++ b/modules/multiresvolume/rendering/simpletfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/tfbrickselector.cpp b/modules/multiresvolume/rendering/tfbrickselector.cpp
index 8e5a46020c..76a325e773 100644
--- a/modules/multiresvolume/rendering/tfbrickselector.cpp
+++ b/modules/multiresvolume/rendering/tfbrickselector.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/tfbrickselector.h b/modules/multiresvolume/rendering/tfbrickselector.h
index d63dc1e3d9..96ace3865b 100644
--- a/modules/multiresvolume/rendering/tfbrickselector.h
+++ b/modules/multiresvolume/rendering/tfbrickselector.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/rendering/tsp.cpp b/modules/multiresvolume/rendering/tsp.cpp
index bcb194fcea..e056dbaeb4 100644
--- a/modules/multiresvolume/rendering/tsp.cpp
+++ b/modules/multiresvolume/rendering/tsp.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -139,7 +139,7 @@ bool TSP::construct() {
         unsigned int OTNode = OT * _numOTNodes;
 
         // Calculate BST level (first level is level 0)
-        unsigned int BSTLevel = static_cast<unsigned int>(log(OT + 1) / log(2));
+        unsigned int BSTLevel = static_cast<unsigned int>(log1p(OT) / log(2));
 
         // Traverse OT
         unsigned int OTChild = 1;
@@ -574,18 +574,18 @@ bool TSP::writeCache() {
 }
 
 float TSP::spatialError(unsigned int brickIndex) const {
-    return reinterpret_cast<const float&>(_data[brickIndex*NUM_DATA + SPATIAL_ERR]);
+    return *reinterpret_cast<const float*>(_data[brickIndex*NUM_DATA + SPATIAL_ERR]);
 }
 
 float TSP::temporalError(unsigned int brickIndex) const {
-    return reinterpret_cast<const float&>(_data[brickIndex*NUM_DATA + TEMPORAL_ERR]);
+    return *reinterpret_cast<const float*>(_data[brickIndex*NUM_DATA + TEMPORAL_ERR]);
 }
 
 unsigned int TSP::firstOctreeChild(unsigned int brickIndex) const {
     const unsigned int otNode = brickIndex % _numOTNodes;
     const unsigned int bstOffset = brickIndex - otNode;
 
-    const unsigned int depth = static_cast<unsigned int>(log(7 * otNode + 1) / log(8));
+    const unsigned int depth = static_cast<unsigned int>(log1p(7 * otNode) / log(8));
     const unsigned int firstInLevel = static_cast<unsigned int>((pow(8, depth) - 1) / 7);
     const unsigned int levelOffset = otNode - firstInLevel;
     const unsigned int firstInChildLevel = static_cast<unsigned int>(
@@ -599,7 +599,7 @@ unsigned int TSP::firstOctreeChild(unsigned int brickIndex) const {
 unsigned int TSP::bstLeft(unsigned int brickIndex) const {
     const unsigned int bstNode = brickIndex / _numOTNodes;
     const unsigned int otOffset = brickIndex % _numOTNodes;
-    const unsigned int depth = static_cast<unsigned int>(log(bstNode + 1) / log(2));
+    const unsigned int depth = static_cast<unsigned int>(log1p(bstNode) / log(2));
     const unsigned int firstInLevel = static_cast<unsigned int>(pow(2, depth) - 1);
     const unsigned int levelOffset = bstNode - firstInLevel;
     const unsigned int firstInChildLevel = static_cast<unsigned int>(
@@ -620,7 +620,7 @@ bool TSP::isBstLeaf(unsigned int brickIndex) const {
 
 bool TSP::isOctreeLeaf(unsigned int brickIndex) const {
     const unsigned int otNode = brickIndex % _numOTNodes;
-    const unsigned int depth = static_cast<unsigned int>(log(7 * otNode + 1) / log(8));
+    const unsigned int depth = static_cast<unsigned int>(log1p(7 * otNode) / log(8));
     return depth == _numOTLevels - 1;
 }
 
diff --git a/modules/multiresvolume/rendering/tsp.h b/modules/multiresvolume/rendering/tsp.h
index 7ff93f23ff..715025bb41 100644
--- a/modules/multiresvolume/rendering/tsp.h
+++ b/modules/multiresvolume/rendering/tsp.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/shaders/boundsFs.glsl b/modules/multiresvolume/shaders/boundsFs.glsl
index 2c1dbf6d40..71bce69244 100644
--- a/modules/multiresvolume/shaders/boundsFs.glsl
+++ b/modules/multiresvolume/shaders/boundsFs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/shaders/boundsVs.glsl b/modules/multiresvolume/shaders/boundsVs.glsl
index bdf91b8623..b021df848e 100644
--- a/modules/multiresvolume/shaders/boundsVs.glsl
+++ b/modules/multiresvolume/shaders/boundsVs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/shaders/helper.glsl b/modules/multiresvolume/shaders/helper.glsl
index 89b0c21866..f904f884ff 100644
--- a/modules/multiresvolume/shaders/helper.glsl
+++ b/modules/multiresvolume/shaders/helper.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/multiresvolume/shaders/raycast.glsl b/modules/multiresvolume/shaders/raycast.glsl
index 5ce6378080..cfed83b0c7 100644
--- a/modules/multiresvolume/shaders/raycast.glsl
+++ b/modules/multiresvolume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -72,7 +72,8 @@ float stepSize#{id}(vec3 samplePos, vec3 dir) {
     return 0.01;
     if (true /*opacity_#{id} >= MULTIRES_OPACITY_THRESHOLD*/) {
         return stepSizeCoefficient_#{id}/float(maxNumBricksPerAxis_#{id})/float(paddedBrickDim_#{id});
-    } else {
+    }
+    else {
         // return a number that is garantueed to be bigger than the whole volume
         return 2.0;
     }
@@ -110,7 +111,8 @@ void sample#{id}(vec3 samplePos, vec3 dir, inout vec3 accumulatedColor,
         vec3 oneMinusFrontAlpha = vec3(1.0) - accumulatedAlpha;
         accumulatedColor += oneMinusFrontAlpha * contribution.rgb * contribution.a;
         accumulatedAlpha += oneMinusFrontAlpha * vec3(contribution.a);
-    } else {
+    }
+    else {
         maxStepSize = 2.0;
     }
 }
diff --git a/modules/server/CMakeLists.txt b/modules/server/CMakeLists.txt
index c39537163d..aa6bdb2580 100644
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
diff --git a/modules/server/include/connection.h b/modules/server/include/connection.h
index ddbed4f249..0d4eddc0a2 100644
--- a/modules/server/include/connection.h
+++ b/modules/server/include/connection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/connectionpool.h b/modules/server/include/connectionpool.h
index 020f6f1369..018b5dfd63 100644
--- a/modules/server/include/connectionpool.h
+++ b/modules/server/include/connectionpool.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/jsonconverters.h b/modules/server/include/jsonconverters.h
index 06558404f4..f7edcc26d5 100644
--- a/modules/server/include/jsonconverters.h
+++ b/modules/server/include/jsonconverters.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/serverinterface.h b/modules/server/include/serverinterface.h
index 1b0e47364b..52a7d86a5b 100644
--- a/modules/server/include/serverinterface.h
+++ b/modules/server/include/serverinterface.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/authorizationtopic.h b/modules/server/include/topics/authorizationtopic.h
index 8b64680d73..93ec86e046 100644
--- a/modules/server/include/topics/authorizationtopic.h
+++ b/modules/server/include/topics/authorizationtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/bouncetopic.h b/modules/server/include/topics/bouncetopic.h
index f8a7c37949..5198ea9758 100644
--- a/modules/server/include/topics/bouncetopic.h
+++ b/modules/server/include/topics/bouncetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/documentationtopic.h b/modules/server/include/topics/documentationtopic.h
index 63d2b77603..bd3d70b97f 100644
--- a/modules/server/include/topics/documentationtopic.h
+++ b/modules/server/include/topics/documentationtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/flightcontrollertopic.h b/modules/server/include/topics/flightcontrollertopic.h
index ff111da0dc..a6aa91bca4 100644
--- a/modules/server/include/topics/flightcontrollertopic.h
+++ b/modules/server/include/topics/flightcontrollertopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/getpropertytopic.h b/modules/server/include/topics/getpropertytopic.h
index b6ec3c4d2f..9060f47f67 100644
--- a/modules/server/include/topics/getpropertytopic.h
+++ b/modules/server/include/topics/getpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/luascripttopic.h b/modules/server/include/topics/luascripttopic.h
index e3bce3be55..7ed757e3dd 100644
--- a/modules/server/include/topics/luascripttopic.h
+++ b/modules/server/include/topics/luascripttopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/sessionrecordingtopic.h b/modules/server/include/topics/sessionrecordingtopic.h
index 242e4a5374..ef68254aaa 100644
--- a/modules/server/include/topics/sessionrecordingtopic.h
+++ b/modules/server/include/topics/sessionrecordingtopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/setpropertytopic.h b/modules/server/include/topics/setpropertytopic.h
index 8ad9aacf3a..ed67ebd541 100644
--- a/modules/server/include/topics/setpropertytopic.h
+++ b/modules/server/include/topics/setpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/shortcuttopic.h b/modules/server/include/topics/shortcuttopic.h
index 1a2c9d3364..6643b23fd9 100644
--- a/modules/server/include/topics/shortcuttopic.h
+++ b/modules/server/include/topics/shortcuttopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/subscriptiontopic.h b/modules/server/include/topics/subscriptiontopic.h
index 7dbceb5dce..6f785162cb 100644
--- a/modules/server/include/topics/subscriptiontopic.h
+++ b/modules/server/include/topics/subscriptiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/timetopic.h b/modules/server/include/topics/timetopic.h
index 99493055cd..43b418bea6 100644
--- a/modules/server/include/topics/timetopic.h
+++ b/modules/server/include/topics/timetopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/topic.h b/modules/server/include/topics/topic.h
index 64f3387a89..f982514c43 100644
--- a/modules/server/include/topics/topic.h
+++ b/modules/server/include/topics/topic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,7 +34,7 @@ class Connection;
 class Topic {
 public:
     Topic() {};
-    virtual ~Topic() = default;
+    virtual ~Topic();
 
     void initialize(Connection* connection, size_t topicId);
     nlohmann::json wrappedPayload(const nlohmann::json& payload) const;
diff --git a/modules/server/include/topics/triggerpropertytopic.h b/modules/server/include/topics/triggerpropertytopic.h
index 67228746f5..fce888cb08 100644
--- a/modules/server/include/topics/triggerpropertytopic.h
+++ b/modules/server/include/topics/triggerpropertytopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/include/topics/versiontopic.h b/modules/server/include/topics/versiontopic.h
index 4eed163361..974f487369 100644
--- a/modules/server/include/topics/versiontopic.h
+++ b/modules/server/include/topics/versiontopic.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/servermodule.cpp b/modules/server/servermodule.cpp
index 84910594da..ec1931c657 100644
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -73,7 +73,7 @@ ServerInterface* ServerModule::serverInterfaceByIdentifier(const std::string& id
 }
 
 void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
-    global::callback::preSync.emplace_back([this]() {
+    global::callback::preSync->emplace_back([this]() {
         ZoneScopedN("ServerModule")
 
         preSync();
@@ -84,7 +84,7 @@ void ServerModule::internalInitialize(const ghoul::Dictionary& configuration) {
     }
     ghoul::Dictionary interfaces = configuration.value<ghoul::Dictionary>(KeyInterfaces);
 
-    for (const std::string& key : interfaces.keys()) {
+    for (std::string_view key : interfaces.keys()) {
         ghoul::Dictionary interfaceDictionary = interfaces.value<ghoul::Dictionary>(key);
 
         // @TODO (abock, 2019-09-17);  This is a hack to make the parsing of the
diff --git a/modules/server/servermodule.h b/modules/server/servermodule.h
index 3fbdb48d72..e85026ef4c 100644
--- a/modules/server/servermodule.h
+++ b/modules/server/servermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/connection.cpp b/modules/server/src/connection.cpp
index e2ee05a0c8..9c403f439b 100644
--- a/modules/server/src/connection.cpp
+++ b/modules/server/src/connection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/connectionpool.cpp b/modules/server/src/connectionpool.cpp
index 30944cdade..4fb22c37d4 100644
--- a/modules/server/src/connectionpool.cpp
+++ b/modules/server/src/connectionpool.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/jsonconverters.cpp b/modules/server/src/jsonconverters.cpp
index 84ede19de5..81e816e947 100644
--- a/modules/server/src/jsonconverters.cpp
+++ b/modules/server/src/jsonconverters.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -72,20 +72,9 @@ namespace ghoul {
 
 void to_json(json& j, const Dictionary& dictionary) {
     json object;
-    for (const std::string& key : dictionary.keys()) {
-        if (dictionary.hasValue<glm::vec4>(key)) {
-            const glm::vec4 v = dictionary.value<glm::vec4>(key);
-            object[key] = json::array({ v[0], v[1], v[2], v[3] });
-        }
-        else if (dictionary.hasValue<glm::vec3>(key)) {
-            const glm::vec3 v = dictionary.value<glm::vec3>(key);
-            object[key] = json::array({ v[0], v[1], v[2] });
-        }
-        else if (dictionary.hasValue<glm::vec2>(key)) {
-            const glm::vec2 v = dictionary.value<glm::vec2>(key);
-            object[key] = json::array({ v[0], v[1] });
-        }
-        else if (dictionary.hasValue<glm::dvec4>(key)) {
+    for (std::string_view k : dictionary.keys()) {
+        std::string key = std::string(k);
+        if (dictionary.hasValue<glm::dvec4>(key)) {
             const glm::dvec4 v = dictionary.value<glm::dvec4>(key);
             object[key] = json::array({ v[0], v[1], v[2], v[3] });
         }
@@ -97,18 +86,12 @@ void to_json(json& j, const Dictionary& dictionary) {
             const glm::dvec2 v = dictionary.value<glm::dvec2>(key);
             object[key] = json::array({ v[0], v[1] });
         }
-        else if (dictionary.hasValue<float>(key)) {
-            object[key] = dictionary.value<float>(key);
-        }
         else if (dictionary.hasValue<double>(key)) {
             object[key] = dictionary.value<double>(key);
         }
         else if (dictionary.hasValue<int>(key)) {
             object[key] = dictionary.value<int>(key);
         }
-        else if (dictionary.hasValue<unsigned int>(key)) {
-            object[key] = dictionary.value<unsigned int>(key);
-        }
         else if (dictionary.hasValue<std::string>(key)) {
             object[key] = dictionary.value<std::string>(key);
         }
diff --git a/modules/server/src/serverinterface.cpp b/modules/server/src/serverinterface.cpp
index d5f8ca6517..2609b2a71e 100644
--- a/modules/server/src/serverinterface.cpp
+++ b/modules/server/src/serverinterface.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -137,7 +137,7 @@ ServerInterface::ServerInterface(const ghoul::Dictionary& config)
             if (config.hasValue<ghoul::Dictionary>(key)) {
                 const ghoul::Dictionary& dict = config.value<ghoul::Dictionary>(key);
                 std::vector<std::string> v;
-                for (const std::string& k : dict.keys()) {
+                for (std::string_view k : dict.keys()) {
                     v.push_back(dict.value<std::string>(k));
                 }
                 list.set(v);
diff --git a/modules/server/src/topics/authorizationtopic.cpp b/modules/server/src/topics/authorizationtopic.cpp
index b761fa7da5..f4df2f922f 100644
--- a/modules/server/src/topics/authorizationtopic.cpp
+++ b/modules/server/src/topics/authorizationtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/bouncetopic.cpp b/modules/server/src/topics/bouncetopic.cpp
index d43718e266..142060b3e6 100644
--- a/modules/server/src/topics/bouncetopic.cpp
+++ b/modules/server/src/topics/bouncetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/documentationtopic.cpp b/modules/server/src/topics/documentationtopic.cpp
index d7dfb7c7c9..37119c8203 100644
--- a/modules/server/src/topics/documentationtopic.cpp
+++ b/modules/server/src/topics/documentationtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/flightcontrollertopic.cpp b/modules/server/src/topics/flightcontrollertopic.cpp
index ed95e9df7b..b6f3a14820 100644
--- a/modules/server/src/topics/flightcontrollertopic.cpp
+++ b/modules/server/src/topics/flightcontrollertopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -47,8 +47,6 @@
 #include <unordered_map>
 
 namespace {
-    constexpr const char* BasePathToken = "${BASE}";
-
     enum class Command {
         Connect = 0,
         Disconnect,
@@ -90,12 +88,7 @@ namespace {
     constexpr const char* AutopilotEngagedKey = "engaged";
     constexpr const char* AutopilotInputKey = "autopilotInput";
 
-    constexpr const char* FlightControllerType = "flightcontroller";
-
     // Friction JSON Keys
-    constexpr const char* FrictionEngagedKey = "engaged";
-    constexpr const char* FrictionPropertyUri =
-        "NavigationHandler.OrbitalNavigator.Friction";
     constexpr const char* FrictionRotationKey = "rotation";
     constexpr const char* FrictionZoomKey = "zoom";
     constexpr const char* FrictionRollKey = "roll";
@@ -104,7 +97,6 @@ namespace {
     constexpr const char* RollFriction = "Friction.RollFriction";
 
     // Friction Lua Keys
-    constexpr const char* LuaKey = "lua";
     constexpr const char* LuaScript = "script";
 
     constexpr const char* OrbitX = "orbitX";
@@ -148,9 +140,6 @@ namespace {
         { Friction, Command::Friction },
         { Lua, Command::Lua }
     });
-
-    const int Axes = 10;
-
 } // namespace
 
 using nlohmann::json;
diff --git a/modules/server/src/topics/getpropertytopic.cpp b/modules/server/src/topics/getpropertytopic.cpp
index 4c5cab7aec..f7ce36f341 100644
--- a/modules/server/src/topics/getpropertytopic.cpp
+++ b/modules/server/src/topics/getpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/luascripttopic.cpp b/modules/server/src/topics/luascripttopic.cpp
index b059f15a51..b718ea4838 100644
--- a/modules/server/src/topics/luascripttopic.cpp
+++ b/modules/server/src/topics/luascripttopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -101,7 +101,7 @@ namespace {
             return formatArrayAsLuaTable(it->get<nlohmann::json>());
         }
         if (it->is_number()) {
-            return fmt::format("{:E}", it->get<double>());
+            return fmt::format("{}", it->get<double>());
         }
         if (it->is_string()) {
             return formatLuaString(it->get<std::string>());
@@ -180,9 +180,11 @@ void LuaScriptTopic::runScript(const std::string& script, bool shouldReturn) {
     scripting::ScriptEngine::ScriptCallback callback;
     if (shouldReturn) {
         callback = [this](ghoul::Dictionary data) {
-            nlohmann::json j = data;
-            _connection->sendJson(wrappedPayload(j));
-            _waitingForReturnValue = false;
+            if (_connection) {
+                nlohmann::json j = data;
+                _connection->sendJson(wrappedPayload(j));
+                _waitingForReturnValue = false;
+            }
         };
         _waitingForReturnValue = true;
     }
diff --git a/modules/server/src/topics/sessionrecordingtopic.cpp b/modules/server/src/topics/sessionrecordingtopic.cpp
index e16cda6d3f..9b39e739c5 100644
--- a/modules/server/src/topics/sessionrecordingtopic.cpp
+++ b/modules/server/src/topics/sessionrecordingtopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/setpropertytopic.cpp b/modules/server/src/topics/setpropertytopic.cpp
index a3cb994ab4..69eeb93093 100644
--- a/modules/server/src/topics/setpropertytopic.cpp
+++ b/modules/server/src/topics/setpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index b215054583..eecfdc36ac 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/subscriptiontopic.cpp b/modules/server/src/topics/subscriptiontopic.cpp
index bbdd6dea93..ae0e54334d 100644
--- a/modules/server/src/topics/subscriptiontopic.cpp
+++ b/modules/server/src/topics/subscriptiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/timetopic.cpp b/modules/server/src/topics/timetopic.cpp
index 57d61adb9b..ca3a00d1c7 100644
--- a/modules/server/src/topics/timetopic.cpp
+++ b/modules/server/src/topics/timetopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -170,7 +170,7 @@ void TimeTopic::sendDeltaTimeSteps() {
     const std::vector<double>& steps = global::timeManager->deltaTimeSteps();
 
     json deltaTimeStepsJson = {
-        { "deltaTimeSteps", steps } 
+        { "deltaTimeSteps", steps }
     };
 
     const json nextPrevJson = getNextPrevDeltaTimeStepJson();
diff --git a/modules/server/src/topics/topic.cpp b/modules/server/src/topics/topic.cpp
index 3453c2d739..b69ee91939 100644
--- a/modules/server/src/topics/topic.cpp
+++ b/modules/server/src/topics/topic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,6 +30,10 @@
 
 namespace openspace {
 
+Topic::~Topic() {
+    _connection = nullptr;
+}
+
 void Topic::initialize(Connection* connection, size_t topicId) {
     _connection = connection;
     _topicId = topicId;
diff --git a/modules/server/src/topics/triggerpropertytopic.cpp b/modules/server/src/topics/triggerpropertytopic.cpp
index c489abbf5a..178d2e67c1 100644
--- a/modules/server/src/topics/triggerpropertytopic.cpp
+++ b/modules/server/src/topics/triggerpropertytopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/server/src/topics/versiontopic.cpp b/modules/server/src/topics/versiontopic.cpp
index 6dea1c8d5b..980ace477b 100644
--- a/modules/server/src/topics/versiontopic.cpp
+++ b/modules/server/src/topics/versiontopic.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index e191a4eff1..583e3e89ab 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,49 +25,53 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableorbitalkepler.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesatellites.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesmallbody.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.h
+  rendering/planetgeometry.h
+  rendering/renderableconstellationbounds.h
+  rendering/renderablehabitablezone.h
+  rendering/renderablerings.h
+  rendering/renderableorbitalkepler.h
+  rendering/renderablesatellites.h
+  rendering/renderablesmallbody.h
+  rendering/renderablestars.h
+  rendering/simplespheregeometry.h
+  translation/keplertranslation.h
+  translation/spicetranslation.h
+  translation/tletranslation.h
+  translation/horizonstranslation.h
+  rotation/spicerotation.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableorbitalkepler.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesatellites.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesmallbody.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.cpp
+  rendering/planetgeometry.cpp
+  rendering/renderableconstellationbounds.cpp
+  rendering/renderablehabitablezone.cpp
+  rendering/renderablerings.cpp
+  rendering/renderableorbitalkepler.cpp
+  rendering/renderablesatellites.cpp
+  rendering/renderablesmallbody.cpp
+  rendering/renderablestars.cpp
+  rendering/simplespheregeometry.cpp
+  translation/keplertranslation.cpp
+  translation/spicetranslation.cpp
+  translation/tletranslation.cpp
+  translation/horizonstranslation.cpp
+  rotation/spicerotation.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/constellationbounds_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/constellationbounds_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/debrisViz_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/debrisViz_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/rings_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_ge.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/star_vs.glsl
+  shaders/constellationbounds_fs.glsl
+  shaders/constellationbounds_vs.glsl
+  shaders/debrisViz_fs.glsl
+  shaders/debrisViz_vs.glsl
+  shaders/habitablezone_vs.glsl
+  shaders/habitablezone_fs.glsl
+  shaders/rings_vs.glsl
+  shaders/rings_fs.glsl
+  shaders/star_fs.glsl
+  shaders/star_ge.glsl
+  shaders/star_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/space/include.cmake b/modules/space/include.cmake
index ffea0ac430..f5adeba225 100644
--- a/modules/space/include.cmake
+++ b/modules/space/include.cmake
@@ -1 +1,4 @@
 set(DEFAULT_MODULE ON)
+set (OPENSPACE_DEPENDENCIES
+  base
+)
diff --git a/modules/space/rendering/planetgeometry.cpp b/modules/space/rendering/planetgeometry.cpp
index 12410506bd..ec68224b61 100644
--- a/modules/space/rendering/planetgeometry.cpp
+++ b/modules/space/rendering/planetgeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,40 +30,29 @@
 #include <ghoul/misc/templatefactory.h>
 
 namespace {
-    constexpr const char* KeyType = "Type";
+    struct [[codegen::Dictionary(PlanetGeometry)]] Parameters {
+        // The type of the PlanetGeometry that will can be constructed
+        std::string type;
+    };
+#include "planetgeometry_codegen.cpp"
 } // namespace
 
 namespace openspace::planetgeometry {
 
 documentation::Documentation PlanetGeometry::Documentation() {
-    using namespace documentation;
-    return {
-        "Planet Geometry",
-        "space_geometry_planet",
-        {
-            {
-                KeyType,
-                new StringVerifier,
-                Optional::No,
-                "The type of the PlanetGeometry that will can be constructed."
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_geometry_planet";
+    return doc;
 }
 
 std::unique_ptr<PlanetGeometry> PlanetGeometry::createFromDictionary(
                                                       const ghoul::Dictionary& dictionary)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "PlanetGeometry"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    std::string geometryType = dictionary.value<std::string>(KeyType);
     auto factory = FactoryManager::ref().factory<PlanetGeometry>();
 
-    PlanetGeometry* result = factory->create(geometryType, dictionary);
+    PlanetGeometry* result = factory->create(p.type, dictionary);
     return std::unique_ptr<PlanetGeometry>(result);
 }
 
diff --git a/modules/space/rendering/planetgeometry.h b/modules/space/rendering/planetgeometry.h
index 6be4505134..664d9a8efa 100644
--- a/modules/space/rendering/planetgeometry.h
+++ b/modules/space/rendering/planetgeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/rendering/renderableconstellationbounds.cpp b/modules/space/rendering/renderableconstellationbounds.cpp
index 4e2ca10e91..4fe8e5a9cc 100644
--- a/modules/space/rendering/renderableconstellationbounds.cpp
+++ b/modules/space/rendering/renderableconstellationbounds.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,6 +33,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/opengl/programobject.h>
 #include <fstream>
+#include <optional>
 #include "SpiceUsr.h"
 
 namespace {
@@ -74,51 +75,33 @@ namespace {
         "Constellation Selection",
         "The constellations that are selected are displayed on the celestial sphere."
     };
+
+    struct [[codegen::Dictionary(RenderableConstellationBounds)]] Parameters {
+        // [[codegen::verbatim(VertexInfo.description)]]
+        std::string file;
+
+        // [[codegen::verbatim(ConstellationInfo.description)]]
+        std::optional<std::string> constellationFile;
+
+        // [[codegen::verbatim(ColorInfo.description)]]
+        std::optional<glm::vec3> color;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<float> lineWidth;
+
+        // [[codegen::verbatim(SelectionInfo.description)]]
+        std::optional<std::vector<std::string>> constellationSelection;
+    };
+#include "renderableconstellationbounds_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableConstellationBounds::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableConstellationBounds",
-        "space_renderable_constellationbounds",
-        {
-            {
-                VertexInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                VertexInfo.description
-            },
-            {
-                ConstellationInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                "Specifies the file that contains the mapping between constellation "
-                "abbreviations and full name of the constellation. If the file is "
-                "omitted, the abbreviations are used as the full names."
-            },
-            {
-                ColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                ColorInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            },
-            {
-                SelectionInfo.identifier,
-                new StringListVerifier,
-                Optional::Yes,
-                SelectionInfo.description
-            }
-        }
-    };
-}
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_renderable_constellationbounds";
+    return doc;
+} // namespace
 
 
 RenderableConstellationBounds::RenderableConstellationBounds(
@@ -130,53 +113,33 @@ RenderableConstellationBounds::RenderableConstellationBounds(
     , _lineWidth(LineWidthInfo, 2.f, 1.f, 32.f)
     , _constellationSelection(SelectionInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableConstellationBounds"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     _vertexFilename.onChange([&](){ loadVertexFile(); });
     addProperty(_vertexFilename);
-    _vertexFilename = dictionary.value<std::string>(VertexInfo.identifier);
+    _vertexFilename = p.file;
 
     _constellationFilename.onChange([&](){ loadConstellationFile(); });
+    _constellationFilename = p.constellationFile.value_or(_constellationFilename);
     addProperty(_constellationFilename);
-    if (dictionary.hasKey(ConstellationInfo.identifier)) {
-        _constellationFilename = dictionary.value<std::string>(
-            ConstellationInfo.identifier
-        );
-    }
 
     _color.setViewOption(properties::Property::ViewOptions::Color);
+    _color = p.color.value_or(_color);
     addProperty(_color);
-    if (dictionary.hasKey(ColorInfo.identifier)) {
-        _color = glm::vec3(dictionary.value<glm::dvec3>(ColorInfo.identifier));
-    }
 
+    _lineWidth = p.lineWidth.value_or(_lineWidth);
     addProperty(_lineWidth);
-    if (dictionary.hasKey(LineWidthInfo.identifier)) {
-        _lineWidth = static_cast<float>(
-            dictionary.value<double>(LineWidthInfo.identifier)
-        );
-    }
 
     fillSelectionProperty();
     _constellationSelection.onChange([this]() { selectionPropertyHasChanged(); });
     addProperty(_constellationSelection);
 
-    if (dictionary.hasKey(SelectionInfo.identifier)) {
-        const ghoul::Dictionary& selection = dictionary.value<ghoul::Dictionary>(
-            SelectionInfo.identifier
-        );
-
+    if (p.constellationSelection.has_value()) {
         std::vector<properties::SelectionProperty::Option> options =
             _constellationSelection.options();
+
         std::vector<int> selectedIndices;
-
-        for (size_t i = 1; i <= selection.size(); ++i) {
-            const std::string& s = selection.value<std::string>(std::to_string(i));
-
+        for (const std::string& s : *p.constellationSelection) {
             const auto it = std::find_if(
                 options.begin(),
                 options.end(),
diff --git a/modules/space/rendering/renderableconstellationbounds.h b/modules/space/rendering/renderableconstellationbounds.h
index be5bb8707a..d14769d72f 100644
--- a/modules/space/rendering/renderableconstellationbounds.h
+++ b/modules/space/rendering/renderableconstellationbounds.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/rendering/renderablehabitablezone.cpp b/modules/space/rendering/renderablehabitablezone.cpp
new file mode 100644
index 0000000000..a8d0d4dc1d
--- /dev/null
+++ b/modules/space/rendering/renderablehabitablezone.cpp
@@ -0,0 +1,302 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/rendering/renderablehabitablezone.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/distanceconstants.h>
+#include <openspace/util/updatestructures.h>
+#include <ghoul/logging/logmanager.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/opengl/openglstatecache.h>
+#include <ghoul/opengl/programobject.h>
+#include <ghoul/opengl/textureunit.h>
+
+namespace {
+    constexpr const char _loggerCat[] = "RenderableHabitableZone";
+
+    constexpr const std::array<const char*, 6> UniformNames = {
+        "modelViewProjectionTransform", "opacity", "width", "transferFunctionTexture",
+        "conservativeBounds", "showOptimistic"
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo EffectiveTemperatureInfo = {
+        "EffectiveTemperature",
+        "Effective Temperature",
+        "The effective temperature of the corresponding star, in Kelvin. "
+        "Used to compute the width and size of the disc."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo LuminosityInfo = {
+        "Luminosity",
+        "Luminosity",
+        "The luminosity of the corresponding star, in units of solar luminosities. "
+        "Used to compute the width and size of the disc."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo OptimisticInfo = {
+        "Optimistic",
+        "Optimistic" ,
+        "If true, the habitable zone disc is rendered with the optimistic boundaries "
+        "rather than the conservative ones."
+    };
+
+    constexpr openspace::properties::Property::PropertyInfo KopparapuTeffIntervalInfo = {
+        "KopparapuTeffInterval",
+        "Kopparapu TEFF" ,
+        "The effective temperature interval for which Kopparapu's formula is used for "
+        "the habitable zone computation. For stars with temperatures outside the range, "
+        "a simpler method by Tom E. Harris is used. This method only uses the star "
+        "luminosity and does not include computation of the optimistic boundaries."
+    };
+} // namespace
+
+namespace openspace {
+
+documentation::Documentation RenderableHabitableZone::Documentation() {
+    using namespace documentation;
+    documentation::Documentation doc {
+        "Renderable Habitable Zone",
+        "exoplanets_renderable_habitable_zone",
+        {
+            {
+                EffectiveTemperatureInfo.identifier,
+                new DoubleVerifier,
+                Optional::No,
+                EffectiveTemperatureInfo.description
+            },
+            {
+                LuminosityInfo.identifier,
+                new DoubleVerifier,
+                Optional::No,
+                LuminosityInfo.description
+            },
+            {
+                OptimisticInfo.identifier,
+                new BoolVerifier,
+                Optional::Yes,
+                OptimisticInfo.description
+            },
+            {
+                KopparapuTeffIntervalInfo.identifier,
+                new DoubleVector2Verifier,
+                Optional::Yes,
+                KopparapuTeffIntervalInfo.description
+            }
+        }
+    };
+
+    // @TODO cleanup
+    // Insert the parents documentation entries until we have a verifier that can deal
+    // with class hierarchy
+    documentation::Documentation parentDoc = RenderableDisc::Documentation();
+    doc.entries.insert(
+        doc.entries.end(),
+        parentDoc.entries.begin(),
+        parentDoc.entries.end()
+    );
+
+    return doc;
+}
+
+RenderableHabitableZone::RenderableHabitableZone(const ghoul::Dictionary& dictionary)
+    : RenderableDisc(dictionary)
+    , _teff(EffectiveTemperatureInfo, 5780.f, 0.f, 7.5e4f)
+    , _luminosity(LuminosityInfo, 1.f, 0.f, 1e8f)
+    , _showOptimistic(OptimisticInfo, false)
+    , _kopparapuTeffInterval(KopparapuTeffIntervalInfo, glm::vec2(1000.f, 10000.f))
+{
+    documentation::testSpecificationAndThrow(
+        Documentation(),
+        dictionary,
+        "RenderableHabitableZone"
+    );
+
+    if (dictionary.hasKey(EffectiveTemperatureInfo.identifier)) {
+        _teff = static_cast<float>(
+            dictionary.value<double>(EffectiveTemperatureInfo.identifier)
+        );
+    }
+    _teff.onChange([this]() { computeZone(); });
+    addProperty(_teff);
+
+    if (dictionary.hasKey(LuminosityInfo.identifier)) {
+        _luminosity = static_cast<float>(
+            dictionary.value<double>(LuminosityInfo.identifier)
+        );
+    }
+    _luminosity.onChange([this]() { computeZone(); });
+    addProperty(_luminosity);
+
+    if (dictionary.hasKey(OptimisticInfo.identifier)) {
+        _showOptimistic = dictionary.value<bool>(OptimisticInfo.identifier);
+    }
+    addProperty(_showOptimistic);
+
+    // 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.setReadOnly(true);
+
+    // Make parent's size related properties read only. We want to set them based on the
+    // given temperature and luminosity
+    _size.setReadOnly(true);
+    _width.setReadOnly(true);
+
+    computeZone();
+}
+
+void RenderableHabitableZone::render(const RenderData& data, RendererTasks&) {
+    _shader->activate();
+
+    glm::dmat4 modelTransform =
+        glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
+        glm::dmat4(data.modelTransform.rotation) *
+        glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale));
+
+    glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;
+
+    _shader->setUniform(
+        _uniformCache.modelViewProjection,
+        data.camera.projectionMatrix() * glm::mat4(modelViewTransform)
+    );
+    _shader->setUniform(_uniformCache.width, _width);
+    _shader->setUniform(_uniformCache.opacity, _opacity);
+    _shader->setUniform(_uniformCache.conservativeBounds, _conservativeBounds);
+    _shader->setUniform(_uniformCache.showOptimistic, _showOptimistic);
+
+    ghoul::opengl::TextureUnit unit;
+    unit.activate();
+    _texture->bind();
+    _shader->setUniform(_uniformCache.texture, unit);
+
+    glEnablei(GL_BLEND, 0);
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+    glDepthMask(false);
+    glDisable(GL_CULL_FACE);
+
+    _plane->render();
+
+    _shader->deactivate();
+
+    // Restores GL State
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
+    global::renderEngine->openglStateCache().resetPolygonAndClippingState();
+}
+
+void RenderableHabitableZone::initializeShader() {
+    _shader = global::renderEngine->buildRenderProgram(
+        "HabitableZoneProgram",
+        absPath("${MODULE_SPACE}/shaders/habitablezone_vs.glsl"),
+        absPath("${MODULE_SPACE}/shaders/habitablezone_fs.glsl")
+    );
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+}
+
+void RenderableHabitableZone::updateUniformLocations() {
+    ghoul::opengl::updateUniformLocations(*_shader, _uniformCache, UniformNames);
+}
+
+void RenderableHabitableZone::computeZone() {
+    glm::dvec4 distancesInAu = computeKopparapuZoneBoundaries(_teff, _luminosity);
+    constexpr const double AU = distanceconstants::AstronomicalUnit;
+    const double inner = distancesInAu[0] * AU;
+    const double innerConservative = distancesInAu[1] * AU;
+    const double outerConservative = distancesInAu[2] * AU;
+    const double outer = distancesInAu[3] * AU;
+
+    double discWidth = 0.0;
+    if (outer > 0.0) {
+        discWidth = (outer - inner) / outer;
+    }
+
+    _size = static_cast<float>(outer);
+    _width = static_cast<float>(discWidth);
+
+    // Compute the coservative bounds normalized by the size of the disc, i.e. in [0, 1]
+    _conservativeBounds = glm::vec2(innerConservative, outerConservative);
+    _conservativeBounds /= _size;
+}
+
+glm::dvec4 RenderableHabitableZone::computeKopparapuZoneBoundaries(float teff,
+                                                                   float luminosity)
+{
+    // Kopparapu's formula only considers stars with teff in range [2600, 7200] K.
+    // However, we want to use the formula for more stars, so add some flexibility to
+    // the teff boundaries (see constructor).
+    // OBS! This also prevents problems with too large teff values in the computation
+    const glm::vec2 teffBounds = _kopparapuTeffInterval;
+    if (teff > teffBounds.y || teff < teffBounds.x) {
+        // For the other stars, use a method by Tom E. Morris:
+        // https://www.planetarybiology.com/calculating_habitable_zone.html
+        const double L = static_cast<double>(luminosity);
+        double inner = std::sqrt(L / 1.1);
+        double outer = std::sqrt(L / 0.53);
+        return glm::dvec4(inner, inner, outer, outer);
+    }
+
+    struct Coefficients {
+        double seffSun;
+        double a;
+        double b;
+        double c;
+        double d;
+    };
+
+    // Coefficients for planets of 1 Earth mass. Received from:
+    // https://depts.washington.edu/naivpl/sites/default/files/HZ_coefficients.dat
+    constexpr const Coefficients coefficients[] = {
+        // Optimistic Inner boundary - Recent Venus
+        {1.77600E+00, 2.13600E-04, 2.53300E-08, -1.33200E-11, -3.09700E-15},
+        // Conservative Inner boundary - Runaway greenhouse
+        {1.10700E+00, 1.33200E-04, 1.58000E-08, -8.30800E-12, -1.93100E-15},
+        // Conservative Outer boundary - Maximum greenhouse
+        {3.56000E-01, 6.17100E-05, 1.69800E-09, -3.19800E-12, -5.57500E-16},
+        // Optimistic Outer boundary - Early Mars
+        {3.20000E-01, 5.54700E-05, 1.52600E-09, -2.87400E-12, -5.01100E-16}
+    };
+
+    const double tstar = static_cast<double>(teff - 5780.f);
+    const double tstar2 = tstar * tstar;
+    const double L = static_cast<double>(luminosity);
+
+    glm::dvec4 distances;
+    for (int i = 0; i < 4; ++i) {
+        const Coefficients& coeffs = coefficients[i];
+        double seff = coeffs.seffSun + (coeffs.a * tstar) + (coeffs.b * tstar2) +
+            (coeffs.c * tstar * tstar2) + (coeffs.d * tstar2 * tstar2);
+
+        distances[i] = std::pow(L / seff, 0.5);
+    }
+
+    return distances;
+}
+
+} // namespace openspace
diff --git a/modules/space/rendering/renderablehabitablezone.h b/modules/space/rendering/renderablehabitablezone.h
new file mode 100644
index 0000000000..6aa5d7f31b
--- /dev/null
+++ b/modules/space/rendering/renderablehabitablezone.h
@@ -0,0 +1,75 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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_EXOPLANETS___RENDERABLEHABITABLEZONE___H__
+#define __OPENSPACE_MODULE_EXOPLANETS___RENDERABLEHABITABLEZONE___H__
+
+#include <modules/base/rendering/renderabledisc.h>
+#include <openspace/properties/scalar/boolproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/vector/vec2property.h>
+
+namespace openspace {
+
+namespace documentation { struct Documentation; }
+
+class RenderableHabitableZone : public RenderableDisc {
+public:
+    RenderableHabitableZone(const ghoul::Dictionary& dictionary);
+
+    void render(const RenderData& data, RendererTasks& rendererTask) override;
+
+    static documentation::Documentation Documentation();
+
+private:
+    void initializeShader() override;
+    void updateUniformLocations() override;
+    void computeZone();
+
+    /**
+     * Compute the inner and outer boundary of the habitable zone of a star, according to
+     * formula and coefficients by Kopparapu et al. (2015) https://arxiv.org/abs/1404.5292
+     *
+     * \param teff The effective temperature of the star, in Kelvin
+     * \param luminosity The luminosity of the star, in solar luminosities
+     * \return A vec4 with the boundaries in atronomical units, in the order:
+               optimistic inner, conservative inner, conservative outer, optimistic outer
+     */
+    glm::dvec4 computeKopparapuZoneBoundaries(float teff, float luminosity);
+
+    properties::FloatProperty _teff;
+    properties::FloatProperty _luminosity;
+    properties::BoolProperty _showOptimistic;
+
+    properties::Vec2Property _kopparapuTeffInterval;
+
+    glm::vec2 _conservativeBounds;
+
+    UniformCache(modelViewProjection, opacity, width, texture,
+        conservativeBounds, showOptimistic) _uniformCache;
+};
+
+} // namespace openspace
+
+#endif // __OPENSPACE_MODULE_EXOPLANETS___RENDERABLEHABITABLEZONE___H__
diff --git a/modules/space/rendering/renderableorbitalkepler.cpp b/modules/space/rendering/renderableorbitalkepler.cpp
index 0afe86fc94..5e898fb39d 100644
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -46,16 +46,19 @@
 
 namespace {
     constexpr const char* ProgramName = "OrbitalKepler";
-    constexpr const char* _loggerCat = "OrbitalKepler";
-    constexpr const char* KeyFile = "Path";
-    constexpr const char* KeyLineNum = "LineNumber";
 
     // Fragile! Keep in sync with documentation
-    const std::map<std::string, openspace::Renderable::RenderBin> RenderBinModeConversion = {
+    const std::map<std::string, openspace::Renderable::RenderBin> RenderBinConversion = {
         { "Background", openspace::Renderable::RenderBin::Background },
         { "Opaque", openspace::Renderable::RenderBin::Opaque },
-        { "PreDeferredTransparent", openspace::Renderable::RenderBin::PreDeferredTransparent},
-        { "PostDeferredTransparent", openspace::Renderable::RenderBin::PostDeferredTransparent}
+        {
+            "PreDeferredTransparent",
+            openspace::Renderable::RenderBin::PreDeferredTransparent
+        },
+        {
+            "PostDeferredTransparent",
+            openspace::Renderable::RenderBin::PostDeferredTransparent
+        }
     };
 
     constexpr const std::array<int, 36> LeapYears = {
@@ -360,11 +363,11 @@ double RenderableOrbitalKepler::epochFromYMDdSubstring(const std::string& epochS
 
 RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
     : Renderable(dict)
-    , _segmentQuality(SegmentQualityInfo, 2, 1, 10)
-    , _path(PathInfo)
     , _upperLimit(UpperLimitInfo, 1000, 1, 1000000)
+    , _segmentQuality(SegmentQualityInfo, 2, 1, 10)
     , _startRenderIdx(StartRenderIdxInfo, 0, 0, 1)
     , _sizeRender(RenderSizeInfo, 1, 1, 2)
+    , _path(PathInfo)
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
@@ -375,27 +378,32 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
     _path = dict.value<std::string>(PathInfo.identifier);
     _segmentQuality = static_cast<int>(dict.value<double>(SegmentQualityInfo.identifier));
 
-    if (dict.hasKeyAndValue<glm::vec3>(LineColorInfo.identifier)) {
-        _appearance.lineColor = dict.value<glm::vec3>(LineColorInfo.identifier);
+    if (dict.hasValue<glm::dvec3>(LineColorInfo.identifier)) {
+        _appearance.lineColor = dict.value<glm::dvec3>(LineColorInfo.identifier);
     }
 
-    _appearance.lineFade = dict.hasKeyAndValue<double>(TrailFadeInfo.identifier) ?
+    _appearance.lineFade =
+        dict.hasValue<double>(TrailFadeInfo.identifier) ?
         static_cast<float>(dict.value<double>(TrailFadeInfo.identifier)) :
         20.f;
 
-    _upperLimit = dict.hasKeyAndValue<double>(UpperLimitInfo.identifier) ?
+    _upperLimit =
+        dict.hasValue<double>(UpperLimitInfo.identifier) ?
         static_cast<unsigned int>(dict.value<double>(UpperLimitInfo.identifier)) :
         0u;
 
-    _startRenderIdx = dict.hasKeyAndValue<double>(StartRenderIdxInfo.identifier) ?
+    _startRenderIdx =
+        dict.hasValue<double>(StartRenderIdxInfo.identifier) ?
         static_cast<unsigned int>(dict.value<double>(StartRenderIdxInfo.identifier)) :
         0u;
 
-    _sizeRender = dict.hasKeyAndValue<double>(RenderSizeInfo.identifier) ?
+    _sizeRender =
+        dict.hasValue<double>(RenderSizeInfo.identifier) ?
         static_cast<unsigned int>(dict.value<double>(RenderSizeInfo.identifier)) :
         0u;
 
-    _appearance.lineWidth = dict.hasKeyAndValue<double>(LineWidthInfo.identifier) ?
+    _appearance.lineWidth =
+        dict.hasValue<double>(LineWidthInfo.identifier) ?
         static_cast<float>(dict.value<double>(LineWidthInfo.identifier)) :
         2.f;
 
@@ -415,12 +423,13 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dict)
     _startRenderIdxCallbackHandle = _startRenderIdx.onChange(_updateStartRenderIdxSelect);
     _sizeRenderCallbackHandle = _sizeRender.onChange(_updateRenderSizeSelect);
 
-    if (dict.hasKeyAndValue<std::string>(RenderBinModeInfo.identifier)) {
-        openspace::Renderable::RenderBin cfgRenderBin = RenderBinModeConversion.at(
+    if (dict.hasValue<std::string>(RenderBinModeInfo.identifier)) {
+        Renderable::RenderBin cfgRenderBin = RenderBinConversion.at(
             dict.value<std::string>(RenderBinModeInfo.identifier)
         );
         setRenderBin(cfgRenderBin);
-    } else {
+    }
+    else {
         setRenderBin(Renderable::RenderBin::PostDeferredTransparent);
     }
 }
@@ -519,13 +528,13 @@ void RenderableOrbitalKepler::updateBuffers() {
     size_t nVerticesTotal = 0;
 
     int numOrbits = static_cast<int>(_data.size());
-    for (size_t i = 0; i < numOrbits; ++i) {
+    for (int i = 0; i < numOrbits; ++i) {
         nVerticesTotal += _segmentSize[i] + 1;
     }
     _vertexBufferData.resize(nVerticesTotal);
 
     size_t vertexBufIdx = 0;
-    for (size_t orbitIdx = 0; orbitIdx < numOrbits; ++orbitIdx) {
+    for (int orbitIdx = 0; orbitIdx < numOrbits; ++orbitIdx) {
         const KeplerParameters& orbit = _data[orbitIdx];
 
         _keplerTranslator.setKeplerElements(
diff --git a/modules/space/rendering/renderableorbitalkepler.h b/modules/space/rendering/renderableorbitalkepler.h
index 42c6a45848..9e269d7d7b 100644
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -120,7 +120,6 @@ private:
 
     GLuint _vertexArray;
     GLuint _vertexBuffer;
-    GLuint _indexBuffer;
 
     void updateBuffers();
 
diff --git a/modules/space/rendering/renderablerings.cpp b/modules/space/rendering/renderablerings.cpp
index 4e882de4a0..6e45f719b6 100644
--- a/modules/space/rendering/renderablerings.cpp
+++ b/modules/space/rendering/renderablerings.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,11 +36,12 @@
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
+#include <optional>
 
 namespace {
     constexpr const std::array<const char*, 6> UniformNames = {
-        "modelViewProjectionTransform", "textureOffset", "colorFilterValue", "_nightFactor",
-        "sunPosition", "texture1"
+        "modelViewProjectionTransform", "textureOffset", "colorFilterValue",
+        "_nightFactor", "sunPosition", "texture1"
     };
 
     constexpr openspace::properties::Property::PropertyInfo TextureInfo = {
@@ -79,53 +80,32 @@ namespace {
         "This value affects the filtering out of part of the rings depending on the "
         "color values of the texture. The higher value, the more rings are filtered out."
     };
+
+    struct [[codegen::Dictionary(RenderableRings)]] Parameters {
+        // [[codegen::verbatim(TextureInfo.description)]]
+        std::string texture;
+
+        // [[codegen::verbatim(SizeInfo.description)]]
+        float size;
+
+        // [[codegen::verbatim(OffsetInfo.description)]]
+        std::optional<glm::vec2> offset;
+
+        // [[codegen::verbatim(NightFactorInfo.description)]]
+        std::optional<float> nightFactor;
+
+        // [[codegen::verbatim(ColorFilterInfo.description)]]
+        std::optional<float> colorFilter;
+    };
+#include "renderablerings_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableRings::Documentation() {
-    using namespace documentation;
-    return {
-        "Renderable Rings",
-        "space_renderable_rings",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableRings"),
-                Optional::No
-            },
-            {
-                TextureInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                TextureInfo.description
-            },
-            {
-                SizeInfo.identifier,
-                new DoubleVerifier,
-                Optional::No,
-                SizeInfo.description
-            },
-            {
-                OffsetInfo.identifier,
-                new DoubleVector2Verifier,
-                Optional::Yes,
-                OffsetInfo.description
-            },
-            {
-                NightFactorInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                NightFactorInfo.description
-            },
-            {
-                ColorFilterInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                ColorFilterInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_renderable_rings";
+    return doc;
 }
 
 RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
@@ -138,23 +118,17 @@ RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
 {
     using ghoul::filesystem::File;
 
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableRings"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _size = static_cast<float>(dictionary.value<double>(SizeInfo.identifier));
+    _size = p.size;
     setBoundingSphere(_size);
     _size.onChange([&]() { _planeIsDirty = true; });
     addProperty(_size);
 
-    _texturePath = absPath(dictionary.value<std::string>(TextureInfo.identifier));
+    _texturePath = absPath(p.texture);
     _textureFile = std::make_unique<File>(_texturePath);
 
-    if (dictionary.hasKeyAndValue<glm::vec2>(OffsetInfo.identifier)) {
-        _offset = dictionary.value<glm::vec2>(OffsetInfo.identifier);
-    }
+    _offset = p.offset.value_or(_offset);
     addProperty(_offset);
 
     _texturePath.onChange([&]() { loadTexture(); });
@@ -162,18 +136,10 @@ RenderableRings::RenderableRings(const ghoul::Dictionary& dictionary)
 
     _textureFile->setCallback([&](const File&) { _textureIsDirty = true; });
 
-    if (dictionary.hasKeyAndValue<double>(NightFactorInfo.identifier)) {
-        _nightFactor = static_cast<float>(
-            dictionary.value<double>(NightFactorInfo.identifier)
-        );
-    }
+    _nightFactor = p.nightFactor.value_or(_nightFactor);
     addProperty(_nightFactor);
 
-    if (dictionary.hasKeyAndValue<double>(ColorFilterInfo.identifier)) {
-        _colorFilter = static_cast<float>(
-            dictionary.value<double>(ColorFilterInfo.identifier)
-        );
-    }
+    _colorFilter = p.colorFilter.value_or(_colorFilter);
     addProperty(_colorFilter);
 }
 
diff --git a/modules/space/rendering/renderablerings.h b/modules/space/rendering/renderablerings.h
index 35152b1629..ddf6b89a8f 100644
--- a/modules/space/rendering/renderablerings.h
+++ b/modules/space/rendering/renderablerings.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp
index f3c667a197..c50736ad34 100644
--- a/modules/space/rendering/renderablesatellites.cpp
+++ b/modules/space/rendering/renderablesatellites.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -45,7 +45,6 @@
 #include <vector>
 
 namespace {
-    constexpr const char* ProgramName = "RenderableSatellites";
     constexpr const char* _loggerCat = "Satellites";
 
     static const openspace::properties::Property::PropertyInfo PathInfo = {
@@ -75,53 +74,42 @@ namespace {
         "Trail Fade",
         "This value determines how fast the trail fades and is an appearance property. "
     };
+
+    struct [[codegen::Dictionary(RenderableSatellites)]] Parameters {
+        // [[codegen::verbatim(SegmentsInfo.description)]]
+        double segments;
+
+        // [[codegen::verbatim(PathInfo.description)]]
+        std::string path;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<double> lineWidth;
+
+        // [[codegen::verbatim(LineColorInfo.description)]]
+        glm::dvec3 color;
+
+        // [[codegen::verbatim(TrailFadeInfo.description)]]
+        std::optional<double> trailFade;
+    };
+#include "renderablesatellites_codegen.cpp"
 }
 
 namespace openspace {
 
 documentation::Documentation RenderableSatellites::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableSatellites",
-        "space_renderable_satellites",
-        {
-            {
-                SegmentsInfo.identifier,
-                new DoubleVerifier,
-                Optional::No,
-                SegmentsInfo.description
-            },
-            {
-                PathInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                PathInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            },
-            {
-                LineColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::No,
-                LineColorInfo.description
-            },
-            {
-                TrailFadeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TrailFadeInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_renderable_satellites";
+    return doc;
 }
 
 RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary)
     : RenderableOrbitalKepler(dictionary)
-{}
+{
+    // Commented out right now as its not super clear how it works with inheritance. We'd
+    // probably want a codegen::check function that only does the checking without
+    // actually creating a Parameter objects
+    // codegen::bake<Parameters>(dictionary);
+}
 
 void RenderableSatellites::readDataFile(const std::string& filename) {
     if (!FileSys.fileExists(filename)) {
diff --git a/modules/space/rendering/renderablesatellites.h b/modules/space/rendering/renderablesatellites.h
index d6e9112ecb..e90c18cc65 100644
--- a/modules/space/rendering/renderablesatellites.h
+++ b/modules/space/rendering/renderablesatellites.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,7 +41,7 @@ namespace openspace {
 class RenderableSatellites : public RenderableOrbitalKepler {
 public:
     RenderableSatellites(const ghoul::Dictionary& dictionary);
-    void readDataFile(const std::string& filename);
+    virtual void readDataFile(const std::string& filename) override;
     static documentation::Documentation Documentation();
     void initializeFileReading();
 
diff --git a/modules/space/rendering/renderablesmallbody.cpp b/modules/space/rendering/renderablesmallbody.cpp
index 1da9da54a7..6963d03a9c 100644
--- a/modules/space/rendering/renderablesmallbody.cpp
+++ b/modules/space/rendering/renderablesmallbody.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -46,7 +46,6 @@
 #include <vector>
 
 namespace {
-    constexpr const char* ProgramName = "RenderableSmallBody";
     constexpr const char* _loggerCat = "SmallSolarSystemBody";
 
     static const openspace::properties::Property::PropertyInfo PathInfo = {
@@ -85,59 +84,62 @@ namespace {
         "Upper limit on the number of objects for this renderable, regardless of "
         "how many objects are contained in the data file"
     };
+
+    double importAngleValue(const std::string& angle) {
+        if (angle.empty()) {
+            return 0.0;
+        }
+
+        double output = std::stod(angle);
+        output = std::fmod(output, 360.0);
+        if (output < 0.0) {
+            output += 360.0;
+        }
+        return output;
+    }
+
+    std::string& formatObjectName(std::string& name) {
+        const std::string trimChars = "\t\n\v\f\r\" ";
+        name.erase(0, name.find_first_not_of(trimChars));
+        name.erase(name.find_last_not_of(trimChars) + 1);
+        return name;
+    }
+
+    struct [[codegen::Dictionary(RenderableSmallBody)]] Parameters {
+        // [[codegen::verbatim(SegmentQualityInfo.description)]]
+        double segmentQuality;
+
+        // [[codegen::verbatim(UpperLimitInfo.description)]]
+        std::optional<int> upperLimit;
+
+        // [[codegen::verbatim(PathInfo.description)]]
+        std::string path;
+
+        // [[codegen::verbatim(LineWidthInfo.description)]]
+        std::optional<double> lineWidth;
+
+        // [[codegen::verbatim(LineColorInfo.description)]]
+        glm::dvec3 color;
+
+        // [[codegen::verbatim(TrailFadeInfo.description)]]
+        std::optional<double> trailFade;
+    };
+#include "renderablesmallbody_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableSmallBody::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableSmallBody",
-        "space_renderable_small_body",
-        {
-            {
-                SegmentQualityInfo.identifier,
-                new DoubleVerifier,
-                Optional::No,
-                SegmentQualityInfo.description
-            },
-            {
-                UpperLimitInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                UpperLimitInfo.description
-            },
-            {
-                PathInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                PathInfo.description
-            },
-            {
-                LineWidthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                LineWidthInfo.description
-            },
-            {
-                LineColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::No,
-                LineColorInfo.description
-            },
-            {
-                TrailFadeInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                TrailFadeInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_renderable_small_body";
+    return doc;
 }
 
 RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary)
     : RenderableOrbitalKepler(dictionary)
 {
+    codegen::bake<Parameters>(dictionary);
+
     _upperLimitCallbackHandle = _upperLimit.onChange(_reinitializeTrailBuffers);
     addProperty(_upperLimit);
 }
@@ -166,8 +168,6 @@ void RenderableSmallBody::readDataFile(const std::string& filename) {
     std::string line;
     unsigned int csvLine = 0;
     int fieldCount = 0;
-    float lineSkipFraction = 1.0;
-    int lastLineCount = -1;
     const std::string expectedHeaderLine = "full_name,epoch_cal,e,a,i,om,w,ma,per";
 
     try {
@@ -178,6 +178,7 @@ void RenderableSmallBody::readDataFile(const std::string& filename) {
         }
         _numObjects = numberOfLines;
 
+        float lineSkipFraction = 1.0;
         if (!_isFileReadinitialized) {
             _isFileReadinitialized = true;
             initializeFileReading();
@@ -211,6 +212,7 @@ void RenderableSmallBody::readDataFile(const std::string& filename) {
             skipSingleLineInFile(file);
         }
         bool firstDataLine = true;
+        int lastLineCount = -1;
         for (csvLine = _startRenderIdx + 1;
              csvLine <= endElement + 1;
              csvLine++, sequentialLineErrors++)
@@ -239,8 +241,8 @@ void RenderableSmallBody::readDataFile(const std::string& filename) {
                         fieldCount, csvLine + 1, numberOfLines, filename
                     ));
                 }
-                catch (std::ios_base::failure& f) {
-                    throw f;
+                catch (std::ios_base::failure&) {
+                    throw;
                 }
 
                 if (sequentialLineErrors == 4) {
@@ -398,20 +400,4 @@ void RenderableSmallBody::readOrbitalParamsFromThisLine(bool firstDataLine,
     );
 }
 
-static double importAngleValue(const std::string& angle) {
-    double output = std::stod(angle);
-    output = std::fmod(output, 360.0);
-    if (output < 0.0) {
-        output += 360.0;
-    }
-    return output;
-}
-
-static std::string& formatObjectName(std::string& name) {
-    const std::string trimChars = "\t\n\v\f\r\" ";
-    name.erase(0, name.find_first_not_of(trimChars));
-    name.erase(name.find_last_not_of(trimChars) + 1);
-    return name;
-}
-
 } // namespace openspace
diff --git a/modules/space/rendering/renderablesmallbody.h b/modules/space/rendering/renderablesmallbody.h
index 6a68bb7e3e..b1fc1d7dc3 100644
--- a/modules/space/rendering/renderablesmallbody.h
+++ b/modules/space/rendering/renderablesmallbody.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,8 +38,6 @@
 
 namespace openspace {
 
-static double importAngleValue(const std::string& angle);
-
 class RenderableSmallBody : public RenderableOrbitalKepler {
 public:
     RenderableSmallBody(const ghoul::Dictionary& dictionary);
@@ -48,7 +46,7 @@ public:
 private:
     void readOrbitalParamsFromThisLine(bool firstDataLine, int& fieldCount,
         unsigned int& csvLine, std::ifstream& file);
-    void readDataFile(const std::string& filename);
+    virtual void readDataFile(const std::string& filename) override;
     void initializeFileReading();
     void skipSingleLineInFile(std::ifstream& file);
 
@@ -59,9 +57,6 @@ private:
     std::vector<unsigned int> _indexBufferData;
 };
 
-static double importAngleValue(const std::string& angle);
-static std::string& formatObjectName(std::string& name);
-
 } // namespace openspace
 
 #endif // __OPENSPACE_MODULE_SPACE___RENDERABLESMALLBODY___H__
diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp
index e3a5987a08..c1d159cb8e 100644
--- a/modules/space/rendering/renderablestars.cpp
+++ b/modules/space/rendering/renderablestars.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -51,10 +51,6 @@
 namespace {
     constexpr const char* _loggerCat = "RenderableStars";
 
-    constexpr const char* KeyFile = "File";
-    constexpr const char* KeyStaticFilterValue = "StaticFilter";
-    constexpr const char* KeyStaticFilterReplacement = "StaticFilterReplacement";
-
     constexpr const std::array<const char*, 17> UniformNames = {
         "modelMatrix", "cameraUp", "cameraViewProjectionMatrix",
         "colorOption", "magnitudeExponent", "eyePosition", "psfParamConf",
@@ -73,7 +69,7 @@ namespace {
 
     constexpr double PARSEC = 0.308567756E17;
 
-    struct CommonDataLayout {
+    struct ColorVBOLayout {
         std::array<float, 3> position;
         float value;
         float luminance;
@@ -81,19 +77,35 @@ namespace {
         float apparentMagnitude;
     };
 
-    struct ColorVBOLayout : public CommonDataLayout {};
+    struct VelocityVBOLayout {
+        std::array<float, 3> position;
+        float value;
+        float luminance;
+        float absoluteMagnitude;
+        float apparentMagnitude;
 
-    struct VelocityVBOLayout : public CommonDataLayout {
         float vx; // v_x
         float vy; // v_y
         float vz; // v_z
     };
 
-    struct SpeedVBOLayout : public CommonDataLayout {
+    struct SpeedVBOLayout {
+        std::array<float, 3> position;
+        float value;
+        float luminance;
+        float absoluteMagnitude;
+        float apparentMagnitude;
+
         float speed;
     };
 
-    struct OtherDataLayout : public CommonDataLayout {};
+    struct OtherDataLayout {
+        std::array<float, 3> position;
+        float value;
+        float luminance;
+        float absoluteMagnitude;
+        float apparentMagnitude;
+    };
 
     constexpr openspace::properties::Property::PropertyInfo SpeckFileInfo = {
         "SpeckFile",
@@ -293,120 +305,71 @@ namespace {
         "Disable Fade-in effect",
         "Enables/Disables the Fade-in effect."
     };
+
+    struct [[codegen::Dictionary(RenderableStars)]] Parameters {
+        // The path to the SPECK file containing information about the stars being rendered
+        std::string speckFile [[codegen::key("File")]];
+
+        // [[codegen::verbatim(ColorTextureInfo.description)]]
+        std::string colorMap;
+
+        enum class ColorOption {
+            Color,
+            Velocity,
+            Speed,
+            OtherData [[codegen::key("Other Data")]],
+            FixedColor [[codegen::key("Fixed Color")]]
+        };
+        // [[codegen::verbatim(ColorOptionInfo.description)]]
+        std::optional<ColorOption> colorOption;
+
+        // [[codegen::verbatim(OtherDataOptionInfo.description)]]
+        std::optional<std::string> otherData;
+
+        // [[codegen::verbatim(OtherDataColorMapInfo.description)]]
+        std::optional<std::string> otherDataColorMap;
+
+        // [[codegen::verbatim(FilterOutOfRangeInfo.description)]]
+        std::optional<bool> filterOutOfRange;
+
+        // This value specifies a value that is always filtered out of the value ranges on
+        // loading. This can be used to trim the dataset's automatic value range
+        std::optional<float> staticFilter;
+
+        // This is the value that is used to replace statically filtered values. Setting this
+        // value only makes sense if 'StaticFilter' is 'true', as well
+        std::optional<float> staticFilterReplacement;
+
+        // [[codegen::verbatim(MagnitudeExponentInfo.description)]]
+        std::optional<float> magnitudeExponent;
+
+        // [[codegen::verbatim(EnableTestGridInfo.description)]]
+        std::optional<bool> enableTestGrid;
+
+        // [[codegen::verbatim(RenderMethodOptionInfo.description)]]
+        std::string renderMethod;
+
+        // [[codegen::verbatim(PsfTextureInfo.description)]]
+        std::string texture;
+
+        // [[codegen::verbatim(SizeCompositionOptionInfo.description)]]
+        std::optional<std::string> sizeComposition;
+
+        // [[codegen::verbatim(FadeInDistancesInfo.description)]]
+        std::optional<glm::dvec2> fadeInDistances;
+
+        // [[codegen::verbatim(DisableFadeInInfo.description)]]
+        std::optional<bool> distableFadeIn;
+    };
+#include "renderablestars_codegen.cpp"
 }  // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableStars::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableStars",
-        "space_renderablestars",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableStars"),
-                Optional::No
-            },
-            {
-                KeyFile,
-                new StringVerifier,
-                Optional::No,
-                "The path to the SPECK file that contains information about the stars "
-                "being rendered."
-            },
-            {
-                ColorTextureInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                ColorTextureInfo.description
-            },
-            /*{
-                ShapeTextureInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                ShapeTextureInfo.description
-            },*/
-            {
-                ColorOptionInfo.identifier,
-                new StringInListVerifier({
-                    "Color", "Velocity", "Speed", "Other Data", "Fixed Color"
-                }),
-                Optional::Yes,
-                ColorOptionInfo.description
-            },
-            {
-                OtherDataOptionInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                OtherDataOptionInfo.description
-            },
-            {
-                OtherDataColorMapInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                OtherDataColorMapInfo.description
-            },
-            {
-                FilterOutOfRangeInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                FilterOutOfRangeInfo.description
-            },
-            {
-                KeyStaticFilterValue,
-                new DoubleVerifier,
-                Optional::Yes,
-                "This value specifies a value that is always filtered out of the value "
-                "ranges on loading. This can be used to trim the dataset's automatic "
-                "value range."
-            },
-            {
-                KeyStaticFilterReplacement,
-                new DoubleVerifier,
-                Optional::Yes,
-                "This is the value that is used to replace statically filtered values. "
-                "Setting this value only makes sense if 'StaticFilter' is 'true', as "
-                "well."
-            },
-            {
-                MagnitudeExponentInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                MagnitudeExponentInfo.description
-            },
-            {
-                EnableTestGridInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                EnableTestGridInfo.description
-            },
-            {
-                RenderMethodOptionInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                RenderMethodOptionInfo.description
-            },
-            {
-                SizeCompositionOptionInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                SizeCompositionOptionInfo.description
-            },
-            {
-                FadeInDistancesInfo.identifier,
-                new Vector2Verifier<double>,
-                Optional::Yes,
-                FadeInDistancesInfo.description
-            },
-            {
-                DisableFadeInInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                DisableFadeInInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_renderablestars";
+    return doc;
 }
 
 RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
@@ -466,22 +429,16 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
 {
     using File = ghoul::filesystem::File;
 
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableStars"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    _speckFile = absPath(dictionary.value<std::string>(KeyFile));
+    _speckFile = absPath(p.speckFile);
     _speckFile.onChange([&]() { _speckFileIsDirty = true; });
     addProperty(_speckFile);
 
-    _colorTexturePath = absPath(
-        dictionary.value<std::string>(ColorTextureInfo.identifier)
-    );
+    _colorTexturePath = absPath(p.colorMap);
     _colorTextureFile = std::make_unique<File>(_colorTexturePath);
 
     /*_shapeTexturePath = absPath(dictionary.value<std::string>(
@@ -489,10 +446,8 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
         ));
     _shapeTextureFile = std::make_unique<File>(_shapeTexturePath);*/
 
-    if (dictionary.hasKey(OtherDataColorMapInfo.identifier)) {
-        _otherDataColorMapPath = absPath(
-            dictionary.value<std::string>(OtherDataColorMapInfo.identifier)
-        );
+    if (p.otherDataColorMap.has_value()) {
+        _otherDataColorMapPath = absPath(*p.otherDataColorMap);
     }
 
     _fixedColor.setViewOption(properties::Property::ViewOptions::Color, true);
@@ -505,24 +460,23 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
         { ColorOption::OtherData, "Other Data" },
         { ColorOption::FixedColor, "Fixed Color" }
     });
-    if (dictionary.hasKey(ColorOptionInfo.identifier)) {
-        const std::string colorOption = dictionary.value<std::string>(
-            ColorOptionInfo.identifier
-        );
-        if (colorOption == "Color") {
-            _colorOption = ColorOption::Color;
-        }
-        else if (colorOption == "Velocity") {
-            _colorOption = ColorOption::Velocity;
-        }
-        else if (colorOption == "Speed") {
-            _colorOption = ColorOption::Speed;
-        }
-        else if (colorOption == "OtherData") {
-            _colorOption = ColorOption::OtherData;
-        }
-        else {
-            _colorOption = ColorOption::FixedColor;
+    if (p.colorOption.has_value()) {
+        switch (*p.colorOption) {
+            case Parameters::ColorOption::Color:
+                _colorOption = ColorOption::Color;
+                break;
+            case Parameters::ColorOption::Velocity:
+                _colorOption = ColorOption::Velocity;
+                break;
+            case Parameters::ColorOption::Speed:
+                _colorOption = ColorOption::Speed;
+                break;
+            case Parameters::ColorOption::OtherData:
+                _colorOption = ColorOption::OtherData;
+                break;
+            case Parameters::ColorOption::FixedColor:
+                _colorOption = ColorOption::FixedColor;
+                break;
         }
     }
     _colorOption.onChange([&] { _dataIsDirty = true; });
@@ -540,13 +494,8 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
         });
     addProperty(_shapeTexturePath);*/
 
-    if (dictionary.hasKey(EnableTestGridInfo.identifier)) {
-        _enableTestGrid = dictionary.value<bool>(EnableTestGridInfo.identifier);
-    }
-
-    if (dictionary.hasKey(OtherDataOptionInfo.identifier)) {
-        _queuedOtherData = dictionary.value<std::string>(OtherDataOptionInfo.identifier);
-    }
+    _enableTestGrid = p.enableTestGrid.value_or(_enableTestGrid);
+    _queuedOtherData = p.otherData.value_or(_queuedOtherData);
 
     _otherDataOption.onChange([&]() { _dataIsDirty = true; });
     addProperty(_otherDataOption);
@@ -556,16 +505,9 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     addProperty(_otherDataColorMapPath);
     _otherDataColorMapPath.onChange([&]() { _otherDataColorMapIsDirty = true; });
 
-    if (dictionary.hasKey(KeyStaticFilterValue)) {
-        _staticFilterValue = static_cast<float>(
-            dictionary.value<double>(KeyStaticFilterValue)
-        );
-    }
-    if (dictionary.hasKey(KeyStaticFilterReplacement)) {
-        _staticFilterReplacementValue = static_cast<float>(
-            dictionary.value<double>(KeyStaticFilterReplacement)
-        );
-    }
+    _staticFilterValue = p.staticFilter;
+    _staticFilterReplacementValue =
+        p.staticFilterReplacement.value_or(_staticFilterReplacementValue);
 
     addProperty(_filterOutOfRange);
 
@@ -576,23 +518,14 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     _renderingMethodOption.addOption(RenderOptionTexture, "Textured Based");
     addProperty(_renderingMethodOption);
 
-    if (dictionary.hasKey(RenderMethodOptionInfo.identifier)) {
-        std::string renderingMethod =
-            dictionary.value<std::string>(RenderMethodOptionInfo.identifier);
-        if (renderingMethod == "PSF") {
-            _renderingMethodOption = RenderOptionPointSpreadFunction;
-        }
-        else if (renderingMethod == "Texture Based") {
-            _renderingMethodOption = RenderOptionTexture;
-        }
+    if (p.renderMethod == "PSF") {
+        _renderingMethodOption = RenderOptionPointSpreadFunction;
     }
-    else {
+    else if (p.renderMethod == "Texture Based") {
         _renderingMethodOption = RenderOptionTexture;
     }
 
-    _pointSpreadFunctionTexturePath = absPath(dictionary.value<std::string>(
-        PsfTextureInfo.identifier
-    ));
+    _pointSpreadFunctionTexturePath = absPath(p.texture);
     _pointSpreadFunctionFile = std::make_unique<File>(_pointSpreadFunctionTexturePath);
     _pointSpreadFunctionTexturePath.onChange([&]() {
         _pointSpreadFunctionTextureIsDirty = true;
@@ -615,26 +548,24 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     _psfMultiplyOption.addOption(4, "Apparent Magnitude");
     _psfMultiplyOption.addOption(5, "Distance Modulus");
 
-    if (dictionary.hasKey(MagnitudeExponentInfo.identifier)) {
-        std::string sizeCompositionOption =
-            dictionary.value<std::string>(SizeCompositionOptionInfo.identifier);
 
-        if (sizeCompositionOption == "App Brightness") {
+    if (p.sizeComposition.has_value()) {
+        if (*p.sizeComposition == "App Brightness") {
             _psfMultiplyOption = 0;
         }
-        else if (sizeCompositionOption == "Lum and Size") {
+        else if (*p.sizeComposition == "Lum and Size") {
             _psfMultiplyOption = 1;
         }
-        else if (sizeCompositionOption == "Lum, Size and App Brightness") {
+        else if (*p.sizeComposition == "Lum, Size and App Brightness") {
             _psfMultiplyOption = 2;
         }
-        else if (sizeCompositionOption == "Abs Magnitude") {
+        else if (*p.sizeComposition == "Abs Magnitude") {
             _psfMultiplyOption = 3;
         }
-        else if (sizeCompositionOption == "App Maginitude") {
+        else if (*p.sizeComposition == "App Maginitude") {
             _psfMultiplyOption = 4;
         }
-        else if (sizeCompositionOption == "Distance Modulus") {
+        else if (*p.sizeComposition == "Distance Modulus") {
             _psfMultiplyOption = 5;
         }
     }
@@ -647,11 +578,7 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     _parametersOwner.addProperty(_radiusCent);
     _parametersOwner.addProperty(_brightnessCent);
 
-    if (dictionary.hasKey(MagnitudeExponentInfo.identifier)) {
-        _magnitudeExponent = static_cast<float>(
-            dictionary.value<double>(MagnitudeExponentInfo.identifier)
-        );
-    }
+    _magnitudeExponent = p.magnitudeExponent.value_or(_magnitudeExponent);
     _parametersOwner.addProperty(_magnitudeExponent);
 
     auto renderPsf = [&]() { renderPSFToTexture(); };
@@ -677,8 +604,8 @@ RenderableStars::RenderableStars(const ghoul::Dictionary& dictionary)
     addPropertySubOwner(_parametersOwner);
     addPropertySubOwner(_moffatMethodOwner);
 
-    if (dictionary.hasKey(FadeInDistancesInfo.identifier)) {
-        glm::vec2 v = dictionary.value<glm::vec2>(FadeInDistancesInfo.identifier);
+    if (p.fadeInDistances.has_value()) {
+        glm::vec2 v = *p.fadeInDistances;
         _fadeInDistance = v;
         _disableFadeInDistance = false;
         addProperty(_fadeInDistance);
@@ -844,7 +771,7 @@ void RenderableStars::loadPSFTexture() {
 void RenderableStars::renderPSFToTexture() {
     // Saves current FBO first
     GLint defaultFBO;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO);
+    defaultFBO = global::renderEngine->openglStateCache().defaultFramebuffer();
 
 //    GLint m_viewport[4];
 //    global::renderEngine.openglStateCache().viewPort(m_viewport);
@@ -957,24 +884,6 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
         return;
     }
 
-    // Saving current OpenGL state
-    GLenum blendEquationRGB;
-    GLenum blendEquationAlpha;
-    GLenum blendDestAlpha;
-    GLenum blendDestRGB;
-    GLenum blendSrcAlpha;
-    GLenum blendSrcRGB;
-    GLboolean depthMask;
-
-    glGetIntegerv(GL_BLEND_EQUATION_RGB, &blendEquationRGB);
-    glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &blendEquationAlpha);
-    glGetIntegerv(GL_BLEND_DST_ALPHA, &blendDestAlpha);
-    glGetIntegerv(GL_BLEND_DST_RGB, &blendDestRGB);
-    glGetIntegerv(GL_BLEND_SRC_ALPHA, &blendSrcAlpha);
-    glGetIntegerv(GL_BLEND_SRC_RGB, &blendSrcRGB);
-
-    glGetBooleanv(GL_DEPTH_WRITEMASK, &depthMask);
-
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
     glDepthMask(false);
 
@@ -991,7 +900,7 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
     glm::dmat4 modelMatrix =
         glm::translate(glm::dmat4(1.0), data.modelTransform.translation) *
         glm::dmat4(data.modelTransform.rotation) *
-        glm::dmat4(glm::scale(glm::dmat4(1.0), glm::dvec3(data.modelTransform.scale)));
+        glm::scale(glm::dmat4(1.0), data.modelTransform.scale);
 
     glm::dmat4 projectionMatrix = glm::dmat4(data.camera.projectionMatrix());
 
@@ -1077,13 +986,9 @@ void RenderableStars::render(const RenderData& data, RendererTasks&) {
     glBindVertexArray(0);
     _program->deactivate();
 
-    glDepthMask(true);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
     // Restores OpenGL blending state
-    glBlendEquationSeparate(blendEquationRGB, blendEquationAlpha);
-    glBlendFuncSeparate(blendSrcRGB, blendDestRGB, blendSrcAlpha, blendDestAlpha);
-    glDepthMask(depthMask);
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
 }
 
 void RenderableStars::update(const UpdateData&) {
diff --git a/modules/space/rendering/renderablestars.h b/modules/space/rendering/renderablestars.h
index 0ab79f66cc..7f1e83eb02 100644
--- a/modules/space/rendering/renderablestars.h
+++ b/modules/space/rendering/renderablestars.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/rendering/simplespheregeometry.cpp b/modules/space/rendering/simplespheregeometry.cpp
index 36a15ab76e..5c4ed12ef9 100644
--- a/modules/space/rendering/simplespheregeometry.cpp
+++ b/modules/space/rendering/simplespheregeometry.cpp
@@ -1,8 +1,8 @@
-/****************************************************************************************
+/****************************************************************************************
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,30 +41,23 @@ namespace {
         "Segments",
         "This value specifies the number of segments that this sphere is split into."
     };
+
+    struct [[codegen::Dictionary(SimpleSphereGeometry)]] Parameters {
+        // [[codegen::verbatim(RadiusInfo.description)]]
+        std::variant<float, glm::vec3> radius;
+
+        // [[codegen::verbatim(SegmentsInfo.description)]]
+        int segments;
+    };
+#include "simplespheregeometry_codegen.cpp"
 } // namespace
 
 namespace openspace::planetgeometry {
 
 documentation::Documentation SimpleSphereGeometry::Documentation() {
-    using namespace documentation;
-    return {
-        "SimpleSphereGeometry",
-        "space_geometry_simplesphere",
-        {
-            {
-                RadiusInfo.identifier,
-                new OrVerifier({ new DoubleVerifier, new DoubleVector3Verifier }),
-                Optional::No,
-                RadiusInfo.description
-            },
-            {
-                SegmentsInfo.identifier,
-                new IntVerifier,
-                Optional::No,
-                SegmentsInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_geometry_simplesphere";
+    return doc;
 }
 
 SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
@@ -72,23 +65,17 @@ SimpleSphereGeometry::SimpleSphereGeometry(const ghoul::Dictionary& dictionary)
     , _segments(SegmentsInfo, 20, 1, 5000)
     , _sphere(nullptr)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "SimpleSphereGeometry"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    if (dictionary.hasKeyAndValue<double>(RadiusInfo.identifier)) {
-        const float r = static_cast<float>(
-            dictionary.value<double>(RadiusInfo.identifier)
-        );
-        _radius = { r, r, r };
+    if (std::holds_alternative<float>(p.radius)) {
+        const float radius = std::get<float>(p.radius);
+        _radius = glm::dvec3(radius, radius, radius);
     }
     else {
-        _radius = dictionary.value<glm::vec3>(RadiusInfo.identifier);
+        _radius = std::get<glm::vec3>(p.radius);
     }
 
-    _segments = static_cast<int>(dictionary.value<double>(SegmentsInfo.identifier));
+    _segments = p.segments;
 
     // The shader need the radii values but they are not changeable runtime
     // TODO: Possibly add a scaling property @AA
diff --git a/modules/space/rendering/simplespheregeometry.h b/modules/space/rendering/simplespheregeometry.h
index 3cd796b6da..2e1ef9827e 100644
--- a/modules/space/rendering/simplespheregeometry.h
+++ b/modules/space/rendering/simplespheregeometry.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/rotation/spicerotation.cpp b/modules/space/rotation/spicerotation.cpp
index 07004cbf7e..02b1b025c0 100644
--- a/modules/space/rotation/spicerotation.cpp
+++ b/modules/space/rotation/spicerotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,10 +29,9 @@
 #include <openspace/util/spicemanager.h>
 #include <openspace/util/time.h>
 #include <openspace/util/updatestructures.h>
+#include <optional>
 
 namespace {
-    constexpr const char* KeyKernels = "Kernels";
-
     constexpr openspace::properties::Property::PropertyInfo SourceInfo = {
         "SourceFrame",
         "Source",
@@ -52,85 +51,58 @@ namespace {
         "Time Frame",
         "The time frame in which the spice kernels are valid."
     };
+
+    struct [[codegen::Dictionary(SpiceRotation)]] Parameters {
+        // [[codegen::verbatim(SourceInfo.description)]]
+        std::string sourceFrame
+            [[codegen::annotation("A valid SPICE NAIF name or integer")]];
+
+        // [[codegen::verbatim(DestinationInfo.description)]]
+        std::string destinationFrame;
+
+        // [[codegen::verbatim(DestinationInfo.description)]]
+        std::optional<std::variant<std::vector<std::string>, std::string>> kernels;
+
+        // [[codegen::verbatim(TimeFrameInfo.description)]]
+        std::optional<std::monostate> timeFrame [[codegen::reference("core_time_frame")]];
+    };
+#include "spicerotation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation SpiceRotation::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Spice Rotation",
-        "space_transform_rotation_spice",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("SpiceRotation"),
-                Optional::No
-            },
-            {
-                SourceInfo.identifier,
-                new StringAnnotationVerifier("A valid SPICE NAIF name or integer"),
-                Optional::No,
-                SourceInfo.description
-            },
-            {
-                DestinationInfo.identifier,
-                new StringAnnotationVerifier("A valid SPICE NAIF name or integer"),
-                Optional::No,
-                DestinationInfo.description
-            },
-            {
-                KeyKernels,
-                new OrVerifier({ new StringListVerifier, new StringVerifier }),
-                Optional::Yes,
-                "A single kernel or list of kernels that this SpiceTranslation depends "
-                "on. All provided kernels will be loaded before any other operation is "
-                "performed."
-            },
-            {
-                TimeFrameInfo.identifier,
-                new ReferencingVerifier("core_time_frame"),
-                Optional::Yes,
-                TimeFrameInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_transform_rotation_spice";
+    return doc;
 }
 
 SpiceRotation::SpiceRotation(const ghoul::Dictionary& dictionary)
     : _sourceFrame(SourceInfo)
     , _destinationFrame(DestinationInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "SpiceRotation"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _sourceFrame = dictionary.value<std::string>(SourceInfo.identifier);
-    _destinationFrame = dictionary.value<std::string>(DestinationInfo.identifier);
+    _sourceFrame = p.sourceFrame;
+    _destinationFrame = p.destinationFrame;
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyKernels)) {
-        SpiceManager::ref().loadKernel(dictionary.value<std::string>(KeyKernels));
-    }
-    else if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeyKernels)) {
-        ghoul::Dictionary kernels = dictionary.value<ghoul::Dictionary>(KeyKernels);
-        for (size_t i = 1; i <= kernels.size(); ++i) {
-            if (!kernels.hasKeyAndValue<std::string>(std::to_string(i))) {
-                throw ghoul::RuntimeError("Kernels has to be an array-style table");
+    if (p.kernels.has_value()) {
+        if (std::holds_alternative<std::string>(*p.kernels)) {
+            SpiceManager::ref().loadKernel(std::get<std::string>(*p.kernels));
+        }
+        else {
+            for (const std::string& s : std::get<std::vector<std::string>>(*p.kernels)) {
+                SpiceManager::ref().loadKernel(s);
             }
-
-            std::string kernel = kernels.value<std::string>(std::to_string(i));
-            SpiceManager::ref().loadKernel(kernel);
         }
     }
 
     if (dictionary.hasKey(TimeFrameInfo.identifier)) {
-        ghoul::Dictionary timeFrameDictionary;
-        dictionary.getValue(TimeFrameInfo.identifier, timeFrameDictionary);
+        ghoul::Dictionary timeFrameDictionary =
+            dictionary.value<ghoul::Dictionary>(TimeFrameInfo.identifier);
         _timeFrame = TimeFrame::createFromDictionary(timeFrameDictionary);
         if (_timeFrame == nullptr) {
-            throw ghoul::RuntimeError("Invalid dictionary for TimeFrame.");
+            throw ghoul::RuntimeError("Invalid dictionary for TimeFrame");
         }
         addPropertySubOwner(_timeFrame.get());
     }
diff --git a/modules/space/rotation/spicerotation.h b/modules/space/rotation/spicerotation.h
index c10c31e38c..1cc4043774 100644
--- a/modules/space/rotation/spicerotation.h
+++ b/modules/space/rotation/spicerotation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/constellationbounds_fs.glsl b/modules/space/shaders/constellationbounds_fs.glsl
index b193abdd68..32ea62a82e 100644
--- a/modules/space/shaders/constellationbounds_fs.glsl
+++ b/modules/space/shaders/constellationbounds_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/constellationbounds_vs.glsl b/modules/space/shaders/constellationbounds_vs.glsl
index fbc3537f7a..1f3bc5245e 100644
--- a/modules/space/shaders/constellationbounds_vs.glsl
+++ b/modules/space/shaders/constellationbounds_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/convolution_fs.glsl b/modules/space/shaders/convolution_fs.glsl
index 9cde38881e..c884ce1846 100644
--- a/modules/space/shaders/convolution_fs.glsl
+++ b/modules/space/shaders/convolution_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,7 +34,7 @@ uniform int convolvedfTextureSize;
 uniform sampler2D psfTexture;
 uniform sampler2D shapeTexture;
 
-void main(void) {
+void main() {
     float fullColor = 0.0;
     
     // Kernel Center
diff --git a/modules/space/shaders/convolution_vs.glsl b/modules/space/shaders/convolution_vs.glsl
index c87dcf9fe6..a92bf82d5d 100644
--- a/modules/space/shaders/convolution_vs.glsl
+++ b/modules/space/shaders/convolution_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/debrisViz_fs.glsl b/modules/space/shaders/debrisViz_fs.glsl
index 2fd1b77264..b7a8476e81 100644
--- a/modules/space/shaders/debrisViz_fs.glsl
+++ b/modules/space/shaders/debrisViz_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/debrisViz_vs.glsl b/modules/space/shaders/debrisViz_vs.glsl
index 57b89a2510..7ec4e86faf 100644
--- a/modules/space/shaders/debrisViz_vs.glsl
+++ b/modules/space/shaders/debrisViz_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -49,7 +49,6 @@ out float vertexID_f;
 // 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, 
@@ -91,10 +90,4 @@ void main() {
     vec4 vs_position = z_normalization( projectionTransform * viewSpacePosition);
     gl_Position = vs_position;
     vs_position_w = vs_position.w;
-
 }
-
-
-
-
-
diff --git a/modules/space/shaders/habitablezone_fs.glsl b/modules/space/shaders/habitablezone_fs.glsl
new file mode 100644
index 0000000000..11bcca4f3b
--- /dev/null
+++ b/modules/space/shaders/habitablezone_fs.glsl
@@ -0,0 +1,87 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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 "fragment.glsl"
+
+in vec2 vs_st;
+in float vs_screenSpaceDepth;
+
+uniform sampler1D transferFunctionTexture;
+uniform float width;
+uniform float opacity;
+uniform vec2 conservativeBounds;
+uniform bool showOptimistic;
+
+// Remap the radius to texture coordinates in the trasfer function texture. The texture
+// is treated as a linear scale where the color represent too cold to too hot. Account
+// for the conservative bounds my mapping one third of the texture ouside each boundary.
+// All parameters \in [0,1], where 1.0 corresponds to the max radius.
+float computeTextureCoord(float radius, float innerRadius,
+                          float conservativeInner, float conservativeOuter)
+{
+    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);
+    }
+}
+
+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;
+
+    // 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);
+
+    if (!showOptimistic && outsideConservative) {
+        discard;
+    }
+
+    float texCoord = computeTextureCoord(radius, innerRadius, consInner, consOuter);
+
+    vec4 diffuse = texture(transferFunctionTexture, texCoord);
+    diffuse.a *= opacity;
+
+    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
new file mode 100644
index 0000000000..d5796d62d9
--- /dev/null
+++ b/modules/space/shaders/habitablezone_vs.glsl
@@ -0,0 +1,47 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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 vec2 in_position;
+layout(location = 1) in vec2 in_st;
+
+out vec2 vs_st;
+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);
+
+    // Moving the origin to the center
+    vs_st = (in_st - vec2(0.5)) * 2.0;
+
+    vs_screenSpaceDepth = positionScreenSpace.w;
+
+    gl_Position = positionScreenSpace;
+}
diff --git a/modules/space/shaders/psfToTexture_fs.glsl b/modules/space/shaders/psfToTexture_fs.glsl
index 060b33e557..288149d9b2 100644
--- a/modules/space/shaders/psfToTexture_fs.glsl
+++ b/modules/space/shaders/psfToTexture_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -39,7 +39,7 @@ uniform float betaConstant;
 
 in vec2 psfCoords;
 
-void main(void) {
+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
@@ -50,7 +50,8 @@ void main(void) {
         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) {
+    }
+    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));
diff --git a/modules/space/shaders/psfToTexture_vs.glsl b/modules/space/shaders/psfToTexture_vs.glsl
index 791adc6c4e..03ae1f2ef5 100644
--- a/modules/space/shaders/psfToTexture_vs.glsl
+++ b/modules/space/shaders/psfToTexture_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/rings_fs.glsl b/modules/space/shaders/rings_fs.glsl
index ffa20731da..76c92cb733 100644
--- a/modules/space/shaders/rings_fs.glsl
+++ b/modules/space/shaders/rings_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/rings_vs.glsl b/modules/space/shaders/rings_vs.glsl
index c6f5d007ee..c81afe6f9d 100644
--- a/modules/space/shaders/rings_vs.glsl
+++ b/modules/space/shaders/rings_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/shaders/star_fs.glsl b/modules/space/shaders/star_fs.glsl
index 46c6ebb4a0..a38dd238b1 100644
--- a/modules/space/shaders/star_fs.glsl
+++ b/modules/space/shaders/star_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -101,7 +101,7 @@ Fragment getFragment() {
     vec4 fullColor = vec4(color.rgb, textureColor.a);
     fullColor.a *= alphaValue;
     
-    if (fullColor.a == 0) {
+    if (fullColor.a < 0.001) {
         discard;
     }
 
diff --git a/modules/space/shaders/star_ge.glsl b/modules/space/shaders/star_ge.glsl
index 744b89006f..759927b7f1 100644
--- a/modules/space/shaders/star_ge.glsl
+++ b/modules/space/shaders/star_ge.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -186,5 +186,4 @@ void main() {
     EmitVertex();
     
     EndPrimitive();
-
 }
diff --git a/modules/space/shaders/star_vs.glsl b/modules/space/shaders/star_vs.glsl
index 094b5657ba..754deb5ea5 100644
--- a/modules/space/shaders/star_vs.glsl
+++ b/modules/space/shaders/star_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/spacemodule.cpp b/modules/space/spacemodule.cpp
index e720068f87..0ebba746cd 100644
--- a/modules/space/spacemodule.cpp
+++ b/modules/space/spacemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,14 +24,13 @@
 
 #include <modules/space/spacemodule.h>
 
-#include <modules/space/rendering/renderablesatellites.h>
 #include <modules/space/rendering/renderableconstellationbounds.h>
+#include <modules/space/rendering/renderablehabitablezone.h>
 #include <modules/space/rendering/renderablerings.h>
 #include <modules/space/rendering/renderablesatellites.h>
 #include <modules/space/rendering/renderablesmallbody.h>
 #include <modules/space/rendering/renderablestars.h>
 #include <modules/space/rendering/simplespheregeometry.h>
-//#include <modules/space/tasks/generatedebrisvolumetask.h>
 #include <modules/space/translation/keplertranslation.h>
 #include <modules/space/translation/spicetranslation.h>
 #include <modules/space/translation/tletranslation.h>
@@ -80,7 +79,7 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     fRenderable->registerClass<RenderableConstellationBounds>(
         "RenderableConstellationBounds"
     );
-
+    fRenderable->registerClass<RenderableHabitableZone>("RenderableHabitableZone");
     fRenderable->registerClass<RenderableRings>("RenderableRings");
     fRenderable->registerClass<RenderableSatellites>("RenderableSatellites");
     fRenderable->registerClass<RenderableSmallBody>("RenderableSmallBody");
@@ -107,7 +106,7 @@ void SpaceModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     ghoul_assert(fGeometry, "Planet geometry factory was not created");
     fGeometry->registerClass<planetgeometry::SimpleSphereGeometry>("SimpleSphere");
 
-    if (dictionary.hasKeyAndValue<bool>(SpiceExceptionInfo.identifier)) {
+    if (dictionary.hasValue<bool>(SpiceExceptionInfo.identifier)) {
         _showSpiceExceptions = dictionary.value<bool>(SpiceExceptionInfo.identifier);
     }
 }
@@ -119,6 +118,7 @@ void SpaceModule::internalDeinitializeGL() {
 std::vector<documentation::Documentation> SpaceModule::documentations() const {
     return {
         RenderableConstellationBounds::Documentation(),
+        RenderableHabitableZone::Documentation(),
         RenderableRings::Documentation(),
         RenderableSatellites::Documentation(),
         RenderableSmallBody::Documentation(),
diff --git a/modules/space/spacemodule.h b/modules/space/spacemodule.h
index 527bce6a71..b2630b6277 100644
--- a/modules/space/spacemodule.h
+++ b/modules/space/spacemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/tasks/generatedebrisvolumetask.cpp b/modules/space/tasks/generatedebrisvolumetask.cpp
index 3946f9ccc2..c8d8e417ca 100644
--- a/modules/space/tasks/generatedebrisvolumetask.cpp
+++ b/modules/space/tasks/generatedebrisvolumetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -483,7 +483,9 @@ float getMaxApogee(std::vector<KeplerParameters> inData){
     return static_cast<float>(maxApogee*1000);  // * 1000 for meters
 }
 
-int getIndexFromPosition(glm::dvec3 position, glm::uvec3 dim, float maxApogee, std::string gridType){
+int getIndexFromPosition(glm::dvec3 position, glm::uvec3 dim, float maxApogee,
+                         std::string gridType)
+{
     // epsilon is to make sure that for example if newPosition.x/maxApogee = 1,
     // then the index for that dimension will not exceed the range of the grid.
     float epsilon = static_cast<float>(0.000000001);
@@ -492,12 +494,15 @@ int getIndexFromPosition(glm::dvec3 position, glm::uvec3 dim, float maxApogee, s
                                         ,position.y + maxApogee
                                         ,position.z + maxApogee);
 
-        glm::uvec3 coordinateIndex = glm::uvec3(static_cast<int>(newPosition.x * dim.x / (2 * (maxApogee + epsilon)))
-                                                ,static_cast<int>(newPosition.y * dim.y / (2 * (maxApogee + epsilon)))
-                                                ,static_cast<int>(newPosition.z * dim.z / (2 * (maxApogee + epsilon))));
+        glm::uvec3 coordinateIndex = glm::uvec3(
+            static_cast<int>(newPosition.x * dim.x / (2 * (maxApogee + epsilon))),
+            static_cast<int>(newPosition.y * dim.y / (2 * (maxApogee + epsilon))),
+            static_cast<int>(newPosition.z * dim.z / (2 * (maxApogee + epsilon)))
+        );
 
 
-        return coordinateIndex.z * (dim.x * dim.y) + coordinateIndex.y * dim.x + coordinateIndex.x;
+        return coordinateIndex.z * (dim.x * dim.y) +
+            coordinateIndex.y * dim.x + coordinateIndex.x;
     }
     else if(gridType == "Spherical"){
 
@@ -508,16 +513,13 @@ int getIndexFromPosition(glm::dvec3 position, glm::uvec3 dim, float maxApogee, s
             position.z = 0;
         }
 
-        glm::uvec3 coordinateIndex = glm::uvec3(static_cast<int>(position.x * dim.x / (maxApogee))
-                                                ,static_cast<int>(position.y * dim.y / (3.14159265358979323846264338327950288))
-                                                ,static_cast<int>(position.z * dim.z / (2*3.14159265358979323846264338327950288)));
+        glm::uvec3 coordinateIndex = glm::uvec3(
+            static_cast<int>(position.x * dim.x / (maxApogee)),
+            static_cast<int>(position.y * dim.y / glm::pi<double>()),
+            static_cast<int>(position.z * dim.z / glm::two_pi<double>()));
 
-
-        // LINFO(fmt::format("index coords: {} ", coordinateIndex));
-        // LINFO(fmt::format("index dim: {} ", dim));
-        // LINFO(fmt::format("index va: {} ", coordinateIndex.y * (dim.x * dim.y) + coordinateIndex.z * dim.x + coordinateIndex.x));
-
-        return coordinateIndex.z * (dim.x * dim.y) + coordinateIndex.y * dim.x + coordinateIndex.x;
+        return coordinateIndex.z * (dim.x * dim.y) +
+            coordinateIndex.y * dim.x + coordinateIndex.x;
     }
 
     return -1;
@@ -541,9 +543,12 @@ double getVoxelVolume(int index, RawVolume<float>& raw, glm::uvec3 dim, float ma
 
 }
 
-double* mapDensityToVoxels(double* densityArray, std::vector<glm::dvec3> positions, glm::uvec3 dim, float maxApogee, std::string gridType, RawVolume<float>& raw) {
+double* mapDensityToVoxels(double* densityArray, std::vector<glm::dvec3> positions,
+                           glm::uvec3 dim, float maxApogee, std::string gridType,
+                           RawVolume<float>& raw)
+{
 
-    for(const glm::dvec3& position : positions) {
+    for (const glm::dvec3& position : positions) {
         //LINFO(fmt::format("pos: {} ", position));
         int index = getIndexFromPosition(position, dim, maxApogee, gridType);
         //LINFO(fmt::format("index: {} ", index));
@@ -551,7 +556,8 @@ double* mapDensityToVoxels(double* densityArray, std::vector<glm::dvec3> positio
             ++densityArray[index];
         }
         else if(gridType == "Spherical"){
-            double voxelVolume = getVoxelVolume(index, raw, dim, maxApogee); //something like this
+            // something like this
+            double voxelVolume = getVoxelVolume(index, raw, dim, maxApogee);
             densityArray[index] += 1/voxelVolume;
         }
     }
@@ -569,9 +575,11 @@ GenerateDebrisVolumeTask::GenerateDebrisVolumeTask(const ghoul::Dictionary& dict
 
     _rawVolumeOutputPath = absPath(dictionary.value<std::string>(KeyRawVolumeOutput));
     _dictionaryOutputPath = absPath(dictionary.value<std::string>(KeyDictionaryOutput));
-    _dimensions = dictionary.value<glm::vec3>(KeyDimensions); // must not be <glm::uvec3> for some reason.
+    // must not be <glm::uvec3> for some reason.
+    _dimensions = dictionary.value<glm::vec3>(KeyDimensions);
     _startTime = dictionary.value<std::string>(KeyStartTime);
-    _timeStep = dictionary.value<std::string>(KeyTimeStep); // Todo: send KeyTimeStep in as a int or float correctly.
+    // Todo: send KeyTimeStep in as a int or float correctly.
+    _timeStep = dictionary.value<std::string>(KeyTimeStep);
     _endTime = dictionary.value<std::string>(KeyEndTime);
     // since _inputPath is past from task,
     // there will have to be either one task per dataset,
@@ -605,12 +613,35 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
     // std::vector<KeplerParameters>TLEDataVector3 = readTLEFile(_inputPath3);
     // std::vector<KeplerParameters>TLEDataVector4 = readTLEFile(_inputPath4);
 
-    // _TLEDataVector.reserve( TLEDataVector.size() + TLEDataVector1.size() + TLEDataVector2.size() + TLEDataVector3.size() + TLEDataVector4.size());
-    // _TLEDataVector.insert(_TLEDataVector.end(), TLEDataVector.begin(), TLEDataVector.end());
-    // _TLEDataVector.insert(_TLEDataVector.end(), TLEDataVector1.begin(), TLEDataVector1.end());
-    // _TLEDataVector.insert(_TLEDataVector.end(), TLEDataVector2.begin(), TLEDataVector2.end());
-    // _TLEDataVector.insert(_TLEDataVector.end(), TLEDataVector3.begin(), TLEDataVector3.end());
-    // _TLEDataVector.insert(_TLEDataVector.end(), TLEDataVector4.begin(), TLEDataVector4.end());
+    // _TLEDataVector.reserve(
+    //     TLEDataVector.size() + TLEDataVector1.size() + TLEDataVector2.size() +
+    //     TLEDataVector3.size() + TLEDataVector4.size()
+    // );
+    // _TLEDataVector.insert(
+    //     _TLEDataVector.end(),
+    //     TLEDataVector.begin(),
+    //     TLEDataVector.end()
+    // );
+    //_TLEDataVector.insert(
+    //    _TLEDataVector.end(),
+    //    TLEDataVector1.begin(),
+    //    TLEDataVector1.end()
+    //);
+    //_TLEDataVector.insert(
+    //    _TLEDataVector.end(),
+    //    TLEDataVector2.begin(),
+    //    TLEDataVector2.end()
+    //);
+    //_TLEDataVector.insert(
+    //    _TLEDataVector.end(),
+    //    TLEDataVector3.begin(),
+    //    TLEDataVector3.end()
+    //);
+    //_TLEDataVector.insert(
+    //    _TLEDataVector.end(),
+    //    TLEDataVector4.begin(),
+    //    TLEDataVector4.end()
+    //);
     // ----- or ----- if only one
 
         // _TLEDataVector = readTLEFile(_inputPath);
@@ -651,16 +682,31 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
     float minVal = std::numeric_limits<float>::max();
     float maxVal = std::numeric_limits<float>::min();
     // 2.
-    for(int i=0 ; i<=numberOfIterations ; ++i) {
-
-        std::vector<glm::dvec3> startPositionBuffer = getPositionBuffer(_TLEDataVector, startTimeInSeconds+(i*timeStep), _gridType);   //+(i*timeStep)
+    for (int i=0 ; i<=numberOfIterations ; ++i) {
+        std::vector<glm::dvec3> startPositionBuffer = getPositionBuffer(
+            _TLEDataVector,
+            startTimeInSeconds + (i * timeStep),
+            _gridType
+        );   //+(i*timeStep)
         //LINFO(fmt::format("pos: {} ", startPositionBuffer[4]));
 
         double *densityArrayp = new double[size]();
-        //densityArrayp = mapDensityToVoxels(densityArrayp, generatedPositions, _dimensions, maxApogee);
+        //densityArrayp = mapDensityToVoxels(
+        //    densityArrayp,
+        //    generatedPositions,
+        //    _dimensions,
+        //    maxApogee
+        //);
         volume::RawVolume<float> rawVolume(_dimensions);
 
-        densityArrayp = mapDensityToVoxels(densityArrayp, startPositionBuffer, _dimensions, _maxApogee, _gridType, rawVolume);
+        densityArrayp = mapDensityToVoxels(
+            densityArrayp,
+            startPositionBuffer,
+            _dimensions,
+            _maxApogee,
+            _gridType,
+            rawVolume
+        );
         /*std::vector<glm::dvec3> testBuffer;
         testBuffer.push_back(glm::dvec3(0,0,0));
         testBuffer.push_back(glm::dvec3(1,1.5,1.5));
@@ -669,14 +715,20 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
         //testBuffer.push_back(glm::dvec3(10000,1000000000,1000000000));
 
 
-        densityArrayp = mapDensityToVoxels(densityArrayp, testBuffer, _dimensions, _maxApogee, _gridType);
+        densityArrayp = mapDensityToVoxels(
+            densityArrayp,
+            testBuffer,
+            _dimensions,
+            _maxApogee,
+            _gridType
+        );
         */
         // create object rawVolume
 
         //glm::vec3 domainSize = _upperDomainBound - _lowerDomainBound;
 
-        // TODO: Create a forEachSatallite and set(cell, value) to combine mapDensityToVoxel
-        //      and forEachVoxel for less time complexity.
+        // TODO: Create a forEachSatallite and set(cell, value) to combine
+        //       mapDensityToVoxel and forEachVoxel for less time complexity.
         rawVolume.forEachVoxel([&](glm::uvec3 cell, float) {
         //     glm::vec3 coord = _lowerDomainBound +
         //        glm::vec3(cell) / glm::vec3(_dimensions) * domainSize;
@@ -708,7 +760,10 @@ void GenerateDebrisVolumeTask::perform(const Task::ProgressCallback& progressCal
         ghoul::filesystem::File file(rawOutputName);
         const std::string directory = file.directoryName();
         if (!FileSys.directoryExists(directory)) {
-            FileSys.createDirectory(directory, ghoul::filesystem::FileSystem::Recursive::Yes);
+            FileSys.createDirectory(
+                directory,
+                ghoul::filesystem::FileSystem::Recursive::Yes
+            );
         }
 
         volume::RawVolumeWriter<float> writer(rawOutputName);
diff --git a/modules/space/tasks/generatedebrisvolumetask.h b/modules/space/tasks/generatedebrisvolumetask.h
index 1a0225b4f2..7eb22f1188 100644
--- a/modules/space/tasks/generatedebrisvolumetask.h
+++ b/modules/space/tasks/generatedebrisvolumetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/translation/horizonstranslation.cpp b/modules/space/translation/horizonstranslation.cpp
index e8cf08330f..6f294d3055 100644
--- a/modules/space/translation/horizonstranslation.cpp
+++ b/modules/space/translation/horizonstranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/fmt.h>
+#include <ghoul/filesystem/cachemanager.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/lua/ghoul_lua.h>
@@ -45,32 +46,22 @@ namespace {
         "This value is the path to the text file generated by Horizons with observer "
         "range and Galactiv longitude and latitude for different timestamps."
     };
+
+    struct [[codegen::Dictionary(HorizonsTranslation)]] Parameters {
+        // [[codegen::verbatim(HorizonsTextFileInfo.description)]]
+        std::string horizonsTextFile;
+    };
+#include "horizonstranslation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation HorizonsTranslation::Documentation() {
-    using namespace documentation;
-    return {
-        "Horizons Translation",
-        "base_transform_translation_horizons",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("HorizonsTranslation"),
-                Optional::No
-            },
-            {
-                HorizonsTextFileInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                HorizonsTextFileInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "base_transform_translation_horizons";
+    return doc;
 }
 
-
 HorizonsTranslation::HorizonsTranslation()
     : _horizonsTextFile(HorizonsTextFileInfo)
 {
@@ -83,25 +74,15 @@ HorizonsTranslation::HorizonsTranslation()
              requireUpdate();
              notifyObservers();
          });
-        readHorizonsTextFile(_horizonsTextFile);
+        loadData();
     });
 }
 
 HorizonsTranslation::HorizonsTranslation(const ghoul::Dictionary& dictionary)
     : HorizonsTranslation()
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "HorizonsTranslation"
-    );
-
-    _horizonsTextFile = absPath(
-        dictionary.value<std::string>(HorizonsTextFileInfo.identifier)
-    );
-
-    // Read specified file and store it in memory.
-    readHorizonsTextFile(_horizonsTextFile);
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _horizonsTextFile = absPath(p.horizonsTextFile);
 }
 
 glm::dvec3 HorizonsTranslation::position(const UpdateData& data) const {
@@ -130,12 +111,50 @@ glm::dvec3 HorizonsTranslation::position(const UpdateData& data) const {
     return interpolatedPos;
 }
 
-void HorizonsTranslation::readHorizonsTextFile(const std::string& horizonsTextFilePath) {
-    std::ifstream fileStream(horizonsTextFilePath);
+void HorizonsTranslation::loadData() {
+    std::string file = _horizonsTextFile;
+    if (!FileSys.fileExists(absPath(file))) {
+        return;
+    }
+
+    std::string cachedFile = FileSys.cacheManager()->cachedFilename(
+        file,
+        ghoul::filesystem::CacheManager::Persistent::Yes
+    );
+
+    bool hasCachedFile = FileSys.fileExists(cachedFile);
+    if (hasCachedFile) {
+        LINFO(fmt::format(
+            "Cached file '{}' used for Horizon 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 Horizon file '{}' not found", file));
+    }
+    LINFO(fmt::format("Loading Horizon file '{}'", file));
+
+    readHorizonsTextFile();
+
+    LINFO("Saving cache");
+    saveCachedFile(cachedFile);
+}
+
+void HorizonsTranslation::readHorizonsTextFile() {
+    std::ifstream fileStream(_horizonsTextFile);
 
     if (!fileStream.good()) {
         LERROR(fmt::format(
-            "Failed to open Horizons text file '{}'", horizonsTextFilePath
+            "Failed to open Horizons text file '{}'", _horizonsTextFile
         ));
         return;
     }
@@ -186,4 +205,81 @@ void HorizonsTranslation::readHorizonsTextFile(const std::string& horizonsTextFi
     fileStream.close();
 }
 
+bool HorizonsTranslation::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;
+    }
+
+    // Read how many keyframes to read
+    int32_t nKeyframes = 0;
+
+    fileStream.read(reinterpret_cast<char*>(&nKeyframes), sizeof(int32_t));
+    if (nKeyframes == 0) {
+        throw ghoul::RuntimeError("Error reading cache: No values were loaded");
+    }
+
+    // Read the values in same order as they were written
+    for (int i = 0; i < nKeyframes; ++i) {
+        double timestamp, x, y, z;
+        glm::dvec3 gPos;
+
+        // Timestamp
+        fileStream.read(reinterpret_cast<char*>(&timestamp), sizeof(double));
+
+        // Position vector components
+        fileStream.read(reinterpret_cast<char*>(&x), sizeof(double));
+        fileStream.read(reinterpret_cast<char*>(&y), sizeof(double));
+        fileStream.read(reinterpret_cast<char*>(&z), sizeof(double));
+
+        // Recreate the position vector
+        gPos = glm::dvec3(x, y, z);
+
+        // Add keyframe in timeline
+        _timeline.addKeyframe(timestamp, std::move(gPos));
+    }
+
+    return fileStream.good();
+}
+
+void HorizonsTranslation::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;
+    }
+
+    // Write how many keyframes are to be written
+    int32_t nKeyframes = static_cast<int32_t>(_timeline.nKeyframes());
+    if (nKeyframes == 0) {
+        throw ghoul::RuntimeError("Error writing cache: No values were loaded");
+    }
+    fileStream.write(reinterpret_cast<const char*>(&nKeyframes), sizeof(int32_t));
+
+    // Write data
+    std::deque<Keyframe<glm::dvec3>> keyframes = _timeline.keyframes();
+    for (int i = 0; i < nKeyframes; i++) {
+        // First write timestamp
+        fileStream.write(reinterpret_cast<const char*>(
+            &keyframes[i].timestamp),
+            sizeof(double)
+        );
+
+        // and then the components of the position vector one by one
+        fileStream.write(reinterpret_cast<const char*>(
+            &keyframes[i].data.x),
+            sizeof(double)
+        );
+        fileStream.write(reinterpret_cast<const char*>(
+            &keyframes[i].data.y),
+            sizeof(double)
+        );
+        fileStream.write(reinterpret_cast<const char*>(
+            &keyframes[i].data.z),
+            sizeof(double)
+        );
+    }
+}
 } // namespace openspace
diff --git a/modules/space/translation/horizonstranslation.h b/modules/space/translation/horizonstranslation.h
index a0c2a9fea8..e002c3f8ed 100644
--- a/modules/space/translation/horizonstranslation.h
+++ b/modules/space/translation/horizonstranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -59,7 +59,10 @@ public:
     static documentation::Documentation Documentation();
 
 private:
-    void readHorizonsTextFile(const std::string& _horizonsTextFilePath);
+    void loadData();
+    void readHorizonsTextFile();
+    bool loadCachedFile(const std::string& file);
+    void saveCachedFile(const std::string& file) const;
 
     properties::StringProperty _horizonsTextFile;
     std::unique_ptr<ghoul::filesystem::File> _fileHandle;
diff --git a/modules/space/translation/keplertranslation.cpp b/modules/space/translation/keplertranslation.cpp
index c1dd9beb2d..2dcedbe797 100644
--- a/modules/space/translation/keplertranslation.cpp
+++ b/modules/space/translation/keplertranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,14 +31,12 @@
 #include <glm/gtx/transform.hpp>
 
 namespace {
-
     template <typename T, typename Func>
     T solveIteration(const Func& function, T x0, const T& err = 0.0, int maxIter = 100) {
-        T x = 0;
         T x2 = x0;
 
         for (int i = 0; i < maxIter; ++i) {
-            x = x2;
+            T x = x2;
             x2 = function(x);
             if (std::abs(x2 - x) < err) {
                 return x2;
@@ -106,6 +104,33 @@ namespace {
         "Orbit period",
         "Specifies the orbital period (in seconds)."
     };
+
+    struct [[codegen::Dictionary(KeplerTranslation)]] Parameters {
+        // [[codegen::verbatim(EccentricityInfo.description)]]
+        double eccentricity [[codegen::inrange(0.0, 1.0)]];
+
+        // [[codegen::verbatim(SemiMajorAxisInfo.description)]]
+        double semiMajorAxis;
+
+        // [[codegen::verbatim(InclinationInfo.description)]]
+        double inclination [[codegen::inrange(0.0, 360.0)]];
+
+        // [[codegen::verbatim(AscendingNodeInfo.description)]]
+        double ascendingNode [[codegen::inrange(0.0, 360.0)]];
+
+        // [[codegen::verbatim(ArgumentOfPeriapsisInfo.description)]]
+        double argumentOfPeriapsis [[codegen::inrange(0.0, 360.0)]];
+
+        // [[codegen::verbatim(MeanAnomalyAtEpochInfo.description)]]
+        double meanAnomaly [[codegen::inrange(0.0, 360.0)]];
+
+        // [[codegen::verbatim(EpochInfo.description)]]
+        std::string epoch;
+
+        // [[codegen::verbatim(PeriodInfo.description)]]
+        double period [[codegen::greater(0.0)]];
+    };
+#include "keplertranslation_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -116,66 +141,9 @@ KeplerTranslation::RangeError::RangeError(std::string off)
 {}
 
 documentation::Documentation KeplerTranslation::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "Kepler Translation",
-        "space_transform_kepler",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("KeplerTranslation"),
-                Optional::No
-            },
-            {
-                EccentricityInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 1.0),
-                Optional::No,
-                EccentricityInfo.description
-            },
-            {
-                SemiMajorAxisInfo.identifier,
-                new DoubleVerifier,
-                Optional::No,
-                SemiMajorAxisInfo.description
-            },
-            {
-                InclinationInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 360.0),
-                Optional::No,
-                InclinationInfo.description
-            },
-            {
-                AscendingNodeInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 360.0),
-                Optional::No,
-                AscendingNodeInfo.description
-            },
-            {
-                ArgumentOfPeriapsisInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 360.0),
-                Optional::No,
-                ArgumentOfPeriapsisInfo.description
-            },
-            {
-                MeanAnomalyAtEpochInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 360.0),
-                Optional::No,
-                MeanAnomalyAtEpochInfo.description
-            },
-            {
-                EpochInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                EpochInfo.description
-            },
-            {
-                PeriodInfo.identifier,
-                new DoubleGreaterVerifier(0.0),
-                Optional::No,
-                PeriodInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_transform_kepler";
+    return doc;
 }
 
 KeplerTranslation::KeplerTranslation()
@@ -219,21 +187,17 @@ KeplerTranslation::KeplerTranslation()
 KeplerTranslation::KeplerTranslation(const ghoul::Dictionary& dictionary)
     : KeplerTranslation()
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "KeplerTranslation"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     setKeplerElements(
-        dictionary.value<double>(EccentricityInfo.identifier),
-        dictionary.value<double>(SemiMajorAxisInfo.identifier),
-        dictionary.value<double>(InclinationInfo.identifier),
-        dictionary.value<double>(AscendingNodeInfo.identifier),
-        dictionary.value<double>(ArgumentOfPeriapsisInfo.identifier),
-        dictionary.value<double>(MeanAnomalyAtEpochInfo.identifier),
-        dictionary.value<double>(PeriodInfo.identifier),
-        dictionary.value<std::string>(EpochInfo.identifier)
+        p.eccentricity,
+        p.semiMajorAxis,
+        p.inclination,
+        p.ascendingNode,
+        p.argumentOfPeriapsis,
+        p.meanAnomaly,
+        p.period,
+        p.epoch
     );
 }
 
diff --git a/modules/space/translation/keplertranslation.h b/modules/space/translation/keplertranslation.h
index 0370822e9e..a6a431da23 100644
--- a/modules/space/translation/keplertranslation.h
+++ b/modules/space/translation/keplertranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/translation/spicetranslation.cpp b/modules/space/translation/spicetranslation.cpp
index 8eadaca8d1..519539d9d6 100644
--- a/modules/space/translation/spicetranslation.cpp
+++ b/modules/space/translation/spicetranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,10 +33,9 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/profiling.h>
+#include <optional>
 
 namespace {
-    constexpr const char* KeyKernels = "Kernels";
-
     constexpr const char* DefaultReferenceFrame = "GALACTIC";
 
     constexpr openspace::properties::Property::PropertyInfo TargetInfo = {
@@ -61,54 +60,32 @@ namespace {
         "This is the SPICE NAIF name for the reference frame in which the position "
         "should be retrieved. The default value is GALACTIC."
     };
+
+    struct [[codegen::Dictionary(SpiceTranslation)]] Parameters {
+        // [[codegen::verbatim(TargetInfo.description)]]
+        std::string target
+            [[codegen::annotation("A valid SPICE NAIF name or identifier")]];
+
+        // [[codegen::verbatim(ObserverInfo.description)]]
+        std::string observer
+            [[codegen::annotation("A valid SPICE NAIF name or identifier")]];
+
+        std::optional<std::string> frame
+            [[codegen::annotation("A valid SPICE NAIF name for a reference frame")]];
+
+        // A single kernel or list of kernels that this SpiceTranslation depends on. All
+        // provided kernels will be loaded before any other operation is performed
+        std::optional<std::variant<std::vector<std::string>, std::string>> kernels;
+    };
+#include "spicetranslation_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation SpiceTranslation::Documentation() {
-    using namespace openspace::documentation;
-
-    return {
-        "Spice Translation",
-        "space_translation_spicetranslation",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("SpiceTranslation"),
-                Optional::No
-            },
-            {
-                TargetInfo.identifier,
-                new StringAnnotationVerifier("A valid SPICE NAIF name or identifier"),
-                Optional::No,
-                "This is the SPICE NAIF name for the body whose translation is to be "
-                "computed by the SpiceTranslation. It can either be a fully qualified "
-                "name (such as 'EARTH') or a NAIF integer id code (such as '399')."
-            },
-            {
-                ObserverInfo.identifier,
-                new StringAnnotationVerifier("A valid SPICE NAIF name or identifier"),
-                Optional::No,
-                ObserverInfo.description
-            },
-            {
-                FrameInfo.identifier,
-                new StringAnnotationVerifier(
-                    "A valid SPICE NAIF name for a reference frame"
-                ),
-                Optional::Yes,
-                FrameInfo.description
-            },
-            {
-                KeyKernels,
-                new OrVerifier({ new StringListVerifier, new StringVerifier }),
-                Optional::Yes,
-                "A single kernel or list of kernels that this SpiceTranslation depends "
-                "on. All provided kernels will be loaded before any other operation is "
-                "performed."
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_translation_spicetranslation";
+    return doc;
 }
 
 SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
@@ -117,15 +94,13 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
     , _frame(FrameInfo, DefaultReferenceFrame)
     , _cachedFrame(DefaultReferenceFrame)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "SpiceTranslation"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     auto loadKernel = [](const std::string& kernel) {
         if (!FileSys.fileExists(kernel)) {
-            throw SpiceManager::SpiceException("Kernel '" + kernel + "' does not exist");
+            throw SpiceManager::SpiceException(fmt::format(
+                "Kernel '{}' does not exist", kernel
+            ));
         }
 
         try {
@@ -136,17 +111,13 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
         }
     };
 
-    if (dictionary.hasKey(KeyKernels)) {
-        // Due to the specification, we can be sure it is either a Dictionary or a string
-        if (dictionary.hasValue<std::string>(KeyKernels)) {
-            std::string kernel = dictionary.value<std::string>(KeyKernels);
-            loadKernel(absPath(kernel));
+    if (p.kernels.has_value()) {
+        if (std::holds_alternative<std::string>(*p.kernels)) {
+            loadKernel(absPath(std::get<std::string>(*p.kernels)));
         }
         else {
-            ghoul::Dictionary kernels = dictionary.value<ghoul::Dictionary>(KeyKernels);
-            for (size_t i = 1; i <= kernels.size(); ++i) {
-                std::string kernel = kernels.value<std::string>(std::to_string(i));
-                loadKernel(absPath(kernel));
+            for (const std::string& k : std::get<std::vector<std::string>>(*p.kernels)) {
+                loadKernel(absPath(k));
             }
         }
     }
@@ -172,12 +143,9 @@ SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
     });
     addProperty(_frame);
 
-    _target = dictionary.value<std::string>(TargetInfo.identifier);
-    _observer = dictionary.value<std::string>(ObserverInfo.identifier);
-
-    if (dictionary.hasKey(FrameInfo.identifier)) {
-        _frame = dictionary.value<std::string>(FrameInfo.identifier);
-    }
+    _target = p.target;
+    _observer = p.observer;
+    _frame = p.frame.value_or(_frame);
 }
 
 glm::dvec3 SpiceTranslation::position(const UpdateData& data) const {
diff --git a/modules/space/translation/spicetranslation.h b/modules/space/translation/spicetranslation.h
index 3c09a87340..6b3f78808a 100644
--- a/modules/space/translation/spicetranslation.h
+++ b/modules/space/translation/spicetranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/space/translation/tletranslation.cpp b/modules/space/translation/tletranslation.cpp
index add42596de..83f5794355 100644
--- a/modules/space/translation/tletranslation.cpp
+++ b/modules/space/translation/tletranslation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,12 +29,10 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <chrono>
 #include <fstream>
+#include <optional>
 #include <vector>
 
 namespace {
-    constexpr const char* KeyFile = "File";
-    constexpr const char* KeyLineNumber = "LineNumber";
-
     // The list of leap years only goes until 2056 as we need to touch this file then
     // again anyway ;)
     const std::vector<int> LeapYears = {
@@ -211,52 +209,32 @@ namespace {
         // We need the semi major axis in km instead of m
         return semiMajorAxis / 1000.0;
     }
-} // namespace
 
+    struct [[codegen::Dictionary(TLETranslation)]] Parameters {
+        // Specifies the filename of the Two-Line-Element file
+        std::string file;
+
+        // Specifies the line number within the file where the group of 3 TLE lines begins
+        // (1-based). Defaults to 1
+        std::optional<int> lineNumber [[codegen::greater(0)]];
+    };
+#include "tletranslation_codegen.cpp"
+} // namespace
 
 namespace openspace {
 
 documentation::Documentation TLETranslation::Documentation() {
-    using namespace openspace::documentation;
-    return {
-        "TLE Translation",
-        "space_transform_tle",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("TLETranslation"),
-               Optional::No
-            },
-            {
-                KeyFile,
-                new StringVerifier,
-                Optional::No,
-                "Specifies the filename of the Two-Line-Element file"
-            },
-            {
-                KeyLineNumber,
-                new DoubleGreaterVerifier(0),
-                Optional::Yes,
-                "Specifies the line number within the file where the group of 3 TLE "
-                "lines begins (1-based). Defaults to 1."
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "space_transform_tle";
+    return doc;
 }
 
 TLETranslation::TLETranslation(const ghoul::Dictionary& dictionary) {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "TLETranslation"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    const std::string& file = dictionary.value<std::string>(KeyFile);
-    int lineNum = 1;
-    if (dictionary.hasKeyAndValue<double>(KeyLineNumber)) {
-        lineNum = static_cast<int>(dictionary.value<double>(KeyLineNumber));
-    }
-    readTLEFile(file, lineNum);
+
+    int lineNum = p.lineNumber.value_or(1);
+    readTLEFile(p.file, lineNum);
 }
 
 void TLETranslation::readTLEFile(const std::string& filename, int lineNum) {
diff --git a/modules/space/translation/tletranslation.h b/modules/space/translation/tletranslation.h
index aff26bc12a..3d9831fc86 100644
--- a/modules/space/translation/tletranslation.h
+++ b/modules/space/translation/tletranslation.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/CMakeLists.txt b/modules/spacecraftinstruments/CMakeLists.txt
index 45f3282bc8..5b2406298c 100644
--- a/modules/spacecraftinstruments/CMakeLists.txt
+++ b/modules/spacecraftinstruments/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,63 +25,63 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES    
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditeminstruments.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecrawlingline.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefov.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneprojection.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetprojection.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableshadowcylinder.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodelprojection.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/decoder.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/hongkangparser.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumenttimesparser.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/image.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/imagesequencer.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumentdecoder.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/labelparser.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/projectioncomponent.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/scannerdecoder.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/sequenceparser.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/targetdecoder.h
+  dashboard/dashboarditeminstruments.h
+  rendering/renderablecrawlingline.h
+  rendering/renderablefov.h
+  rendering/renderableplaneprojection.h
+  rendering/renderableplanetprojection.h
+  rendering/renderableshadowcylinder.h
+  rendering/renderablemodelprojection.h
+  util/decoder.h
+  util/hongkangparser.h
+  util/instrumenttimesparser.h
+  util/image.h
+  util/imagesequencer.h
+  util/instrumentdecoder.h
+  util/labelparser.h
+  util/projectioncomponent.h
+  util/scannerdecoder.h
+  util/sequenceparser.h
+  util/targetdecoder.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/dashboard/dashboarditeminstruments.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablecrawlingline.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablefov.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplaneprojection.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanetprojection.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableshadowcylinder.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablemodelprojection.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/decoder.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/hongkangparser.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumenttimesparser.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/imagesequencer.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/instrumentdecoder.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/labelparser.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/projectioncomponent.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/scannerdecoder.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/sequenceparser.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/util/targetdecoder.cpp
+  dashboard/dashboarditeminstruments.cpp
+  rendering/renderablecrawlingline.cpp
+  rendering/renderablefov.cpp
+  rendering/renderableplaneprojection.cpp
+  rendering/renderableplanetprojection.cpp
+  rendering/renderableshadowcylinder.cpp
+  rendering/renderablemodelprojection.cpp
+  util/decoder.cpp
+  util/hongkangparser.cpp
+  util/instrumenttimesparser.cpp
+  util/imagesequencer.cpp
+  util/instrumentdecoder.cpp
+  util/labelparser.cpp
+  util/projectioncomponent.cpp
+  util/scannerdecoder.cpp
+  util/sequenceparser.cpp
+  util/targetdecoder.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/crawlingline_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/crawlingline_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fov_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/fov_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModel_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModel_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModelProjection_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderableModelProjection_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanet_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanet_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanetProjection_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/renderablePlanetProjection_vs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/terminatorshadow_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/terminatorshadow_vs.glsl
+  shaders/crawlingline_fs.glsl
+  shaders/crawlingline_vs.glsl
+  shaders/fov_fs.glsl
+  shaders/fov_vs.glsl
+  shaders/renderableModel_fs.glsl
+  shaders/renderableModel_vs.glsl
+  shaders/renderableModelProjection_fs.glsl
+  shaders/renderableModelProjection_vs.glsl
+  shaders/renderablePlanet_fs.glsl
+  shaders/renderablePlanet_vs.glsl
+  shaders/renderablePlanetProjection_fs.glsl
+  shaders/renderablePlanetProjection_vs.glsl
+  shaders/terminatorshadow_fs.glsl
+  shaders/terminatorshadow_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
index e3a8f2d171..b8371ac55e 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -87,47 +87,29 @@ namespace {
     glm::vec2 addToBoundingbox(glm::vec2 lhs, glm::vec2 rhs) {
         return { std::max(lhs.x, rhs.x), lhs.y + rhs.y };
     }
+
+    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::verbatim(FlashColorInfo.description)]]
+        std::optional<glm::dvec3> flashColor;
+    };
+#include "dashboarditeminstruments_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation DashboardItemInstruments::Documentation() {
-    using namespace documentation;
-    return {
-        "DashboardItem Instruments",
-        "spacecraftinstruments_dashboarditem_instuments",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("DashboardItemInstruments"),
-                Optional::No
-            },
-            {
-                FontNameInfo.identifier,
-                new StringVerifier,
-                Optional::Yes,
-                FontNameInfo.description
-            },
-            {
-                FontSizeInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                FontSizeInfo.description
-            },
-            {
-                ActiveColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                ActiveColorInfo.description
-            },
-            {
-                FlashColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                FlashColorInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "spacecraftinstruments_dashboarditem_instuments";
+    return doc;
 }
 
 DashboardItemInstruments::DashboardItemInstruments(const ghoul::Dictionary& dictionary)
@@ -147,24 +129,15 @@ DashboardItemInstruments::DashboardItemInstruments(const ghoul::Dictionary& dict
     )
     , _font(global::fontManager->font(KeyFontMono, 10))
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "DashboardItemInstruments"
-    );
-
-    if (dictionary.hasKey(FontNameInfo.identifier)) {
-        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
-    }
-    if (dictionary.hasKey(FontSizeInfo.identifier)) {
-        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
-    }
+    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);
     });
@@ -275,7 +248,6 @@ void DashboardItemInstruments::render(glm::vec2& penPosition) {
         sequencer.activeInstruments(currentTime);
 
     glm::vec4 firing(0.58f - t, 1.f - t, 1.f - t, 1.f);
-    glm::vec4 notFiring(0.5f, 0.5f, 0.5f, 1.f);
 
     RenderFont(
         *_font,
@@ -334,7 +306,6 @@ glm::vec2 DashboardItemInstruments::size() const {
 
 
     if (remaining > 0) {
-        using FR = ghoul::fontrendering::FontRenderer;
         std::string progress = progressToStr(25, t);
 
         size = addToBoundingbox(
diff --git a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
index 1d787cf0f4..06be3f5dd9 100644
--- a/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
+++ b/modules/spacecraftinstruments/dashboard/dashboarditeminstruments.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/include.cmake b/modules/spacecraftinstruments/include.cmake
index 659b975323..ffea0ac430 100644
--- a/modules/spacecraftinstruments/include.cmake
+++ b/modules/spacecraftinstruments/include.cmake
@@ -1,5 +1 @@
 set(DEFAULT_MODULE ON)
-
-set (OPENSPACE_DEPENDENCIES
-  space
-)
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
index 425538476a..b1cf2a0ecb 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -119,11 +119,11 @@ RenderableCrawlingLine::RenderableCrawlingLine(const ghoul::Dictionary& dictiona
     _target = dictionary.value<std::string>(KeyTarget);
     _instrumentName = dictionary.value<std::string>(KeyInstrument);
 
-    _lineColorBegin = dictionary.value<glm::vec4>(
+    _lineColorBegin = dictionary.value<glm::dvec4>(
         std::string(KeyColor) + "." + KeyColorStart
     );
 
-    _lineColorEnd = dictionary.value<glm::vec4>(
+    _lineColorEnd = dictionary.value<glm::dvec4>(
         std::string(KeyColor) + "." + KeyColorEnd
     );
 }
diff --git a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
index e80107a5b6..4f9c0a41cb 100644
--- a/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
+++ b/modules/spacecraftinstruments/rendering/renderablecrawlingline.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.cpp b/modules/spacecraftinstruments/rendering/renderablefov.cpp
index a8ea7682e0..25111acf83 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablefov.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -152,6 +152,48 @@ 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
+//        // rendered
+//        std::string body;
+//
+//        // The SPICE name of the source body's frame in which the field of view should be
+//        // rendered
+//        std::string frame;
+//
+//        struct Instrument {
+//            // The SPICE name of the instrument that is rendered
+//            std::string name;
+//
+//            // The aberration correction that is used for this field of view. The default
+//            // is 'NONE'
+//            std::optional<std::string> aberration [[codegen::inlist("NONE",
+//                "LT", "LT+S", "CN", "CN+S", "XLT", "XLT+S", "XCN", "XCN+S")]];
+//        };
+//        // A table describing the instrument whose field of view should be rendered
+//        Instrument instrument;
+//
+//        // A list of potential targets (specified as SPICE names) that the field of view
+//        // should be tested against
+//        std::vector<std::string> potentialTargets;
+//
+//        // A list of frame conversions that should be registered with the SpiceManager
+//        std::optional<std::vector<std::string>> frameConversions;
+//
+//        // [[codegen::verbatim(LineWidthInfo.description)]]
+//        std::optional<double> lineWidth;
+//
+//        // [[codegen::verbatim(StandoffDistanceInfo.description)]]
+//        std::optional<double> standOffDistance;
+//
+//        // If this value is set to 'true' the field-of-views bounds values will be
+//        // simplified on load. Bound vectors will be removed if they are the strict linear
+//        // interpolation between the two neighboring vectors. This value is disabled on
+//        // default
+//        std::optional<bool> simplifyBounds;
+//    };
+//#include "renderablefov_codegen.cpp"
 } // namespace
 
 namespace openspace {
@@ -256,46 +298,46 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
     , _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) 
-        },
-        { 
-            IntersectionStartInfo, 
-            glm::vec3(1.f, 0.89f, 0.f), 
+        {
+            DefaultStartColorInfo,
+            glm::vec3(0.4f),
             glm::vec3(0.f),
-            glm::vec3(1.f) 
-        },
-        { 
-            IntersectionEndInfo, 
-            glm::vec3(1.f, 0.29f, 0.f), 
-            glm::vec3(0.f), 
             glm::vec3(1.f)
         },
-        { 
-            SquareColorInfo, 
-            glm::vec3(0.85f), 
-            glm::vec3(0.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),
+            glm::vec3(0.f),
+            glm::vec3(1.f)
+        },
+        {
+            IntersectionEndInfo,
+            glm::vec3(1.f, 0.29f, 0.f),
+            glm::vec3(0.f),
+            glm::vec3(1.f)
+        },
+        {
+            SquareColorInfo,
+            glm::vec3(0.85f),
+            glm::vec3(0.f),
             glm::vec3(1.f)
         }
     })
@@ -314,7 +356,7 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
     );
 
     std::string ia = std::string(KeyInstrument) + "." + KeyInstrumentAberration;
-    if (dictionary.hasKeyAndValue<std::string>(ia)) {
+    if (dictionary.hasValue<std::string>(ia)) {
         const std::string& ac = dictionary.value<std::string>(ia);
         _instrument.aberrationCorrection = SpiceManager::AberrationCorrection(ac);
     }
@@ -328,9 +370,9 @@ RenderableFov::RenderableFov(const ghoul::Dictionary& dictionary)
 
     if (dictionary.hasKey(KeyFrameConversions)) {
         ghoul::Dictionary fc = dictionary.value<ghoul::Dictionary>(KeyFrameConversions);
-        for (const std::string& key : fc.keys()) {
+        for (std::string_view key : fc.keys()) {
             global::moduleEngine->module<SpacecraftInstrumentsModule>()->addFrame(
-                key,
+                std::string(key),
                 fc.value<std::string>(key)
             );
         }
@@ -767,97 +809,96 @@ void RenderableFov::computeIntercepts(const UpdateData& data, const std::string&
     }
 
 
-#ifdef DEBUG_THIS
-        // At least one point will intersect
-        for (size_t i = 0; i < _instrument.bounds.size(); ++i) {
-            // Wrap around the array index to 0
-            const size_t j = (i == _instrument.bounds.size() - 1) ? 0 : i + 1;
+#if 0 // DEBUG_THIS
+    // At least one point will intersect
+    for (size_t i = 0; i < _instrument.bounds.size(); ++i) {
+        // Wrap around the array index to 0
+        const size_t j = (i == _instrument.bounds.size() - 1) ? 0 : i + 1;
 
-            const glm::dvec3& iBound = _instrument.bounds[i];
-            const glm::dvec3& jBound = _instrument.bounds[j];
+        const glm::dvec3& iBound = _instrument.bounds[i];
+        const glm::dvec3& jBound = _instrument.bounds[j];
 
-            auto intercepts = [&](const glm::dvec3& probe) -> bool {
-                return SpiceManager::ref().surfaceIntercept(
-                    target,
-                    _instrument.spacecraft,
-                    _instrument.name,
-                    makeBodyFixedReferenceFrame(_instrument.referenceFrame).first,
-                    _instrument.aberrationCorrection,
-                    data.time,
-                    probe
-                ).interceptFound;
-            };
+        auto intercepts = [&](const glm::dvec3& probe) -> bool {
+            return SpiceManager::ref().surfaceIntercept(
+                target,
+                _instrument.spacecraft,
+                _instrument.name,
+                makeBodyFixedReferenceFrame(_instrument.referenceFrame).first,
+                _instrument.aberrationCorrection,
+                data.time,
+                probe
+            ).interceptFound;
+        };
 
-            static const uint8_t NoIntersect   = 0b00;
-            static const uint8_t ThisIntersect = 0b01;
-            static const uint8_t NextIntersect = 0b10;
-            static const uint8_t BothIntersect = 0b11;
+        static const uint8_t NoIntersect   = 0b00;
+        static const uint8_t ThisIntersect = 0b01;
+        static const uint8_t NextIntersect = 0b10;
+        static const uint8_t BothIntersect = 0b11;
 
-            const uint8_t type = (intersects[i] ? 1 : 0) + (intersects[j] ? 2 : 0);
-            switch (type) {
-                case NoIntersect:
-                {
-                    // If both points don't intercept, the target might still pass between
-                    // them, so we need to check the intermediate point
+        const uint8_t type = (intersects[i] ? 1 : 0) + (intersects[j] ? 2 : 0);
+        switch (type) {
+            case NoIntersect:
+            {
+                // If both points don't intercept, the target might still pass between
+                // them, so we need to check the intermediate point
 
-                    const glm::dvec3 half = glm::mix(iBound, jBound, 0.5);
-                    if (intercepts(half)) {
-                        // The two outer points do not intersect, but the middle point
-                        // does; so we need to find the intersection points
-                        const double t1 = bisect(half, iBound, intercepts);
-                        const double t2 = 0.5 + bisect(half, jBound, intercepts);
+                const glm::dvec3 half = glm::mix(iBound, jBound, 0.5);
+                if (intercepts(half)) {
+                    // The two outer points do not intersect, but the middle point
+                    // does; so we need to find the intersection points
+                    const double t1 = bisect(half, iBound, intercepts);
+                    const double t2 = 0.5 + bisect(half, jBound, intercepts);
 
-                        //
-                        // The target is sticking out somewhere between i and j, so we
-                        // have three regions here:
-                        // The first (0,t1) and second (t2,1) are not intersecting
-                        // The third between (t1,t2) is intersecting
-                        //
-                        //   i       p1    p2       j
-                        //            *****
-                        //   x-------*     *-------x
-                        //   0       t1    t2      1
+                    //
+                    // The target is sticking out somewhere between i and j, so we
+                    // have three regions here:
+                    // The first (0,t1) and second (t2,1) are not intersecting
+                    // The third between (t1,t2) is intersecting
+                    //
+                    //   i       p1    p2       j
+                    //            *****
+                    //   x-------*     *-------x
+                    //   0       t1    t2      1
 
-                        // OBS: i and j are in bounds-space,  p1, p2 are in
-                        // _orthogonalPlane-space
-                        const size_t p1 = static_cast<size_t>(
-                            indexForBounds(i) + t1 * InterpolationSteps
-                        );
-                        const size_t p2 = static_cast<size_t>(
-                            indexForBounds(i) + t2 * InterpolationSteps
-                        );
+                    // OBS: i and j are in bounds-space,  p1, p2 are in
+                    // _orthogonalPlane-space
+                    const size_t p1 = static_cast<size_t>(
+                        indexForBounds(i) + t1 * InterpolationSteps
+                    );
+                    const size_t p2 = static_cast<size_t>(
+                        indexForBounds(i) + t2 * InterpolationSteps
+                    );
 
-                        // We can copy the non-intersecting parts
-                        copyFieldOfViewValues(i, indexForBounds(i), p1);
-                        copyFieldOfViewValues(i, p2, indexForBounds(j));
+                    // We can copy the non-intersecting parts
+                    copyFieldOfViewValues(i, indexForBounds(i), p1);
+                    copyFieldOfViewValues(i, p2, indexForBounds(j));
 
-                        // Are recompute the intersecting ones
-                        for (size_t k = 0; k <= (p2 - p1); ++k) {
-                            const double t = t1 + k * (t2 - t1);
-                            const glm::dvec3 interpolated = glm::mix(iBound, jBound, t);
-                            const glm::vec3 icpt = interceptVector(interpolated);
-                            _orthogonalPlane.data[p1 + k] = {
-                                icpt.x, icpt.y, icpt.z,
-                                RenderInformation::VertexColorTypeSquare
-                            };
-                        }
+                    // Are recompute the intersecting ones
+                    for (size_t k = 0; k <= (p2 - p1); ++k) {
+                        const double t = t1 + k * (t2 - t1);
+                        const glm::dvec3 interpolated = glm::mix(iBound, jBound, t);
+                        const glm::vec3 icpt = interceptVector(interpolated);
+                        _orthogonalPlane.data[p1 + k] = {
+                            icpt.x, icpt.y, icpt.z,
+                            RenderInformation::VertexColorTypeSquare
+                        };
                     }
-                    else {
-                        copyFieldOfViewValues(
-                            i,
-                            indexForBounds(i),
-                            indexForBounds(i + 1)
-                        );
-                    }
-                    break;
                 }
-                case ThisIntersect:
-                case NextIntersect:
-                case BothIntersect:
-                    break;
-                default:
-                    throw ghoul::MissingCaseException();
+                else {
+                    copyFieldOfViewValues(
+                        i,
+                        indexForBounds(i),
+                        indexForBounds(i + 1)
+                    );
+                }
+                break;
             }
+            case ThisIntersect:
+            case NextIntersect:
+            case BothIntersect:
+                break;
+            default:
+                throw ghoul::MissingCaseException();
         }
     }
 #endif
diff --git a/modules/spacecraftinstruments/rendering/renderablefov.h b/modules/spacecraftinstruments/rendering/renderablefov.h
index 082e6cb1fd..25bda493d7 100644
--- a/modules/spacecraftinstruments/rendering/renderablefov.h
+++ b/modules/spacecraftinstruments/rendering/renderablefov.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
index 8d5c76a77e..7e4222cf2a 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -43,8 +43,6 @@
 #include <modules/spacecraftinstruments/util/imagesequencer.h>
 
 namespace {
-    constexpr const char* _loggerCat = "RenderableModelProjection";
-
     constexpr const char* keyGeometry = "Geometry";
     constexpr const char* keyProjection = "Projection";
     constexpr const char* keyBoundingSphereRadius = "BoundingSphereRadius";
@@ -83,11 +81,6 @@ documentation::Documentation RenderableModelProjection::Documentation() {
         "Renderable Model Projection",
         "newhorizons_renderable_modelprojection",
         {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableModelProjection"),
-                Optional::No
-            },
             {
                 keyGeometry,
                 new ReferencingVerifier("base_geometry_model"),
@@ -139,11 +132,13 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di
         dictionary.value<ghoul::Dictionary>(keyProjection)
     );
 
-    float boundingSphereRadius = 1.0e9;
-    dictionary.getValue(keyBoundingSphereRadius, boundingSphereRadius);
+    double boundingSphereRadius = 1.0e9;
+    if (dictionary.hasValue<double>(keyBoundingSphereRadius)) {
+        boundingSphereRadius = dictionary.value<double>(keyBoundingSphereRadius);
+    }
     setBoundingSphere(boundingSphereRadius);
 
-    if (dictionary.hasKeyAndValue<bool>(PerformShadingInfo.identifier)) {
+    if (dictionary.hasValue<bool>(PerformShadingInfo.identifier)) {
         _performShading = dictionary.value<bool>(PerformShadingInfo.identifier);
     }
 
@@ -199,7 +194,7 @@ void RenderableModelProjection::initializeGL() {
 
     _projectionComponent.initializeGL();
 
-    float bs = boundingSphere();
+    double bs = boundingSphere();
     _geometry->initialize(this);
     setBoundingSphere(bs); // ignore bounding sphere set by geometry.
 }
@@ -438,7 +433,7 @@ void RenderableModelProjection::attitudeParameters(double time) {
     const glm::vec3 cpos = p * 10000.0;
 
     const float distance = glm::length(cpos);
-    const float radius = boundingSphere();
+    const double radius = boundingSphere();
 
     _projectorMatrix = _projectionComponent.computeProjectorMatrix(
         cpos,
@@ -447,8 +442,8 @@ void RenderableModelProjection::attitudeParameters(double time) {
         _instrumentMatrix,
         _projectionComponent.fieldOfViewY(),
         _projectionComponent.aspectRatio(),
-        distance - radius,
-        distance + radius,
+        static_cast<float>(distance - radius),
+        static_cast<float>(distance + radius),
         _boresight
     );
 }
diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
index 45d5ccf252..5862b09390 100644
--- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
index 29e1768614..a165d84c5d 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,6 +26,7 @@
 
 #include <modules/spacecraftinstruments/spacecraftinstrumentsmodule.h>
 #include <modules/spacecraftinstruments/util/imagesequencer.h>
+#include <openspace/documentation/documentation.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/rendering/renderengine.h>
@@ -40,6 +41,7 @@
 #include <ghoul/opengl/texture.h>
 #include <ghoul/opengl/textureunit.h>
 #include <glm/gtx/projection.hpp>
+#include <optional>
 
 namespace {
     constexpr const char* _loggerCat = "RenderablePlaneProjection";
@@ -50,22 +52,32 @@ namespace {
     constexpr const char* KeyName = "Name";
     constexpr const char* KeyTarget = "DefaultTarget";
     constexpr const char* GalacticFrame = "GALACTIC";
+
+    struct [[codegen::Dictionary(RenderablePlaneProjection)]] Parameters {
+        std::optional<std::string> spacecraft;
+        std::optional<std::string> instrument;
+        std::optional<bool> moving;
+        std::optional<std::string> name;
+        std::optional<std::string> defaultTarget;
+        std::optional<std::string> texture;
+    };
+#include "renderableplaneprojection_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
-RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& dictionary)
-    : Renderable(dictionary)
+RenderablePlaneProjection::RenderablePlaneProjection(const ghoul::Dictionary& dict)
+    : Renderable(dict)
 {
-    dictionary.getValue(KeySpacecraft, _spacecraft);
-    dictionary.getValue(KeyInstrument, _instrument);
-    dictionary.getValue(KeyMoving, _moving);
-    dictionary.getValue(KeyName, _name);
-    dictionary.getValue(KeyTarget, _defaultTarget);
+    const Parameters p = codegen::bake<Parameters>(dict);
+    _spacecraft = p.spacecraft.value_or(_spacecraft);
+    _instrument = p.instrument.value_or(_instrument);
+    _moving = p.moving.value_or(_moving);
+    _name = p.name.value_or(_name);
+    _defaultTarget = p.defaultTarget.value_or(_defaultTarget);
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyTexture)) {
-        _texturePath = dictionary.value<std::string>(KeyTexture);
-        _texturePath = absPath(_texturePath);
+    if (p.texture.has_value()) {
+        _texturePath = absPath(*p.texture);
         _textureFile = std::make_unique<ghoul::filesystem::File>(_texturePath);
     }
 }
diff --git a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
index d86b00d030..d4d72f0ab8 100644
--- a/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplaneprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
index e7adc0985c..23ac686770 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -145,12 +145,6 @@ documentation::Documentation RenderablePlanetProjection::Documentation() {
         "Renderable Planet Projection",
         "newhorizons_renderable_planetprojection",
         {
-            {
-                "Type",
-                new StringEqualVerifier("RenderablePlanetProjection"),
-                Optional::No,
-                ""
-            },
             {
                 KeyGeometry,
                 new ReferencingVerifier("space_geometry_planet"),
@@ -234,7 +228,7 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
     _colorTexturePaths.onChange([this](){ _colorTextureDirty = true; });
     addProperty(_colorTexturePaths);
 
-    if (dict.hasKeyAndValue<ghoul::Dictionary>(ColorTexturePathsInfo.identifier)) {
+    if (dict.hasValue<ghoul::Dictionary>(ColorTexturePathsInfo.identifier)) {
         const ghoul::Dictionary& value = dict.value<ghoul::Dictionary>(
             ColorTexturePathsInfo.identifier
         );
@@ -278,7 +272,7 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
     addProperty(_heightMapTexturePaths);
 
 
-    if (dict.hasKeyAndValue<ghoul::Dictionary>(HeightTexturePathsInfo.identifier)) {
+    if (dict.hasValue<ghoul::Dictionary>(HeightTexturePathsInfo.identifier)) {
         const ghoul::Dictionary& value = dict.value<ghoul::Dictionary>(
             HeightTexturePathsInfo.identifier
         );
@@ -315,12 +309,14 @@ RenderablePlanetProjection::RenderablePlanetProjection(const ghoul::Dictionary&
     addProperty(_addHeightMapTexturePath);
 
 
-    if (dict.hasKeyAndValue<bool>(MeridianShiftInfo.identifier)) {
+    if (dict.hasValue<bool>(MeridianShiftInfo.identifier)) {
         _meridianShift = dict.value<bool>(MeridianShiftInfo.identifier);
     }
 
-    float radius = std::pow(10.f, 9.f);
-    dict.getValue(KeyRadius, radius);
+    double radius = std::pow(10.0, 9.0);
+    if (dict.hasValue<double>(KeyRadius)) {
+        radius = dict.value<double>(KeyRadius);
+    }
     setBoundingSphere(radius);
 
     addPropertySubOwner(_geometry.get());
diff --git a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
index 8be5b83b66..7b36109f3a 100644
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
index 76e3159a78..4857d8d23d 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,7 +32,7 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/opengl/programobject.h>
-#include <openspace/util/spicemanager.h>
+#include <optional>
 
 namespace {
     constexpr const char* ProgramName = "ShadowCylinderProgram";
@@ -104,85 +104,49 @@ namespace {
         "Aberration",
         "This value determines the aberration method that is used to compute the shadow "
         "cylinder."
+    }; 
+
+    struct [[codegen::Dictionary(RenderableShadowCylinder)]] Parameters {
+        // [[codegen::verbatim(NumberPointsInfo.description)]]
+        std::optional<int> numberOfPoints [[codegen::key("AmountOfPoints")]];
+
+        // [[codegen::verbatim(ShadowLengthInfo.description)]]
+        std::optional<float> shadowLength;
+
+        // [[codegen::verbatim(ShadowColorInfo.description)]]
+        std::optional<glm::vec3> shadowColor;
+
+        enum class TerminatorType {
+            Umbral [[codegen::key("UMBRAL")]],
+            Penumbral [[codegen::key("PENUMBRAL")]]
+        };
+        // [[codegen::verbatim(TerminatorTypeInfo.description)]]
+        TerminatorType terminatorType;
+
+        // [[codegen::verbatim(LightSourceInfo.description)]]
+        std::string lightSource;
+
+        // [[codegen::verbatim(ObserverInfo.description)]]
+        std::string observer;
+
+        // [[codegen::verbatim(BodyInfo.description)]]
+        std::string body;
+
+        // [[codegen::verbatim(BodyFrameInfo.description)]]
+        std::string bodyFrame;
+
+        // [[codegen::verbatim(AberrationInfo.description)]]
+        std::string aberration [[codegen::inlist("NONE", "LT", "LT+S", "CN", "CN+S")]];
     };
+#include "renderableshadowcylinder_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation RenderableShadowCylinder::Documentation() {
-    using namespace documentation;
-    return {
-        "RenderableShadowCylinder",
-        "newhorizons_renderable_shadowcylinder",
-        {
-            {
-                "Type",
-                new StringEqualVerifier("RenderableShadowCylinder"),
-                Optional::No,
-                ""
-            },
-            {
-                NumberPointsInfo.identifier,
-                new IntVerifier,
-                Optional::Yes,
-                NumberPointsInfo.description
-            },
-            {
-                ShadowLengthInfo.identifier,
-                new DoubleVerifier,
-                Optional::Yes,
-                ShadowLengthInfo.description
-            },
-            {
-                ShadowColorInfo.identifier,
-                new DoubleVector3Verifier,
-                Optional::Yes,
-                ShadowColorInfo.description
-            },
-            {
-                TerminatorTypeInfo.identifier,
-                new StringInListVerifier({
-                    // Synchronized with SpiceManager::terminatorTypeFromString
-                    "UMBRAL", "PENUMBRAL"
-                }),
-                Optional::No,
-                TerminatorTypeInfo.description
-            },
-            {
-                LightSourceInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                LightSourceInfo.description
-            },
-            {
-                ObserverInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                ObserverInfo.description
-            },
-            {
-                BodyInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                BodyInfo.description
-            },
-            {
-                BodyFrameInfo.identifier,
-                new StringVerifier,
-                Optional::No,
-                BodyFrameInfo.description
-            },
-            {
-                AberrationInfo.identifier,
-                new StringInListVerifier({
-                    // SpiceManager::AberrationCorrection::AberrationCorrection
-                    "NONE", "LT", "LT+S", "CN", "CN+S"
-                }),
-                Optional::No,
-                AberrationInfo.description
-            },
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "newhorizons_renderable_shadowcylinder";
+    return doc;
 }
 
 RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dictionary)
@@ -200,34 +164,18 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
     , _bodyFrame(BodyFrameInfo)
     , _aberration(AberrationInfo)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "RenderableShadowCylinder"
-    );
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
     addProperty(_opacity);
     registerUpdateRenderBinFromOpacity();
 
-    if (dictionary.hasKey(NumberPointsInfo.identifier)) {
-        _numberOfPoints = static_cast<int>(
-            dictionary.value<double>(NumberPointsInfo.identifier)
-        );
-    }
+    _numberOfPoints = p.numberOfPoints.value_or(_numberOfPoints);
     addProperty(_numberOfPoints);
 
-
-    if (dictionary.hasKey(ShadowLengthInfo.identifier)) {
-        _shadowLength = static_cast<float>(
-            dictionary.value<double>(ShadowLengthInfo.identifier)
-        );
-    }
+    _shadowLength = p.shadowLength.value_or(_shadowLength);
     addProperty(_shadowLength);
 
-
-    if (dictionary.hasKey(ShadowColorInfo.identifier)) {
-        _shadowColor = dictionary.value<glm::vec3>(ShadowLengthInfo.identifier);
-    }
+    _shadowColor = p.shadowColor.value_or(_shadowColor);
     _shadowColor.setViewOption(properties::Property::ViewOptions::Color);
     addProperty(_shadowColor);
 
@@ -236,16 +184,21 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
         { static_cast<int>(SpiceManager::TerminatorType::Umbral), "Umbral" },
         { static_cast<int>(SpiceManager::TerminatorType::Penumbral), "Penumbral" }
     });
-    _terminatorType = static_cast<int>(SpiceManager::terminatorTypeFromString(
-        dictionary.value<std::string>(TerminatorTypeInfo.identifier)
-    ));
+    switch (p.terminatorType) {
+        case Parameters::TerminatorType::Umbral:
+            _terminatorType = static_cast<int>(SpiceManager::TerminatorType::Umbral);
+            break;
+        case Parameters::TerminatorType::Penumbral:
+            _terminatorType = static_cast<int>(SpiceManager::TerminatorType::Penumbral);
+            break;
+    }
     addProperty(_terminatorType);
 
 
-    _lightSource = dictionary.value<std::string>(LightSourceInfo.identifier);
-    _observer = dictionary.value<std::string>(ObserverInfo.identifier);
-    _body = dictionary.value<std::string>(BodyInfo.identifier);
-    _bodyFrame = dictionary.value<std::string>(BodyFrameInfo.identifier);
+    _lightSource = p.lightSource;
+    _observer = p.observer;
+    _body = p.body;
+    _bodyFrame = p.bodyFrame;
 
     using T = SpiceManager::AberrationCorrection::Type;
     _aberration.addOptions({
@@ -257,7 +210,7 @@ RenderableShadowCylinder::RenderableShadowCylinder(const ghoul::Dictionary& dict
 
     });
     SpiceManager::AberrationCorrection aberration = SpiceManager::AberrationCorrection(
-        dictionary.value<std::string>(AberrationInfo.identifier)
+        p.aberration
     );
     _aberration = static_cast<int>(aberration.type);
 }
diff --git a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
index 236f519470..c6caaf4f8d 100644
--- a/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
+++ b/modules/spacecraftinstruments/rendering/renderableshadowcylinder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
index fb5f9c6a62..08c86633b5 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
index 9d75648529..551a19ee5a 100644
--- a/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/crawlingline_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/dilation_fs.glsl b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
index 0b4b01e684..18df1d1f08 100644
--- a/modules/spacecraftinstruments/shaders/dilation_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -77,7 +77,6 @@ vec3 gatherNeighboringColors() {
     else {
         return vec3(0.0);
     }
-
 }
 
 void main() {
diff --git a/modules/spacecraftinstruments/shaders/dilation_vs.glsl b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
index 9d2a0c22d9..f0e692aab0 100644
--- a/modules/spacecraftinstruments/shaders/dilation_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/dilation_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/fov_fs.glsl b/modules/spacecraftinstruments/shaders/fov_fs.glsl
index 089ba1e8b3..f05491be6f 100644
--- a/modules/spacecraftinstruments/shaders/fov_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/fov_vs.glsl b/modules/spacecraftinstruments/shaders/fov_vs.glsl
index 2bf1ff5fde..8d067e7645 100644
--- a/modules/spacecraftinstruments/shaders/fov_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/fov_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
index c4a2b2c5c3..9d01c9a7c3 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
index eec94130a1..731c82ef9a 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelDepth_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
index 886a05c843..4d8563d5a2 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
index 63448d4d22..80a73c107e 100644
--- a/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModelProjection_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
index b1ee517e61..23b3035869 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
index bfc2456bf7..4a7fff09a5 100644
--- a/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderableModel_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
index 3760905ab4..dcba10ec68 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -44,7 +44,7 @@ uniform vec3 boresight;
 
 #define M_PI 3.14159265358979323846
 
-vec4 uvToModel(vec2 uv, vec3 radius, float segments){
+vec4 uvToModel(vec2 uv, vec3 radius, float segments) {
     float fj = uv.x * segments;
     float fi = (1.0 - uv.y) * segments;
 
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
index 9007efff34..7d138ee0ed 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanetProjection_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
index 01373460e8..6b65b27563 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
index fa1568f5fe..123d70eb92 100644
--- a/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/renderablePlanet_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
index bf7c29b1fb..eaef27c5c9 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
index 55fd791490..ac79d14c86 100644
--- a/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
+++ b/modules/spacecraftinstruments/shaders/terminatorshadow_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,7 +36,7 @@ uniform mat4 modelViewProjectionTransform;
 uniform vec3 shadowColor;
 
 void main() {
-    if (mod(gl_VertexID,2) == 0.0) {
+    if (mod(gl_VertexID, 2) == 0.0) {
         vs_color = shadowColor;
     }
     else {
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
index 1ea6a2d698..c0bfebbfa1 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
index 53f55a4a02..c94fb8c96f 100644
--- a/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
+++ b/modules/spacecraftinstruments/spacecraftinstrumentsmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/decoder.cpp b/modules/spacecraftinstruments/util/decoder.cpp
index 64a6344a04..9f9acb38f5 100644
--- a/modules/spacecraftinstruments/util/decoder.cpp
+++ b/modules/spacecraftinstruments/util/decoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/decoder.h b/modules/spacecraftinstruments/util/decoder.h
index 878f1cd742..f7cb53ee86 100644
--- a/modules/spacecraftinstruments/util/decoder.h
+++ b/modules/spacecraftinstruments/util/decoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/hongkangparser.cpp b/modules/spacecraftinstruments/util/hongkangparser.cpp
index db387a547d..4c413a72df 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.cpp
+++ b/modules/spacecraftinstruments/util/hongkangparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -73,28 +73,36 @@ HongKangParser::HongKangParser(std::string name, std::string fileName,
     , _potentialTargets(std::move(potentialTargets))
 {
     //get the different instrument types
-    const std::vector<std::string>& decoders = translationDictionary.keys();
     //for each decoder (assuming might have more if hong makes changes)
-    for (const std::string& decoderType : decoders) {
+    for (std::string_view decoderType : translationDictionary.keys()) {
         //create dictionary containing all {playbookKeys , spice IDs}
         if (decoderType == "Instrument") {
-            ghoul::Dictionary typeDictionary;
-            translationDictionary.getValue(decoderType, typeDictionary);
+            if (!translationDictionary.hasKey(decoderType) ||
+                !translationDictionary.hasValue<ghoul::Dictionary>(decoderType))
+            {
+                continue;
+            }
+
+            ghoul::Dictionary typeDictionary =
+                translationDictionary.value<ghoul::Dictionary>(decoderType);
             // for each playbook call -> create a Decoder object
-            const std::vector<std::string>& keys = typeDictionary.keys();
-            for (const std::string& key : keys) {
-                const std::string& currentKey = decoderType + "." + key;
+            for (std::string_view key : typeDictionary.keys()) {
+                const std::string& currentKey = fmt::format("{}.{}", decoderType, key);
 
                 ghoul::Dictionary decoderDictionary;
-                translationDictionary.getValue(currentKey, decoderDictionary);
+                if (translationDictionary.hasValue<ghoul::Dictionary>(currentKey)) {
+                    decoderDictionary = translationDictionary.value<ghoul::Dictionary>(
+                        currentKey
+                    );
+                }
 
                 std::unique_ptr<Decoder> decoder = Decoder::createFromDictionary(
                     decoderDictionary,
-                    decoderType
+                    std::string(decoderType)
                 );
                 //insert decoder to map - this will be used in the parser to determine
                 //behavioral characteristics of each instrument
-                _fileTranslation[key] = std::move(decoder);
+                _fileTranslation[std::string(key)] = std::move(decoder);
             }
         }
         //Hong's playbook needs _only_ instrument translation though.
@@ -161,12 +169,8 @@ bool HongKangParser::create() {
     std::string previousCamera;
 
     double captureStart = -1.0;
-    double captureStop = -1.0;
-    double scanStart = -1.0;
-    double scanStop = -1.0;
 
     std::string cameraTarget  = "VOID";
-    std::string scannerTarget = "VOID";
 
     std::string line;
     while (!file.eof()) {
@@ -220,7 +224,7 @@ bool HongKangParser::create() {
                 _subsetMap[image.target]._range.include(time);
             }
             if (it->second->decoderType() == "SCANNER") { // SCANNER START
-                scanStart = time;
+                double scanStart = time;
 
                 InstrumentDecoder* scanner = static_cast<InstrumentDecoder*>(
                     it->second.get()
@@ -235,8 +239,11 @@ bool HongKangParser::create() {
                     getline(file, linePeek);
                     if (linePeek.find(endNominal) != std::string::npos) {
                         met = linePeek.substr(25, 9);
-                        scanStop = ephemerisTimeFromMissionElapsedTime(met, _metRef);
-                        scannerTarget = findPlaybookSpecifiedTarget(line);
+                        double scanStop = ephemerisTimeFromMissionElapsedTime(
+                            met,
+                            _metRef
+                        );
+                        std::string scannerTarget = findPlaybookSpecifiedTarget(line);
 
                         TimeRange scanRange = { scanStart, scanStop };
                         ghoul_assert(scanRange.isDefined(), "Invalid time range!");
@@ -264,10 +271,8 @@ bool HongKangParser::create() {
             // 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
-                captureStop = time;
-                TimeRange cameraRange = { captureStart, captureStop };
+                // end of capture sequence for camera, store end time of this sequence
+                TimeRange cameraRange = { captureStart, time };
                 ghoul_assert(cameraRange.isDefined(), "Invalid time range!");
                 _instrumentTimes.emplace_back(previousCamera, cameraRange);
                 captureStart = -1;
diff --git a/modules/spacecraftinstruments/util/hongkangparser.h b/modules/spacecraftinstruments/util/hongkangparser.h
index 7232afeb15..afee6984ef 100644
--- a/modules/spacecraftinstruments/util/hongkangparser.h
+++ b/modules/spacecraftinstruments/util/hongkangparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/image.h b/modules/spacecraftinstruments/util/image.h
index 642765d142..e86ac405fb 100644
--- a/modules/spacecraftinstruments/util/image.h
+++ b/modules/spacecraftinstruments/util/image.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/imagesequencer.cpp b/modules/spacecraftinstruments/util/imagesequencer.cpp
index 5e51a43aff..af4ffd77d3 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.cpp
+++ b/modules/spacecraftinstruments/util/imagesequencer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/imagesequencer.h b/modules/spacecraftinstruments/util/imagesequencer.h
index 3f01f2712a..6f5361a38d 100644
--- a/modules/spacecraftinstruments/util/imagesequencer.h
+++ b/modules/spacecraftinstruments/util/imagesequencer.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.cpp b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
index a5b04f79ba..a17d11f1f2 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.cpp
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,53 +24,43 @@
 
 #include <modules/spacecraftinstruments/util/instrumentdecoder.h>
 
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/dictionary.h>
+#include <optional>
 
 namespace {
     constexpr const char* _loggerCat  = "InstrumentDecoder";
-    constexpr const char* KeyDetector = "DetectorType";
-    constexpr const char* KeySpice    = "Spice";
-    constexpr const char* KeyStopCommand = "StopCommand";
+
+    struct [[codegen::Dictionary(InstrumentDecoder)]] Parameters {
+        std::string detectorType;
+        std::optional<std::string> stopCommand;
+        std::vector<std::string> spice;
+    };
+#include "instrumentdecoder_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 InstrumentDecoder::InstrumentDecoder(const ghoul::Dictionary& dictionary) {
-    if (dictionary.hasKeyAndValue<std::string>(KeyDetector)) {
-        _type = dictionary.value<std::string>(KeyDetector);
-        std::for_each(
-            _type.begin(),
-            _type.end(),
-            [](char& in) { in = static_cast<char>(toupper(in)); }
-        );
-    }
-    else {
-        ghoul_assert(false, "Instrument has not provided detector type");
-        throw ghoul::RuntimeError("Instrument has not provided detector type");
-    }
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    _type = p.detectorType;
+    std::for_each(
+        _type.begin(),
+        _type.end(),
+        [](char& in) { in = static_cast<char>(toupper(in)); }
+    );
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyStopCommand) && _type == "SCANNER"){
-        dictionary.getValue(KeyStopCommand, _stopCommand);
+    if (p.stopCommand.has_value() && _type == "SCANNER") {
+        _stopCommand = *p.stopCommand;
     }
     else {
         LWARNING("Scanner must provide stop command, please check mod file.");
     }
 
-    if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeySpice)) {
-        ghoul::Dictionary spiceDictionary = dictionary.value<ghoul::Dictionary>(KeySpice);
-
-        _spiceIDs.resize(spiceDictionary.size());
-        for (size_t i = 0; i < _spiceIDs.size(); ++i) {
-            std::string id = spiceDictionary.value<std::string>(std::to_string(i + 1));
-            _spiceIDs[i] = std::move(id);
-        }
-    }
-    else {
-        ghoul_assert(false, "Instrument did not provide spice ids");
-        throw ghoul::RuntimeError("Instrument has not provided detector type");
-    }
+    _spiceIDs = p.spice;
 }
 
 const std::string& InstrumentDecoder::stopCommand() {
diff --git a/modules/spacecraftinstruments/util/instrumentdecoder.h b/modules/spacecraftinstruments/util/instrumentdecoder.h
index 2537b45870..8df00052fb 100644
--- a/modules/spacecraftinstruments/util/instrumentdecoder.h
+++ b/modules/spacecraftinstruments/util/instrumentdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
index 0aad439d9d..350a5b73fb 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -54,13 +54,14 @@ InstrumentTimesParser::InstrumentTimesParser(std::string name, std::string seque
     _target = inputDict.value<std::string>(KeyTargetBody);
     ghoul::Dictionary instruments = inputDict.value<ghoul::Dictionary>(KeyInstruments);
 
-    for (const std::string& key : instruments.keys()) {
+    for (std::string_view key : instruments.keys()) {
         ghoul::Dictionary instrument = instruments.value<ghoul::Dictionary>(key);
         ghoul::Dictionary files = instrument.value<ghoul::Dictionary>(KeyInstrumentFiles);
-        _fileTranslation[key] = Decoder::createFromDictionary(instrument, KeyInstrument);
+        _fileTranslation[std::string(key)] =
+            Decoder::createFromDictionary(instrument, KeyInstrument);
         for (size_t i = 0; i < files.size(); i++) {
             std::string filename = files.value<std::string>(std::to_string(i + 1));
-            _instrumentFiles[key].push_back(std::move(filename));
+            _instrumentFiles[std::string(key)].push_back(std::move(filename));
         }
     }
 }
diff --git a/modules/spacecraftinstruments/util/instrumenttimesparser.h b/modules/spacecraftinstruments/util/instrumenttimesparser.h
index 6e8947d12f..225d2d7cec 100644
--- a/modules/spacecraftinstruments/util/instrumenttimesparser.h
+++ b/modules/spacecraftinstruments/util/instrumenttimesparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/labelparser.cpp b/modules/spacecraftinstruments/util/labelparser.cpp
index 27159934e0..f8c2360224 100644
--- a/modules/spacecraftinstruments/util/labelparser.cpp
+++ b/modules/spacecraftinstruments/util/labelparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -43,60 +43,73 @@ namespace {
 namespace openspace {
 
 LabelParser::LabelParser(std::string name, std::string fileName,
-                         const ghoul::Dictionary& translationDictionary)
+                         const ghoul::Dictionary& dictionary)
     : _name(std::move(name))
     , _fileName(std::move(fileName))
 {
     // get the different instrument types
-    const std::vector<std::string>& decoders = translationDictionary.keys();
     // for each decoder (assuming might have more if hong makes changes)
-    for (const std::string& decoderStr : decoders) {
-        ghoul::Dictionary typeDictionary;
-        translationDictionary.getValue(decoderStr, typeDictionary);
+    for (std::string_view decoderStr : dictionary.keys()) {
+        if (!dictionary.hasValue<ghoul::Dictionary>(decoderStr)) {
+            continue;
+        }
 
-        //create dictionary containing all {playbookKeys , spice IDs}
+        ghoul::Dictionary typeDict = dictionary.value<ghoul::Dictionary>(decoderStr);
+
+        // create dictionary containing all {playbookKeys , spice IDs}
         if (decoderStr == "Instrument") {
             // for each playbook call -> create a Decoder object
-            const std::vector<std::string>& keys = typeDictionary.keys();
-            for (const std::string& key : keys) {
-                std::string currentKey = decoderStr + "." + key;
+            for (std::string_view key : typeDict.keys()) {
+                std::string currentKey = fmt::format("{}.{}", decoderStr, key);
 
-                ghoul::Dictionary decoderDictionary =
-                    translationDictionary.value<ghoul::Dictionary>(currentKey);
+                if (!dictionary.hasValue<ghoul::Dictionary>(currentKey)) {
+                    continue;
+                }
+                ghoul::Dictionary decoderDict =
+                    dictionary.value<ghoul::Dictionary>(currentKey);
 
                 std::unique_ptr<Decoder> decoder = Decoder::createFromDictionary(
-                    decoderDictionary,
-                    decoderStr
+                    decoderDict,
+                    std::string(decoderStr)
                 );
                 // insert decoder to map - this will be used in the parser to determine
                 // behavioral characteristics of each instrument
-                _fileTranslation[key] = std::move(decoder);
+                _fileTranslation[std::string(key)] = std::move(decoder);
             }
         }
         if (decoderStr == "Target") {
-            ghoul::Dictionary specsOfInterestDictionary;
-            typeDictionary.getValue(keySpecs, specsOfInterestDictionary);
-
-            _specsOfInterest.resize(specsOfInterestDictionary.size());
-            for (size_t n = 0; n < _specsOfInterest.size(); ++n) {
-                std::string readMe;
-                specsOfInterestDictionary.getValue(std::to_string(n + 1), readMe);
-                _specsOfInterest[n] = readMe;
+            if (!typeDict.hasValue<ghoul::Dictionary>(keySpecs) ||
+                !typeDict.hasValue<ghoul::Dictionary>(keySpecs))
+            {
+                continue;
             }
-            ghoul::Dictionary convertDictionary;
-            typeDictionary.getValue(keyConvert, convertDictionary);
 
-            const std::vector<std::string>& keys = convertDictionary.keys();
-            for (const std::string& key : keys) {
-                ghoul::Dictionary itemDictionary;
-                convertDictionary.getValue(key, itemDictionary);
+            ghoul::Dictionary specsOfInterestDict =
+                typeDict.value<ghoul::Dictionary>(keySpecs);
+
+            _specsOfInterest.resize(specsOfInterestDict.size());
+            for (size_t n = 0; n < _specsOfInterest.size(); ++n) {
+                std::string key = std::to_string(n + 1);
+                if (specsOfInterestDict.hasValue<std::string>(key)) {
+                    std::string readMe = specsOfInterestDict.value<std::string>(key);
+                    _specsOfInterest[n] = readMe;
+                }
+            }
+            ghoul::Dictionary convertDict = typeDict.value<ghoul::Dictionary>(keyConvert);
+
+            for (std::string_view key : convertDict.keys()) {
+                if (!convertDict.hasValue<ghoul::Dictionary>(key)) {
+                    continue;
+                }
+
+                ghoul::Dictionary itemDict = convertDict.value<ghoul::Dictionary>(key);
                 std::unique_ptr<Decoder> decoder = Decoder::createFromDictionary(
-                    itemDictionary,
-                    decoderStr
+                    itemDict,
+                    std::string(decoderStr)
                 );
                 // insert decoder to map - this will be used in the parser to determine
                 // behavioral characteristics of each instrument
-                _fileTranslation[key] = std::move(decoder);
+                _fileTranslation[std::string(key)] = std::move(decoder);
             };
         }
     }
diff --git a/modules/spacecraftinstruments/util/labelparser.h b/modules/spacecraftinstruments/util/labelparser.h
index d7f5496c13..4e9667f2e8 100644
--- a/modules/spacecraftinstruments/util/labelparser.h
+++ b/modules/spacecraftinstruments/util/labelparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.cpp b/modules/spacecraftinstruments/util/projectioncomponent.cpp
index 847a45523c..83ef37f558 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.cpp
+++ b/modules/spacecraftinstruments/util/projectioncomponent.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -42,36 +42,12 @@
 #include <ghoul/opengl/textureunit.h>
 #include <ghoul/opengl/texture.h>
 #include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
+#include <optional>
+#include <variant>
 
 namespace {
-    constexpr const char* keyPotentialTargets = "PotentialTargets";
-
-    constexpr const char* keyInstrument = "Instrument.Name";
-    constexpr const char* keyInstrumentFovy = "Instrument.Fovy";
-    constexpr const char* keyInstrumentAspect = "Instrument.Aspect";
-
     constexpr const char* keyTranslation = "DataInputTranslation";
     constexpr const char* keyTimesTranslation = "TimesDataInputTranslation";
-
-    constexpr const char* keyProjObserver = "Observer";
-    constexpr const char* keyProjTarget = "Target";
-    constexpr const char* keyProjAberration = "Aberration";
-
-    constexpr const char* keySequenceDir = "Sequence";
-    constexpr const char* keyTimesSequenceDir = "TimesSequence";
-    constexpr const char* keySequenceType = "SequenceType";
-
-    constexpr const char* keyNeedsTextureMapDilation = "TextureMap";
-    constexpr const char* keyNeedsShadowing = "ShadowMap";
-    constexpr const char* keyTextureMapAspectRatio = "AspectRatio";
-
-    constexpr const char* sequenceTypeImage = "image-sequence";
-    constexpr const char* sequenceTypePlaybook = "playbook";
-    constexpr const char* sequenceTypeHybrid = "hybrid";
-    constexpr const char* sequenceTypeInstrumentTimes = "instrument-times";
-    constexpr const char* sequenceTypeImageAndInstrumentTimes =
-        "image-and-instrument-times";
-
     constexpr const char* placeholderFile = "${DATA}/placeholder.png";
 
     constexpr const char* _loggerCat = "ProjectionComponent";
@@ -113,115 +89,84 @@ namespace {
         "Triggering this property applies a new size to the underlying projection "
         "texture. The old texture is resized and interpolated to fit the new size."
     };
+
+    struct [[codegen::Dictionary(ProjectionComponent)]] Parameters {
+        // This value specifies one or more directories from which images are being used
+        // for image projections. If the sequence type is set to 'playbook', this value is
+        // ignored
+        std::optional<std::variant<std::string, std::vector<std::string>>> sequence;
+
+        struct Instrument {
+            // The instrument that is used to perform the projections
+            std::string name [[codegen::annotation("A SPICE name of an instrument")]];
+
+            // The field of view in degrees along the y axis
+            float fovy;
+
+            // The aspect ratio of the instrument in relation between x and y axis
+            float aspect;
+        };
+        Instrument instrument;
+
+        enum class Type {
+            ImageSequence [[codegen::key("image-sequence")]],
+            Playbook [[codegen::key("playbook")]],
+            Hybrid [[codegen::key("hybrid")]],
+            InstrumentTimes [[codegen::key("instrument-times")]],
+            ImageAndInstrumentTimes [[codegen::key("image-and-instrument-times")]]
+        };
+        // This value determines which type of sequencer is used for generating image 
+        // schedules. The 'playbook' is using a custom format designed by the New Horizons 
+        // team, the 'image-sequence' uses lbl files from a directory, and the 'hybrid'
+        // uses both methods
+        std::optional<Type> sequenceType;
+
+        std::optional<std::string> eventFile;
+
+        // The observer that is doing the projection. This has to be a valid SPICE name
+        // or SPICE integer
+        std::string observer
+            [[codegen::annotation("A SPICE name of the observing object")]];
+
+        std::optional<std::string> timesSequence;
+
+        // The observed object that is projected on. This has to be a valid SPICE name or
+        // SPICE integer
+        std::string target [[codegen::annotation("A SPICE name of the observed object")]];
+
+        // The aberration correction that is supposed to be used for the projection. The 
+        // values for the correction correspond to the SPICE definition as described in
+        // ftp://naif.jpl.nasa.gov/pub/naif/toolkit_docs/IDL/cspice/spkezr_c.html
+        std::string aberration [[codegen::inlist("NONE", "LT", "LT+S", "CN", "CN+S",
+            "XLT", "XLT+S", "XCN", "XCN+S")]];
+
+        // The list of potential targets that are involved with the image projection
+        std::optional<std::vector<std::string>> potentialTargets;
+
+        // Determines whether the object requires a self-shadowing algorithm. This is 
+        // necessary if the object is concave and might cast a shadow on itself during 
+        // presentation. The default value is 'false'
+        std::optional<bool> textureMap;
+
+        // Determines whether the object requires a self-shadowing algorithm. This is 
+        // necessary if the object is concave and might cast a shadow on itself during 
+        // presentation. The default value is 'false'
+        std::optional<bool> shadowMap;
+
+        // Sets the desired aspect ratio of the projected texture. This might be necessary 
+        // 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;
+    };
+#include "projectioncomponent_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation ProjectionComponent::Documentation() {
-    using namespace documentation;
-    return {
-        "Projection Component",
-        "newhorizons_projectioncomponent",
-        {
-            {
-                keySequenceDir,
-                new OrVerifier({ new StringVerifier, new StringListVerifier }),
-                Optional::Yes,
-                "This value specifies one or more directories from which images are "
-                "being used for image projections. If the sequence type is set to "
-                "'playbook', this value is ignored"
-            },
-            {
-                keyInstrument,
-                new StringAnnotationVerifier("A SPICE name of an instrument"),
-                Optional::No,
-                "The instrument that is used to perform the projections"
-            },
-            {
-                keyInstrumentFovy,
-                new DoubleVerifier,
-                Optional::No,
-                "The field of view in degrees along the y axis"
-            },
-            {
-                keyInstrumentAspect,
-                new DoubleVerifier,
-                Optional::No,
-                "The aspect ratio of the instrument in relation between x and y axis"
-            },
-            {
-                keySequenceType,
-                new StringInListVerifier(
-                    { sequenceTypeImage, sequenceTypePlaybook, sequenceTypeHybrid,
-                      sequenceTypeInstrumentTimes, sequenceTypeImageAndInstrumentTimes }
-                ),
-                Optional::Yes,
-                "This value determines which type of sequencer is used for generating "
-                "image schedules. The 'playbook' is using a custom format designed by "
-                "the New Horizons team, the 'image-sequence' uses lbl files from a "
-                "directory, and the 'hybrid' uses both methods."
-            },
-            {
-                keyProjObserver,
-                new StringAnnotationVerifier("A SPICE name of the observing object"),
-                Optional::No,
-                "The observer that is doing the projection. This has to be a valid SPICE "
-                "name or SPICE integer."
-            },
-            {
-                keyProjTarget,
-                new StringAnnotationVerifier("A SPICE name of the observed object"),
-                Optional::No,
-                "The observed object that is projected on. This has to be a valid SPICE "
-                "name or SPICE integer."
-            },
-            {
-                keyProjAberration,
-                new StringInListVerifier({
-                    // from SpiceManager::AberrationCorrection::AberrationCorrection
-                    "NONE", "LT", "LT+S", "CN", "CN+S", "XLT", "XLT+S", "XCN", "XCN+S"
-                }),
-                Optional::No,
-                "The aberration correction that is supposed to be used for the "
-                "projection. The values for the correction correspond to the SPICE "
-                "definition as described in "
-                "ftp://naif.jpl.nasa.gov/pub/naif/toolkit_docs/IDL/cspice/spkezr_c.html"
-            },
-            {
-                keyPotentialTargets,
-                new StringListVerifier,
-                Optional::Yes,
-                "The list of potential targets that are involved with the image "
-                "projection"
-            },
-            {
-                keyNeedsTextureMapDilation,
-                new BoolVerifier,
-                Optional::Yes,
-                "Determines whether a dilation step of the texture map has to be "
-                "performed after each projection. This is necessary if the texture of "
-                "the projected object is a texture map where the borders are not "
-                "touching. The default value is 'false'."
-            },
-            {
-                keyNeedsShadowing,
-                new BoolVerifier,
-                Optional::Yes,
-                "Determines whether the object requires a self-shadowing algorithm. This "
-                "is necessary if the object is concave and might cast a shadow on itself "
-                "during presentation. The default value is 'false'."
-            },
-            {
-                keyTextureMapAspectRatio,
-                new DoubleVerifier,
-                Optional::Yes,
-                "Sets the desired aspect ratio of the projected texture. This might be "
-                "necessary 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'."
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "newhorizons_projectioncomponent";
+    return doc;
 }
 
 ProjectionComponent::ProjectionComponent()
@@ -244,157 +189,143 @@ ProjectionComponent::ProjectionComponent()
 void ProjectionComponent::initialize(const std::string& identifier,
                                      const ghoul::Dictionary& dictionary)
 {
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "ProjectionComponent"
-    );
-    _instrumentID = dictionary.value<std::string>(keyInstrument);
-    _projectorID = dictionary.value<std::string>(keyProjObserver);
-    _projecteeID = dictionary.value<std::string>(keyProjTarget);
-    _fovy = static_cast<float>(dictionary.value<double>(keyInstrumentFovy));
-    _aspectRatio = static_cast<float>(dictionary.value<double>(keyInstrumentAspect));
+    const Parameters p = codegen::bake<Parameters>(dictionary);
 
-    _aberration = SpiceManager::AberrationCorrection(
-        dictionary.value<std::string>(keyProjAberration)
-    );
+    _instrumentID = p.instrument.name;
+    _projectorID = p.observer;
+    _projecteeID = p.target;
+    _fovy = p.instrument.fovy;
+    _aspectRatio = p.instrument.aspect;
 
-    if (dictionary.hasKeyAndValue<ghoul::Dictionary>(keyPotentialTargets)) {
-        const ghoul::Dictionary& potentialTargets = dictionary.value<ghoul::Dictionary>(
-            keyPotentialTargets
-        );
+    _aberration = SpiceManager::AberrationCorrection(p.aberration);
 
-        _potentialTargets.reserve(potentialTargets.size());
-        for (size_t i = 1; i <= potentialTargets.size(); ++i) {
-            _potentialTargets.emplace_back(
-                potentialTargets.value<std::string>(std::to_string(i))
-            );
-        }
-    }
-
-    if (dictionary.hasKeyAndValue<bool>(keyNeedsTextureMapDilation)) {
-        _dilation.isEnabled = dictionary.value<bool>(keyNeedsTextureMapDilation);
-    }
-
-    if (dictionary.hasKeyAndValue<bool>(keyNeedsShadowing)) {
-        _shadowing.isEnabled = dictionary.value<bool>(keyNeedsShadowing);
-    }
-
-    if (dictionary.hasKeyAndValue<double>(keyTextureMapAspectRatio)) {
-        _projectionTextureAspectRatio =
-            static_cast<float>(dictionary.value<double>(keyTextureMapAspectRatio));
-    }
+    _potentialTargets = p.potentialTargets.value_or(_potentialTargets);
+    _dilation.isEnabled = p.textureMap.value_or(_dilation.isEnabled);
+    _shadowing.isEnabled = p.shadowMap.value_or(_shadowing.isEnabled);
+    _projectionTextureAspectRatio = p.aspectRatio.value_or(_projectionTextureAspectRatio);
 
 
-    if (!dictionary.hasKey(keySequenceDir)) {
+    if (!p.sequence.has_value()) {
+        // we are done here, the rest only applies if we do have a sequence
         return;
     }
 
+    std::variant<std::string, std::vector<std::string>> sequence = *p.sequence;
+
     std::vector<std::string> sequenceSources;
-    // Due to the documentation check above it must either be one or the other
-    if (dictionary.hasValue<std::string>(keySequenceDir)) {
-        sequenceSources.push_back(absPath(dictionary.value<std::string>(keySequenceDir)));
+    if (std::holds_alternative<std::string>(sequence)) {
+        sequenceSources.push_back(absPath(std::get<std::string>(sequence)));
     }
     else {
-        ghoul::Dictionary sourcesDict = dictionary.value<ghoul::Dictionary>(
-            keySequenceDir
+        ghoul_assert(
+            std::holds_alternative<std::vector<std::string>>(sequence),
+            "Something is wrong with the generated documentation"
         );
-        for (int i = 1; i <= static_cast<int>(sourcesDict.size()); ++i) {
-            sequenceSources.push_back(
-                absPath(sourcesDict.value<std::string>(std::to_string(i)))
-            );
+        sequenceSources = std::get<std::vector<std::string>>(sequence);
+        for (std::string& s : sequenceSources) {
+            s = absPath(s);
         }
     }
 
-    const std::string& sequenceType = dictionary.value<std::string>(keySequenceType);
-    //Important: client must define translation-list in mod file IFF playbook
-    if (!dictionary.hasKey(keyTranslation)) {
+
+    if (!p.sequenceType.has_value()) {
+        throw ghoul::RuntimeError("Missing SequenceType");
+    }
+
+    ghoul::Dictionary translationDictionary;
+    if (dictionary.hasValue<ghoul::Dictionary>(keyTranslation)) {
+        translationDictionary = dictionary.value<ghoul::Dictionary>(keyTranslation);
+    }
+    else {
         LWARNING("No playbook translation provided, spice calls must match playbook!");
         return;
     }
 
-    ghoul::Dictionary translationDictionary;
-    dictionary.getValue(keyTranslation, translationDictionary);
-
     std::vector<std::unique_ptr<SequenceParser>> parsers;
     for (std::string& sequenceSource : sequenceSources) {
-        if (sequenceType == sequenceTypePlaybook) {
-            parsers.push_back(
-                std::make_unique<HongKangParser>(
-                    identifier,
-                    std::move(sequenceSource),
-                    _projectorID,
-                    translationDictionary,
-                    _potentialTargets
-                )
-            );
-        }
-        else if (sequenceType == sequenceTypeImage) {
-            parsers.push_back(
-                std::make_unique<LabelParser>(
-                    identifier,
-                    std::move(sequenceSource),
-                    translationDictionary
-                )
-            );
-        }
-        else if (sequenceType == sequenceTypeHybrid) {
-            //first read labels
-            parsers.push_back(
-                std::make_unique<LabelParser>(
-                    identifier,
-                    std::move(sequenceSource),
-                    translationDictionary
-                )
-            );
-
-            if (dictionary.hasKey("EventFile")) {
-                std::string eventFile = dictionary.value<std::string>("EventFile");
+        switch (*p.sequenceType) {
+            case Parameters::Type::Playbook:
                 parsers.push_back(
                     std::make_unique<HongKangParser>(
                         identifier,
-                        absPath(eventFile),
+                        std::move(sequenceSource),
                         _projectorID,
                         translationDictionary,
                         _potentialTargets
                     )
                 );
-            }
-            else {
-                LWARNING("No eventfile has been provided, please check modfiles");
-            }
-        }
-        else if (sequenceType == sequenceTypeInstrumentTimes) {
-            parsers.push_back(
-                std::make_unique<InstrumentTimesParser>(
-                    identifier,
-                    std::move(sequenceSource),
-                    translationDictionary
-                )
-            );
-        }
-        else if (sequenceType == sequenceTypeImageAndInstrumentTimes) {
-            parsers.push_back(
-                std::make_unique<LabelParser>(
-                    identifier,
-                    std::move(sequenceSource),
-                    translationDictionary
+                break;
+            case Parameters::Type::ImageSequence:
+                parsers.push_back(
+                    std::make_unique<LabelParser>(
+                        identifier,
+                        std::move(sequenceSource),
+                        translationDictionary
                     )
-            );
-
-            std::string timesSequenceSource = absPath(
-                dictionary.value<std::string>(keyTimesSequenceDir)
-            );
-            ghoul::Dictionary timesTranslationDictionary;
-            dictionary.getValue(keyTimesTranslation, timesTranslationDictionary);
-
-            parsers.push_back(
-                std::make_unique<InstrumentTimesParser>(
-                    identifier,
-                    std::move(timesSequenceSource),
-                    timesTranslationDictionary
+                );
+                break;
+            case Parameters::Type::Hybrid:
+                // first read labels
+                parsers.push_back(
+                    std::make_unique<LabelParser>(
+                        identifier,
+                        std::move(sequenceSource),
+                        translationDictionary
                     )
-            );
+                );
+
+                if (p.eventFile.has_value()) {
+                    parsers.push_back(
+                        std::make_unique<HongKangParser>(
+                            identifier,
+                            absPath(*p.eventFile),
+                            _projectorID,
+                            translationDictionary,
+                            _potentialTargets
+                        )
+                    );
+                }
+                else {
+                    LWARNING("No eventfile has been provided, please check modfiles");
+                }
+                break;
+            case Parameters::Type::InstrumentTimes:
+                parsers.push_back(
+                    std::make_unique<InstrumentTimesParser>(
+                        identifier,
+                        std::move(sequenceSource),
+                        translationDictionary
+                    )
+                );
+                break;
+            case Parameters::Type::ImageAndInstrumentTimes:
+            {
+                parsers.push_back(
+                    std::make_unique<LabelParser>(
+                        identifier,
+                        std::move(sequenceSource),
+                        translationDictionary
+                    )
+                );
+
+                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);
+                }
+
+                parsers.push_back(
+                    std::make_unique<InstrumentTimesParser>(
+                        identifier,
+                        absPath(*p.timesSequence),
+                        timesTranslationDictionary
+                    )
+                );
+                break;
+            }
         }
     }
 
@@ -1021,7 +952,7 @@ std::shared_ptr<ghoul::opengl::Texture> ProjectionComponent::loadProjectionTextu
         );
         texture->setFilter(Texture::FilterMode::LinearMipMap);
     }
-    return std::move(texture);
+    return texture;
 }
 
 bool ProjectionComponent::generateProjectionLayerTexture(const glm::ivec2& size) {
diff --git a/modules/spacecraftinstruments/util/projectioncomponent.h b/modules/spacecraftinstruments/util/projectioncomponent.h
index 931b47d07b..322b9eaf5b 100644
--- a/modules/spacecraftinstruments/util/projectioncomponent.h
+++ b/modules/spacecraftinstruments/util/projectioncomponent.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.cpp b/modules/spacecraftinstruments/util/scannerdecoder.cpp
index cfeb7d993a..c7ccf2bc50 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.cpp
+++ b/modules/spacecraftinstruments/util/scannerdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/scannerdecoder.h b/modules/spacecraftinstruments/util/scannerdecoder.h
index 4efba03bd3..75b0f2e663 100644
--- a/modules/spacecraftinstruments/util/scannerdecoder.h
+++ b/modules/spacecraftinstruments/util/scannerdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/sequenceparser.cpp b/modules/spacecraftinstruments/util/sequenceparser.cpp
index ad41246ff5..59ebc56128 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.cpp
+++ b/modules/spacecraftinstruments/util/sequenceparser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/sequenceparser.h b/modules/spacecraftinstruments/util/sequenceparser.h
index ffda80131b..d90005da5a 100644
--- a/modules/spacecraftinstruments/util/sequenceparser.h
+++ b/modules/spacecraftinstruments/util/sequenceparser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spacecraftinstruments/util/targetdecoder.cpp b/modules/spacecraftinstruments/util/targetdecoder.cpp
index 6787d2f75d..4f69884f77 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.cpp
+++ b/modules/spacecraftinstruments/util/targetdecoder.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,9 +31,11 @@ namespace openspace {
 TargetDecoder::TargetDecoder(const ghoul::Dictionary& dictionary) : _type("TARGET") {
     _names.resize(dictionary.size());
     for (size_t i = 0; i < _names.size(); ++i) {
-        std::string readMe;
-        dictionary.getValue(std::to_string(i + 1), readMe);
-        _names[i] = readMe;
+        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;
+        }
     }
 }
 
diff --git a/modules/spacecraftinstruments/util/targetdecoder.h b/modules/spacecraftinstruments/util/targetdecoder.h
index 477cd8bcce..e26f9ebb7c 100644
--- a/modules/spacecraftinstruments/util/targetdecoder.h
+++ b/modules/spacecraftinstruments/util/targetdecoder.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spout/CMakeLists.txt b/modules/spout/CMakeLists.txt
index 9cc9bd8a01..bddbfaabc1 100644
--- a/modules/spout/CMakeLists.txt
+++ b/modules/spout/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,15 +25,15 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/renderableplanespout.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/screenspacespout.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/spoutlibrary.h
+  renderableplanespout.h
+  screenspacespout.h
+  spoutlibrary.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/renderableplanespout.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/screenspacespout.cpp
+  renderableplanespout.cpp
+  screenspacespout.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
@@ -46,7 +46,7 @@ create_new_module(
   ${HEADER_FILES} ${SOURCE_FILES}
 )
 
-target_include_directories(openspace-module-spout SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout)
+target_include_directories(openspace-module-spout SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout)
 target_link_libraries(openspace-module-spout PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.lib)
 register_external_libraries("${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.dll")
 
diff --git a/modules/spout/include.cmake b/modules/spout/include.cmake
index 2a359fe308..e52c831cc2 100644
--- a/modules/spout/include.cmake
+++ b/modules/spout/include.cmake
@@ -1,7 +1,3 @@
-set (OPENSPACE_DEPENDENCIES
-  base
-)
-
 if (WIN32)
   set(DEFAULT_MODULE ON)
 endif ()
diff --git a/modules/spout/renderableplanespout.cpp b/modules/spout/renderableplanespout.cpp
index 68a3a81a1c..12e539409f 100644
--- a/modules/spout/renderableplanespout.cpp
+++ b/modules/spout/renderableplanespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spout/renderableplanespout.h b/modules/spout/renderableplanespout.h
index 99e0bd639c..d91887fe81 100644
--- a/modules/spout/renderableplanespout.h
+++ b/modules/spout/renderableplanespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spout/screenspacespout.cpp b/modules/spout/screenspacespout.cpp
index db1cec61b1..b47d28dff3 100644
--- a/modules/spout/screenspacespout.cpp
+++ b/modules/spout/screenspacespout.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -94,7 +94,7 @@ ScreenSpaceSpout::ScreenSpaceSpout(const ghoul::Dictionary& dictionary)
     );
 
     std::string identifier;
-    if (dictionary.hasKeyAndValue<std::string>(KeyIdentifier)) {
+    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
         identifier = dictionary.value<std::string>(KeyIdentifier);
     }
     else {
diff --git a/modules/spout/screenspacespout.h b/modules/spout/screenspacespout.h
index 0cfa61ec3c..91d4593a08 100644
--- a/modules/spout/screenspacespout.h
+++ b/modules/spout/screenspacespout.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spout/spoutlibrary.h b/modules/spout/spoutlibrary.h
index bb3bbaac84..fedb0d5e68 100644
--- a/modules/spout/spoutlibrary.h
+++ b/modules/spout/spoutlibrary.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spout/spoutmodule.cpp b/modules/spout/spoutmodule.cpp
index 01cb0800be..8d9d417548 100644
--- a/modules/spout/spoutmodule.cpp
+++ b/modules/spout/spoutmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/spout/spoutmodule.h b/modules/spout/spoutmodule.h
index 08fae170a0..3a5ba8ea80 100644
--- a/modules/spout/spoutmodule.h
+++ b/modules/spout/spoutmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/sync/CMakeLists.txt b/modules/sync/CMakeLists.txt
index 97a6716b7e..2870e014cb 100644
--- a/modules/sync/CMakeLists.txt
+++ b/modules/sync/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,18 +25,18 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/syncmodule.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/syncs/httpsynchronization.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/syncs/urlsynchronization.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/syncassettask.h
+  syncmodule.h
+  syncs/httpsynchronization.h
+  syncs/urlsynchronization.h
+  tasks/syncassettask.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/syncmodule.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/syncs/httpsynchronization.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/syncs/urlsynchronization.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/syncassettask.cpp
+  syncmodule.cpp
+  syncs/httpsynchronization.cpp
+  syncs/urlsynchronization.cpp
+  tasks/syncassettask.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/sync/syncmodule.cpp b/modules/sync/syncmodule.cpp
index 1d36c420c2..d3339de8c7 100644
--- a/modules/sync/syncmodule.cpp
+++ b/modules/sync/syncmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -56,7 +56,7 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
             KeyHttpSynchronizationRepositories
         );
 
-        for (const std::string& key : dictionary.keys()) {
+        for (std::string_view key : dictionary.keys()) {
             _synchronizationRepositories.push_back(dictionary.value<std::string>(key));
         }
     }
diff --git a/modules/sync/syncmodule.h b/modules/sync/syncmodule.h
index 5e24d4cdfc..03c7956eaf 100644
--- a/modules/sync/syncmodule.h
+++ b/modules/sync/syncmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index 030c168c04..9a01580bd2 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/sync/syncs/httpsynchronization.h b/modules/sync/syncs/httpsynchronization.h
index db768761a0..7f686818e1 100644
--- a/modules/sync/syncs/httpsynchronization.h
+++ b/modules/sync/syncs/httpsynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index d7b3e61348..a8b7ee98fb 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -162,7 +162,7 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict,
         }
     }
 
-    if (dict.hasKeyAndValue<bool>(KeyOverride)) {
+    if (dict.hasValue<bool>(KeyOverride)) {
         _forceOverride = dict.value<bool>(KeyOverride);
     }
 }
diff --git a/modules/sync/syncs/urlsynchronization.h b/modules/sync/syncs/urlsynchronization.h
index d0e6047737..1f658b3362 100644
--- a/modules/sync/syncs/urlsynchronization.h
+++ b/modules/sync/syncs/urlsynchronization.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/sync/tasks/syncassettask.cpp b/modules/sync/tasks/syncassettask.cpp
index 5b69d7df55..b670301dff 100644
--- a/modules/sync/tasks/syncassettask.cpp
+++ b/modules/sync/tasks/syncassettask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -45,7 +45,6 @@
 
 namespace {
     constexpr const char* KeyAsset = "Asset";
-    constexpr const char* _loggerCat = "SyncAssetTask";
     constexpr std::chrono::milliseconds ProgressPollInterval(200);
 } // namespace
 
@@ -57,12 +56,6 @@ documentation::Documentation SyncAssetTask::documentation() {
         "SyncAssetTask",
         "sync_asset_task",
         {
-            {
-                "Type",
-                new StringEqualVerifier("SyncAssetTask"),
-                Optional::No,
-                "The type of this task"
-            },
             {
                 KeyAsset,
                 new StringAnnotationVerifier("A file path to an asset"),
diff --git a/modules/sync/tasks/syncassettask.h b/modules/sync/tasks/syncassettask.h
index 168bb7006d..5f0cf8f830 100644
--- a/modules/sync/tasks/syncassettask.h
+++ b/modules/sync/tasks/syncassettask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/CMakeLists.txt b/modules/touch/CMakeLists.txt
index 5792eaaecf..cd3df135d8 100644
--- a/modules/touch/CMakeLists.txt
+++ b/modules/touch/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,28 +25,28 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/directinputsolver.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/tuioear.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/touchinteraction.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/touchmarker.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/include/win32_touch.h
+  ext/levmarq.h
+  include/directinputsolver.h
+  include/tuioear.h
+  include/touchinteraction.h
+  include/touchmarker.h
+  include/win32_touch.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/directinputsolver.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/tuioear.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/touchinteraction.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/touchmarker.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/win32_touch.cpp
+  ext/levmarq.cpp
+  src/directinputsolver.cpp
+  src/tuioear.cpp
+  src/touchinteraction.cpp
+  src/touchmarker.cpp
+  src/win32_touch.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
 set(SHADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/marker_fs.glsl
-  ${CMAKE_CURRENT_SOURCE_DIR}/shaders/marker_vs.glsl
+  shaders/marker_fs.glsl
+  shaders/marker_vs.glsl
 )
 source_group("Shader Files" FILES ${SHADER_FILES})
 
@@ -57,6 +57,5 @@ create_new_module(
   ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
 )
 
-include_external_library(${touch_module} PUBLIC libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext)
-
+include_external_library(${touch_module} PRIVATE libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext)
 disable_external_warnings_for_file(${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp)
diff --git a/modules/touch/ext/CMakeLists.txt b/modules/touch/ext/CMakeLists.txt
index 9ce2824de9..d4c0c4ebf3 100644
--- a/modules/touch/ext/CMakeLists.txt
+++ b/modules/touch/ext/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -26,58 +26,58 @@ project(libTUIO11)
 message(STATUS "Generating libTUIO11 project")
 
 set(TUIO_SOURCE 
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/WebSockSender.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/UdpSender.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/UdpReceiver.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioTime.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioServer.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioPoint.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioObject.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioManager.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioDispatcher.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioCursor.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioContainer.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioClient.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TuioBlob.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TcpSender.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/TcpReceiver.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/OscReceiver.cpp 
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/OneEuroFilter.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO/FlashSender.cpp
-    
-    ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/ip/IpEndpointName.cpp
-    
-    ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/osc/OscTypes.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/osc/OscReceivedElements.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/osc/OscPrintReceivedElements.cpp
-    ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/osc/OscOutboundPacketStream.cpp
+  libTUIO11/TUIO/WebSockSender.cpp
+  libTUIO11/TUIO/UdpSender.cpp
+  libTUIO11/TUIO/UdpReceiver.cpp
+  libTUIO11/TUIO/TuioTime.cpp
+  libTUIO11/TUIO/TuioServer.cpp
+  libTUIO11/TUIO/TuioPoint.cpp
+  libTUIO11/TUIO/TuioObject.cpp
+  libTUIO11/TUIO/TuioManager.cpp
+  libTUIO11/TUIO/TuioDispatcher.cpp
+  libTUIO11/TUIO/TuioCursor.cpp
+  libTUIO11/TUIO/TuioContainer.cpp
+  libTUIO11/TUIO/TuioClient.cpp
+  libTUIO11/TUIO/TuioBlob.cpp
+  libTUIO11/TUIO/TcpSender.cpp
+  libTUIO11/TUIO/TcpReceiver.cpp
+  libTUIO11/TUIO/OscReceiver.cpp 
+  libTUIO11/TUIO/OneEuroFilter.cpp
+  libTUIO11/TUIO/FlashSender.cpp
+  
+  libTUIO11/oscpack/ip/IpEndpointName.cpp
+  
+  libTUIO11/oscpack/osc/OscTypes.cpp
+  libTUIO11/oscpack/osc/OscReceivedElements.cpp
+  libTUIO11/oscpack/osc/OscPrintReceivedElements.cpp
+  libTUIO11/oscpack/osc/OscOutboundPacketStream.cpp
 )
 
 if (WIN32)
-    set(TUIO_SOURCE 
-        ${TUIO_SOURCE}
-        ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/ip/win32/NetworkingUtils.cpp
-        ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/ip/win32/UdpSocket.cpp
-    )
+  set(TUIO_SOURCE 
+    ${TUIO_SOURCE}
+    libTUIO11/oscpack/ip/win32/NetworkingUtils.cpp
+    libTUIO11/oscpack/ip/win32/UdpSocket.cpp
+  )
 endif ()
 
 if (UNIX)
-    set(TUIO_SOURCE 
-        ${TUIO_SOURCE}
-        ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/ip/posix/NetworkingUtils.cpp
-        ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack/ip/posix/UdpSocket.cpp
-    )
+  set(TUIO_SOURCE 
+    ${TUIO_SOURCE}
+    libTUIO11/oscpack/ip/posix/NetworkingUtils.cpp
+    libTUIO11/oscpack/ip/posix/UdpSocket.cpp
+  )
 endif ()
 
-add_library(libTUIO11
-    ${TUIO_SOURCE}
+add_library(libTUIO11 ${TUIO_SOURCE})
+target_include_directories(libTUIO11 SYSTEM
+  PUBLIC
+    "${PROJECT_SOURCE_DIR}/libTUIO11/TUIO"
+    "${PROJECT_SOURCE_DIR}/libTUIO11/"
+    "${PROJECT_SOURCE_DIR}/libTUIO11/oscpack"
 )
-target_include_directories(libTUIO11 PUBLIC 
-    ${PROJECT_SOURCE_DIR}/libTUIO11/
-    ${PROJECT_SOURCE_DIR}/libTUIO11/oscpack
-    ${PROJECT_SOURCE_DIR}/libTUIO11/TUIO)
 
 if (WIN32)
-    # Tuio dependencies
-    target_link_libraries(libTUIO11 PRIVATE winmm.lib wininet.lib ws2_32.lib)
+  # Tuio dependencies
+  target_link_libraries(libTUIO11 PRIVATE winmm.lib wininet.lib ws2_32.lib)
 endif ()
diff --git a/modules/touch/include/directinputsolver.h b/modules/touch/include/directinputsolver.h
index c65ca76782..ca02a2e733 100644
--- a/modules/touch/include/directinputsolver.h
+++ b/modules/touch/include/directinputsolver.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/include/touchinteraction.h b/modules/touch/include/touchinteraction.h
index 7ef8e2867d..87ebce7e9e 100644
--- a/modules/touch/include/touchinteraction.h
+++ b/modules/touch/include/touchinteraction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -47,7 +47,7 @@ namespace openspace {
 class Camera;
 class SceneGraphNode;
 
-//Class used for keeping track of the recent average frame time
+// Class used for keeping track of the recent average frame time
 class FrameTimeAverage {
 public:
     //Update the circular buffer with the most recent frame time
@@ -59,7 +59,6 @@ private:
     static const int TotalSamples = 10;
     int _nSamples = 0;
     double _samples[TotalSamples];
-    double _runningTotal = 0.0;
     int _index = 0;
 };
 
@@ -205,7 +204,6 @@ private:
     double _currentRadius = 1.0;
     double _slerpdT = 10001.0;
     double _timeSlack = 0.0;
-    int _numOfTests = 0;
     std::chrono::milliseconds _time;
     bool _directTouchMode = false;
     bool _wasPrevModeDirectTouch = false;
diff --git a/modules/touch/include/touchmarker.h b/modules/touch/include/touchmarker.h
index 26ed9e18bf..a56db73507 100644
--- a/modules/touch/include/touchmarker.h
+++ b/modules/touch/include/touchmarker.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/include/tuioear.h b/modules/touch/include/tuioear.h
index cbbd8bb8dc..4f2d917b10 100644
--- a/modules/touch/include/tuioear.h
+++ b/modules/touch/include/tuioear.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/include/win32_touch.h b/modules/touch/include/win32_touch.h
index 1741febd7d..b66c67ef9b 100644
--- a/modules/touch/include/win32_touch.h
+++ b/modules/touch/include/win32_touch.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/shaders/marker_fs.glsl b/modules/touch/shaders/marker_fs.glsl
index 2425e5323a..6b09a05a8e 100644
--- a/modules/touch/shaders/marker_fs.glsl
+++ b/modules/touch/shaders/marker_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/shaders/marker_vs.glsl b/modules/touch/shaders/marker_vs.glsl
index 5b40a6b65b..b57089428c 100644
--- a/modules/touch/shaders/marker_vs.glsl
+++ b/modules/touch/shaders/marker_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/src/directinputsolver.cpp b/modules/touch/src/directinputsolver.cpp
index 419d08e149..5f19cb5d9f 100644
--- a/modules/touch/src/directinputsolver.cpp
+++ b/modules/touch/src/directinputsolver.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/src/touchinteraction.cpp b/modules/touch/src/touchinteraction.cpp
index 2d0a8b0802..9eededbcbf 100644
--- a/modules/touch/src/touchinteraction.cpp
+++ b/modules/touch/src/touchinteraction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -217,12 +217,6 @@ namespace {
         "" // @TODO Missing documentation
     };
 
-    constexpr openspace::properties::Property::PropertyInfo PickingRadiusInfo = {
-        "PickingRadiusMinimum",
-        "Minimum radius for picking in NDC coordinates",
-        "" // @TODO Missing documentation
-    };
-
     constexpr openspace::properties::Property::PropertyInfo ZoomOutLimitInfo = {
         "ZoomOutLimit",
         "Zoom Out Limit",
@@ -278,13 +272,13 @@ TouchInteraction::TouchInteraction()
         0.25f
     )
     , _zoomBoundarySphereMultiplier(ZoomBoundarySphereMultiplierInfo, 1.001f, 1.f, 1.01f)
+    , _zoomInLimit(ZoomInLimitInfo, -1.0, 0.0, std::numeric_limits<double>::max())
     , _zoomOutLimit(
         ZoomOutLimitInfo,
         std::numeric_limits<double>::max(),
         1000.0,
         std::numeric_limits<double>::max()
     )
-    , _zoomInLimit(ZoomInLimitInfo, -1.0, 0.0, std::numeric_limits<double>::max())
     , _inputStillThreshold(InputSensitivityInfo, 0.0005f, 0.f, 0.001f)
     // used to void wrongly interpreted roll interactions
     , _centroidStillThreshold(StationaryCentroidInfo, 0.0018f, 0.f, 0.01f)
@@ -303,10 +297,10 @@ TouchInteraction::TouchInteraction()
         0.f,
         1.f
     )
+    , _constTimeDecay_secs(ConstantTimeDecaySecsInfo, 1.75f, 0.1f, 4.0f)
     , _pinchInputs({ TouchInput(0, 0, 0.0, 0.0, 0.0), TouchInput(0, 0, 0.0, 0.0, 0.0) })
     , _vel{ glm::dvec2(0.0), 0.0, 0.0, glm::dvec2(0.0) }
     , _sensitivity{ glm::dvec2(0.08, 0.045), 12.0, 2.75, glm::dvec2(0.08, 0.045) }
-    , _constTimeDecay_secs(ConstantTimeDecaySecsInfo, 1.75f, 0.1f, 4.0f)
     // calculated with two vectors with known diff in length, then
     // projDiffLength/diffLength.
 {
@@ -1092,9 +1086,9 @@ void TouchInteraction::step(double dt, bool directTouch) {
             }
             else if (currentPosViolatingZoomOutLimit) {
 #ifdef TOUCH_DEBUG_PROPERTIES
-                LINFO(fmt::format(
+                LINFOC("", fmt::format(
                     "{}: You are outside zoom out {} limit, only zoom in allowed",
-                    _loggerCat, _zoomOutLimit.value());
+                    _loggerCat, _zoomOutLimit.value()));
 #endif
                 // Only allow zooming in if you are outside the zoom out limit
                 if (newPosDistance < currentPosDistance) {
diff --git a/modules/touch/src/touchmarker.cpp b/modules/touch/src/touchmarker.cpp
index 6ff732fb40..3d03816e73 100644
--- a/modules/touch/src/touchmarker.cpp
+++ b/modules/touch/src/touchmarker.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/src/tuioear.cpp b/modules/touch/src/tuioear.cpp
index ac9c91fffe..3fd5ee9413 100644
--- a/modules/touch/src/tuioear.cpp
+++ b/modules/touch/src/tuioear.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/touch/src/win32_touch.cpp b/modules/touch/src/win32_touch.cpp
index 3e1640af86..9586eee088 100644
--- a/modules/touch/src/win32_touch.cpp
+++ b/modules/touch/src/win32_touch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,6 +35,7 @@
 #include <thread>
 #include <tchar.h>
 #include <tpcshrd.h>
+#include <debugapi.h>
 
 // #define ENABLE_TUIOMESSAGES
 #define ENABLE_DIRECTMSG
@@ -230,25 +231,31 @@ Win32TouchHook::Win32TouchHook(void* nativeWindow) {
             GetCurrentThreadId()
         );
 
-        // In theory, if our UI is pumped from a different thread, we can
-        // handle Low-level mouse events in that thread as well.
-        // this might help reduce mouse lag while running OpenSpace?
-        // gMouseHookThread = new std::thread([](){
-        //     gMouseHook = SetWindowsHookExW(
-        //         WH_MOUSE_LL,
-        //         LowLevelMouseProc,
-        //         GetModuleHandleW(NULL),
-        //         0 //<- Global thread id (low-level mouse is global only)
-        //     );
-        //     if (!gMouseHook) {
-        //         LINFO("Could not setup mousehook!");
-        //     }
+        // Attach a lowlevel mouse hook.
+        // This mouse hook prevents injected mouse events (touch-to-mouse),
+        // since we cannot catch it in our messageloop.
+        // Since this is attached to windows global thread, this will block lowlevel mouse
+        // access to all running applications if we stall in this thread.
+        // Debug breakpoints typically freeze our application, in which case we simply
+        // don't create this if a debugger is attached.
+        if (!IsDebuggerPresent()) {
+            gMouseHookThread = new std::thread([](){
+                gMouseHook = SetWindowsHookExW(
+                    WH_MOUSE_LL,
+                    LowLevelMouseProc,
+                    GetModuleHandleW(NULL),
+                    0 //<- Global thread id (low-level mouse is global only)
+                );
+                if (!gMouseHook) {
+                    LINFO("Could not setup mousehook!");
+                }
 
-        //     MSG msg;
-        //     while (GetMessage(&msg, NULL, 0, 0)) {
-        //         DispatchMessage(&msg);
-        //     }
-        // });
+                MSG msg;
+                while (GetMessage(&msg, NULL, 0, 0)) {
+                    DispatchMessage(&msg);
+                }
+            });
+        }
 
         if (!gTouchHook) {
             LINFO(fmt::format("Failed to setup WindowsHook for touch input redirection"));
@@ -271,14 +278,14 @@ Win32TouchHook::~Win32TouchHook() {
     }
 }
 
-// Low-level mouse hook is "needed" if we want to stop mousecursor from moving
-// when we get a touch-input on our window A negative effect is that this
-// function is for global threads, meaning our application will cause Windows to
-// stall the mouse cursor when this function can't be scheduled. This is not yet
-// fail-proof...might be a race-condition on message pumping?
+// Low-level mouse hook is "needed" if we want to stop mousecursor from moving when we get
+// a touch-input on our window.
+// A negative effect is that this function is for global threads, meaning our application
+// will cause Windows to stall the mouse cursor when this  function can't be scheduled
+// (i.e. when debugger hits a breakpoint). This is not yet fail-proof...might be a
+// race-condition on message pumping?
 // - Seems to move the cursor when we get two fingers as input..
-// - If we ourselves would pump windows for events, we can handle this in the
-// pump-loop
+// - If we ourselves would pump windows for events, we can handle this.
 LRESULT CALLBACK LowLevelMouseProc(int nCode, WPARAM wParam, LPARAM lParam) {
     constexpr const LONG_PTR SIGNATURE_MASK = 0xFFFFFF00;
     constexpr const LONG_PTR MOUSEEVENTF_FROMTOUCH = 0xFF515700;
diff --git a/modules/touch/touchmodule.cpp b/modules/touch/touchmodule.cpp
index dc80b46fac..a140127f7d 100644
--- a/modules/touch/touchmodule.cpp
+++ b/modules/touch/touchmodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -191,7 +191,7 @@ TouchModule::~TouchModule() {
 void TouchModule::internalInitialize(const ghoul::Dictionary& /*dictionary*/){
     _ear.reset(new TuioEar());
 
-    global::callback::initializeGL.push_back([&]() {
+    global::callback::initializeGL->push_back([&]() {
         LDEBUGC("TouchModule", "Initializing TouchMarker OpenGL");
         _markers.initialize();
 #ifdef WIN32
@@ -204,33 +204,33 @@ void TouchModule::internalInitialize(const ghoul::Dictionary& /*dictionary*/){
 #endif
     });
 
-    global::callback::deinitializeGL.push_back([&]() {
+    global::callback::deinitializeGL->push_back([&]() {
         LDEBUGC("TouchMarker", "Deinitialize TouchMarker OpenGL");
         _markers.deinitialize();
     });
 
     // These are handled in UI thread, which (as of 20th dec 2019) is in main/rendering
     // thread so we don't need a mutex here
-    global::callback::touchDetected.push_back(
+    global::callback::touchDetected->push_back(
         [this](TouchInput i) {
             addTouchInput(i);
             return true;
         }
     );
 
-    global::callback::touchUpdated.push_back(
+    global::callback::touchUpdated->push_back(
         [this](TouchInput i) {
             updateOrAddTouchInput(i);
             return true;
         }
     );
 
-    global::callback::touchExit.push_back(
+    global::callback::touchExit->push_back(
         std::bind(&TouchModule::removeTouchInput, this, std::placeholders::_1)
     );
 
 
-    global::callback::preSync.push_back([&]() {
+    global::callback::preSync->push_back([&]() {
         _touch.setCamera(global::navigationHandler->camera());
         _touch.setFocusNode(global::navigationHandler->orbitalNavigator().anchorNode());
 
@@ -251,7 +251,7 @@ void TouchModule::internalInitialize(const ghoul::Dictionary& /*dictionary*/){
         clearInputs();
     });
 
-    global::callback::render.push_back([&]() {
+    global::callback::render->push_back([&]() {
         _markers.render(_touchPoints);
     });
 }
diff --git a/modules/touch/touchmodule.h b/modules/touch/touchmodule.h
index 919f888f7a..3a7b5b9b81 100644
--- a/modules/touch/touchmodule.h
+++ b/modules/touch/touchmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/toyvolume/CMakeLists.txt b/modules/toyvolume/CMakeLists.txt
index ad4395b781..60604c8623 100644
--- a/modules/toyvolume/CMakeLists.txt
+++ b/modules/toyvolume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,14 +25,14 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletoyvolume.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/toyvolumeraycaster.h
+  rendering/renderabletoyvolume.h
+  rendering/toyvolumeraycaster.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletoyvolume.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/toyvolumeraycaster.cpp
+  rendering/renderabletoyvolume.cpp
+  rendering/toyvolumeraycaster.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/toyvolume/include.cmake b/modules/toyvolume/include.cmake
index 659b975323..ffea0ac430 100644
--- a/modules/toyvolume/include.cmake
+++ b/modules/toyvolume/include.cmake
@@ -1,5 +1 @@
 set(DEFAULT_MODULE ON)
-
-set (OPENSPACE_DEPENDENCIES
-  space
-)
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.cpp b/modules/toyvolume/rendering/renderabletoyvolume.cpp
index be0ce3d6b4..33c4a446ee 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.cpp
+++ b/modules/toyvolume/rendering/renderabletoyvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -95,47 +95,46 @@ RenderableToyVolume::RenderableToyVolume(const ghoul::Dictionary& dictionary)
     , _color(ColorInfo, glm::vec3(1.f, 0.f, 0.f), glm::vec3(0.f), glm::vec3(1.f))
     , _downScaleVolumeRendering(DownscaleVolumeRenderingInfo, 1.f, 0.1f, 1.f)
 {
-    if (dictionary.hasKeyAndValue<double>(ScalingExponentInfo.identifier)) {
+    if (dictionary.hasValue<double>(ScalingExponentInfo.identifier)) {
         _scalingExponent = static_cast<int>(
             dictionary.value<double>(ScalingExponentInfo.identifier)
         );
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(SizeInfo.identifier)) {
-        _size = dictionary.value<glm::vec3>(SizeInfo.identifier);
+    if (dictionary.hasValue<glm::dvec3>(SizeInfo.identifier)) {
+        _size = dictionary.value<glm::dvec3>(SizeInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(TranslationInfo.identifier)) {
-        _translation = dictionary.value<glm::vec3>(TranslationInfo.identifier);
+    if (dictionary.hasValue<glm::dvec3>(TranslationInfo.identifier)) {
+        _translation = dictionary.value<glm::dvec3>(TranslationInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(RotationInfo.identifier)) {
-        _rotation = dictionary.value<glm::vec3>(RotationInfo.identifier);
+    if (dictionary.hasValue<glm::dvec3>(RotationInfo.identifier)) {
+        _rotation = dictionary.value<glm::dvec3>(RotationInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<glm::vec3>(ColorInfo.identifier)) {
-        _color = dictionary.value<glm::vec3>(ColorInfo.identifier);
+    if (dictionary.hasValue<glm::dvec3>(ColorInfo.identifier)) {
+        _color = dictionary.value<glm::dvec3>(ColorInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<double>(StepSizeInfo.identifier)) {
+    if (dictionary.hasValue<double>(StepSizeInfo.identifier)) {
         _stepSize = static_cast<float>(dictionary.value<double>(StepSizeInfo.identifier));
     }
 
-    _downScaleVolumeRendering.setVisibility(
-        openspace::properties::Property::Visibility::Developer
-    );
+    _downScaleVolumeRendering.setVisibility(properties::Property::Visibility::Developer);
     if (dictionary.hasKey("Downscale")) {
-        _downScaleVolumeRendering = dictionary.value<float>("Downscale");
+        _downScaleVolumeRendering = static_cast<float>(
+            dictionary.value<double>("Downscale")
+        );
     }
 
     if (dictionary.hasKey("Steps")) {
-        _rayCastSteps = static_cast<int>(dictionary.value<float>("Steps"));
+        _rayCastSteps = static_cast<int>(dictionary.value<double>("Steps"));
     }
     else {
         LINFO("Number of raycasting steps not specified for ToyVolume."
             " Using default value.");
     }
-
 }
 
 RenderableToyVolume::~RenderableToyVolume() {}
diff --git a/modules/toyvolume/rendering/renderabletoyvolume.h b/modules/toyvolume/rendering/renderabletoyvolume.h
index d42988639d..1430013c80 100644
--- a/modules/toyvolume/rendering/renderabletoyvolume.h
+++ b/modules/toyvolume/rendering/renderabletoyvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.cpp b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
index 87a6b2c173..6d992e848e 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.cpp
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/toyvolume/rendering/toyvolumeraycaster.h b/modules/toyvolume/rendering/toyvolumeraycaster.h
index b5672c5e60..344ed1e41b 100644
--- a/modules/toyvolume/rendering/toyvolumeraycaster.h
+++ b/modules/toyvolume/rendering/toyvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/toyvolume/shaders/boundsfs.glsl b/modules/toyvolume/shaders/boundsfs.glsl
index 4c6fa0ed17..6905e234e4 100644
--- a/modules/toyvolume/shaders/boundsfs.glsl
+++ b/modules/toyvolume/shaders/boundsfs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 in vec3 modelPosition;
 in vec4 viewPosition;
 
+
 Fragment getFragment() {
     Fragment frag;
     frag.color = vec4(modelPosition + 0.5, 1.0);
diff --git a/modules/toyvolume/shaders/boundsvs.glsl b/modules/toyvolume/shaders/boundsvs.glsl
index 67c3aa488e..7b926aa6ea 100644
--- a/modules/toyvolume/shaders/boundsvs.glsl
+++ b/modules/toyvolume/shaders/boundsvs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/toyvolume/shaders/raycast.glsl b/modules/toyvolume/shaders/raycast.glsl
index b604dd050d..a3e1ca480f 100644
--- a/modules/toyvolume/shaders/raycast.glsl
+++ b/modules/toyvolume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/toyvolume/toyvolumemodule.cpp b/modules/toyvolume/toyvolumemodule.cpp
index 2626a877fe..fdd4922668 100644
--- a/modules/toyvolume/toyvolumemodule.cpp
+++ b/modules/toyvolume/toyvolumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/toyvolume/toyvolumemodule.h b/modules/toyvolume/toyvolumemodule.h
index cfecede06f..53a3ce85ce 100644
--- a/modules/toyvolume/toyvolumemodule.h
+++ b/modules/toyvolume/toyvolumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/vislab/CMakeLists.txt b/modules/vislab/CMakeLists.txt
index 1e75a257b2..6ff1f45991 100644
--- a/modules/vislab/CMakeLists.txt
+++ b/modules/vislab/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,17 +25,13 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledistancelabel.h
+  rendering/renderabledistancelabel.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabledistancelabel.cpp
+  rendering/renderabledistancelabel.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
-create_new_module(
-    "VisLab"
-    vislab_module
-    ${HEADER_FILES} ${SOURCE_FILES}
-)
+create_new_module("VisLab" vislab_module ${HEADER_FILES} ${SOURCE_FILES})
diff --git a/modules/vislab/rendering/renderabledistancelabel.cpp b/modules/vislab/rendering/renderabledistancelabel.cpp
index 4936e7dcc8..397798d431 100644
--- a/modules/vislab/rendering/renderabledistancelabel.cpp
+++ b/modules/vislab/rendering/renderabledistancelabel.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/vislab/rendering/renderabledistancelabel.h b/modules/vislab/rendering/renderabledistancelabel.h
index effb4efe71..6c745c0f62 100644
--- a/modules/vislab/rendering/renderabledistancelabel.h
+++ b/modules/vislab/rendering/renderabledistancelabel.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/vislab/vislabmodule.h b/modules/vislab/vislabmodule.h
index 797fcde9f5..bb393d9691 100644
--- a/modules/vislab/vislabmodule.h
+++ b/modules/vislab/vislabmodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/CMakeLists.txt b/modules/volume/CMakeLists.txt
index 3974d1f95f..a10d450445 100644
--- a/modules/volume/CMakeLists.txt
+++ b/modules/volume/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,51 +25,51 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/envelope.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/lrucache.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/linearlrucache.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletimevaryingvolume.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/basicvolumeraycaster.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/generaterawvolumetask.h
+  envelope.h
+  rawvolume.h
+  rawvolumemetadata.h
+  rawvolumereader.h
+  rawvolumewriter.h
+  textureslicevolumereader.h
+  textureslicevolumereader.inl
+  transferfunction.h
+  transferfunctionhandler.h
+  transferfunctionproperty.h
+  rawvolumemetadata.h
+  lrucache.h
+  lrucache.inl
+  linearlrucache.h
+  linearlrucache.inl
+  volumegridtype.h
+  volumesampler.h
+  volumesampler.inl
+  volumeutils.h
+  rendering/renderabletimevaryingvolume.h
+  rendering/basicvolumeraycaster.h
+  rendering/volumeclipplane.h
+  rendering/volumeclipplanes.h
+  tasks/generaterawvolumetask.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/envelope.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolume.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumemetadata.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumereader.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/rawvolumewriter.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/textureslicevolumereader.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/transferfunction.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionhandler.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/transferfunctionproperty.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/volumesampler.inl
-  ${CMAKE_CURRENT_SOURCE_DIR}/volumegridtype.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/volumeutils.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderabletimevaryingvolume.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/basicvolumeraycaster.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplane.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/volumeclipplanes.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/tasks/generaterawvolumetask.cpp
+  envelope.cpp
+  rawvolume.inl
+  rawvolumemetadata.cpp
+  rawvolumereader.inl
+  rawvolumewriter.inl
+  textureslicevolumereader.inl
+  transferfunction.cpp
+  transferfunctionhandler.cpp
+  transferfunctionproperty.cpp
+  volumesampler.inl
+  volumegridtype.cpp
+  volumeutils.cpp
+  rendering/renderabletimevaryingvolume.cpp
+  rendering/basicvolumeraycaster.cpp
+  rendering/volumeclipplane.cpp
+  rendering/volumeclipplanes.cpp
+  tasks/generaterawvolumetask.cpp
 )
 
 source_group("Source Files" FILES ${SOURCE_FILES})
diff --git a/modules/volume/envelope.cpp b/modules/volume/envelope.cpp
index 21f5cfdad3..6df652f9c4 100644
--- a/modules/volume/envelope.cpp
+++ b/modules/volume/envelope.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -123,7 +123,8 @@ glm::vec4 Envelope::valueAtPosition(float pos) const {
                 beforeIter->color * (std::fabs(pos - afterIter->position.first) / dist) +
                 afterIter->color * (std::fabs(pos - beforeIter->position.first) / dist)
             ),
-            beforeIter->position.second * (std::fabs(pos - afterIter->position.first) / dist) +
+            beforeIter->position.second *
+                (std::fabs(pos - afterIter->position.first) / dist) +
                 afterIter->position.second *
                 (std::fabs(pos - beforeIter->position.first) / dist)
         };
@@ -155,11 +156,9 @@ std::string EnvelopePoint::decimalToHexadecimal(int dec) const {
         return "00";
     }
 
-    int hex = dec;
     std::string hexStr;
-
     while (dec > 0) {
-        hex = dec % 16;
+        int hex = dec % 16;
 
         if (hex < 10) {
             hexStr = hexStr.insert(0, std::string(1, static_cast<char>(hex + 48)));
diff --git a/modules/volume/envelope.h b/modules/volume/envelope.h
index b7f3d07698..5a7864e033 100644
--- a/modules/volume/envelope.h
+++ b/modules/volume/envelope.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/include.cmake b/modules/volume/include.cmake
index 659b975323..ffea0ac430 100644
--- a/modules/volume/include.cmake
+++ b/modules/volume/include.cmake
@@ -1,5 +1 @@
 set(DEFAULT_MODULE ON)
-
-set (OPENSPACE_DEPENDENCIES
-  space
-)
diff --git a/modules/volume/linearlrucache.h b/modules/volume/linearlrucache.h
index d2a8c3553f..5bf086bb89 100644
--- a/modules/volume/linearlrucache.h
+++ b/modules/volume/linearlrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,7 +25,6 @@
 #ifndef __OPENSPACE_MODULE_VOLUME___LINEARLRUCACHE___H__
 #define __OPENSPACE_MODULE_VOLUME___LINEARLRUCACHE___H__
 
-//#include <modules/volume/lrucache.h>
 #include <ghoul/glm.h>
 #include <list>
 #include <iterator>
diff --git a/modules/volume/linearlrucache.inl b/modules/volume/linearlrucache.inl
index 0353fb2044..e65e41f79a 100644
--- a/modules/volume/linearlrucache.inl
+++ b/modules/volume/linearlrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/lrucache.h b/modules/volume/lrucache.h
index 2b20ce46b9..16c5bacbb1 100644
--- a/modules/volume/lrucache.h
+++ b/modules/volume/lrucache.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,13 +31,12 @@
 
 namespace openspace::volume {
 
-template <
+template<
     typename KeyType,
     typename ValueType,
-    template <typename...> class ContainerType
+    template<typename...> class ContainerType
 >
-class LruCache
-{
+class LruCache {
 public:
     LruCache(size_t capacity);
 
diff --git a/modules/volume/lrucache.inl b/modules/volume/lrucache.inl
index 004acc100e..35be7b61d6 100644
--- a/modules/volume/lrucache.inl
+++ b/modules/volume/lrucache.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/rawvolume.h b/modules/volume/rawvolume.h
index 44485f63db..c110399722 100644
--- a/modules/volume/rawvolume.h
+++ b/modules/volume/rawvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,9 +33,9 @@ namespace openspace::volume {
 
 template <typename Type>
 class RawVolume {
+public:
     using VoxelType = Type;
 
-public:
     RawVolume(const glm::uvec3& dimensions);
 
     glm::uvec3 dimensions() const;
diff --git a/modules/volume/rawvolume.inl b/modules/volume/rawvolume.inl
index 5f95eee40f..d91388da07 100644
--- a/modules/volume/rawvolume.inl
+++ b/modules/volume/rawvolume.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -48,11 +48,8 @@ void RawVolume<VoxelType>::setDimensions(const glm::uvec3& dimensions) {
 template<typename VoxelType>
 size_t RawVolume<VoxelType>::nCells() const
 {
-    return static_cast<size_t>(
-        static_cast<size_t>(_dimensions.x) *
-        static_cast<size_t>(_dimensions.y) *
-        static_cast<size_t>(_dimensions.z)
-    );
+    return static_cast<size_t>(_dimensions.x) * static_cast<size_t>(_dimensions.y) *
+        static_cast<size_t>(_dimensions.z);
 }
 
 template <typename VoxelType>
diff --git a/modules/volume/rawvolumemetadata.cpp b/modules/volume/rawvolumemetadata.cpp
index e7886f57ca..9ad143a764 100644
--- a/modules/volume/rawvolumemetadata.cpp
+++ b/modules/volume/rawvolumemetadata.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,8 +25,9 @@
 #include <modules/volume/rawvolumemetadata.h>
 
 #include <openspace/documentation/verifier.h>
-
+#include <openspace/documentation/documentation.h>
 #include <openspace/util/time.h>
+#include <ghoul/misc/dictionary.h>
 
 namespace {
     constexpr const char* KeyDimensions = "Dimensions";
@@ -55,28 +56,30 @@ RawVolumeMetadata RawVolumeMetadata::createFromDictionary(
     );
 
     RawVolumeMetadata metadata;
-    metadata.dimensions = dictionary.value<glm::vec3>(KeyDimensions);
+    metadata.dimensions = dictionary.value<glm::dvec3>(KeyDimensions);
 
-    metadata.hasDomainBounds = dictionary.hasValue<glm::vec3>(KeyLowerDomainBound) &&
-            dictionary.hasValue<glm::vec3>(KeyUpperDomainBound);
+    metadata.hasDomainBounds = dictionary.hasValue<glm::dvec3>(KeyLowerDomainBound) &&
+            dictionary.hasValue<glm::dvec3>(KeyUpperDomainBound);
 
     if (metadata.hasDomainBounds) {
-        metadata.lowerDomainBound = dictionary.value<glm::vec3>(KeyLowerDomainBound);
-        metadata.upperDomainBound = dictionary.value<glm::vec3>(KeyUpperDomainBound);
+        metadata.lowerDomainBound = dictionary.value<glm::dvec3>(KeyLowerDomainBound);
+        metadata.upperDomainBound = dictionary.value<glm::dvec3>(KeyUpperDomainBound);
     }
-    metadata.hasDomainUnit = dictionary.hasValue<float>(KeyDomainUnit);
+    metadata.hasDomainUnit = static_cast<float>(
+        dictionary.hasValue<double>(KeyDomainUnit)
+    );
     if (metadata.hasDomainUnit) {
         metadata.domainUnit = dictionary.value<std::string>(KeyDomainUnit);
     }
 
-    metadata.hasValueRange = dictionary.hasValue<float>(KeyMinValue) &&
-        dictionary.hasValue<float>(KeyMaxValue);
+    metadata.hasValueRange = dictionary.hasValue<double>(KeyMinValue) &&
+        dictionary.hasValue<double>(KeyMaxValue);
 
     if (metadata.hasValueRange) {
-        metadata.minValue = dictionary.value<float>(KeyMinValue);
-        metadata.maxValue = dictionary.value<float>(KeyMaxValue);
+        metadata.minValue = static_cast<float>(dictionary.value<double>(KeyMinValue));
+        metadata.maxValue = static_cast<float>(dictionary.value<double>(KeyMaxValue));
     }
-    metadata.hasValueUnit = dictionary.hasValue<float>(KeyValueUnit);
+    metadata.hasValueUnit = static_cast<float>(dictionary.hasValue<double>(KeyValueUnit));
     if (metadata.hasValueUnit) {
         metadata.valueUnit = dictionary.value<std::string>(KeyValueUnit);
     }
@@ -92,23 +95,23 @@ RawVolumeMetadata RawVolumeMetadata::createFromDictionary(
 
 ghoul::Dictionary RawVolumeMetadata::dictionary() {
     ghoul::Dictionary dict;
-    dict.setValue<glm::vec3>(KeyDimensions, dimensions);
-    dict.setValue<std::string>(KeyGridType, gridTypeToString(gridType));
+    dict.setValue(KeyDimensions, glm::dvec3(dimensions));
+    dict.setValue(KeyGridType, gridTypeToString(gridType));
 
     if (hasDomainUnit) {
-        dict.setValue<std::string>(KeyDomainUnit, domainUnit);
+        dict.setValue(KeyDomainUnit, domainUnit);
     }
     if (hasDomainBounds) {
-        dict.setValue<glm::vec3>(KeyLowerDomainBound, lowerDomainBound);
-        dict.setValue<glm::vec3>(KeyUpperDomainBound, upperDomainBound);
+        dict.setValue(KeyLowerDomainBound, glm::dvec3(lowerDomainBound));
+        dict.setValue(KeyUpperDomainBound, glm::dvec3(upperDomainBound));
     }
 
     if (hasValueRange) {
-        dict.setValue<double>(KeyMinValue, minValue);
-        dict.setValue<double>(KeyMaxValue, maxValue);
+        dict.setValue(KeyMinValue, static_cast<double>(minValue));
+        dict.setValue(KeyMaxValue, static_cast<double>(maxValue));
     }
     if (hasDomainUnit) {
-        dict.setValue<std::string>(KeyValueUnit, valueUnit);
+        dict.setValue(KeyValueUnit, valueUnit);
     }
 
     if (hasTime) {
@@ -117,7 +120,7 @@ ghoul::Dictionary RawVolumeMetadata::dictionary() {
         if (timeString.back() == 'Z') {
             timeString = timeString.substr(0, timeString.size() - 1);
         }
-        dict.setValue<std::string>(KeyTime, std::string(timeString));
+        dict.setValue(KeyTime, std::string(timeString));
     }
     return dict;
 }
@@ -130,7 +133,7 @@ documentation::Documentation RawVolumeMetadata::Documentation() {
         {
             {
                 KeyDimensions,
-                new Vector3Verifier<float>,
+                new DoubleVector3Verifier,
                 Optional::No,
                 "Specifies the number of grid cells in each dimension",
             },
@@ -142,13 +145,13 @@ documentation::Documentation RawVolumeMetadata::Documentation() {
             },
             {
                 KeyLowerDomainBound,
-                new Vector3Verifier<float>,
+                new DoubleVector3Verifier,
                 Optional::Yes,
                 "Specifies the lower domain bounds in the model coordinate system",
             },
             {
                 KeyUpperDomainBound,
-                new Vector3Verifier<float>,
+                new DoubleVector3Verifier,
                 Optional::Yes,
                 "Specifies the upper domain bounds in the model coordinate system",
             },
diff --git a/modules/volume/rawvolumemetadata.h b/modules/volume/rawvolumemetadata.h
index c3f95f7cd3..8a4339d09d 100644
--- a/modules/volume/rawvolumemetadata.h
+++ b/modules/volume/rawvolumemetadata.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,10 +25,11 @@
 #ifndef __OPENSPACE_MODULE_VOLUME___RAWVOLUMEMETADATA___H__
 #define __OPENSPACE_MODULE_VOLUME___RAWVOLUMEMETADATA___H__
 
-#include <openspace/documentation/documentation.h>
 #include <modules/volume/volumegridtype.h>
+#include <ghoul/glm.h>
 
-#include <ghoul/misc/dictionary.h>
+namespace openspace::documentation { struct Documentation; }
+namespace ghoul { class Dictionary; }
 
 namespace openspace::volume {
 
diff --git a/modules/volume/rawvolumereader.h b/modules/volume/rawvolumereader.h
index 161fdeb18d..8da0948be4 100644
--- a/modules/volume/rawvolumereader.h
+++ b/modules/volume/rawvolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,7 +26,6 @@
 #define __OPENSPACE_MODULE_VOLUME___RAWVOLUMEREADER___H__
 
 #include <ghoul/glm.h>
-#include <memory>
 #include <string>
 
 namespace openspace::volume {
diff --git a/modules/volume/rawvolumereader.inl b/modules/volume/rawvolumereader.inl
index 07d48caaf6..f654d18652 100644
--- a/modules/volume/rawvolumereader.inl
+++ b/modules/volume/rawvolumereader.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/rawvolumewriter.h b/modules/volume/rawvolumewriter.h
index a8a9278a5d..bfae4a9bc4 100644
--- a/modules/volume/rawvolumewriter.h
+++ b/modules/volume/rawvolumewriter.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/rawvolumewriter.inl b/modules/volume/rawvolumewriter.inl
index 22e86056f8..d9318f9b15 100644
--- a/modules/volume/rawvolumewriter.inl
+++ b/modules/volume/rawvolumewriter.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/rendering/basicvolumeraycaster.cpp b/modules/volume/rendering/basicvolumeraycaster.cpp
index 0f1cfda6ec..d4f8516134 100644
--- a/modules/volume/rendering/basicvolumeraycaster.cpp
+++ b/modules/volume/rendering/basicvolumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,17 +24,18 @@
 
 #include <modules/volume/rendering/basicvolumeraycaster.h>
 
+#include <modules/volume/rendering/volumeclipplanes.h>
+#include <modules/volume/transferfunctionhandler.h>
+#include <openspace/rendering/renderable.h>
+#include <openspace/rendering/transferfunction.h>
+#include <openspace/util/updatestructures.h>
 #include <ghoul/glm.h>
-#include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/filesystem/filesystem.h>
-#include <sstream>
+#include <ghoul/opengl/ghoul_gl.h>
 #include <ghoul/opengl/programobject.h>
 #include <ghoul/opengl/textureunit.h>
-#include <openspace/util/updatestructures.h>
-#include <openspace/rendering/renderable.h>
-#include <modules/volume/transferfunctionhandler.h>
-#include <modules/volume/rendering/volumeclipplanes.h>
 #include <ghoul/opengl/texture.h>
+#include <sstream>
 
 namespace {
     constexpr const char* GlslRaycastPath = "${MODULE_VOLUME}/shaders/raycast.glsl";
diff --git a/modules/volume/rendering/basicvolumeraycaster.h b/modules/volume/rendering/basicvolumeraycaster.h
index 66d018cc93..fd4daf5285 100644
--- a/modules/volume/rendering/basicvolumeraycaster.h
+++ b/modules/volume/rendering/basicvolumeraycaster.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,12 +26,9 @@
 #define __OPENSPACE_MODULE_VOLUME___BASICVOLUMERAYCASTER___H__
 
 #include <openspace/rendering/volumeraycaster.h>
-#include <openspace/rendering/transferfunction.h>
-#include <openspace/util/boxgeometry.h>
-#include <modules/volume/rendering/volumeclipplanes.h>
 
-#include <modules/volume/volumegridtype.h>
 #include <openspace/util/boxgeometry.h>
+#include <modules/volume/volumegridtype.h>
 
 namespace ghoul::opengl {
     class Texture;
@@ -42,6 +39,7 @@ namespace ghoul::opengl {
 namespace openspace {
     struct RenderData;
     struct RaycastData;
+    class TransferFunction;
 } // namespace openspace
 
 namespace openspace::volume {
@@ -78,8 +76,7 @@ public:
 
     void setVolumeTexture(std::shared_ptr<ghoul::opengl::Texture> texture);
     std::shared_ptr<ghoul::opengl::Texture> volumeTexture() const;
-    void setTransferFunction(
-        std::shared_ptr<openspace::TransferFunction> transferFunction);
+    void setTransferFunction(std::shared_ptr<TransferFunction> transferFunction);
 
     void setStepSize(float stepSize);
     float opacity() const;
@@ -97,7 +94,7 @@ private:
 
     std::shared_ptr<VolumeClipPlanes> _clipPlanes;
     std::shared_ptr<ghoul::opengl::Texture> _volumeTexture;
-    std::shared_ptr<openspace::TransferFunction> _transferFunction;
+    std::shared_ptr<TransferFunction> _transferFunction;
     BoxGeometry _boundingBox;
     VolumeGridType _gridType;
     glm::mat4 _modelTransform = glm::mat4(1.f);
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp
index e4f20524ac..386b2b4bf5 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.cpp
+++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,6 +36,7 @@
 #include <openspace/rendering/raycastermanager.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/util/histogram.h>
+#include <openspace/rendering/transferfunction.h>
 #include <openspace/util/time.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/util/updatestructures.h>
diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h
index 2658ade856..3ed365cc58 100644
--- a/modules/volume/rendering/renderabletimevaryingvolume.h
+++ b/modules/volume/rendering/renderabletimevaryingvolume.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,8 +27,11 @@
 
 #include <openspace/rendering/renderable.h>
 
+#include <modules/volume/rawvolumemetadata.h>
 #include <openspace/properties/optionproperty.h>
 #include <openspace/properties/stringproperty.h>
+#include <openspace/properties/scalar/floatproperty.h>
+#include <openspace/properties/scalar/intproperty.h>
 #include <openspace/properties/triggerproperty.h>
  // #include <modules/volume/rawvolume.h>
 #include <modules/volume/rawvolumemetadata.h>
diff --git a/modules/volume/rendering/volumeclipplane.cpp b/modules/volume/rendering/volumeclipplane.cpp
index 11f5f613fc..220d1c27ab 100644
--- a/modules/volume/rendering/volumeclipplane.cpp
+++ b/modules/volume/rendering/volumeclipplane.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -43,8 +43,8 @@ VolumeClipPlane::VolumeClipPlane(const ghoul::Dictionary& dictionary)
         glm::vec2(2.f, 1.f)
     )
 {
-    _normal = dictionary.value<glm::vec3>("Normal");
-    _offsets = dictionary.value<glm::vec2>("Offsets");
+    _normal = dictionary.value<glm::dvec3>("Normal");
+    _offsets = dictionary.value<glm::dvec2>("Offsets");
 
     addProperty(_normal);
     addProperty(_offsets);
diff --git a/modules/volume/rendering/volumeclipplane.h b/modules/volume/rendering/volumeclipplane.h
index b8bb1f5b0b..5a19c5f1bd 100644
--- a/modules/volume/rendering/volumeclipplane.h
+++ b/modules/volume/rendering/volumeclipplane.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/rendering/volumeclipplanes.cpp b/modules/volume/rendering/volumeclipplanes.cpp
index 89fb6eea6c..24d91de15c 100644
--- a/modules/volume/rendering/volumeclipplanes.cpp
+++ b/modules/volume/rendering/volumeclipplanes.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,14 +34,13 @@ VolumeClipPlanes::VolumeClipPlanes(const ghoul::Dictionary& dictionary)
     // @TODO Missing documentation
     , _nClipPlanes({ "nClipPlanes", "Number of clip planes", "" }, 0, 0, 10)
 {
-    const std::vector<std::string>& keys = dictionary.keys();
-    for (const std::string& key : keys) {
+    for (std::string_view key : dictionary.keys()) {
         ghoul::Dictionary cutPlaneDictionary = dictionary.value<ghoul::Dictionary>(key);
         VolumeClipPlane clipPlane = VolumeClipPlane(cutPlaneDictionary);
-        clipPlane.setIdentifier(key);
+        clipPlane.setIdentifier(std::string(key));
         _clipPlanes.push_back(std::move(clipPlane));
     }
-    _nClipPlanes = static_cast<int>(keys.size());
+    _nClipPlanes = static_cast<int>(dictionary.keys().size());
 }
 
 void VolumeClipPlanes::initialize() {
diff --git a/modules/volume/rendering/volumeclipplanes.h b/modules/volume/rendering/volumeclipplanes.h
index 2deb6fd254..b8d33e83b9 100644
--- a/modules/volume/rendering/volumeclipplanes.h
+++ b/modules/volume/rendering/volumeclipplanes.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/shaders/boundsfs.glsl b/modules/volume/shaders/boundsfs.glsl
index 5e589ac90b..32d585b4de 100644
--- a/modules/volume/shaders/boundsfs.glsl
+++ b/modules/volume/shaders/boundsfs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,6 +28,7 @@
 in vec4 positionLocalSpace;
 in vec4 positionCameraSpace;
 
+
 Fragment getFragment() {
     vec4 position = positionCameraSpace;
 
diff --git a/modules/volume/shaders/boundsvs.glsl b/modules/volume/shaders/boundsvs.glsl
index 32c2d80aeb..2933defd60 100644
--- a/modules/volume/shaders/boundsvs.glsl
+++ b/modules/volume/shaders/boundsvs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/shaders/helper.glsl b/modules/volume/shaders/helper.glsl
index 9c51d02d41..effc70f6d3 100644
--- a/modules/volume/shaders/helper.glsl
+++ b/modules/volume/shaders/helper.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/shaders/raycast.glsl b/modules/volume/shaders/raycast.glsl
index 0ecee6cf0d..c7803279d0 100644
--- a/modules/volume/shaders/raycast.glsl
+++ b/modules/volume/shaders/raycast.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/tasks/generaterawvolumetask.cpp b/modules/volume/tasks/generaterawvolumetask.cpp
index e89bece66b..68e889fc72 100644
--- a/modules/volume/tasks/generaterawvolumetask.cpp
+++ b/modules/volume/tasks/generaterawvolumetask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -27,11 +27,9 @@
 #include <modules/volume/rawvolume.h>
 #include <modules/volume/rawvolumemetadata.h>
 #include <modules/volume/rawvolumewriter.h>
-
 #include <openspace/documentation/verifier.h>
 #include <openspace/util/time.h>
 #include <openspace/util/spicemanager.h>
-
 #include <ghoul/filesystem/filesystem.h>
 #include <ghoul/filesystem/file.h>
 #include <ghoul/logging/logmanager.h>
@@ -40,7 +38,6 @@
 #include <ghoul/misc/dictionaryluaformatter.h>
 #include <ghoul/misc/defer.h>
 
-
 #include <fstream>
 
 namespace {
@@ -53,11 +50,9 @@ namespace {
     constexpr const char* KeyUpperDomainBound = "UpperDomainBound";
 } // namespace
 
-namespace openspace {
-namespace volume {
+namespace openspace::volume {
 
-GenerateRawVolumeTask::GenerateRawVolumeTask(const ghoul::Dictionary& dictionary)
-{
+GenerateRawVolumeTask::GenerateRawVolumeTask(const ghoul::Dictionary& dictionary) {
     openspace::documentation::testSpecificationAndThrow(
         documentation(),
         dictionary,
@@ -66,11 +61,11 @@ GenerateRawVolumeTask::GenerateRawVolumeTask(const ghoul::Dictionary& dictionary
 
     _rawVolumeOutputPath = absPath(dictionary.value<std::string>(KeyRawVolumeOutput));
     _dictionaryOutputPath = absPath(dictionary.value<std::string>(KeyDictionaryOutput));
-    _dimensions = glm::uvec3(dictionary.value<glm::vec3>(KeyDimensions));
+    _dimensions = glm::uvec3(dictionary.value<glm::dvec3>(KeyDimensions));
     _time = dictionary.value<std::string>(KeyTime);
     _valueFunctionLua = dictionary.value<std::string>(KeyValueFunction);
-    _lowerDomainBound = dictionary.value<glm::vec3>(KeyLowerDomainBound);
-    _upperDomainBound = dictionary.value<glm::vec3>(KeyUpperDomainBound);
+    _lowerDomainBound = dictionary.value<glm::dvec3>(KeyLowerDomainBound);
+    _upperDomainBound = dictionary.value<glm::dvec3>(KeyUpperDomainBound);
 }
 
 std::string GenerateRawVolumeTask::description() {
@@ -187,12 +182,6 @@ documentation::Documentation GenerateRawVolumeTask::documentation() {
         "GenerateRawVolumeTask",
         "generate_raw_volume_task",
         {
-            {
-                "Type",
-                new StringEqualVerifier("GenerateRawVolumeTask"),
-                Optional::No,
-                "The type of this task",
-            },
             {
                 KeyValueFunction,
                 new StringAnnotationVerifier("A lua expression that returns a function "
@@ -234,5 +223,4 @@ documentation::Documentation GenerateRawVolumeTask::documentation() {
     };
 }
 
-} // namespace volume
-} // namespace openspace
+} // namespace openspace::volume
diff --git a/modules/volume/tasks/generaterawvolumetask.h b/modules/volume/tasks/generaterawvolumetask.h
index 9f7ca41732..367a590ce3 100644
--- a/modules/volume/tasks/generaterawvolumetask.h
+++ b/modules/volume/tasks/generaterawvolumetask.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -28,11 +28,9 @@
 #include <openspace/util/task.h>
 
 #include <ghoul/glm.h>
-
 #include <string>
 
-namespace openspace {
-namespace volume {
+namespace openspace::volume {
 
 class GenerateRawVolumeTask : public Task {
 public:
@@ -53,7 +51,6 @@ private:
     std::string _valueFunctionLua;
 };
 
-} // namespace volume
-} // namespace openspace
+} // namespace openspace::volume
 
 #endif // __OPENSPACE_MODULE_VOLUME___GENERATERAWVOLUMETASK___H__
diff --git a/modules/volume/textureslicevolumereader.h b/modules/volume/textureslicevolumereader.h
index 834c7447d1..476e0763cf 100644
--- a/modules/volume/textureslicevolumereader.h
+++ b/modules/volume/textureslicevolumereader.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/textureslicevolumereader.inl b/modules/volume/textureslicevolumereader.inl
index d63d1de6a8..cf46cbceae 100644
--- a/modules/volume/textureslicevolumereader.inl
+++ b/modules/volume/textureslicevolumereader.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/transferfunction.cpp b/modules/volume/transferfunction.cpp
index b45f9b04fb..0539ec516c 100644
--- a/modules/volume/transferfunction.cpp
+++ b/modules/volume/transferfunction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -109,18 +109,15 @@ void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
     ghoul::Dictionary dictionary;
     ghoul::lua::loadDictionaryFromFile(path, dictionary, L);
 
-    const std::vector<std::string>& tfKeys = dictionary.keys();
-    for (const std::string& key : tfKeys) {
+    for (std::string_view key : dictionary.keys()) {
         ghoul::Dictionary tfDictionary = dictionary.value<ghoul::Dictionary>(key);
 
-        const std::vector<std::string>& envelopeKeys = tfDictionary.keys();
-        for (const std::string& envelopeKey : envelopeKeys) {
+        for (std::string_view envelopeKey : tfDictionary.keys()) {
             ghoul::Dictionary envelopeDictionary =
                 tfDictionary.value<ghoul::Dictionary>(envelopeKey);
-            const std::vector<std::string>& pointKeys = envelopeDictionary.keys();
             Envelope env;
             std::vector<EnvelopePoint> tmpVec;
-            for (const std::string& pointKey : pointKeys) {
+            for (std::string_view pointKey : envelopeDictionary.keys()) {
                 ghoul::Dictionary pointDictionary =
                     envelopeDictionary.value<ghoul::Dictionary>(pointKey);
 
@@ -128,9 +125,13 @@ void TransferFunction::loadEnvelopesFromFile(const std::string& path) {
                     pointDictionary.value<ghoul::Dictionary>("position");
 
                 std::string color = pointDictionary.value<std::string>("color");
-                float posX = positionDictionary.value<float>("x");
-                float posY = positionDictionary.value<float>("y");
-                tmpVec.emplace_back(color, posX, posY);
+                double posX = positionDictionary.value<double>("x");
+                double posY = positionDictionary.value<double>("y");
+                tmpVec.emplace_back(
+                    color,
+                    static_cast<float>(posX),
+                    static_cast<float>(posY)
+                );
             }
             env.setPoints(tmpVec);
             _envelopes.emplace_back(env);
diff --git a/modules/volume/transferfunction.h b/modules/volume/transferfunction.h
index 9581cc6e63..0d574d9e4d 100644
--- a/modules/volume/transferfunction.h
+++ b/modules/volume/transferfunction.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,8 +25,8 @@
 #ifndef __OPENSPACE_MODULE_VOLUME___TRANSFERFUNCTION___H__
 #define __OPENSPACE_MODULE_VOLUME___TRANSFERFUNCTION___H__
 
-#include <ghoul/glm.h>
 #include <modules/volume/envelope.h>
+#include <ghoul/glm.h>
 
 namespace ghoul { class Dictionary; }
 namespace ghoul::opengl { class Texture; }
diff --git a/modules/volume/transferfunctionhandler.cpp b/modules/volume/transferfunctionhandler.cpp
index 991fddf851..f99fc7d055 100644
--- a/modules/volume/transferfunctionhandler.cpp
+++ b/modules/volume/transferfunctionhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/transferfunctionhandler.h b/modules/volume/transferfunctionhandler.h
index 35e112123a..b62f16c06c 100644
--- a/modules/volume/transferfunctionhandler.h
+++ b/modules/volume/transferfunctionhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/transferfunctionproperty.cpp b/modules/volume/transferfunctionproperty.cpp
index 18be5eee77..7bba685907 100644
--- a/modules/volume/transferfunctionproperty.cpp
+++ b/modules/volume/transferfunctionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/transferfunctionproperty.h b/modules/volume/transferfunctionproperty.h
index 14fb8aac46..85eaab4a89 100644
--- a/modules/volume/transferfunctionproperty.h
+++ b/modules/volume/transferfunctionproperty.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumegridtype.cpp b/modules/volume/volumegridtype.cpp
index a261fd2463..d582b3a79e 100644
--- a/modules/volume/volumegridtype.cpp
+++ b/modules/volume/volumegridtype.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumegridtype.h b/modules/volume/volumegridtype.h
index ca3064d387..b648f227f8 100644
--- a/modules/volume/volumegridtype.h
+++ b/modules/volume/volumegridtype.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumemodule.cpp b/modules/volume/volumemodule.cpp
index f2eb2b10f9..f337103f14 100644
--- a/modules/volume/volumemodule.cpp
+++ b/modules/volume/volumemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumemodule.h b/modules/volume/volumemodule.h
index f12747978e..74ddcfbeea 100644
--- a/modules/volume/volumemodule.h
+++ b/modules/volume/volumemodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumesampler.h b/modules/volume/volumesampler.h
index 836c1e0712..8b7f0800c2 100644
--- a/modules/volume/volumesampler.h
+++ b/modules/volume/volumesampler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumesampler.inl b/modules/volume/volumesampler.inl
index 4c6f344607..68a83bdd27 100644
--- a/modules/volume/volumesampler.inl
+++ b/modules/volume/volumesampler.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumeutils.cpp b/modules/volume/volumeutils.cpp
index 864715494e..e83c4fd1b5 100644
--- a/modules/volume/volumeutils.cpp
+++ b/modules/volume/volumeutils.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/volume/volumeutils.h b/modules/volume/volumeutils.h
index 91088ffc23..a4e18155e4 100644
--- a/modules/volume/volumeutils.h
+++ b/modules/volume/volumeutils.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/CMakeLists.txt b/modules/webbrowser/CMakeLists.txt
index c914689fda..50024e8ec7 100644
--- a/modules/webbrowser/CMakeLists.txt
+++ b/modules/webbrowser/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -45,6 +45,10 @@ cmake_minimum_required(VERSION 2.8.12.1)
 # Use folders in the resulting project files.
 set_property(GLOBAL PROPERTY OS_FOLDERS ON)
 
+# "OpenSpace Helper" is not a valid CMake target name under OLD
+# https://cmake.org/cmake/help/git-stage/policy/CMP0037.html
+cmake_policy(SET CMP0037 OLD)
+
 # Use <PackageName>_ROOT variables
 # https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
 cmake_policy(SET CMP0074 NEW)
@@ -156,7 +160,7 @@ if (OS_MACOSX)
   # Helper executable target.
   add_executable(${CEF_HELPER_TARGET} MACOSX_BUNDLE ${WEBBROWSER_HELPER_SOURCES})
   SET_EXECUTABLE_TARGET_PROPERTIES(${CEF_HELPER_TARGET})
-  add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
+  # add_cef_logical_target("libcef_lib" "${CEF_LIB_DEBUG}" "${CEF_LIB_RELEASE}")
   add_dependencies(${CEF_HELPER_TARGET} libcef_dll_wrapper)
   target_link_libraries(${CEF_HELPER_TARGET} libcef_dll_wrapper ${CEF_STANDARD_LIBS})
   set_target_properties(${CEF_HELPER_TARGET} PROPERTIES
@@ -232,6 +236,15 @@ set_folder_location(openspace_web_helper "Helper")
 
 
 # Display CEF configuration settings.
-PRINT_CEF_CONFIG()
+# PRINT_CEF_CONFIG()
 
-target_include_directories(${webbrowser_module} PUBLIC ${CEF_ROOT})
+target_include_directories(${webbrowser_module} SYSTEM PUBLIC ${CEF_ROOT})
+
+set(deps "")
+foreach (i ${CEF_BINARY_FILES})
+  list(APPEND deps "${CEF_BINARY_DIR}/${i}")
+endforeach()
+foreach (j ${CEF_RESOURCE_FILES})
+list(APPEND deps "${CEF_RESOURCE_DIR}/${j}")
+endforeach()
+add_external_library_dependencies("${deps}")
diff --git a/modules/webbrowser/cmake/cef_support.cmake b/modules/webbrowser/cmake/cef_support.cmake
index fdecb039d1..6336e7ce21 100644
--- a/modules/webbrowser/cmake/cef_support.cmake
+++ b/modules/webbrowser/cmake/cef_support.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -32,22 +32,22 @@
 # platform.
 
 function(set_current_cef_build_platform)
-  if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+  if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
     set(CEF_PLATFORM "macosx64" PARENT_SCOPE)
-  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-    if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+  elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+    if (CMAKE_SIZEOF_VOID_P MATCHES 8)
       set(CEF_PLATFORM "linux64" PARENT_SCOPE)
-    else()
+    else ()
       set(CEF_PLATFORM "linux32" PARENT_SCOPE)
-    endif()
-  elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-    if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+    endif ()
+  elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
+    if (CMAKE_SIZEOF_VOID_P MATCHES 8)
       set(CEF_PLATFORM "windows64" PARENT_SCOPE)
     else()
       set(CEF_PLATFORM "windows32" PARENT_SCOPE)
-    endif()
-  endif()
-endfunction()
+    endif ()
+  endif ()
+endfunction ()
 
 # Download the CEF binary distribution for |platform| and |version| to
 # |download_dir|. The |CEF_ROOT| variable will be set in global scope pointing
@@ -64,11 +64,11 @@ function(download_cef platform version download_dir)
   set(CEF_ROOT "${CEF_DOWNLOAD_DIR}/${CEF_DISTRIBUTION}" CACHE INTERNAL "CEF_ROOT")
 
   # Download and/or extract the binary distribution if necessary.
-  if(NOT IS_DIRECTORY "${CEF_ROOT}")
+  if (NOT IS_DIRECTORY "${CEF_ROOT}")
     set(CEF_DOWNLOAD_FILENAME "${CEF_DISTRIBUTION}.tar.bz2")
     set(CEF_DOWNLOAD_PATH "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}")
-    if(NOT EXISTS "${CEF_DOWNLOAD_PATH}")
-      string(REPLACE "+" "%2B" CEF_DOWNLOAD_URL "http://opensource.spotify.com/cefbuilds/${CEF_DOWNLOAD_FILENAME}")
+    if (NOT EXISTS "${CEF_DOWNLOAD_PATH}")
+      string(REPLACE "+" "%2B" CEF_DOWNLOAD_URL "http://cef-builds.spotifycdn.com/${CEF_DOWNLOAD_FILENAME}")
 
       # Download the SHA1 hash for the binary distribution.
       message(STATUS "Downloading CEF: ${CEF_DOWNLOAD_PATH}.sha1...")
@@ -81,21 +81,21 @@ function(download_cef platform version download_dir)
         DOWNLOAD "${CEF_DOWNLOAD_URL}" "${CEF_DOWNLOAD_PATH}"
         EXPECTED_HASH SHA1=${CEF_SHA1}
         SHOW_PROGRESS
-        )
-    endif()
+      )
+    endif ()
 
     # Extract the binary distribution.
     message(STATUS "Extracting CEF: ${CEF_DOWNLOAD_PATH}...")
     execute_process(
       COMMAND ${CMAKE_COMMAND} -E tar xzf "${CEF_DOWNLOAD_DIR}/${CEF_DOWNLOAD_FILENAME}"
       WORKING_DIRECTORY ${CEF_DOWNLOAD_DIR}
-      )
-  endif()
-endfunction()
+    )
+  endif ()
+endfunction ()
 
 macro(set_openspace_cef_target_out_dir)
-  if(${CMAKE_GENERATOR} STREQUAL "Ninja" OR
-     ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+  if (${CMAKE_GENERATOR} STREQUAL "Ninja" OR
+      ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
     # By default Ninja and Make builds don't create a subdirectory named after
     # the configuration.
     # set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
@@ -104,11 +104,11 @@ macro(set_openspace_cef_target_out_dir)
     # Output binaries (executables, libraries) to the correct directory.
     # set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
     # set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CEF_TARGET_OUT_DIR})
-  else()
+  else ()
     # set(CEF_TARGET_OUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>")
     set(CEF_TARGET_OUT_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>")
-  endif()
-endmacro()
+  endif ()
+endmacro ()
 
 macro(add_windows_cef_manifest target_dir manifest_path target extension)
   add_custom_command(
@@ -119,7 +119,7 @@ macro(add_windows_cef_manifest target_dir manifest_path target extension)
       -outputresource:"${target_dir}/${target}.${extension}"\;\#1
       COMMENT "Adding manifest..."
   )
-endmacro()
+endmacro ()
 
 
 # Add a logical target that can be used to link the specified libraries into an
@@ -130,5 +130,5 @@ macro(add_cef_logical_target target debug_lib release_lib)
     IMPORTED_LOCATION "${release_lib}"
     IMPORTED_LOCATION_DEBUG "${debug_lib}"
     IMPORTED_LOCATION_RELEASE "${release_lib}"
-    )
-endmacro()
+  )
+endmacro ()
diff --git a/modules/webbrowser/cmake/webbrowser_helpers.cmake b/modules/webbrowser/cmake/webbrowser_helpers.cmake
index ac082325ba..ccb74d7da3 100644
--- a/modules/webbrowser/cmake/webbrowser_helpers.cmake
+++ b/modules/webbrowser/cmake/webbrowser_helpers.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -23,121 +23,117 @@
 ##########################################################################################
 
 function(set_cef_targets cef_root main_target)
-    # find cef cmake helpers
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${cef_root}/cmake")
-    include(cef_support)
+  # find cef cmake helpers
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${cef_root}/cmake")
+  include(cef_support)
 
-    # Use <PackageName>_ROOT variables
-    # https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
-    cmake_policy(SET CMP0074 NEW)
-    find_package(CEF REQUIRED)
+  # Use <PackageName>_ROOT variables
+  # https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
+  cmake_policy(SET CMP0074 NEW)
+  find_package(CEF REQUIRED)
 
-    # ensure out target dir is set
-    set_openspace_cef_target_out_dir()
+  # ensure out target dir is set
+  set_openspace_cef_target_out_dir()
 
-    # main CEF executable target
-    set(CEF_TARGET ${main_target} PARENT_SCOPE)
-endfunction()
+  # main CEF executable target
+  set(CEF_TARGET ${main_target} PARENT_SCOPE)
+endfunction ()
 
 function(run_cef_platform_config cef_root cef_target module_path)
-    # find cef cmake helpers
-    set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${cef_root}/cmake")
-    include(cef_support)
+  # find cef cmake helpers
+  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${cef_root}/cmake")
+  include(cef_support)
 
-    # Use <PackageName>_ROOT variables
-    # https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
-    cmake_policy(SET CMP0074 NEW)
-    find_package(CEF REQUIRED)
+  # Use <PackageName>_ROOT variables
+  # https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
+  cmake_policy(SET CMP0074 NEW)
+  find_package(CEF REQUIRED)
 
-    if (OS_MACOSX)
-        run_cef_macosx_config("${cef_target}" "${module_path}")
-    endif()
-    if (OS_WINDOWS)
-        run_cef_windows_config("${cef_target}" "${cef_root}" "${module_path}")
-    endif()
-    if (OS_LINUX)
-        run_cef_linux_config("${cef_target}")
-    endif()
-endfunction()
+  if (OS_MACOSX)
+    run_cef_macosx_config("${cef_target}" "${module_path}")
+  endif ()
+  if (OS_WINDOWS)
+    run_cef_windows_config("${cef_target}" "${cef_root}" "${module_path}")
+  endif ()
+  if (OS_LINUX)
+    run_cef_linux_config("${cef_target}")
+  endif ()
+endfunction ()
 
 function(run_cef_macosx_config CEF_ROOT module_path)
-    if (${CMAKE_GENERATOR} STREQUAL "Ninja" OR
-        ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
-        set(CEF_OUTPUT_PREFIX "")
-    else()
-        set(CEF_OUTPUT_PREFIX "$<CONFIG>/")
-    endif()
+  if (${CMAKE_GENERATOR} STREQUAL "Ninja" OR ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
+    set(CEF_OUTPUT_PREFIX "")
+  else ()
+    set(CEF_OUTPUT_PREFIX "$<CONFIG>/")
+  endif ()
 
-    set(CEF_FINAL_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CEF_OUTPUT_PREFIX}${CEF_TARGET}.app")
-    set(CEF_INTERMEDIATE_HELPER_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CEF_OUTPUT_PREFIX}${CEF_HELPER_TARGET}.app")
+  set(CEF_FINAL_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CEF_OUTPUT_PREFIX}${CEF_TARGET}.app")
+  set(CEF_INTERMEDIATE_HELPER_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CEF_OUTPUT_PREFIX}${CEF_HELPER_TARGET}.app")
 
-    set(CEF_FINAL_HELPER_APP "${CEF_FINAL_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app")
-    set(CEF_FRAMEWORK_LOCATION "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework")
-    set(CEF_FRAMEWORK_FINAL_LOCATION "${CEF_FINAL_APP}/Contents/Frameworks/Chromium Embedded Framework.framework")
+  set(CEF_FINAL_HELPER_APP "${CEF_FINAL_APP}/Contents/Frameworks/${CEF_HELPER_TARGET}.app")
+  set(CEF_FRAMEWORK_LOCATION "${CEF_BINARY_DIR}/Chromium Embedded Framework.framework")
+  set(CEF_FRAMEWORK_FINAL_LOCATION "${CEF_FINAL_APP}/Contents/Frameworks/Chromium Embedded Framework.framework")
 
-    add_dependencies(${CEF_TARGET} libcef_dll_wrapper "${CEF_HELPER_TARGET}")
+  add_dependencies(${CEF_TARGET} libcef_dll_wrapper "${CEF_HELPER_TARGET}")
 
-    target_link_libraries(${CEF_TARGET} PUBLIC libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
-    set_target_properties(${CEF_TARGET} PROPERTIES
-        RESOURCE "${WEBBROWSER_RESOURCES_SRCS}"
-        MACOSX_BUNDLE_INFO_PLIST ${module_path}/mac/Info.plist
-        )
+  # target_link_libraries(${CEF_TARGET} PUBLIC libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
+  target_link_libraries(${CEF_TARGET} PUBLIC libcef_dll_wrapper ${CEF_STANDARD_LIBS})
+  set_target_properties(${CEF_TARGET} PROPERTIES
+    RESOURCE "${WEBBROWSER_RESOURCES_SRCS}"
+    MACOSX_BUNDLE_INFO_PLIST ${module_path}/mac/Info.plist
+  )
 
-    # Copy files into the main app bundle.
+  # Copy files into the main app bundle.
+  add_custom_command(
+    TARGET ${CEF_TARGET}
+    POST_BUILD
+    # Copy the helper app bundle into the Frameworks directory.
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_INTERMEDIATE_HELPER_APP}" "${CEF_FINAL_HELPER_APP}"
+    # Copy the CEF framework into the Frameworks directory.
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_FRAMEWORK_LOCATION}" "${CEF_FRAMEWORK_FINAL_LOCATION}"
+    VERBATIM
+  )
+
+  # copy dynamic libraries to bundle
+  file(GLOB LIBRARIES_TO_COPY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.dylib")
+  foreach (lib_file ${LIBRARIES_TO_COPY})
+    get_filename_component(file_name "${lib_file}" NAME)
     add_custom_command(
-        TARGET ${CEF_TARGET}
-        POST_BUILD
-        # Copy the helper app bundle into the Frameworks directory.
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_INTERMEDIATE_HELPER_APP}" "${CEF_FINAL_HELPER_APP}"
-        # Copy the CEF framework into the Frameworks directory.
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CEF_FRAMEWORK_LOCATION}" "${CEF_FRAMEWORK_FINAL_LOCATION}"
-        VERBATIM
+      TARGET ${CEF_TARGET} POST_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different
+      "${lib_file}"
+      "${CEF_FINAL_APP}/Contents/${file_name}"
     )
+  endforeach ()
 
-    # copy dynamic libraries to bundle
-    file(GLOB LIBRARIES_TO_COPY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.dylib")
-    foreach (lib_file ${LIBRARIES_TO_COPY})
-        get_filename_component(file_name "${lib_file}" NAME)
-        add_custom_command(
-            TARGET ${CEF_TARGET} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            "${lib_file}"
-            "${CEF_FINAL_APP}/Contents/${file_name}"
-        )
-    endforeach ()
-
-    if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
-        # Manually process and copy over resource files.
-        # The Xcode generator handles this via the set_target_properties RESOURCE directive.
-        set(PREFIXES "mac/")  # Remove these prefixes from input file paths.
-        COPY_MACOSX_RESOURCES("${WEBBROWSER_RESOURCES_SOURCES}" "${PREFIXES}" "${CEF_TARGET}" "${module_path}" "${CEF_FINAL_APP}")
-    endif()
-endfunction()
+  if (NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
+    # Manually process and copy over resource files.
+    # The Xcode generator handles this via the set_target_properties RESOURCE directive.
+    set(PREFIXES "mac/")  # Remove these prefixes from input file paths.
+    COPY_MACOSX_RESOURCES("${WEBBROWSER_RESOURCES_SOURCES}" "${PREFIXES}" "${CEF_TARGET}" "${module_path}" "${CEF_FINAL_APP}")
+  endif ()
+endfunction ()
 
 function(run_cef_windows_config CEF_TARGET CEF_ROOT MODULE_PATH)
-    # Executable target.
-    add_dependencies(${CEF_TARGET} libcef_dll_wrapper)
-    target_link_libraries(${CEF_TARGET} PUBLIC libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
-    include_directories(${CEF_ROOT})
+  # Executable target.
+  add_dependencies(${CEF_TARGET} libcef_dll_wrapper)
+  target_link_libraries(${CEF_TARGET} PUBLIC libcef_lib libcef_dll_wrapper ${CEF_STANDARD_LIBS})
+  include_directories(${CEF_ROOT})
 
-    add_dependencies(${CEF_TARGET} libcef_dll_wrapper "${CEF_HELPER_TARGET}")
+  add_dependencies(${CEF_TARGET} libcef_dll_wrapper "${CEF_HELPER_TARGET}")
 
-    if(USE_SANDBOX)
-        # Logical target used to link the cef_sandbox library.
-        message(STATUS "Using CEF in Sandboxed mode.")
-        ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
-        target_link_libraries(${CEF_TARGET} cef_sandbox_lib ${CEF_SANDBOX_STANDARD_LIBS})
-    endif()
+  if (USE_SANDBOX)
+    # Logical target used to link the cef_sandbox library.
+    message(STATUS "Using CEF in Sandboxed mode.")
+    ADD_LOGICAL_TARGET("cef_sandbox_lib" "${CEF_SANDBOX_LIB_DEBUG}" "${CEF_SANDBOX_LIB_RELEASE}")
+    target_link_libraries(${CEF_TARGET} cef_sandbox_lib ${CEF_SANDBOX_STANDARD_LIBS})
+  endif ()
 
-    # Add the custom manifest files to the executable.
-    set_openspace_cef_target_out_dir()
-    add_windows_cef_manifest("${CEF_TARGET_OUT_DIR}" "${MODULE_PATH}" "${CEF_TARGET}" "exe")
-
-    # Copy binary and resource files to the target output directory.
-    copy_files("${CEF_TARGET}" "${CEF_BINARY_FILES}" "${CEF_BINARY_DIR}" "$<TARGET_FILE_DIR:${CEF_TARGET}>")
-    copy_files("${CEF_TARGET}" "${CEF_RESOURCE_FILES}" "${CEF_RESOURCE_DIR}" "$<TARGET_FILE_DIR:${CEF_TARGET}>")
-endfunction()
+  # Add the custom manifest files to the executable.
+  set_openspace_cef_target_out_dir()
+  add_windows_cef_manifest("${CEF_TARGET_OUT_DIR}" "${MODULE_PATH}" "${CEF_TARGET}" "exe")
+endfunction ()
 
 function(run_cef_linux_config CEF_ROOT)
-    message(ERROR "Linux is not yet supported for Web Browser Module.")
-endfunction()
+  message(ERROR "Linux is not yet supported for Web Browser Module.")
+endfunction ()
diff --git a/modules/webbrowser/codegentest.exe.manifest b/modules/webbrowser/codegentest.exe.manifest
new file mode 100644
index 0000000000..d36f084b65
--- /dev/null
+++ b/modules/webbrowser/codegentest.exe.manifest
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+
+  <!--The compatibility section will be merged from build/win/compatibility.manifest -->
+
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+</assembly>
diff --git a/modules/webbrowser/include/browserclient.h b/modules/webbrowser/include/browserclient.h
index 26a61cc9b2..7cc98ef6c5 100644
--- a/modules/webbrowser/include/browserclient.h
+++ b/modules/webbrowser/include/browserclient.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/browserinstance.h b/modules/webbrowser/include/browserinstance.h
index 5e74c6806c..8ff3349fcf 100644
--- a/modules/webbrowser/include/browserinstance.h
+++ b/modules/webbrowser/include/browserinstance.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/cefhost.h b/modules/webbrowser/include/cefhost.h
index 3c739e4560..a2796db686 100644
--- a/modules/webbrowser/include/cefhost.h
+++ b/modules/webbrowser/include/cefhost.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/defaultbrowserlauncher.h b/modules/webbrowser/include/defaultbrowserlauncher.h
index 5de76a4aab..f669e007f8 100644
--- a/modules/webbrowser/include/defaultbrowserlauncher.h
+++ b/modules/webbrowser/include/defaultbrowserlauncher.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/eventhandler.h b/modules/webbrowser/include/eventhandler.h
index 870eb49a47..36758e0627 100644
--- a/modules/webbrowser/include/eventhandler.h
+++ b/modules/webbrowser/include/eventhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/screenspacebrowser.h b/modules/webbrowser/include/screenspacebrowser.h
index f7ccd60a6a..9dd81e0d63 100644
--- a/modules/webbrowser/include/screenspacebrowser.h
+++ b/modules/webbrowser/include/screenspacebrowser.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/webbrowserapp.h b/modules/webbrowser/include/webbrowserapp.h
index bd8de22e13..858d8532fc 100644
--- a/modules/webbrowser/include/webbrowserapp.h
+++ b/modules/webbrowser/include/webbrowserapp.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/webkeyboardhandler.h b/modules/webbrowser/include/webkeyboardhandler.h
index 38bbe841e3..e099286573 100644
--- a/modules/webbrowser/include/webkeyboardhandler.h
+++ b/modules/webbrowser/include/webkeyboardhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/include/webrenderhandler.h b/modules/webbrowser/include/webrenderhandler.h
index 8e7a12caac..63bf21fe18 100644
--- a/modules/webbrowser/include/webrenderhandler.h
+++ b/modules/webbrowser/include/webrenderhandler.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,12 +31,17 @@
 #ifdef _MSC_VER
 #pragma warning (push)
 #pragma warning (disable : 4100)
+#elif __clang__
+//#pragma clang diagnostic push
+//#pragma clang diagnostic ignored "-Wunused-variable"
 #endif // _MSC_VER
 
 #include <include/cef_render_handler.h>
 
 #ifdef _MSC_VER
 #pragma warning (pop)
+#elif __clang__
+//#pragma clang diagnostic pop
 #endif // _MSC_VER
 
 #include <ghoul/opengl/ghoul_gl.h>
diff --git a/modules/webbrowser/shaders/screenspace_fs.glsl b/modules/webbrowser/shaders/screenspace_fs.glsl
index 7b0491b004..22783c756a 100644
--- a/modules/webbrowser/shaders/screenspace_fs.glsl
+++ b/modules/webbrowser/shaders/screenspace_fs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/shaders/screenspace_vs.glsl b/modules/webbrowser/shaders/screenspace_vs.glsl
index b7a3b4af15..cb76445436 100644
--- a/modules/webbrowser/shaders/screenspace_vs.glsl
+++ b/modules/webbrowser/shaders/screenspace_vs.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,6 +35,6 @@ out vec4 vs_position;
 
 void main(){
     vs_st = in_st;
-    vs_position =  ViewProjectionMatrix * ModelTransform * in_position * vec4(1.0, -1.0, 1.0, 1.0);
-    gl_Position =  vec4(vs_position);
+    vs_position = ViewProjectionMatrix * ModelTransform * in_position * vec4(1.0, -1.0, 1.0, 1.0);
+    gl_Position = vec4(vs_position);
 }
diff --git a/modules/webbrowser/src/browserclient.cpp b/modules/webbrowser/src/browserclient.cpp
index b69cb406cd..b8c550128c 100644
--- a/modules/webbrowser/src/browserclient.cpp
+++ b/modules/webbrowser/src/browserclient.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/browserinstance.cpp b/modules/webbrowser/src/browserinstance.cpp
index 6899eb8e3f..2a4b6d6492 100644
--- a/modules/webbrowser/src/browserinstance.cpp
+++ b/modules/webbrowser/src/browserinstance.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/cefhost.cpp b/modules/webbrowser/src/cefhost.cpp
index f53463b290..49bbf51c99 100644
--- a/modules/webbrowser/src/cefhost.cpp
+++ b/modules/webbrowser/src/cefhost.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/defaultbrowserlauncher.cpp b/modules/webbrowser/src/defaultbrowserlauncher.cpp
index e5ad4223ed..39e6b591df 100644
--- a/modules/webbrowser/src/defaultbrowserlauncher.cpp
+++ b/modules/webbrowser/src/defaultbrowserlauncher.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/eventhandler.cpp b/modules/webbrowser/src/eventhandler.cpp
index da9ca87185..33a5fe9166 100644
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -152,7 +152,7 @@ namespace {
 namespace openspace {
 
 void EventHandler::initialize() {
-    global::callback::character.emplace_back(
+    global::callback::character->emplace_back(
         [this](unsigned int charCode, KeyModifier mod) -> bool {
             if (_browserInstance) {
                 return charCallback(charCode, mod);
@@ -160,7 +160,7 @@ void EventHandler::initialize() {
             return false;
         }
     );
-    global::callback::keyboard.emplace_back(
+    global::callback::keyboard->emplace_back(
         [this](Key key, KeyModifier mod, KeyAction action) -> bool {
             if (_browserInstance) {
                 return keyboardCallback(key, mod, action);
@@ -168,7 +168,7 @@ void EventHandler::initialize() {
             return false;
         }
     );
-    global::callback::mousePosition.emplace_back(
+    global::callback::mousePosition->emplace_back(
         [this](double x, double y) -> bool {
             if (_browserInstance) {
                 return mousePositionCallback(x, y);
@@ -176,7 +176,7 @@ void EventHandler::initialize() {
             return false;
         }
     );
-    global::callback::mouseButton.emplace_back(
+    global::callback::mouseButton->emplace_back(
         [this](MouseButton button, MouseAction action, KeyModifier mods) -> bool {
             if (_browserInstance) {
                 return mouseButtonCallback(button, action, mods);
@@ -184,7 +184,7 @@ void EventHandler::initialize() {
             return false;
         }
     );
-    global::callback::mouseScrollWheel.emplace_back(
+    global::callback::mouseScrollWheel->emplace_back(
         [this](double x, double y) -> bool {
             if (_browserInstance) {
                 const glm::ivec2 delta(x, y);
@@ -194,7 +194,7 @@ void EventHandler::initialize() {
         }
     );
 
-    global::callback::touchDetected.emplace_back(
+    global::callback::touchDetected->emplace_back(
         [&](TouchInput input) -> bool {
             if (!_browserInstance) {
                 return false;
@@ -236,7 +236,7 @@ void EventHandler::initialize() {
         }
     );
 
-    global::callback::touchUpdated.emplace_back(
+    global::callback::touchUpdated->emplace_back(
         [&](TouchInput input) -> bool {
             if (!_browserInstance) {
                 return false;
@@ -278,7 +278,7 @@ void EventHandler::initialize() {
         }
     );
 
-    global::callback::touchExit.emplace_back(
+    global::callback::touchExit->emplace_back(
         [&](TouchInput input) {
             if (!_browserInstance) {
                 return;
diff --git a/modules/webbrowser/src/processhelpermac.cpp b/modules/webbrowser/src/processhelpermac.cpp
index f39f312b8f..3432078556 100644
--- a/modules/webbrowser/src/processhelpermac.cpp
+++ b/modules/webbrowser/src/processhelpermac.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/processhelperwindows.cpp b/modules/webbrowser/src/processhelperwindows.cpp
index f907fa6e32..518bac56f1 100644
--- a/modules/webbrowser/src/processhelperwindows.cpp
+++ b/modules/webbrowser/src/processhelperwindows.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/screenspacebrowser.cpp b/modules/webbrowser/src/screenspacebrowser.cpp
index f1f3993294..a2c4df95fe 100644
--- a/modules/webbrowser/src/screenspacebrowser.cpp
+++ b/modules/webbrowser/src/screenspacebrowser.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -34,7 +34,6 @@
 #include <ghoul/opengl/texture.h>
 
 namespace {
-    constexpr const char* KeyIdentifier = "Indentifier";
     constexpr const char* _loggerCat = "ScreenSpaceBrowser";
 
     const openspace::properties::Property::PropertyInfo DimensionsInfo = {
@@ -74,7 +73,7 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
 {
 
     std::string identifier;
-    if (dictionary.hasKeyAndValue<std::string>(KeyIdentifier)) {
+    if (dictionary.hasValue<std::string>(KeyIdentifier)) {
         identifier = dictionary.value<std::string>(KeyIdentifier);
     }
     else {
@@ -83,7 +82,7 @@ ScreenSpaceBrowser::ScreenSpaceBrowser(const ghoul::Dictionary &dictionary)
     identifier = makeUniqueIdentifier(identifier);
     setIdentifier(identifier);
 
-    if (dictionary.hasKeyAndValue<std::string>(UrlInfo.identifier)) {
+    if (dictionary.hasValue<std::string>(UrlInfo.identifier)) {
         _url = dictionary.value<std::string>(UrlInfo.identifier);
     }
 
diff --git a/modules/webbrowser/src/webbrowserapp.cpp b/modules/webbrowser/src/webbrowserapp.cpp
index 6412b4fd66..6ba297f9cc 100644
--- a/modules/webbrowser/src/webbrowserapp.cpp
+++ b/modules/webbrowser/src/webbrowserapp.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/webkeyboardhandler.cpp b/modules/webbrowser/src/webkeyboardhandler.cpp
index aab923c07d..2c8c4b63fa 100644
--- a/modules/webbrowser/src/webkeyboardhandler.cpp
+++ b/modules/webbrowser/src/webkeyboardhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/src/webrenderhandler.cpp b/modules/webbrowser/src/webrenderhandler.cpp
index d0d081c7c1..67c42ab792 100644
--- a/modules/webbrowser/src/webrenderhandler.cpp
+++ b/modules/webbrowser/src/webrenderhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/modules/webbrowser/webbrowsermodule.cpp b/modules/webbrowser/webbrowsermodule.cpp
index 33a5fe0f46..5f20bffa7a 100644
--- a/modules/webbrowser/webbrowsermodule.cpp
+++ b/modules/webbrowser/webbrowsermodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,8 +25,9 @@
 #include <modules/webbrowser/webbrowsermodule.h>
 
 #include <modules/webbrowser/include/browserinstance.h>
-#include <modules/webbrowser/include/screenspacebrowser.h>
 #include <modules/webbrowser/include/cefhost.h>
+#include <modules/webbrowser/include/eventhandler.h>
+#include <modules/webbrowser/include/screenspacebrowser.h>
 #include <openspace/engine/globals.h>
 #include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/windowdelegate.h>
@@ -72,8 +73,9 @@ WebBrowserModule::WebBrowserModule()
     : OpenSpaceModule(WebBrowserModule::Name)
     , _updateBrowserBetweenRenderables(UpdateBrowserBetweenRenderablesInfo, true)
     , _browserUpdateInterval(BrowserUpdateIntervalInfo, 1.f, 1.0f, 1000.f)
+    , _eventHandler(new EventHandler)
 {
-    global::callback::deinitialize.emplace_back([this]() {
+    global::callback::deinitialize->emplace_back([this]() {
         ZoneScopedN("WebBrowserModule")
 
         deinitialize();
@@ -105,7 +107,7 @@ void WebBrowserModule::internalDeinitialize() {
         return;
     }
 
-    _eventHandler.resetBrowserInstance();
+    _eventHandler->resetBrowserInstance();
 
     bool forceBrowserShutdown = true;
     for (BrowserInstance* browser : _browsers) {
@@ -127,14 +129,14 @@ std::string WebBrowserModule::findHelperExecutable() {
 void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
     ZoneScoped
 
-    if (dictionary.hasKeyAndValue<bool>("WebHelperLocation")) {
+    if (dictionary.hasValue<bool>("WebHelperLocation")) {
         _webHelperLocation = absPath(dictionary.value<std::string>("WebHelperLocation"));
     }
     else {
         _webHelperLocation = findHelperExecutable();
     }
 
-    if (dictionary.hasKeyAndValue<bool>("Enabled")) {
+    if (dictionary.hasValue<bool>("Enabled")) {
         _enabled = dictionary.value<bool>("Enabled");
     }
 
@@ -159,7 +161,7 @@ void WebBrowserModule::internalInitialize(const ghoul::Dictionary& dictionary) {
         );
     }
 
-    _eventHandler.initialize();
+    _eventHandler->initialize();
 
     // register ScreenSpaceBrowser
     auto fScreenSpaceRenderable = FactoryManager::ref().factory<ScreenSpaceRenderable>();
@@ -199,17 +201,13 @@ void WebBrowserModule::removeBrowser(BrowserInstance* browser) {
 
 void WebBrowserModule::attachEventHandler(BrowserInstance* browserInstance) {
     if (_enabled) {
-        _eventHandler.setBrowserInstance(browserInstance);
+        _eventHandler->setBrowserInstance(browserInstance);
     }
 }
 
-EventHandler WebBrowserModule::eventHandler() {
-    return _eventHandler;
-}
-
 void WebBrowserModule::detachEventHandler() {
     if (_enabled) {
-        _eventHandler.setBrowserInstance(nullptr);
+        _eventHandler->setBrowserInstance(nullptr);
     }
 }
 
diff --git a/modules/webbrowser/webbrowsermodule.h b/modules/webbrowser/webbrowsermodule.h
index bc2c78a2a7..adc3379bb3 100644
--- a/modules/webbrowser/webbrowsermodule.h
+++ b/modules/webbrowser/webbrowsermodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,7 +25,6 @@
 #ifndef __OPENSPACE_MODULE_WEBBROWSER___WEBBROWSERMODULE___H__
 #define __OPENSPACE_MODULE_WEBBROWSER___WEBBROWSERMODULE___H__
 
-#include <modules/webbrowser/include/eventhandler.h>
 #include <openspace/util/openspacemodule.h>
 #include <openspace/properties/scalar/boolproperty.h>
 #include <openspace/properties/scalar/floatproperty.h>
@@ -33,7 +32,9 @@
 
 namespace openspace {
 
+class BrowserInstance;
 class CefHost;
+class EventHandler;
 
 namespace webbrowser {
     extern std::chrono::microseconds interval;
@@ -51,7 +52,6 @@ public:
     void addBrowser(BrowserInstance*);
     void removeBrowser(BrowserInstance*);
 
-    EventHandler eventHandler();
     void attachEventHandler(BrowserInstance* browserInstance);
     void detachEventHandler();
     bool isEnabled() const;
@@ -73,7 +73,7 @@ private:
     properties::FloatProperty _browserUpdateInterval;
 
     std::vector<BrowserInstance*> _browsers;
-    EventHandler _eventHandler;
+    std::unique_ptr<EventHandler> _eventHandler;
     std::unique_ptr<CefHost> _cefHost;
     std::string _webHelperLocation;
     bool _enabled = true;
diff --git a/modules/webgui/CMakeLists.txt b/modules/webgui/CMakeLists.txt
index 3bd341131a..3089f47696 100644
--- a/modules/webgui/CMakeLists.txt
+++ b/modules/webgui/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -35,8 +35,6 @@ set(OPENSPACE_SOURCE_FILES
 )
 source_group("Source Files" FILES ${OPENSPACE_SOURCE_FILES})
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 # Specify the NodeJs distribution version.
diff --git a/modules/webgui/cmake/nodejs_support.cmake b/modules/webgui/cmake/nodejs_support.cmake
index 1296a709eb..0b90111fd6 100644
--- a/modules/webgui/cmake/nodejs_support.cmake
+++ b/modules/webgui/cmake/nodejs_support.cmake
@@ -1,47 +1,47 @@
-#########################################################################################
-#                                                                                       #
-# OpenSpace                                                                             #
-#                                                                                       #
-# Copyright (c) 2014-2017                                                               #
-#                                                                                       #
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this  #
-# software and associated documentation files (the "Software"), to deal in the Software #
-# without restriction, including without limitation the rights to use, copy, modify,    #
-# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    #
-# permit persons to whom the Software is furnished to do so, subject to the following   #
-# conditions:                                                                           #
-#                                                                                       #
-# The above copyright notice and this permission notice shall be included in all copies #
-# or substantial portions of the Software.                                              #
-#                                                                                       #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   #
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         #
-# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    #
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  #
-# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  #
-# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         #
-#########################################################################################
+##########################################################################################
+#                                                                                        #
+# 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.                                          #
+##########################################################################################
 
 # https://nodejs.org/dist/v8.9.4/win-x64/node.exe
 # https://nodejs.org/dist/v8.9.4/node-v8.9.4-darwin-x64.tar.gz
 # https://nodejs.org/dist/v8.9.4/node-v8.9.4-linux-x64.tar.xz
 
 function(DownloadNodeJs version download_dir)
-  if(MSVC)
+  if (MSVC)
     set(basename "node")
     set(filename "${basename}.exe")
     set(path "v${version}/win-x64/${filename}")
-  endif(MSVC)
-  if(APPLE)
+  endif ()
+  if (APPLE)
     set(basename "node-v${version}-darwin-x64")
     set(filename "${basename}.tar.gz")
     set(path "v${version}/${filename}")
-  endif(APPLE)
+  endif ()
   if (UNIX AND NOT APPLE)
     set(basename "node-v${version}-linux-x64")
     set(filename "${basename}.tar.xz")
     set(path "v${version}/${filename}")
-  endif(UNIX AND NOT APPLE)
+  endif ()
 
   # Specify the binary distribution type and download directory.
   set(NODEJS_DOWNLOAD_DIR "${download_dir}")
@@ -50,19 +50,16 @@ function(DownloadNodeJs version download_dir)
   set(NODEJS_ROOT "${NODEJS_DOWNLOAD_DIR}" CACHE INTERNAL "NODEJS_ROOT")
 
   # Download and/or extract the binary distribution if necessary.
-  if(NOT IS_DIRECTORY "${NODEJS_ROOT}")
+  if (NOT IS_DIRECTORY "${NODEJS_ROOT}")
     set(NODEJS_DOWNLOAD_SOURCE "v${version}/node-v${version}-${suffix}")
     set(NODEJS_DOWNLOAD_PATH "${NODEJS_DOWNLOAD_DIR}/${filename}")
-    if(NOT EXISTS "${NODEJS_DOWNLOAD_PATH}")
+    if (NOT EXISTS "${NODEJS_DOWNLOAD_PATH}")
       set(NODEJS_DOWNLOAD_URL "https://nodejs.org/dist/${path}")
 
       # Download the binary distribution.
       message(STATUS "Downloading NodeJs: ${NODEJS_DOWNLOAD_PATH}...")
-      file(
-        DOWNLOAD "${NODEJS_DOWNLOAD_URL}" "${NODEJS_DOWNLOAD_PATH}"
-        SHOW_PROGRESS
-        )
-    endif()
+      file(DOWNLOAD "${NODEJS_DOWNLOAD_URL}" "${NODEJS_DOWNLOAD_PATH}" SHOW_PROGRESS)
+    endif ()
 
     message(STATUS "URL: ${NODEJS_DOWNLOAD_URL}")
 
@@ -74,21 +71,20 @@ function(DownloadNodeJs version download_dir)
         COMMAND tar xzf ${NODEJS_DOWNLOAD_PATH}
         WORKING_DIRECTORY ${NODEJS_DOWNLOAD_DIR}
       )
-    endif()
+    endif ()
     if (UNIX AND NOT APPLE)
       # Linux uses tar.xz
       message(STATUS "Extracting NodeJs: ${NODEJS_DOWNLOAD_PATH} in ${NODEJS_DOWNLOAD_DIR}")
       execute_process(
-        COMMAND tar xvf ${NODEJS_DOWNLOAD_PATH}
+        COMMAND tar xf ${NODEJS_DOWNLOAD_PATH}
         WORKING_DIRECTORY ${NODEJS_DOWNLOAD_DIR}
       )
-    endif()
+    endif ()
 
     if (UNIX)
-      FILE(COPY ${NODEJS_DOWNLOAD_DIR}/${basename}/bin/node
-           DESTINATION ${NODEJS_DOWNLOAD_DIR})
+      FILE(COPY ${NODEJS_DOWNLOAD_DIR}/${basename}/bin/node DESTINATION ${NODEJS_DOWNLOAD_DIR})
       FILE(REMOVE_RECURSE ${NODEJS_DOWNLOAD_DIR}/${basename})
       FILE(REMOVE ${NODEJS_DOWNLOAD_PATH})
-    endif()
-  endif()
-endfunction()
+    endif ()
+  endif ()
+endfunction ()
diff --git a/modules/webgui/include.cmake b/modules/webgui/include.cmake
index 448a857dfd..3ccace7c97 100644
--- a/modules/webgui/include.cmake
+++ b/modules/webgui/include.cmake
@@ -1,4 +1 @@
 set (DEFAULT_MODULE ON)
-set (OPENSPACE_DEPENDENCIES
-  server
-)
diff --git a/modules/webgui/webguimodule.cpp b/modules/webgui/webguimodule.cpp
index aa09e84e0b..774e8b675d 100644
--- a/modules/webgui/webguimodule.cpp
+++ b/modules/webgui/webguimodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -194,8 +194,10 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
     _servedDirectories.onChange([this]() {
         std::unordered_map<std::string, std::string> newEndpoints;
         std::vector<std::string> list = _servedDirectories.value();
-        for (int i = 0; i < list.size() - 1; i += 2) {
-            newEndpoints[list[i]] = newEndpoints[list[i + 1]];
+        if (!list.empty()) {
+            for (size_t i = 0; i < list.size() - 1; i += 2) {
+                newEndpoints[list[i]] = newEndpoints[list[i + 1]];
+            }
         }
         for (const std::pair<const std::string, std::string>& e : _endpoints) {
             if (newEndpoints.find(e.first) == newEndpoints.end()) {
@@ -221,7 +223,7 @@ void WebGuiModule::internalInitialize(const ghoul::Dictionary& configuration) {
 void WebGuiModule::notifyEndpointListeners(const std::string& endpoint, bool exists) {
     using K = CallbackHandle;
     using V = EndpointCallback;
-    for (const std::pair<const K, V>& it : _endpointChangeCallbacks) {
+    for (const std::pair<K, V>& it : _endpointChangeCallbacks) {
         it.second(endpoint, exists);
     }
 }
diff --git a/modules/webgui/webguimodule.h b/modules/webgui/webguimodule.h
index 3286b6d927..7a97a136bb 100644
--- a/modules/webgui/webguimodule.h
+++ b/modules/webgui/webguimodule.h
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/openspace.cfg b/openspace.cfg
index 4410c6c261..2eba4ff450 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -21,7 +21,7 @@ SGCTConfig = sgct.config.single{vsync=false}
 -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"}
 
 --for more details about sgct configuration options see:
--- http://wiki.openspaceproject.com/docs/users/configfile
+-- https://sgct.github.io/configuration-files.html
 
 -- To use a sgct configuration file set the variable like below
 -- SGCTConfig = "${CONFIG}/single_gui.xml"
@@ -95,7 +95,11 @@ Paths = {
     PROFILES = "${DATA}/profiles",
     FONTS = "${DATA}/fonts",
     TASKS = "${DATA}/tasks",
-    SYNC = "${BASE}/sync",
+    -- If the the 'OPENSPACE_SYNC' environment variable is defined on the system, use that
+    -- value.  Otherwise, fall back to the ${BASE}/sync folder instead.  This allows a
+    -- reuse of the sync folder between multiple OpenSpace installations by simply setting
+    -- that environment variable
+    SYNC = os.getenv("OPENSPACE_SYNC") or "${BASE}/sync",
     SCREENSHOTS = "${BASE}/screenshots",
     WEB = "${DATA}/web",
     RECORDINGS = "${BASE}/recordings",
@@ -215,13 +219,18 @@ ScreenSpaceRotation = { 0.0, 0.0, 0.0 }
 
 RenderingMethod = "Framebuffer"
 OpenGLDebugContext = {
-   Activate = false,
+   Activate = true,
    FilterIdentifier = {
        { Type = "Other", Source = "API", Identifier = 131185 },
---      Buffer performance warning: "copied/moved from VIDEO memory to HOST memory"
+       -- 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
-       { Type = "Deprecated", Source = "API", Identifier = 7 }
+       -- API_ID_LINE_WIDTH deprecated behavior warning has been generated
+       { Type = "Deprecated", Source = "API", Identifier = 7 },
+       -- Program/shader state performance warning: Vertex shader in program %i is being recompiled based on GL state.
+       { Type = "Performance", Source = "API", Identifier = 131218 },
+       -- This is getting a bit wordy
+       { Type = "Push group", Source = "Application", Identifier = 0 },
+       { Type = "Pop group", Source = "Application", Identifier = 0 },
    },
 -- FilterSeverity = { }
 }
diff --git a/scripts/configuration_helper.lua b/scripts/configuration_helper.lua
index 2fc3bf4c67..970314a89a 100644
--- a/scripts/configuration_helper.lua
+++ b/scripts/configuration_helper.lua
@@ -345,7 +345,6 @@ function generateCluster(arg)
 <?xml version="1.0" ?>
 <Cluster
     masterAddress="localhost"
-    externalControlPort="20500"
     debug="]] .. tostring(arg["sgctDebug"]) .. [["
 >
 ]] .. (arg["settings"] or "") .. [[
diff --git a/shaders/PowerScaling/powerScalingMath.hglsl b/shaders/PowerScaling/powerScalingMath.hglsl
index c07c248f4b..3e3f898221 100644
--- a/shaders/PowerScaling/powerScalingMath.hglsl
+++ b/shaders/PowerScaling/powerScalingMath.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/PowerScaling/powerScaling_fs.hglsl b/shaders/PowerScaling/powerScaling_fs.hglsl
index d30d5370fa..c09e68c724 100644
--- a/shaders/PowerScaling/powerScaling_fs.hglsl
+++ b/shaders/PowerScaling/powerScaling_fs.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,26 +31,6 @@
 
 #include "powerScalingMath.hglsl"
 
-const float s_far            = 27.0f; //= gl_DepthRange.far;    // 40
-const float s_farcutoff        = 12.0f;
-const float s_nearcutoff    = 7.00f;
-const float s_near            = 1.00f;// gl_DepthRange.near;    // 0.1
-
-vec4 psc_normlization(vec4 invec) {
-    
-    float xymax = max(invec.x,invec.y);
-
-    if(invec.z > 0.0f || invec.z < 0.0f) {
-        return invec / abs(invec.z);
-    } else if (xymax != 0.0f) {
-        return invec / xymax;
-    } else {
-        return invec / -.0;
-    }
-}
-
-
-
 float pscDepth(vec4 position) {
     // For now: simply convert power scaled coordinates to a linear scale.
     // TODO: get rid of power scaled coordinates and use scale graph instead.
@@ -58,6 +38,4 @@ float pscDepth(vec4 position) {
     return safeLength(pscToLinear(position));
 }
 
-
-
 #endif
diff --git a/shaders/PowerScaling/powerScaling_vs.hglsl b/shaders/PowerScaling/powerScaling_vs.hglsl
index 85b94bd939..d422a897bb 100644
--- a/shaders/PowerScaling/powerScaling_vs.hglsl
+++ b/shaders/PowerScaling/powerScaling_vs.hglsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -37,15 +37,6 @@ vec4 psc_to_meter(vec4 v1, vec2 v2) {
     return vec4(v1.xyz * factor, 1.0);
 }
 
-vec4 psc_scaling(vec4 v1, vec2 v2) {
-    float ds = v2.y - v1.w;
-    if(ds >= 0) {
-        return vec4(v1.xyz * v2.x * pow(k,v1.w), v2.y);
-    } else {
-        return vec4(v1.xyz * v2.x * pow(k,v2.y), v1.w);
-    }
-}
-
 // vertexPosition is returned as the transformed vertex in OS Camera Rig Space in PSC
 vec4 pscTransform(inout vec4 vertexPosition, mat4 modelTransform) {
     vec3 local_vertex_pos = mat3(modelTransform) * vertexPosition.xyz;
@@ -59,7 +50,13 @@ vec4 pscTransform(inout vec4 vertexPosition, mat4 modelTransform) {
     // rotate the camera
     vertexPosition.xyz =  mat3(camrot) * vertexPosition.xyz;
     vec4 tmp = vertexPosition;
-    vertexPosition = psc_scaling(vertexPosition, scaling);
+
+    float ds = scaling.y - vertexPosition.w;
+    if (ds >= 0) {
+        vertexPosition = vec4(vertexPosition.xyz * scaling.x * pow(k, vertexPosition.w), scaling.y);
+    } else {
+        vertexPosition = vec4(vertexPosition.xyz * scaling.x * pow(k, scaling.y), vertexPosition.w);
+    }
     
     // project using the rescaled coordinates,
     tmp = psc_to_meter(tmp, scaling);
diff --git a/shaders/abuffer/abufferfragment.glsl b/shaders/abuffer/abufferfragment.glsl
index 519c76136f..a08b2b44bb 100644
--- a/shaders/abuffer/abufferfragment.glsl
+++ b/shaders/abuffer/abufferfragment.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/abufferresources.glsl b/shaders/abuffer/abufferresources.glsl
index 2083160765..0fe6c64655 100644
--- a/shaders/abuffer/abufferresources.glsl
+++ b/shaders/abuffer/abufferresources.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/boundsabuffer.frag b/shaders/abuffer/boundsabuffer.frag
index 39b3c9de74..41820282ab 100644
--- a/shaders/abuffer/boundsabuffer.frag
+++ b/shaders/abuffer/boundsabuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/raycasterdata.glsl b/shaders/abuffer/raycasterdata.glsl
index 6adc2b505d..d4803b9894 100644
--- a/shaders/abuffer/raycasterdata.glsl
+++ b/shaders/abuffer/raycasterdata.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/renderabuffer.frag b/shaders/abuffer/renderabuffer.frag
index 316238681b..c413335aec 100644
--- a/shaders/abuffer/renderabuffer.frag
+++ b/shaders/abuffer/renderabuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/renderabuffer.vert b/shaders/abuffer/renderabuffer.vert
index 95ffd3ac7a..bc69947439 100644
--- a/shaders/abuffer/renderabuffer.vert
+++ b/shaders/abuffer/renderabuffer.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/resolveabuffer.frag b/shaders/abuffer/resolveabuffer.frag
index d3681578da..c9c03c3ed7 100644
--- a/shaders/abuffer/resolveabuffer.frag
+++ b/shaders/abuffer/resolveabuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/resolveabuffer.vert b/shaders/abuffer/resolveabuffer.vert
index c33c92d84d..ce038d9da6 100644
--- a/shaders/abuffer/resolveabuffer.vert
+++ b/shaders/abuffer/resolveabuffer.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/abuffer/resolvehelpers.glsl b/shaders/abuffer/resolvehelpers.glsl
index 2a474879c9..f2b03b77be 100644
--- a/shaders/abuffer/resolvehelpers.glsl
+++ b/shaders/abuffer/resolvehelpers.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -53,7 +53,15 @@ uniform vec3 cameraPosInRaycaster#{index}
 #endif
 
 
-
+/**
+ * Normalize a vector
+ * Supporting huge vectors, where the square of any of the components is too large to be
+ * represent as a float. 
+ */
+vec3 safeNormalize(vec3 v) {
+    float m = max(max(abs(v.x), abs(v.y)), abs(v.z));
+    return normalize(v / m);
+}
 
 uniform int nAaSamples;
 
diff --git a/shaders/blending.glsl b/shaders/blending.glsl
index c5dce91519..53dc78b6bc 100644
--- a/shaders/blending.glsl
+++ b/shaders/blending.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/floatoperations.glsl b/shaders/floatoperations.glsl
index dad993dc47..b583c386c8 100644
--- a/shaders/floatoperations.glsl
+++ b/shaders/floatoperations.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -62,32 +62,7 @@ float safeLength(vec4 v) {
     }
 }
 
-float safeLength(vec3 v) {
-    float m = max(max(abs(v.x), abs(v.y)), abs(v.z));
-    if (m > 0.f) {
-        return length(v / m) * m;
-    } else {
-        return 0.f;
-    }
-}
-
-float safeLength(vec2 v) {
-    float m = max(abs(v.x), abs(v.y));
-    if (m > 0.f) {
-        return length(v / m) * m;
-    } else {
-        return 0.f;
-    }
-}
-
-/**
- * Normalize a vector
- * Supporting huge vectors, where the square of any of the components is too large to be
- * represent as a float. 
- */
-vec3 safeNormalize(vec3 v) {
-    float m = max(max(abs(v.x), abs(v.y)), abs(v.z));
-    return normalize(v / m);
-}
+float safeLength(vec3 v) { return safeLength(vec4(v, 0.0)); }
+float safeLength(vec2 v) { return safeLength(vec4(v, 0.0, 0.0)); }
 
 #endif // _FLOATOPERATIONS_GLSL_
diff --git a/shaders/fragment.glsl b/shaders/fragment.glsl
index 7607996e74..d7d815ee65 100644
--- a/shaders/fragment.glsl
+++ b/shaders/fragment.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/exitframebuffer.frag b/shaders/framebuffer/exitframebuffer.frag
index 0280f0a36c..273ca7d3f5 100644
--- a/shaders/framebuffer/exitframebuffer.frag
+++ b/shaders/framebuffer/exitframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/fxaa.frag b/shaders/framebuffer/fxaa.frag
index c558b4cd04..2a86d8b9ea 100644
--- a/shaders/framebuffer/fxaa.frag
+++ b/shaders/framebuffer/fxaa.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -230,4 +230,4 @@ void main() {
     }
 
     aaFinalColor = texture(renderedTexture, finalUV);
-}
\ No newline at end of file
+}
diff --git a/shaders/framebuffer/fxaa.vert b/shaders/framebuffer/fxaa.vert
index b0a412be03..8429abf101 100644
--- a/shaders/framebuffer/fxaa.vert
+++ b/shaders/framebuffer/fxaa.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/hdrAndFiltering.frag b/shaders/framebuffer/hdrAndFiltering.frag
index d4e43cbdf8..5c501b4eaa 100644
--- a/shaders/framebuffer/hdrAndFiltering.frag
+++ b/shaders/framebuffer/hdrAndFiltering.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/hdrAndFiltering.vert b/shaders/framebuffer/hdrAndFiltering.vert
index b0a412be03..8429abf101 100644
--- a/shaders/framebuffer/hdrAndFiltering.vert
+++ b/shaders/framebuffer/hdrAndFiltering.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/inside.glsl b/shaders/framebuffer/inside.glsl
index 012a221fd9..9e80f65abf 100644
--- a/shaders/framebuffer/inside.glsl
+++ b/shaders/framebuffer/inside.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/mergeDownscaledVolume.frag b/shaders/framebuffer/mergeDownscaledVolume.frag
index b255d2a590..034ea8c5b9 100644
--- a/shaders/framebuffer/mergeDownscaledVolume.frag
+++ b/shaders/framebuffer/mergeDownscaledVolume.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/mergeDownscaledVolume.vert b/shaders/framebuffer/mergeDownscaledVolume.vert
index b0a412be03..8429abf101 100644
--- a/shaders/framebuffer/mergeDownscaledVolume.vert
+++ b/shaders/framebuffer/mergeDownscaledVolume.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/nOneStripMSAA.frag b/shaders/framebuffer/nOneStripMSAA.frag
index 4386ad4af5..cdceb55337 100644
--- a/shaders/framebuffer/nOneStripMSAA.frag
+++ b/shaders/framebuffer/nOneStripMSAA.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/nOneStripMSAA.vert b/shaders/framebuffer/nOneStripMSAA.vert
index ccce241d15..f757ce0eb4 100644
--- a/shaders/framebuffer/nOneStripMSAA.vert
+++ b/shaders/framebuffer/nOneStripMSAA.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/outside.glsl b/shaders/framebuffer/outside.glsl
index 847304b039..0d902214ee 100644
--- a/shaders/framebuffer/outside.glsl
+++ b/shaders/framebuffer/outside.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/raycastframebuffer.frag b/shaders/framebuffer/raycastframebuffer.frag
index 1a9efc53c2..ecf0bd0c20 100644
--- a/shaders/framebuffer/raycastframebuffer.frag
+++ b/shaders/framebuffer/raycastframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/renderframebuffer.frag b/shaders/framebuffer/renderframebuffer.frag
index deb68cb122..4139267ef0 100644
--- a/shaders/framebuffer/renderframebuffer.frag
+++ b/shaders/framebuffer/renderframebuffer.frag
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/framebuffer/resolveframebuffer.vert b/shaders/framebuffer/resolveframebuffer.vert
index 320f8b7f15..b5b2bfc730 100644
--- a/shaders/framebuffer/resolveframebuffer.vert
+++ b/shaders/framebuffer/resolveframebuffer.vert
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/hdr.glsl b/shaders/hdr.glsl
index 63dc9b5d2d..01904eae76 100644
--- a/shaders/hdr.glsl
+++ b/shaders/hdr.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/shaders/rand.glsl b/shaders/rand.glsl
index f2ac746245..e8f16f3253 100644
--- a/shaders/rand.glsl
+++ b/shaders/rand.glsl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf8dce02a9..6f62fad495 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -63,6 +63,7 @@ set(OPENSPACE_SOURCE
   ${OPENSPACE_BASE_DIR}/src/interaction/shortcutmanager_lua.inl
   ${OPENSPACE_BASE_DIR}/src/interaction/websocketinputstate.cpp
   ${OPENSPACE_BASE_DIR}/src/interaction/websocketcamerastates.cpp
+  ${OPENSPACE_BASE_DIR}/src/interaction/tasks/convertrecfileversiontask.cpp
   ${OPENSPACE_BASE_DIR}/src/interaction/tasks/convertrecformattask.cpp
   ${OPENSPACE_BASE_DIR}/src/mission/mission.cpp
   ${OPENSPACE_BASE_DIR}/src/mission/missionmanager.cpp
@@ -142,6 +143,7 @@ set(OPENSPACE_SOURCE
   ${OPENSPACE_BASE_DIR}/src/rendering/renderengine.cpp
   ${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl
   ${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp
+  ${OPENSPACE_BASE_DIR}/src/rendering/texturecomponent.cpp
   ${OPENSPACE_BASE_DIR}/src/rendering/transferfunction.cpp
   ${OPENSPACE_BASE_DIR}/src/rendering/volumeraycaster.cpp
   ${OPENSPACE_BASE_DIR}/src/scene/asset.cpp
@@ -177,6 +179,7 @@ set(OPENSPACE_SOURCE
   ${OPENSPACE_BASE_DIR}/src/util/httprequest.cpp
   ${OPENSPACE_BASE_DIR}/src/util/keys.cpp
   ${OPENSPACE_BASE_DIR}/src/util/openspacemodule.cpp
+  ${OPENSPACE_BASE_DIR}/src/util/planegeometry.cpp
   ${OPENSPACE_BASE_DIR}/src/util/progressbar.cpp
   ${OPENSPACE_BASE_DIR}/src/util/resourcesynchronization.cpp
   ${OPENSPACE_BASE_DIR}/src/util/screenlog.cpp
@@ -246,6 +249,7 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/shortcutmanager.h
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketinputstate.h
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketcamerastates.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/tasks/convertrecfileversiontask.h
   ${OPENSPACE_BASE_DIR}/include/openspace/interaction/tasks/convertrecformattask.h
   ${OPENSPACE_BASE_DIR}/include/openspace/mission/mission.h
   ${OPENSPACE_BASE_DIR}/include/openspace/mission/missionmanager.h
@@ -320,6 +324,7 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboard.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboarditem.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/framebufferrenderer.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcaster.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcasterlistener.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcastermanager.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/loadingscreen.h
@@ -330,11 +335,11 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderable.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderer.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volume.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcaster.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/texturecomponent.h
   ${OPENSPACE_BASE_DIR}/include/openspace/rendering/transferfunction.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volume.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h
   ${OPENSPACE_BASE_DIR}/include/openspace/scene/asset.h
   ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetlistener.h
   ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetloader.h
@@ -371,6 +376,7 @@ set(OPENSPACE_HEADER
   ${OPENSPACE_BASE_DIR}/include/openspace/util/memorymanager.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/mouse.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/openspacemodule.h
+  ${OPENSPACE_BASE_DIR}/include/openspace/util/planegeometry.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/progressbar.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/resourcesynchronization.h
   ${OPENSPACE_BASE_DIR}/include/openspace/util/screenlog.h
@@ -432,19 +438,46 @@ endforeach ()
 # Create OpenSpace target
 ##########################################################################################
 add_library(openspace-core STATIC ${OPENSPACE_HEADER} ${OPENSPACE_SOURCE})
-target_include_directories(openspace-core PUBLIC
-  # In order to be able to include openspace-core files
-  ${OPENSPACE_BASE_DIR}/include
-  # In order to be able to include module files
-  ${OPENSPACE_BASE_DIR}
-  # In order to use the date library
-  ${OPENSPACE_BASE_DIR}/ext/date/include
-  # In order to use the nlohmann JSON library
-  ${OPENSPACE_BASE_DIR}/ext
-  # In order to be able to include the module_registration file
-  ${CMAKE_BINARY_DIR}/_generated/include
+target_include_directories(openspace-core SYSTEM
+  PUBLIC
+    # In order to use the date library
+    ${OPENSPACE_BASE_DIR}/ext/date/include
+    # In order to use the nlohmann JSON library
+    ${OPENSPACE_BASE_DIR}/ext
 )
 
+target_include_directories(openspace-core
+  PUBLIC
+    # In order to be able to include openspace-core files
+    ${OPENSPACE_BASE_DIR}/include
+    # In order to be able to include the module_registration file
+    ${CMAKE_BINARY_DIR}/_generated/include
+
+  PRIVATE
+    # In order to be able to include module files.  This is a temporary fix as this
+    # introduces a dependency from the opnspace-core onto the modules
+    ${OPENSPACE_BASE_DIR}
+)
+
+target_precompile_headers(openspace-core PRIVATE
+  [["ghoul/fmt.h"]]
+  [["ghoul/glm.h"]]
+  [["ghoul/misc/assert.h"]]
+  [["ghoul/misc/boolean.h"]]
+  [["ghoul/misc/exception.h"]]
+  [["ghoul/misc/invariants.h"]]
+  [["ghoul/misc/profiling.h"]]
+  <algorithm>
+  <array>
+  <map>
+  <memory>
+  <string>
+  <utility>
+  <vector>
+)
+
+add_dependencies(openspace-core run_codegen)
+
 configure_file(
   ${OPENSPACE_CMAKE_EXT_DIR}/openspace_header.template
   ${CMAKE_BINARY_DIR}/_generated/include/openspace/openspace.h
@@ -458,8 +491,18 @@ configure_file(
 )
 
 if (APPLE)
-  find_library(APPKIT_LIBRARY AppKit REQUIRED)
-  target_link_libraries(openspace-core PUBLIC ${APPKIT_LIBRARY})
+  target_link_libraries(openspace-core INTERFACE external-system-apple)
 endif ()
 
 set_openspace_compile_settings(openspace-core)
+target_link_libraries(openspace-core PUBLIC Ghoul spice external-curl)
+
+if (OPENSPACE_WITH_ABUFFER_RENDERER)
+  target_compile_definitions(openspace-core PUBLIC "OPENSPACE_WITH_ABUFFER_RENDERER")
+endif ()
+
+# Just in case, create the bin directory
+add_custom_command(
+  TARGET openspace-core
+  PRE_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+)
diff --git a/src/documentation/core_registration.cpp b/src/documentation/core_registration.cpp
index fe894136f8..3dd2756fb2 100644
--- a/src/documentation/core_registration.cpp
+++ b/src/documentation/core_registration.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/documentation/documentation.cpp b/src/documentation/documentation.cpp
index 4c9f074f6c..ef1bfc8843 100644
--- a/src/documentation/documentation.cpp
+++ b/src/documentation/documentation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -179,7 +179,8 @@ TestResult testSpecification(const Documentation& documentation,
     TestResult result;
     result.success = true;
 
-    auto applyVerifier = [dictionary, &result](Verifier& verifier, const std::string& key)
+    auto applyVerifier = [dictionary, &result](const Verifier& verifier,
+                                               const std::string& key)
     {
         TestResult res = verifier(dictionary, key);
         if (!res.success) {
@@ -199,8 +200,8 @@ TestResult testSpecification(const Documentation& documentation,
 
     for (const auto& p : documentation.entries) {
         if (p.key == DocumentationEntry::Wildcard) {
-            for (const std::string& key : dictionary.keys()) {
-                applyVerifier(*(p.verifier), key);
+            for (std::string_view key : dictionary.keys()) {
+                applyVerifier(*(p.verifier), std::string(key));
             }
         }
         else {
@@ -238,7 +239,7 @@ void testSpecificationAndThrow(const Documentation& documentation,
     // Perform testing against the documentation/specification
     TestResult testResult = testSpecification(documentation, dictionary);
     if (!testResult.success) {
-        throw SpecificationError(std::move(testResult), std::move(component));
+        throw SpecificationError(testResult, component);
     }
 }
 
diff --git a/src/documentation/documentationengine.cpp b/src/documentation/documentationengine.cpp
index 174fa7f05a..35edf1a73e 100644
--- a/src/documentation/documentationengine.cpp
+++ b/src/documentation/documentationengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -46,13 +46,11 @@ namespace openspace::documentation {
 DocumentationEngine* DocumentationEngine::_instance = nullptr;
 
 DocumentationEngine::DuplicateDocumentationException::DuplicateDocumentationException(
-                                                              Documentation documentation)
+                                                                        Documentation doc)
     : ghoul::RuntimeError(fmt::format(
-        "Duplicate Documentation with name '{}' and id '{}'",
-        documentation.name,
-        documentation.id
+        "Duplicate Documentation with name '{}' and id '{}'",doc.name, doc.id
     ))
-    , documentation(std::move(documentation))
+    , documentation(std::move(doc))
 {}
 
 DocumentationEngine::DocumentationEngine()
diff --git a/src/documentation/documentationgenerator.cpp b/src/documentation/documentationgenerator.cpp
index b81cd02bd1..8f7880a576 100644
--- a/src/documentation/documentationgenerator.cpp
+++ b/src/documentation/documentationgenerator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/documentation/verifier.cpp b/src/documentation/verifier.cpp
index e1809f3bab..3cea6786bc 100644
--- a/src/documentation/verifier.cpp
+++ b/src/documentation/verifier.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,23 +32,23 @@ namespace openspace::documentation {
 
 // The explicit template instantiations for many of the commonly used template values
 // This cuts down on the compilation time by only compiling these once
-template struct Vector2Verifier<bool>;
+//template struct Vector2Verifier<bool>;
 template struct Vector2Verifier<int>;
 template struct Vector2Verifier<double>;
-template struct Vector3Verifier<bool>;
+//template struct Vector3Verifier<bool>;
 template struct Vector3Verifier<int>;
 template struct Vector3Verifier<double>;
-template struct Vector4Verifier<bool>;
+//template struct Vector4Verifier<bool>;
 template struct Vector4Verifier<int>;
 template struct Vector4Verifier<double>;
 
-template struct Vector2ListVerifier<bool>;
+//template struct Vector2ListVerifier<bool>;
 template struct Vector2ListVerifier<int>;
 template struct Vector2ListVerifier<double>;
-template struct Vector3ListVerifier<bool>;
+//template struct Vector3ListVerifier<bool>;
 template struct Vector3ListVerifier<int>;
 template struct Vector3ListVerifier<double>;
-template struct Vector4ListVerifier<bool>;
+//template struct Vector4ListVerifier<bool>;
 template struct Vector4ListVerifier<int>;
 template struct Vector4ListVerifier<double>;
 
@@ -100,13 +100,13 @@ template struct AnnotationVerifier<IntVerifier>;
 template struct AnnotationVerifier<DoubleVerifier>;
 template struct AnnotationVerifier<StringVerifier>;
 template struct AnnotationVerifier<TableVerifier>;
-template struct AnnotationVerifier<BoolVector2Verifier>;
+//template struct AnnotationVerifier<BoolVector2Verifier>;
 template struct AnnotationVerifier<IntVector2Verifier>;
 template struct AnnotationVerifier<DoubleVector2Verifier>;
-template struct AnnotationVerifier<BoolVector3Verifier>;
+//template struct AnnotationVerifier<BoolVector3Verifier>;
 template struct AnnotationVerifier<IntVector3Verifier>;
 template struct AnnotationVerifier<DoubleVector3Verifier>;
-template struct AnnotationVerifier<BoolVector4Verifier>;
+//template struct AnnotationVerifier<BoolVector4Verifier>;
 template struct AnnotationVerifier<IntVector4Verifier>;
 template struct AnnotationVerifier<DoubleVector4Verifier>;
 
@@ -115,13 +115,13 @@ template struct DeprecatedVerifier<IntVerifier>;
 template struct DeprecatedVerifier<DoubleVerifier>;
 template struct DeprecatedVerifier<StringVerifier>;
 template struct DeprecatedVerifier<TableVerifier>;
-template struct DeprecatedVerifier<BoolVector2Verifier>;
+//template struct DeprecatedVerifier<BoolVector2Verifier>;
 template struct DeprecatedVerifier<IntVector2Verifier>;
 template struct DeprecatedVerifier<DoubleVector2Verifier>;
-template struct DeprecatedVerifier<BoolVector3Verifier>;
+//template struct DeprecatedVerifier<BoolVector3Verifier>;
 template struct DeprecatedVerifier<IntVector3Verifier>;
 template struct DeprecatedVerifier<DoubleVector3Verifier>;
-template struct DeprecatedVerifier<BoolVector4Verifier>;
+//template struct DeprecatedVerifier<BoolVector4Verifier>;
 template struct DeprecatedVerifier<IntVector4Verifier>;
 template struct DeprecatedVerifier<DoubleVector4Verifier>;
 
@@ -133,11 +133,11 @@ std::string DoubleVerifier::type() const {
     return "Double";
 }
 
-TestResult IntVerifier::operator()(const ghoul::Dictionary & dict,
+TestResult IntVerifier::operator()(const ghoul::Dictionary& dict,
                                    const std::string & key) const
 {
-    if (dict.hasKeyAndValue<int>(key)) {
-        // We we have a key and the value is int, we are done
+    if (dict.hasValue<int>(key)) {
+        // We have a key and the value is int, we are done
         return { true, {}, {} };
     }
     else {
@@ -177,6 +177,120 @@ std::string StringVerifier::type() const {
     return "String";
 }
 
+template <>
+TestResult TemplateVerifier<glm::ivec2>::operator()(const ghoul::Dictionary& dict,
+                                                    const std::string& key) const
+{
+    if (dict.hasValue<glm::ivec2>(key)) {
+        return { true, {}, {} };
+    }
+    else {
+        if (dict.hasKey(key)) {
+            if (dict.hasValue<glm::dvec2>(key)) {
+                glm::dvec2 value = dict.value<glm::dvec2>(key);
+                glm::dvec2 intPart;
+                glm::bvec2 isInt = {
+                    modf(value.x, &intPart.x) == 0.0,
+                    modf(value.y, &intPart.y) == 0.0
+                };
+                if (isInt.x && isInt.y) {
+                    return { true, {}, {} };
+                }
+                else {
+                    return {
+                        false,
+                        {{ key, TestResult::Offense::Reason::WrongType }},
+                        {}
+                    };
+                }
+            }
+            else {
+                return { false, {{ key, TestResult::Offense::Reason::WrongType }}, {} };
+            }
+        }
+        else {
+            return { false, {{ key, TestResult::Offense::Reason::MissingKey }}, {} };
+        }
+    }
+}
+
+template <>
+TestResult TemplateVerifier<glm::ivec3>::operator()(const ghoul::Dictionary& dict,
+                                                    const std::string& key) const
+{
+    if (dict.hasValue<glm::ivec3>(key)) {
+        return { true, {}, {} };
+    }
+    else {
+        if (dict.hasKey(key)) {
+            if (dict.hasValue<glm::dvec3>(key)) {
+                glm::dvec3 value = dict.value<glm::dvec3>(key);
+                glm::dvec3 intPart;
+                glm::bvec3 isInt = {
+                    modf(value.x, &intPart.x) == 0.0,
+                    modf(value.y, &intPart.y) == 0.0,
+                    modf(value.z, &intPart.z) == 0.0
+                };
+                if (isInt.x && isInt.y && isInt.z) {
+                    return { true, {}, {} };
+                }
+                else {
+                    return {
+                        false,
+                        {{ key, TestResult::Offense::Reason::WrongType }},
+                        {}
+                    };
+                }
+            }
+            else {
+                return { false, {{ key, TestResult::Offense::Reason::WrongType }}, {} };
+            }
+        }
+        else {
+            return { false, {{ key, TestResult::Offense::Reason::MissingKey }}, {} };
+        }
+    }
+}
+
+template <>
+TestResult TemplateVerifier<glm::ivec4>::operator()(const ghoul::Dictionary& dict,
+                                                    const std::string& key) const
+{
+    if (dict.hasValue<glm::ivec4>(key)) {
+        return { true, {}, {} };
+    }
+    else {
+        if (dict.hasKey(key)) {
+            if (dict.hasValue<glm::dvec4>(key)) {
+                glm::dvec4 value = dict.value<glm::dvec4>(key);
+                glm::dvec4 intPart;
+                glm::bvec4 isInt = {
+                    modf(value.x, &intPart.x) == 0.0,
+                    modf(value.y, &intPart.y) == 0.0,
+                    modf(value.z, &intPart.z) == 0.0,
+                    modf(value.w, &intPart.w) == 0.0
+                };
+                if (isInt.x && isInt.y && isInt.z && isInt.w) {
+                    return { true, {}, {} };
+                }
+                else {
+                    return {
+                        false,
+                        {{ key, TestResult::Offense::Reason::WrongType }},
+                        {}
+                    };
+                }
+            }
+            else {
+                return { false, {{ key, TestResult::Offense::Reason::WrongType }}, {} };
+            }
+        }
+        else {
+            return { false, {{ key, TestResult::Offense::Reason::MissingKey }}, {} };
+        }
+    }
+}
+
 TableVerifier::TableVerifier(std::vector<DocumentationEntry> documentationEntries)
     : documentations(std::move(documentationEntries))
 {}
@@ -184,7 +298,7 @@ TableVerifier::TableVerifier(std::vector<DocumentationEntry> documentationEntrie
 TestResult TableVerifier::operator()(const ghoul::Dictionary& dictionary,
                                      const std::string& key) const
 {
-    if (dictionary.hasKeyAndValue<Type>(key)) {
+    if (dictionary.hasValue<Type>(key)) {
         ghoul::Dictionary d = dictionary.value<ghoul::Dictionary>(key);
         TestResult res = testSpecification({documentations}, d);
 
@@ -292,9 +406,9 @@ std::string ReferencingVerifier::documentation() const {
     return "Referencing Documentation: '" + identifier + "'";
 }
 
-AndVerifier::AndVerifier(const std::vector<Verifier*> values) {
-    ghoul_assert(!values.empty(), "values must not be empty");
-    for (Verifier* v : values) {
+AndVerifier::AndVerifier(const std::vector<Verifier*> values_) {
+    ghoul_assert(!values_.empty(), "values must not be empty");
+    for (Verifier* v : values_) {
         this->values.push_back(std::shared_ptr<Verifier>(v));
     }
 }
@@ -304,8 +418,8 @@ TestResult AndVerifier::operator()(const ghoul::Dictionary& dictionary,
 {
     std::vector<TestResult> res(values.size());
     std::transform(
-        values.begin(),
-        values.end(),
+        values.cbegin(),
+        values.cend(),
         res.begin(),
         [dictionary, key](const std::shared_ptr<Verifier>& v) {
             return v->operator()(dictionary, key);
@@ -313,9 +427,9 @@ TestResult AndVerifier::operator()(const ghoul::Dictionary& dictionary,
     );
 
     const bool success = std::all_of(
-        res.begin(),
-        res.end(),
-        [](const TestResult& res) { return res.success; }
+        res.cbegin(),
+        res.cend(),
+        std::mem_fn(&TestResult::success)
     );
 
     if (success) {
@@ -330,10 +444,10 @@ std::string AndVerifier::type() const {
     // Dirty hack to get an "and " inserted before the last element
     std::vector<std::string> types(values.size() - 1);
     std::transform(
-        values.begin(),
-        values.end() - 1,
+        values.cbegin(),
+        values.cend() - 1,
         types.begin(),
-        [](const std::shared_ptr<Verifier>& v) { return v->type(); }
+        std::mem_fn(&Verifier::type)
     );
     types.push_back(std::string("and ") + values.back()->type());
 
@@ -344,19 +458,19 @@ std::string AndVerifier::documentation() const {
     // Dirty hack to get an "and " inserted before the last element
     std::vector<std::string> documentations(values.size() - 1);
     std::transform(
-        values.begin(),
-        values.end() - 1,
+        values.cbegin(),
+        values.cend() - 1,
         documentations.begin(),
-        [](const std::shared_ptr<Verifier>& v) { return v->documentation(); }
+        std::mem_fn(&Verifier::documentation)
     );
     documentations.push_back(std::string("and ") + values.back()->documentation());
 
     return ghoul::join(documentations, ", ");
 }
 
-OrVerifier::OrVerifier(const std::vector<Verifier*> values) {
-    ghoul_assert(!values.empty(), "values must not be empty");
-    for (Verifier* v : values) {
+OrVerifier::OrVerifier(const std::vector<Verifier*> values_) {
+    ghoul_assert(!values_.empty(), "values must not be empty");
+    for (Verifier* v : values_) {
         this->values.push_back(std::shared_ptr<Verifier>(v));
     }
 }
@@ -366,8 +480,8 @@ TestResult OrVerifier::operator()(const ghoul::Dictionary& dictionary,
 {
     std::vector<TestResult> res(values.size());
     std::transform(
-        values.begin(),
-        values.end(),
+        values.cbegin(),
+        values.cend(),
         res.begin(),
         [dictionary, key](const std::shared_ptr<Verifier>& v) {
             return v->operator()(dictionary, key);
@@ -375,9 +489,9 @@ TestResult OrVerifier::operator()(const ghoul::Dictionary& dictionary,
     );
 
     const bool success = std::any_of(
-        res.begin(),
-        res.end(),
-        [](const TestResult& res) { return res.success; }
+        res.cbegin(),
+        res.cend(),
+        std::mem_fn(&TestResult::success)
     );
 
     if (success) {
@@ -392,10 +506,10 @@ std::string OrVerifier::type() const {
     // Dirty hack to get an "or " inserted before the last element
     std::vector<std::string> types(values.size() - 1);
     std::transform(
-        values.begin(),
-        values.end() - 1,
+        values.cbegin(),
+        values.cend() - 1,
         types.begin(),
-        [](const std::shared_ptr<Verifier>& v) { return v->type(); }
+        std::mem_fn(&Verifier::type)
     );
     types.push_back(std::string("or ") + values.back()->type());
 
@@ -406,10 +520,10 @@ std::string OrVerifier::documentation() const {
     // Dirty hack to get an "or " inserted before the last element
     std::vector<std::string> documentations(values.size() - 1);
     std::transform(
-        values.begin(),
-        values.end() - 1,
+        values.cbegin(),
+        values.cend() - 1,
         documentations.begin(),
-        [](const std::shared_ptr<Verifier>& v) { return v->documentation(); }
+        std::mem_fn(&Verifier::documentation)
     );
     documentations.push_back(std::string("or ") + values.back()->documentation());
 
diff --git a/src/engine/configuration.cpp b/src/engine/configuration.cpp
index e70a905d8f..35727a3790 100644
--- a/src/engine/configuration.cpp
+++ b/src/engine/configuration.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -147,42 +147,50 @@ namespace {
             for (size_t i = 1; i <= d.size(); ++i) {
                 res.push_back(d.value<std::string>(std::to_string(i)));
             }
-            value = res;
+            value = std::move(res);
         }
         // NOLINTNEXTLINE
         else if constexpr (std::is_same_v<T, std::map<std::string, std::string>>) {
             ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
 
             std::map<std::string, std::string> res;
+            std::vector<std::string_view> keys = d.keys();
             for (size_t i = 0; i < d.size(); ++i) {
-                std::string key = d.keys()[i];
+                std::string_view key = keys[i];
                 std::string v = d.value<std::string>(key);
-                res[std::move(key)] = std::move(v);
+                res[std::string(key)] = std::move(v);
             }
-            value = res;
+            value = std::move(res);
         }
         // NOLINTNEXTLINE
         else if constexpr (std::is_same_v<T, std::map<std::string, ghoul::Dictionary>>) {
             ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
 
             std::map<std::string, ghoul::Dictionary> res;
+            std::vector<std::string_view> keys = d.keys();
             for (size_t i = 0; i < d.size(); ++i) {
-                std::string key = d.keys()[i];
+                std::string_view key = keys[i];
                 ghoul::Dictionary v = d.value<ghoul::Dictionary>(key);
-                res[std::move(key)] = std::move(v);
+                res[std::string(key)] = std::move(v);
             }
-            value = res;
+            value = std::move(res);
         }
         // NOLINTNEXTLINE
         else if constexpr (std::is_same_v<T, Configuration::Logging>) {
             Configuration::Logging& v = static_cast<Configuration::Logging&>(value);
             ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
 
-            d.getValue(KeyLogLevel, v.level);
-            d.getValue(KeyImmediateFlush, v.forceImmediateFlush);
-            d.getValue(KeyCapabilitiesVerbosity, v.capabilitiesVerbosity);
+            if (d.hasValue<std::string>(KeyLogLevel)) {
+                v.level = d.value<std::string>(KeyLogLevel);
+            }
+            if (d.hasValue<bool>(KeyImmediateFlush)) {
+                v.forceImmediateFlush = d.value<bool>(KeyImmediateFlush);
+            }
+            if (d.hasValue<std::string>(KeyCapabilitiesVerbosity)) {
+                v.capabilitiesVerbosity = d.value<std::string>(KeyCapabilitiesVerbosity);
+            }
 
-            if (d.hasKeyAndValue<ghoul::Dictionary>(KeyLogs)) {
+            if (d.hasValue<ghoul::Dictionary>(KeyLogs)) {
                 ghoul::Dictionary l = d.value<ghoul::Dictionary>(KeyLogs);
                 std::vector<ghoul::Dictionary> res;
                 for (size_t i = 1; i <= l.size(); ++i) {
@@ -196,18 +204,24 @@ namespace {
             Configuration::DocumentationInfo& v =
                 static_cast<Configuration::DocumentationInfo&>(value);
             ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
-
-            d.getValue(KeyDocumentationPath, v.path);
+            if (d.hasValue<std::string>(KeyDocumentationPath)) {
+                v.path = d.value<std::string>(KeyDocumentationPath);
+            }
         }
         // NOLINTNEXTLINE
         else if constexpr (std::is_same_v<T, Configuration::LoadingScreen>) {
             Configuration::LoadingScreen& v =
                 static_cast<Configuration::LoadingScreen&>(value);
             ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
-
-            d.getValue(KeyShowMessage, v.isShowingMessages);
-            d.getValue(KeyShowNodeNames, v.isShowingNodeNames);
-            d.getValue(KeyShowProgressbar, v.isShowingProgressbar);
+            if (d.hasValue<bool>(KeyShowMessage)) {
+                v.isShowingMessages = d.value<bool>(KeyShowMessage);
+            }
+            if (d.hasValue<bool>(KeyShowNodeNames)) {
+                v.isShowingNodeNames = d.value<bool>(KeyShowNodeNames);
+            }
+            if (d.hasValue<bool>(KeyShowProgressbar)) {
+                v.isShowingProgressbar = d.value<bool>(KeyShowProgressbar);
+            }
         }
         // NOLINTNEXTLINE
         else if constexpr (std::is_same_v<T, Configuration::OpenGLDebugContext>) {
@@ -215,10 +229,14 @@ namespace {
                 static_cast<Configuration::OpenGLDebugContext&>(value);
             ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
 
-            d.getValue(KeyActivate, v.isActive);
-            d.getValue(KeySynchronous, v.isSynchronous);
+            if (d.hasValue<bool>(KeyActivate)) {
+                v.isActive = d.value<bool>(KeyActivate);
+            }
+            if (d.hasValue<bool>(KeySynchronous)) {
+                v.isSynchronous = d.value<bool>(KeySynchronous);
+            }
 
-            if (d.hasKeyAndValue<ghoul::Dictionary>(KeyFilterIdentifier)) {
+            if (d.hasValue<ghoul::Dictionary>(KeyFilterIdentifier)) {
                 ghoul::Dictionary f = d.value<ghoul::Dictionary>(KeyFilterIdentifier);
 
                 std::vector<Configuration::OpenGLDebugContext::IdentifierFilter> res;
@@ -226,19 +244,28 @@ namespace {
                     Configuration::OpenGLDebugContext::IdentifierFilter filter;
                     ghoul::Dictionary fi = f.value<ghoul::Dictionary>(std::to_string(i));
 
-                    double id = static_cast<double>(filter.identifier);
-                    fi.getValue(KeyIdentifier, id);
-                    filter.identifier = static_cast<unsigned int>(id);
-                    fi.getValue(KeySource, filter.source);
-                    fi.getValue(KeyType, filter.type);
+                    if (fi.hasValue<double>(KeyIdentifier)) {
+                        filter.identifier = static_cast<unsigned int>(
+                            fi.value<double>(KeyIdentifier)
+                        );
+                    }
+                    if (fi.hasValue<std::string>(KeySource)) {
+                        filter.source = fi.value<std::string>(KeySource);
+                    }
+                    if (fi.hasValue<std::string>(KeyType)) {
+                        filter.type = fi.value<std::string>(KeyType);
+                    }
 
-                    res.push_back(filter);
+                    auto fff = filter;
+                    const auto ffg = filter;
+
+                    res.push_back(std::move(filter));
                 }
 
                 v.identifierFilters = res;
             }
 
-            if (d.hasKeyAndValue<ghoul::Dictionary>(KeyFilterSeverity)) {
+            if (d.hasValue<ghoul::Dictionary>(KeyFilterSeverity)) {
                 ghoul::Dictionary f = d.value<ghoul::Dictionary>(KeyFilterSeverity);
 
                 std::vector<std::string> res;
@@ -253,14 +280,24 @@ namespace {
             Configuration::HTTPProxy& v = static_cast<Configuration::HTTPProxy&>(value);
             ghoul::Dictionary d = ghoul::lua::value<ghoul::Dictionary>(L);
 
-            d.getValue(KeyActivate, v.usingHttpProxy);
-            d.getValue(KeyAddress, v.address);
-            double p = static_cast<double>(v.port);
-            d.getValue(KeyPort, p);
-            v.port = static_cast<unsigned int>(p);
-            d.getValue(KeyAuthentication, v.authentication);
-            d.getValue(KeyUser, v.user);
-            d.getValue(KeyPassword, v.password);
+            if (d.hasValue<bool>(KeyActivate)) {
+                v.usingHttpProxy = d.value<bool>(KeyActivate);
+            }
+            if (d.hasValue<std::string>(KeyAddress)) {
+                v.address = d.value<std::string>(KeyAddress);
+            }
+            if (d.hasValue<double>(KeyPort)) {
+                v.port = static_cast<unsigned int>(d.value<double>(KeyPort));
+            }
+            if (d.hasValue<std::string>(KeyAuthentication)) {
+                v.authentication = d.value<std::string>(KeyAuthentication);
+            }
+            if (d.hasValue<std::string>(KeyUser)) {
+                v.user = d.value<std::string>(KeyUser);
+            }
+            if (d.hasValue<std::string>(KeyPassword)) {
+                v.password = d.value<std::string>(KeyPassword);
+            }
         }
         else {
             value = ghoul::lua::value<T>(L);
diff --git a/src/engine/configuration_doc.inl b/src/engine/configuration_doc.inl
index 0e92ca2427..16430a7c0c 100644
--- a/src/engine/configuration_doc.inl
+++ b/src/engine/configuration_doc.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -41,7 +41,7 @@ documentation::Documentation Configuration::Documentation = {
         },
         {
             KeySgctConfigNameInitialized,
-            new StringAnnotationVerifier("The type of SGCT auto-gen function (if called)"),
+            new StringAnnotationVerifier("The type of SGCT autogen function (if called)"),
             Optional::Yes,
             "The SGCT configuration can be defined from an .xml file, or auto-generated "
             "by an sgct.config.* lua function. If a lua function is used to generate the "
diff --git a/src/engine/downloadmanager.cpp b/src/engine/downloadmanager.cpp
index 6f75683ccb..4efe92c9e6 100644
--- a/src/engine/downloadmanager.cpp
+++ b/src/engine/downloadmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/engine/globals.cpp b/src/engine/globals.cpp
index 67f65513f9..3552eda0e2 100644
--- a/src/engine/globals.cpp
+++ b/src/engine/globals.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,6 +26,7 @@
 
 #include <openspace/engine/downloadmanager.h>
 #include <openspace/engine/configuration.h>
+#include <openspace/engine/globalscallbacks.h>
 #include <openspace/engine/moduleengine.h>
 #include <openspace/engine/openspaceengine.h>
 #include <openspace/engine/syncengine.h>
@@ -53,6 +54,7 @@
 #include <openspace/util/memorymanager.h>
 #include <openspace/util/timemanager.h>
 #include <openspace/util/versionchecker.h>
+#include <ghoul/misc/assert.h>
 #include <ghoul/glm.h>
 #include <ghoul/font/fontmanager.h>
 #include <ghoul/misc/profiling.h>
@@ -62,6 +64,12 @@
 
 namespace openspace {
 namespace {
+    // This is kind of weird.  Optimally, we would want to use the std::array also on
+    // non-Windows platforms but that causes some issues with nullptrs being thrown
+    // around and invalid accesses.  Switching this to a std::vector with dynamic memory
+    // allocation works on Linux, but it fails on Windows in some SGCT function and on Mac
+    // in some random global randoms
+#ifdef WIN32
     constexpr const int TotalSize =
         sizeof(ghoul::fontrendering::FontManager) +
         sizeof(Dashboard) +
@@ -95,6 +103,7 @@ namespace {
         sizeof(Profile);
 
     std::array<std::byte, TotalSize> DataStorage;
+#endif // WIN32
 } // namespace
 } // namespace openspace
 
@@ -103,131 +112,262 @@ namespace openspace::global {
 void create() {
     ZoneScoped
 
+    callback::create();
+
+#ifdef WIN32
+    std::fill(DataStorage.begin(), DataStorage.end(), std::byte(0));
     std::byte* currentPos = DataStorage.data();
+#endif // WIN32
 
+#ifdef WIN32
     fontManager = new (currentPos) ghoul::fontrendering::FontManager({ 1536, 1536, 1 });
-    assert(fontManager);
+    ghoul_assert(fontManager, "No fontManager");
     currentPos += sizeof(ghoul::fontrendering::FontManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    fontManager = new ghoul::fontrendering::FontManager({ 1536, 1536, 1 });
+#endif // WIN32
 
+#ifdef WIN32
     dashboard = new (currentPos) Dashboard;
-    assert(dashboard);
+    ghoul_assert(dashboard, "No dashboard");
     currentPos += sizeof(Dashboard);
+#else // ^^^ WIN32 / !WIN32 vvv
+    dashboard = new Dashboard;
+#endif // WIN32
 
+#ifdef WIN32
     deferredcasterManager = new (currentPos) DeferredcasterManager;
-    assert(deferredcasterManager);
+    ghoul_assert(deferredcasterManager, "No deferredcasterManager");
     currentPos += sizeof(DeferredcasterManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    deferredcasterManager = new DeferredcasterManager;
+#endif // WIN32
 
+#ifdef WIN32
     downloadManager = new (currentPos) DownloadManager;
-    assert(downloadManager);
+    ghoul_assert(downloadManager, "No downloadManager");
     currentPos += sizeof(DownloadManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    downloadManager = new DownloadManager;
+#endif // WIN32
 
+#ifdef WIN32
     luaConsole = new (currentPos) LuaConsole;
-    assert(luaConsole);
+    ghoul_assert(luaConsole, "No luaConsole");
     currentPos += sizeof(LuaConsole);
+#else // ^^^ WIN32 / !WIN32 vvv
+    luaConsole = new LuaConsole;
+#endif // WIN32
 
+#ifdef WIN32
     memoryManager = new (currentPos) MemoryManager;
-    assert(memoryManager);
+    ghoul_assert(memoryManager, "No memoryManager");
     currentPos += sizeof(MemoryManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    memoryManager = new MemoryManager;
+#endif // WIN32
 
+#ifdef WIN32
     missionManager = new (currentPos) MissionManager;
-    assert(missionManager);
+    ghoul_assert(missionManager, "No missionManager");
     currentPos += sizeof(MissionManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    missionManager = new MissionManager;
+#endif // WIN32
 
+#ifdef WIN32
     moduleEngine = new (currentPos) ModuleEngine;
-    assert(moduleEngine);
+    ghoul_assert(moduleEngine, "No moduleEngine");
     currentPos += sizeof(ModuleEngine);
+#else // ^^^ WIN32 / !WIN32 vvv
+    moduleEngine = new ModuleEngine;
+#endif // WIN32
 
+#ifdef WIN32
     openSpaceEngine = new (currentPos) OpenSpaceEngine;
-    assert(openSpaceEngine);
+    ghoul_assert(openSpaceEngine, "No openSpaceEngine");
     currentPos += sizeof(OpenSpaceEngine);
+#else // ^^^ WIN32 / !WIN32 vvv
+    openSpaceEngine = new OpenSpaceEngine;
+#endif // WIN32
 
+#ifdef WIN32
     parallelPeer = new (currentPos) ParallelPeer;
-    assert(parallelPeer);
+    ghoul_assert(parallelPeer, "No parallelPeer");
     currentPos += sizeof(ParallelPeer);
+#else // ^^^ WIN32 / !WIN32 vvv
+    parallelPeer = new ParallelPeer;
+#endif // WIN32
 
+#ifdef WIN32
     raycasterManager = new (currentPos) RaycasterManager;
-    assert(raycasterManager);
+    ghoul_assert(raycasterManager, "No raycasterManager");
     currentPos += sizeof(RaycasterManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    raycasterManager = new RaycasterManager;
+#endif // WIN32
 
+#ifdef WIN32
     renderEngine = new (currentPos) RenderEngine;
-    assert(renderEngine);
+    ghoul_assert(renderEngine, "No renderEngine");
     currentPos += sizeof(RenderEngine);
+#else // ^^^ WIN32 / !WIN32 vvv
+    renderEngine = new RenderEngine;
+#endif // WIN32
 
-    screenSpaceRenderables = new (currentPos) std::vector<std::unique_ptr<ScreenSpaceRenderable>>;
-    assert(screenSpaceRenderables);
+#ifdef WIN32
+    screenSpaceRenderables =
+        new (currentPos) std::vector<std::unique_ptr<ScreenSpaceRenderable>>;
+    ghoul_assert(screenSpaceRenderables, "No screenSpaceRenderables");
     currentPos += sizeof(std::vector<std::unique_ptr<ScreenSpaceRenderable>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    screenSpaceRenderables = new std::vector<std::unique_ptr<ScreenSpaceRenderable>>;
+#endif // WIN32
 
+#ifdef WIN32
     syncEngine = new (currentPos) SyncEngine(4096);
-    assert(syncEngine);
+    ghoul_assert(syncEngine, "No syncEngine");
     currentPos += sizeof(SyncEngine);
+#else // ^^^ WIN32 / !WIN32 vvv
+    syncEngine = new SyncEngine(4096);
+#endif // WIN32
 
+#ifdef WIN32
     timeManager = new (currentPos) TimeManager;
-    assert(timeManager);
+    ghoul_assert(timeManager, "No timeManager");
     currentPos += sizeof(TimeManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    timeManager = new TimeManager;
+#endif // WIN32
 
+#ifdef WIN32
     versionChecker = new (currentPos) VersionChecker;
-    assert(versionChecker);
+    ghoul_assert(versionChecker, "No versionChecker");
     currentPos += sizeof(VersionChecker);
+#else
+    versionChecker = new VersionChecker;
+#endif // WIN32
 
+#ifdef WIN32
     virtualPropertyManager = new (currentPos) VirtualPropertyManager;
-    assert(virtualPropertyManager);
+    ghoul_assert(virtualPropertyManager, "No virtualPropertyManager");
     currentPos += sizeof(VirtualPropertyManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    virtualPropertyManager = new VirtualPropertyManager;
+#endif // WIN32
 
+#ifdef WIN32
     windowDelegate = new (currentPos) WindowDelegate;
-    assert(windowDelegate);
+    ghoul_assert(windowDelegate, "No windowDelegate");
     currentPos += sizeof(WindowDelegate);
+#else // ^^^ WIN32 / !WIN32 vvv
+    windowDelegate = new WindowDelegate;
+#endif // WIN32
 
+#ifdef WIN32
     configuration = new (currentPos) configuration::Configuration;
-    assert(configuration);
+    ghoul_assert(configuration, "No configuration");
     currentPos += sizeof(configuration::Configuration);
+#else // ^^^ WIN32 / !WIN32 vvv
+    configuration = new configuration::Configuration;
+#endif // WIN32
 
+#ifdef WIN32
     interactionMonitor = new (currentPos) interaction::InteractionMonitor;
-    assert(interactionMonitor);
+    ghoul_assert(interactionMonitor, "No interactionMonitor");
     currentPos += sizeof(interaction::InteractionMonitor);
+#else // ^^^ WIN32 / !WIN32 vvv
+    interactionMonitor = new interaction::InteractionMonitor;
+#endif // WIN32
 
+#ifdef WIN32
     joystickInputStates = new (currentPos) interaction::JoystickInputStates;
-    assert(joystickInputStates);
+    ghoul_assert(joystickInputStates, "No joystickInputStates");
     currentPos += sizeof(interaction::JoystickInputStates);
+#else // ^^^ WIN32 / !WIN32 vvv
+    joystickInputStates = new interaction::JoystickInputStates;
+#endif // WIN32
 
+#ifdef WIN32
     websocketInputStates = new (currentPos) interaction::WebsocketInputStates;
-    assert(websocketInputStates);
+    ghoul_assert(websocketInputStates, "No websocketInputStates");
     currentPos += sizeof(interaction::WebsocketInputStates);
+#else // ^^^ WIN32 / !WIN32 vvv
+    websocketInputStates = new interaction::WebsocketInputStates;
+#endif // WIN32
 
+#ifdef WIN32
     keybindingManager = new (currentPos) interaction::KeybindingManager;
-    assert(keybindingManager);
+    ghoul_assert(keybindingManager, "No keybindingManager");
     currentPos += sizeof(interaction::KeybindingManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    keybindingManager = new interaction::KeybindingManager;
+#endif // WIN32
 
+#ifdef WIN32
     navigationHandler = new (currentPos) interaction::NavigationHandler;
-    assert(navigationHandler);
+    ghoul_assert(navigationHandler, "No navigationHandler");
     currentPos += sizeof(interaction::NavigationHandler);
+#else // ^^^ WIN32 / !WIN32 vvv
+    navigationHandler = new interaction::NavigationHandler;
+#endif // WIN32
 
-    sessionRecording = new (currentPos) interaction::SessionRecording;
-    assert(sessionRecording);
+#ifdef WIN32
+    sessionRecording = new (currentPos) interaction::SessionRecording(true);
+    ghoul_assert(sessionRecording, "No sessionRecording");
     currentPos += sizeof(interaction::SessionRecording);
+#else // ^^^ WIN32 / !WIN32 vvv
+    sessionRecording = new interaction::SessionRecording(true);
+#endif // WIN32
 
+#ifdef WIN32
     shortcutManager = new (currentPos) interaction::ShortcutManager;
-    assert(shortcutManager);
+    ghoul_assert(shortcutManager, "No shortcutManager");
     currentPos += sizeof(interaction::ShortcutManager);
+#else // ^^^ WIN32 / !WIN32 vvv
+    shortcutManager = new interaction::ShortcutManager;
+#endif // WIN32
 
+#ifdef WIN32
     rootPropertyOwner = new (currentPos) properties::PropertyOwner({ "" });
-    assert(rootPropertyOwner);
+    ghoul_assert(rootPropertyOwner, "No rootPropertyOwner");
     currentPos += sizeof(properties::PropertyOwner);
+#else // ^^^ WIN32 / !WIN32 vvv
+    rootPropertyOwner = new properties::PropertyOwner({ "" });
+#endif // WIN32
 
-    screenSpaceRootPropertyOwner = new (currentPos) properties::PropertyOwner({ "ScreenSpace" });
-    assert(screenSpaceRootPropertyOwner);
+#ifdef WIN32
+    screenSpaceRootPropertyOwner =
+        new (currentPos) properties::PropertyOwner({ "ScreenSpace" });
+    ghoul_assert(screenSpaceRootPropertyOwner, "No screenSpaceRootPropertyOwner");
     currentPos += sizeof(properties::PropertyOwner);
+#else // ^^^ WIN32 / !WIN32 vvv
+    screenSpaceRootPropertyOwner = new properties::PropertyOwner({ "ScreenSpace" });
+#endif // WIN32
 
+#ifdef WIN32
     scriptEngine = new (currentPos) scripting::ScriptEngine;
-    assert(scriptEngine);
+    ghoul_assert(scriptEngine, "No scriptEngine");
     currentPos += sizeof(scripting::ScriptEngine);
+#else // ^^^ WIN32 / !WIN32 vvv
+    scriptEngine = new scripting::ScriptEngine;
+#endif // WIN32
 
+#ifdef WIN32
     scriptScheduler = new (currentPos) scripting::ScriptScheduler;
-    assert(scriptScheduler);
+    ghoul_assert(scriptScheduler, "No scriptScheduler");
     currentPos += sizeof(scripting::ScriptScheduler);
+#else // ^^^ WIN32 / !WIN32 vvv
+    scriptScheduler = new scripting::ScriptScheduler;
+#endif // WIN32
 
+#ifdef WIN32
     profile = new (currentPos) Profile;
-    assert(profile);
-    currentPos += sizeof(Profile);
+    ghoul_assert(profile, "No profile");
+    //currentPos += sizeof(Profile);
+#else // ^^^ WIN32 / !WIN32 vvv
+    profile = new Profile;
+#endif // WIN32
 }
 
 void initialize() {
@@ -259,99 +399,223 @@ void initializeGL() {
 
 void destroy() {
     LDEBUGC("Globals", "Destroying 'Profile'");
+#ifdef WIN32
     profile->~Profile();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete profile;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'ScriptScheduler'");
+#ifdef WIN32
     scriptScheduler->~ScriptScheduler();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete scriptScheduler;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'ScriptEngine'");
+#ifdef WIN32
     scriptEngine->~ScriptEngine();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete scriptEngine;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'ScreenSpace Root Owner'");
+#ifdef WIN32
     screenSpaceRootPropertyOwner->~PropertyOwner();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete screenSpaceRootPropertyOwner;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'Root Owner'");
+#ifdef WIN32
     rootPropertyOwner->~PropertyOwner();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete rootPropertyOwner;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'ShortcutManager'");
+#ifdef WIN32
     shortcutManager->~ShortcutManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete shortcutManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'SessionRecording'");
+#ifdef WIN32
     sessionRecording->~SessionRecording();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete sessionRecording;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'NavigationHandler'");
+#ifdef WIN32
     navigationHandler->~NavigationHandler();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete navigationHandler;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'KeybindingManager'");
+#ifdef WIN32
     keybindingManager->~KeybindingManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete keybindingManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'WebsocketInputStates'");
+#ifdef WIN32
     websocketInputStates->~WebsocketInputStates();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete websocketInputStates;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'JoystickInputStates'");
+#ifdef WIN32
     joystickInputStates->~JoystickInputStates();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete joystickInputStates;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'InteractionMonitor'");
+#ifdef WIN32
     interactionMonitor->~InteractionMonitor();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete interactionMonitor;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'Configuration'");
+#ifdef WIN32
     configuration->~Configuration();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete configuration;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'WindowDelegate'");
+#ifdef WIN32
     windowDelegate->~WindowDelegate();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete windowDelegate;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'VirtualPropertyManager'");
+#ifdef WIN32
     virtualPropertyManager->~VirtualPropertyManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete virtualPropertyManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'VersionChecker'");
+#ifdef WIN32
     versionChecker->~VersionChecker();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete versionChecker;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'TimeManager'");
+#ifdef WIN32
     timeManager->~TimeManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete timeManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'SyncEngine'");
+#ifdef WIN32
     syncEngine->~SyncEngine();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete syncEngine;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'ScreenSpaceRenderables'");
-    screenSpaceRenderables->~vector<std::unique_ptr<ScreenSpaceRenderable>>();
+#ifdef WIN32
+    screenSpaceRenderables->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete screenSpaceRenderables;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'RenderEngine'");
+#ifdef WIN32
     renderEngine->~RenderEngine();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete renderEngine;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'RaycasterManager'");
+#ifdef WIN32
     raycasterManager->~RaycasterManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete raycasterManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'ParallelPeer'");
+#ifdef WIN32
     parallelPeer->~ParallelPeer();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete parallelPeer;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'OpenSpaceEngine'");
+#ifdef WIN32
     openSpaceEngine->~OpenSpaceEngine();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete openSpaceEngine;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'ModuleEngine'");
+#ifdef WIN32
     moduleEngine->~ModuleEngine();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete moduleEngine;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'MissionManager'");
+#ifdef WIN32
     missionManager->~MissionManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete missionManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'MemoryManager'");
+#ifdef WIN32
     memoryManager->~MemoryManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete memoryManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'LuaConsole'");
+#ifdef WIN32
     luaConsole->~LuaConsole();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete luaConsole;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'DownloadManager'");
+#ifdef WIN32
     downloadManager->~DownloadManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete downloadManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'DeferredcasterManager'");
+#ifdef WIN32
     deferredcasterManager->~DeferredcasterManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete deferredcasterManager;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'Dashboard'");
+#ifdef WIN32
     dashboard->~Dashboard();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete dashboard;
+#endif // WIN32
 
     LDEBUGC("Globals", "Destroying 'FontManager'");
+#ifdef WIN32
     fontManager->~FontManager();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete fontManager;
+#endif // WIN32
 
-    std::fill(DataStorage.begin(), DataStorage.end(), std::byte(0));
+    callback::destroy();
 }
 
 void deinitialize() {
diff --git a/src/engine/globalscallbacks.cpp b/src/engine/globalscallbacks.cpp
index a6dba4bc19..4579ea8718 100644
--- a/src/engine/globalscallbacks.cpp
+++ b/src/engine/globalscallbacks.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,97 +24,296 @@
 
 #include <openspace/engine/globalscallbacks.h>
 
-namespace openspace::global::detail {
-
-std::vector<std::function<void()>>& gInitialize() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gDeinitialize() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gInitializeGL() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gDeinitializeGL() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gPreSync() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gPostSyncPreDraw() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gRender() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gDraw2D() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<void()>>& gPostDraw() {
-    static std::vector<std::function<void()>> g;
-    return g;
-}
-
-std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>& gKeyboard() {
-    static std::vector<std::function<bool(Key, KeyModifier, KeyAction)>> g;
-    return g;
-}
-
-std::vector<std::function<bool(unsigned int, KeyModifier)>>& gCharacter() {
-    static std::vector<std::function<bool(unsigned int, KeyModifier)>> g;
-    return g;
-}
-
-std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>>& gMouseButton() {
-    static std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>> g;
-    return g;
-}
-
-std::vector<std::function<void(double, double)>>& gMousePosition() {
-    static std::vector<std::function<void(double, double)>> g;
-    return g;
-}
-
-std::vector<std::function<bool(double, double)>>& gMouseScrollWheel() {
-    static std::vector<std::function<bool(double, double)>> g;
-    return g;
-}
-
-std::vector<std::function<bool(TouchInput)>>& gTouchDetected() {
-    static std::vector<std::function<bool(TouchInput)>> g;
-    return g;
-}
-
-std::vector<std::function<bool(TouchInput)>>& gTouchUpdated() {
-    static std::vector<std::function<bool(TouchInput)>> g;
-    return g;
-}
-
-std::vector<std::function<void(TouchInput)>>& gTouchExit() {
-    static std::vector<std::function<void(TouchInput)>> g;
-    return g;
-}
-
-} // namespace openspace::global::detail
+#include <ghoul/misc/assert.h>
+#include <ghoul/misc/profiling.h>
+#include <array>
 
 namespace openspace::global::callback {
 
+namespace {
+    // Using the same mechanism as in the globals file
+#ifdef WIN32
+    constexpr const int TotalSize =
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<void()>>) +
+        sizeof(std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>) +
+        sizeof(std::vector<std::function<bool(unsigned int, KeyModifier)>>) +
+        sizeof(std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>>) +
+        sizeof(std::vector<std::function<void(double, double)>>) +
+        sizeof(std::vector<std::function<bool(double, double)>>) +
+        sizeof(std::vector<std::function<bool(TouchInput)>>) +
+        sizeof(std::vector<std::function<bool(TouchInput)>>) +
+        sizeof(std::vector<std::function<void(TouchInput)>>);
+
+    std::array<std::byte, TotalSize> DataStorage;
+#endif // WIN32
+
+} // namespace
+
+void create() {
+    ZoneScoped
+
+#ifdef WIN32
+    std::fill(DataStorage.begin(), DataStorage.end(), std::byte(0));
+    std::byte* currentPos = DataStorage.data();
+#endif // WIN32
+
+#ifdef WIN32
+    initialize = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(initialize, "No initialize");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    initialize = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    deinitialize = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(deinitialize, "No deinitialize");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    deinitialize = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    initializeGL = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(initializeGL, "No initializeGL");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    initializeGL = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    deinitializeGL = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(deinitializeGL, "No deinitializeGL");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    deinitializeGL = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    preSync = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(preSync, "No preSync");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    preSync = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    postSyncPreDraw = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(postSyncPreDraw, "No postSyncPreDraw");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    postSyncPreDraw = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    render = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(render, "No render");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    render = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    draw2D = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(draw2D, "No draw2D");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    draw2D = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    postDraw = new (currentPos) std::vector<std::function<void()>>;
+    ghoul_assert(postDraw, "No postDraw");
+    currentPos += sizeof(std::vector<std::function<void()>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    postDraw = new std::vector<std::function<void()>>;
+#endif // WIN32
+
+#ifdef WIN32
+    keyboard =
+        new (currentPos) std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>;
+    ghoul_assert(keyboard, "No keyboard");
+    currentPos += sizeof(std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    keyboard = new std::vector<std::function<bool(Key, KeyModifier, KeyAction)>>;
+#endif // WIN32
+
+#ifdef WIN32
+    character =
+        new (currentPos) std::vector<std::function<bool(unsigned int, KeyModifier)>>;
+    ghoul_assert(character, "No character");
+    currentPos += sizeof(std::vector<std::function<bool(unsigned int, KeyModifier)>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    character = new std::vector<std::function<bool(unsigned int, KeyModifier)>>;
+#endif // WIN32
+
+#ifdef WIN32
+    mouseButton =
+        new (currentPos) std::vector<
+            std::function<bool(MouseButton, MouseAction, KeyModifier)>
+        >;
+    ghoul_assert(mouseButton, "No mouseButton");
+    currentPos += sizeof(
+        std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>>
+    );
+#else // ^^^ WIN32 / !WIN32 vvv
+    mouseButton =
+        new std::vector<std::function<bool(MouseButton, MouseAction, KeyModifier)>>;
+#endif // WIN32
+
+#ifdef WIN32
+    mousePosition = new (currentPos) std::vector<std::function<void(double, double)>>;
+    ghoul_assert(mousePosition, "No mousePosition");
+    currentPos += sizeof(std::vector<std::function<void(double, double)>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    mousePosition = new std::vector<std::function<void(double, double)>>;
+#endif // WIN32
+
+#ifdef WIN32
+    mouseScrollWheel = new (currentPos) std::vector<std::function<bool(double, double)>>;
+    ghoul_assert(mouseScrollWheel, "No mouseScrollWheel");
+    currentPos += sizeof(std::vector<std::function<bool(double, double)>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    mouseScrollWheel = new std::vector<std::function<bool(double, double)>>;
+#endif // WIN32
+
+#ifdef WIN32
+    touchDetected = new (currentPos) std::vector<std::function<bool(TouchInput)>>;
+    ghoul_assert(touchDetected, "No touchDetected");
+    currentPos += sizeof(std::vector<std::function<bool(TouchInput)>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    touchDetected = new std::vector<std::function<bool(TouchInput)>>;
+#endif // WIN32
+
+#ifdef WIN32
+    touchUpdated = new (currentPos) std::vector<std::function<bool(TouchInput)>>;
+    ghoul_assert(touchUpdated, "No touchUpdated");
+    currentPos += sizeof(std::vector<std::function<bool(TouchInput)>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    touchUpdated = new std::vector<std::function<bool(TouchInput)>>;
+#endif // WIN32
+
+#ifdef WIN32
+    touchExit = new (currentPos) std::vector<std::function<void(TouchInput)>>;
+    ghoul_assert(touchExit, "No touchExit");
+    //currentPos += sizeof(std::vector<std::function<void(TouchInput)>>);
+#else // ^^^ WIN32 / !WIN32 vvv
+    touchExit = new std::vector<std::function<void(TouchInput)>>;
+#endif // WIN32
+}
+
+void destroy() {
+#ifdef WIN32
+    touchExit->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete touchExit;
+#endif // WIN32
+
+#ifdef WIN32
+    touchUpdated->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete touchUpdated;
+#endif // WIN32
+
+#ifdef WIN32
+    touchDetected->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete touchDetected;
+#endif // WIN32
+
+#ifdef WIN32
+    mouseScrollWheel->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete mouseScrollWheel;
+#endif // WIN32
+
+#ifdef WIN32
+    mousePosition->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete mousePosition;
+#endif // WIN32
+
+#ifdef WIN32
+    mouseButton->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete mouseButton;
+#endif // WIN32
+
+#ifdef WIN32
+    character->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete character;
+#endif // WIN32
+
+#ifdef WIN32
+    keyboard->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete keyboard;
+#endif // WIN32
+
+#ifdef WIN32
+    postDraw->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete postDraw;
+#endif // WIN32
+
+#ifdef WIN32
+    draw2D->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete draw2D;
+#endif // WIN32
+
+#ifdef WIN32
+    render->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete render;
+#endif // WIN32
+
+#ifdef WIN32
+    postSyncPreDraw->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete postSyncPreDraw;
+#endif // WIN32
+
+#ifdef WIN32
+    preSync->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete preSync;
+#endif // WIN32
+
+#ifdef WIN32
+    deinitializeGL->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete deinitializeGL;
+#endif // WIN32
+
+#ifdef WIN32
+    initializeGL->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete initializeGL;
+#endif // WIN32
+
+#ifdef WIN32
+    deinitialize->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete deinitialize;
+#endif // WIN32
+
+#ifdef WIN32
+    initialize->~vector();
+#else // ^^^ WIN32 / !WIN32 vvv
+    delete initialize;
+#endif // WIN32
+}
+
 void(*webBrowserPerformanceHotfix)() = nullptr;
 
 } // namespace openspace::global::callback
diff --git a/src/engine/logfactory.cpp b/src/engine/logfactory.cpp
index 4a57a6944d..a1f65f8898 100644
--- a/src/engine/logfactory.cpp
+++ b/src/engine/logfactory.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -127,27 +127,27 @@ std::unique_ptr<ghoul::logging::Log> createLog(const ghoul::Dictionary& dictiona
 
     // the rest are optional
     bool append = true;
-    if (dictionary.hasKeyAndValue<bool>(KeyAppend)) {
+    if (dictionary.hasValue<bool>(KeyAppend)) {
         append = dictionary.value<bool>(KeyAppend);
     }
     bool timeStamp = true;
-    if (dictionary.hasKeyAndValue<bool>(KeyTimeStamping)) {
+    if (dictionary.hasValue<bool>(KeyTimeStamping)) {
         timeStamp = dictionary.value<bool>(KeyTimeStamping);
     }
     bool dateStamp = true;
-    if (dictionary.hasKeyAndValue<bool>(KeyDateStamping)) {
+    if (dictionary.hasValue<bool>(KeyDateStamping)) {
         dateStamp = dictionary.value<bool>(KeyDateStamping);
     }
     bool categoryStamp = true;
-    if (dictionary.hasKeyAndValue<bool>(KeyCategoryStamping)) {
+    if (dictionary.hasValue<bool>(KeyCategoryStamping)) {
         categoryStamp = dictionary.value<bool>(KeyCategoryStamping);
     }
     bool logLevelStamp = true;
-    if (dictionary.hasKeyAndValue<bool>(KeyLogLevelStamping)) {
+    if (dictionary.hasValue<bool>(KeyLogLevelStamping)) {
         logLevelStamp = dictionary.value<bool>(KeyLogLevelStamping);
     }
     std::string logLevel;
-    if (dictionary.hasKeyAndValue<std::string>(KeyLogLevel)) {
+    if (dictionary.hasValue<std::string>(KeyLogLevel)) {
         logLevel = dictionary.value<std::string>(KeyLogLevel);
     }
 
diff --git a/src/engine/moduleengine.cpp b/src/engine/moduleengine.cpp
index 5cb6c292d6..1880c0393c 100644
--- a/src/engine/moduleengine.cpp
+++ b/src/engine/moduleengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -45,14 +45,22 @@ void ModuleEngine::initialize(
 {
     ZoneScoped
 
-    for (OpenSpaceModule* m : AllModules()) {
+    std::vector<OpenSpaceModule*> modules = AllModules();
+
+    for (OpenSpaceModule* m : modules) {
+        registerModule(std::unique_ptr<OpenSpaceModule>(m));
+    }
+
+    for (OpenSpaceModule* m : modules) {
         const std::string& identifier = m->identifier();
         auto it = moduleConfigurations.find(identifier);
         ghoul::Dictionary configuration;
         if (it != moduleConfigurations.end()) {
             configuration = it->second;
         }
-        registerModule(std::unique_ptr<OpenSpaceModule>(m), configuration);
+        m->initialize(configuration);
+        addPropertySubOwner(m);
+
     }
 }
 
@@ -99,9 +107,7 @@ void ModuleEngine::deinitializeGL() {
     LDEBUG("Finished deinitializing OpenGL of modules");
 }
 
-void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> mod,
-                                  const ghoul::Dictionary& configuration)
-{
+void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> mod) {
     ZoneScoped
 
     ghoul_assert(mod, "Module must not be nullptr");
@@ -121,8 +127,6 @@ void ModuleEngine::registerModule(std::unique_ptr<OpenSpaceModule> mod,
     }
 
     LDEBUG(fmt::format("Registering module '{}'", mod->identifier()));
-    mod->initialize(this, configuration);
-    addPropertySubOwner(mod.get());
     LDEBUG(fmt::format("Registered module '{}'", mod->identifier()));
     _modules.push_back(std::move(mod));
 }
diff --git a/src/engine/moduleengine_lua.inl b/src/engine/moduleengine_lua.inl
index 6a70dea095..f999ea1d92 100644
--- a/src/engine/moduleengine_lua.inl
+++ b/src/engine/moduleengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 61442d56c8..00c135152d 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -370,7 +370,7 @@ void OpenSpaceEngine::initialize() {
 
     global::renderEngine->initialize();
 
-    for (const std::function<void()>& func : global::callback::initialize) {
+    for (const std::function<void()>& func : *global::callback::initialize) {
         ZoneScopedN("[Module] initialize")
 
         func();
@@ -633,7 +633,7 @@ void OpenSpaceEngine::initializeGL() {
                     call.parameters.begin(),
                     call.parameters.end(),
                     std::string("("),
-                    [](std::string a, const std::unique_ptr<AbstractValue>& v) {
+                    [](const std::string& a, const std::unique_ptr<AbstractValue>& v) {
                         std::stringstream s;
                         s << v.get();
                         return a + s.str() + ", ";
@@ -663,7 +663,7 @@ void OpenSpaceEngine::initializeGL() {
     global::moduleEngine->initializeGL();
 
 
-    for (const std::function<void()>& func : global::callback::initializeGL) {
+    for (const std::function<void()>& func : *global::callback::initializeGL) {
         ZoneScopedN("[Module] initializeGL")
         func();
     }
@@ -793,12 +793,8 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
                 progressInfo.progress = (*it)->progress();
 
                 if ((*it)->nTotalBytesIsKnown()) {
-                    progressInfo.currentSize = static_cast<uint64_t>(
-                        (*it)->nSynchronizedBytes()
-                    );
-                    progressInfo.totalSize = static_cast<uint64_t>(
-                        (*it)->nTotalBytes()
-                    );
+                    progressInfo.currentSize = (*it)->nSynchronizedBytes();
+                    progressInfo.totalSize = (*it)->nTotalBytes();
                 }
 
                 loading = true;
@@ -865,7 +861,7 @@ void OpenSpaceEngine::deinitialize() {
 
     LTRACE("OpenSpaceEngine::deinitialize(begin)");
 
-    for (const std::function<void()>& func : global::callback::deinitialize) {
+    for (const std::function<void()>& func : *global::callback::deinitialize) {
         func();
     }
 
@@ -914,7 +910,7 @@ void OpenSpaceEngine::deinitializeGL() {
     global::openSpaceEngine->_scene = nullptr;
     global::renderEngine->setScene(nullptr);
 
-    for (const std::function<void()>& func : global::callback::deinitializeGL) {
+    for (const std::function<void()>& func : *global::callback::deinitializeGL) {
         func();
     }
 
@@ -1017,7 +1013,7 @@ void OpenSpaceEngine::writeSceneDocumentation() {
             &properties::PropertyOwner::generateJson,
             global::rootPropertyOwner
         );
-        
+
         std::future<std::string> scene = std::async(
             &properties::PropertyOwner::generateJson,
             _scene.get()
@@ -1125,7 +1121,7 @@ void OpenSpaceEngine::preSynchronization() {
         global::interactionMonitor->updateActivityState();
     }
 
-    for (const std::function<void()>& func : global::callback::preSync) {
+    for (const std::function<void()>& func : *global::callback::preSync) {
         ZoneScopedN("[Module] preSync")
 
         func();
@@ -1180,7 +1176,7 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
         _scene->camera()->invalidateCache();
     }
 
-    for (const std::function<void()>& func : global::callback::postSyncPreDraw) {
+    for (const std::function<void()>& func : *global::callback::postSyncPreDraw) {
         ZoneScopedN("[Module] postSyncPreDraw")
 
         func();
@@ -1226,7 +1222,7 @@ void OpenSpaceEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& view
 
     global::renderEngine->render(sceneMatrix, viewMatrix, projectionMatrix);
 
-    for (const std::function<void()>& func : global::callback::render) {
+    for (const std::function<void()>& func : *global::callback::render) {
         ZoneScopedN("[Module] render")
 
         func();
@@ -1251,7 +1247,7 @@ void OpenSpaceEngine::drawOverlays() {
         global::sessionRecording->render();
     }
 
-    for (const std::function<void()>& func : global::callback::draw2D) {
+    for (const std::function<void()>& func : *global::callback::draw2D) {
         ZoneScopedN("[Module] draw2D")
 
         func();
@@ -1267,7 +1263,7 @@ void OpenSpaceEngine::postDraw() {
 
     global::renderEngine->postDraw();
 
-    for (const std::function<void()>& func : global::callback::postDraw) {
+    for (const std::function<void()>& func : *global::callback::postDraw) {
         ZoneScopedN("[Module] postDraw")
 
         func();
@@ -1317,7 +1313,7 @@ void OpenSpaceEngine::keyboardCallback(Key key, KeyModifier mod, KeyAction actio
     }
 
     using F = std::function<bool (Key, KeyModifier, KeyAction)>;
-    for (const F& func : global::callback::keyboard) {
+    for (const F& func : *global::callback::keyboard) {
         const bool isConsumed = func(key, mod, action);
         if (isConsumed) {
             return;
@@ -1340,7 +1336,7 @@ void OpenSpaceEngine::charCallback(unsigned int codepoint, KeyModifier modifier)
     ZoneScoped
 
     using F = std::function<bool (unsigned int, KeyModifier)>;
-    for (const F& func : global::callback::character) {
+    for (const F& func : *global::callback::character) {
         bool isConsumed = func(codepoint, modifier);
         if (isConsumed) {
             return;
@@ -1358,7 +1354,7 @@ void OpenSpaceEngine::mouseButtonCallback(MouseButton button,
     ZoneScoped
 
     using F = std::function<bool (MouseButton, MouseAction, KeyModifier)>;
-    for (const F& func : global::callback::mouseButton) {
+    for (const F& func : *global::callback::mouseButton) {
         bool isConsumed = func(button, action, mods);
         if (isConsumed) {
             // If the mouse was released, we still want to forward it to the navigation
@@ -1390,7 +1386,7 @@ void OpenSpaceEngine::mousePositionCallback(double x, double y) {
     ZoneScoped
 
     using F = std::function<void (double, double)>;
-    for (const F& func : global::callback::mousePosition) {
+    for (const F& func : *global::callback::mousePosition) {
         func(x, y);
     }
 
@@ -1404,7 +1400,7 @@ void OpenSpaceEngine::mouseScrollWheelCallback(double posX, double posY) {
     ZoneScoped
 
     using F = std::function<bool (double, double)>;
-    for (const F& func : global::callback::mouseScrollWheel) {
+    for (const F& func : *global::callback::mouseScrollWheel) {
         bool isConsumed = func(posX, posY);
         if (isConsumed) {
             return;
@@ -1419,7 +1415,7 @@ void OpenSpaceEngine::touchDetectionCallback(TouchInput input) {
     ZoneScoped
 
     using F = std::function<bool (TouchInput)>;
-    for (const F& func : global::callback::touchDetected) {
+    for (const F& func : *global::callback::touchDetected) {
         bool isConsumed = func(input);
         if (isConsumed) {
             return;
@@ -1431,7 +1427,7 @@ void OpenSpaceEngine::touchUpdateCallback(TouchInput input) {
     ZoneScoped
 
     using F = std::function<bool(TouchInput)>;
-    for (const F& func : global::callback::touchUpdated) {
+    for (const F& func : *global::callback::touchUpdated) {
         bool isConsumed = func(input);
         if (isConsumed) {
             return;
@@ -1443,7 +1439,7 @@ void OpenSpaceEngine::touchExitCallback(TouchInput input) {
     ZoneScoped
 
     using F = std::function<void(TouchInput)>;
-    for (const F& func : global::callback::touchExit) {
+    for (const F& func : *global::callback::touchExit) {
         func(input);
     }
 }
@@ -1522,6 +1518,13 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
                 "",
                 "Remove all registered virtual properties"
             },
+            {
+                "setScreenshotFolder",
+                &luascriptfunctions::setScreenshotFolder,
+                {},
+                "string",
+                "Sets the folder used for storing screenshots or session recording frames"
+            },
             {
                 "addTag",
                 &luascriptfunctions::addTag,
@@ -1536,6 +1539,17 @@ scripting::LuaLibrary OpenSpaceEngine::luaLibrary() {
                 "string, string",
                 "Removes a tag (second argument) from a scene graph node (first argument)"
             },
+            {
+                "createSingeColorImage",
+                &luascriptfunctions::createSingeColorImage,
+                {},
+                "string, vec3",
+                "Creates a 1 pixel image with a certain color in the cache folder and "
+                "returns the path to the file. If a cached file with the given name "
+                "already exists, the path to that file is returned. The first argument "
+                "is the name of the file, without extension. The second is the RGB "
+                "color, given as {r, g, b} with values between 0 and 1."
+            },
             {
                 "isMaster",
                 &luascriptfunctions::isMaster,
diff --git a/src/engine/openspaceengine_lua.inl b/src/engine/openspaceengine_lua.inl
index f92dad961b..2b4636a66f 100644
--- a/src/engine/openspaceengine_lua.inl
+++ b/src/engine/openspaceengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -22,11 +22,16 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
+#include <openspace/documentation/documentation.h>
+#include <openspace/documentation/verifier.h>
 #include <openspace/engine/downloadmanager.h>
 #include <openspace/engine/globals.h>
 #include <openspace/properties/triggerproperty.h>
 #include <openspace/rendering/renderengine.h>
 #include <openspace/scene/scenegraphnode.h>
+#include <ghoul/filesystem/cachemanager.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <filesystem>
 
 namespace openspace::luascriptfunctions {
 
@@ -182,6 +187,27 @@ int removeAllVirtualProperties(lua_State* L) {
     return 0;
 }
 
+int setScreenshotFolder(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::setScreenshotFolder");
+
+    std::string arg = ghoul::lua::value<std::string>(L);
+    lua_pop(L, 0);
+
+    std::string folder = FileSys.absolutePath(arg);
+    if (!std::filesystem::exists(folder)) {
+        std::filesystem::create_directory(folder);
+    }
+
+    FileSys.registerPathToken(
+        "${SCREENSHOTS}",
+        folder,
+        ghoul::filesystem::FileSystem::Override::Yes
+    );
+
+    global::windowDelegate->setScreenshotFolder(folder);
+    return 0;
+}
+
 /**
  * \ingroup LuaScripts
  * addTag()
@@ -255,10 +281,10 @@ int downloadFile(lua_State* L) {
             DownloadManager::FailOnError::Yes,
             5
         );
-    if (!future || (future && !future->isFinished)) {
+    if (!future || !future->isFinished) {
         return ghoul::lua::luaError(
             L,
-            future ? "Download failed" : "Download failed: " + future->errorMessage
+            future ? "Download failed: " + future->errorMessage : "Download failed"
         );
     }
 
@@ -266,6 +292,79 @@ int downloadFile(lua_State* L) {
     return 0;
 }
 
+/**
+* \ingroup LuaScripts
+* createSingeColorImage():
+* Creates a one pixel image with a given color and returns the path to the cached file
+*/
+int createSingeColorImage(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, 2, "lua::createSingeColorImage");
+
+    const std::string& name = ghoul::lua::value<std::string>(L, 1);
+    const ghoul::Dictionary& d = ghoul::lua::value<ghoul::Dictionary>(L, 2);
+    lua_settop(L, 0);
+
+    // @TODO (emmbr 2020-12-18) Verify that the input dictionary is a vec3
+    // Would like to clean this up with a more direct use of the Verifier in the future
+    using namespace openspace::documentation;
+    const std::string& key = "color";
+    ghoul::Dictionary colorDict;
+    colorDict.setValue(key, d);
+    TestResult res = DoubleVector3Verifier()(colorDict, key);
+
+    // @TODO (emmbr 2020-02-04) A 'ColorVerifier' would be really useful here, to easily
+    // check that we have a vector with values in [0, 1]
+
+    if (!res.success) {
+        return ghoul::lua::luaError(
+            L,
+            "Invalid color. Expected three double values {r, g, b} in range 0 to 1"
+        );
+    }
+
+    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);
+    if (hasCachedFile) {
+        LDEBUGC("OpenSpaceEngine", fmt::format("Cached file '{}' used", fileName));
+        ghoul::lua::push(L, fileName);
+        return 1;
+    }
+    else {
+        // Write the color to a ppm file
+        static std::mutex fileMutex;
+        std::lock_guard guard(fileMutex);
+        std::ofstream ppmFile(fileName, std::ofstream::binary | std::ofstream::trunc);
+
+        unsigned int width = 1;
+        unsigned int height = 1;
+        unsigned int size = width * height;
+        std::vector<unsigned char> img(size * 3);
+        img[0] = static_cast<unsigned char>(255 * color.r);
+        img[1] = static_cast<unsigned char>(255 * color.g);
+        img[2] = static_cast<unsigned char>(255 * color.b);
+
+        if (ppmFile.is_open()) {
+            ppmFile << "P6" << std::endl;
+            ppmFile << width << " " << height << std::endl;
+            ppmFile << 255 << std::endl;
+            ppmFile.write(reinterpret_cast<char*>(&img[0]), size * 3);
+            ppmFile.close();
+            ghoul::lua::push(L, fileName);
+            return 1;
+        }
+        else {
+            return ghoul::lua::luaError(L, "Could not open ppm file for writing.");
+        }
+    }
+}
+
 int isMaster(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 0, "lua::isMaster");
     ghoul::lua::push(L, global::windowDelegate->isMaster());
diff --git a/src/engine/syncengine.cpp b/src/engine/syncengine.cpp
index c2dca81352..9b22308ce8 100644
--- a/src/engine/syncengine.cpp
+++ b/src/engine/syncengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/engine/virtualpropertymanager.cpp b/src/engine/virtualpropertymanager.cpp
index 4236d24bcc..5b46ea2468 100644
--- a/src/engine/virtualpropertymanager.cpp
+++ b/src/engine/virtualpropertymanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/camerainteractionstates.cpp b/src/interaction/camerainteractionstates.cpp
index dee066c314..9164319e7a 100644
--- a/src/interaction/camerainteractionstates.cpp
+++ b/src/interaction/camerainteractionstates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/externinteraction.cpp b/src/interaction/externinteraction.cpp
index bb4641017b..3f71f3403c 100644
--- a/src/interaction/externinteraction.cpp
+++ b/src/interaction/externinteraction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -39,35 +39,6 @@
 
 #include <ghoul/logging/logmanager.h>
 
-namespace {
-    constexpr const uint32_t ProtocolVersion = 3;
-    constexpr const size_t MaxLatencyDiffs = 64;
-
-    constexpr openspace::properties::Property::PropertyInfo BufferTimeInfo = {
-        "BufferTime",
-        "Buffer Time",
-        "" // @TODO Missing documentation
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo TimeKeyFrameInfo = {
-        "TimeKeyframeInterval",
-        "Time keyframe interval",
-        "" // @TODO Missing documentation
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo CameraKeyFrameInfo = {
-        "CameraKeyframeInterval",
-        "Camera Keyframe interval",
-        "" // @TODO Missing documentation
-    };
-
-    constexpr openspace::properties::Property::PropertyInfo TimeToleranceInfo = {
-        "TimeTolerance",
-        "Time tolerance",
-        "" // @TODO Missing documentation
-    };
-} // namespace
-
 namespace openspace {
 
 ExternInteraction::ExternInteraction()
diff --git a/src/interaction/inputstate.cpp b/src/interaction/inputstate.cpp
index c603937722..fb0c792cf8 100644
--- a/src/interaction/inputstate.cpp
+++ b/src/interaction/inputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/interactionmonitor.cpp b/src/interaction/interactionmonitor.cpp
index 2b88c7bcc0..f848e4a9a4 100644
--- a/src/interaction/interactionmonitor.cpp
+++ b/src/interaction/interactionmonitor.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,8 +29,6 @@
 #include <ghoul/logging/logmanager.h>
 
 namespace {
-    constexpr const char* _loggerCat = "InteractionMonitor";
-
     constexpr openspace::properties::Property::PropertyInfo IdleTimeInfo = {
         "IdleTime",
         "Idle Time",
diff --git a/src/interaction/joystickcamerastates.cpp b/src/interaction/joystickcamerastates.cpp
index 6f38580fdd..75c0e40306 100644
--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/joystickinputstate.cpp b/src/interaction/joystickinputstate.cpp
index 70815d0581..4a5537a353 100644
--- a/src/interaction/joystickinputstate.cpp
+++ b/src/interaction/joystickinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/keybindingmanager.cpp b/src/interaction/keybindingmanager.cpp
index aabe3c3c0c..b05c8641e7 100644
--- a/src/interaction/keybindingmanager.cpp
+++ b/src/interaction/keybindingmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/keybindingmanager_lua.inl b/src/interaction/keybindingmanager_lua.inl
index 9b4db7fd33..5627bd26aa 100644
--- a/src/interaction/keybindingmanager_lua.inl
+++ b/src/interaction/keybindingmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/keyframenavigator.cpp b/src/interaction/keyframenavigator.cpp
index c7de51ac17..d4441b912d 100644
--- a/src/interaction/keyframenavigator.cpp
+++ b/src/interaction/keyframenavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -97,13 +97,7 @@ bool KeyframeNavigator::updateCamera(Camera& camera, bool ignoreFutureKeyframes)
         return false;
     }
 
-    return updateCamera(
-        &camera,
-        prevKeyframe->data,
-        nextKeyframe->data,
-        t,
-        ignoreFutureKeyframes
-    );
+    return updateCamera(&camera, prevPose, nextPose, t, ignoreFutureKeyframes);
 }
 
 bool KeyframeNavigator::updateCamera(Camera* camera, const CameraPose prevPose,
diff --git a/src/interaction/mousecamerastates.cpp b/src/interaction/mousecamerastates.cpp
index 36cc688170..c2014d8a34 100644
--- a/src/interaction/mousecamerastates.cpp
+++ b/src/interaction/mousecamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/navigationhandler.cpp b/src/interaction/navigationhandler.cpp
index 548a0b9c3b..fa3aefb28f 100644
--- a/src/interaction/navigationhandler.cpp
+++ b/src/interaction/navigationhandler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -53,13 +53,20 @@ namespace {
     constexpr const char* KeyReferenceFrame = "ReferenceFrame";
     const double Epsilon = 1E-7;
 
-    constexpr const openspace::properties::Property::PropertyInfo KeyDisableInputInfo = {
-        "DisableInputs",
+    using namespace openspace;
+    constexpr const properties::Property::PropertyInfo KeyDisableMouseInputInfo = {
+        "DisableMouseInputs",
         "Disable all mouse inputs",
         "Disables all mouse inputs and prevents them from affecting the camera"
     };
 
-    constexpr const openspace::properties::Property::PropertyInfo KeyFrameInfo = {
+    constexpr const properties::Property::PropertyInfo KeyDisableJoystickInputInfo = {
+        "DisableJoystickInputs",
+        "Disable all joystick inputs",
+        "Disables all joystick inputs and prevents them from affecting the camera"
+    };
+
+    constexpr const properties::Property::PropertyInfo KeyFrameInfo = {
         "UseKeyFrameInteraction",
         "Use keyframe interaction",
         "If this is set to 'true' the entire interaction is based off key frames rather "
@@ -131,29 +138,31 @@ NavigationHandler::NavigationState::NavigationState(const ghoul::Dictionary& dic
     }
 }
 
-NavigationHandler::NavigationState::NavigationState(std::string anchor, std::string aim,
-                                                    std::string referenceFrame,
-                                                    glm::dvec3 position,
-                                                    std::optional<glm::dvec3> up,
-                                                    double yaw,
-                                                    double pitch)
-    : anchor(std::move(anchor))
-    , aim(std::move(aim))
-    , referenceFrame(std::move(referenceFrame))
-    , position(std::move(position))
-    , up(std::move(up))
-    , yaw(yaw)
-    , pitch(pitch)
+NavigationHandler::NavigationState::NavigationState(std::string anchor_, std::string aim_,
+                                                    std::string referenceFrame_,
+                                                    glm::dvec3 position_,
+                                                    std::optional<glm::dvec3> up_,
+                                                    double yaw_,
+                                                    double pitch_)
+    : anchor(std::move(anchor_))
+    , aim(std::move(aim_))
+    , referenceFrame(std::move(referenceFrame_))
+    , position(std::move(position_))
+    , up(std::move(up_))
+    , yaw(yaw_)
+    , pitch(pitch_)
 {}
 
 NavigationHandler::NavigationHandler()
     : properties::PropertyOwner({ "NavigationHandler" })
-    , _disableInputs(KeyDisableInputInfo, false)
+    , _disableMouseInputs(KeyDisableMouseInputInfo, false)
+    , _disableJoystickInputs(KeyDisableJoystickInputInfo, true)
     , _useKeyFrameInteraction(KeyFrameInfo, false)
 {
     addPropertySubOwner(_orbitalNavigator);
 
-    addProperty(_disableInputs);
+    addProperty(_disableMouseInputs);
+    addProperty(_disableJoystickInputs);
     addProperty(_useKeyFrameInteraction);
 }
 
@@ -235,6 +244,13 @@ void NavigationHandler::updateCamera(double deltaTime) {
             _keyframeNavigator.updateCamera(*_camera, _playbackModeEnabled);
         }
         else {
+            if (_disableJoystickInputs) {
+                std::fill(
+                    global::joystickInputStates->begin(),
+                    global::joystickInputStates->end(),
+                    JoystickInputState()
+                );
+            }
             _orbitalNavigator.updateStatesFromInput(_inputState, deltaTime);
             _orbitalNavigator.updateCameraStateFromStates(deltaTime);
         }
@@ -279,7 +295,7 @@ void NavigationHandler::applyNavigationState(const NavigationHandler::Navigation
     }
 
     const glm::dvec3 cameraPositionWorld = anchorWorldPosition +
-        glm::dvec3(referenceFrameTransform * glm::dvec4(ns.position, 1.0));
+        referenceFrameTransform * glm::dvec4(ns.position, 1.0);
 
     glm::dvec3 up = ns.up.has_value() ?
         glm::normalize(referenceFrameTransform * *ns.up) :
@@ -334,28 +350,28 @@ const InputState& NavigationHandler::inputState() const {
 }
 
 void NavigationHandler::mouseButtonCallback(MouseButton button, MouseAction action) {
-    if (!_disableInputs) {
+    if (!_disableMouseInputs) {
         _inputState.mouseButtonCallback(button, action);
     }
 }
 
 void NavigationHandler::mousePositionCallback(double x, double y) {
-    if (!_disableInputs) {
+    if (!_disableMouseInputs) {
         _inputState.mousePositionCallback(x, y);
     }
 }
 
 void NavigationHandler::mouseScrollWheelCallback(double pos) {
-    if (!_disableInputs) {
+    if (!_disableMouseInputs) {
         _inputState.mouseScrollWheelCallback(pos);
     }
 }
 
 void NavigationHandler::keyboardCallback(Key key, KeyModifier modifier, KeyAction action)
 {
-    if (!_disableInputs) {
-        _inputState.keyboardCallback(key, modifier, action);
-    }
+    // There is no need to disable the keyboard callback based on a property as the vast
+    // majority of input is coming through Lua scripts anyway which are not blocked here
+    _inputState.keyboardCallback(key, modifier, action);
 }
 
 NavigationHandler::NavigationState NavigationHandler::navigationState() const {
diff --git a/src/interaction/navigationhandler_lua.inl b/src/interaction/navigationhandler_lua.inl
index 4ccb59d75c..34f6531f51 100644
--- a/src/interaction/navigationhandler_lua.inl
+++ b/src/interaction/navigationhandler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -73,14 +73,14 @@ int getNavigationState(lua_State* L) {
 
     lua_settop(L, 0);
 
-    const auto pushVector = [](lua_State* L, const glm::dvec3& v) {
-        lua_newtable(L);
-        ghoul::lua::push(L, 1, v.x);
-        lua_rawset(L, -3);
-        ghoul::lua::push(L, 2, v.y);
-        lua_rawset(L, -3);
-        ghoul::lua::push(L, 3, v.z);
-        lua_rawset(L, -3);
+    const auto pushVector = [](lua_State* s, const glm::dvec3& v) {
+        lua_newtable(s);
+        ghoul::lua::push(s, 1, v.x);
+        lua_rawset(s, -3);
+        ghoul::lua::push(s, 2, v.y);
+        lua_rawset(s, -3);
+        ghoul::lua::push(s, 3, v.z);
+        lua_rawset(s, -3);
     };
 
     lua_newtable(L);
@@ -309,7 +309,7 @@ int joystickButton(lua_State* L) {
         cmds.begin(),
         cmds.end(),
         std::string(),
-        [](std::string lhs, std::string rhs) {
+        [](const std::string& lhs, const std::string& rhs) {
             return lhs + ";" + rhs;
         }
     );
diff --git a/src/interaction/orbitalnavigator.cpp b/src/interaction/orbitalnavigator.cpp
index 3f923ac7e6..9c6d13a15d 100644
--- a/src/interaction/orbitalnavigator.cpp
+++ b/src/interaction/orbitalnavigator.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -249,7 +249,7 @@ OrbitalNavigator::OrbitalNavigator()
     , _flightDestinationDistance(FlightDestinationDistInfo, 2e8f, 0.0f, 1e10f)
     , _flightDestinationFactor(FlightDestinationFactorInfo, 1E-4, 1E-6, 0.5)
     , _applyLinearFlight(ApplyLinearFlightInfo, false)
-    , _velocitySensitivity(VelocityZoomControlInfo, 0.02f, 0.01f, 0.15f)      
+    , _velocitySensitivity(VelocityZoomControlInfo, 3.5f, 0.001f, 20.f)
     , _mouseSensitivity(MouseSensitivityInfo, 15.f, 1.f, 50.f)
     , _joystickSensitivity(JoystickSensitivityInfo, 10.f, 1.0f, 50.f)
     , _websocketSensitivity(WebsocketSensitivityInfo, 5.f, 1.0f, 50.f)
@@ -469,12 +469,15 @@ void OrbitalNavigator::updateCameraStateFromStates(double deltaTime) {
 
         // Fly towards the flight destination distance. When getting closer than
         // arrivalThreshold terminate the flight
-        if (std::fabs(distFromCameraToFocus - _flightDestinationDistance) > arrivalThreshold) {
+        if (std::fabs(distFromCameraToFocus - _flightDestinationDistance) >
+            arrivalThreshold)
+        {
             pose.position = moveCameraAlongVector(
                 pose.position,
                 distFromCameraToFocus,
                 camPosToAnchorPosDiff,
-                _flightDestinationDistance
+                _flightDestinationDistance,
+                deltaTime
             );
         }
         else {
@@ -1261,7 +1264,8 @@ glm::dvec3 OrbitalNavigator::translateHorizontally(double deltaTime,
 glm::dvec3 OrbitalNavigator::moveCameraAlongVector(const glm::dvec3& camPos,
                                                   double distFromCameraToFocus,
                                                   const glm::dvec3& camPosToAnchorPosDiff,
-                                                  double destination) const
+                                                  double destination,
+                                                  double deltaTime) const
 {
     // This factor adapts the velocity so it slows down when getting closer
     // to our final destination
@@ -1271,14 +1275,9 @@ glm::dvec3 OrbitalNavigator::moveCameraAlongVector(const glm::dvec3& camPos,
         velocity = 1.0 - destination / distFromCameraToFocus;
     }
     else { // When flying away from anchor
-        if (destination == 0.0) {
-            velocity = -1.0;
-        }
-        else {
-            velocity = distFromCameraToFocus / destination - 1.0;
-        }
+        velocity = distFromCameraToFocus / destination - 1.0;
     }
-    velocity *= _velocitySensitivity;
+    velocity *= _velocitySensitivity * deltaTime;
 
     // Return the updated camera position
     return camPos - velocity * camPosToAnchorPosDiff;
diff --git a/src/interaction/scriptcamerastates.cpp b/src/interaction/scriptcamerastates.cpp
index e9e01b81dc..863e630de3 100644
--- a/src/interaction/scriptcamerastates.cpp
+++ b/src/interaction/scriptcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -26,11 +26,6 @@
 
 #include <openspace/interaction/inputstate.h>
 
-namespace {
-    const double SENSITIVITY_ADJUSTMENT_INCREASE = 8.0;
-    const double SENSITIVITY_ADJUSTMENT_DECREASE = 0.5;
-}
-
 namespace openspace::interaction {
 
 ScriptCameraStates::ScriptCameraStates() : CameraInteractionStates(1.0, 1.0) {}
diff --git a/src/interaction/sessionrecording.cpp b/src/interaction/sessionrecording.cpp
index 9425204fe9..fe8343c6ef 100644
--- a/src/interaction/sessionrecording.cpp
+++ b/src/interaction/sessionrecording.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,6 +29,7 @@
 #include <openspace/interaction/keyframenavigator.h>
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/interaction/orbitalnavigator.h>
+#include <openspace/interaction/tasks/convertrecfileversiontask.h>
 #include <openspace/interaction/tasks/convertrecformattask.h>
 #include <openspace/rendering/luaconsole.h>
 #include <openspace/rendering/renderable.h>
@@ -60,24 +61,36 @@ namespace {
 
     constexpr const bool UsingTimeKeyframes = false;
 
-
 } // namespace
 
 #include "sessionrecording_lua.inl"
 
 namespace openspace::interaction {
 
+ConversionError::ConversionError(std::string msg)
+    : ghoul::RuntimeError(std::move(msg), "conversionError")
+{}
+
 SessionRecording::SessionRecording()
     : properties::PropertyOwner({ "SessionRecording", "Session Recording" })
     , _renderPlaybackInformation(RenderPlaybackInfo, false)
+{}
+
+SessionRecording::SessionRecording(bool isGlobal)
+    : properties::PropertyOwner({ "SessionRecording", "Session Recording" })
+    , _renderPlaybackInformation(RenderPlaybackInfo, false)
 {
-    auto fTask = FactoryManager::ref().factory<Task>();
-    ghoul_assert(fTask, "No task factory existed");
-    fTask->registerClass<ConvertRecFormatTask>("ConvertRecFormatTask");
-    addProperty(_renderPlaybackInformation);
+    if (isGlobal) {
+        auto fTask = FactoryManager::ref().factory<Task>();
+        ghoul_assert(fTask, "No task factory existed");
+        fTask->registerClass<ConvertRecFormatTask>("ConvertRecFormatTask");
+        fTask->registerClass<ConvertRecFileVersionTask>("ConvertRecFileVersionTask");
+        addProperty(_renderPlaybackInformation);
+    }
 }
 
-SessionRecording::~SessionRecording() {} // NOLINT
+SessionRecording::~SessionRecording() { // NOLINT
+}
 
 void SessionRecording::deinitialize() {
     stopRecording();
@@ -97,8 +110,32 @@ bool SessionRecording::hasFileExtension(std::string filename, std::string extens
     }
 }
 
+bool SessionRecording::isPath(std::string& filename) {
+    size_t unixDelimiter = filename.find("/");
+    size_t windowsDelimiter = filename.find("\\");
+    return (unixDelimiter != std::string::npos || windowsDelimiter != std::string::npos);
+}
+
+void SessionRecording::removeTrailingPathSlashes(std::string& filename) {
+    while (filename.substr(filename.length() - 1, 1) == "/") {
+        filename.pop_back();
+    }
+    while (filename.substr(filename.length() - 1, 1) == "\\") {
+        filename.pop_back();
+    }
+}
+
+void SessionRecording::extractFilenameFromPath(std::string& filename) {
+    size_t unixDelimiter = filename.find_last_of("/");
+    if (unixDelimiter != std::string::npos)
+        filename = filename.substr(unixDelimiter + 1);
+    size_t windowsDelimiter = filename.find_last_of("\\");
+    if (windowsDelimiter != std::string::npos)
+        filename = filename.substr(windowsDelimiter + 1);
+}
+
 bool SessionRecording::handleRecordingFile(std::string filenameIn) {
-    if (filenameIn.find("/") != std::string::npos) {
+    if (isPath(filenameIn)) {
         LERROR("Recording filename must not contain path (/) elements");
         return false;
     }
@@ -203,15 +240,24 @@ void SessionRecording::stopRecording() {
     _recordFile.close();
 }
 
-bool SessionRecording::startPlayback(const std::string& filename,
+bool SessionRecording::startPlayback(std::string& filename,
                                      KeyframeTimeRef timeMode,
                                      bool forceSimTimeAtStart)
 {
-    if (filename.find("/") != std::string::npos) {
+    if (isPath(filename)) {
         LERROR("Playback filename must not contain path (/) elements");
         return false;
     }
-    const std::string absFilename = absPath("${RECORDINGS}/" + filename);
+    std::string absFilename;
+    //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)) {
+        absFilename = filename;
+    }
+    else {
+        absFilename = absPath("${RECORDINGS}/" + filename);
+    }
 
     if (_state == SessionState::Recording) {
         LERROR("Unable to start playback while in session recording mode");
@@ -255,17 +301,19 @@ bool SessionRecording::startPlayback(const std::string& filename,
         LERROR("Unknown data type in header (should be Ascii or Binary)");
         cleanUpPlayback();
     }
-    std::string throwawayNewlineChar = readHeaderElement(_playbackFile, 1);
+    // throwaway newline character
+    readHeaderElement(_playbackFile, 1);
 
     if (_recordingDataMode == DataMode::Binary) {
         //Close & re-open the file, starting from the beginning, and do dummy read
         // past the header, version, and data type
         _playbackFile.close();
         _playbackFile.open(_playbackFilename, std::ifstream::in | std::ios::binary);
-        size_t headerSize = FileHeaderTitle.length() +
-            FileHeaderVersionLength +
-            sizeof(DataFormatBinaryTag) + sizeof('\n');
-        _playbackFile.read(reinterpret_cast<char*>(&_keyframeBuffer), headerSize);
+        size_t headerSize = FileHeaderTitle.length() + FileHeaderVersionLength
+            + sizeof(DataFormatBinaryTag) + sizeof('\n');
+        std::vector<char> hBuffer;
+        hBuffer.resize(headerSize);
+        _playbackFile.read(hBuffer.data(), headerSize);
     }
 
     if (!_playbackFile.is_open() || !_playbackFile.good()) {
@@ -500,15 +548,10 @@ void SessionRecording::saveCameraKeyframe() {
         kf._timestamp - _timestampRecordStarted,
         global::timeManager->time().j2000Seconds()
     };
-    if (_recordingDataMode == DataMode::Binary) {
-        saveCameraKeyframeBinary(times, kf, _keyframeBuffer, _recordFile);
-    }
-    else {
-        saveCameraKeyframeAscii(times, kf, _recordFile);
-    }
+    saveSingleKeyframeCamera(kf, times, _recordingDataMode, _recordFile, _keyframeBuffer);
 }
 
-void SessionRecording::saveHeaderBinary(Timestamps times,
+void SessionRecording::saveHeaderBinary(Timestamps& times,
                                         char type,
                                         unsigned char* kfBuffer,
                                         size_t& idx)
@@ -519,7 +562,7 @@ void SessionRecording::saveHeaderBinary(Timestamps times,
     writeToFileBuffer(kfBuffer, idx, times.timeSim);
 }
 
-void SessionRecording::saveHeaderAscii(Timestamps times,
+void SessionRecording::saveHeaderAscii(Timestamps& times,
                                        const std::string& type,
                                        std::stringstream& line)
 {
@@ -529,7 +572,7 @@ void SessionRecording::saveHeaderAscii(Timestamps times,
     line << std::fixed << std::setprecision(3) << times.timeSim << ' ';
 }
 
-void SessionRecording::saveCameraKeyframeBinary(Timestamps times,
+void SessionRecording::saveCameraKeyframeBinary(Timestamps& times,
                                                 datamessagestructures::CameraKeyframe& kf,
                                                 unsigned char* kfBuffer,
                                                 std::ofstream& file)
@@ -544,7 +587,7 @@ void SessionRecording::saveCameraKeyframeBinary(Timestamps times,
     saveKeyframeToFileBinary(kfBuffer, idx, file);
 }
 
-void SessionRecording::saveCameraKeyframeAscii(Timestamps times,
+void SessionRecording::saveCameraKeyframeAscii(Timestamps& times,
                                                datamessagestructures::CameraKeyframe& kf,
                                                std::ofstream& file)
 {
@@ -567,14 +610,10 @@ void SessionRecording::saveTimeKeyframe() {
         kf._timestamp - _timestampRecordStarted,
         global::timeManager->time().j2000Seconds()
     };
-    if (_recordingDataMode == DataMode::Binary) {
-        saveTimeKeyframeBinary(times, kf, _keyframeBuffer, _recordFile);
-    } else {
-        saveTimeKeyframeAscii(times, kf, _recordFile);
-    }
+    saveSingleKeyframeTime(kf, times, _recordingDataMode, _recordFile, _keyframeBuffer);
 }
 
-void SessionRecording::saveTimeKeyframeBinary(Timestamps times,
+void SessionRecording::saveTimeKeyframeBinary(Timestamps& times,
                                               datamessagestructures::TimeKeyframe& kf,
                                               unsigned char* kfBuffer,
                                               std::ofstream& file)
@@ -587,7 +626,7 @@ void SessionRecording::saveTimeKeyframeBinary(Timestamps times,
     saveKeyframeToFileBinary(kfBuffer, idx, file);
 }
 
-void SessionRecording::saveTimeKeyframeAscii(Timestamps times,
+void SessionRecording::saveTimeKeyframeAscii(Timestamps& times,
                                              datamessagestructures::TimeKeyframe& kf,
                                              std::ofstream& file)
 {
@@ -597,7 +636,8 @@ void SessionRecording::saveTimeKeyframeAscii(Timestamps times,
     saveKeyframeToFile(keyframeLine.str(), file);
 }
 
-void SessionRecording::saveScriptKeyframe(std::string scriptToSave) {
+void SessionRecording::saveScriptKeyframe(std::string scriptToSave)
+{
     if (_state != SessionState::Recording) {
         return;
     }
@@ -611,15 +651,16 @@ void SessionRecording::saveScriptKeyframe(std::string scriptToSave) {
         global::timeManager->time().j2000Seconds()
     };
 
-    if (_recordingDataMode == DataMode::Binary) {
-        saveScriptKeyframeBinary(times, sm, _keyframeBuffer, _recordFile);
-    }
-    else {
-        saveScriptKeyframeAscii(times, sm, _recordFile);
-    }
+    saveSingleKeyframeScript(
+        sm,
+        times,
+        _recordingDataMode,
+        _recordFile,
+        _keyframeBuffer
+    );
 }
 
-void SessionRecording::saveScriptKeyframeBinary(Timestamps times,
+void SessionRecording::saveScriptKeyframeBinary(Timestamps& times,
                                                 datamessagestructures::ScriptMessage& sm,
                                                 unsigned char* smBuffer,
                                                 std::ofstream& file)
@@ -633,7 +674,7 @@ void SessionRecording::saveScriptKeyframeBinary(Timestamps times,
     saveKeyframeToFileBinary(smBuffer, idx, file);
 }
 
-void SessionRecording::saveScriptKeyframeAscii(Timestamps times,
+void SessionRecording::saveScriptKeyframeAscii(Timestamps& times,
                                                datamessagestructures::ScriptMessage& sm,
                                                std::ofstream& file)
 {
@@ -662,7 +703,7 @@ void SessionRecording::preSynchronization() {
 
     //Handle callback(s) for change in idle/record/playback state
     if (_state != _lastState) {
-        using K = const CallbackHandle;
+        using K = CallbackHandle;
         using V = StateChangeCallback;
         for (const std::pair<K, V>& it : _stateChangeCallbacks) {
             it.second();
@@ -714,9 +755,8 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
 
     if (_recordingDataMode == DataMode::Binary) {
         unsigned char frameType;
-        bool fileReadOk = true;
 
-        while (parsingStatusOk && fileReadOk) {
+        while (parsingStatusOk) {
             frameType = readFromPlayback<unsigned char>(_playbackFile);
             // Check if have reached EOF
             if (!_playbackFile) {
@@ -724,7 +764,6 @@ bool SessionRecording::playbackAddEntriesToTimeline() {
                     "Finished parsing {} entries from playback file {}",
                     _playbackLineNum - 1, _playbackFilename
                 ));
-                fileReadOk = false;
                 break;
             }
             if (frameType == HeaderCameraBinary) {
@@ -871,12 +910,14 @@ bool SessionRecording::playbackCamera() {
     Timestamps times;
     datamessagestructures::CameraKeyframe kf;
 
-    if (_recordingDataMode == DataMode::Binary) {
-        readCameraKeyframeBinary(times, kf, _playbackFile, _playbackLineNum);
-    }
-    else {
-        readCameraKeyframeAscii(times, kf, _playbackLineParsing, _playbackLineNum);
-    }
+    bool success = readSingleKeyframeCamera(
+        kf,
+        times,
+        _recordingDataMode,
+        _playbackFile,
+        _playbackLineParsing,
+        _playbackLineNum
+    );
 
     if (_setSimulationTimeWithNextCameraKeyframe) {
         global::timeManager->setTimeNextFrame(Time(times.timeSim));
@@ -886,16 +927,73 @@ bool SessionRecording::playbackCamera() {
     double timeRef = appropriateTimestamp(times.timeOs, times.timeRec, times.timeSim);
 
     interaction::KeyframeNavigator::CameraPose pbFrame(std::move(kf));
-    return addKeyframe(timeRef, pbFrame, _playbackLineNum);
+    if (success) {
+        success = addKeyframe(timeRef, pbFrame, _playbackLineNum);
+    }
+    return success;
 }
 
-void SessionRecording::readCameraKeyframeBinary(Timestamps& times,
+bool SessionRecording::convertCamera(std::stringstream& inStream, DataMode mode,
+                                     int lineNum, std::string& inputLine,
+                                     std::ofstream& outFile, unsigned char* buffer)
+{
+    Timestamps times;
+    datamessagestructures::CameraKeyframe kf;
+
+    bool success = readSingleKeyframeCamera(
+        kf,
+        times,
+        mode,
+        reinterpret_cast<std::ifstream&>(inStream),
+        inputLine,
+        lineNum
+    );
+    if (success) {
+        saveSingleKeyframeCamera(
+            kf,
+            times,
+            mode,
+            outFile,
+            buffer
+        );
+    }
+    return success;
+}
+
+bool SessionRecording::readSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
+                                                Timestamps& times, DataMode mode,
+                                                std::ifstream& file, std::string& inLine,
+                                                const int lineNum)
+{
+    if (mode == DataMode::Binary) {
+        return readCameraKeyframeBinary(times, kf, file, lineNum);
+    }
+    else {
+        return readCameraKeyframeAscii(times, kf, inLine, lineNum);
+    }
+}
+
+void SessionRecording::saveSingleKeyframeCamera(datamessagestructures::CameraKeyframe& kf,
+                                                Timestamps& times, DataMode mode,
+                                                std::ofstream& file,
+                                                unsigned char* buffer)
+{
+    if (mode == DataMode::Binary) {
+        saveCameraKeyframeBinary(times, kf, buffer, file);
+    }
+    else {
+        saveCameraKeyframeAscii(times, kf, file);
+    }
+}
+
+bool SessionRecording::readCameraKeyframeBinary(Timestamps& times,
                                                 datamessagestructures::CameraKeyframe& kf,
                                                 std::ifstream& file, int lineN)
 {
     times.timeOs = readFromPlayback<double>(file);
     times.timeRec = readFromPlayback<double>(file);
     times.timeSim = readFromPlayback<double>(file);
+
     try {
         kf.read(&file);
     }
@@ -904,14 +1002,14 @@ void SessionRecording::readCameraKeyframeBinary(Timestamps& times,
             "Allocation error with camera playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
     catch (std::length_error&) {
         LERROR(fmt::format(
             "length_error with camera playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
     times.timeOs = kf._timestamp;
 
@@ -920,11 +1018,12 @@ void SessionRecording::readCameraKeyframeBinary(Timestamps& times,
             "Error reading camera playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
+    return true;
 }
 
-void SessionRecording::readCameraKeyframeAscii(Timestamps& times,
+bool SessionRecording::readCameraKeyframeAscii(Timestamps& times,
                                                datamessagestructures::CameraKeyframe& kf,
                                                std::string currentParsingLine,
                                                int lineN)
@@ -941,28 +1040,85 @@ void SessionRecording::readCameraKeyframeAscii(Timestamps& times,
 
     if (iss.fail() || !iss.eof()) {
         LERROR(fmt::format("Error parsing camera line {} of playback file", lineN));
-        return;
+        return false;
     }
+    return true;
 }
 
 bool SessionRecording::playbackTimeChange() {
     Timestamps times;
     datamessagestructures::TimeKeyframe kf;
 
-    if (_recordingDataMode == DataMode::Binary) {
-        readTimeKeyframeBinary(times, kf, _playbackFile, _playbackLineNum);
-    } else {
-        readTimeKeyframeAscii(times, kf, _playbackLineParsing, _playbackLineNum);
-    }
+    bool success = readSingleKeyframeTime(
+        kf,
+        times,
+        _recordingDataMode,
+        _playbackFile,
+        _playbackLineParsing,
+        _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);
-    return addKeyframe(kf._timestamp, kf, _playbackLineNum);
+    if (success) {
+        success = addKeyframe(kf._timestamp, kf, _playbackLineNum);
+    }
+    return success;
 }
 
-void SessionRecording::readTimeKeyframeBinary(Timestamps& times,
+bool SessionRecording::convertTimeChange(std::stringstream& inStream, DataMode mode,
+                                         int lineNum, std::string& inputLine,
+                                         std::ofstream& outFile, unsigned char* buffer)
+{
+    Timestamps times;
+    datamessagestructures::TimeKeyframe kf;
+
+    bool success = readSingleKeyframeTime(
+        kf,
+        times,
+        mode,
+        reinterpret_cast<std::ifstream&>(inStream),
+        inputLine,
+        lineNum
+    );
+    if (success) {
+        saveSingleKeyframeTime(
+            kf,
+            times,
+            mode,
+            outFile,
+            buffer
+        );
+    }
+    return success;
+}
+
+bool SessionRecording::readSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
+                                              Timestamps& times, DataMode mode,
+                                              std::ifstream& file, std::string& inLine,
+                                              const int lineNum)
+{
+    if (mode == DataMode::Binary) {
+        return readTimeKeyframeBinary(times, kf, file, lineNum);
+    } else {
+        return readTimeKeyframeAscii(times, kf, inLine, lineNum);
+    }
+}
+
+void SessionRecording::saveSingleKeyframeTime(datamessagestructures::TimeKeyframe& kf,
+                                              Timestamps& times, DataMode mode,
+                                              std::ofstream& file, unsigned char* buffer)
+{
+    if (mode == DataMode::Binary) {
+        saveTimeKeyframeBinary(times, kf, buffer, file);
+    } else {
+        saveTimeKeyframeAscii(times, kf, file);
+    }
+}
+
+bool SessionRecording::readTimeKeyframeBinary(Timestamps& times,
                                               datamessagestructures::TimeKeyframe& kf,
                                               std::ifstream& file, int lineN)
 {
@@ -978,25 +1134,26 @@ void SessionRecording::readTimeKeyframeBinary(Timestamps& times,
             "Allocation error with time playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
     catch (std::length_error&) {
         LERROR(fmt::format(
             "length_error with time playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
 
     if (!file) {
         LERROR(fmt::format(
             "Error reading time playback from keyframe entry {}", lineN - 1
         ));
-        return;
+        return false;
     }
+    return true;
 }
 
-void SessionRecording::readTimeKeyframeAscii(Timestamps& times,
+bool SessionRecording::readTimeKeyframeAscii(Timestamps& times,
                                              datamessagestructures::TimeKeyframe& kf,
                                              std::string currentParsingLine,
                                              int lineN)
@@ -1012,8 +1169,9 @@ void SessionRecording::readTimeKeyframeAscii(Timestamps& times,
         LERROR(fmt::format(
             "Error parsing time line {} of playback file", lineN
         ));
-        return;
+        return false;
     }
+    return true;
 }
 
 std::string SessionRecording::readHeaderElement(std::ifstream& stream,
@@ -1024,21 +1182,88 @@ std::string SessionRecording::readHeaderElement(std::ifstream& stream,
     return std::string(readTemp.begin(), readTemp.end());
 }
 
+std::string SessionRecording::readHeaderElement(std::stringstream& stream,
+                                                size_t readLen_chars)
+{
+    std::vector<char> readTemp(readLen_chars);
+    stream.read(&readTemp[0], readLen_chars);
+    return std::string(readTemp.begin(), readTemp.end());
+}
+
 bool SessionRecording::playbackScript() {
     Timestamps times;
     datamessagestructures::ScriptMessage kf;
 
-    if (_recordingDataMode == DataMode::Binary) {
-        readScriptKeyframeBinary(times, kf, _playbackFile, _playbackLineNum);
-    } else {
-        readScriptKeyframeAscii(times, kf, _playbackLineParsing, _playbackLineNum);
-    }
+    bool success = readSingleKeyframeScript(
+        kf,
+        times,
+        _recordingDataMode,
+        _playbackFile,
+        _playbackLineParsing,
+        _playbackLineNum
+    );
 
     double timeRef = appropriateTimestamp(times.timeOs, times.timeRec, times.timeSim);
-    return addKeyframe(timeRef, kf._script, _playbackLineNum);
+    if (success) {
+        success = addKeyframe(timeRef, kf._script, _playbackLineNum);
+    }
+    return success;
 }
 
-void SessionRecording::readScriptKeyframeBinary(Timestamps& times,
+bool SessionRecording::convertScript(std::stringstream& inStream, DataMode mode,
+                                     int lineNum, std::string& inputLine,
+                                     std::ofstream& outFile, unsigned char* buffer)
+{
+    Timestamps times;
+    datamessagestructures::ScriptMessage kf;
+
+    bool success = readSingleKeyframeScript(
+        kf,
+        times,
+        mode,
+        reinterpret_cast<std::ifstream&>(inStream),
+        inputLine,
+        lineNum
+    );
+    if (success) {
+        saveSingleKeyframeScript(
+            kf,
+            times,
+            mode,
+            outFile,
+            buffer
+        );
+    }
+    return success;
+}
+
+bool SessionRecording::readSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
+                                                Timestamps& times, DataMode mode,
+                                                std::ifstream& file, std::string& inLine,
+                                                const int lineNum)
+{
+    if (mode == DataMode::Binary) {
+        return readScriptKeyframeBinary(times, kf, file, lineNum);
+    }
+    else {
+        return readScriptKeyframeAscii(times, kf, inLine, lineNum);
+    }
+}
+
+void SessionRecording::saveSingleKeyframeScript(datamessagestructures::ScriptMessage& kf,
+                                                Timestamps& times, DataMode mode,
+                                                std::ofstream& file,
+                                                unsigned char* buffer)
+{
+    if (mode == DataMode::Binary) {
+        saveScriptKeyframeBinary(times, kf, buffer, file);
+    }
+    else {
+        saveScriptKeyframeAscii(times, kf, file);
+    }
+}
+
+bool SessionRecording::readScriptKeyframeBinary(Timestamps& times,
                                                 datamessagestructures::ScriptMessage& kf,
                                                 std::ifstream& file, int lineN)
 {
@@ -1054,14 +1279,14 @@ void SessionRecording::readScriptKeyframeBinary(Timestamps& times,
             "Allocation error with script playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
     catch (std::length_error&) {
         LERROR(fmt::format(
             "length_error with script playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
 
     if (!file) {
@@ -1069,14 +1294,14 @@ void SessionRecording::readScriptKeyframeBinary(Timestamps& times,
             "Error reading script playback from keyframe entry {}",
             lineN - 1
         ));
-        return;
+        return false;
     }
+    return true;
 }
 
-void SessionRecording::readScriptKeyframeAscii(Timestamps& times,
+bool SessionRecording::readScriptKeyframeAscii(Timestamps& times,
                                                datamessagestructures::ScriptMessage& kf,
-                                               std::string currentParsingLine,
-                                               int lineN)
+                                               std::string currentParsingLine, int lineN)
 {
     std::string entryType;
     std::istringstream iss(currentParsingLine);
@@ -1087,13 +1312,14 @@ void SessionRecording::readScriptKeyframeAscii(Timestamps& times,
         LERROR(fmt::format(
             "Error parsing script line {} of playback file", lineN
         ));
-        return;
+        return false;
     } else if (!iss.eof()) {
         LERROR(fmt::format(
             "Did not find an EOL at line {} of playback file", lineN
         ));
-        return;
+        return false;
     }
+    return true;
 }
 
 bool SessionRecording::addKeyframe(double timestamp,
@@ -1140,8 +1366,7 @@ bool SessionRecording::addKeyframe(double timestamp,
 
 bool SessionRecording::addKeyframeToTimeline(RecordedType type,
                                              size_t indexIntoTypeKeyframes,
-                                             double timestamp,
-                                             int lineNum)
+                                             double timestamp, int lineNum)
 {
     try {
         _timeline.push_back({
@@ -1493,6 +1718,399 @@ std::vector<std::string> SessionRecording::playbackList() const {
     return fileList;
 }
 
+void SessionRecording::readPlaybackHeader_stream(std::stringstream& conversionInStream,
+                                                 std::string& version, DataMode& mode)
+{
+    // Read header
+    std::string readBackHeaderString = readHeaderElement(
+        conversionInStream,
+        FileHeaderTitle.length()
+    );
+
+    if (readBackHeaderString != FileHeaderTitle) {
+        throw ConversionError("File to convert does not contain expected header.");
+    }
+    version = readHeaderElement(conversionInStream, FileHeaderVersionLength);
+    std::string readDataMode = readHeaderElement(conversionInStream, 1);
+    if (readDataMode[0] == DataFormatAsciiTag) {
+        mode = DataMode::Ascii;
+    }
+    else if (readDataMode[0] == DataFormatBinaryTag) {
+        mode = DataMode::Binary;
+    }
+    else {
+        throw ConversionError("Unknown data type in header (needs Ascii or Binary)");
+    }
+    //Read to throw out newline at end of header
+    readHeaderElement(conversionInStream, 1);
+}
+
+SessionRecording::DataMode SessionRecording::readModeFromHeader(std::string filename) {
+    DataMode mode;
+    std::ifstream inputFile;
+    // Open in ASCII first
+    inputFile.open(filename, std::ifstream::in);
+    // Read header
+    std::string readBackHeaderString = readHeaderElement(
+        inputFile,
+        FileHeaderTitle.length()
+    );
+    if (readBackHeaderString != FileHeaderTitle) {
+        LERROR("Specified playback file does not contain expected header.");
+    }
+    readHeaderElement(inputFile, FileHeaderVersionLength);
+    std::string readDataMode = readHeaderElement(inputFile, 1);
+    if (readDataMode[0] == DataFormatAsciiTag) {
+        mode = DataMode::Ascii;
+    }
+    else if (readDataMode[0] == DataFormatBinaryTag) {
+        mode = DataMode::Binary;
+    }
+    else {
+        throw ConversionError("Unknown data type in header (should be Ascii or Binary)");
+    }
+    return mode;
+}
+
+void SessionRecording::readFileIntoStringStream(std::string filename,
+                                                std::ifstream& inputFstream,
+                                                std::stringstream& stream)
+{
+    if (isPath(filename)) {
+        throw ConversionError("Playback filename must not contain path (/) elements");
+    }
+    std::string conversionInFilename = absPath("${RECORDINGS}/" + filename);
+    if (!FileSys.fileExists(conversionInFilename)) {
+        throw ConversionError(fmt::format(
+            "Cannot find the specified playback file '{}' to convert.",
+            conversionInFilename
+        ));
+    }
+
+    DataMode mode = readModeFromHeader(conversionInFilename);
+
+    stream.str("");
+    stream.clear();
+    inputFstream.close();
+    if (mode == DataMode::Binary) {
+        inputFstream.open(conversionInFilename, std::ifstream::in | std::ios::binary);
+    }
+    else {
+        inputFstream.open(conversionInFilename, std::ifstream::in);
+    }
+    stream << inputFstream.rdbuf();
+    if (!inputFstream.is_open() || !inputFstream.good()) {
+        throw ConversionError(fmt::format(
+            "Unable to open file {} for conversion", filename.c_str()
+        ));
+    }
+    inputFstream.close();
+}
+
+std::string SessionRecording::convertFile(std::string filename, int depth)
+{
+    std::string conversionOutFilename = filename;
+    std::ifstream conversionInFile;
+    std::stringstream conversionInStream;
+    if (depth >= _maximumRecursionDepth) {
+        LERROR("Runaway recursion in session recording conversion of file version.");
+        exit(EXIT_FAILURE);
+    }
+    std::string newFilename = filename;
+    try {
+        readFileIntoStringStream(filename, conversionInFile, conversionInStream);
+        DataMode mode;
+        std::string fileVersion;
+        readPlaybackHeader_stream(
+            conversionInStream,
+            fileVersion,
+            mode
+        );
+        int conversionLineNum = 1;
+
+        //If this instance of the SessionRecording class isn't the instance with the
+        // correct version of the file to be converted, then call getLegacy() to recurse
+        // to the next level down in the legacy subclasses until we get the right
+        // version, then proceed with conversion from there.
+        if (fileVersion.compare(fileFormatVersion()) != 0) {
+            //conversionInStream.seekg(conversionInStream.beg);
+            newFilename = getLegacyConversionResult(filename, depth + 1);
+            removeTrailingPathSlashes(newFilename);
+            if (isPath(newFilename)) {
+                extractFilenameFromPath(newFilename);
+            }
+            if (filename == newFilename) {
+                return filename;
+            }
+            readFileIntoStringStream(newFilename, conversionInFile, conversionInStream);
+            readPlaybackHeader_stream(
+                conversionInStream,
+                fileVersion,
+                mode
+            );
+        }
+        if (depth != 0) {
+            conversionOutFilename = determineConversionOutFilename(filename, mode);
+            LINFO(fmt::format(
+                "Starting conversion on rec file {}, version {} in {} mode. "
+                "Writing result to {}.",
+                newFilename, fileVersion, (mode == DataMode::Ascii) ? "ascii" : "binary",
+                conversionOutFilename
+            ));
+            std::ofstream conversionOutFile;
+            if (mode == DataMode::Binary) {
+                conversionOutFile.open(conversionOutFilename, std::ios::binary);
+            }
+            else {
+                conversionOutFile.open(conversionOutFilename);
+            }
+            if (!conversionOutFile.is_open() || !conversionOutFile.good()) {
+                LERROR(fmt::format(
+                    "Unable to open file {} for conversion result",
+                    conversionOutFilename.c_str()
+                ));
+                return "";
+            }
+            conversionOutFile << FileHeaderTitle;
+            conversionOutFile.write(
+                targetFileFormatVersion().c_str(),
+                FileHeaderVersionLength
+            );
+            if (mode == DataMode::Binary) {
+                conversionOutFile << DataFormatBinaryTag;
+            }
+            else {
+                conversionOutFile << DataFormatAsciiTag;
+            }
+            conversionOutFile << '\n';
+            convertEntries(
+                newFilename,
+                conversionInStream,
+                mode,
+                conversionLineNum,
+                conversionOutFile
+            );
+            conversionOutFile.close();
+        }
+        conversionInFile.close();
+    }
+    catch (ConversionError& c) {
+        LERROR(c.message);
+    }
+
+    if (depth == 0) {
+        return newFilename;
+    }
+    else {
+        return conversionOutFilename;
+    }
+}
+
+bool SessionRecording::convertEntries(std::string& inFilename,
+                                      std::stringstream& inStream, DataMode mode,
+                                      int lineNum, std::ofstream& outFile)
+{
+    bool conversionStatusOk = true;
+    std::string lineParsing;
+
+    if (mode == DataMode::Binary) {
+        unsigned char frameType;
+
+        while (conversionStatusOk) {
+            frameType = readFromPlayback<unsigned char>(inStream);
+            // Check if have reached EOF
+            if (!inStream) {
+                LINFO(fmt::format(
+                    "Finished converting {} entries from playback file {}",
+                    lineNum - 1, inFilename
+                ));
+                break;
+            }
+            if (frameType == HeaderCameraBinary) {
+                conversionStatusOk = convertCamera(
+                    inStream,
+                    mode,
+                    lineNum,
+                    lineParsing,
+                    outFile,
+                    _keyframeBuffer
+                );
+            }
+            else if (frameType == HeaderTimeBinary) {
+                conversionStatusOk = convertTimeChange(
+                    inStream,
+                    mode,
+                    lineNum,
+                    lineParsing,
+                    outFile,
+                    _keyframeBuffer
+                );
+            }
+            else if (frameType == HeaderScriptBinary) {
+                try {
+                    conversionStatusOk = convertScript(
+                        inStream,
+                        mode,
+                        lineNum,
+                        lineParsing,
+                        outFile,
+                        _keyframeBuffer
+                    );
+                }
+                catch (ConversionError& c) {
+                    LERROR(c.message);
+                    conversionStatusOk = false;
+                }
+            }
+            else {
+                LERROR(fmt::format(
+                    "Unknown frame type {} @ index {} of conversion file {}",
+                    frameType, lineNum - 1, inFilename
+                ));
+                conversionStatusOk = false;
+            }
+            lineNum++;
+        }
+    }
+    else {
+        while (conversionStatusOk && std::getline(inStream, lineParsing)) {
+            lineNum++;
+
+            std::istringstream iss(lineParsing);
+            std::string entryType;
+            if (!(iss >> entryType)) {
+                LERROR(fmt::format(
+                    "Error reading entry type @ line {} of conversion file {}",
+                    lineNum, inFilename
+                ));
+                break;
+            }
+
+            if (entryType == HeaderCameraAscii) {
+                conversionStatusOk = convertCamera(
+                    inStream,
+                    mode,
+                    lineNum,
+                    lineParsing,
+                    outFile,
+                    _keyframeBuffer
+                );
+            }
+            else if (entryType == HeaderTimeAscii) {
+                conversionStatusOk = convertTimeChange(
+                    inStream,
+                    mode,
+                    lineNum,
+                    lineParsing,
+                    outFile,
+                    _keyframeBuffer
+                );
+            }
+            else if (entryType == HeaderScriptAscii) {
+                try {
+                    conversionStatusOk = convertScript(
+                        inStream,
+                        mode,
+                        lineNum,
+                        lineParsing,
+                        outFile,
+                        _keyframeBuffer
+                    );
+                }
+                catch (ConversionError& c) {
+                    LERROR(c.message);
+                    conversionStatusOk = false;
+                }
+            }
+            else if (entryType.substr(0, 1) == HeaderCommentAscii) {
+                continue;
+            }
+            else {
+                LERROR(fmt::format(
+                    "Unknown frame type {} @ line {} of conversion file {}",
+                    entryType, lineNum, inFilename
+                ));
+                conversionStatusOk = false;
+            }
+        }
+        LINFO(fmt::format(
+            "Finished parsing {} entries from conversion file {}",
+            lineNum, inFilename
+        ));
+    }
+    return conversionStatusOk;
+}
+
+std::string SessionRecording::getLegacyConversionResult(std::string filename, int depth) {
+    SessionRecording_legacy_0085 legacy;
+    return legacy.convertFile(filename, depth);
+}
+
+std::string SessionRecording_legacy_0085::getLegacyConversionResult(std::string filename,
+                                                                    int)
+{
+    //This method is overriden in each legacy subclass, but does nothing in this instance
+    // as the oldest supported legacy version.
+    LERROR(fmt::format(
+        "Version 00.85 is the oldest supported legacy file format; no conversion "
+        "can be made. It is possible that file {} has a corrupted header or an invalid "
+        "file format version number.",
+        filename
+    ));
+    return filename;
+}
+
+std::string SessionRecording::fileFormatVersion() {
+    return std::string(FileHeaderVersion);
+}
+
+std::string SessionRecording::targetFileFormatVersion() {
+    return std::string(FileHeaderVersion);
+}
+
+std::string SessionRecording::determineConversionOutFilename(const std::string filename,
+                                                             DataMode mode)
+{
+    std::string filenameSansExtension = filename;
+    std::string fileExtension = (mode == DataMode::Binary) ?
+        FileExtensionBinary : FileExtensionAscii;
+
+    if (filename.find_last_of(".") != std::string::npos) {
+        filenameSansExtension = filename.substr(0, filename.find_last_of("."));
+    }
+    filenameSansExtension += "_" + fileFormatVersion() + "-" + targetFileFormatVersion();
+    return absPath("${RECORDINGS}/" + filenameSansExtension + fileExtension);
+}
+
+bool SessionRecording_legacy_0085::convertScript(std::stringstream& inStream,
+                                                 DataMode mode, int lineNum,
+                                                 std::string& inputLine,
+                                                 std::ofstream& outFile,
+                                                 unsigned char* buffer)
+{
+    Timestamps times;
+    ScriptMessage_legacy_0085 kf;
+
+    bool success = readSingleKeyframeScript(
+        kf,
+        times,
+        mode,
+        reinterpret_cast<std::ifstream&>(inStream),
+        inputLine,
+        lineNum
+    );
+    if (success) {
+        saveSingleKeyframeScript(
+            kf,
+            times,
+            mode,
+            outFile,
+            buffer
+        );
+    }
+    return success;
+}
+
 scripting::LuaLibrary SessionRecording::luaLibrary() {
     return {
         "sessionRecording",
@@ -1583,7 +2201,15 @@ scripting::LuaLibrary SessionRecording::luaLibrary() {
                 {},
                 "void",
                 "Used to disable that renderings are saved during playback"
-            }
+            },
+            {
+                "fileFormatConversion",
+                &luascriptfunctions::fileFormatConversion,
+                {},
+                "string",
+                "Performs a conversion of the specified file to the most most recent "
+                "file format, creating a copy of the recording file."
+            },
         }
     };
 }
diff --git a/src/interaction/sessionrecording_lua.inl b/src/interaction/sessionrecording_lua.inl
index e2b47d8bd8..fe457ce3df 100644
--- a/src/interaction/sessionrecording_lua.inl
+++ b/src/interaction/sessionrecording_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -96,7 +96,7 @@ int startPlayback(lua_State* L, interaction::KeyframeTimeRef timeMode,
     }
 
     global::sessionRecording->startPlayback(
-        playbackFilePath,
+        const_cast<std::string&>(playbackFilePath),
         timeMode,
         forceSimTimeAtStart
     );
@@ -167,4 +167,22 @@ int disableTakeScreenShotDuringPlayback(lua_State* L) {
     return 0;
 }
 
+int fileFormatConversion(lua_State* L) {
+    using ghoul::lua::luaTypeToString;
+
+    const std::string convertFilePath = ghoul::lua::value<std::string>(
+        L,
+        1,
+        ghoul::lua::PopValue::Yes
+    );
+
+    if (convertFilePath.empty()) {
+        return luaL_error(L, "filepath string is empty");
+    }
+    global::sessionRecording->convertFile(convertFilePath);
+
+    ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
+    return 0;
+}
+
 } // namespace openspace::luascriptfunctions
diff --git a/src/interaction/shortcutmanager.cpp b/src/interaction/shortcutmanager.cpp
index 6ce77e835b..1170ce8f3e 100644
--- a/src/interaction/shortcutmanager.cpp
+++ b/src/interaction/shortcutmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/shortcutmanager_lua.inl b/src/interaction/shortcutmanager_lua.inl
index fcce0b314a..90021969bd 100644
--- a/src/interaction/shortcutmanager_lua.inl
+++ b/src/interaction/shortcutmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/tasks/convertrecfileversiontask.cpp b/src/interaction/tasks/convertrecfileversiontask.cpp
new file mode 100644
index 0000000000..83eea9640c
--- /dev/null
+++ b/src/interaction/tasks/convertrecfileversiontask.cpp
@@ -0,0 +1,120 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/interaction/tasks/convertrecfileversiontask.h>
+#include <openspace/interaction/sessionrecording.h>
+#include <openspace/documentation/verifier.h>
+
+#include <openspace/engine/globals.h>
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <iomanip>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr const char* _loggerCat = "ConvertRecFileVersionTask";
+
+    constexpr const char* KeyInFilePath = "InputFilePath";
+} // namespace
+
+namespace openspace::interaction {
+
+ConvertRecFileVersionTask::ConvertRecFileVersionTask(const ghoul::Dictionary& dictionary)
+{
+    openspace::documentation::testSpecificationAndThrow(
+        documentation(),
+        dictionary,
+        "ConvertRecFileVersionTask"
+    );
+
+    _inFilename = dictionary.value<std::string>(KeyInFilePath);
+    _inFilePath = absPath(_inFilename);
+
+    std::string::size_type idx = _inFilename.find_last_of('/');
+    if( idx != std::string::npos ) {
+        _inFilename = _inFilename.substr(idx + 1);
+    }
+
+    ghoul_assert(FileSys.fileExists(_inFilePath), "The filename must exist");
+    if (!FileSys.fileExists(_inFilePath)) {
+        LERROR(fmt::format("Failed to load session recording file: {}", _inFilePath));
+    }
+    else {
+        sessRec = new SessionRecording(false);
+    }
+}
+
+ConvertRecFileVersionTask::~ConvertRecFileVersionTask() {
+    if (sessRec != nullptr) {
+        delete sessRec;
+    }
+}
+
+std::string ConvertRecFileVersionTask::description() {
+    std::string description = "Convert file format of session recording file '"
+        + _inFilePath + "' to current version.";
+    return description;
+}
+
+void ConvertRecFileVersionTask::perform(const Task::ProgressCallback&) {
+    convert();
+}
+
+void ConvertRecFileVersionTask::convert() {
+    bool hasBinaryFileExtension = sessRec->hasFileExtension(
+        _inFilename,
+        SessionRecording::FileExtensionBinary
+    );
+    bool hasAsciiFileExtension = sessRec->hasFileExtension(
+        _inFilename,
+        SessionRecording::FileExtensionAscii
+    );
+    if (!hasBinaryFileExtension && !hasAsciiFileExtension) {
+        LERROR(fmt::format(
+            "Input filename does not have expected {} or {} extension.",
+            SessionRecording::FileExtensionBinary,
+            SessionRecording::FileExtensionAscii
+        ));
+        return;
+    }
+    sessRec->convertFile(_inFilename);
+}
+
+documentation::Documentation ConvertRecFileVersionTask::documentation() {
+    using namespace documentation;
+    return {
+        "ConvertRecFileVersionTask",
+        "convert_file_version_task",
+        {
+            {
+                KeyInFilePath,
+                new StringAnnotationVerifier("A valid filename to convert"),
+                Optional::No,
+                "The filename to update to the current file format.",
+            },
+        },
+    };
+}
+
+}
diff --git a/src/interaction/tasks/convertrecformattask.cpp b/src/interaction/tasks/convertrecformattask.cpp
index 956639443b..3651d49868 100644
--- a/src/interaction/tasks/convertrecformattask.cpp
+++ b/src/interaction/tasks/convertrecformattask.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -56,14 +56,18 @@ ConvertRecFormatTask::ConvertRecFormatTask(const ghoul::Dictionary& dictionary)
         LERROR(fmt::format("Failed to load session recording file: {}", _inFilePath));
     }
     else {
-        _iFile.open(_inFilePath, std::ifstream::in);
+        _iFile.open(_inFilePath, std::ifstream::in | std::ifstream::binary);
         determineFormatType();
+        sessRec = new SessionRecording(false);
     }
 }
 
 ConvertRecFormatTask::~ConvertRecFormatTask() {
     _iFile.close();
     _oFile.close();
+    if (sessRec != nullptr) {
+        delete sessRec;
+    }
 }
 
 std::string ConvertRecFormatTask::description() {
@@ -81,7 +85,7 @@ std::string ConvertRecFormatTask::description() {
     return description;
 }
 
-void ConvertRecFormatTask::perform(const Task::ProgressCallback& progressCallback) {
+void ConvertRecFormatTask::perform(const Task::ProgressCallback&) {
     convert();
 }
 
@@ -101,8 +105,7 @@ void ConvertRecFormatTask::convert() {
 
     if (!SessionRecording::hasFileExtension(_inFilePath, expectedFileExtension_in)) {
         LWARNING(fmt::format(
-            "Input filename doesn't have expected {} "
-            "format file extension",
+            "Input filename doesn't have expected {} format file extension",
             currentFormat)
         );
     }
@@ -114,7 +117,8 @@ void ConvertRecFormatTask::convert() {
         );
         return;
     }
-    else if (!SessionRecording::hasFileExtension(_outFilePath, expectedFileExtension_out)) {
+    else if (!SessionRecording::hasFileExtension(_outFilePath, expectedFileExtension_out))
+    {
         _outFilePath += expectedFileExtension_out;
     }
 
@@ -128,10 +132,7 @@ void ConvertRecFormatTask::convert() {
         SessionRecording::FileHeaderTitle.c_str(),
         SessionRecording::FileHeaderTitle.length()
     );
-    _oFile.write(
-        SessionRecording::FileHeaderVersion,
-        SessionRecording::FileHeaderVersionLength
-    );
+    _oFile.write(_version.c_str(), SessionRecording::FileHeaderVersionLength);
     _oFile.close();
 
     if (_fileFormatType == SessionRecording::DataMode::Ascii) {
@@ -161,7 +162,7 @@ void ConvertRecFormatTask::determineFormatType() {
     }
     else {
         //Read version string and throw it away (and also line feed character at end)
-        SessionRecording::readHeaderElement(_iFile,
+        _version = SessionRecording::readHeaderElement(_iFile,
             SessionRecording::FileHeaderVersionLength);
         line = SessionRecording::readHeaderElement(_iFile, 1);
         SessionRecording::readHeaderElement(_iFile, 1);
@@ -202,21 +203,22 @@ void ConvertRecFormatTask::convertToAscii() {
 
         std::stringstream keyframeLine = std::stringstream();
         keyframeLine.str(std::string());
+
         if (frameType == SessionRecording::HeaderCameraBinary) {
-            SessionRecording::readCameraKeyframeBinary(times, ckf, _iFile, lineNum);
-            SessionRecording::saveHeaderAscii(times, SessionRecording::HeaderCameraAscii,
+            sessRec->readCameraKeyframeBinary(times, ckf, _iFile, lineNum);
+            sessRec->saveHeaderAscii(times, SessionRecording::HeaderCameraAscii,
                 keyframeLine);
             ckf.write(keyframeLine);
         }
         else if (frameType == SessionRecording::HeaderTimeBinary) {
-            SessionRecording::readTimeKeyframeBinary(times, tkf, _iFile, lineNum);
-            SessionRecording::saveHeaderAscii(times, SessionRecording::HeaderTimeAscii,
+            sessRec->readTimeKeyframeBinary(times, tkf, _iFile, lineNum);
+            sessRec->saveHeaderAscii(times, SessionRecording::HeaderTimeAscii,
                 keyframeLine);
             tkf.write(keyframeLine);
         }
         else if (frameType == SessionRecording::HeaderScriptBinary) {
-            SessionRecording::readScriptKeyframeBinary(times, skf, _iFile, lineNum);
-            SessionRecording::saveHeaderAscii(times, SessionRecording::HeaderScriptAscii,
+            sessRec->readScriptKeyframeBinary(times, skf, _iFile, lineNum);
+            sessRec->saveHeaderAscii(times, SessionRecording::HeaderScriptAscii,
                 keyframeLine);
             skf.write(keyframeLine);
         }
@@ -227,6 +229,7 @@ void ConvertRecFormatTask::convertToAscii() {
             ));
             break;
         }
+
         SessionRecording::saveKeyframeToFile(keyframeLine.str(), _oFile);
         lineNum++;
     }
@@ -245,7 +248,6 @@ void ConvertRecFormatTask::convertToBinary() {
     char tmpType = SessionRecording::DataFormatBinaryTag;
     _oFile.write(&tmpType, 1);
     _oFile.write("\n", 1);
-    size_t idx = 0;
 
     while (std::getline(_iFile, lineContents)) {
         lineNum++;
@@ -261,18 +263,18 @@ void ConvertRecFormatTask::convertToBinary() {
         }
 
         if (entryType == SessionRecording::HeaderCameraAscii) {
-            SessionRecording::readCameraKeyframeAscii(times, ckf, lineContents, lineNum);
-            SessionRecording::saveCameraKeyframeBinary(times, ckf, keyframeBuffer,
+            sessRec->readCameraKeyframeAscii(times, ckf, lineContents, lineNum);
+            sessRec->saveCameraKeyframeBinary(times, ckf, keyframeBuffer,
             _oFile);
         }
         else if (entryType == SessionRecording::HeaderTimeAscii) {
-            SessionRecording::readTimeKeyframeAscii(times, tkf, lineContents, lineNum);
-            SessionRecording::saveTimeKeyframeBinary(times, tkf, keyframeBuffer,
+            sessRec->readTimeKeyframeAscii(times, tkf, lineContents, lineNum);
+            sessRec->saveTimeKeyframeBinary(times, tkf, keyframeBuffer,
             _oFile);
         }
         else if (entryType == SessionRecording::HeaderScriptAscii) {
-            SessionRecording::readScriptKeyframeAscii(times, skf, lineContents, lineNum);
-            SessionRecording::saveScriptKeyframeBinary(times, skf, keyframeBuffer,
+            sessRec->readScriptKeyframeAscii(times, skf, lineContents, lineNum);
+            sessRec->saveScriptKeyframeBinary(times, skf, keyframeBuffer,
             _oFile);
         }
         else if (entryType.substr(0, 1) == SessionRecording::HeaderCommentAscii) {
@@ -312,12 +314,6 @@ documentation::Documentation ConvertRecFormatTask::documentation() {
         "ConvertRecFormatTask",
         "convert_format_task",
         {
-            {
-                "Type",
-                new StringEqualVerifier("ConvertRecFormatTask"),
-                Optional::No,
-                "The type of this task",
-            },
             {
                 KeyInFilePath,
                 new StringAnnotationVerifier("A valid filename to convert"),
diff --git a/src/interaction/touchbar.mm b/src/interaction/touchbar.mm
index 644e199e29..514f17d46e 100644
--- a/src/interaction/touchbar.mm
+++ b/src/interaction/touchbar.mm
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -92,7 +92,7 @@ NSArray* focusIdentifiers;
         if ([identifier isEqualToString:pauseResultId]) {
             NSButton* button = [NSButton 
                 buttonWithTitle:NSLocalizedString(
-                    (global::timeManager.isPaused() ? @"Resume" : @"Pause"),
+                    (global::timeManager->isPaused() ? @"Resume" : @"Pause"),
                     @""
                 )
                 target:self action:@selector(pauseResumeButtonAction:)
@@ -172,14 +172,14 @@ NSArray* focusIdentifiers;
     }
 
     - (void)pauseResumeButtonAction:(id)sender {
-        global::scriptEngine.queueScript(
+        global::scriptEngine->queueScript(
             "openspace.time.togglePause();",
             scripting::ScriptEngine::RemoteScripting::Yes
         );
 
         NSButton* button = static_cast<NSButton*>(sender);
         // This check is inverted since the togglePause script has not run yet
-        [button setTitle: global::timeManager.isPaused() ? @"Pause" : @"Resume"];
+        [button setTitle: global::timeManager->isPaused() ? @"Pause" : @"Resume"];
     }
 
     - (void)focusObjectAction:(id)sender {
@@ -195,7 +195,7 @@ NSArray* focusIdentifiers;
              "NavigationHandler.OrbitalNavigator.Aim",
              "NavigationHandler.OrbitalNavigator.RetargetAnchor"
         );
-        global::scriptEngine.queueScript(
+        global::scriptEngine->queueScript(
             str,
             scripting::ScriptEngine::RemoteScripting::Yes
         );
@@ -205,7 +205,7 @@ NSArray* focusIdentifiers;
         // Remove unused variable warning
         (void)sender;
 
-        global::scriptEngine.queueScript(
+        global::scriptEngine->queueScript(
             "local isEnabled = openspace.getPropertyValue('Dashboard.IsEnabled');\
              openspace.setPropertyValueSingle('Dashboard.IsEnabled', not isEnabled);\
              openspace.setPropertyValueSingle('RenderEngine.ShowLog', not isEnabled);\
@@ -218,7 +218,7 @@ NSArray* focusIdentifiers;
     - (void)hideGuiAction:(id)sender {
         // Remove unused variable warning
         (void)sender;
-        global::scriptEngine.queueScript(
+        global::scriptEngine->queueScript(
             "local isEnabled = openspace.getPropertyValue('Modules.CefWebGui.Visible');\
             openspace.setPropertyValueSingle('Modules.CefWebGui.Visible', not isEnabled);",
             scripting::ScriptEngine::RemoteScripting::No
@@ -242,7 +242,7 @@ void showTouchbar() {
         [NSApplication sharedApplication].automaticCustomizeTouchBarMenuItemEnabled = YES;
     }
     
-    std::vector<SceneGraphNode*> ns = global::renderEngine.scene()->allSceneGraphNodes();
+    std::vector<SceneGraphNode*> ns = global::renderEngine->scene()->allSceneGraphNodes();
 
     std::sort(
         ns.begin(),
diff --git a/src/interaction/websocketcamerastates.cpp b/src/interaction/websocketcamerastates.cpp
index 0881607a9a..1d933bd06d 100644
--- a/src/interaction/websocketcamerastates.cpp
+++ b/src/interaction/websocketcamerastates.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/interaction/websocketinputstate.cpp b/src/interaction/websocketinputstate.cpp
index 2c918d84e8..5f0f5d0172 100644
--- a/src/interaction/websocketinputstate.cpp
+++ b/src/interaction/websocketinputstate.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/mission/mission.cpp b/src/mission/mission.cpp
index e4d5d70f2a..95c63cadf3 100644
--- a/src/mission/mission.cpp
+++ b/src/mission/mission.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -85,10 +85,12 @@ documentation::Documentation MissionPhase::Documentation() {
 
 MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
     _name = dictionary.value<std::string>(KeyName);
-    dictionary.getValue(KeyDescription, _description);
+    if (dictionary.hasValue<std::string>(KeyDescription)) {
+        _description = dictionary.value<std::string>(KeyDescription);
+    }
 
-    ghoul::Dictionary childDicts;
-    if (dictionary.getValue(KeyPhases, childDicts)) {
+    if (dictionary.hasValue<ghoul::Dictionary>(KeyPhases)) {
+        ghoul::Dictionary childDicts = dictionary.value<ghoul::Dictionary>(KeyPhases);
         // This is a nested mission phase
         _subphases.reserve(childDicts.size());
         for (size_t i = 0; i < childDicts.size(); ++i) {
@@ -111,9 +113,9 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
         timeRangeSubPhases.end = _subphases.back().timeRange().end;
 
         // user may specify an overall time range. In that case expand this timerange.
-        ghoul::Dictionary timeRangeDict;
-        if (dictionary.getValue(KeyTimeRange, timeRangeDict)) {
-            TimeRange overallTimeRange(timeRangeDict);
+        if (dictionary.hasValue<ghoul::Dictionary>(KeyTimeRange)) {
+            ghoul::Dictionary range = dictionary.value<ghoul::Dictionary>(KeyTimeRange);
+            TimeRange overallTimeRange(range);
             if (!overallTimeRange.includes(timeRangeSubPhases)) {
                 throw ghoul::RuntimeError(
                     "User specified time range must at least include its subphases'",
@@ -130,8 +132,9 @@ MissionPhase::MissionPhase(const ghoul::Dictionary& dictionary) {
         }
     }
     else {
-        ghoul::Dictionary timeRangeDict;
-        if (dictionary.getValue(KeyTimeRange, timeRangeDict)) {
+        if (dictionary.hasValue<ghoul::Dictionary>(KeyTimeRange)) {
+            ghoul::Dictionary timeRangeDict =
+                dictionary.value<ghoul::Dictionary>(KeyTimeRange);
             _timeRange = TimeRange(timeRangeDict); // throws exception if unable to parse
         }
         else {
diff --git a/src/mission/missionmanager.cpp b/src/mission/missionmanager.cpp
index 892ceae501..c84cbd8399 100644
--- a/src/mission/missionmanager.cpp
+++ b/src/mission/missionmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/mission/missionmanager_lua.inl b/src/mission/missionmanager_lua.inl
index 283e5c46cc..5d9f3ea890 100644
--- a/src/mission/missionmanager_lua.inl
+++ b/src/mission/missionmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/network/parallelconnection.cpp b/src/network/parallelconnection.cpp
index 514528237e..de1fc5300b 100644
--- a/src/network/parallelconnection.cpp
+++ b/src/network/parallelconnection.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -149,7 +149,7 @@ ParallelConnection::Message ParallelConnection::receiveMessage() {
     }
 
     // Make sure that header matches this version of OpenSpace
-    if (!(headerBuffer[0] == 'O' && headerBuffer[1] && 'S')) {
+    if (!(headerBuffer[0] == 'O' && headerBuffer[1] == 'S')) {
         LERROR("Expected to read message header 'OS' from socket.");
         throw ConnectionLostError();
     }
@@ -174,7 +174,7 @@ ParallelConnection::Message ParallelConnection::receiveMessage() {
 
     const uint32_t messageSizeIn =
         *reinterpret_cast<uint32_t*>(headerBuffer.data() + offset);
-    offset += sizeof(uint32_t);
+    //offset += sizeof(uint32_t);
 
     const size_t messageSize = messageSizeIn;
 
diff --git a/src/network/parallelpeer.cpp b/src/network/parallelpeer.cpp
index 184ac07c1f..08bee3b496 100644
--- a/src/network/parallelpeer.cpp
+++ b/src/network/parallelpeer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -129,10 +129,6 @@ ParallelPeer::~ParallelPeer() {
     if (_timeJumpCallback != -1) {
         global::timeManager->removeTimeJumpCallback(_timeJumpCallback);
     }
-    if (_timeJumpCallback != -1) {
-        global::timeManager->removeTimeJumpCallback(_timeJumpCallback);
-    }
-
 }
 
 void ParallelPeer::connect() {
diff --git a/src/network/parallelpeer_lua.inl b/src/network/parallelpeer_lua.inl
index b48c81337f..8aad523b26 100644
--- a/src/network/parallelpeer_lua.inl
+++ b/src/network/parallelpeer_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/network/parallelserver.cpp b/src/network/parallelserver.cpp
index a52caeb410..35846ef76d 100644
--- a/src/network/parallelserver.cpp
+++ b/src/network/parallelserver.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -259,12 +259,6 @@ void ParallelServer::handleHostshipRequest(std::shared_ptr<Peer> peer,
 void ParallelServer::handleHostshipResignation(Peer& peer) {
     LINFO(fmt::format("Connection {} wants to resign its hostship", peer.id));
 
-    size_t oldHostPeerId = 0;
-    {
-        std::lock_guard lock(_hostInfoMutex);
-        oldHostPeerId = _hostPeerId;
-    }
-
     setToClient(peer);
 
     LINFO(fmt::format("Connection {} resigned as host", peer.id));
diff --git a/src/openspace.cpp b/src/openspace.cpp
index eda8a807f2..8d10c8c497 100644
--- a/src/openspace.cpp
+++ b/src/openspace.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,7 +29,7 @@ namespace openspace {
 std::string licenseText() {
     return "OpenSpace\n\
 \n\
-Copyright (c) 2014-2020\n\
+Copyright (c) 2014-2021\n\
 \n\
 Permission is hereby granted, free of charge, to any person obtaining a copy of this\n\
 software and associated documentation files (the \"Software\"), to deal in the Software\n\
diff --git a/src/properties/matrix/dmat2property.cpp b/src/properties/matrix/dmat2property.cpp
index a6372c3926..49c2945347 100644
--- a/src/properties/matrix/dmat2property.cpp
+++ b/src/properties/matrix/dmat2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat2x2 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat2x2 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x2>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat2x2 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat2x2 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x2>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat2x2 value) {
 glm::dmat2x2 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat2x2 result = glm::dmat2x2(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat2x2>::value * ghoul::glm_cols<glm::dmat2x2>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat2x2>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x2>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat2x2::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat2x2 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat2x2 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x2>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat2x3property.cpp b/src/properties/matrix/dmat2x3property.cpp
index 3ad6111e41..bc2c45bdcc 100644
--- a/src/properties/matrix/dmat2x3property.cpp
+++ b/src/properties/matrix/dmat2x3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat2x3 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat2x3 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x3>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat2x3 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat2x3 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x3>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat2x3 value) {
 glm::dmat2x3 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat2x3 result = glm::dmat2x3(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat2x3>::value * ghoul::glm_cols<glm::dmat2x3>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat2x3>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x3>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat2x3::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat2x3 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat2x3 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x3>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat2x4property.cpp b/src/properties/matrix/dmat2x4property.cpp
index 5c4fabf4f9..0134c624e8 100644
--- a/src/properties/matrix/dmat2x4property.cpp
+++ b/src/properties/matrix/dmat2x4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat2x4 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat2x4 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x4>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat2x4 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat2x4 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x4>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat2x4 value) {
 glm::dmat2x4 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat2x4 result = glm::dmat2x4(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat2x4>::value * ghoul::glm_cols<glm::dmat2x4>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat2x4>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x4>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat2x4::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat2x4 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat2x4 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat2x4>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat3property.cpp b/src/properties/matrix/dmat3property.cpp
index de1d758fa0..c3f94f472e 100644
--- a/src/properties/matrix/dmat3property.cpp
+++ b/src/properties/matrix/dmat3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat3x3 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat3x3 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x3>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat3x3 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat3x3 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x3>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat3x3 value) {
 glm::dmat3x3 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat3x3 result = glm::dmat3x3(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat3x3>::value * ghoul::glm_cols<glm::dmat3x3>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat3x3>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x3>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat3x3::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat3x3 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat3x3 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x3>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat3x2property.cpp b/src/properties/matrix/dmat3x2property.cpp
index 7a47ba70bd..fd58a78776 100644
--- a/src/properties/matrix/dmat3x2property.cpp
+++ b/src/properties/matrix/dmat3x2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat3x2 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat3x2 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x2>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat3x2 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat3x2 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x2>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat3x2 value) {
 glm::dmat3x2 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat3x2 result = glm::dmat3x2(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat3x2>::value * ghoul::glm_cols<glm::dmat3x2>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat3x2>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x2>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat3x2::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat3x2 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat3x2 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x2>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat3x4property.cpp b/src/properties/matrix/dmat3x4property.cpp
index 0edadd3f63..531a839970 100644
--- a/src/properties/matrix/dmat3x4property.cpp
+++ b/src/properties/matrix/dmat3x4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat3x4 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat3x4 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x4>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat3x4 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat3x4 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x4>::value; ++j) {
+    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;
@@ -77,15 +77,13 @@ bool toLuaConversion(lua_State* state, glm::dmat3x4 value) {
 glm::dmat3x4 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat3x4 result = glm::dmat3x4(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat3x4>::value * ghoul::glm_cols<glm::dmat3x4>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat3x4>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x4>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat3x4::value_type v;
             s >> v;
@@ -105,8 +103,8 @@ glm::dmat3x4 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat3x4 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat3x4>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat4property.cpp b/src/properties/matrix/dmat4property.cpp
index baa232b191..6cff54b244 100644
--- a/src/properties/matrix/dmat4property.cpp
+++ b/src/properties/matrix/dmat4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat4x4 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat4x4 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x4>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat4x4 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat4x4 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x4>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat4x4 value) {
 glm::dmat4x4 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat4x4 result = glm::dmat4x4(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat4x4>::value * ghoul::glm_cols<glm::dmat4x4>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat4x4>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x4>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat4x4::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat4x4 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat4x4 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x4>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat4x2property.cpp b/src/properties/matrix/dmat4x2property.cpp
index 49707fc77e..ee1c31e26d 100644
--- a/src/properties/matrix/dmat4x2property.cpp
+++ b/src/properties/matrix/dmat4x2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat4x2 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat4x2 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x2>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat4x2 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat4x2 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x2>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat4x2 value) {
 glm::dmat4x2 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat4x2 result = glm::dmat4x2(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat4x2>::value * ghoul::glm_cols<glm::dmat4x2>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat4x2>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x2>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat4x2::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat4x2 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat4x2 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x2>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/dmat4x3property.cpp b/src/properties/matrix/dmat4x3property.cpp
index 95fa2beaaf..fe11fd7118 100644
--- a/src/properties/matrix/dmat4x3property.cpp
+++ b/src/properties/matrix/dmat4x3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ glm::dmat4x3 fromLuaConversion(lua_State* state, bool& success) {
     glm::dmat4x3 result;
     lua_pushnil(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x3>::value; ++j) {
+    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;
@@ -63,8 +63,8 @@ glm::dmat4x3 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::dmat4x3 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x3>::value; ++j) {
+    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;
@@ -76,15 +76,13 @@ bool toLuaConversion(lua_State* state, glm::dmat4x3 value) {
 glm::dmat4x3 fromStringConversion(const std::string& val, bool& success) {
     glm::dmat4x3 result = glm::dmat4x3(1.0);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::dmat4x3>::value * ghoul::glm_cols<glm::dmat4x3>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::dmat4x3>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x3>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::dmat4x3::value_type v;
             s >> v;
@@ -104,8 +102,8 @@ glm::dmat4x3 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::dmat4x3 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::dmat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::dmat4x3>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat2property.cpp b/src/properties/matrix/mat2property.cpp
index aaa69c6cbc..be91afeb1e 100644
--- a/src/properties/matrix/mat2property.cpp
+++ b/src/properties/matrix/mat2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ 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 < ghoul::glm_cols<glm::mat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x2>::value; ++j) {
+    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;
@@ -65,8 +65,8 @@ glm::mat2x2 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat2x2 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x2>::value; ++j) {
+    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;
@@ -78,15 +78,13 @@ bool toLuaConversion(lua_State* state, glm::mat2x2 value) {
 glm::mat2x2 fromStringConversion(const std::string& val, bool& success) {
     glm::mat2x2 result = glm::mat2x2(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat2x2>::value * ghoul::glm_cols<glm::mat2x2>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat2x2>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x2>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat2x2::value_type v;
             s >> v;
@@ -106,8 +104,8 @@ glm::mat2x2 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat2x2 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x2>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat2x3property.cpp b/src/properties/matrix/mat2x3property.cpp
index bc0512ae73..0cc150c78c 100644
--- a/src/properties/matrix/mat2x3property.cpp
+++ b/src/properties/matrix/mat2x3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,8 +38,8 @@ 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 < ghoul::glm_cols<glm::mat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x3>::value; ++j) {
+    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;
@@ -66,8 +66,8 @@ glm::mat2x3 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat2x3 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x3>::value; ++j) {
+    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;
@@ -79,15 +79,13 @@ bool toLuaConversion(lua_State* state, glm::mat2x3 value) {
 glm::mat2x3 fromStringConversion(const std::string& val, bool& success) {
     glm::mat2x3 result = glm::mat2x3(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat2x3>::value * ghoul::glm_cols<glm::mat2x3>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat2x3>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x3>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat2x3::value_type v;
             s >> v;
@@ -107,8 +105,8 @@ glm::mat2x3 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat2x3 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x3>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat2x4property.cpp b/src/properties/matrix/mat2x4property.cpp
index 25424f2ed6..1867ed5dd0 100644
--- a/src/properties/matrix/mat2x4property.cpp
+++ b/src/properties/matrix/mat2x4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ 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 < ghoul::glm_cols<glm::mat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x4>::value; ++j) {
+    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;
@@ -64,8 +64,8 @@ glm::mat2x4 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat2x4 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x4>::value; ++j) {
+    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;
@@ -77,15 +77,13 @@ bool toLuaConversion(lua_State* state, glm::mat2x4 value) {
 glm::mat2x4 fromStringConversion(const std::string& val, bool& success) {
     glm::mat2x4 result = glm::mat2x4(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat2x4>::value * ghoul::glm_cols<glm::mat2x4>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat2x4>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x4>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat2x4::value_type v;
             s >> v;
@@ -105,8 +103,8 @@ glm::mat2x4 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat2x4 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat2x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat2x4>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat3property.cpp b/src/properties/matrix/mat3property.cpp
index 8cb87a6418..79748ebeea 100644
--- a/src/properties/matrix/mat3property.cpp
+++ b/src/properties/matrix/mat3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ 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 < ghoul::glm_cols<glm::mat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x3>::value; ++j) {
+    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;
@@ -64,8 +64,8 @@ glm::mat3x3 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat3x3 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x3>::value; ++j) {
+    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;
@@ -77,15 +77,13 @@ bool toLuaConversion(lua_State* state, glm::mat3x3 value) {
 glm::mat3x3 fromStringConversion(const std::string& val, bool& success) {
     glm::mat3x3 result = glm::mat3x3(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat3x3>::value * ghoul::glm_cols<glm::mat3x3>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat3x3>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x3>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat3x3::value_type v;
             s >> v;
@@ -105,8 +103,8 @@ glm::mat3x3 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat3x3 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x3>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat3x2property.cpp b/src/properties/matrix/mat3x2property.cpp
index 8e9b1b2ea9..ce32e1cb97 100644
--- a/src/properties/matrix/mat3x2property.cpp
+++ b/src/properties/matrix/mat3x2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ 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 < ghoul::glm_cols<glm::mat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x2>::value; ++j) {
+    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;
@@ -64,8 +64,8 @@ glm::mat3x2 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat3x2 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x2>::value; ++j) {
+    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;
@@ -77,15 +77,13 @@ bool toLuaConversion(lua_State* state, glm::mat3x2 value) {
 glm::mat3x2 fromStringConversion(const std::string& val, bool& success) {
     glm::mat3x2 result = glm::mat3x2(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat3x2>::value * ghoul::glm_cols<glm::mat3x2>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat3x2>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x2>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat3x2::value_type v;
             s >> v;
@@ -105,8 +103,8 @@ glm::mat3x2 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat3x2 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x2>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat3x4property.cpp b/src/properties/matrix/mat3x4property.cpp
index be54c8239e..9f37aa8f51 100644
--- a/src/properties/matrix/mat3x4property.cpp
+++ b/src/properties/matrix/mat3x4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ 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 < ghoul::glm_cols<glm::mat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x4>::value; ++j) {
+    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;
@@ -64,8 +64,8 @@ glm::mat3x4 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat3x4 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x4>::value; ++j) {
+    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;
@@ -77,15 +77,13 @@ bool toLuaConversion(lua_State* state, glm::mat3x4 value) {
 glm::mat3x4 fromStringConversion(const std::string& val, bool& success) {
     glm::mat3x4 result = glm::mat3x4(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat3x4>::value * ghoul::glm_cols<glm::mat3x4>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat3x4>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x4>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat3x4::value_type v;
             s >> v;
@@ -105,8 +103,8 @@ glm::mat3x4 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat3x4 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat3x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat3x4>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat4property.cpp b/src/properties/matrix/mat4property.cpp
index b224668489..8be8cc6ef7 100644
--- a/src/properties/matrix/mat4property.cpp
+++ b/src/properties/matrix/mat4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,8 +38,8 @@ 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 < ghoul::glm_cols<glm::mat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x4>::value; ++j) {
+    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;
@@ -66,8 +66,8 @@ glm::mat4x4 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat4x4 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x4>::value; ++j) {
+    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;
@@ -79,15 +79,13 @@ bool toLuaConversion(lua_State* state, glm::mat4x4 value) {
 glm::mat4x4 fromStringConversion(const std::string& val, bool& success) {
     glm::mat4x4 result = glm::mat4x4(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat4x4>::value * ghoul::glm_cols<glm::mat4x4>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat4x4>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x4>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat4x4::value_type v;
             s >> v;
@@ -107,8 +105,8 @@ glm::mat4x4 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat4x4 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x4>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x4>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat4x2property.cpp b/src/properties/matrix/mat4x2property.cpp
index c528dd49cc..1b10566d22 100644
--- a/src/properties/matrix/mat4x2property.cpp
+++ b/src/properties/matrix/mat4x2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ 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 < ghoul::glm_cols<glm::mat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x2>::value; ++j) {
+    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;
@@ -64,8 +64,8 @@ glm::mat4x2 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat4x2 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x2>::value; ++j) {
+    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;
@@ -77,15 +77,13 @@ bool toLuaConversion(lua_State* state, glm::mat4x2 value) {
 glm::mat4x2 fromStringConversion(const std::string& val, bool& success) {
     glm::mat4x2 result = glm::mat4x2(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat4x2>::value * ghoul::glm_cols<glm::mat4x2>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat4x2>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x2>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat4x2::value_type v;
             s >> v;
@@ -105,8 +103,8 @@ glm::mat4x2 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat4x2 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x2>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x2>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/matrix/mat4x3property.cpp b/src/properties/matrix/mat4x3property.cpp
index 74bd66237e..667d63011f 100644
--- a/src/properties/matrix/mat4x3property.cpp
+++ b/src/properties/matrix/mat4x3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -36,8 +36,8 @@ 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 < ghoul::glm_cols<glm::mat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x3>::value; ++j) {
+    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;
@@ -64,8 +64,8 @@ glm::mat4x3 fromLuaConversion(lua_State* state, bool& success) {
 bool toLuaConversion(lua_State* state, glm::mat4x3 value) {
     lua_newtable(state);
     int number = 1;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x3>::value; ++j) {
+    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;
@@ -77,15 +77,13 @@ bool toLuaConversion(lua_State* state, glm::mat4x3 value) {
 glm::mat4x3 fromStringConversion(const std::string& val, bool& success) {
     glm::mat4x3 result = glm::mat4x3(1.f);
     std::vector<std::string> tokens = ghoul::tokenizeString(val, ',');
-    if (tokens.size() !=
-        (ghoul::glm_rows<glm::mat4x3>::value * ghoul::glm_cols<glm::mat4x3>::value))
-    {
+    if (tokens.size() != ghoul::glm_components<glm::mat4x3>::value) {
         success = false;
         return result;
     }
     int number = 0;
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x3>::value; ++j) {
+    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) {
             std::stringstream s(tokens[number]);
             glm::mat4x3::value_type v;
             s >> v;
@@ -105,8 +103,8 @@ glm::mat4x3 fromStringConversion(const std::string& val, bool& success) {
 
 bool toStringConversion(std::string& outValue, glm::mat4x3 inValue) {
     outValue = "[";
-    for (glm::length_t i = 0; i < ghoul::glm_cols<glm::mat4x3>::value; ++i) {
-        for (glm::length_t j = 0; j < ghoul::glm_rows<glm::mat4x3>::value; ++j) {
+    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]) + ",";
         }
     }
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index d0cd5cba40..710e4ef93b 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -3,7 +3,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/property.cpp b/src/properties/property.cpp
index 85f2f6fdd9..157aa6d261 100644
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -37,7 +37,7 @@ namespace {
     constexpr const char* MetaDataKeyVisibility = "Visibility";
     constexpr const char* MetaDataKeyReadOnly = "isReadOnly";
 
-    constexpr const char* _metaDataKeyViewPrefix = "view.";
+    constexpr const char* _metaDataKeyViewPrefix = "view";
 
 } // namespace
 
@@ -185,9 +185,12 @@ void Property::setGroupIdentifier(std::string groupId) {
 }
 
 std::string Property::groupIdentifier() const {
-    std::string result;
-    _metaData.getValue(MetaDataKeyGroup, result);
-    return result;
+    if (_metaData.hasValue<std::string>(MetaDataKeyGroup)) {
+        return _metaData.value<std::string>(MetaDataKeyGroup);
+    }
+    else {
+        return "";
+    }
 }
 
 void Property::setVisibility(Visibility visibility) {
@@ -208,17 +211,22 @@ void Property::setReadOnly(bool state) {
 }
 
 void Property::setViewOption(std::string option, bool value) {
-    _metaData.setValue(
-        _metaDataKeyViewPrefix + std::move(option),
-        value,
-        ghoul::Dictionary::CreateIntermediate::Yes
-    );
+    ghoul::Dictionary d;
+    d.setValue(option, value);
+    _metaData.setValue(_metaDataKeyViewPrefix, d);
 }
 
 bool Property::viewOption(const std::string& option, bool defaultValue) const {
-    bool v = defaultValue;
-    _metaData.getValue(_metaDataKeyViewPrefix + option, v);
-    return v;
+    if (!_metaData.hasValue<ghoul::Dictionary>(_metaDataKeyViewPrefix)) {
+        return defaultValue;
+    }
+    ghoul::Dictionary d = _metaData.value<ghoul::Dictionary>(_metaDataKeyViewPrefix);
+    if (d.hasKey(option)) {
+        return d.value<bool>(option);
+    }
+    else {
+        return defaultValue;
+    }
 }
 
 const ghoul::Dictionary& Property::metaData() const {
@@ -350,7 +358,7 @@ std::string Property::generateMetaDataJsonDescription() const {
     const std::string& vis = VisibilityConverter.at(visibility);
 
     bool isReadOnly = false;
-    if (_metaData.hasKey(MetaDataKeyReadOnly)) {
+    if (_metaData.hasValue<bool>(MetaDataKeyReadOnly)) {
         isReadOnly = _metaData.value<bool>(MetaDataKeyReadOnly);
     }
 
diff --git a/src/properties/propertyowner.cpp b/src/properties/propertyowner.cpp
index 4fedbd95d2..6864b7c0b5 100644
--- a/src/properties/propertyowner.cpp
+++ b/src/properties/propertyowner.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -121,9 +121,12 @@ namespace {
         buf.push_back(',');
 
         constexpr const char propertyOwnersText[] = "\"propertyOwners\": [";
-        //constexpr const std::array<char, 20> propertyOwnersText = { "\"propertyOwners\": [" };
         //json << "\"propertyOwners\": [";
-        buf.insert(buf.end(), std::begin(propertyOwnersText), std::end(propertyOwnersText) - 1);
+        buf.insert(
+            buf.end(),
+            std::begin(propertyOwnersText),
+            std::end(propertyOwnersText) - 1
+        );
         auto propertyOwners = owner->propertySubOwners();
         for (properties::PropertyOwner* o : propertyOwners) {
             createJson(o, buf);
@@ -139,7 +142,7 @@ namespace {
         buf.push_back('}');
 
         //return json.str();
-    };
+    }
 } // namespace
 
 namespace openspace::properties {
diff --git a/src/properties/scalar/boolproperty.cpp b/src/properties/scalar/boolproperty.cpp
index 234f707e2b..736dfba051 100644
--- a/src/properties/scalar/boolproperty.cpp
+++ b/src/properties/scalar/boolproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/charproperty.cpp b/src/properties/scalar/charproperty.cpp
index 4fc29b0f77..1b2182da60 100644
--- a/src/properties/scalar/charproperty.cpp
+++ b/src/properties/scalar/charproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/doubleproperty.cpp b/src/properties/scalar/doubleproperty.cpp
index 7fbde3a65f..41cc901b2e 100644
--- a/src/properties/scalar/doubleproperty.cpp
+++ b/src/properties/scalar/doubleproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/floatproperty.cpp b/src/properties/scalar/floatproperty.cpp
index ed67553f63..5b9b916a5f 100644
--- a/src/properties/scalar/floatproperty.cpp
+++ b/src/properties/scalar/floatproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/intproperty.cpp b/src/properties/scalar/intproperty.cpp
index b1ac4a1e5c..ddbae1be74 100644
--- a/src/properties/scalar/intproperty.cpp
+++ b/src/properties/scalar/intproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/longdoubleproperty.cpp b/src/properties/scalar/longdoubleproperty.cpp
index 440e38a5fd..cd2711a202 100644
--- a/src/properties/scalar/longdoubleproperty.cpp
+++ b/src/properties/scalar/longdoubleproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/longlongproperty.cpp b/src/properties/scalar/longlongproperty.cpp
index 57b9b2091b..be6be24175 100644
--- a/src/properties/scalar/longlongproperty.cpp
+++ b/src/properties/scalar/longlongproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/longproperty.cpp b/src/properties/scalar/longproperty.cpp
index c1363c8c73..959e742e8b 100644
--- a/src/properties/scalar/longproperty.cpp
+++ b/src/properties/scalar/longproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/shortproperty.cpp b/src/properties/scalar/shortproperty.cpp
index b212d7a55a..88d2a861d3 100644
--- a/src/properties/scalar/shortproperty.cpp
+++ b/src/properties/scalar/shortproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/signedcharproperty.cpp b/src/properties/scalar/signedcharproperty.cpp
index f98916396c..dcf54be963 100644
--- a/src/properties/scalar/signedcharproperty.cpp
+++ b/src/properties/scalar/signedcharproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/ucharproperty.cpp b/src/properties/scalar/ucharproperty.cpp
index 8b1f920a57..dc77716b7b 100644
--- a/src/properties/scalar/ucharproperty.cpp
+++ b/src/properties/scalar/ucharproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/uintproperty.cpp b/src/properties/scalar/uintproperty.cpp
index 919f55206f..7f4409d89c 100644
--- a/src/properties/scalar/uintproperty.cpp
+++ b/src/properties/scalar/uintproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/ulonglongproperty.cpp b/src/properties/scalar/ulonglongproperty.cpp
index 5cba1a18fb..98c689e80b 100644
--- a/src/properties/scalar/ulonglongproperty.cpp
+++ b/src/properties/scalar/ulonglongproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/ulongproperty.cpp b/src/properties/scalar/ulongproperty.cpp
index fa80ac91f1..d6dbf92f8b 100644
--- a/src/properties/scalar/ulongproperty.cpp
+++ b/src/properties/scalar/ulongproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/ushortproperty.cpp b/src/properties/scalar/ushortproperty.cpp
index de5f7990b1..8331a932de 100644
--- a/src/properties/scalar/ushortproperty.cpp
+++ b/src/properties/scalar/ushortproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/scalar/wcharproperty.cpp b/src/properties/scalar/wcharproperty.cpp
index 98eb6beb90..73964f3896 100644
--- a/src/properties/scalar/wcharproperty.cpp
+++ b/src/properties/scalar/wcharproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/selectionproperty.cpp b/src/properties/selectionproperty.cpp
index 3cd8214122..63773ed410 100644
--- a/src/properties/selectionproperty.cpp
+++ b/src/properties/selectionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/stringlistproperty.cpp b/src/properties/stringlistproperty.cpp
index ac547e4bac..8aaa7692f6 100644
--- a/src/properties/stringlistproperty.cpp
+++ b/src/properties/stringlistproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/stringproperty.cpp b/src/properties/stringproperty.cpp
index 803d0a3ea7..31cf5415ce 100644
--- a/src/properties/stringproperty.cpp
+++ b/src/properties/stringproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -58,11 +58,9 @@ std::string fromStringConversion(std::string val, bool& success) {
 }
 
 bool toStringConversion(std::string& outValue, std::string inValue) {
-    std::string str;
     nlohmann::json json;
     nlohmann::to_json(json, inValue);
     outValue = json.dump();
-
     return true;
 }
 
diff --git a/src/properties/triggerproperty.cpp b/src/properties/triggerproperty.cpp
index 2f101820f5..f94373f1c0 100644
--- a/src/properties/triggerproperty.cpp
+++ b/src/properties/triggerproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/bvec2property.cpp b/src/properties/vector/bvec2property.cpp
index 65d55b37c7..57579a741e 100644
--- a/src/properties/vector/bvec2property.cpp
+++ b/src/properties/vector/bvec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/bvec3property.cpp b/src/properties/vector/bvec3property.cpp
index 7323a9e6f9..e8f1bd90f7 100644
--- a/src/properties/vector/bvec3property.cpp
+++ b/src/properties/vector/bvec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/bvec4property.cpp b/src/properties/vector/bvec4property.cpp
index 64388fa7a6..65404bb1ce 100644
--- a/src/properties/vector/bvec4property.cpp
+++ b/src/properties/vector/bvec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/dvec2property.cpp b/src/properties/vector/dvec2property.cpp
index c23a4ec493..9e9bfd43ae 100644
--- a/src/properties/vector/dvec2property.cpp
+++ b/src/properties/vector/dvec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/dvec3property.cpp b/src/properties/vector/dvec3property.cpp
index de124eb25b..b148d894b4 100644
--- a/src/properties/vector/dvec3property.cpp
+++ b/src/properties/vector/dvec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/dvec4property.cpp b/src/properties/vector/dvec4property.cpp
index 726048ed90..154072bfdb 100644
--- a/src/properties/vector/dvec4property.cpp
+++ b/src/properties/vector/dvec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/ivec2property.cpp b/src/properties/vector/ivec2property.cpp
index fd5dd2a3a9..35e3d51c5d 100644
--- a/src/properties/vector/ivec2property.cpp
+++ b/src/properties/vector/ivec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/ivec3property.cpp b/src/properties/vector/ivec3property.cpp
index 6ef0c002a4..09cccc79be 100644
--- a/src/properties/vector/ivec3property.cpp
+++ b/src/properties/vector/ivec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/ivec4property.cpp b/src/properties/vector/ivec4property.cpp
index 9d468e96ea..8d08f30b9e 100644
--- a/src/properties/vector/ivec4property.cpp
+++ b/src/properties/vector/ivec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/uvec2property.cpp b/src/properties/vector/uvec2property.cpp
index d337c4144e..b2e496bdfd 100644
--- a/src/properties/vector/uvec2property.cpp
+++ b/src/properties/vector/uvec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/uvec3property.cpp b/src/properties/vector/uvec3property.cpp
index c838b1cd7c..535eae4b5b 100644
--- a/src/properties/vector/uvec3property.cpp
+++ b/src/properties/vector/uvec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/uvec4property.cpp b/src/properties/vector/uvec4property.cpp
index c1abcc5f3e..8414d437bc 100644
--- a/src/properties/vector/uvec4property.cpp
+++ b/src/properties/vector/uvec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/vec2property.cpp b/src/properties/vector/vec2property.cpp
index 5074d33525..64d6c2e67c 100644
--- a/src/properties/vector/vec2property.cpp
+++ b/src/properties/vector/vec2property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/vec3property.cpp b/src/properties/vector/vec3property.cpp
index f663b4d1fa..a6c00330b7 100644
--- a/src/properties/vector/vec3property.cpp
+++ b/src/properties/vector/vec3property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/properties/vector/vec4property.cpp b/src/properties/vector/vec4property.cpp
index 38580017b0..bb785b723b 100644
--- a/src/properties/vector/vec4property.cpp
+++ b/src/properties/vector/vec4property.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/query/query.cpp b/src/query/query.cpp
index 76da802137..5f84919aab 100644
--- a/src/query/query.cpp
+++ b/src/query/query.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/rendering/abufferrenderer.cpp b/src/rendering/abufferrenderer.cpp
index db86645354..4b4f4d4654 100644
--- a/src/rendering/abufferrenderer.cpp
+++ b/src/rendering/abufferrenderer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/rendering/dashboard.cpp b/src/rendering/dashboard.cpp
index 43bc3bb4c5..1a9ef79422 100644
--- a/src/rendering/dashboard.cpp
+++ b/src/rendering/dashboard.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -143,7 +143,7 @@ void Dashboard::render(glm::vec2& penPosition) {
 
 glm::vec2 Dashboard::getStartPositionOffset() {
     return _startPositionOffset.value();
-};
+}
 
 scripting::LuaLibrary Dashboard::luaLibrary() {
     return {
diff --git a/src/rendering/dashboard_lua.inl b/src/rendering/dashboard_lua.inl
index 40ac6930f1..081e2ecbe1 100644
--- a/src/rendering/dashboard_lua.inl
+++ b/src/rendering/dashboard_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -22,7 +22,6 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
  ****************************************************************************************/
 
-#include <modules/base/rendering/screenspacedashboard.h>
 #include <openspace/engine/globals.h>
 #include <ghoul/logging/logmanager.h>
 
diff --git a/src/rendering/dashboarditem.cpp b/src/rendering/dashboarditem.cpp
index a075d500ed..9dbc2e3604 100644
--- a/src/rendering/dashboarditem.cpp
+++ b/src/rendering/dashboarditem.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -24,9 +24,11 @@
 
 #include <openspace/rendering/dashboarditem.h>
 
-#include <openspace/util/factorymanager.h>
+#include <openspace/engine/globals.h>
 #include <openspace/documentation/documentation.h>
 #include <openspace/documentation/verifier.h>
+#include <openspace/util/factorymanager.h>
+#include <ghoul/font/fontmanager.h>
 #include <ghoul/misc/templatefactory.h>
 
 namespace {
@@ -112,7 +114,7 @@ DashboardItem::DashboardItem(const ghoul::Dictionary& dictionary)
     std::string identifier = dictionary.value<std::string>(IdentifierInfo.identifier);
     setIdentifier(std::move(identifier));
 
-    if (dictionary.hasKeyAndValue<std::string>(GuiNameInfo.identifier)) {
+    if (dictionary.hasValue<std::string>(GuiNameInfo.identifier)) {
         std::string guiName = dictionary.value<std::string>(GuiNameInfo.identifier);
         setGuiName(std::move(guiName));
     }
@@ -124,4 +126,73 @@ bool DashboardItem::isEnabled() const {
     return _isEnabled;
 }
 
+
+namespace {
+    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 distance."
+    };
+} // namespace
+
+documentation::Documentation DashboardTextItem::Documentation() {
+    using namespace documentation;
+    return {
+        "DashboardTextItem",
+        "dashboardtextitem",
+        {
+            {
+                FontNameInfo.identifier,
+                new StringVerifier,
+                Optional::Yes,
+                FontNameInfo.description
+            },
+            {
+                FontSizeInfo.identifier,
+                new IntVerifier,
+                Optional::Yes,
+                FontSizeInfo.description
+            }
+        }
+    };
+}
+
+DashboardTextItem::DashboardTextItem(const ghoul::Dictionary& dictionary, float fontSize,
+                                     const std::string& fontName)
+    : DashboardItem(dictionary)
+    , _fontName(FontNameInfo, fontName)
+    , _fontSize(FontSizeInfo, fontSize, 6.f, 144.f, 1.f)
+{
+    documentation::testSpecificationAndThrow(
+        Documentation(),
+        dictionary,
+        "DashboardTextItem"
+    );
+
+    if (dictionary.hasKey(FontNameInfo.identifier)) {
+        _fontName = dictionary.value<std::string>(FontNameInfo.identifier);
+    }
+    _fontName.onChange([this]() {
+        _font = global::fontManager->font(_fontName, _fontSize);
+    });
+    addProperty(_fontName);
+
+    if (dictionary.hasKey(FontSizeInfo.identifier)) {
+        _fontSize = static_cast<float>(dictionary.value<double>(FontSizeInfo.identifier));
+    }
+    _fontSize.onChange([this]() {
+        _font = global::fontManager->font(_fontName, _fontSize);
+    });
+    addProperty(_fontSize);
+
+    _font = global::fontManager->font(_fontName, _fontSize);
+}
+
 } // namespace openspace
diff --git a/src/rendering/deferredcastermanager.cpp b/src/rendering/deferredcastermanager.cpp
index 6978824675..f38b3b06c9 100644
--- a/src/rendering/deferredcastermanager.cpp
+++ b/src/rendering/deferredcastermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index aae263a0a5..70c9b8bc07 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -73,6 +73,7 @@ namespace {
         }
     };
 
+    constexpr const glm::vec4 PosBufferClearVal = { 1e32, 1e32, 1e32, 1.f };
 
     constexpr const std::array<const char*, 7> HDRUniformNames = {
         "hdrFeedingTexture", "blackoutFactor", "hdrExposure", "gamma",
@@ -102,37 +103,6 @@ namespace {
        GL_COLOR_ATTACHMENT2,
        GL_COLOR_ATTACHMENT3
     };
-
-    void saveTextureToMemory(GLenum attachment, int width, int height,
-                             std::vector<double>& memory)
-    {
-        memory.clear();
-        memory.resize(width * height * 3);
-
-        std::vector<float> tempMemory(width * height * 3);
-
-        if (attachment != GL_DEPTH_ATTACHMENT) {
-            glReadBuffer(attachment);
-            glReadPixels(0, 0, width, height, GL_RGB, GL_FLOAT, tempMemory.data());
-
-        }
-        else {
-            glReadPixels(
-                0,
-                0,
-                width,
-                height,
-                GL_DEPTH_COMPONENT,
-                GL_FLOAT,
-                tempMemory.data()
-            );
-        }
-
-        for (int i = 0; i < width * height * 3; ++i) {
-            memory[i] = static_cast<double>(tempMemory[i]);
-        }
-    }
-
 } // namespace
 
 namespace openspace {
@@ -175,27 +145,27 @@ void FramebufferRenderer::initialize() {
     glGenTextures(1, &_gBuffers.positionTexture);
     glGenTextures(1, &_gBuffers.normalTexture);
     glGenFramebuffers(1, &_gBuffers.framebuffer);
-   
+
 
     // PingPong Buffers
     // The first pingpong buffer shares the color texture with the renderbuffer:
     _pingPongBuffers.colorTexture[0] = _gBuffers.colorTexture;
     glGenTextures(1, &_pingPongBuffers.colorTexture[1]);
     glGenFramebuffers(1, &_pingPongBuffers.framebuffer);
-    
+
     // Exit framebuffer
     glGenTextures(1, &_exitColorTexture);
-    glGenTextures(1, &_exitDepthTexture);    
+    glGenTextures(1, &_exitDepthTexture);
     glGenFramebuffers(1, &_exitFramebuffer);
 
     // HDR / Filtering Buffers
     glGenFramebuffers(1, &_hdrBuffers.hdrFilteringFramebuffer);
     glGenTextures(1, &_hdrBuffers.hdrFilteringTexture);
-    
+
     // FXAA Buffers
     glGenFramebuffers(1, &_fxaaBuffers.fxaaFramebuffer);
     glGenTextures(1, &_fxaaBuffers.fxaaTexture);
-    
+
     // DownscaleVolumeRendering
     glGenFramebuffers(1, &_downscaleVolumeRendering.framebuffer);
     glGenTextures(1, &_downscaleVolumeRendering.colorTexture);
@@ -317,7 +287,12 @@ void FramebufferRenderer::initialize() {
         0
     );
     if (glbinding::Binding::ObjectLabel.isResolved()) {
-        glObjectLabel(GL_FRAMEBUFFER, _hdrBuffers.hdrFilteringFramebuffer, -1, "HDR filtering");
+        glObjectLabel(
+            GL_FRAMEBUFFER,
+            _hdrBuffers.hdrFilteringFramebuffer,
+            -1,
+            "HDR filtering"
+        );
     }
 
     status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
@@ -410,7 +385,11 @@ void FramebufferRenderer::initialize() {
     glDisablei(GL_BLEND, 1);
     glDisablei(GL_BLEND, 2);
 
-    glClampColor(GL_CLAMP_READ_COLOR, GL_FALSE);
+    // glClampColor is weird as it requires a GLenum in the function definition, but
+    // the OpenGL standard says that it only accepts GL_FALSE and GL_TRUE, which are
+    // of type GLboolean *eye rolling*
+    // GLenum(0) == GLboolen(0) == GL_FALSE
+    glClampColor(GL_CLAMP_READ_COLOR, GLenum(0));
 
     glEnable(GL_DEPTH_TEST);
 
@@ -577,27 +556,6 @@ void FramebufferRenderer::updateDownscaleTextures() {
 }
 
 void FramebufferRenderer::writeDownscaledVolume() {
-    // Saving current OpenGL state
-    GLboolean blendEnabled = glIsEnabledi(GL_BLEND, 0);
-
-    GLenum blendEquationRGB;
-    glGetIntegerv(GL_BLEND_EQUATION_RGB, &blendEquationRGB);
-
-    GLenum blendEquationAlpha;
-    glGetIntegerv(GL_BLEND_EQUATION_ALPHA, &blendEquationAlpha);
-
-    GLenum blendDestAlpha;
-    glGetIntegerv(GL_BLEND_DST_ALPHA, &blendDestAlpha);
-
-    GLenum blendDestRGB;
-    glGetIntegerv(GL_BLEND_DST_RGB, &blendDestRGB);
-
-    GLenum blendSrcAlpha;
-    glGetIntegerv(GL_BLEND_SRC_ALPHA, &blendSrcAlpha);
-
-    GLenum blendSrcRGB;
-    glGetIntegerv(GL_BLEND_SRC_RGB, &blendSrcRGB);
-
     glEnablei(GL_BLEND, 0);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 
@@ -641,14 +599,9 @@ void FramebufferRenderer::writeDownscaledVolume() {
 
     _downscaledVolumeProgram->deactivate();
 
-    // Restores blending state
-    glBlendEquationSeparate(blendEquationRGB, blendEquationAlpha);
-    glBlendFuncSeparate(blendSrcRGB, blendDestRGB, blendSrcAlpha, blendDestAlpha);
-
-    if (!blendEnabled) {
-        glDisablei(GL_BLEND, 0);
-    }
-
+    // Restores OpenGL Rendering State
+    global::renderEngine->openglStateCache().resetBlendState();
+    global::renderEngine->openglStateCache().resetDepthState();
 }
 
 void FramebufferRenderer::update() {
@@ -1031,7 +984,7 @@ void FramebufferRenderer::updateRaycastData() {
 
         try {
             ghoul::Dictionary outsideDict = dict;
-            outsideDict.setValue("getEntryPath", GetEntryOutsidePath);
+            outsideDict.setValue("getEntryPath", std::string(GetEntryOutsidePath));
             _raycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
                 "Volume " + std::to_string(data.id) + " raycast",
                 absPath(vsPath),
@@ -1044,7 +997,7 @@ void FramebufferRenderer::updateRaycastData() {
 
         try {
             ghoul::Dictionary insideDict = dict;
-            insideDict.setValue("getEntryPath", GetEntryInsidePath);
+            insideDict.setValue("getEntryPath", std::string(GetEntryInsidePath));
             _insideRaycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
                 "Volume " + std::to_string(data.id) + " inside raycast",
                 absPath("${SHADERS}/framebuffer/resolveframebuffer.vert"),
@@ -1133,8 +1086,8 @@ void FramebufferRenderer::updateFXAA() {
 
 void FramebufferRenderer::updateDownscaledVolume() {
     ZoneScoped
-        
-        _downscaledVolumeProgram = ghoul::opengl::ProgramObject::Build(
+
+    _downscaledVolumeProgram = ghoul::opengl::ProgramObject::Build(
         "Write Downscaled Volume Program",
         absPath("${SHADERS}/framebuffer/mergeDownscaledVolume.vert"),
         absPath("${SHADERS}/framebuffer/mergeDownscaledVolume.frag")
@@ -1146,6 +1099,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
     TracyGpuZone("FramebufferRenderer")
 
     glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO);
+    global::renderEngine->openglStateCache().setDefaultFramebuffer(_defaultFBO);
 
     GLint viewport[4] = { 0 };
     global::renderEngine->openglStateCache().viewport(viewport);
@@ -1170,6 +1124,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
         glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer);
         glDrawBuffers(3, ColorAttachmentArray);
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+        glClearBufferfv(GL_COLOR, 1, glm::value_ptr(PosBufferClearVal));
     }
     Time time = global::timeManager->time();
 
@@ -1223,7 +1178,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac
 
         performDeferredTasks(tasks.deferredcasterTasks);
     }
-    
+
     glDrawBuffers(1, &ColorAttachmentArray[_pingPongIndex]);
     glEnablei(GL_BLEND, 0);
 
@@ -1281,7 +1236,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector<RaycasterTask>
 
     for (const RaycasterTask& raycasterTask : tasks) {
         TracyGpuZone("Raycaster")
-        
+
         VolumeRaycaster* raycaster = raycasterTask.raycaster;
 
         glBindFramebuffer(GL_FRAMEBUFFER, _exitFramebuffer);
@@ -1416,16 +1371,11 @@ void FramebufferRenderer::performDeferredTasks(
 
     for (const DeferredcasterTask& deferredcasterTask : tasks) {
         TracyGpuZone("Deferredcaster")
-            
+
         Deferredcaster* deferredcaster = deferredcasterTask.deferredcaster;
 
-        ghoul::opengl::ProgramObject* deferredcastProgram = nullptr;
-
-        if (deferredcastProgram != _deferredcastPrograms[deferredcaster].get()
-            || deferredcastProgram == nullptr)
-        {
-            deferredcastProgram = _deferredcastPrograms[deferredcaster].get();
-        }
+        ghoul::opengl::ProgramObject* deferredcastProgram =
+            _deferredcastPrograms[deferredcaster].get();
 
         if (deferredcastProgram) {
             _pingPongIndex = _pingPongIndex == 0 ? 1 : 0;
diff --git a/src/rendering/helper.cpp b/src/rendering/helper.cpp
index 3fa5195b0d..99787c973c 100644
--- a/src/rendering/helper.cpp
+++ b/src/rendering/helper.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -204,12 +204,12 @@ void initialize() {
     glBindVertexArray(vertexObjects.square.vao);
     glBindBuffer(GL_ARRAY_BUFFER, vertexObjects.square.vbo);
 
-    struct Vertex {
+    struct VertexXYUVRGBA {
         GLfloat xy[2];
         GLfloat uv[2];
         GLfloat rgba[4];
     };
-    Vertex data[] = {
+    VertexXYUVRGBA data[] = {
         // X     Y    U    V    R    G    B    A
         -1.f, -1.f, 0.f, 0.f, 1.f, 1.f, 1.f, 1.f,
         -1.f,  1.f, 0.f, 1.f, 1.f, 1.f, 1.f, 1.f,
@@ -219,16 +219,16 @@ void initialize() {
          1.f,  1.f, 1.f, 1.f, 1.f, 1.f, 1.f, 1.f,
          1.f, -1.f, 1.f, 0.f, 1.f, 1.f, 1.f, 1.f
     };
-    glBufferData(GL_ARRAY_BUFFER, 6 * sizeof(Vertex), data, GL_STATIC_DRAW);
+    glBufferData(GL_ARRAY_BUFFER, 6 * sizeof(VertexXYUVRGBA), data, GL_STATIC_DRAW);
 
     glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(VertexXYUVRGBA), nullptr);
     glEnableVertexAttribArray(1);
-    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
-        reinterpret_cast<GLvoid*>(offsetof(Vertex, uv)));
+    glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(VertexXYUVRGBA),
+        reinterpret_cast<GLvoid*>(offsetof(VertexXYUVRGBA, uv)));
     glEnableVertexAttribArray(2);
-    glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(Vertex),
-        reinterpret_cast<GLvoid*>(offsetof(Vertex, rgba)));
+    glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(VertexXYUVRGBA),
+        reinterpret_cast<GLvoid*>(offsetof(VertexXYUVRGBA, rgba)));
     glBindVertexArray(0);
 
     //
diff --git a/src/rendering/loadingscreen.cpp b/src/rendering/loadingscreen.cpp
index 7b1d63f491..5e585d2d7b 100644
--- a/src/rendering/loadingscreen.cpp
+++ b/src/rendering/loadingscreen.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -322,15 +322,10 @@ void LoadingScreen::render() {
                     (item.name + " 100%\n99999999/99999999")
                 );
 
-                // The maximum count is in here since we can't control the amount of
-                // screen estate and the number of nodes.  Rather than looping forever
-                // we make use with an overlap in the worst case
-                bool foundSpace = false;
-
                 glm::vec2 ll = glm::vec2(0.f);
                 glm::vec2 ur = glm::vec2(0.f);
                 int i = 0;
-                for (; i < MaxNumberLocationSamples && !foundSpace; ++i) {
+                for (; i < MaxNumberLocationSamples; ++i) {
                     std::uniform_int_distribution<int> distX(
                         15,
                         static_cast<int>(res.x - b.x - 15)
diff --git a/src/rendering/luaconsole.cpp b/src/rendering/luaconsole.cpp
index 104f637218..dfbfc483d5 100644
--- a/src/rendering/luaconsole.cpp
+++ b/src/rendering/luaconsole.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -590,7 +590,7 @@ void LuaConsole::charCallback(unsigned int codepoint,
         return;
     }
 
-    addToCommand(std::string(1, static_cast<const char>(codepoint)));
+    addToCommand(std::string(1, static_cast<char>(codepoint)));
 }
 
 void LuaConsole::update() {
@@ -600,7 +600,9 @@ void LuaConsole::update() {
     // what the bounding box for that text would be.
     using namespace ghoul::fontrendering;
 
-    const float height = _historyFont->height() * (_commandsHistory.size() + 1);
+    const float height =
+        _historyFont->height() *
+        (std::min(static_cast<int>(_commandsHistory.size()), _historyLength.value()) + 1);
 
     // Update the full height and the target height.
     // Add the height of the entry line and space for a separator.
diff --git a/src/rendering/raycastermanager.cpp b/src/rendering/raycastermanager.cpp
index 9d7fecd95c..38dd357451 100644
--- a/src/rendering/raycastermanager.cpp
+++ b/src/rendering/raycastermanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/rendering/renderable.cpp b/src/rendering/renderable.cpp
index 6ed258b7e7..9236c2850a 100644
--- a/src/rendering/renderable.cpp
+++ b/src/rendering/renderable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -33,10 +33,10 @@
 #include <openspace/util/updatestructures.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/programobject.h>
+#include <optional>
 
 namespace {
     constexpr const char* KeyType = "Type";
-    constexpr const char* KeyTag = "Tag";
 
     constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
         "Enabled",
@@ -63,49 +63,47 @@ namespace {
         "Bounding Sphere",
         "The size of the bounding sphere radius."
     };
+    struct [[codegen::Dictionary(Renderable)]] Parameters {
+        // [[codegen::verbatim(EnabledInfo.description)]]
+        std::optional<bool> enabled;
 
+        // [[codegen::verbatim(OpacityInfo.description)]]
+        std::optional<float> opacity [[codegen::inrange(0.0, 1.0)]];
+
+        // A single tag or a list of tags that this renderable will respond to when
+        // setting properties
+        std::optional<std::variant<std::vector<std::string>, std::string>> tag;
+
+        // [[codegen::verbatim(RenderableTypeInfo.description)]]
+        std::optional<std::string> type;
+
+        // [[codegen::verbatim(BoundingSphereInfo.description)]]
+        std::optional<float> boundingSphere;
+    };
+#include "renderable_codegen.cpp"
 } // namespace
 
 namespace openspace {
 
 documentation::Documentation Renderable::Documentation() {
-    using namespace openspace::documentation;
-
-    return {
-        "Renderable",
-        "renderable",
-        {
-            {
-                KeyType,
-                new StringAnnotationVerifier("A valid Renderable created by a factory"),
-                Optional::No,
-                "This key specifies the type of Renderable that gets created. It has to "
-                "be one of the valid Renderables that are available for creation (see "
-                "the FactoryDocumentation for a list of possible Renderables), which "
-                "depends on the configration of the application"
-            },
-            {
-                EnabledInfo.identifier,
-                new BoolVerifier,
-                Optional::Yes,
-                EnabledInfo.description
-            },
-            {
-                OpacityInfo.identifier,
-                new DoubleInRangeVerifier(0.0, 1.0),
-                Optional::Yes,
-                OpacityInfo.description
-            }
-        }
-    };
+    documentation::Documentation doc = codegen::doc<Parameters>();
+    doc.id = "renderable";
+    return doc;
 }
 
 ghoul::mm_unique_ptr<Renderable> Renderable::createFromDictionary(
-                                                      const ghoul::Dictionary& dictionary)
+                                                             ghoul::Dictionary dictionary)
 {
+    if (!dictionary.hasKey(KeyType)) {
+        throw ghoul::RuntimeError("Tried to create Renderable but no 'Type' was found");
+    }
+
+    // This should be done in the constructor instead with noexhaustive
     documentation::testSpecificationAndThrow(Documentation(), dictionary, "Renderable");
 
     std::string renderableType = dictionary.value<std::string>(KeyType);
+    // Now we no longer need the type variable
+    dictionary.removeValue(KeyType);
 
     auto factory = FactoryManager::ref().factory<Renderable>();
     ghoul_assert(factory, "Renderable factory did not exist");
@@ -130,49 +128,34 @@ Renderable::Renderable(const ghoul::Dictionary& dictionary)
     // I can't come up with a good reason not to do this for all renderables
     registerUpdateRenderBinFromOpacity();
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyTag)) {
-        std::string tagName = dictionary.value<std::string>(KeyTag);
-        if (!tagName.empty()) {
-            addTag(std::move(tagName));
+    const Parameters p = codegen::bake<Parameters>(dictionary);
+    
+    if (p.tag.has_value()) {
+        if (std::holds_alternative<std::string>(*p.tag)) {
+            if (!std::get<std::string>(*p.tag).empty()) {
+                addTag(std::get<std::string>(*p.tag));
+            }
         }
-    }
-    else if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeyTag)) {
-        const ghoul::Dictionary& tagNames = dictionary.value<ghoul::Dictionary>(KeyTag);
-        const std::vector<std::string>& keys = tagNames.keys();
-        for (const std::string& key : keys) {
-            std::string tagName = tagNames.value<std::string>(key);
-            if (!tagName.empty()) {
-                addTag(std::move(tagName));
+        else {
+            ghoul_assert(std::holds_alternative<std::vector<std::string>>(*p.tag), "");
+            for (std::string tag : std::get<std::vector<std::string>>(*p.tag)) {
+                addTag(std::move(tag));
             }
         }
     }
 
-    if (dictionary.hasKey(EnabledInfo.identifier)) {
-        _enabled = dictionary.value<bool>(EnabledInfo.identifier);
-    }
-
-    if (dictionary.hasKey(OpacityInfo.identifier)) {
-        _opacity = static_cast<float>(dictionary.value<double>(
-            OpacityInfo.identifier)
-       );
-    }
-
+    _enabled = p.enabled.value_or(_enabled);
     addProperty(_enabled);
 
-    //set type for UI
-    if (dictionary.hasKey(RenderableTypeInfo.identifier)) {
-        _renderableType = dictionary.value<std::string>(
-            RenderableTypeInfo.identifier
-       );
-    }
-
-    if (dictionary.hasKey(BoundingSphereInfo.identifier)) {
-        _boundingSphere = static_cast<float>(
-            dictionary.value<double>(BoundingSphereInfo.identifier)
-       );
-    }
+    _opacity = p.opacity.value_or(_opacity);
+    // We don't add the property here as subclasses should decide on their own whether
+    // they to expose the opacity or not
 
+    // set type for UI
+    _renderableType = p.type.value_or(_renderableType);
     addProperty(_renderableType);
+
+    _boundingSphere = p.boundingSphere.value_or(_boundingSphere);
     addProperty(_boundingSphere);
 }
 
@@ -188,11 +171,11 @@ void Renderable::update(const UpdateData&) {}
 
 void Renderable::render(const RenderData&, RendererTasks&) {}
 
-void Renderable::setBoundingSphere(float boundingSphere) {
+void Renderable::setBoundingSphere(double boundingSphere) {
     _boundingSphere = boundingSphere;
 }
 
-float Renderable::boundingSphere() const {
+double Renderable::boundingSphere() const {
     return _boundingSphere;
 }
 
@@ -201,7 +184,7 @@ SurfacePositionHandle Renderable::calculateSurfacePositionHandle(
 {
     const glm::dvec3 directionFromCenterToTarget = glm::normalize(targetModelSpace);
     return {
-        directionFromCenterToTarget * static_cast<double>(boundingSphere()),
+        directionFromCenterToTarget * boundingSphere(),
         directionFromCenterToTarget,
         0.0
     };
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index b1ca205edc..b95f6c1c06 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -87,15 +87,6 @@ namespace {
     constexpr const char* KeyFontMono = "Mono";
     constexpr const char* KeyFontLight = "Light";
 
-    constexpr openspace::properties::Property::PropertyInfo PerformanceInfo = {
-        "PerformanceMeasurements",
-        "Performance Measurements",
-        "If this value is enabled, detailed performance measurements about the updates "
-        "and rendering of the scene graph nodes are collected each frame. These values "
-        "provide some information about the impact of individual nodes on the overall "
-        "performance."
-    };
-
     constexpr openspace::properties::Property::PropertyInfo ShowOverlaySlavesInfo = {
         "ShowOverlayOnSlaves",
         "Show Overlay Information on Slaves",
@@ -148,14 +139,6 @@ namespace {
         "into the window."
     };
 
-#ifdef OPENSPACE_WITH_INSTRUMENTATION
-    constexpr openspace::properties::Property::PropertyInfo SaveFrameInfo = {
-        "SaveFrameInformation",
-        "Save Frame Information",
-        "Saves the frame information to disk"
-    };
-#endif // OPENSPACE_WITH_INSTRUMENTATION
-
     constexpr openspace::properties::Property::PropertyInfo DisableMasterInfo = {
         "DisableMasterRendering",
         "Disable Master Rendering",
@@ -230,6 +213,13 @@ namespace {
         "Value"
     };
 
+    constexpr openspace::properties::Property::PropertyInfo FramerateLimitInfo = {
+        "FramerateLimit",
+        "Framerate Limit",
+        "If set to a value bigger than 0, the framerate will be limited to that many "
+        "frames per second without using V-Sync"
+    };
+
     constexpr openspace::properties::Property::PropertyInfo HorizFieldOfViewInfo = {
         "HorizFieldOfView",
         "Horizontal Field of View",
@@ -264,9 +254,6 @@ RenderEngine::RenderEngine()
     , _showCameraInfo(ShowCameraInfo, true)
     , _applyWarping(ApplyWarpingInfo, false)
     , _showFrameInformation(ShowFrameNumberInfo, false)
-#ifdef OPENSPACE_WITH_INSTRUMENTATION
-    , _saveFrameInformation(SaveFrameInfo, false)
-#endif // OPENSPACE_WITH_INSTRUMENTATION
     , _disableMasterRendering(DisableMasterInfo, false)
     , _globalBlackOutFactor(GlobalBlackoutFactorInfo, 1.f, 0.f, 1.f)
     , _enableFXAA(FXAAInfo, true)
@@ -276,6 +263,7 @@ RenderEngine::RenderEngine()
     , _hue(HueInfo, 0.f, 0.f, 360.f)
     , _saturation(SaturationInfo, 1.f, 0.0f, 2.f)
     , _value(ValueInfo, 1.f, 0.f, 2.f)
+    , _framerateLimit(FramerateLimitInfo, 0, 0, 500)
     , _horizFieldOfView(HorizFieldOfViewInfo, 80.f, 1.f, 179.f)
     , _globalRotation(
         GlobalRotationInfo,
@@ -302,12 +290,6 @@ RenderEngine::RenderEngine()
     addProperty(_showVersionInfo);
     addProperty(_showCameraInfo);
 
-    // @TODO (maci 2019-08-23) disabling FXAA on
-    // MacOS for now until we have fix or MSAA option.
-#ifdef __APPLE__
-    _enableFXAA = false;
-#endif
-
     _enableFXAA.onChange([this]() {
         if (_renderer) {
             _renderer->enableFXAA(_enableFXAA);
@@ -372,15 +354,8 @@ RenderEngine::RenderEngine()
     addProperty(_horizFieldOfView);
 
     addProperty(_showFrameInformation);
-#ifdef OPENSPACE_WITH_INSTRUMENTATION
-    _saveFrameInformation.onChange([&]() {
-        if (_saveFrameInformation) {
-            _frameInfo.lastSavedFrame = frameNumber();
-        }
-    });
-    addProperty(_saveFrameInformation);
-#endif // OPENSPACE_WITH_INSTRUMENTATION
 
+    addProperty(_framerateLimit);
     addProperty(_globalRotation);
     addProperty(_screenSpaceRotation);
     addProperty(_masterRotation);
@@ -676,6 +651,16 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         _camera->invalidateCache();
     }
 
+    const int fpsLimit = _framerateLimit;
+    if (fpsLimit > 0) {
+        // Using a sleep here is not optimal, but we are not looking for FPS-perfect
+        // limiting
+        std::this_thread::sleep_until(_lastFrameTime);
+        const double delta = (1.0 / fpsLimit) * 1000.0 * 1000.0;
+        auto now = std::chrono::high_resolution_clock::now();
+        _lastFrameTime = now + std::chrono::microseconds(static_cast<int>(delta));
+    }
+
     const bool masterEnabled = delegate.isMaster() ? !_disableMasterRendering : true;
     if (masterEnabled && !delegate.isGuiWindow() && _globalBlackOutFactor > 0.f) {
         _renderer->render(
@@ -695,12 +680,12 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
 
         std::string fn = std::to_string(_frameNumber);
         WindowDelegate::Frustum frustum = global::windowDelegate->frustumMode();
-        std::string fr = [](WindowDelegate::Frustum frustum) -> std::string {
-            switch (frustum) {
-                case WindowDelegate::Frustum::Mono: return "";
-                case WindowDelegate::Frustum::LeftEye: return "(left)";
+        std::string fr = [](WindowDelegate::Frustum f) -> std::string {
+            switch (f) {
+                case WindowDelegate::Frustum::Mono:     return "";
+                case WindowDelegate::Frustum::LeftEye:  return "(left)";
                 case WindowDelegate::Frustum::RightEye: return "(right)";
-                default: throw std::logic_error("Unhandled case label");
+                default:                              throw ghoul::MissingCaseException();
             }
         }(frustum);
 
@@ -708,9 +693,10 @@ void RenderEngine::render(const glm::mat4& sceneMatrix, const glm::mat4& viewMat
         std::string dt = std::to_string(global::windowDelegate->deltaTime());
         std::string avgDt = std::to_string(global::windowDelegate->averageDeltaTime());
 
-        std::string res = "Frame: " + fn + ' ' + fr + '\n' +
-                          "Swap group frame: " + sgFn + '\n' +
-                          "Dt: " + dt + '\n' + "Avg Dt: " + avgDt;
+        std::string res = fmt::format(
+            "Frame: {} {}\nSwap group frame: {}\nDt: {}\nAvg Dt: {}",
+            fn, fr, sgFn, dt, avgDt
+        );
         RenderFont(*_fontFrameInfo, penPosition, res);
     }
 
@@ -829,7 +815,6 @@ void RenderEngine::renderEndscreen() {
         glm::vec2(global::windowDelegate->currentSubwindowSize()) / dpiScaling;
     glViewport(0, 0, res.x, res.y);
 
-    using FR = ghoul::fontrendering::FontRenderer;
     const glm::vec2 size = _fontDate->boundingBox("Shutting down");
     glm::vec2 penPosition = glm::vec2(
         fontResolution().x / 2 - size.x / 2,
@@ -900,35 +885,6 @@ void RenderEngine::postDraw() {
     ZoneScoped
 
     ++_frameNumber;
-
-#ifdef OPENSPACE_WITH_INSTRUMENTATION
-    if (_saveFrameInformation) {
-        _frameInfo.frames.push_back({
-            frameNumber(),
-            global::windowDelegate.deltaTime(),
-            global::windowDelegate.averageDeltaTime()
-        });
-    }
-
-    const uint16_t next = _frameInfo.lastSavedFrame + _frameInfo.saveEveryNthFrame;
-    const bool shouldSave = _saveFrameInformation && frameNumber() >= next;
-    if (shouldSave) {
-        std::string filename = fmt::format(
-            "_inst_renderengine_{}_{}.txt",
-            _frameInfo.lastSavedFrame, _frameInfo.saveEveryNthFrame
-        );
-        std::ofstream file(absPath("${BIN}/" + filename));
-        for (const FrameInfo& i : _frameInfo.frames) {
-            std::string line = fmt::format(
-                "{}\t{}\t{}", i.iFrame, i.deltaTime, i.avgDeltaTime
-            );
-            file << line << '\n';
-        }
-
-        _frameInfo.frames.clear();
-        _frameInfo.lastSavedFrame = frameNumber();
-    }
-#endif // OPENSPACE_WITH_INSTRUMENTATION
 }
 
 Scene* RenderEngine::scene() {
@@ -1295,7 +1251,7 @@ void RenderEngine::renderCameraInformation() {
         global::navigationHandler->orbitalNavigator();
 
     using FR = ghoul::fontrendering::FontRenderer;
-    
+
     _cameraButtonLocations.rotation = {
         fontResolution().x - rotationBox.x - XSeparation,
         fontResolution().y - penPosY,
diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl
index f671ab7213..9bb26d0fcd 100644
--- a/src/rendering/renderengine_lua.inl
+++ b/src/rendering/renderengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/rendering/screenspacerenderable.cpp b/src/rendering/screenspacerenderable.cpp
index 8b0f561038..9f913096a2 100644
--- a/src/rendering/screenspacerenderable.cpp
+++ b/src/rendering/screenspacerenderable.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -102,10 +102,10 @@ namespace {
     };
 
 
-    constexpr openspace::properties::Property::PropertyInfo AlphaInfo = {
-        "Alpha",
-        "Transparency",
-        "This value determines the transparency of the screen space plane. If this value "
+    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
+        "Opacity",
+        "Opacity",
+        "This value determines the opacity of the screen space plane. If this value "
         "is 1, the plane is completely opaque, if this value is 0, the plane is "
         "completely transparent."
     };
@@ -280,10 +280,10 @@ documentation::Documentation ScreenSpaceRenderable::Documentation() {
                 ScaleInfo.description
             },
             {
-                AlphaInfo.identifier,
+                OpacityInfo.identifier,
                 new DoubleVerifier,
                 Optional::Yes,
-                AlphaInfo.description
+                OpacityInfo.description
             },
             {
                 KeyTag,
@@ -316,16 +316,16 @@ std::unique_ptr<ScreenSpaceRenderable> ScreenSpaceRenderable::createFromDictiona
 }
 
 std::string ScreenSpaceRenderable::makeUniqueIdentifier(std::string name) {
-    std::vector<ScreenSpaceRenderable*> r =
+    std::vector<ScreenSpaceRenderable*> rs =
         global::renderEngine->screenSpaceRenderables();
 
-    auto nameTaken = [&r](const std::string& name) {
-        bool nameTaken = std::any_of(
-            r.begin(),
-            r.end(),
-            [&name](ScreenSpaceRenderable* r) { return r->identifier() == name; }
+    auto nameTaken = [&rs](const std::string& n) {
+        const bool taken = std::any_of(
+            rs.cbegin(),
+            rs.cend(),
+            [&n](ScreenSpaceRenderable* r) { return r->identifier() == n; }
         );
-        return nameTaken;
+        return taken;
     };
 
     std::string baseName = name;
@@ -362,7 +362,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         glm::vec3(glm::pi<float>())
     )
     , _scale(ScaleInfo, 0.25f, 0.f, 2.f)
-    , _alpha(AlphaInfo, 1.f, 0.f, 1.f)
+    , _opacity(OpacityInfo, 1.f, 0.f, 1.f)
     , _delete(DeleteInfo)
 {
     if (dictionary.hasKey(KeyIdentifier)) {
@@ -373,7 +373,6 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         setGuiName(dictionary.value<std::string>(KeyName));
     }
 
-
     addProperty(_enabled);
     addProperty(_useRadiusAzimuthElevation);
     addProperty(_usePerspectiveProjection);
@@ -392,7 +391,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
     });
 
     addProperty(_scale);
-    addProperty(_alpha);
+    addProperty(_opacity);
     addProperty(_localRotation);
 
     if (dictionary.hasKey(EnabledInfo.identifier)) {
@@ -407,14 +406,14 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
 
     if (_useRadiusAzimuthElevation) {
         if (dictionary.hasKey(RadiusAzimuthElevationInfo.identifier)) {
-            _raePosition = dictionary.value<glm::vec3>(
+            _raePosition = dictionary.value<glm::dvec3>(
                 RadiusAzimuthElevationInfo.identifier
             );
         }
     }
     else {
         if (dictionary.hasKey(CartesianPositionInfo.identifier)) {
-            _cartesianPosition = dictionary.value<glm::vec3>(
+            _cartesianPosition = dictionary.value<glm::dvec3>(
                 CartesianPositionInfo.identifier
             );
         }
@@ -424,32 +423,28 @@ ScreenSpaceRenderable::ScreenSpaceRenderable(const ghoul::Dictionary& dictionary
         _scale = static_cast<float>(dictionary.value<double>(ScaleInfo.identifier));
     }
 
-    if (dictionary.hasKey(AlphaInfo.identifier)) {
-        _alpha = static_cast<float>(dictionary.value<double>(AlphaInfo.identifier));
+    if (dictionary.hasKey(OpacityInfo.identifier)) {
+        _opacity = static_cast<float>(dictionary.value<double>(OpacityInfo.identifier));
     }
 
     if (dictionary.hasKey(UsePerspectiveProjectionInfo.identifier)) {
-        _usePerspectiveProjection = static_cast<bool>(
-            dictionary.value<bool>(UsePerspectiveProjectionInfo.identifier)
-        );
+        _usePerspectiveProjection =
+            dictionary.value<bool>(UsePerspectiveProjectionInfo.identifier);
     }
 
     if (dictionary.hasKey(FaceCameraInfo.identifier)) {
-        _faceCamera = static_cast<bool>(
-            dictionary.value<bool>(FaceCameraInfo.identifier)
-        );
+        _faceCamera = dictionary.value<bool>(FaceCameraInfo.identifier);
     }
 
-    if (dictionary.hasKeyAndValue<std::string>(KeyTag)) {
+    if (dictionary.hasValue<std::string>(KeyTag)) {
         std::string tagName = dictionary.value<std::string>(KeyTag);
         if (!tagName.empty()) {
             addTag(std::move(tagName));
         }
     }
-    else if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeyTag)) {
+    else if (dictionary.hasValue<ghoul::Dictionary>(KeyTag)) {
         const ghoul::Dictionary& tagNames = dictionary.value<ghoul::Dictionary>(KeyTag);
-        const std::vector<std::string>& keys = tagNames.keys();
-        for (const std::string& key : keys) {
+        for (std::string_view key : tagNames.keys()) {
             std::string tagName = tagNames.value<std::string>(key);
             if (!tagName.empty()) {
                 addTag(std::move(tagName));
@@ -523,16 +518,24 @@ void ScreenSpaceRenderable::createShaders() {
     ghoul::Dictionary dict = ghoul::Dictionary();
 
     auto res = global::windowDelegate->currentDrawBufferResolution();
-    ghoul::Dictionary rendererData = {
-        { "fragmentRendererPath", "${SHADERS}/framebuffer/renderframebuffer.frag" },
-        { "windowWidth" , res.x },
-        { "windowHeight" , res.y },
-        { "hdrExposure", global::renderEngine->hdrExposure() },
-        { "disableHDR", global::renderEngine->isHdrDisabled() }
-    };
+    ghoul::Dictionary rendererData;
+    rendererData.setValue(
+        "fragmentRendererPath",
+        std::string("${SHADERS}/framebuffer/renderframebuffer.frag")
+    );
+    rendererData.setValue("windowWidth", res.x);
+    rendererData.setValue("windowHeight", res.y);
+    rendererData.setValue(
+        "hdrExposure",
+        static_cast<double>(global::renderEngine->hdrExposure())
+    );
+    rendererData.setValue("disableHDR", global::renderEngine->isHdrDisabled());
 
     dict.setValue("rendererData", rendererData);
-    dict.setValue("fragmentPath", "${MODULE_BASE}/shaders/screenspace_fs.glsl");
+    dict.setValue(
+        "fragmentPath",
+        std::string("${MODULE_BASE}/shaders/screenspace_fs.glsl")
+    );
     _shader = ghoul::opengl::ProgramObject::Build(
         "ScreenSpaceProgram",
         absPath("${MODULE_BASE}/shaders/screenspace_vs.glsl"),
@@ -544,9 +547,7 @@ void ScreenSpaceRenderable::createShaders() {
 }
 
 glm::mat4 ScreenSpaceRenderable::scaleMatrix() {
-    glm::vec2 resolution = global::windowDelegate->currentDrawBufferResolution();
-
-    //to scale the plane
+    // to scale the plane
     float textureRatio =
         static_cast<float>(_objectSize.y) / static_cast<float>(_objectSize.x);
 
@@ -613,7 +614,7 @@ void ScreenSpaceRenderable::draw(glm::mat4 modelTransform) {
 
     _shader->activate();
 
-    _shader->setUniform(_uniformCache.alpha, _alpha);
+    _shader->setUniform(_uniformCache.alpha, _opacity);
     _shader->setUniform(_uniformCache.modelTransform, modelTransform);
 
     _shader->setUniform(
diff --git a/src/rendering/texturecomponent.cpp b/src/rendering/texturecomponent.cpp
new file mode 100644
index 0000000000..ce771887f8
--- /dev/null
+++ b/src/rendering/texturecomponent.cpp
@@ -0,0 +1,115 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/rendering/texturecomponent.h>
+
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/io/texture/texturereader.h>
+#include <ghoul/logging/logmanager.h>
+
+namespace {
+    constexpr const char _loggerCat[] = "TextureComponent";
+} // namespace
+
+namespace openspace {
+
+const ghoul::opengl::Texture* TextureComponent::texture() const {
+    return _texture.get();
+}
+
+ghoul::opengl::Texture* TextureComponent::texture() {
+    return _texture.get();
+}
+
+void TextureComponent::setFilterMode(Texture::FilterMode filterMode) {
+    _filterMode = filterMode;
+}
+
+void TextureComponent::setWrapping(Texture::WrappingMode wrapping) {
+    _wrappingMode = wrapping;
+}
+
+void TextureComponent::setShouldWatchFileForChanges(bool value) {
+    _shouldWatchFile = value;
+}
+
+void TextureComponent::setShouldPurgeFromRAM(bool value) {
+    _shouldPurgeFromRAM = value;
+}
+
+void TextureComponent::bind() {
+    ghoul_assert(_texture, "Texture must be loaded before binding");
+    _texture->bind();
+}
+
+void TextureComponent::uploadToGpu() {
+    if (!_texture) {
+        LERROR("Could not upload texture to GPU. Texture not loaded");
+        return;
+    }
+    _texture->uploadTexture();
+    _texture->setFilter(_filterMode);
+    _texture->setWrapping(_wrappingMode);
+    if (_shouldPurgeFromRAM) {
+        _texture->purgeFromRAM();
+    }
+}
+
+void TextureComponent::loadFromFile(const std::string& path) {
+    if (!path.empty()) {
+        using namespace ghoul::io;
+        using namespace ghoul::opengl;
+        std::unique_ptr<Texture> texture = TextureReader::ref().loadTexture(
+            absPath(path)
+        );
+
+        if (texture) {
+            LDEBUG(fmt::format("Loaded texture from '{}'", absPath(path)));
+            _texture = std::move(texture);
+
+            _textureFile = std::make_unique<ghoul::filesystem::File>(path);
+            if (_shouldWatchFile) {
+                _textureFile->setCallback(
+                    [&](const ghoul::filesystem::File&) { _fileIsDirty = true; }
+                );
+            }
+
+            _fileIsDirty = false;
+            _textureIsDirty = true;
+        }
+    }
+}
+
+void TextureComponent::update() {
+    if (_fileIsDirty) {
+        loadFromFile(_textureFile->path());
+    }
+
+    if (_textureIsDirty) {
+        uploadToGpu();
+        _textureIsDirty = false;
+    }
+}
+} // namespace openspace
diff --git a/src/rendering/transferfunction.cpp b/src/rendering/transferfunction.cpp
index f702b1d347..db342727d0 100644
--- a/src/rendering/transferfunction.cpp
+++ b/src/rendering/transferfunction.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -112,7 +112,7 @@ void TransferFunction::setCallback(TfChangedCallback callback) {
     _tfChangedCallback = std::move(callback);
 }
 
-void TransferFunction::setTextureFromTxt(std::shared_ptr<ghoul::opengl::Texture> ptr) {
+void TransferFunction::setTextureFromTxt() {
     std::ifstream in;
     in.open(_filepath.c_str());
 
diff --git a/src/rendering/volumeraycaster.cpp b/src/rendering/volumeraycaster.cpp
index 843a157ca2..f870810700 100644
--- a/src/rendering/volumeraycaster.cpp
+++ b/src/rendering/volumeraycaster.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/asset.cpp b/src/scene/asset.cpp
index 8c5909bada..39cae2b715 100644
--- a/src/scene/asset.cpp
+++ b/src/scene/asset.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/assetloader.cpp b/src/scene/assetloader.cpp
index 06804dbf08..d00d7faa72 100644
--- a/src/scene/assetloader.cpp
+++ b/src/scene/assetloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -299,15 +299,33 @@ bool AssetLoader::loadAsset(Asset* asset) {
             ghoul::lua::luaDictionaryFromState(*_luaState, metaDict);
 
             Asset::MetaInformation meta;
-            metaDict.getValue(MetaInformationName, meta.name);
-            metaDict.getValue(MetaInformationVersion, meta.version);
-            metaDict.getValue(MetaInformationDescription, meta.description);
-            metaDict.getValue(MetaInformationAuthor, meta.author);
-            metaDict.getValue(MetaInformationURL, meta.url);
-            metaDict.getValue(MetaInformationLicense, meta.license);
-            if (metaDict.hasKey(MetaInformationIdentifiers)) {
-                ghoul::Dictionary iddict = metaDict.value<ghoul::Dictionary>(MetaInformationIdentifiers);
-                for (int i = 1; i <= iddict.size(); ++i) {
+            if (metaDict.hasValue<std::string>(MetaInformationName)) {
+                meta.name = metaDict.value<std::string>(MetaInformationName);
+
+            }
+            if (metaDict.hasValue<std::string>(MetaInformationVersion)) {
+                meta.version = metaDict.value<std::string>(MetaInformationVersion);
+
+            }
+            if (metaDict.hasValue<std::string>(MetaInformationDescription)) {
+                meta.description =
+                    metaDict.value<std::string>(MetaInformationDescription);
+
+            }
+            if (metaDict.hasValue<std::string>(MetaInformationAuthor)) {
+                meta.author = metaDict.value<std::string>(MetaInformationAuthor);
+
+            }
+            if (metaDict.hasValue<std::string>(MetaInformationURL)) {
+                meta.url = metaDict.value<std::string>(MetaInformationURL);
+            }
+            if (metaDict.hasValue<std::string>(MetaInformationLicense)) {
+                meta.license = metaDict.value<std::string>(MetaInformationLicense);
+            }
+            if (metaDict.hasValue<ghoul::Dictionary>(MetaInformationIdentifiers)) {
+                ghoul::Dictionary iddict =
+                    metaDict.value<ghoul::Dictionary>(MetaInformationIdentifiers);
+                for (size_t i = 1; i <= iddict.size(); ++i) {
                     std::string key = std::to_string(i);
                     std::string identifier = iddict.value<std::string>(key);
                     meta.identifiers.push_back(identifier);
@@ -332,7 +350,7 @@ void AssetLoader::unloadAsset(Asset* asset) {
     }
     _onDeinitializationFunctionRefs[asset].clear();
 
-    for (const std::pair<const Asset*, std::vector<int>>& it :
+    for (std::pair<Asset*, std::vector<int>> it :
          _onDependencyInitializationFunctionRefs[asset])
     {
         for (int ref : it.second) {
@@ -341,7 +359,7 @@ void AssetLoader::unloadAsset(Asset* asset) {
     }
     _onDependencyInitializationFunctionRefs.erase(asset);
 
-    for (const std::pair<Asset*, std::vector<int>>& it :
+    for (std::pair<Asset*, std::vector<int>> it :
          _onDependencyDeinitializationFunctionRefs[asset])
     {
         for (int ref : it.second) {
diff --git a/src/scene/assetloader_lua.inl b/src/scene/assetloader_lua.inl
index 74c281411e..0b8884f3e2 100644
--- a/src/scene/assetloader_lua.inl
+++ b/src/scene/assetloader_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/assetmanager.cpp b/src/scene/assetmanager.cpp
index de1809110f..c129207ed0 100644
--- a/src/scene/assetmanager.cpp
+++ b/src/scene/assetmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/assetmanager_lua.inl b/src/scene/assetmanager_lua.inl
index b6e2705da1..82bbbd62f9 100644
--- a/src/scene/assetmanager_lua.inl
+++ b/src/scene/assetmanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/lightsource.cpp b/src/scene/lightsource.cpp
index be63cf1a30..61bb9fffd1 100644
--- a/src/scene/lightsource.cpp
+++ b/src/scene/lightsource.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -92,7 +92,7 @@ std::unique_ptr<LightSource> LightSource::createFromDictionary(
 
     auto factory = FactoryManager::ref().factory<LightSource>();
     LightSource* source = factory->create(timeFrameType, dictionary);
-    
+
     const std::string identifier = dictionary.value<std::string>(KeyIdentifier);
     source->setIdentifier(identifier);
 
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 5f8b389c45..69c6061a82 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -40,8 +40,6 @@
 namespace openspace {
 
 namespace {
-    constexpr const char* _loggerCat = "Profile";
-
     // Helper structs for the visitor pattern of the std::variant
     template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
     template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
@@ -792,7 +790,7 @@ std::string Profile::convertToScene() const {
                     );
                     if (camera.up.has_value()) {
                         result += fmt::format(
-                            "Up = {{ {}, {}, {} }}, ", 
+                            "Up = {{ {}, {}, {} }}, ",
                             camera.up->x, camera.up->y, camera.up->z
                         );
                     }
@@ -809,7 +807,8 @@ std::string Profile::convertToScene() const {
                     if (camera.altitude.has_value()) {
                         return fmt::format(
                             "openspace.globebrowsing.goToGeo([[{}]], {}, {}, {});\n",
-                            camera.anchor, camera.latitude, camera.longitude, *camera.altitude
+                            camera.anchor,
+                            camera.latitude, camera.longitude, *camera.altitude
                         );
                     }
                     else {
diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl
index a009f1d07d..6a46e50167 100644
--- a/src/scene/profile_lua.inl
+++ b/src/scene/profile_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -105,7 +105,7 @@ int saveSettingsToProfile(lua_State* L) {
 
     if (FileSys.fileExists(absFilename) && !overwrite) {
         return luaL_error(
-            L, 
+            L,
             fmt::format(
                 "Unable to save profile '{}'. File of same name already exists",
                 absFilename
diff --git a/src/scene/rotation.cpp b/src/scene/rotation.cpp
index 05266dc4ab..59daaf823d 100644
--- a/src/scene/rotation.cpp
+++ b/src/scene/rotation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/scale.cpp b/src/scene/scale.cpp
index 3035a22884..b22af536a8 100644
--- a/src/scene/scale.cpp
+++ b/src/scene/scale.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -60,7 +60,9 @@ documentation::Documentation Scale::Documentation() {
     };
 }
 
-ghoul::mm_unique_ptr<Scale> Scale::createFromDictionary(const ghoul::Dictionary& dictionary) {
+ghoul::mm_unique_ptr<Scale> Scale::createFromDictionary(
+                                                      const ghoul::Dictionary& dictionary)
+{
     documentation::testSpecificationAndThrow(Documentation(), dictionary, "Scale");
 
     std::string scaleType = dictionary.value<std::string>(KeyType);
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index d364354be3..0e0ff31093 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -48,6 +48,7 @@ namespace {
     constexpr const char* KeyIdentifier = "Identifier";
     constexpr const char* KeyParent = "Parent";
 
+#ifdef TRACY_ENABLE
     constexpr const char* renderBinToString(int renderBin) {
         // Synced with Renderable::RenderBin
         if (renderBin == 1) {
@@ -69,6 +70,7 @@ namespace {
             throw ghoul::MissingCaseException();
         }
     }
+#endif // TRACY_ENABLE
 } // namespace
 
 namespace openspace {
@@ -428,11 +430,10 @@ SceneGraphNode* Scene::loadNode(const ghoul::Dictionary& nodeDictionary) {
             // TODO: Throw exception
             LERROR("Dependencies did not have the corrent type");
         }
-        ghoul::Dictionary nodeDependencies;
-        nodeDictionary.getValue(SceneGraphNode::KeyDependencies, nodeDependencies);
+        ghoul::Dictionary nodeDependencies =
+            nodeDictionary.value<ghoul::Dictionary>(SceneGraphNode::KeyDependencies);
 
-        const std::vector<std::string>& keys = nodeDependencies.keys();
-        for (const std::string& key : keys) {
+        for (std::string_view key : nodeDependencies.keys()) {
             std::string value = nodeDependencies.value<std::string>(key);
             dependencyNames.push_back(value);
         }
diff --git a/src/scene/scene_lua.inl b/src/scene/scene_lua.inl
index a822d94dd4..be155ed426 100644
--- a/src/scene/scene_lua.inl
+++ b/src/scene/scene_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -150,12 +150,13 @@ bool doesUriContainGroupTag(const std::string& command, std::string& groupName)
     }
 }
 
-std::string replaceUriWithGroupName(std::string uri, std::string ownerName) {
+std::string replaceUriWithGroupName(const std::string& uri, const std::string& ownerName)
+{
     size_t pos = uri.find_first_of(".");
     return ownerName + "." + uri.substr(pos);
 }
 
-std::string extractUriWithoutGroupName(std::string uri) {
+std::string extractUriWithoutGroupName(const std::string& uri) {
     size_t pos = uri.find_first_of(".");
     return uri.substr(pos);
 }
@@ -640,16 +641,16 @@ int removeSceneGraphNodesFromRegex(lua_State* L) {
 
     // Add all the children
     std::function<void(SceneGraphNode*, std::vector<SceneGraphNode*>&)> markNode =
-        [&markNode](SceneGraphNode* node, std::vector<SceneGraphNode*>& markedList)
+        [&markNode](SceneGraphNode* node, std::vector<SceneGraphNode*>& marked)
     {
         std::vector<SceneGraphNode*> children = node->children();
         for (SceneGraphNode* child : children) {
-            markNode(child, markedList);
+            markNode(child, marked);
         }
 
-        auto it = std::find(markedList.begin(), markedList.end(), node);
-        if (it == markedList.end()) {
-            markedList.push_back(node);
+        const auto it = std::find(marked.cbegin(), marked.cend(), node);
+        if (it == marked.end()) {
+            marked.push_back(node);
         }
     };
     for (SceneGraphNode* node : markedList) {
diff --git a/src/scene/scenegraphnode.cpp b/src/scene/scenegraphnode.cpp
index aebb135f3c..38ddc471bf 100644
--- a/src/scene/scenegraphnode.cpp
+++ b/src/scene/scenegraphnode.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -35,6 +35,7 @@
 #include <openspace/util/memorymanager.h>
 #include <openspace/util/updatestructures.h>
 #include <ghoul/logging/logmanager.h>
+#include <ghoul/misc/assert.h>
 #include <ghoul/misc/profiling.h>
 #include <ghoul/opengl/ghoul_gl.h>
 #include "scenegraphnode_doc.inl"
@@ -182,13 +183,13 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (dictionary.hasKey(BoundingSphereInfo.identifier)) {
-        result->_boundingSphere = dictionary.value<float>(BoundingSphereInfo.identifier);
+        result->_boundingSphere = dictionary.value<double>(BoundingSphereInfo.identifier);
         result->_boundingSphere.setVisibility(properties::Property::Visibility::All);
     }
 
     if (dictionary.hasKey(KeyTransformTranslation)) {
-        ghoul::Dictionary translationDictionary;
-        dictionary.getValue(KeyTransformTranslation, translationDictionary);
+        ghoul::Dictionary translationDictionary =
+            dictionary.value<ghoul::Dictionary>(KeyTransformTranslation);
         result->_transform.translation = Translation::createFromDictionary(
             translationDictionary
         );
@@ -207,8 +208,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (dictionary.hasKey(KeyTransformRotation)) {
-        ghoul::Dictionary rotationDictionary;
-        dictionary.getValue(KeyTransformRotation, rotationDictionary);
+        ghoul::Dictionary rotationDictionary =
+            dictionary.value<ghoul::Dictionary>(KeyTransformRotation);
         result->_transform.rotation = Rotation::createFromDictionary(rotationDictionary);
         if (result->_transform.rotation == nullptr) {
             LERROR(fmt::format(
@@ -225,8 +226,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (dictionary.hasKey(KeyTransformScale)) {
-        ghoul::Dictionary scaleDictionary;
-        dictionary.getValue(KeyTransformScale, scaleDictionary);
+        ghoul::Dictionary scaleDictionary =
+            dictionary.value<ghoul::Dictionary>(KeyTransformScale);
         result->_transform.scale = Scale::createFromDictionary(scaleDictionary);
         if (result->_transform.scale == nullptr) {
             LERROR(fmt::format(
@@ -241,8 +242,8 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (dictionary.hasKey(KeyTimeFrame)) {
-        ghoul::Dictionary timeFrameDictionary;
-        dictionary.getValue(KeyTimeFrame, timeFrameDictionary);
+        ghoul::Dictionary timeFrameDictionary =
+            dictionary.value<ghoul::Dictionary>(KeyTimeFrame);
         result->_timeFrame = TimeFrame::createFromDictionary(timeFrameDictionary);
         if (result->_timeFrame == nullptr) {
             LERROR(fmt::format(
@@ -260,19 +261,11 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
 
     // We initialize the renderable last as it probably has the most dependencies
     if (dictionary.hasValue<ghoul::Dictionary>(KeyRenderable)) {
-        ghoul::Dictionary renderableDictionary;
-        dictionary.getValue(KeyRenderable, renderableDictionary);
-
-        renderableDictionary.setValue(KeyIdentifier, result->_identifier);
+        ghoul::Dictionary renderableDictionary =
+            dictionary.value<ghoul::Dictionary>(KeyRenderable);
 
         result->_renderable = Renderable::createFromDictionary(renderableDictionary);
-        if (result->_renderable == nullptr) {
-            LERROR(fmt::format(
-                "Failed to create renderable for SceneGraphNode '{}'",
-                result->identifier()
-            ));
-            return nullptr;
-        }
+        ghoul_assert(result->_renderable, "Failed to create Renderable");
         result->addPropertySubOwner(result->_renderable.get());
         LDEBUG(fmt::format(
             "Successfully created renderable for '{}'", result->identifier()
@@ -293,17 +286,16 @@ ghoul::mm_unique_ptr<SceneGraphNode> SceneGraphNode::createFromDictionary(
     }
 
     if (dictionary.hasKey(KeyTag)) {
-        if (dictionary.hasKeyAndValue<std::string>(KeyTag)) {
+        if (dictionary.hasValue<std::string>(KeyTag)) {
             std::string tagName = dictionary.value<std::string>(KeyTag);
             if (!tagName.empty()) {
                 result->addTag(std::move(tagName));
             }
         }
-        else if (dictionary.hasKeyAndValue<ghoul::Dictionary>(KeyTag)) {
+        else if (dictionary.hasValue<ghoul::Dictionary>(KeyTag)) {
             ghoul::Dictionary tagNames = dictionary.value<ghoul::Dictionary>(KeyTag);
-            std::vector<std::string> keys = tagNames.keys();
             std::string tagName;
-            for (const std::string& key : keys) {
+            for (std::string_view key : tagNames.keys()) {
                 tagName = tagNames.value<std::string>(key);
                 if (!tagName.empty()) {
                     result->addTag(std::move(tagName));
@@ -341,15 +333,13 @@ SceneGraphNode::SceneGraphNode()
             global::memoryManager->PersistentMemory.alloc<StaticScale>()
         )
     }
-   , _boundingSphere(properties::FloatProperty(BoundingSphereInfo, 0.f))
+    , _boundingSphere(BoundingSphereInfo, 0.0)
     , _computeScreenSpaceValues(ComputeScreenSpaceInfo, false)
-    , _screenSpacePosition(
-        properties::IVec2Property(ScreenSpacePositionInfo, glm::ivec2(-1, -1))
-    )
-    , _screenVisibility(properties::BoolProperty(ScreenVisibilityInfo, false))
-    , _distFromCamToNode(properties::DoubleProperty(DistanceFromCamToNodeInfo, -1.0))
-    , _screenSizeRadius(properties::DoubleProperty(ScreenSizeRadiusInfo, 0))
-    , _visibilityDistance(properties::FloatProperty(VisibilityDistanceInfo, 6e10f))
+    , _screenSpacePosition(ScreenSpacePositionInfo, glm::ivec2(-1, -1))
+    , _screenVisibility(ScreenVisibilityInfo, false)
+    , _distFromCamToNode(DistanceFromCamToNodeInfo, -1.0)
+    , _screenSizeRadius(ScreenSizeRadiusInfo, 0)
+    , _visibilityDistance(VisibilityDistanceInfo, 6e10f)
 {
     addProperty(_computeScreenSpaceValues);
     addProperty(_screenSpacePosition);
@@ -692,7 +682,7 @@ void SceneGraphNode::computeScreenSpaceData(RenderData& newData) {
     glm::ivec2 res = global::windowDelegate->currentSubwindowSize();
 
     // Get the radius of node
-    double nodeRadius = static_cast<double>(this->boundingSphere());
+    double nodeRadius = boundingSphere();
 
     // Distance from the camera to the node
     double distFromCamToNode = glm::distance(cam.positionVec3(), worldPos) - nodeRadius;
@@ -888,7 +878,7 @@ std::vector<SceneGraphNode*> SceneGraphNode::children() const {
     return nodes;
 }
 
-float SceneGraphNode::boundingSphere() const {
+double SceneGraphNode::boundingSphere() const {
     return _boundingSphere;
 }
 
diff --git a/src/scene/scenegraphnode_doc.inl b/src/scene/scenegraphnode_doc.inl
index 7a8298b573..29f89546e6 100644
--- a/src/scene/scenegraphnode_doc.inl
+++ b/src/scene/scenegraphnode_doc.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/sceneinitializer.cpp b/src/scene/sceneinitializer.cpp
index b03039c5ac..1e92860d26 100644
--- a/src/scene/sceneinitializer.cpp
+++ b/src/scene/sceneinitializer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp
index 42dd91f544..e93946ae41 100644
--- a/src/scene/scenelicensewriter.cpp
+++ b/src/scene/scenelicensewriter.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -65,7 +65,7 @@ std::string SceneLicenseWriter::generateJson() const {
     int metaCount = 0;
     for (const Asset* asset : assets) {
         std::optional<Asset::MetaInformation> meta = asset->metaInformation();
-        
+
         if (!meta.has_value()) {
             continue;
         }
diff --git a/src/scene/timeframe.cpp b/src/scene/timeframe.cpp
index ce01f44227..5ecebb4f62 100644
--- a/src/scene/timeframe.cpp
+++ b/src/scene/timeframe.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scene/translation.cpp b/src/scene/translation.cpp
index a7491cfef2..55ff79b80d 100644
--- a/src/scene/translation.cpp
+++ b/src/scene/translation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scripting/lualibrary.cpp b/src/scripting/lualibrary.cpp
index d11250322a..245c40b42c 100644
--- a/src/scripting/lualibrary.cpp
+++ b/src/scripting/lualibrary.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scripting/scriptengine.cpp b/src/scripting/scriptengine.cpp
index 05260f7de1..7ea69ac42d 100644
--- a/src/scripting/scriptengine.cpp
+++ b/src/scripting/scriptengine.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/scripting/scriptengine_lua.inl b/src/scripting/scriptengine_lua.inl
index e27ddeb283..d221232ca6 100644
--- a/src/scripting/scriptengine_lua.inl
+++ b/src/scripting/scriptengine_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -25,7 +25,7 @@
 #include <ghoul/filesystem/directory.h>
 #include <ghoul/filesystem/file.h>
 
-#include <ext/ghoul/ext/assimp/contrib/zip/src/zip.h>
+#include <ghoul/ext/assimp/contrib/zip/src/zip.h>
 
 namespace openspace::luascriptfunctions {
 
diff --git a/src/scripting/scriptscheduler.cpp b/src/scripting/scriptscheduler.cpp
index 2606a7431e..7523f91e69 100644
--- a/src/scripting/scriptscheduler.cpp
+++ b/src/scripting/scriptscheduler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,6 +32,13 @@
 
 #include "scriptscheduler_lua.inl"
 
+namespace {
+    constexpr const char* KeyTime = "Time";
+    constexpr const char* KeyForwardScript = "ForwardScript";
+    constexpr const char* KeyBackwardScript = "BackwardScript";
+    constexpr const char* KeyUniversalScript = "Script";
+} // namespace
+
 namespace openspace::scripting {
 
 documentation::Documentation ScriptScheduler::Documentation() {
@@ -40,7 +47,7 @@ documentation::Documentation ScriptScheduler::Documentation() {
     using TimeVerifier = StringVerifier;
     using LuaScriptVerifier = StringVerifier;
 
-    return{
+    return {
         "Scheduled Scripts",
         "core_scheduledscript",
         {
@@ -88,46 +95,7 @@ documentation::Documentation ScriptScheduler::Documentation() {
 
 using namespace openspace::interaction;
 
-ScriptScheduler::ScheduledScript::ScheduledScript(const ghoul::Dictionary& dictionary) {
-    const std::string& timeStr = dictionary.value<std::string>(KeyTime);
-    time = Time::convertTime(timeStr);
-
-    // If a universal script is specified, retrieve it and add a ; as a separator so that
-    // it can be added to the other scripts
-    std::string universal;
-    dictionary.getValue(KeyUniversalScript, universal);
-    if (!universal.empty()) {
-        universal += ";";
-    }
-
-    if (dictionary.hasKeyAndValue<std::string>(KeyForwardScript)) {
-        forwardScript =
-            universal + dictionary.value<std::string>(KeyForwardScript);
-    }
-
-    if (dictionary.hasKeyAndValue<std::string>(KeyBackwardScript)) {
-        backwardScript =
-            universal + dictionary.value<std::string>(KeyBackwardScript);
-    }
-}
-
-void ScriptScheduler::loadScripts(const ghoul::Dictionary& dictionary) {
-    // Check if all of the scheduled scripts are formed correctly
-    documentation::testSpecificationAndThrow(
-        Documentation(),
-        dictionary,
-        "ScriptScheduler"
-    );
-
-    // Create all the scheduled script first
-    std::vector<ScheduledScript> scheduledScripts;
-    for (size_t i = 1; i <= dictionary.size(); ++i) {
-        const ghoul::Dictionary& timedScriptDict = dictionary.value<ghoul::Dictionary>(
-            std::to_string(i)
-        );
-        scheduledScripts.emplace_back(timedScriptDict);
-    }
-
+void ScriptScheduler::loadScripts(std::vector<ScheduledScript> scheduledScripts) {
     // Sort scripts by time; use a stable_sort as the user might have had an intention
     // specifying multiple scripts for the same time in a specific order
     std::stable_sort(
@@ -145,12 +113,17 @@ void ScriptScheduler::loadScripts(const ghoul::Dictionary& dictionary) {
     for (ScheduledScript& script : scheduledScripts) {
         _timings.push_back(script.time);
 
-        _forwardScripts.push_back(std::move(script.forwardScript));
+        std::string forward =
+            script.universalScript.empty() ?
+            std::move(script.forwardScript) :
+            std::move(script.universalScript) + ';' + std::move(script.forwardScript);
+        _forwardScripts.push_back(forward);
 
-        _backwardScripts.insert(
-            _backwardScripts.begin(),
-            std::move(script.backwardScript)
-        );
+        std::string backward =
+            script.universalScript.empty() ?
+            std::move(script.backwardScript) :
+            std::move(script.universalScript) + ';' + std::move(script.backwardScript);
+        _backwardScripts.insert(_backwardScripts.begin(), backward);
     }
 
     // Ensure _currentIndex and _currentTime is accurate after new scripts was added
diff --git a/src/scripting/scriptscheduler_lua.inl b/src/scripting/scriptscheduler_lua.inl
index 0d8bbe44cb..7c63502e9f 100644
--- a/src/scripting/scriptscheduler_lua.inl
+++ b/src/scripting/scriptscheduler_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -29,19 +29,49 @@ namespace openspace::luascriptfunctions {
 int loadFile(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(L, 1, "lua::loadFile");
 
-    const std::string& missionFileName = ghoul::lua::value<std::string>(
+    const std::string& fileName = ghoul::lua::value<std::string>(
         L,
         1,
         ghoul::lua::PopValue::Yes
     );
-    if (missionFileName.empty()) {
+    if (fileName.empty()) {
         return ghoul::lua::luaError(L, "filepath string is empty");
     }
 
-    global::scriptScheduler->loadScripts(
-        ghoul::lua::loadDictionaryFromFile(missionFileName, L)
+    ghoul::Dictionary scriptsDict = ghoul::lua::loadDictionaryFromFile(fileName, L);
+    documentation::testSpecificationAndThrow(
+        scripting::ScriptScheduler::Documentation(),
+        scriptsDict,
+        "ScriptScheduler"
     );
 
+
+    std::vector<scripting::ScriptScheduler::ScheduledScript> scripts;
+    for (int i = 1; i <= scriptsDict.size(); ++i) {
+        ghoul::Dictionary d = scriptsDict.value<ghoul::Dictionary>(std::to_string(i));
+
+        scripting::ScriptScheduler::ScheduledScript script;
+        constexpr const char* KeyTime = "Time";
+        if (d.hasValue<std::string>(KeyTime)) {
+            script.time = Time::convertTime(d.value<std::string>(KeyTime));
+        }
+        constexpr const char* KeyForwardScript = "ForwardScript";
+        if (d.hasValue<std::string>(KeyForwardScript)) {
+            script.forwardScript = d.value<std::string>(KeyForwardScript);
+        }
+        constexpr const char* KeyBackwardScript = "BackwardScript";
+        if (d.hasValue<std::string>(KeyBackwardScript)) {
+            script.backwardScript = d.value<std::string>(KeyBackwardScript);
+        }
+        constexpr const char* KeyUniversalScript = "Script";
+        if (d.hasValue<std::string>(KeyUniversalScript)) {
+            script.universalScript = d.value<std::string>(KeyUniversalScript);
+        }
+        scripts.push_back(script);
+    }
+
+    global::scriptScheduler->loadScripts(scripts);
+
     ghoul_assert(lua_gettop(L) == 0, "Incorrect number of items left on stack");
     return 0;
 }
@@ -53,49 +83,26 @@ int loadScheduledScript(lua_State* L) {
         "lua::loadScheduledScript"
     );
 
-    std::string time = ghoul::lua::value<std::string>(L, 1);
-    std::string forwardScript = ghoul::lua::value<std::string>(L, 2);
+    scripting::ScriptScheduler::ScheduledScript script;
 
-    if (nArguments == 2) {
-        global::scriptScheduler->loadScripts({
-            {
-                "1",
-                ghoul::Dictionary {
-                    { KeyTime, std::move(time) },
-                    { KeyForwardScript, std::move(forwardScript) }
-                }
-            }
-        });
-    }
-    else if (nArguments == 3) {
+    std::string time = ghoul::lua::value<std::string>(L, 1);
+    script.time = Time::convertTime(time);
+    std::string forwardScript = ghoul::lua::value<std::string>(L, 2);
+    script.forwardScript = std::move(forwardScript);
+
+    if (nArguments == 3) {
         std::string backwardScript = ghoul::lua::value<std::string>(L, 3);
-        global::scriptScheduler->loadScripts({
-            {
-                "1",
-                ghoul::Dictionary {
-                    { KeyTime, std::move(time) },
-                    { KeyForwardScript, std::move(forwardScript) },
-                    { KeyBackwardScript, std::move(backwardScript) }
-                }
-            }
-        });
+        script.backwardScript = std::move(backwardScript);
     }
     else if (nArguments == 4) {
         std::string backwardScript = ghoul::lua::value<std::string>(L, 3);
+        script.backwardScript = std::move(backwardScript);
         std::string universalScript = ghoul::lua::value<std::string>(L, 4);
-
-        global::scriptScheduler->loadScripts({
-            {
-                "1",
-                ghoul::Dictionary {
-                    { KeyTime, std::move(time) },
-                    { KeyForwardScript, std::move(forwardScript) },
-                    { KeyBackwardScript, std::move(backwardScript) },
-                    { KeyUniversalScript, std::move(universalScript) }
-                }
-            }
-        });
+        script.universalScript = std::move(universalScript);
     }
+    std::vector<scripting::ScriptScheduler::ScheduledScript> scripts;
+    scripts.push_back(std::move(script));
+    global::scriptScheduler->loadScripts(scripts);
 
     lua_settop(L, 0);
 
diff --git a/src/scripting/systemcapabilitiesbinding.cpp b/src/scripting/systemcapabilitiesbinding.cpp
index 79b7676711..f48109ce6a 100644
--- a/src/scripting/systemcapabilitiesbinding.cpp
+++ b/src/scripting/systemcapabilitiesbinding.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -175,7 +175,7 @@ int extensions(lua_State* L) {
 
     lua_newtable(L);
 
-    for (size_t i = 1; i <= extensions.size(); ++i) {
+    for (size_t i = 1; i < extensions.size(); ++i) {
         ghoul::lua::push(L, extensions[i]);
         lua_rawseti(L, -2, i);
     }
diff --git a/src/util/blockplaneintersectiongeometry.cpp b/src/util/blockplaneintersectiongeometry.cpp
index b2e6dd4d0c..3bbca9d57b 100644
--- a/src/util/blockplaneintersectiongeometry.cpp
+++ b/src/util/blockplaneintersectiongeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -155,7 +155,7 @@ void BlockPlaneIntersectionGeometry::updateVertices() {
     );
 
     glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(GLfloat), 0);
+    glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(GLfloat), nullptr);
 
     glBindVertexArray(0);
 }
diff --git a/src/util/boxgeometry.cpp b/src/util/boxgeometry.cpp
index 34c9189d8d..4e5943319a 100644
--- a/src/util/boxgeometry.cpp
+++ b/src/util/boxgeometry.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/camera.cpp b/src/util/camera.cpp
index 02cd915e04..0cd86da56a 100644
--- a/src/util/camera.cpp
+++ b/src/util/camera.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/coordinateconversion.cpp b/src/util/coordinateconversion.cpp
index 0fedafb08f..65cba42a33 100644
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/distanceconversion.cpp b/src/util/distanceconversion.cpp
index 905b07a400..2296156d6e 100644
--- a/src/util/distanceconversion.cpp
+++ b/src/util/distanceconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/factorymanager.cpp b/src/util/factorymanager.cpp
index 3796976382..d66edbf38e 100644
--- a/src/util/factorymanager.cpp
+++ b/src/util/factorymanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/histogram.cpp b/src/util/histogram.cpp
index 148b3d2a19..8801756ffb 100644
--- a/src/util/histogram.cpp
+++ b/src/util/histogram.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 74e1749d1d..4692e19525 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/keys.cpp b/src/util/keys.cpp
index a868be79a7..58afcc3632 100644
--- a/src/util/keys.cpp
+++ b/src/util/keys.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -32,10 +32,6 @@
 #include <algorithm>
 #include <vector>
 
-namespace {
-    constexpr const char* _loggerCat = "Keys";
-} // namespace
-
 namespace openspace {
 
 bool hasKeyModifier(KeyAction lhs, KeyAction rhs) {
@@ -50,7 +46,7 @@ KeyAction operator|(KeyAction lhs, KeyAction rhs) {
     );
 }
 
-KeyAction operator|=(KeyAction& lhs, KeyAction rhs) {
+KeyAction operator|=(KeyAction lhs, KeyAction rhs) {
     return (lhs | rhs);
 }
 
@@ -66,7 +62,7 @@ KeyModifier operator|(KeyModifier lhs, KeyModifier rhs) {
     );
 }
 
-KeyModifier operator|=(KeyModifier& lhs, KeyModifier rhs) {
+KeyModifier operator|=(KeyModifier lhs, KeyModifier rhs) {
     return (lhs | rhs);
 }
 
diff --git a/src/util/openspacemodule.cpp b/src/util/openspacemodule.cpp
index faba6a17fb..0bc39e71cd 100644
--- a/src/util/openspacemodule.cpp
+++ b/src/util/openspacemodule.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -47,9 +47,7 @@ OpenSpaceModule::OpenSpaceModule(std::string name)
     : properties::PropertyOwner({ std::move(name) })
 {}
 
-void OpenSpaceModule::initialize(const ModuleEngine* moduleEngine,
-                                 const ghoul::Dictionary& configuration)
-{
+void OpenSpaceModule::initialize(const ghoul::Dictionary& configuration) {
     ZoneScoped
     ZoneName(identifier().c_str(), identifier().size())
 
@@ -71,7 +69,6 @@ void OpenSpaceModule::initialize(const ModuleEngine* moduleEngine,
     LDEBUG(fmt::format("Registering module path {}: {}", moduleToken, path));
     FileSys.registerPathToken(moduleToken, std::move(path));
 
-    _moduleEngine = moduleEngine;
     internalInitialize(configuration);
 }
 
@@ -145,10 +142,6 @@ std::string OpenSpaceModule::modulePath() const {
     );
 }
 
-const ModuleEngine* OpenSpaceModule::moduleEngine() const {
-    return _moduleEngine;
-}
-
 void OpenSpaceModule::internalInitialize(const ghoul::Dictionary&) {}
 
 void OpenSpaceModule::internalInitializeGL() {}
diff --git a/src/util/planegeometry.cpp b/src/util/planegeometry.cpp
new file mode 100644
index 0000000000..69a8c92317
--- /dev/null
+++ b/src/util/planegeometry.cpp
@@ -0,0 +1,108 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/util/planegeometry.h>
+
+#include <ghoul/logging/logmanager.h>
+#include <string>
+
+namespace {
+    constexpr const char* _loggerCat = "PlaneGeometry";
+} // namespace
+
+namespace openspace {
+
+PlaneGeometry::PlaneGeometry(glm::vec2 size) : _size(std::move(size)) {}
+
+PlaneGeometry::PlaneGeometry(float size) : PlaneGeometry(glm::vec2(size, size)) {}
+
+PlaneGeometry::~PlaneGeometry() {
+    glDeleteBuffers(1, &_vBufferId);
+    glDeleteVertexArrays(1, &_vaoId);
+}
+
+void PlaneGeometry::initialize() {
+    glGenVertexArrays(1, &_vaoId);
+    glGenBuffers(1, &_vBufferId);
+    updateGeometry();
+}
+
+void PlaneGeometry::deinitialize() {
+    glDeleteVertexArrays(1, &_vaoId);
+    _vaoId = 0;
+
+    glDeleteBuffers(1, &_vBufferId);
+    _vBufferId = 0;
+}
+
+void PlaneGeometry::render() {
+    glBindVertexArray(_vaoId);
+    glDrawArrays(GL_TRIANGLES, 0, 6);
+    glBindVertexArray(0);
+}
+
+void PlaneGeometry::updateSize(const glm::vec2& size) {
+    _size = size;
+    updateGeometry();
+}
+
+void PlaneGeometry::updateSize(const float size) {
+    updateSize(glm::vec2(size));
+}
+
+void PlaneGeometry::updateGeometry() {
+    const glm::vec2 size = _size;
+    struct VertexData {
+        GLfloat x;
+        GLfloat y;
+        GLfloat s;
+        GLfloat t;
+    };
+
+    VertexData vertices[] = {
+        { -size.x, -size.y, 0.f, 0.f },
+        {  size.x,  size.y, 1.f, 1.f },
+        { -size.x,  size.y, 0.f, 1.f },
+        { -size.x, -size.y, 0.f, 0.f },
+        {  size.x, -size.y, 1.f, 0.f },
+        {  size.x,  size.y, 1.f, 1.f }
+    };
+
+    glBindVertexArray(_vaoId);
+    glBindBuffer(GL_ARRAY_BUFFER, _vBufferId);
+    glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), &vertices, GL_STATIC_DRAW);
+    glEnableVertexAttribArray(0);
+    glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(VertexData), nullptr);
+    glEnableVertexAttribArray(1);
+    glVertexAttribPointer(
+        1,
+        2,
+        GL_FLOAT,
+        GL_FALSE,
+        sizeof(VertexData),
+        reinterpret_cast<void*>(offsetof(VertexData, s)) // NOLINT
+    );
+}
+
+} // namespace openspace
diff --git a/src/util/progressbar.cpp b/src/util/progressbar.cpp
index 7ff4913801..eb42742c83 100644
--- a/src/util/progressbar.cpp
+++ b/src/util/progressbar.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/resourcesynchronization.cpp b/src/util/resourcesynchronization.cpp
index 0af28f3c18..0e9a61449b 100644
--- a/src/util/resourcesynchronization.cpp
+++ b/src/util/resourcesynchronization.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/screenlog.cpp b/src/util/screenlog.cpp
index 9425298cf9..40e42f679e 100644
--- a/src/util/screenlog.cpp
+++ b/src/util/screenlog.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/sphere.cpp b/src/util/sphere.cpp
index 7c34be9a58..2fc07768ba 100644
--- a/src/util/sphere.cpp
+++ b/src/util/sphere.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/spicemanager.cpp b/src/util/spicemanager.cpp
index 51ed9fdc47..f3c68adc56 100644
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -342,6 +342,23 @@ bool SpiceManager::hasSpkCoverage(const std::string& target, double et) const {
     return false;
 }
 
+std::vector<std::pair<double, double>> SpiceManager::spkCoverage(
+                                                          const std::string& target) const
+{
+    ghoul_assert(!target.empty(), "Empty target");
+
+    const int id = naifId(target);
+    const auto it = _spkIntervals.find(id);
+    if (it != _spkIntervals.end()) {
+        return it->second;
+    }
+    else {
+        std::vector<std::pair<double, double>> emptyList;
+        return emptyList;
+    }
+}
+
+
 bool SpiceManager::hasCkCoverage(const std::string& frame, double et) const {
     ghoul_assert(!frame.empty(), "Empty target");
 
@@ -358,6 +375,74 @@ bool SpiceManager::hasCkCoverage(const std::string& frame, double et) const {
     return false;
 }
 
+std::vector<std::pair<double, double>> SpiceManager::ckCoverage(
+                                                          const std::string& target) const
+{
+    ghoul_assert(!target.empty(), "Empty target");
+
+    int id = naifId(target);
+    const auto it = _ckIntervals.find(id);
+    if (it != _ckIntervals.end()) {
+        return it->second;
+    }
+    else {
+        id *= 1000;
+        const auto it2 = _ckIntervals.find(id);
+        if (it2 != _ckIntervals.end()) {
+            return it2->second;
+        }
+        else {
+            std::vector<std::pair<double, double>> emptyList;
+            return emptyList;
+        }
+    }
+}
+
+std::vector<std::pair<int, std::string>> SpiceManager::spiceBodies(
+                                                                 bool builtInFrames) const
+{
+    std::vector<std::pair<int, std::string>> bodies;
+
+    constexpr const int Frnmln = 33;
+    SPICEINT_CELL(idset, 8192);
+
+    SpiceChar frname[Frnmln];
+
+    for (SpiceInt i = 1; i <= 6; i++) {
+        if (i < 6) {
+            if (builtInFrames) {
+                bltfrm_c(i, &idset);
+            }
+            else {
+                kplfrm_c(i, &idset);
+            }
+        }
+        else {
+            if (builtInFrames) {
+                bltfrm_c(SPICE_FRMTYP_ALL, &idset);
+            }
+            else {
+                kplfrm_c(SPICE_FRMTYP_ALL, &idset);
+            }
+        }
+
+        for (SpiceInt j = 0; j < card_c(&idset); j++) {
+            frmnam_c(
+                (reinterpret_cast<SpiceInt*>(idset.data))[j],
+                Frnmln,
+                frname
+            );
+            bodies.push_back(
+                std::make_pair(
+                    static_cast<long>(reinterpret_cast<SpiceInt*>(idset.data)[j]),
+                    frname
+                )
+            );
+        }
+    }
+    return bodies;
+}
+
 bool SpiceManager::hasValue(int naifId, const std::string& item) const {
     return bodfnd_c(naifId, item.c_str());
 }
@@ -489,6 +574,22 @@ double SpiceManager::ephemerisTimeFromDate(const char* timeString) const {
     return et;
 }
 
+std::string SpiceManager::dateFromEphemerisTime(double ephemerisTime, const char* format)
+{
+    char Buffer[128];
+    std::memset(Buffer, char(0), 128);
+
+    timout_c(ephemerisTime, format, 128, Buffer);
+    if (failed_c()) {
+        throwSpiceError(fmt::format(
+            "Error converting ephemeris time '{}' to date with format '{}'",
+            ephemerisTime, format
+        ));
+    }
+    
+    return std::string(Buffer);
+}
+
 glm::dvec3 SpiceManager::targetPosition(const std::string& target,
                                         const std::string& observer,
                                         const std::string& referenceFrame,
@@ -1250,7 +1351,31 @@ scripting::LuaLibrary SpiceManager::luaLibrary() {
                 "{string, number}",
                 "Unloads the provided SPICE kernel. The name can contain path tokens, "
                 "which are automatically resolved"
+            },
+            {
+                "getSpkCoverage",
+                &luascriptfunctions::spkCoverage,
+                {},
+                "{string [, printValues]}",
+                "Returns a list of SPK coverage intervals for the target."
+            },
+            {
+                "getCkCoverage",
+                & luascriptfunctions::ckCoverage,
+                {},
+                "{string [, printValues]}",
+                "Returns a list of CK coverage intervals for the target."
+            },
+            {
+                "getSpiceBodies",
+                &luascriptfunctions::spiceBodies,
+                {},
+                "{ builtInFrames [, printValues] }",
+                "Returns a list of Spice Bodies loaded into the system. Returns SPICE "
+                "built in frames if builtInFrames. Returns User loaded frames if "
+                "!builtInFrames"
             }
+
         }
     };
 }
diff --git a/src/util/spicemanager_lua.inl b/src/util/spicemanager_lua.inl
index 57e112ecd4..0633be6b09 100644
--- a/src/util/spicemanager_lua.inl
+++ b/src/util/spicemanager_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -23,6 +23,8 @@
  ****************************************************************************************/
 
 #include <ghoul/filesystem/filesystem.h>
+#include <openspace/engine/globals.h>
+#include <ghoul/logging/logmanager.h>
 
 namespace openspace::luascriptfunctions {
 
@@ -103,4 +105,129 @@ int unloadKernel(lua_State* L) {
     return 0;
 }
 
+/**
+ * spiceBodies():
+ * Returns the list of bodies loaded into the spicemanager
+ */
+int spiceBodies(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, { 1,2 }, "lua::getSpiceBodies");
+    bool isBool = (lua_isboolean(L, 1) == 1);
+    const bool buildInBodies = isBool ? ghoul::lua::value<bool>(L, 1) : false;
+
+    isBool = (lua_isboolean(L, 2) == 1);
+    bool printValues = isBool ? ghoul::lua::value<bool>(L, 2) : false;
+    lua_settop(L, 0);
+    std::vector<std::pair<int, std::string>> bodies = SpiceManager::ref().spiceBodies(
+        buildInBodies
+    );
+
+    lua_newtable(L);
+    int number = 1;
+    for (const std::pair<int, std::string>& body : bodies) {
+        lua_newtable(L);
+        ghoul::lua::push(L, 1, body.first);
+        lua_rawset(L, -3);
+        ghoul::lua::push(L, 2, body.second);
+        lua_rawset(L, -3);
+        lua_rawseti(L, -2, number);
+        ++number;
+
+        if (printValues) {
+            LINFO(fmt::format("Body id '{}' and name: {}", body.first, body.second));
+        }
+    }
+
+    return 1;
+}
+
+//internal function for getSpk and getCk coverages
+void buildLuaCoverageStack(lua_State* L,
+                           const std::vector<std::pair<double, double>>& coverage,
+                           bool printValues)
+{
+    lua_settop(L, 0);
+    lua_newtable(L);
+    int number = 1;
+    for (const std::pair<double, double>& window : coverage) {
+        std::string start = SpiceManager::ref().dateFromEphemerisTime(window.first);
+        std::string end = SpiceManager::ref().dateFromEphemerisTime(window.second);
+
+        if (printValues) {
+            LINFO(fmt::format(
+                "Coverage start {} and end: {}",
+                SpiceManager::ref().dateFromEphemerisTime(window.first),
+                SpiceManager::ref().dateFromEphemerisTime(window.second)
+            ));
+        }
+
+        lua_newtable(L);
+        ghoul::lua::push(L, 1, start);
+        lua_rawset(L, -3);
+        ghoul::lua::push(L, 2, end);
+        lua_rawset(L, -3);
+        lua_rawseti(L, -2, number);
+        ++number;
+    }
+}
+
+/**
+ * getSpkCoverage({string, bool(optional)}):
+ * Returns the spk coverage for given body
+ */
+int spkCoverage(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, { 1, 2 }, "lua::getSpkCoverage");
+    const bool isString = (lua_isstring(L, 1) == 1);
+    const bool isBool = (lua_isboolean(L, 2) == 1);
+
+    if (!isString) {
+        LERRORC(
+            "getSpkCoverage",
+            fmt::format(
+                "{}: Expected argument of type 'string'",
+                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 argument = ghoul::lua::value<std::string>(L, 1);
+
+    bool printValues = isBool ? ghoul::lua::value<bool>(L, 2) : false;
+    buildLuaCoverageStack(L, SpiceManager::ref().spkCoverage(argument), printValues);
+
+    return 1;
+}
+
+/**
+ * getCkCoverage({string, bool(optional)}):
+ * Returns the spk coverage for given body
+ */
+int ckCoverage(lua_State* L) {
+    ghoul::lua::checkArgumentsAndThrow(L, { 1, 2 }, "lua::getCkCoverage");
+
+    const bool isString = (lua_isstring(L, 1) == 1);
+    const bool isBool = (lua_isboolean(L, 2) == 1);
+
+    if (!isString) {
+        LERRORC(
+            "getCkCoverage",
+            fmt::format(
+                "{}: Expected argument of type 'string'",
+                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 argument = ghoul::lua::value<std::string>(L, 1);
+    bool printValues = isBool ? ghoul::lua::value<bool>(L, 2) : false;
+    buildLuaCoverageStack(L, SpiceManager::ref().ckCoverage(argument), printValues);
+
+    return 1;
+}
+
 } // namespace openspace::luascriptfunctions
diff --git a/src/util/syncbuffer.cpp b/src/util/syncbuffer.cpp
index edb19f7123..136af42c82 100644
--- a/src/util/syncbuffer.cpp
+++ b/src/util/syncbuffer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -42,7 +42,7 @@ void SyncBuffer::encode(const std::string& s) {
     int32_t anticpatedBufferSize = static_cast<int32_t>(
         _encodeOffset + (sizeof(char) * s.size()) + sizeof(int32_t)
     );
-    if (anticpatedBufferSize >= _n) {
+    if (anticpatedBufferSize >= static_cast<int32_t>(_n)) {
         _dataStream.resize(anticpatedBufferSize);
     }
 
@@ -79,6 +79,34 @@ void SyncBuffer::decode(std::string& s) {
     s = decode();
 }
 
+void SyncBuffer::decode(glm::quat& value) {
+    const size_t size = sizeof(glm::quat);
+    ghoul_assert(_decodeOffset + size < _n, "");
+    std::memcpy(glm::value_ptr(value), _dataStream.data() + _decodeOffset, size);
+    _decodeOffset += size;
+}
+
+void SyncBuffer::decode(glm::dquat& value) {
+    const size_t size = sizeof(glm::dquat);
+    ghoul_assert(_decodeOffset + size < _n, "");
+    std::memcpy(glm::value_ptr(value), _dataStream.data() + _decodeOffset, size);
+    _decodeOffset += size;
+}
+
+void SyncBuffer::decode(glm::vec3& value) {
+    const size_t size = sizeof(glm::vec3);
+    ghoul_assert(_decodeOffset + size < _n, "");
+    std::memcpy(glm::value_ptr(value), _dataStream.data() + _decodeOffset, size);
+    _decodeOffset += size;
+}
+
+void SyncBuffer::decode(glm::dvec3& value) {
+    const size_t size = sizeof(glm::dvec3);
+    ghoul_assert(_decodeOffset + size < _n, "");
+    std::memcpy(glm::value_ptr(value), _dataStream.data() + _decodeOffset, size);
+    _decodeOffset += size;
+}
+
 void SyncBuffer::setData(std::vector<std::byte> data) {
     _dataStream = std::move(data);
 }
diff --git a/src/util/synchronizationwatcher.cpp b/src/util/synchronizationwatcher.cpp
index e176b7af8c..5c14833970 100644
--- a/src/util/synchronizationwatcher.cpp
+++ b/src/util/synchronizationwatcher.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/task.cpp b/src/util/task.cpp
index b6de0c29a7..23dac7fc42 100644
--- a/src/util/task.cpp
+++ b/src/util/task.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/taskloader.cpp b/src/util/taskloader.cpp
index 75778d07d3..32e388b0d5 100644
--- a/src/util/taskloader.cpp
+++ b/src/util/taskloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -44,16 +44,15 @@ std::vector<std::unique_ptr<Task>> TaskLoader::tasksFromDictionary(
 {
     std::vector<std::unique_ptr<Task>> tasks;
 
-    const std::vector<std::string>& keys = tasksDictionary.keys();
-    for (const std::string& key : keys) {
-        std::string taskName;
-        ghoul::Dictionary subTask;
-        if (tasksDictionary.getValue(key, taskName)) {
+    for (std::string_view key : tasksDictionary.keys()) {
+        if (tasksDictionary.hasValue<std::string>(key)) {
+            std::string taskName = tasksDictionary.value<std::string>(key);
             const std::string path = taskName + ".task";
             std::vector<std::unique_ptr<Task>> subTasks = tasksFromFile(path);
             std::move(subTasks.begin(), subTasks.end(), std::back_inserter(tasks));
         }
-        else if (tasksDictionary.getValue(key, subTask)) {
+        else if (tasksDictionary.hasValue<ghoul::Dictionary>(key)) {
+            ghoul::Dictionary subTask = tasksDictionary.value<ghoul::Dictionary>(key);
             const std::string& taskType = subTask.value<std::string>("Type");
             std::unique_ptr<Task> task = Task::createFromDictionary(subTask);
             if (!task) {
diff --git a/src/util/threadpool.cpp b/src/util/threadpool.cpp
index 0092daa7e5..d61485f6f9 100644
--- a/src/util/threadpool.cpp
+++ b/src/util/threadpool.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/time.cpp b/src/util/time.cpp
index a448438b19..bd886aa9aa 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -97,8 +97,7 @@ std::string_view Time::UTC() const {
     std::memset(b, 0, 32);
 
     SpiceManager::ref().dateFromEphemerisTime(_time, b, 32, Format);
-
-    return std::string_view(b, 32);
+    return std::string_view(b);
 }
 
 std::string_view Time::ISO8601() const {
diff --git a/src/util/time_lua.inl b/src/util/time_lua.inl
index fe5cc9fadd..95ebcd4d11 100644
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -86,13 +86,15 @@ int time_setDeltaTimeSteps(lua_State* L) {
 
     for (size_t i = 1; i <= nItems; ++i) {
         std::string key = std::to_string(i);
-        if (dict.hasKeyAndValue<double>(key)) {
+        if (dict.hasValue<double>(key)) {
             const double time = dict.value<double>(key);
             inputDeltaTimes.push_back(time);
         }
         else {
-            const char* msg = lua_pushfstring(L,
-                "Error setting delta times. Expected list of numbers.");
+            const char* msg = lua_pushfstring(
+                L,
+                "Error setting delta times. Expected list of numbers"
+            );
             return ghoul::lua::luaError(L, fmt::format("bad argument ({})", msg));
         }
     }
@@ -108,7 +110,7 @@ int time_setDeltaTimeSteps(lua_State* L) {
 /**
  * \ingroup LuaScripts
 * setNextDeltaTimeStep():
-* Immediately set the simulation speed to the first delta time step in the list that is 
+* Immediately set the simulation speed to the first delta time step in the list that is
 * larger than the current choice of simulation speed, if any.
  */
 int time_setNextDeltaTimeStep(lua_State* L) {
@@ -147,12 +149,12 @@ int time_setPreviousDeltaTimeStep(lua_State* L) {
  */
 int time_interpolateNextDeltaTimeStep(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(
-        L, 
-        { 0, 1 }, 
+        L,
+        { 0, 1 },
         "lua::time_interpolateNextDeltaTimeStep"
     );
 
-    double interpolationDuration = 
+    double interpolationDuration =
         global::timeManager->defaultDeltaTimeInterpolationDuration();
 
     const int nArguments = lua_gettop(L);
@@ -181,19 +183,19 @@ int time_interpolateNextDeltaTimeStep(lua_State* L) {
 /**
  * \ingroup LuaScripts
 * interpolatePreviousDeltaTimeStep([interpolationDuration]):
-* Interpolate the simulation speed to the previous delta time step in the list. If an 
+* Interpolate the simulation speed to the previous delta time step in the list. If an
 * input value is given, the interpolation is done over the specified number of seconds.
 * If interpolationDuration is not provided, the interpolation time will be based on the
 * `defaultDeltaTimeInterpolationDuration` property of the TimeManager.
  */
 int time_interpolatePreviousDeltaTimeStep(lua_State* L) {
     ghoul::lua::checkArgumentsAndThrow(
-        L, 
-        { 0, 1 }, 
+        L,
+        { 0, 1 },
         "lua::time_interpolatePreviousDeltaTimeStep"
     );
 
-    double interpolationDuration = 
+    double interpolationDuration =
         global::timeManager->defaultDeltaTimeInterpolationDuration();
 
     const int nArguments = lua_gettop(L);
@@ -613,7 +615,7 @@ int time_interpolateTimeRelative(lua_State* L) {
         return ghoul::lua::luaError(L, fmt::format("bad argument #1 ({})", msg));
     }
 
-    if (lua_gettop(L) == 1 && isNumber) {
+    if (lua_gettop(L) == 1) {
         double delta = lua_tonumber(L, 1);
         global::timeManager->interpolateTimeRelative(
             delta,
diff --git a/src/util/timeconversion.cpp b/src/util/timeconversion.cpp
index 79dc4dd218..76873cf8b4 100644
--- a/src/util/timeconversion.cpp
+++ b/src/util/timeconversion.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/timeline.cpp b/src/util/timeline.cpp
index b15bd2b10f..1ba5b61649 100644
--- a/src/util/timeline.cpp
+++ b/src/util/timeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/timemanager.cpp b/src/util/timemanager.cpp
index d9a9b526c8..52189d09d7 100644
--- a/src/util/timemanager.cpp
+++ b/src/util/timemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -146,7 +146,7 @@ void TimeManager::preSynchronization(double dt) {
 
     if (newTime != _lastTime) {
         ZoneScopedN("newTime != _lastTime")
-        using K = const CallbackHandle;
+        using K = CallbackHandle;
         using V = TimeChangeCallback;
         for (const std::pair<K, V>& it : _timeChangeCallbacks) {
             ZoneScopedN("tcc")
@@ -158,7 +158,7 @@ void TimeManager::preSynchronization(double dt) {
         _targetDeltaTime != _lastTargetDeltaTime)
     {
         ZoneScopedN("delta time changed")
-        using K = const CallbackHandle;
+        using K = CallbackHandle;
         using V = TimeChangeCallback;
         for (const std::pair<K, V>& it : _deltaTimeChangeCallbacks) {
             ZoneScopedN("dtcc")
@@ -166,7 +166,7 @@ void TimeManager::preSynchronization(double dt) {
         }
     }
     if (_deltaTimeStepsChanged) {
-        using K = const CallbackHandle;
+        using K = CallbackHandle;
         using V = TimeChangeCallback;
         for (const std::pair<K, V>& it : _deltaTimeStepsChangeCallbacks) {
             it.second();
@@ -174,7 +174,7 @@ void TimeManager::preSynchronization(double dt) {
     }
     if (_timelineChanged) {
         ZoneScopedN("timeline changed")
-        using K = const CallbackHandle;
+        using K = CallbackHandle;
         using V = TimeChangeCallback;
         for (const std::pair<K, V>& it : _timelineChangeCallbacks) {
             ZoneScopedN("tlcc")
@@ -254,7 +254,7 @@ void TimeManager::progressTime(double dt) {
         _integrateFromTime.data().setTime(_timeNextFrame.j2000Seconds());
         _shouldSetTime = false;
 
-        using K = const CallbackHandle;
+        using K = CallbackHandle;
         using V = TimeChangeCallback;
         for (const std::pair<K, V>& it : _timeJumpCallbacks) {
             it.second();
@@ -400,18 +400,20 @@ void TimeManager::setDeltaTime(double deltaTime) {
 }
 
 void TimeManager::setDeltaTimeSteps(std::vector<double> deltaTimes) {
+    // Add negative versions
     std::vector<double> negatives;
     negatives.reserve(deltaTimes.size());
     std::transform(
         deltaTimes.begin(),
         deltaTimes.end(),
         std::back_inserter(negatives),
-        [](double d) { return -d; }
+        std::negate<double>()
     );
 
     deltaTimes.reserve(2 * deltaTimes.size());
     deltaTimes.insert(deltaTimes.end(), negatives.begin(), negatives.end());
 
+    // Sort and remove duplicates
     std::sort(deltaTimes.begin(), deltaTimes.end());
     deltaTimes.erase(std::unique(deltaTimes.begin(), deltaTimes.end()), deltaTimes.end());
 
@@ -449,10 +451,6 @@ void TimeManager::addDeltaTimesKeybindings() {
         [](double value) { return value >= 0.0; }
     );
 
-    const int nKeys = static_cast<int>(Keys.size());
-    const int nSteps = static_cast<int>(steps.size());
-    const int maxIterations = (nSteps >= nKeys) ? nKeys : nSteps;
-
     auto addDeltaTimeKeybind = [this](Key key, KeyModifier mod, double step) {
         const std::string s = fmt::format("{:.0f}", step);
         global::keybindingManager->bindKeyLocal(
@@ -468,37 +466,36 @@ void TimeManager::addDeltaTimesKeybindings() {
         _deltaTimeStepKeybindings.push_back(KeyWithModifier{ key, mod });
     };
 
+    const int nKeys = static_cast<int>(Keys.size());
+    const int nSteps = static_cast<int>(steps.size());
+
     // For each key, add upp to three keybinds (no modifier, then SHIFT and then CTRL),
     // plus inverted version of each time step one using the ALT modifier
-    for (int i = 0; i < maxIterations; ++i) {
-        const Key key = Keys[i];
-        addDeltaTimeKeybind(key, KeyModifier::NoModifier, steps[i]);
-        addDeltaTimeKeybind(key, KeyModifier::Alt, -steps[i]);
+    for (int i = 0; i < nSteps; ++i) {
+        const Key key = Keys[i % nKeys];
+        const double deltaTimeStep = steps[i];
 
-        if (nSteps > nKeys) {
-            const int index = nKeys + i;
-            addDeltaTimeKeybind(key, KeyModifier::Shift, steps[index]);
-
-            KeyModifier mod = KeyModifier::Shift | KeyModifier::Alt;
-            addDeltaTimeKeybind(key, mod, -steps[index]);
+        KeyModifier modifier = KeyModifier::NoModifier;
+        if (i > nKeys - 1) {
+            modifier = KeyModifier::Shift;
+        }
+        else if (i > 2 * nKeys - 1) {
+            modifier = KeyModifier::Control;
         }
 
-        if (nSteps > 2 * nKeys) {
-            const int index = 2 * nKeys + i;
-            addDeltaTimeKeybind(key, KeyModifier::Control, steps[index]);
+        KeyModifier negativeModifier = modifier | KeyModifier::Alt;
 
-            KeyModifier mod = KeyModifier::Control | KeyModifier::Alt;
-            addDeltaTimeKeybind(key, mod, -steps[index]);
-        }
+        addDeltaTimeKeybind(key, modifier, deltaTimeStep);
+        addDeltaTimeKeybind(key, negativeModifier, -deltaTimeStep);
     }
 
-    LINFO("Added keybindings for specified delta time steps.");
+    LINFO("Added keybindings for specified delta time steps");
     const int maxKeyBinds = 3 * nKeys;
     if (nSteps > maxKeyBinds) {
         LWARNING(fmt::format(
             "Error settings delta time keys: Too many delta times, so not all could be "
             "mapped to a key. Total: {} steps, which is {} more than the number of "
-            "available keybindings.",
+            "available keybindings",
             nSteps, nSteps - maxKeyBinds
         ));
     }
diff --git a/src/util/timerange.cpp b/src/util/timerange.cpp
index 537181a19f..443cc2eca9 100644
--- a/src/util/timerange.cpp
+++ b/src/util/timerange.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -73,13 +73,9 @@ TimeRange::TimeRange(const ghoul::Dictionary& dict) {
 bool TimeRange::initializeFromDictionary(const ghoul::Dictionary& dict,
                                          TimeRange& timeRange)
 {
-    std::string startTimeStr;
-    std::string endTimeStr;
-
-    bool success = true;
-    success &= dict.getValue(KeyStart, startTimeStr);
-    success &= dict.getValue(KeyEnd, endTimeStr);
-    if (success) {
+    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);
diff --git a/src/util/touch.cpp b/src/util/touch.cpp
index 0c3d7ce7c1..a49d7dee51 100644
--- a/src/util/touch.cpp
+++ b/src/util/touch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,13 +30,13 @@
 
 namespace openspace {
 
-TouchInput::TouchInput(size_t touchDeviceId, size_t fingerId, float x, float y,
-                       double timestamp)
-    : touchDeviceId(touchDeviceId)
-    , fingerId(fingerId)
-    , x(x)
-    , y(y)
-    , timestamp(timestamp)
+TouchInput::TouchInput(size_t touchDeviceId_, size_t fingerId_, float x_, float y_,
+                       double timestamp_)
+    : touchDeviceId(touchDeviceId_)
+    , fingerId(fingerId_)
+    , x(x_)
+    , y(y_)
+    , timestamp(timestamp_)
 {}
 
 glm::vec2 TouchInput::screenCoordinates(glm::vec2 resolution) const {
diff --git a/src/util/transformationmanager.cpp b/src/util/transformationmanager.cpp
index 08e14675ae..76adebbc87 100644
--- a/src/util/transformationmanager.cpp
+++ b/src/util/transformationmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/src/util/versionchecker.cpp b/src/util/versionchecker.cpp
index aabec2be59..6eddfd9644 100644
--- a/src/util/versionchecker.cpp
+++ b/src/util/versionchecker.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/support/cmake/application_definition.cmake b/support/cmake/application_definition.cmake
index 1f6180e0db..83f79f69a1 100644
--- a/support/cmake/application_definition.cmake
+++ b/support/cmake/application_definition.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -25,18 +25,40 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
 
 function (create_new_application application_name)
-    add_executable(${application_name} MACOSX_BUNDLE ${ARGN})
-    set_openspace_compile_settings(${application_name})
+  add_executable(${application_name} MACOSX_BUNDLE ${ARGN})
+  set_openspace_compile_settings(${application_name})
 
-    if (WIN32)
-        get_external_library_dependencies(ext_lib)
-        ghl_copy_files(
-            ${application_name}
-            "${CURL_ROOT_DIR}/lib/libcurl.dll"
-            "${CURL_ROOT_DIR}/lib/libeay32.dll"
-            "${CURL_ROOT_DIR}/lib/ssleay32.dll"
-            ${ext_lib}
-        )
-        ghl_copy_shared_libraries(${application_name} ${OPENSPACE_EXT_DIR}/ghoul)
-    endif ()
+  # We currently can't reuse the precompiled header because that one has the Kameleon
+  # definition stuck into it
+  #target_precompile_headers(${library_name} REUSE_FROM openspace-core)
+  target_precompile_headers(${application_name} PRIVATE
+    [["ghoul/fmt.h"]]
+    [["ghoul/glm.h"]]
+    [["ghoul/misc/assert.h"]]
+    [["ghoul/misc/boolean.h"]]
+    [["ghoul/misc/exception.h"]]
+    [["ghoul/misc/invariants.h"]]
+    [["ghoul/misc/profiling.h"]]
+    <algorithm>
+    <array>
+    <map>
+    <memory>
+    <string>
+    <utility>
+    <vector>
+  )
+
+  if (WIN32)
+    get_external_library_dependencies(ext_lib)
+    ghl_copy_files(
+      ${application_name}
+      "${OPENSPACE_BASE_DIR}/ext/curl/lib/libcurl.dll"
+      "${OPENSPACE_BASE_DIR}/ext/curl/lib/libeay32.dll"
+      "${OPENSPACE_BASE_DIR}/ext/curl/lib/ssleay32.dll"
+      ${ext_lib}
+    )
+    ghl_copy_shared_libraries(${application_name} ${OPENSPACE_BASE_DIR}/ext/ghoul)
+  endif ()
+
+  target_link_libraries(${application_name} PUBLIC openspace-module-base)
 endfunction ()
diff --git a/support/cmake/global_variables.cmake b/support/cmake/global_variables.cmake
index a5bb7fc463..01ddf71f47 100644
--- a/support/cmake/global_variables.cmake
+++ b/support/cmake/global_variables.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
diff --git a/support/cmake/handle_modules.cmake b/support/cmake/handle_modules.cmake
deleted file mode 100644
index b6258833f8..0000000000
--- a/support/cmake/handle_modules.cmake
+++ /dev/null
@@ -1,369 +0,0 @@
-##########################################################################################
-#                                                                                        #
-# OpenSpace                                                                              #
-#                                                                                        #
-# Copyright (c) 2014-2020                                                                #
-#                                                                                        #
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
-# software and associated documentation files (the "Software"), to deal in the Software  #
-# without restriction, including without limitation the rights to use, copy, modify,     #
-# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to     #
-# permit persons to whom the Software is furnished to do so, subject to the following    #
-# conditions:                                                                            #
-#                                                                                        #
-# The above copyright notice and this permission notice shall be included in all copies  #
-# or substantial portions of the Software.                                               #
-#                                                                                        #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,    #
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A          #
-# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT     #
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF   #
-# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE   #
-# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
-##########################################################################################
-
-include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/message_macros.cmake)
-
-function (handle_modules internal_module_path external_modules_paths)
-    #
-    # Step 1:  Get a list of all modules
-    #
-    # First get all the internal module
-    get_individual_modules(${internal_module_path} all_module_names all_module_paths)
-
-    # Then get all external modules
-    foreach (path ${external_modules_paths})
-        get_individual_modules(${path} names paths)
-
-        foreach (n ${names})
-            if (${n} IN_LIST all_module_names)
-                message(FATAL_ERROR "Module name ${n} is not unique among the external directories")
-            endif ()
-        endforeach ()
-
-        set(all_module_names ${all_module_names} ${names})
-        set(all_module_paths ${all_module_paths} ${paths})
-    endforeach ()
-
-    list(LENGTH all_module_names all_module_names_count)
-    math(EXPR all_module_names_count "${all_module_names_count} - 1")
-
-    #
-    # Step 2:  Create options for all modules with correct default values
-    #
-
-    set(enabled_module_names "")
-    set(enabled_module_paths "")
-    foreach(val RANGE ${all_module_names_count})
-        list(GET all_module_names ${val} name)
-        list(GET all_module_paths ${val} path)
-
-        get_module_attribute_supported(${path} is_module_supported)
-        if (NOT ${is_module_supported})
-            message(STATUS "Skipping module ${name} (${path}) as it is not supported on this machine")
-            continue()
-        endif ()
-
-        get_module_attribute_default(${path} is_default_module)
-        create_option_name(${name} optionName)
-        option(${optionName} "Build ${path} Module" ${is_default_module})
-
-        if (${optionName})
-            list(APPEND enabled_module_names ${name})
-            list(APPEND enabled_module_paths ${path})
-        endif ()
-    endforeach ()
-
-    #
-    # Step 3:  For each module that is default or enabled by the user, get the dependencies
-    #
-    set(dependencies "")
-    list(LENGTH enabled_module_names enabled_module_count)
-    if (${enabled_module_count} EQUAL 0)
-        message(STATUS "No modules selected")
-        return()
-    endif ()
-    math(EXPR enabled_module_count "${enabled_module_count} - 1")
-    foreach (val RANGE ${enabled_module_count})
-        list(GET enabled_module_names ${val} name)
-        list(GET enabled_module_paths ${val} path)
-
-        get_recursive_dependencies(
-            ${name} ${path}
-            "${all_module_names}" "${all_module_paths}"
-            deps
-        )
-
-        set(dependencies ${dependencies} ${deps})
-    endforeach()
-
-    # We can remove the duplicates here.  We constructed the list such that nested 
-    # dependencies are order left to right.  REMOVE_DUPLICATES will keep the left most
-    # value in the case of duplicates, so that will still work
-    list(REMOVE_DUPLICATES dependencies)
-
-    #
-    # Step 4:  Check each dependency and set it, if necessary
-    #
-    foreach (dep ${dependencies})
-        create_option_name(${dep} optionName)
-        if (NOT ${optionName})
-            set(${optionName} ON CACHE BOOL "Build ${dep} Module" FORCE)
-            message(STATUS "Due to dependencies, the '${dep}' was enabled")
-
-            find_path_for_module(${dep} "${all_module_names}" "${all_module_paths}" path)
-            list(APPEND enabled_module_names ${dep})
-            list(APPEND enabled_module_paths ${path})
-        endif ()
-    endforeach ()
-
-    # Print all the enabled modules
-    message(STATUS "Enabled modules:")
-    list(LENGTH enabled_module_names enabled_module_count)
-    math(EXPR enabled_module_count "${enabled_module_count} - 1")
-    foreach (val RANGE ${enabled_module_count})
-        list(GET enabled_module_names ${val} name)
-        list(GET enabled_module_paths ${val} path)
-
-        message(STATUS "\t${name}  (${path})")
-    endforeach ()
-
-    #
-    # Step 5:  Add the subdirectories of all enabled modules
-    #
-    set(module_class_names "")
-    set(module_external_libraries "")
-    foreach (val RANGE ${enabled_module_count})
-        list(GET enabled_module_names ${val} name)
-        list(GET enabled_module_paths ${val} path)
-
-        create_library_name(${name} library_name)
-        begin_header("Module ${name} (${library_name})")
-        add_subdirectory(${path})
-        end_header("End: Module ${name}")
-        message(STATUS "")
-
-        # Only link openspace-core against the library if it has been set STATIC
-        get_target_property(library_type ${library_name} TYPE)
-        if (NOT ${library_type} STREQUAL "SHARED_LIBRARY")
-            target_link_libraries(openspace-core PUBLIC ${library_name})
-        endif()
-
-        create_define_name(${name} define_name)
-        target_compile_definitions(openspace-core PUBLIC "${define_name}")
-
-        get_property(class_name GLOBAL PROPERTY CurrentModuleClassName)
-        list(APPEND module_class_names ${class_name})
-
-        get_property(ext_lib GLOBAL PROPERTY CurrentModuleExternalLibraries)
-        list(APPEND module_external_libraries ${ext_lib})
-    endforeach ()
-    
-    list(REMOVE_DUPLICATES module_external_libraries)
-    add_external_library_dependencies("${module_external_libraries}")
-
-    #
-    # Step 6:  Create the moduleregistration.h file with the header file paths, class
-    #          names and the external module paths.
-    #          The class list needs to be topologically sorted, based on
-    #          the dependency graph, in order to guarantee that modules are
-    #          initialized after their dependencies.
-    #
-
-    # We generate a list of the names of the enabled modules taking
-    # the topologically sorted dependencies and adding the rest of the modules.
-    # REMOVE_DUPLICATES will keep the left most value in the case of duplicates
-    set(topologically_sorted ${dependencies} ${enabled_module_names})
-    list(REMOVE_DUPLICATES topologically_sorted)
-
-    set(MODULE_HEADERS "")
-    set(MODULE_CLASSES "")
-    set(MODULE_PATHS "")
-
-    foreach (key RANGE ${enabled_module_count})
-        list(GET topologically_sorted ${key} name)
-        list(FIND enabled_module_names ${name} val)
-
-        list(GET enabled_module_paths ${val} path)
-        list(GET module_class_names ${val} class_name)
-
-        string(TOUPPER ${name} module_upper)
-        string(TOLOWER ${name} module_lower)
-
-        create_module_header_filepath(${name} ${path} header_filepath)
-
-        list(APPEND MODULE_HEADERS "#include <${header_filepath}>\n")
-        list(APPEND MODULE_CLASSES "        new ${class_name},\n")
-    endforeach ()
-
-    get_unique_include_paths(
-        "${enabled_module_paths}"
-        "${internal_module_path}"
-        module_paths
-    )
-
-    foreach (path ${module_paths})
-        list(APPEND MODULE_PATHS "    \"${path}\",\n")
-        # The module path should include the 'modules' directory, which is removed for the
-        # include path to make all of the includes look the same
-        list(APPEND MODULE_PATHS "    \"${path}/modules\",\n")
-        target_include_directories(openspace-core PUBLIC ${path})
-    endforeach ()
-
-    if (NOT "${MODULE_HEADERS}" STREQUAL "")
-        string(REPLACE ";" "" MODULE_HEADERS ${MODULE_HEADERS})
-    endif ()
-
-    if (NOT "${MODULE_CLASSES}" STREQUAL "")
-        string(REPLACE ";" "" MODULE_CLASSES ${MODULE_CLASSES})
-    endif ()
-
-    if (NOT "${MODULE_PATHS}" STREQUAL "")
-        string(REPLACE ";" "" MODULE_PATHS ${MODULE_PATHS})
-        string(REPLACE "\\" "/" MODULE_PATHS ${MODULE_PATHS})
-    endif ()
-
-    configure_file(
-        ${OPENSPACE_CMAKE_EXT_DIR}/module_registration.template
-        ${CMAKE_BINARY_DIR}/_generated/include/openspace/moduleregistration.h
-    )
-
-    configure_file(
-        ${OPENSPACE_CMAKE_EXT_DIR}/module_path.template
-        ${CMAKE_BINARY_DIR}/_generated/include/openspace/modulepath.h
-    )
-endfunction()
-
-
-# This function takes a list of module paths and returns the list of include paths that
-# need to be added to the moduleregistration file. Each module files parent directory is
-# considered, but with the internal module path ignored
-function (get_unique_include_paths module_paths internal_module_path result)
-    set(res "")
-    foreach (p ${all_module_paths})
-        get_filename_component(base_dir_parent "${p}/.." ABSOLUTE)
-        get_filename_component(base_dir_grandparent "${p}/../.." ABSOLUTE)
-        get_filename_component(int_dir "${internal_module_path}/.." ABSOLUTE)
-        if (NOT ${base_dir_grandparent} STREQUAL ${int_dir})
-            # We need to add both parent and grantparent directory:
-            # The grandparent has to be added if we have an external module in the path
-            # x/modules/name and we need to add 'x' to the module search path such that
-            # people can write #include <modules/name/namemodule.h>
-            #
-            # The parent needs to be included for modules in subdirectories of the form
-            # openspace/modules/dir/name such that 'dir' is included in the search path
-            list(APPEND res ${base_dir_parent})
-            list(APPEND res ${base_dir_grandparent})
-        endif ()
-    endforeach ()
-
-    list(REMOVE_DUPLICATES res)
-    set(${result} ${res} PARENT_SCOPE)
-endfunction ()
-
-
-# Returns whether the module located at 'path' is a default module or not
-function (get_module_attribute_default path result)
-    set(${result} OFF PARENT_SCOPE)
-    if (EXISTS "${path}/include.cmake")
-        unset(DEFAULT_MODULE)
-        include(${path}/include.cmake)
-        if (DEFINED DEFAULT_MODULE)
-            set(${result} ${DEFAULT_MODULE} PARENT_SCOPE)
-        endif ()
-    endif ()
-endfunction()
-
-
-# Returns the list of dependencies of the module located at 'path'
-function (get_module_attribute_dependencies path result)
-    set(${result} "" PARENT_SCOPE)
-    if (EXISTS "${path}/include.cmake")
-        unset(OPENSPACE_DEPENDENCIES)
-        include(${path}/${dir}/include.cmake)
-        if (DEFINED OPENSPACE_DEPENDENCIES)
-            set(${result} ${OPENSPACE_DEPENDENCIES} PARENT_SCOPE)
-        endif ()
-    endif ()
-endfunction()
-
-# Returns the state whether the module located at 'path' is supported on this machine
-function (get_module_attribute_supported path result)
-    set(${result} ON PARENT_SCOPE)
-    if (EXISTS "${path}/include.cmake")
-        unset(SUPPORTED)
-        include(${path}/${dir}/include.cmake)
-        if (DEFINED SUPPORTED)
-            set(${result} ${SUPPORTED} PARENT_SCOPE)
-        endif ()
-    endif ()
-endfunction()
-
-
-# Returns the path for the 'module_name'. If the module has not been seen before by 
-# get_individual_modules, an empty string is returned
-function (find_path_for_module module_name module_names module_paths result)
-    list(FIND module_names ${module_name} i)
-    if (i EQUAL -1)
-        # Did not find the name in the list
-        set(${result} "" PARENT_SCOPE)
-    else ()
-        # We found the name in the list, so the path is at the same location
-        list(GET module_paths ${i} path)
-        set(${result} ${path} PARENT_SCOPE)
-    endif ()
-endfunction ()
-
-
-# Gets the names of the dependencies of 'module_name' recursively and returns them in
-# 'result'.  For a dependency chain of a -> b -> c   get_recursive_depdencies(a) will
-# return "b,c"
-function (get_recursive_dependencies module_name module_path module_names module_paths result)
-    set(result_aggregate "")
-    get_module_attribute_dependencies(${module_path} deps)
-    if (deps)
-        foreach (name ${deps})
-            find_path_for_module(${name} "${module_names}" "${module_paths}" path)
-            if (path)
-                get_recursive_dependencies(
-                    ${name} ${path}
-                    "${module_names}" "${module_paths}"
-                    res
-                )
-                # 1. We add "base" to the list of dependencies as we always want it 
-                # 2. We add dependencies in this order such that when we later traverse
-                #    this list, we automatically get them in the correct order (meaning
-                #    that we include a dependency first)
-                set(result_aggregate ${result_aggregate} "base" ${res} ${name})
-            else ()
-                message(FATAL_ERROR "Could not find dependency ${name} for module ${module_name}")
-            endif ()
-        endforeach ()
-    endif ()
-    set(${result} ${result_aggregate} PARENT_SCOPE)
-endfunction()
-
-
-# Returns a list of all modules contained in the folder 'path'
-function (get_individual_modules path module_names module_paths)
-    file(GLOB moduleDirs RELATIVE ${path} ${path}/*)
-
-    set(names "")
-    set(paths "")
-    foreach (dir ${moduleDirs})
-        if (EXISTS "${path}/${dir}/CMakeLists.txt")
-            list(APPEND names ${dir})
-            list(APPEND paths ${path}/${dir})
-        else ()
-            # The CMakeLists.txt does not exist, so it might be a group of subdirectories
-            get_individual_modules(${path}/${dir} _mod_names _mod_paths)
-            list(APPEND names ${_mod_names})
-            list(APPEND paths ${_mod_paths})
-            # message(STATUS "Skipping ${dir} as ${dir}/CMakeLists.txt does not exist")
-        endif ()
-    endforeach ()
-
-    set(${module_names} ${names} PARENT_SCOPE)
-    set(${module_paths} ${paths} PARENT_SCOPE)
-endfunction ()
diff --git a/support/cmake/module_common.cmake b/support/cmake/module_common.cmake
index 7ca5c2f94d..c1f06427c2 100644
--- a/support/cmake/module_common.cmake
+++ b/support/cmake/module_common.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -23,29 +23,29 @@
 ##########################################################################################
 
 function (create_library_name module_name library_name)
-    string(TOLOWER ${module_name} module_name)
-    set(${library_name} "openspace-module-${module_name}" PARENT_SCOPE)
+  string(TOLOWER ${module_name} module_name)
+  set(${library_name} "openspace-module-${module_name}" PARENT_SCOPE)
 endfunction ()
 
 function (create_option_name module_name option_name)
-    string(TOUPPER ${module_name} module_name)
-    set(${option_name} "OPENSPACE_MODULE_${module_name}" PARENT_SCOPE)
+  string(TOUPPER ${module_name} module_name)
+  set(${option_name} "OPENSPACE_MODULE_${module_name}" PARENT_SCOPE)
 endfunction ()
 
 function (create_define_name module_name define_name)
-    string(TOUPPER ${module_name} module_name)
-    set(${define_name} "OPENSPACE_MODULE_${module_name}_ENABLED" PARENT_SCOPE)
+  string(TOUPPER ${module_name} module_name)
+  set(${define_name} "OPENSPACE_MODULE_${module_name}_ENABLED" PARENT_SCOPE)
 endfunction ()
 
 function (create_module_header_filepath module_name module_path header_filepath)
-    string(TOLOWER ${module_name} module_name)
-    string(REPLACE "${OPENSPACE_BASE_DIR}/" "" module_path ${module_path})
-    set(header_filepath "${module_path}/${module_name}module.h" PARENT_SCOPE)
+  string(TOLOWER ${module_name} module_name)
+  string(REPLACE "${OPENSPACE_BASE_DIR}/" "" module_path ${module_path})
+  set(header_filepath "${module_path}/${module_name}module.h" PARENT_SCOPE)
 endfunction ()
 
 function (create_module_class_name module_name module_class_name)
-    # Capitalize the first character
-    string(SUBSTRING ${module_name} 0 1 FIRST_LETTER)
-    string(TOUPPER ${FIRST_LETTER} FIRST_LETTER)
-    string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" module_name "${module_name}")
+  # Capitalize the first character
+  string(SUBSTRING ${module_name} 0 1 FIRST_LETTER)
+  string(TOUPPER ${FIRST_LETTER} FIRST_LETTER)
+  string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" module_name "${module_name}")
 endfunction ()
diff --git a/support/cmake/module_definition.cmake b/support/cmake/module_definition.cmake
index b2aaffd948..ff50195087 100644
--- a/support/cmake/module_definition.cmake
+++ b/support/cmake/module_definition.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -35,65 +35,69 @@ include(GenerateExportHeader)
 # The 'library_mode' determines whether the module is linked STATIC or SHARED
 # Dependencies will have to be set in a file called "include.cmake" 
 function (create_new_module module_name output_library_name library_mode)
-    # Create a library name of the style: openspace-module-${name}
-    create_library_name(${module_name} library_name)
+  # Create a library name of the style: openspace-module-${name}
+  create_library_name(${module_name} library_name)
 
-    # Add the module files to the list of sources
-    get_module_files(${module_name} module_files)
+  # Add the module files to the list of sources
+  get_module_files(${module_name} module_files)
 
-    # Create the library
-    add_library(${library_name} ${library_mode} ${module_files} ${ARGN})
+  # Create the library
+  add_library(${library_name} ${library_mode} ${module_files} ${ARGN})
 
-    # Set compile settings that are common to all modules
-    set_openspace_compile_settings(${library_name})
+  # Set compile settings that are common to all modules
+  set_openspace_compile_settings(${library_name})
 
-    handle_module_dependencies(${library_name} ${module_name})
+  target_include_directories(${library_name} PUBLIC ${OPENSPACE_BASE_DIR})
+  create_define_name(${module_name} define_name)
+  target_compile_definitions(${library_name} PUBLIC "${define_name}")
 
-    if ("${library_mode}" STREQUAL "SHARED")
-        # If it is a shared library, we want to generate the export header
-        string(TOLOWER ${module_name} lower_module_name)
-        generate_export_header(
-            ${library_name}
-            EXPORT_FILE_NAME
-            ${CMAKE_BINARY_DIR}/_generated/include/${lower_module_name}_export.h
-        )
-    endif ()
+  handle_module_dependencies(${library_name} ${module_name})
 
-    # This is an ugly hack as we can't inject a variable into a scope two parents above
-    # would love to: set(${module_class_name} "${module_name}Module" PARENT_PARENT_SCOPE)
-    # instead
-    # This value is used in handle_modules.cmake::handle_modules
-    set_property(GLOBAL PROPERTY CurrentModuleClassName "${module_name}Module")
-    
-    set(${output_library_name} ${library_name} PARENT_SCOPE)
+  if ("${library_mode}" STREQUAL "SHARED")
+    # If it is a shared library, we want to generate the export header
+    string(TOLOWER ${module_name} lower_module_name)
+    generate_export_header(
+      ${library_name}
+      EXPORT_FILE_NAME
+      ${CMAKE_BINARY_DIR}/_generated/include/${lower_module_name}_export.h
+    )
+  endif ()
+
+  # This is an ugly hack as we can't inject a variable into a scope two parents above
+  # would love to: set(${module_class_name} "${module_name}Module" PARENT_PARENT_SCOPE)
+  # instead
+  # This value is used in handle_modules.cmake::handle_modules
+  set_property(GLOBAL PROPERTY CurrentModuleClassName "${module_name}Module")
+  
+  set(${output_library_name} ${library_name} PARENT_SCOPE)
 endfunction ()
 
 
 
 function (register_external_libraries libraries)
-    # This is an ugly hack as we can't inject a variable into a scope two parents above
-    # would love to: set(${module_external_librarys} "${libraries}" PARENT_PARENT_SCOPE)
-    # instead
-    set(libs "")
-    foreach (library ${libraries})
-        get_filename_component(lib ${library} ABSOLUTE)
-        list(APPEND libs ${lib})
-    endforeach()
+  # This is an ugly hack as we can't inject a variable into a scope two parents above
+  # would love to: set(${module_external_librarys} "${libraries}" PARENT_PARENT_SCOPE)
+  # instead
+  set(libs "")
+  foreach (library ${libraries})
+    get_filename_component(lib ${library} ABSOLUTE)
+    list(APPEND libs ${lib})
+  endforeach()
 
-    set_property(GLOBAL PROPERTY CurrentModuleExternalLibraries ${libs})
+  set_property(GLOBAL PROPERTY CurrentModuleExternalLibraries ${libs})
 endfunction ()
 
 
 # Gets and returns the <name>module.h and <name>module.cpp files and provides them with a
 # source group
 function (get_module_files module_name module_files)
-    string(TOLOWER ${module_name} module_name_lower)
-    set(module_files
-        ${CMAKE_CURRENT_SOURCE_DIR}/${module_name_lower}module.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/${module_name_lower}module.cpp
-        PARENT_SCOPE
-    )
-    source_group("Module Files" FILES ${module_files})
+  string(TOLOWER ${module_name} module_name_lower)
+  set(module_files
+    ${CMAKE_CURRENT_SOURCE_DIR}/${module_name_lower}module.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/${module_name_lower}module.cpp
+    PARENT_SCOPE
+  )
+  source_group("Module Files" FILES ${module_files})
 endfunction ()
 
 
@@ -102,28 +106,48 @@ endfunction ()
 # function takes care that they are added to the project
 # External dependencies are found using the find_package function and then linked
 function (handle_module_dependencies target_name module_name)
-    # We always want to link against Ghoul and the core library
-    target_link_libraries(${library_name} PRIVATE Ghoul openspace-core)
+  # We always want to link against Ghoul and the core library
+  target_link_libraries(${library_name} PRIVATE Ghoul openspace-core)
+  # We currently can't reuse the precompiled header because that one has the Kameleon
+  # definition stuck into it
+  #target_precompile_headers(${library_name} REUSE_FROM openspace-core)
+  target_precompile_headers(${library_name} PRIVATE
+    [["ghoul/fmt.h"]]
+    [["ghoul/glm.h"]]
+    [["ghoul/misc/assert.h"]]
+    [["ghoul/misc/boolean.h"]]
+    [["ghoul/misc/exception.h"]]
+    [["ghoul/misc/invariants.h"]]
+    [["ghoul/misc/profiling.h"]]
+    <algorithm>
+    <array>
+    <map>
+    <memory>
+    <string>
+    <utility>
+    <vector>
+  )
 
-    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include.cmake")
-        include(${CMAKE_CURRENT_SOURCE_DIR}/include.cmake)
 
-        # Handle OpenSpace dependencies
-        foreach (dep ${OPENSPACE_DEPENDENCIES})
-            create_library_name(${dep} dep_library)
-            message(STATUS "Link: ${target_name} <- ${dep_library}")
-            target_link_libraries(${target_name} PRIVATE ${dep_library})
-        endforeach ()
+  if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include.cmake")
+    include(${CMAKE_CURRENT_SOURCE_DIR}/include.cmake)
 
-        # Handle external dependencies
-        foreach (dep ${EXTERNAL_DEPENDENCIES})
-            string(TOUPPER ${dep} dep_upper)
-            find_package(${dep} REQUIRED)
-            target_include_directories(${target_name} PUBLIC
-                ${${dep_upper}_INCLUDE_DIR} ${${dep_upper}_INCLUDE_DIRS}
-            )
-            message(STATUS "Link: ${target_name} <- ${${dep_upper}_LIBRARIES}")
-            target_link_libraries(${target_name} PRIVATE ${${dep_upper}_LIBRARIES})
-        endforeach ()
-    endif ()
+    # Handle OpenSpace dependencies
+    foreach (dep ${OPENSPACE_DEPENDENCIES})
+      create_library_name(${dep} dep_library)
+      message(STATUS "Link: ${target_name} <- ${dep_library}")
+      target_link_libraries(${target_name} PRIVATE ${dep_library})
+    endforeach ()
+
+    # Handle external dependencies
+    foreach (dep ${EXTERNAL_DEPENDENCIES})
+      string(TOUPPER ${dep} dep_upper)
+      find_package(${dep} REQUIRED)
+      target_include_directories(${target_name} PUBLIC
+        ${${dep_upper}_INCLUDE_DIR} ${${dep_upper}_INCLUDE_DIRS}
+      )
+      message(STATUS "Link: ${target_name} <- ${${dep_upper}_LIBRARIES}")
+      target_link_libraries(${target_name} PRIVATE ${${dep_upper}_LIBRARIES})
+    endforeach ()
+  endif ()
 endfunction ()
diff --git a/support/cmake/openspace_header.template b/support/cmake/openspace_header.template
index ca8ede21eb..0f5b82a27f 100644
--- a/support/cmake/openspace_header.template
+++ b/support/cmake/openspace_header.template
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -31,9 +31,9 @@ namespace openspace {
 
 std::string licenseText();
 
-constexpr int OPENSPACE_VERSION_MAJOR = @OPENSPACE_VERSION_MAJOR@;
-constexpr int OPENSPACE_VERSION_MINOR = @OPENSPACE_VERSION_MINOR@;
-constexpr int OPENSPACE_VERSION_PATCH = @OPENSPACE_VERSION_PATCH@;
+constexpr const int OPENSPACE_VERSION_MAJOR = @OPENSPACE_VERSION_MAJOR@;
+constexpr const int OPENSPACE_VERSION_MINOR = @OPENSPACE_VERSION_MINOR@;
+constexpr const int OPENSPACE_VERSION_PATCH = @OPENSPACE_VERSION_PATCH@;
 
 constexpr const char* OPENSPACE_VERSION_NUMBER = "@OPENSPACE_VERSION_MAJOR@.@OPENSPACE_VERSION_MINOR@.@OPENSPACE_VERSION_PATCH@";
 
diff --git a/support/cmake/packaging.cmake b/support/cmake/packaging.cmake
index 796e5367c2..c901f71f48 100644
--- a/support/cmake/packaging.cmake
+++ b/support/cmake/packaging.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -33,82 +33,82 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${OPENSPACE_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${OPENSPACE_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${OPENSPACE_VERSION_PATCH}")
 set(OPENSPACE_VERSION_NUMBER
-    "${OPENSPACE_VERSION_MAJOR}.${OPENSPACE_VERSION_MINOR}.${OPENSPACE_VERSION_PATCH}"
+  "${OPENSPACE_VERSION_MAJOR}.${OPENSPACE_VERSION_MINOR}.${OPENSPACE_VERSION_PATCH}"
 )
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "OpenSpace ${OPENSPACE_VERSION_NUMBER}")
 set(CPACK_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME} ${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}"
+  "${CPACK_PACKAGE_NAME} ${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}"
 )
 set(CPACK_STRIP_FILES 1)
 
 install(DIRECTORY
-    ${OPENSPACE_BASE_DIR}/bin/${CMAKE_BUILD_TYPE}/
-    DESTINATION bin
-    USE_SOURCE_PERMISSIONS
+  ${OPENSPACE_BASE_DIR}/bin/${CMAKE_BUILD_TYPE}/
+  DESTINATION bin
+  USE_SOURCE_PERMISSIONS
 )
 install(DIRECTORY ${OPENSPACE_BASE_DIR}/config/ DESTINATION config)
 
 install(DIRECTORY ${OPENSPACE_BASE_DIR}/data/ DESTINATION data)
 
 install(DIRECTORY ${OPENSPACE_BASE_DIR}/modules/
-    DESTINATION modules
-    FILES_MATCHING
-    PATTERN "*.glsl"
-    PATTERN "*.hglsl"
-    PATTERN "*.fs"
-    PATTERN "*.vs"
-    PATTERN "*.lua"
+  DESTINATION modules
+  FILES_MATCHING
+  PATTERN "*.glsl"
+  PATTERN "*.hglsl"
+  PATTERN "*.fs"
+  PATTERN "*.vs"
+  PATTERN "*.lua"
 )
 install(DIRECTORY ${OPENSPACE_BASE_DIR}/scripts/ DESTINATION scripts)
 install(DIRECTORY ${OPENSPACE_BASE_DIR}/shaders/ DESTINATION shaders)
 
 install(FILES
-    ${OPENSPACE_BASE_DIR}/openspace.cfg
-    ${OPENSPACE_BASE_DIR}/CREDITS.md
-    ${OPENSPACE_BASE_DIR}/LICENSE.md
-    ${OPENSPACE_BASE_DIR}/README.md
-    DESTINATION .
+  ${OPENSPACE_BASE_DIR}/openspace.cfg
+  ${OPENSPACE_BASE_DIR}/CREDITS.md
+  ${OPENSPACE_BASE_DIR}/LICENSE.md
+  ${OPENSPACE_BASE_DIR}/README.md
+  DESTINATION .
 )
 
 if (WIN32)
-    set(CPACK_GENERATOR ZIP)
-    # Need backslash for correct subdirectory paths
-    set(CPACK_PACKAGE_ICON "${OPENSPACE_BASE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.png")
-    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}\\\\${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}")
+  set(CPACK_GENERATOR ZIP)
+  # Need backslash for correct subdirectory paths
+  set(CPACK_PACKAGE_ICON "${OPENSPACE_BASE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.png")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}\\\\${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}")
 else ()
-    set(CPACK_GENERATOR TGZ)
-    set(CPACK_PACKAGE_ICON "${OPENSPACE_BASE_DIR}/apps/OpenSpace/openspace.png")
-    set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}")
+  set(CPACK_GENERATOR TGZ)
+  set(CPACK_PACKAGE_ICON "${OPENSPACE_BASE_DIR}/apps/OpenSpace/openspace.png")
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}")
 endif ()
 
 option(OPENSPACE_CREATE_INSTALLER "Create an OpenSpace installer from the package" OFF)
 
 if (OPENSPACE_CREATE_INSTALLER)
-    set(CPACK_PACKAGE_EXECUTABLES "openspace;OpenSpace")
-    if (WIN32)
-        set(CPACK_GENERATOR "ZIP;NSIS")
-        # OpenSpace does NOT seem to handle C:/Program Files/ without crashing
-        set(CPACK_NSIS_INSTALL_ROOT "C:")
-        # There is a bug in NSI that does not handle full unix paths properly. Make
-        # sure there is at least one set of four (4) backlashes.
-        set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_FILE_NAME}")
-        # Create the desktop link
-        set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "CreateShortCut '$DESKTOP\\\\${CPACK_NSIS_DISPLAY_NAME}.lnk' '$INSTDIR\\\\bin\\\\OpenSpace.exe' ")
-        # Delete the desktop link
-        set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '$DESKTOP\\\\${CPACK_NSIS_DISPLAY_NAME}.lnk' ")
-        # The icon to start the application.
-        set(CPACK_NSIS_MUI_ICON "${OPENSPACE_BASE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.ico")
-        # Add a link to the application website in the startup menu.
-        set(CPACK_NSIS_MENU_LINKS "http://openspaceproject.com/" "OpenSpace Homepage")
-        # Set the icon for the application in the Add/Remove programs section.
-        set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\OpenSpace.exe")
-        # The mail address for the maintainer of the application in the Add/Remove programs section
-        set(CPACK_NSIS_CONTACT alexander.bock@liu.se)
-        # The url of the application in the Add/Remove programs section
-        set(CPACK_NSIS_URL_INFO_ABOUT "http://openspaceproject.com/")
-        # Help URL
-        set(CPACK_NSIS_HELP_LINK "http://openspaceproject.com/")
-    endif ()
+  set(CPACK_PACKAGE_EXECUTABLES "openspace;OpenSpace")
+  if (WIN32)
+    set(CPACK_GENERATOR "ZIP;NSIS")
+    # OpenSpace does NOT seem to handle C:/Program Files/ without crashing
+    set(CPACK_NSIS_INSTALL_ROOT "C:")
+    # There is a bug in NSI that does not handle full unix paths properly. Make
+    # sure there is at least one set of four (4) backlashes.
+    set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_FILE_NAME}")
+    # Create the desktop link
+    set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "CreateShortCut '$DESKTOP\\\\${CPACK_NSIS_DISPLAY_NAME}.lnk' '$INSTDIR\\\\bin\\\\OpenSpace.exe' ")
+    # Delete the desktop link
+    set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '$DESKTOP\\\\${CPACK_NSIS_DISPLAY_NAME}.lnk' ")
+    # The icon to start the application.
+    set(CPACK_NSIS_MUI_ICON "${OPENSPACE_BASE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.ico")
+    # Add a link to the application website in the startup menu.
+    set(CPACK_NSIS_MENU_LINKS "http://openspaceproject.com/" "OpenSpace Homepage")
+    # Set the icon for the application in the Add/Remove programs section.
+    set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\OpenSpace.exe")
+    # The mail address for the maintainer of the application in the Add/Remove programs section
+    set(CPACK_NSIS_CONTACT alexander.bock@liu.se)
+    # The url of the application in the Add/Remove programs section
+    set(CPACK_NSIS_URL_INFO_ABOUT "http://openspaceproject.com/")
+    # Help URL
+    set(CPACK_NSIS_HELP_LINK "http://openspaceproject.com/")
+  endif ()
 endif ()
 
 include (CPack)
diff --git a/support/cmake/set_openspace_compile_settings.cmake b/support/cmake/set_openspace_compile_settings.cmake
index 698821579c..a0c96ab0a9 100644
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -22,303 +22,220 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################
 
-function (set_openspace_compile_settings project)
-    set_property(TARGET ${project} PROPERTY CXX_STANDARD 17)
-    set_property(TARGET ${project} PROPERTY CXX_STANDARD_REQUIRED ON)
+function (set_openspace_compile_settings target)
+  target_compile_features(${target} PRIVATE cxx_std_17)
 
-    if (MSVC)
-        target_compile_options(
-            ${project}
-            PRIVATE
-            "/MP"       # Multi-threading support
-            "/W4"       # Highest warning level
-            "/w44062"   # enumerator 'identifier' in a switch of enum 'enumeration' is not handled
-            "/wd4127"   # conditional expression is constant
-            "/wd4201"   # nonstandard extension used : nameless struct/union
-            "/w44255"   # 'function': no function prototype given: converting '()' to '(void)'
-            "/w44263"   # 'function': member function does not override any base class virtual member function
-            "/w44264"   # 'virtual_function': no override available for virtual member function from base 'class'; function is hidden
-            "/w44265"   # 'class': class has virtual functions, but destructor is not virtual
-            "/w44266"   # 'function': no override available for virtual member function from base 'type'; function is hidden
-            "/w44289"   # nonstandard extension used : 'var' : loop control variable declared in the for-loop is used outside the for-loop scope
-            "/w44296"   # 'operator': expression is always false
-            "/w44311"   # 'variable' : pointer truncation from 'type' to 'type'
-            "/w44339"   # 'type' : use of undefined type detected in CLR meta-data - use of this type may lead to a runtime exception
-            "/w44342"   # behavior change: 'function' called, but a member operator was called in previous versions
-            "/w44350"   # behavior change: 'member1' called instead of 'member2'
-            "/w44431"   # missing type specifier - int assumed. Note: C no longer supports default-int
-            "/w44471"   # a forward declaration of an unscoped enumeration must have an underlying type (int assumed)
-            "/wd4505"   # unreferenced local function has been removed
-            "/w44545"   # expression before comma evaluates to a function which is missing an argument list
-            "/w44546"   # function call before comma missing argument list
-            "/w44547"   # 'operator': operator before comma has no effect; expected operator with side-effect
-            "/w44548"   # expression before comma has no effect; expected expression with side-effect
-            "/w44549"   # 'operator': operator before comma has no effect; did you intend 'operator'?
-            "/w44555"   # expression has no effect; expected expression with side-effect
-            # 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"
-            "/permissive-"
-            "/Zc:twoPhase-"  # Used to prevent C:\Program Files (x86)\Windows Kits\8.1\Include\um\combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here
-                             # This is a bug in Visual Studio 15.3 and can be removed with the next version:
-                             # https://developercommunity.visualstudio.com/content/problem/94419/vs-2017-153-with-permissive-shows-error-c2187-in-c.html
-            "/Zc:strictStrings-"    # Windows header don't adhere to this
-            "/Zc:__cplusplus" # Correctly set the __cplusplus macro
-        )
-        if (OPENSPACE_WARNINGS_AS_ERRORS)
-            target_compile_options(${project} PRIVATE "/WX")
-        endif ()
+  set(MSVC_WARNINGS
+    "/MP"       # Multi-threading support
+    "/W4"       # Highest warning level
+    "/w44062"   # enumerator 'identifier' in a switch of enum 'enumeration' is not handled
+    "/wd4127"   # conditional expression is constant
+    "/wd4201"   # nonstandard extension used : nameless struct/union
+    "/wd5030"   # attribute 'attribute' is not recognized
+    "/w44255"   # 'function': no function prototype given: converting '()' to '(void)'
+    "/w44263"   # 'function': member function does not override any base class virtual member function
+    "/w44264"   # 'virtual_function': no override available for virtual member function from base 'class'; function is hidden
+    "/w44265"   # 'class': class has virtual functions, but destructor is not virtual
+    "/w44266"   # 'function': no override available for virtual member function from base 'type'; function is hidden
+    "/w44289"   # nonstandard extension used : 'var' : loop control variable declared in the for-loop is used outside the for-loop scope
+    "/w44296"   # 'operator': expression is always false
+    "/w44311"   # 'variable' : pointer truncation from 'type' to 'type'
+    "/w44339"   # 'type' : use of undefined type detected in CLR meta-data - use of this type may lead to a runtime exception
+    "/w44342"   # behavior change: 'function' called, but a member operator was called in previous versions
+    "/w44350"   # behavior change: 'member1' called instead of 'member2'
+    "/w44431"   # missing type specifier - int assumed. Note: C no longer supports default-int
+    "/w44471"   # a forward declaration of an unscoped enumeration must have an underlying type (int assumed)
+    "/wd4505"   # unreferenced local function has been removed
+    "/w44545"   # expression before comma evaluates to a function which is missing an argument list
+    "/w44546"   # function call before comma missing argument list
+    "/w44547"   # 'operator': operator before comma has no effect; expected operator with side-effect
+    "/w44548"   # expression before comma has no effect; expected expression with side-effect
+    "/w44549"   # 'operator': operator before comma has no effect; did you intend 'operator'?
+    "/w44555"   # expression has no effect; expected expression with side-effect
+    # 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"
+    "/permissive-"
+    "/Zc:twoPhase-"  # Used to prevent C:\Program Files (x86)\Windows Kits\8.1\Include\um\combaseapi.h(229): error C2187: syntax error: 'identifier' was unexpected here
+                      # This is a bug in Visual Studio 15.3 and can be removed with the next version:
+                      # https://developercommunity.visualstudio.com/content/problem/94419/vs-2017-153-with-permissive-shows-error-c2187-in-c.html
+    "/Zc:strictStrings-"    # Windows header don't adhere to this
+    "/Zc:__cplusplus" # Correctly set the __cplusplus macro
+  )
+  if (OPENSPACE_WARNINGS_AS_ERRORS)
+    set(MSVC_WARNINGS ${MSVC_WARNINGS} "/WX")
+  endif ()
+  if (OPENSPACE_OPTIMIZATION_ENABLE_AVX)
+    set(MSVC_WARNINGS ${MSVC_WARNINGS} "/arch:AVX")
+  endif ()
+  if (OPENSPACE_OPTIMIZATION_ENABLE_AVX2)
+    set(MSVC_WARNINGS ${MSVC_WARNINGS} "/arch:AVX2")
+  endif ()
+  if (OPENSPACE_OPTIMIZATION_ENABLE_AVX512)
+    set(MSVC_WARNINGS ${MSVC_WARNINGS} "/arch:AVX512")
+  endif ()
+  if (OPENSPACE_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS)
+    set(MSVC_WARNINGS ${MSVC_WARNINGS}
+      "/Oi" # usage of intrinsic functions
+      "/GL" # Whole program optimization
+    )
+  else ()
+    set(MSVC_WARNINGS ${MSVC_WARNINGS}
+      "/ZI"       # Edit and continue support
+    )
+  endif ()
 
-        # Boost as of 1.64 still uses unary_function unless we define this
-        target_compile_definitions(${project} PRIVATE "_HAS_AUTO_PTR_ETC")
-        target_compile_definitions(${project} PRIVATE "NOMINMAX")
+  set(CLANG_WARNINGS
+    "-stdlib=libc++"
+    "-Wall"
+    "-Wextra"
+    "-Wabstract-vbase-init"
+    "-Warray-bounds-pointer-arithmetic"
+    "-Wassign-enum"
+    "-Wauto-import"
+    "-Wbad-function-cast"
+    "-Wbitfield-constant-conversion"
+    "-Wcast-calling-convention"
+    "-Wcast-qual"
+    "-Wchar-subscripts"
+    "-Wcomma"
+    "-Wcomment"
+    "-Wcomplex-component-init"
+    "-Wconditional-uninitialized"
+    "-Wdate-time"
+    "-Wdeprecated-implementations"
+    "-Wdollar-in-identifier-extension"
+    "-Wduplicate-enum"
+    "-Wduplicate-method-match"
+    "-Wempty-body"
+    "-Wformat-pedantic"
+    "-Wheader-hygiene"
+    "-Widiomatic-parentheses"
+    "-Wimplicit-fallthrough"
+    "-Wimport-preprocessor-directive-pedantic"
+    "-Winconsistent-missing-override"
+    "-Winfinite-recursion"
+    "-Wkeyword-macro"
+    "-Wlanguage-extension-token"
+    "-Wloop-analysis"
+    "-Wmethod-signatures"
+    "-Wmicrosoft-end-of-file"
+    "-Wmicrosoft-enum-forward-reference"
+    "-Wmicrosoft-fixed-enum"
+    "-Wmicrosoft-flexible-array"
+    "-Wmismatched-tags"
+    "-Wmissing-field-initializers"
+    "-Wmissing-noreturn"
+    "-Wnon-virtual-dtor"
+    "-Wold-style-cast"
+    "-Woverloaded-virtual"
+    "-Wpessimizing-move"
+    "-Wpointer-arith"
+    "-Wpragmas"
+    "-Wredundant-move"
+    "-Wreorder"
+    "-Wsemicolon-before-method-body"
+    # "-Wshadow-field"
+    "-Wshadow-field-in-constructor"
+    # "-Wshadow-all"  Add this again once the Properties don't throw warnings --abock
+    "-Wshift-sign-overflow"
+    "-Wshorten-64-to-32"
+    "-Wsign-compare"
+    "-Wstring-conversion"
+    "-Wtautological-compare"
+    "-Wthread-safety"
+    "-Wundef"
+    "-Wundefined-reinterpret-cast"
+    "-Wuninitialized"
+    "-Wunneeded-internal-declaration"
+    "-Wunneeded-member-function"
+    "-Wunreachable-code-break"
+    "-Wunreachable-code-loop-increment"
+    "-Wunreachable-code-return"
+    "-Wunused-exception-parameter"
+    "-Wunused-label"
+    "-Wunused-local-typedef"
+    "-Wunused-macros"
+    "-Wunused-parameter"
+    "-Wunused-private-field"
+    "-Wunused-result"
+    "-Wunused-variable"
+    "-Wused-but-marked-unused"
+    "-Wvariadic-macros"
+    "-Wvla"
+    "-Wzero-length-array"
+    "-Wno-missing-braces"
+    "-Wno-unknown-attributes"
+  )
+  if (OPENSPACE_WARNINGS_AS_ERRORS)
+    set(CLANG_WARNINGS ${CLANG_WARNINGS} "-Werror")
+  endif ()
 
-        if (OPENSPACE_OPTIMIZATION_ENABLE_AVX)
-            target_compile_options(${project} PRIVATE "/arch:AVX")
-        endif ()
-        if (OPENSPACE_OPTIMIZATION_ENABLE_AVX2)
-            target_compile_options(${project} PRIVATE "/arch:AVX2")
-        endif ()
-        if (OPENSPACE_OPTIMIZATION_ENABLE_AVX512)
-            target_compile_options(${project} PRIVATE "/arch:AVX512")
-        endif ()
 
-        if (OPENSPACE_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS)
-            target_compile_options(${project} PRIVATE
-                "/Oi" # usage of intrinsic functions
-                "/GL" # Whole program optimization
-            )
-        else ()
-            target_compile_options(${project} PRIVATE
-                "/ZI"       # Edit and continue support
-            )
-        endif ()
-    elseif (NOT LINUX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if (OPENSPACE_WARNINGS_AS_ERRORS)
-            target_compile_options(${project} PRIVATE "-Werror")
-        endif ()
+  set(GCC_WARNINGS
+    "-ggdb"
+    "-Wall"
+    "-Wextra"
+    "-Wpedantic"
+    "-Wunused-parameter"
+    "-Wuninitialized"
+    "-Wsuggest-attribute=const"
+    "-Wsuggest-final-types"
+    "-Wsuggest-final-methods"
+    "-Wsuggest-override"
+    "-Walloc-zero"
+    "-Wduplicated-cond"
+    "-Wshadow"
+    "-Wundef"
+    "-Wcast-qual"
+    "-Wzero-as-null-pointer-constant"
+    "-Wdate-time"
+    "-Wuseless-cast"
+    "-Wlogical-op"
+    "-Wint-in-bool-context"
+    "-Wno-deprecated-copy"
+    "-Wno-float-equal"
+    "-Wno-write-strings"
+    "-Wnon-virtual-dtor"
+    "-Wold-style-cast"
+    "-Woverloaded-virtual"
+    "-Wno-long-long"
+    "-Wno-ignored-attributes"
+    "-Wno-attributes"
+  )
+  if (OPENSPACE_WARNINGS_AS_ERRORS)
+    set(GCC_WARNINGS ${CLANG_WARNINGS} "-Werror")
+  endif ()
 
-        target_compile_options(
-            ${project}
-            PRIVATE
-            "-stdlib=libc++"
-            "-Wall"
-            "-Wextra"
-            "-Wabstract-vbase-init"
-            "-Warray-bounds-pointer-arithmetic"
-            "-Wassign-enum"
-            "-Wauto-import"
-            "-Wbad-function-cast"
-            "-Wbitfield-constant-conversion"
-            "-Wcast-calling-convention"
-            "-Wcast-qual"
-            "-Wchar-subscripts"
-            "-Wcomma"
-            "-Wcomment"
-            "-Wcomplex-component-init"
-            "-Wconditional-uninitialized"
-            "-Wdate-time"
-            "-Wdeprecated-implementations"
-            "-Wdollar-in-identifier-extension"
-            "-Wduplicate-enum"
-            "-Wduplicate-method-match"
-            "-Wempty-body"
-            "-Wformat-pedantic"
-            "-Wheader-hygiene"
-            "-Widiomatic-parentheses"
-            "-Wimplicit-fallthrough"
-            "-Wimport-preprocessor-directive-pedantic"
-            "-Winconsistent-missing-override"
-            "-Winfinite-recursion"
-            "-Wkeyword-macro"
-            "-Wlanguage-extension-token"
-            "-Wloop-analysis"
-            "-Wmethod-signatures"
-            "-Wmicrosoft-end-of-file"
-            "-Wmicrosoft-enum-forward-reference"
-            "-Wmicrosoft-fixed-enum"
-            "-Wmicrosoft-flexible-array"
-            "-Wmismatched-tags"
-            "-Wmissing-field-initializers"
-            "-Wmissing-noreturn"
-            "-Wnewline-eof"
-            "-Wnon-virtual-dtor"
-            "-Wold-style-cast"
-            "-Woverloaded-virtual"
-            "-Wpessimizing-move"
-            "-Wpointer-arith"
-            "-Wpragmas"
-            "-Wredundant-move"
-            "-Wreorder"
-            "-Wsemicolon-before-method-body"
-            # "-Wshadow-field"
-            "-Wshadow-field-in-constructor"
-            # "-Wshadow-all"  Add this again once the Properties don't throw warnings --abock
-            "-Wshift-sign-overflow"
-            "-Wshorten-64-to-32"
-            "-Wsign-compare"
-            "-Wstring-conversion"
-            "-Wtautological-compare"
-            "-Wthread-safety"
-            "-Wundef"
-            "-Wundefined-reinterpret-cast"
-            "-Wuninitialized"
-            "-Wunneeded-internal-declaration"
-            "-Wunneeded-member-function"
-            "-Wunreachable-code-break"
-            "-Wunreachable-code-loop-increment"
-            "-Wunreachable-code-return"
-            "-Wunused-exception-parameter"
-            "-Wunused-label"
-            "-Wunused-local-typedef"
-            "-Wunused-macros"
-            "-Wunused-parameter"
-            "-Wunused-private-field"
-            "-Wunused-result"
-            "-Wunused-variable"
-            "-Wused-but-marked-unused"
-            "-Wvariadic-macros"
-            "-Wvla"
-            "-Wzero-length-array"
-            "-Wno-missing-braces"
-        )
-    elseif (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if (OPENSPACE_WARNINGS_AS_ERRORS)
-            target_compile_options(${project} PRIVATE "-Werror")
-        endif ()
+  if (MSVC)
+    target_compile_options(${target} PRIVATE ${MSVC_WARNINGS})
 
-        target_compile_options(
-            ${project}
-            PRIVATE
-            "-stdlib=libc++"
-            "-std=c++17"
-            "-Wall"
-            "-Wextra"
-            "-Wabstract-vbase-init"
-            "-Warray-bounds-pointer-arithmetic"
-            "-Wassign-enum"
-            "-Wauto-import"
-            "-Wbad-function-cast"
-            "-Wbitfield-constant-conversion"
-            "-Wcast-calling-convention"
-            "-Wcast-qual"
-            "-Wchar-subscripts"
-            "-Wcomma"
-            "-Wcomment"
-            "-Wcomplex-component-init"
-            "-Wconditional-uninitialized"
-            "-Wdate-time"
-            "-Wdeprecated-implementations"
-            "-Wdollar-in-identifier-extension"
-            "-Wduplicate-enum"
-            "-Wduplicate-method-match"
-            "-Wempty-body"
-            "-Wformat-pedantic"
-            "-Wheader-hygiene"
-            "-Widiomatic-parentheses"
-            "-Wimplicit-fallthrough"
-            "-Wimport-preprocessor-directive-pedantic"
-            "-Winconsistent-missing-override"
-            "-Winfinite-recursion"
-            "-Wkeyword-macro"
-            "-Wlanguage-extension-token"
-            "-Wloop-analysis"
-            "-Wmethod-signatures"
-            "-Wmicrosoft-end-of-file"
-            "-Wmicrosoft-enum-forward-reference"
-            "-Wmicrosoft-fixed-enum"
-            "-Wmicrosoft-flexible-array"
-            "-Wmismatched-tags"
-            "-Wmissing-field-initializers"
-            "-Wmissing-noreturn"
-            "-Wnewline-eof"
-            "-Wnon-virtual-dtor"
-            "-Wold-style-cast"
-            "-Woverloaded-virtual"
-            "-Wpessimizing-move"
-            "-Wpointer-arith"
-            "-Wpragmas"
-            "-Wredundant-move"
-            "-Wreorder"
-            "-Wsemicolon-before-method-body"
-            # "-Wshadow-field"
-            "-Wshadow-field-in-constructor"
-            # "-Wshadow-all"  Add this again once the Properties don't throw warnings --abock
-            "-Wshift-sign-overflow"
-            "-Wshorten-64-to-32"
-            "-Wsign-compare"
-            "-Wstring-conversion"
-            "-Wtautological-compare"
-            "-Wthread-safety"
-            "-Wundef"
-            "-Wundefined-reinterpret-cast"
-            "-Wuninitialized"
-            "-Wunneeded-internal-declaration"
-            "-Wunneeded-member-function"
-            "-Wunreachable-code-break"
-            "-Wunreachable-code-loop-increment"
-            "-Wunreachable-code-return"
-            "-Wunused-exception-parameter"
-            "-Wunused-label"
-            "-Wunused-local-typedef"
-            "-Wunused-macros"
-            "-Wunused-parameter"
-            "-Wunused-private-field"
-            "-Wunused-result"
-            "-Wunused-variable"
-            "-Wused-but-marked-unused"
-            "-Wvariadic-macros"
-            "-Wvla"
-            "-Wzero-length-array"
-            "-Wno-missing-braces"
-        )
-
-        target_link_libraries(${project} PRIVATE "c++" "c++abi")
-        
-    elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-        target_compile_options(
-            ${project}
-            PRIVATE
-            "-ggdb"
-            "-Wall"
-            "-Wextra"
-            "-Wpedantic"
-            "-Wunused-parameter"
-            "-Wuninitialized"
-            "-Wsuggest-attribute=const"
-            "-Wsuggest-final-types"
-            "-Wsuggest-final-methods"
-            "-Wsuggest-override"
-            "-Walloc-zero"
-            "-Wduplicated-cond"
-            "-Wshadow"
-            "-Wundef"
-            "-Wcast-qual"
-            "-Wzero-as-null-pointer-constant"
-            "-Wdate-time"
-            "-Wuseless-cast"
-            "-Wlogical-op"
-            "-Wint-in-bool-context"
-            "-Wno-write-strings"
-            "-Wnon-virtual-dtor"
-            "-Wold-style-cast"
-            "-Woverloaded-virtual"
-            "-Wno-long-long"
-        )
-
-        if (OPENSPACE_WARNINGS_AS_ERRORS)
-            target_compile_options(${project} PRIVATE "-Werror")
-        endif ()
-    else ()
-        message("Compiler not handled in set_openspace_compile_settings.cmake")
+    # Boost as of 1.64 still uses unary_function unless we define this
+    target_compile_definitions(${target} PRIVATE "_HAS_AUTO_PTR_ETC")
+    target_compile_definitions(${target} PRIVATE "NOMINMAX")
+  elseif (NOT LINUX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if (OPENSPACE_WARNINGS_AS_ERRORS)
+      target_compile_options(${target} PRIVATE "-Werror")
     endif ()
+    # Apple has "deprecated" OpenGL and offers nothing by warnings instead
+    target_compile_definitions(${target} PRIVATE "GL_SILENCE_DEPRECATION")
+
+    target_compile_options(${target} PRIVATE ${CLANG_WARNINGS})
+  elseif (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    target_compile_options(${target} PRIVATE ${CLANG_WARNINGS} "-std=c++17")
+    target_link_libraries(${target} PRIVATE "c++" "c++abi")
+  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    target_compile_options(${target} PRIVATE ${GCC_WARNINGS})
+  else ()
+    message("Compiler not handled in set_openspace_compile_settings.cmake")
+  endif ()
 endfunction ()
diff --git a/support/coding/codegen b/support/coding/codegen
new file mode 160000
index 0000000000..1e942f53f1
--- /dev/null
+++ b/support/coding/codegen
@@ -0,0 +1 @@
+Subproject commit 1e942f53f1e9543bc5040c2a8d52eeea1559b788
diff --git a/support/coding/new_files.py b/support/coding/new_files.py
index 60ee3c29e2..d6c88f630f 100644
--- a/support/coding/new_files.py
+++ b/support/coding/new_files.py
@@ -33,7 +33,7 @@ Project = {
 }
 
 License = {
-    'OpenSpace': '/*****************************************************************************************\n *                                                                                       *\n * OpenSpace                                                                             *\n *                                                                                       *\n * Copyright (c) 2014-2020                                                               *\n *                                                                                       *\n * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *\n * software and associated documentation files (the "Software"), to deal in the Software *\n * without restriction, including without limitation the rights to use, copy, modify,    *\n * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *\n * permit persons to whom the Software is furnished to do so, subject to the following   *\n * conditions:                                                                           *\n *                                                                                       *\n * The above copyright notice and this permission notice shall be included in all copies *\n * or substantial portions of the Software.                                              *\n *                                                                                       *\n * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *\n * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *\n * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *\n * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *\n * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *\n * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *\n ****************************************************************************************/',
+    'OpenSpace': '/*****************************************************************************************\n *                                                                                       *\n * OpenSpace                                                                             *\n *                                                                                       *\n * Copyright (c) 2014-2021                                                               *\n *                                                                                       *\n * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *\n * software and associated documentation files (the "Software"), to deal in the Software *\n * without restriction, including without limitation the rights to use, copy, modify,    *\n * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *\n * permit persons to whom the Software is furnished to do so, subject to the following   *\n * conditions:                                                                           *\n *                                                                                       *\n * The above copyright notice and this permission notice shall be included in all copies *\n * or substantial portions of the Software.                                              *\n *                                                                                       *\n * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *\n * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *\n * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *\n * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *\n * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *\n * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *\n ****************************************************************************************/',
     'Ghoul': '/*****************************************************************************************\n *                                                                                       *\n * GHOUL                                                                                 *\n * General Helpful Open Utility Library                                                  *\n *                                                                                       *\n * Copyright (c) 2012-2020                                                               *\n *                                                                                       *\n * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *\n * software and associated documentation files (the "Software"), to deal in the Software *\n * without restriction, including without limitation the rights to use, copy, modify,    *\n * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *\n * permit persons to whom the Software is furnished to do so, subject to the following   *\n * conditions:                                                                           *\n *                                                                                       *\n * The above copyright notice and this permission notice shall be included in all copies *\n * or substantial portions of the Software.                                              *\n *                                                                                       *\n * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *\n * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *\n * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *\n * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *\n * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *\n * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *\n ****************************************************************************************/'
 }
 
diff --git a/support/cppcheck/suppressions.txt b/support/cppcheck/suppressions.txt
index 0fbf1a7945..704af3f655 100644
--- a/support/cppcheck/suppressions.txt
+++ b/support/cppcheck/suppressions.txt
@@ -1,7 +1,6 @@
-// This is not a memleak because the placement new operator does not
-// actually create any memory that could leak
-//memleak:src/performance/performancemanager.cpp
+useStlAlgorithm
+unreadVariable
+unusedFunction
 
-
-missingInclude
-noExplicitConstructor
+shadowFunction:modules/globebrowsing/src/tileprovider.cpp
+syntaxError:src/scene/profile.cpp:44
diff --git a/tests/AssetLoaderTest/assetfunctionsexist.asset b/tests/AssetLoaderTest/assetfunctionsexist.asset
index ad5d5fb4cb..3eb012cb33 100644
--- a/tests/AssetLoaderTest/assetfunctionsexist.asset
+++ b/tests/AssetLoaderTest/assetfunctionsexist.asset
@@ -1,5 +1,4 @@
 assert(type(asset.require) == "function", "require should be function")
-assert(type(asset.request) == "function", "request should be function")
 assert(type(asset.localResource) == "function", "localResource should be function")
 assert(type(asset.syncedResource) == "function", "syncedResource should be function")
 assert(type(asset.export) == "function", "export should be function")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 658348b7ab..522b4509c8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -2,7 +2,7 @@
 #                                                                                        #
 # OpenSpace                                                                              #
 #                                                                                        #
-# Copyright (c) 2014-2020                                                                #
+# 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  #
@@ -33,6 +33,7 @@ add_executable(
   test_latlonpatch.cpp
   test_lrucache.cpp
   test_luaconversions.cpp
+  test_lua_createsinglecolorimage.cpp
   test_optionproperty.cpp
   test_profile.cpp
   test_rawvolumeio.cpp
@@ -47,12 +48,21 @@ add_executable(
 
 set_openspace_compile_settings(OpenSpaceTest)
 
-target_include_directories(OpenSpaceTest PUBLIC
+target_include_directories(OpenSpaceTest
+  PUBLIC
     "${GHOUL_BASE_DIR}/ext/catch2/single_include"
+    "${OPENSPACE_BASE_DIR}"
 )
 target_compile_definitions(OpenSpaceTest PUBLIC "GHL_THROW_ON_ASSERT")
 target_link_libraries(OpenSpaceTest PUBLIC openspace-core)
 
+foreach (library_name ${all_enabled_modules})
+  get_target_property(library_type ${library_name} TYPE)
+  if (NOT ${library_type} STREQUAL "SHARED_LIBRARY")
+    target_link_libraries(OpenSpaceTest PRIVATE ${library_name})
+  endif()
+endforeach ()
+
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
   # Add the CEF binary distribution's cmake/ directory to the module path and
   # find CEF to initialize it properly.
diff --git a/tests/main.cpp b/tests/main.cpp
index 11e7afe2d8..8e1f681a88 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -43,7 +43,8 @@
 int main(int argc, char** argv) {
     using namespace openspace;
     ghoul::initialize();
-
+    global::create();
+    
     // Register the path of the executable,
     // to make it possible to find other files in the same directory.
     FileSys.registerPathToken(
diff --git a/tests/regression/517.cpp b/tests/regression/517.cpp
index d1b8e6c079..82b49592c4 100644
--- a/tests/regression/517.cpp
+++ b/tests/regression/517.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_assetloader.cpp b/tests/test_assetloader.cpp
index 097d7694cd..084e52dd44 100644
--- a/tests/test_assetloader.cpp
+++ b/tests/test_assetloader.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_concurrentjobmanager.cpp b/tests/test_concurrentjobmanager.cpp
index ec91ee5c23..552c212366 100644
--- a/tests/test_concurrentjobmanager.cpp
+++ b/tests/test_concurrentjobmanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -30,7 +30,7 @@
 
 namespace {
     struct TestJob : public openspace::Job<int> {
-        TestJob(int jobExecutingTime)
+        explicit TestJob(int jobExecutingTime)
             : _jobExecutingTime(jobExecutingTime)
         {}
 
@@ -45,12 +45,12 @@ namespace {
 
     private:
         int _jobExecutingTime;
-        int prod;
+        int prod = 0;
     };
 
 
     struct VerboseProduct {
-        VerboseProduct(int v) : val(v) {}
+        explicit VerboseProduct(int v) : val(v) {}
 
         ~VerboseProduct() {}
 
@@ -59,7 +59,7 @@ namespace {
 
 
     struct VerboseJob : public openspace::Job<VerboseProduct> {
-        VerboseJob(int jobExecutingTime)
+        explicit VerboseJob(int jobExecutingTime)
             : _jobExecutingTime(jobExecutingTime)
             , _product(-1)
         {}
diff --git a/tests/test_concurrentqueue.cpp b/tests/test_concurrentqueue.cpp
index b9d66981e0..86ff15b0bf 100644
--- a/tests/test_concurrentqueue.cpp
+++ b/tests/test_concurrentqueue.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_documentation.cpp b/tests/test_documentation.cpp
index 9961d13cdc..5347b0e4ab 100644
--- a/tests/test_documentation.cpp
+++ b/tests/test_documentation.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -323,26 +323,24 @@ TEST_CASE("Documentation: BoolVerifier", "[documentation]") {
         {{ "Bool", new BoolVerifier, Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Bool", true }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool", true);
 
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Bool", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Bool", 0);
+
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Bool");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeExist {
-        { "Bool2", 0 }
-    };
+    ghoul::Dictionary negativeExist;
+    negativeExist.setValue("Bool2", 0);
     negativeRes = testSpecification(doc, negativeExist);
 
     REQUIRE_FALSE(negativeRes.success);
@@ -358,17 +356,15 @@ TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
         {{ "Double", new DoubleVerifier, Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 0.0);
 
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 0);
 
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -376,9 +372,8 @@ TEST_CASE("Documentation: DoubleVerifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "Double");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeExist{
-        { "Double2" , 0.0 }
-    };
+    ghoul::Dictionary negativeExist;
+    negativeExist.setValue("Double2", 0.0);
     negativeRes = testSpecification(doc, negativeExist);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -393,23 +388,20 @@ TEST_CASE("Documentation: IntVerifier", "[documentation]") {
         {{ "Int", new IntVerifier, Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Int", 0.0 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Int", 0.0);
     positiveRes = testSpecification(doc, positive2);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 0.1 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 0.1);
 
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -417,9 +409,8 @@ TEST_CASE("Documentation: IntVerifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "Int");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeExist {
-        { "Int2", 0 }
-    };
+    ghoul::Dictionary negativeExist;
+    negativeExist.setValue("Int2", 0);
     negativeRes = testSpecification(doc, negativeExist);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -435,25 +426,22 @@ TEST_CASE("Documentation: StringVerifier", "[documentation]") {
         {{ "String", new StringVerifier, Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "String", ""s }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("String", ""s);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "String", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("String", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "String");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeExist {
-        { "String2", ""s }
-    };
+    ghoul::Dictionary negativeExist;
+    negativeExist.setValue("String2", ""s);
     negativeRes = testSpecification(doc, negativeExist);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -468,25 +456,22 @@ TEST_CASE("Documentation: TableVerifierType", "[documentation]") {
         {{ "Table", new TableVerifier, Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Table", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Table", ghoul::Dictionary());
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Table", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Table", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Table");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeExist {
-        { "Table2", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary negativeExist;
+    negativeExist.setValue("Table2", ghoul::Dictionary());
     negativeRes = testSpecification(doc, negativeExist);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -502,48 +487,43 @@ TEST_CASE("Documentation: StringListVerifierType", "[documentation]") {
         { { "StringList", new StringListVerifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        {
-            "StringList",
-            ghoul::Dictionary {
-                { "1", "a"s },
-                { "2", "b"s },
-                { "3", "c"s }
-            }
-        }
-    };
+    ghoul::Dictionary positive;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", "a"s);
+        inner.setValue("2", "b"s);
+        inner.setValue("3", "c"s);
+        positive.setValue("StringList", inner);
+    }
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "StringList", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("StringList", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "StringList");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        {
-            "StringList",
-            ghoul::Dictionary {
-                { "1", "a"s },
-                { "2", "b"s },
-                { "3", 2.0 }
-            }
-        }
-    };
+
+    ghoul::Dictionary negative2;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", "a"s);
+        inner.setValue("2", "b"s);
+        inner.setValue("3", 2.0);
+        negative2.setValue("StringList", inner);
+    }
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "StringList.3");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeExist {
-        { "StringList2", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary negativeExist;
+    negativeExist.setValue("StringList2", ghoul::Dictionary());
     negativeRes = testSpecification(doc, negativeExist);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -559,48 +539,42 @@ TEST_CASE("Documentation: IntListVerifierType", "[documentation]") {
         { { "IntList", new IntListVerifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        {
-            "IntList",
-            ghoul::Dictionary{
-                { "1", 1 },
-                { "2", 2 },
-                { "3", 3 }
+    ghoul::Dictionary positive;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", 1);
+        inner.setValue("2", 2);
+        inner.setValue("3", 3);
+        positive.setValue("IntList", inner);
     }
-        }
-    };
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative{
-        { "IntList", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("IntList", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "IntList");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        {
-            "IntList",
-            ghoul::Dictionary{
-                { "1", "a"s },
-                { "2", 1 },
-                { "3", 2 }
+    ghoul::Dictionary negative2;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", "a"s);
+        inner.setValue("2", 1);
+        inner.setValue("3", 2);
+        negative2.setValue("IntList", inner);
     }
-        }
-    };
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "IntList.1");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeExist {
-        { "IntList2", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary negativeExist;
+    negativeExist.setValue("IntList2", ghoul::Dictionary());
     negativeRes = testSpecification(doc, negativeExist);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -622,37 +596,34 @@ TEST_CASE("Documentation: MixedVerifiers", "[documentation]") {
         }
     };
 
-    ghoul::Dictionary positive {
-        { "Bool", true },
-        { "Double", 0.0 },
-        { "Int", 0 },
-        { "String", ""s },
-        { "Table", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool", true);
+    positive.setValue("Double", 0.0);
+    positive.setValue("Int", 0);
+    positive.setValue("String", ""s);
+    positive.setValue("Table", ghoul::Dictionary());
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative1 {
-        { "Bool", true },
-        { "Double", 1 },
-        { "Int", 0 },
-        { "String", ""s },
-        { "Table", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary negative1;
+    negative1.setValue("Bool", true);
+    negative1.setValue("Double", 1);
+    negative1.setValue("Int", 0);
+    negative1.setValue("String", ""s);
+    negative1.setValue("Table", ghoul::Dictionary());
     TestResult negativeRes = testSpecification(doc, negative1);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Double");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "Bool", true },
-        { "Double", 0.0 },
-        { "Int", ""s },
-        { "String", 1 },
-        { "Table", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("Bool", true);
+    negative2.setValue("Double", 0.0);
+    negative2.setValue("Int", ""s);
+    negative2.setValue("String", 1);
+    negative2.setValue("Table", ghoul::Dictionary());
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 2);
@@ -684,79 +655,97 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
         }
     };
 
-    ghoul::Dictionary positive {
-        { "Outer_Int", 1 },
-        { "Outer_Table", ghoul::Dictionary {
-            { "Inner_Double", 0.0 },
-            { "Inner_String", ""s }
-        }},
-        { "Outer_Double", 0.0 },
-        { "Outer_Table2", ghoul::Dictionary {
-            { "Inner_Double2", 0.0 },
-            { "Inner_String2", ""s },
-            { "Inner_Table", ghoul::Dictionary {
-                { "Inner_Inner_Int", 0 }
-            }}
-        }}
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Outer_Int", 1);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double", 0.0);
+        inner.setValue("Inner_String", ""s);
+        positive.setValue("Outer_Table", inner);
+    }
+    positive.setValue("Outer_Double", 0.0);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double2", 0.0);
+        inner.setValue("Inner_String2", ""s);
+        {
+            ghoul::Dictionary innerInner;
+            innerInner.setValue("Inner_Inner_Int", 0);
+            inner.setValue("Inner_Table", innerInner);
+        }
+        positive.setValue("Outer_Table2", inner);
+    }
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negativeSimple {
-        { "Outer_Int", 1 },
-        { "Outer_Table", 0},
-        { "Outer_Double", 0.0 },
-        { "Outer_Table2", ghoul::Dictionary {
-            { "Inner_Double2", 0.0 },
-            { "Inner_String2", ""s },
-            { "Inner_Table", ghoul::Dictionary {
-                { "Inner_Inner_Int", 0 }
-            }}
-        }}
-    };
+    ghoul::Dictionary negativeSimple;
+    negativeSimple.setValue("Outer_Int", 1);
+    negativeSimple.setValue("Outer_Table", 0);
+    negativeSimple.setValue("Outer_Double", 0.0);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double2", 0.0);
+        inner.setValue("Inner_String2", ""s);
+        {
+            ghoul::Dictionary innerInner;
+            innerInner.setValue("Inner_Inner_Int", 0);
+            inner.setValue("Inner_Table", innerInner);
+        }
+        negativeSimple.setValue("Outer_Table2", inner);
+    }
     TestResult negativeRes = testSpecification(doc, negativeSimple);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Outer_Table");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeInner {
-        { "Outer_Int", 1 },
-        { "Outer_Table", ghoul::Dictionary {
-            { "Inner_Double", ""s },
-            { "Inner_String", ""s }
-        }},
-        { "Outer_Double", 0.0 },
-        { "Outer_Table2", ghoul::Dictionary {
-            { "Inner_Double2", 0.0 },
-            { "Inner_String2", ""s },
-            { "Inner_Table", ghoul::Dictionary {
-                { "Inner_Inner_Int", 0 }
-            }}
-        }}
-    };
+    ghoul::Dictionary negativeInner;
+    negativeInner.setValue("Outer_Int", 1);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double", ""s);
+        inner.setValue("Inner_String", ""s);
+        negativeInner.setValue("Outer_Table", inner);
+    }
+    negativeInner.setValue("Outer_Double", 0.0);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double2", 0.0);
+        inner.setValue("Inner_String2", ""s);
+        {
+            ghoul::Dictionary innerInner;
+            innerInner.setValue("Inner_Inner_Int", 0);
+            inner.setValue("Inner_Table", innerInner);
+        }
+        negativeInner.setValue("Outer_Table2", inner);
+    }
     negativeRes = testSpecification(doc, negativeInner);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Outer_Table.Inner_Double");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeInner2 {
-        { "Outer_Int", 1 },
-        { "Outer_Table", ghoul::Dictionary {
-            { "Inner_Double", ""s },
-            { "Inner_String", 0.0 }
-        }},
-        { "Outer_Double", 0.0 },
-        { "Outer_Table2", ghoul::Dictionary {
-            { "Inner_Double2", 0.0 },
-            { "Inner_String2", ""s },
-            { "Inner_Table", ghoul::Dictionary {
-                { "Inner_Inner_Int", 0 }
-            }}
-        }}
-    };
+    ghoul::Dictionary negativeInner2;
+    negativeInner2.setValue("Outer_Int", 1);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double", ""s);
+        inner.setValue("Inner_String", 0.0);
+        negativeInner2.setValue("Outer_Table", inner);
+    }
+    negativeInner2.setValue("Outer_Double", 0.0);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double2", 0.0);
+        inner.setValue("Inner_String2", ""s);
+        {
+            ghoul::Dictionary innerInner;
+            innerInner.setValue("Inner_Inner_Int", 0);
+            inner.setValue("Inner_Table", innerInner);
+        }
+        negativeInner2.setValue("Outer_Table2", inner);
+    }
     negativeRes = testSpecification(doc, negativeInner2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 2);
@@ -765,21 +754,26 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
     REQUIRE(negativeRes.offenses[1].offender == "Outer_Table.Inner_String");
     REQUIRE(negativeRes.offenses[1].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeInnerSeparate {
-        { "Outer_Int", 1 },
-        { "Outer_Table", ghoul::Dictionary {
-            { "Inner_Double", ""s },
-            { "Inner_String", ""s }
-        } },
-        { "Outer_Double", 0.0 },
-        { "Outer_Table2", ghoul::Dictionary {
-            { "Inner_Double2", ""s },
-            { "Inner_String2", ""s },
-            { "Inner_Table", ghoul::Dictionary {
-                { "Inner_Inner_Int", 0 }
-            }}
-        }}
-    };
+    ghoul::Dictionary negativeInnerSeparate;
+    negativeInnerSeparate.setValue("Outer_Int", 1);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double", ""s);
+        inner.setValue("Inner_String", ""s);
+        negativeInnerSeparate.setValue("Outer_Table", inner);
+    }
+    negativeInnerSeparate.setValue("Outer_Double", 0.0);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double2", ""s);
+        inner.setValue("Inner_String2", ""s);
+        {
+            ghoul::Dictionary innerInner;
+            innerInner.setValue("Inner_Inner_Int", 0);
+            inner.setValue("Inner_Table", innerInner);
+        }
+        negativeInnerSeparate.setValue("Outer_Table2", inner);
+    }
     negativeRes = testSpecification(doc, negativeInnerSeparate);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 2);
@@ -788,21 +782,26 @@ TEST_CASE("Documentation: NestedTables", "[documentation]") {
     REQUIRE(negativeRes.offenses[1].offender == "Outer_Table2.Inner_Double2");
     REQUIRE(negativeRes.offenses[1].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negativeInnerFull {
-        { "Outer_Int", 1 },
-        { "Outer_Table", ghoul::Dictionary {
-            { "Inner_Double", ""s },
-            { "Inner_String", ""s }
-        } },
-        { "Outer_Double", 0.0 },
-        { "Outer_Table2", ghoul::Dictionary {
-            { "Inner_Double2", ""s },
-            { "Inner_String2", ""s },
-            { "Inner_Table", ghoul::Dictionary {
-                { "Inner_Inner_Int", ""s }
-            }}
-        }}
-    };
+    ghoul::Dictionary negativeInnerFull;
+    negativeInnerFull.setValue("Outer_Int", 1);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double", ""s);
+        inner.setValue("Inner_String", ""s);
+        negativeInnerFull.setValue("Outer_Table", inner);
+    }
+    negativeInnerFull.setValue("Outer_Double", 0.0);
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("Inner_Double2", ""s);
+        inner.setValue("Inner_String2", ""s);
+        {
+            ghoul::Dictionary innerInner;
+            innerInner.setValue("Inner_Inner_Int", ""s);
+            inner.setValue("Inner_Table", innerInner);
+        }
+        negativeInnerFull.setValue("Outer_Table2", inner);
+    }
     negativeRes = testSpecification(doc, negativeInnerFull);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 3);
@@ -826,42 +825,37 @@ TEST_CASE("Documentation: Optional", "[documentation]") {
         }
     };
 
-    ghoul::Dictionary positive {
-        { "Bool_Force", true }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool_Force", true);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Bool_Force", true },
-        { "Bool_Optional", true }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Bool_Force", true);
+    positive2.setValue("Bool_Optional", true);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
     
-    ghoul::Dictionary negative {
-    };
+    ghoul::Dictionary negative;
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Bool_Force");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::MissingKey);
 
-    ghoul::Dictionary negative2 {
-        { "Bool_Optional", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("Bool_Optional", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Bool_Force");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::MissingKey);
 
-    ghoul::Dictionary negative3 {
-        { "Bool_Force", true },
-        { "Bool_Optional", 1 }
-    };
+    ghoul::Dictionary negative3;
+    negative3.setValue("Bool_Force", true);
+    negative3.setValue("Bool_Optional", 1);
     negativeRes = testSpecification(doc, negative3);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -891,37 +885,38 @@ TEST_CASE("Documentation: Required In Optional", "[documentation]") {
         }}
     };
 
-    ghoul::Dictionary positive {
-        {
-            "a", ghoul::Dictionary{
-                { "b", 1 }
-            }
-        }
-    };
+    ghoul::Dictionary positive;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("b", 1);
+        positive.setValue("a", inner);
+    }
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        {
-            "a", ghoul::Dictionary{
-                { "b", 1 },
-                { "c", 2 }
-        }
-        }
-    };
+    ghoul::Dictionary positive2;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("b", 1);
+        inner.setValue("c", 2);
+        positive2.setValue("a", inner);
+    }
     positiveRes = testSpecification(doc, positive2);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive3 {};
+    ghoul::Dictionary positive3;
     positiveRes = testSpecification(doc, positive3);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "c", 2 }}}
-    };
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("c", 2);
+        negative.setValue("a", inner);
+    }
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -936,25 +931,22 @@ TEST_CASE("Documentation: Exhaustive", "[documentation]") {
         {{ "Int", new IntVerifier, Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int" , 1 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 1);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "False_Int", 1 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("False_Int", 1);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Int");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::MissingKey);
 
-    ghoul::Dictionary negative2 {
-        { "Double", 2.0 }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("Double", 2.0);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -972,16 +964,22 @@ TEST_CASE("Documentation: Nested Exhaustive", "[documentation]") {
         }}
     };
 
-    ghoul::Dictionary positive {
-        { "Table", ghoul::Dictionary{{ "a", 1 }}}
-    };
+    ghoul::Dictionary positive;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("a", 1);
+        positive.setValue("Table", inner);
+    }
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Table", ghoul::Dictionary{{ "b", 2.0 }}}
-    };
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("b", 2.0);
+        negative.setValue("Table", inner);
+    }
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -999,9 +997,8 @@ TEST_CASE("Documentation: Empty Entries Non Exhaustive", "[documentation]") {
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "a", 1 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("a", 1);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
@@ -1018,16 +1015,18 @@ TEST_CASE("Documentation: Empty Nested Exhaustive", "[documentation]") {
         }}
     };
 
-    ghoul::Dictionary positive {
-        { "Table", ghoul::Dictionary() }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Table", ghoul::Dictionary());
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Table", ghoul::Dictionary{ { "a", 1 }}}
-    };
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("a", 1);
+        negative.setValue("Table", inner);
+    }
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE(negativeRes.success);
     REQUIRE(negativeRes.offenses.empty());
@@ -1040,16 +1039,14 @@ TEST_CASE("Documentation: Less Int", "[documentation]") {
         {{ "Int", new IntLessVerifier(5), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 10 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 10);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1064,16 +1061,14 @@ TEST_CASE("Documentation: Less Double", "[documentation]") {
         {{ "Double", new DoubleLessVerifier(5.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 0.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 10.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 10.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1088,23 +1083,20 @@ TEST_CASE("Documentation: LessEqual Int", "[documentation]") {
         {{ "Int", new IntLessEqualVerifier(5), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positiveEqual {
-        { "Int", 5 }
-    };
+    ghoul::Dictionary positiveEqual;
+    positiveEqual.setValue("Int", 5);
     positiveRes = testSpecification(doc, positiveEqual);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 10 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 10);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1119,23 +1111,20 @@ TEST_CASE("Documentation: LessEqual Double", "[documentation]") {
         {{ "Double", new DoubleLessEqualVerifier(5.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 0.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positiveEqual {
-        { "Double", 5.0 }
-    };
+    ghoul::Dictionary positiveEqual;
+    positiveEqual.setValue("Double", 5.0);
     positiveRes = testSpecification(doc, positiveEqual);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 10.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 10.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1150,16 +1139,14 @@ TEST_CASE("Documentation: Greater Int", "[documentation]") {
         {{ "Int", new IntGreaterVerifier(5), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 10 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 10);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1174,16 +1161,14 @@ TEST_CASE("Documentation: Greater Double", "[documentation]") {
         {{ "Double", new DoubleGreaterVerifier(5.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 10.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 10.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 0.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1198,23 +1183,20 @@ TEST_CASE("Documentation: GreaterEqual Int", "[documentation]") {
         {{ "Int", new IntGreaterEqualVerifier(5), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 10 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 10);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positiveEqual {
-        { "Int", 5 }
-    };
+    ghoul::Dictionary positiveEqual;
+    positiveEqual.setValue("Int", 5);
     positiveRes = testSpecification(doc, positiveEqual);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1229,23 +1211,20 @@ TEST_CASE("Documentation: GreaterEqual Double", "[documentation]") {
         {{ "Double", new DoubleGreaterEqualVerifier(5.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 10.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 10.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positiveEqual {
-        { "Double", 5.0 }
-    };
+    ghoul::Dictionary positiveEqual;
+    positiveEqual.setValue("Double", 5.0);
     positiveRes = testSpecification(doc, positiveEqual);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 0.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1260,16 +1239,14 @@ TEST_CASE("Documentation: Equal Bool", "[documentation]") {
         {{ "Bool", new BoolEqualVerifier(true), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Bool", true}
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool", true);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Bool", false }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Bool", false);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1284,16 +1261,14 @@ TEST_CASE("Documentation: Equal Int", "[documentation]") {
         {{ "Int", new IntEqualVerifier(1), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 1}
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 1);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1308,16 +1283,14 @@ TEST_CASE("Documentation: Equal Double", "[documentation]") {
         {{ "Double", new DoubleEqualVerifier(1.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 1.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 1.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 0.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1333,16 +1306,14 @@ TEST_CASE("Documentation: Equal String", "[documentation]") {
         {{ "String", new StringEqualVerifier("string"s), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "String", "string"s }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("String", "string"s);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "String", "no_string"s }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("String", "no_string"s);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1357,16 +1328,14 @@ TEST_CASE("Documentation: Unequal Bool", "[documentation]") {
         {{ "Bool", new BoolUnequalVerifier(true), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Bool", false }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool", false);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Bool", true }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Bool", true);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1381,16 +1350,14 @@ TEST_CASE("Documentation: Unequal Int", "[documentation]") {
         {{ "Int", new IntUnequalVerifier(1), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 1 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 1);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1405,16 +1372,14 @@ TEST_CASE("Documentation: Unequal Double", "[documentation]") {
         {{ "Double", new DoubleUnequalVerifier(1.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 0.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 1.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 1.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1430,16 +1395,14 @@ TEST_CASE("Documentation: Unequal String", "[documentation]") {
         {{ "String", new StringUnequalVerifier("string"s), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "String", "no_string"s }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("String", "no_string"s);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "String", "string"s }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("String", "string"s);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1454,16 +1417,14 @@ TEST_CASE("Documentation: List Bool", "[documentation]") {
         {{ "Bool" , new BoolInListVerifier({ true }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Bool", true }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool", true);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Bool", false }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Bool", false);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1478,23 +1439,20 @@ TEST_CASE("Documentation: List Int", "[documentation]") {
         {{ "Int" , new IntInListVerifier({ 0, 1, 2 }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 1 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 1);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Int", 2 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Int", 2);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 5 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 5);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1509,23 +1467,20 @@ TEST_CASE("Documentation: List Double", "[documentation]") {
         {{ "Double" , new DoubleInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 1.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 1.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Double", 2.0 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Double", 2.0);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 5.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 5.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1541,23 +1496,20 @@ TEST_CASE("Documentation: List String", "[documentation]") {
         {{ "String" , new StringInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "String", "1"s }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("String", "1"s);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "String", "2"s }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("String", "2"s);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "String", "5"s }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("String", "5"s);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1572,16 +1524,14 @@ TEST_CASE("Documentation: NotList Bool", "[documentation]") {
         {{ "Bool" , new BoolNotInListVerifier({ true }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Bool", false }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool", false);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Bool", true }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Bool", true);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1596,23 +1546,20 @@ TEST_CASE("Documentation: NotList Int", "[documentation]") {
         {{ "Int" , new IntNotInListVerifier({ 0, 1, 2 }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", -1 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", -1);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Int", 3 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Int", 3);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 2 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 2);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1627,23 +1574,20 @@ TEST_CASE("Documentation: NotList Double", "[documentation]") {
         {{ "Double" , new DoubleNotInListVerifier({ 0.0, 1.0, 2.0 }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", -1.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", -1.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Double", 3.0 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Double", 3.0);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 1.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 1.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1659,23 +1603,20 @@ TEST_CASE("Documentation: NotList String", "[documentation]") {
         {{ "String" , new StringNotInListVerifier({ "0"s, "1"s, "2"s }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "String", "string"s }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("String", "string"s);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "String", "foo_string"s }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("String", "foo_string"s);
     positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "String", "1"s }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("String", "1"s);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1690,16 +1631,14 @@ TEST_CASE("Documentation: Annotation Bool", "[documentation]") {
         {{ "Bool", new BoolAnnotationVerifier("Bool"), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Bool", true }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Bool", true);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Bool", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Bool", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1714,16 +1653,14 @@ TEST_CASE("Documentation: Annotation Int", "[documentation]") {
         {{ "Int", new IntAnnotationVerifier("Int"), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 1 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 1);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 1.1 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 1.1);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1738,16 +1675,14 @@ TEST_CASE("Documentation: Annotation Double", "[documentation]") {
         {{ "Double", new DoubleAnnotationVerifier("Double"), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 0.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", true }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", true);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1763,16 +1698,14 @@ TEST_CASE("Documentation: Annotation String", "[documentation]") {
         {{ "String", new StringAnnotationVerifier("String"), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "String", ""s }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("String", ""s);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "String", 1 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("String", 1);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1787,16 +1720,14 @@ TEST_CASE("Documentation: Annotation Table", "[documentation]") {
         {{ "Table", new TableAnnotationVerifier("Table"), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Table", ghoul::Dictionary{} }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Table", ghoul::Dictionary());
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Table", 1 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Table", 1);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1811,30 +1742,26 @@ TEST_CASE("Documentation: InRange Int", "[documentation]") {
         {{ "Int", new InRangeVerifier<IntVerifier>(0, 5), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", 2 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", 2);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Int", 0);
     positiveRes = testSpecification(doc, positive2);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive3 {
-        { "Int", 5 }
-    };
+    ghoul::Dictionary positive3;
+    positive3.setValue("Int", 5);
     positiveRes = testSpecification(doc, positive3);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 10 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 10);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1849,37 +1776,32 @@ TEST_CASE("Documentation: InRange Double", "[documentation]") {
         {{ "Double", new InRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", 2.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", 2.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Double", 0.0);
     positiveRes = testSpecification(doc, positive2);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive3 {
-        { "Double", 5.0 }
-    };
+    ghoul::Dictionary positive3;
+    positive3.setValue("Double", 5.0);
     positiveRes = testSpecification(doc, positive3);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive4 {
-        { "Double", 1.5 }
-    };
+    ghoul::Dictionary positive4;
+    positive4.setValue("Double", 1.5);
     positiveRes = testSpecification(doc, positive4);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 10.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 10.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1894,41 +1816,36 @@ TEST_CASE("Documentation: NotInRange Int", "[documentation]") {
         {{ "Int", new NotInRangeVerifier<IntVerifier>(0, 5), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Int", -1 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Int", -1);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Int", 6 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Int", 6);
     positiveRes = testSpecification(doc, positive2);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Int", 2 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Int", 2);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Int");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
 
-    ghoul::Dictionary negative2 {
-        { "Int", 0 }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("Int", 0);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Int");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
 
-    ghoul::Dictionary negative3 {
-        { "Int", 5 }
-    };
+    ghoul::Dictionary negative3;
+    negative3.setValue("Int", 5);
     negativeRes = testSpecification(doc, negative3);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1943,41 +1860,36 @@ TEST_CASE("Documentation: NotInRange Double", "[documentation]") {
         {{ "Double", new NotInRangeVerifier<DoubleVerifier>(0.0, 5.0), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "Double", -1.0 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("Double", -1.0);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "Double", 6.0 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("Double", 6.0);
     positiveRes = testSpecification(doc, positive2);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Double", 0.0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Double", 0.0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Double");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
 
-    ghoul::Dictionary negative2 {
-        { "Double", 5.0 }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("Double", 5.0);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Double");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
 
-    ghoul::Dictionary negative3 {
-        { "Double", 2.5 }
-    };
+    ghoul::Dictionary negative3;
+    negative3.setValue("Double", 2.5);
     negativeRes = testSpecification(doc, negative3);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -1992,31 +1904,28 @@ TEST_CASE("Documentation: Wildcard", "[documentation]") {
         {{ DocumentationEntry::Wildcard, new IntVerifier, Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "a", 1 },
-        { "b", 2 },
-        { "c", 3 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", 1);
+    positive.setValue("b", 2);
+    positive.setValue("c", 3);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", false },
-        { "b", 2 },
-        { "c", 3 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("a", false);
+    negative.setValue("b", 2);
+    negative.setValue("c", 3);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", false },
-        { "b", false },
-        { "c", 3 }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", false);
+    negative2.setValue("b", false);
+    negative2.setValue("c", 3);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 2);
@@ -2025,11 +1934,10 @@ TEST_CASE("Documentation: Wildcard", "[documentation]") {
     REQUIRE(negativeRes.offenses[1].offender == "b");
     REQUIRE(negativeRes.offenses[1].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative3 {
-        { "a", false },
-        { "b", false },
-        { "c", false }
-    };
+    ghoul::Dictionary negative3;
+    negative3.setValue("a", false);
+    negative3.setValue("b", false);
+    negative3.setValue("c", false);
     negativeRes = testSpecification(doc, negative3);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 3);
@@ -2051,20 +1959,18 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
         }
     };
 
-    ghoul::Dictionary positive {
-        { "a", 1 },
-        { "b", 8 },
-        { "c", 3 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", 1);
+    positive.setValue("b", 8);
+    positive.setValue("c", 3);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", false },
-        { "b", 2 },
-        { "c", 3 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("a", false);
+    negative.setValue("b", 2);
+    negative.setValue("c", 3);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 2);
@@ -2073,11 +1979,10 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
     REQUIRE(negativeRes.offenses[1].offender == "b");
     REQUIRE(negativeRes.offenses[1].reason == TestResult::Offense::Reason::Verification);
 
-    ghoul::Dictionary negative2 {
-        { "a", false },
-        { "b", false },
-        { "c", 3 }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", false);
+    negative2.setValue("b", false);
+    negative2.setValue("c", 3);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 2);
@@ -2086,11 +1991,10 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
     REQUIRE(negativeRes.offenses[1].offender == "b");
     REQUIRE(negativeRes.offenses[1].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative3 {
-        { "a", false },
-        { "b", 1 },
-        { "c", false }
-    };
+    ghoul::Dictionary negative3;
+    negative3.setValue("a", false);
+    negative3.setValue("b", 1);
+    negative3.setValue("c", false);
     negativeRes = testSpecification(doc, negative3);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 3);
@@ -2101,11 +2005,10 @@ TEST_CASE("Documentation: Wildcard Mixed", "[documentation]") {
     REQUIRE(negativeRes.offenses[2].offender == "c");
     REQUIRE(negativeRes.offenses[2].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative4 {
-        { "a", false },
-        { "b", 10 },
-        { "c", false }
-    };
+    ghoul::Dictionary negative4;
+    negative4.setValue("a", false);
+    negative4.setValue("b", 10);
+    negative4.setValue("c", false);
     negativeRes = testSpecification(doc, negative4);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 2);
@@ -2132,25 +2035,31 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
         { "Table", new ReferencingVerifier("referenced_id"), Optional::No }
     }};
 
-    ghoul::Dictionary positive {
-        { "Table", ghoul::Dictionary{ { "a", 1 }, { "b", 2.0 } }}
+    ghoul::Dictionary positive;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("a", 1);
+        inner.setValue("b", 2.0);
+        positive.setValue("Table", inner);
     };
-
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "Table", 1 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("Table", 1);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "Table");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "Table", ghoul::Dictionary{ { "a", 1 }, { "b", true }}}
+    ghoul::Dictionary negative2;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("a", 1);
+        inner.setValue("b", true);
+        negative2.setValue("Table", inner);
     };
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
@@ -2162,9 +2071,13 @@ TEST_CASE("Documentation: Referencing", "[documentation]") {
     Documentation wrongDoc {{
         { "Table", new ReferencingVerifier("WRONG"), Optional::No }
     } };
-    ghoul::Dictionary wrongNegative {
-        { "Table", ghoul::Dictionary{ { "a", 1 },{ "b", 2.0 } } }
-    };
+    ghoul::Dictionary wrongNegative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("a", 1);
+        inner.setValue("b", 2.0);
+        wrongNegative.setValue("Table", inner);
+    }
     negativeRes = testSpecification(wrongDoc, wrongNegative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2189,25 +2102,22 @@ TEST_CASE("Documentation: AndOperator", "[documentation]") {
         }
     };
 
-    ghoul::Dictionary positive {
-        { "a", 4 }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", 4);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", 0 }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("a", 0);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
 
-    ghoul::Dictionary negative2 {
-        { "a", 8 }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", 8);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2223,23 +2133,20 @@ TEST_CASE("Documentation: OrOperator", "[documentation]") {
         {{ "a", new OrVerifier({ new StringVerifier, new IntVerifier }), Optional::No }}
     };
 
-    ghoul::Dictionary positive {
-        { "a", ""s }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", ""s);
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary positive2 {
-        { "a", 1 }
-    };
+    ghoul::Dictionary positive2;
+    positive2.setValue("a", 1);
     positiveRes = testSpecification(doc, positive2);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", false }
-    };
+    ghoul::Dictionary negative;
+    negative.setValue("a", false);
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2247,39 +2154,6 @@ TEST_CASE("Documentation: OrOperator", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::Verification);
 }
 
-TEST_CASE("Documentation: BoolVector2Verifier", "[documentation]") {
-    using namespace openspace::documentation;
-
-    Documentation doc {
-        {{ "a", new BoolVector2Verifier, Optional::No }}
-    };
-
-    ghoul::Dictionary positive {
-        { "a", glm::bvec2(true) }
-    };
-    TestResult positiveRes = testSpecification(doc, positive);
-    REQUIRE(positiveRes.success);
-    REQUIRE(positiveRes.offenses.empty());
-
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true }, { "2", 1.0 } } }
-    };
-    TestResult negativeRes = testSpecification(doc, negative);
-    REQUIRE_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    REQUIRE(negativeRes.offenses[0].offender == "a");
-    REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
-
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
-    negativeRes = testSpecification(doc, negative2);
-    REQUIRE_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    REQUIRE(negativeRes.offenses[0].offender == "a");
-    REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
-}
-
 TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
     using namespace openspace::documentation;
 
@@ -2287,15 +2161,18 @@ TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
         { { "a", new IntVector2Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::ivec2(2) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::ivec2(2));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1 } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2303,9 +2180,8 @@ TEST_CASE("Documentation: IntVector2Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2320,15 +2196,18 @@ TEST_CASE("Documentation: DoubleVector2Verifier", "[documentation]") {
         { { "a", new DoubleVector2Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dvec2(2.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dvec2(2.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true }, { "2", 1.0 } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2336,42 +2215,8 @@ TEST_CASE("Documentation: DoubleVector2Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
-    negativeRes = testSpecification(doc, negative2);
-    REQUIRE_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    REQUIRE(negativeRes.offenses[0].offender == "a");
-    REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
-}
-
-TEST_CASE("Documentation: BoolVector3Verifier", "[documentation]") {
-    using namespace openspace::documentation;
-
-    Documentation doc {
-        { { "a", new BoolVector3Verifier, Optional::No } }
-    };
-
-    ghoul::Dictionary positive {
-        { "a", glm::bvec3(true) }
-    };
-    TestResult positiveRes = testSpecification(doc, positive);
-    REQUIRE(positiveRes.success);
-    REQUIRE(positiveRes.offenses.empty());
-
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 }, { "3", "s" } } }
-    };
-    TestResult negativeRes = testSpecification(doc, negative);
-    REQUIRE_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    REQUIRE(negativeRes.offenses[0].offender == "a");
-    REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
-
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2381,20 +2226,25 @@ TEST_CASE("Documentation: BoolVector3Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: IntVector3Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new IntVector3Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::ivec3(2) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::ivec3(2));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1 }, { "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2402,9 +2252,8 @@ TEST_CASE("Documentation: IntVector3Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2414,20 +2263,25 @@ TEST_CASE("Documentation: IntVector3Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleVector3Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleVector3Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dvec3(2.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dvec3(2.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 }, { "3", "s"} } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2435,42 +2289,8 @@ TEST_CASE("Documentation: DoubleVector3Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
-    negativeRes = testSpecification(doc, negative2);
-    REQUIRE_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    REQUIRE(negativeRes.offenses[0].offender == "a");
-    REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
-}
-
-TEST_CASE("Documentation: BoolVector4Verifier", "[documentation]") {
-    using namespace openspace::documentation;
-
-    Documentation doc {
-        { { "a", new BoolVector4Verifier, Optional::No } }
-    };
-
-    ghoul::Dictionary positive {
-        { "a", glm::bvec4(true) }
-    };
-    TestResult positiveRes = testSpecification(doc, positive);
-    REQUIRE(positiveRes.success);
-    REQUIRE(positiveRes.offenses.empty());
-
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 }, { "3", "s" }, { "4", 1 }}}
-    };
-    TestResult negativeRes = testSpecification(doc, negative);
-    REQUIRE_FALSE(negativeRes.success);
-    REQUIRE(negativeRes.offenses.size() == 1);
-    REQUIRE(negativeRes.offenses[0].offender == "a");
-    REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
-
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2480,20 +2300,26 @@ TEST_CASE("Documentation: BoolVector4Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: IntVector4Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new IntVector4Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::ivec4(2) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::ivec4(2));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1 },{ "3", "s" }, { "4", 1 } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1);
+        inner.setValue("3", "s"s);
+        inner.setValue("4", 1);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2501,9 +2327,8 @@ TEST_CASE("Documentation: IntVector4Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2{
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2513,20 +2338,26 @@ TEST_CASE("Documentation: IntVector4Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleVector4Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleVector4Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dvec4(2.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dvec4(2.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" }, { "4", 1 } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        inner.setValue("4", 1);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2534,9 +2365,8 @@ TEST_CASE("Documentation: DoubleVector4Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2546,20 +2376,25 @@ TEST_CASE("Documentation: DoubleVector4Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix2x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix2x2Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat2x2(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat2x2(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary { { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2567,9 +2402,8 @@ TEST_CASE("Documentation: DoubleMatrix2x2Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2579,30 +2413,34 @@ TEST_CASE("Documentation: DoubleMatrix2x2Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix2x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix2x3Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat2x3(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat2x3(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
-    };
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
+    }
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2612,20 +2450,25 @@ TEST_CASE("Documentation: DoubleMatrix2x3Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix2x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix2x4Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat2x4(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat2x4(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2633,9 +2476,8 @@ TEST_CASE("Documentation: DoubleMatrix2x4Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2645,20 +2487,25 @@ TEST_CASE("Documentation: DoubleMatrix2x4Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix3x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix3x2Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat3x2(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat3x2(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2666,9 +2513,8 @@ TEST_CASE("Documentation: DoubleMatrix3x2Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2678,20 +2524,25 @@ TEST_CASE("Documentation: DoubleMatrix3x2Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix3x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix3x3Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat3x3(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat3x3(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2699,9 +2550,8 @@ TEST_CASE("Documentation: DoubleMatrix3x3Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2711,20 +2561,25 @@ TEST_CASE("Documentation: DoubleMatrix3x3Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix3x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix3x4Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat3x4(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat3x4(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2732,9 +2587,8 @@ TEST_CASE("Documentation: DoubleMatrix3x4Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2744,20 +2598,25 @@ TEST_CASE("Documentation: DoubleMatrix3x4Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix4x2Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix4x2Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat4x2(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat4x2(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2765,9 +2624,8 @@ TEST_CASE("Documentation: DoubleMatrix4x2Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2777,20 +2635,25 @@ TEST_CASE("Documentation: DoubleMatrix4x2Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix4x3Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix4x3Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat4x3(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat4x3(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2798,9 +2661,8 @@ TEST_CASE("Documentation: DoubleMatrix4x3Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2810,20 +2672,25 @@ TEST_CASE("Documentation: DoubleMatrix4x3Verifier", "[documentation]") {
 
 TEST_CASE("Documentation: DoubleMatrix4x4Verifier", "[documentation]") {
     using namespace openspace::documentation;
+    using namespace std::string_literals;
 
     Documentation doc {
         { { "a", new DoubleMatrix4x4Verifier, Optional::No } }
     };
 
-    ghoul::Dictionary positive {
-        { "a", glm::dmat4x4(1.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("a", glm::dmat4x4(1.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
 
-    ghoul::Dictionary negative {
-        { "a", ghoul::Dictionary{ { "1", true },{ "2", 1.0 },{ "3", "s" } } }
+    ghoul::Dictionary negative;
+    {
+        ghoul::Dictionary inner;
+        inner.setValue("1", true);
+        inner.setValue("2", 1.0);
+        inner.setValue("3", "s"s);
+        negative.setValue("a", inner);
     };
     TestResult negativeRes = testSpecification(doc, negative);
     REQUIRE_FALSE(negativeRes.success);
@@ -2831,9 +2698,8 @@ TEST_CASE("Documentation: DoubleMatrix4x4Verifier", "[documentation]") {
     REQUIRE(negativeRes.offenses[0].offender == "a");
     REQUIRE(negativeRes.offenses[0].reason == TestResult::Offense::Reason::WrongType);
 
-    ghoul::Dictionary negative2 {
-        { "a", true }
-    };
+    ghoul::Dictionary negative2;
+    negative2.setValue("a", true);
     negativeRes = testSpecification(doc, negative2);
     REQUIRE_FALSE(negativeRes.success);
     REQUIRE(negativeRes.offenses.size() == 1);
@@ -2850,62 +2716,50 @@ TEST_CASE("Documentation: DeprecatedVerifier", "[documentation]") {
         { "int" , new IntDeprecatedVerifier, Optional::No },
         { "double", new DoubleDeprecatedVerifier, Optional::No },
         { "string" , new StringDeprecatedVerifier, Optional::No },
-        { "boolvec2", new DeprecatedVerifier<BoolVector2Verifier>, Optional::No },
         { "intvec2", new DeprecatedVerifier<IntVector2Verifier>, Optional::No },
         { "doublevec2", new DeprecatedVerifier<DoubleVector2Verifier>, Optional::No },
-        { "boolvec3", new DeprecatedVerifier<BoolVector3Verifier>, Optional::No },
         { "intvec3", new DeprecatedVerifier<IntVector3Verifier>, Optional::No },
         { "doublevec3", new DeprecatedVerifier<DoubleVector3Verifier>, Optional::No },
-        { "boolvec4", new DeprecatedVerifier<BoolVector4Verifier>, Optional::No },
         { "intvec4", new DeprecatedVerifier<IntVector4Verifier>, Optional::No },
         { "doublevec4", new DeprecatedVerifier<DoubleVector4Verifier>, Optional::No }
     }};
 
-    ghoul::Dictionary positive {
-        { "bool", true },
-        { "int", 1 },
-        { "double", 2.0 },
-        { "string" , ""s },
-        { "boolvec2", glm::bvec2(false) },
-        { "intvec2", glm::ivec2(0) },
-        { "doublevec2", glm::dvec2(0.0) },
-        { "boolvec3", glm::bvec3(false) },
-        { "intvec3", glm::ivec3(0) },
-        { "doublevec3", glm::dvec3(0.0) },
-        { "boolvec4", glm::bvec4(false) },
-        { "intvec4", glm::ivec4(0) },
-        { "doublevec4", glm::dvec4(0.0) }
-    };
+    ghoul::Dictionary positive;
+    positive.setValue("bool", true);
+    positive.setValue("int", 1);
+    positive.setValue("double", 2.0);
+    positive.setValue("string", ""s);
+    positive.setValue("intvec2", glm::ivec2(0));
+    positive.setValue("doublevec2", glm::dvec2(0.0));
+    positive.setValue("intvec3", glm::ivec3(0));
+    positive.setValue("doublevec3", glm::dvec3(0.0));
+    positive.setValue("intvec4", glm::ivec4(0));
+    positive.setValue("doublevec4", glm::dvec4(0.0));
     TestResult positiveRes = testSpecification(doc, positive);
     REQUIRE(positiveRes.success);
     REQUIRE(positiveRes.offenses.empty());
-    REQUIRE(positiveRes.warnings.size() == 13);
+    REQUIRE(positiveRes.warnings.size() == doc.entries.size());
+
     REQUIRE(positiveRes.warnings[0].offender == "bool");
     REQUIRE(positiveRes.warnings[0].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[1].offender == "boolvec2");
+    REQUIRE(positiveRes.warnings[1].offender == "double");
     REQUIRE(positiveRes.warnings[1].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[2].offender == "boolvec3");
+    REQUIRE(positiveRes.warnings[2].offender == "doublevec2");
     REQUIRE(positiveRes.warnings[2].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[3].offender == "boolvec4");
+    REQUIRE(positiveRes.warnings[3].offender == "doublevec3");
     REQUIRE(positiveRes.warnings[3].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[4].offender == "double");
+    REQUIRE(positiveRes.warnings[4].offender == "doublevec4");
     REQUIRE(positiveRes.warnings[4].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[5].offender == "doublevec2");
+    REQUIRE(positiveRes.warnings[5].offender == "int");
     REQUIRE(positiveRes.warnings[5].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[6].offender == "doublevec3");
+    REQUIRE(positiveRes.warnings[6].offender == "intvec2");
     REQUIRE(positiveRes.warnings[6].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[7].offender == "doublevec4");
+    REQUIRE(positiveRes.warnings[7].offender == "intvec3");
     REQUIRE(positiveRes.warnings[7].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[8].offender == "int");
+    REQUIRE(positiveRes.warnings[8].offender == "intvec4");
     REQUIRE(positiveRes.warnings[8].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[9].offender == "intvec2");
+    REQUIRE(positiveRes.warnings[9].offender == "string");
     REQUIRE(positiveRes.warnings[9].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[10].offender == "intvec3");
-    REQUIRE(positiveRes.warnings[10].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[11].offender == "intvec4");
-    REQUIRE(positiveRes.warnings[11].reason == TestResult::Warning::Reason::Deprecated);
-    REQUIRE(positiveRes.warnings[12].offender == "string");
-    REQUIRE(positiveRes.warnings[12].reason == TestResult::Warning::Reason::Deprecated);
 }
 
 TEST_CASE("Documentation: Verifier Type Post Conditions", "[documentation]") {
@@ -2918,13 +2772,10 @@ TEST_CASE("Documentation: Verifier Type Post Conditions", "[documentation]") {
     REQUIRE(StringVerifier().type() != "");
     REQUIRE(TableVerifier().type() != "");
 
-    REQUIRE(BoolVector2Verifier().type() != "");
     REQUIRE(IntVector2Verifier().type() != "");
     REQUIRE(DoubleVector2Verifier().type() != "");
-    REQUIRE(BoolVector3Verifier().type() != "");
     REQUIRE(IntVector3Verifier().type() != "");
     REQUIRE(DoubleVector3Verifier().type() != "");
-    REQUIRE(BoolVector4Verifier().type() != "");
     REQUIRE(IntVector4Verifier().type() != "");
     REQUIRE(DoubleVector4Verifier().type() != "");
 
@@ -2965,13 +2816,10 @@ TEST_CASE("Documentation: Verifier Type Post Conditions", "[documentation]") {
     REQUIRE(DoubleAnnotationVerifier("A"s).type() != "");
     REQUIRE(StringAnnotationVerifier("A"s).type() != "");
     REQUIRE(TableAnnotationVerifier("A"s).type() != "");
-    REQUIRE(AnnotationVerifier<BoolVector2Verifier>("A"s).type() != "");
     REQUIRE(AnnotationVerifier<IntVector2Verifier>("A"s).type() != "");
     REQUIRE(AnnotationVerifier<DoubleVector2Verifier>("A"s).type() != "");
-    REQUIRE(AnnotationVerifier<BoolVector3Verifier>("A"s).type() != "");
     REQUIRE(AnnotationVerifier<IntVector3Verifier>("A"s).type() != "");
     REQUIRE(AnnotationVerifier<DoubleVector3Verifier>("A"s).type() != "");
-    REQUIRE(AnnotationVerifier<BoolVector4Verifier>("A"s).type() != "");
     REQUIRE(AnnotationVerifier<IntVector4Verifier>("A"s).type() != "");
     REQUIRE(AnnotationVerifier<DoubleVector4Verifier>("A"s).type() != "");
 
@@ -2980,13 +2828,10 @@ TEST_CASE("Documentation: Verifier Type Post Conditions", "[documentation]") {
     REQUIRE(DoubleDeprecatedVerifier().type() != "");
     REQUIRE(StringDeprecatedVerifier().type() != "");
     REQUIRE(TableDeprecatedVerifier().type() != "");
-    REQUIRE(DeprecatedVerifier<BoolVector2Verifier>().type() != "");
     REQUIRE(DeprecatedVerifier<IntVector2Verifier>().type() != "");
     REQUIRE(DeprecatedVerifier<DoubleVector2Verifier>().type() != "");
-    REQUIRE(DeprecatedVerifier<BoolVector3Verifier>().type() != "");
     REQUIRE(DeprecatedVerifier<IntVector3Verifier>().type() != "");
     REQUIRE(DeprecatedVerifier<DoubleVector3Verifier>().type() != "");
-    REQUIRE(DeprecatedVerifier<BoolVector4Verifier>().type() != "");
     REQUIRE(DeprecatedVerifier<IntVector4Verifier>().type() != "");
     REQUIRE(DeprecatedVerifier<DoubleVector4Verifier>().type() != "");
 
@@ -3003,13 +2848,10 @@ TEST_CASE("Documentation: Verifier Documentation Post Conditions", "[documentati
     REQUIRE(StringVerifier().documentation() != "");
     REQUIRE(TableVerifier().documentation() != "");
 
-    REQUIRE(BoolVector2Verifier().documentation() != "");
     REQUIRE(IntVector2Verifier().documentation() != "");
     REQUIRE(DoubleVector2Verifier().documentation() != "");
-    REQUIRE(BoolVector3Verifier().documentation() != "");
     REQUIRE(IntVector3Verifier().documentation() != "");
     REQUIRE(DoubleVector3Verifier().documentation() != "");
-    REQUIRE(BoolVector4Verifier().documentation() != "");
     REQUIRE(IntVector4Verifier().documentation() != "");
     REQUIRE(DoubleVector4Verifier().documentation() != "");
 
@@ -3050,13 +2892,10 @@ TEST_CASE("Documentation: Verifier Documentation Post Conditions", "[documentati
     REQUIRE(DoubleAnnotationVerifier("A"s).documentation() != "");
     REQUIRE(StringAnnotationVerifier("A"s).documentation() != "");
     REQUIRE(TableAnnotationVerifier("A"s).documentation() != "");
-    REQUIRE(AnnotationVerifier<BoolVector2Verifier>("A"s).documentation() != "");
     REQUIRE(AnnotationVerifier<IntVector2Verifier>("A"s).documentation() != "");
     REQUIRE(AnnotationVerifier<DoubleVector2Verifier>("A"s).documentation() != "");
-    REQUIRE(AnnotationVerifier<BoolVector3Verifier>("A"s).documentation() != "");
     REQUIRE(AnnotationVerifier<IntVector3Verifier>("A"s).documentation() != "");
     REQUIRE(AnnotationVerifier<DoubleVector3Verifier>("A"s).documentation() != "");
-    REQUIRE(AnnotationVerifier<BoolVector4Verifier>("A"s).documentation() != "");
     REQUIRE(AnnotationVerifier<IntVector4Verifier>("A"s).documentation() != "");
     REQUIRE(AnnotationVerifier<DoubleVector4Verifier>("A"s).documentation() != "");
 
@@ -3065,13 +2904,10 @@ TEST_CASE("Documentation: Verifier Documentation Post Conditions", "[documentati
     REQUIRE(DoubleDeprecatedVerifier().documentation() != "");
     REQUIRE(StringDeprecatedVerifier().documentation() != "");
     REQUIRE(TableDeprecatedVerifier().documentation() != "");
-    REQUIRE(DeprecatedVerifier<BoolVector2Verifier>().documentation() != "");
     REQUIRE(DeprecatedVerifier<IntVector2Verifier>().documentation() != "");
     REQUIRE(DeprecatedVerifier<DoubleVector2Verifier>().documentation() != "");
-    REQUIRE(DeprecatedVerifier<BoolVector3Verifier>().documentation() != "");
     REQUIRE(DeprecatedVerifier<IntVector3Verifier>().documentation() != "");
     REQUIRE(DeprecatedVerifier<DoubleVector3Verifier>().documentation() != "");
-    REQUIRE(DeprecatedVerifier<BoolVector4Verifier>().documentation() != "");
     REQUIRE(DeprecatedVerifier<IntVector4Verifier>().documentation() != "");
     REQUIRE(DeprecatedVerifier<DoubleVector4Verifier>().documentation() != "");
 
diff --git a/tests/test_iswamanager.cpp b/tests/test_iswamanager.cpp
index 7997fb45fa..f557a05a5a 100644
--- a/tests/test_iswamanager.cpp
+++ b/tests/test_iswamanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_latlonpatch.cpp b/tests/test_latlonpatch.cpp
index df459ec25c..488e8d32fb 100644
--- a/tests/test_latlonpatch.cpp
+++ b/tests/test_latlonpatch.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -71,72 +71,72 @@ TEST_CASE("LatLonPatch: Find Closest Corner 2", "[latlonpatch]") {
 }
 
 TEST_CASE("LatLonPatch: Spherical Clamp 1", "[latlonpatch]") {
-    using namespace openspace::globebrowsing;
+    //using namespace openspace::globebrowsing;
 
-    GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
+    //GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
 
-    // inside patch latitude-wise, east of patch longitude-wise
-    Geodetic2 point { glm::pi<double>() / 6.0, glm::pi<double>() / 4.0 - 0.01 };
+    //// inside patch latitude-wise, east of patch longitude-wise
+    //Geodetic2 point { glm::pi<double>() / 6.0, glm::pi<double>() / 4.0 - 0.01 };
 
 
-    Geodetic2 clampedPoint = patch.closestPoint(point);
-    Geodetic2 neCorner = patch.corner(NORTH_EAST);
+    //Geodetic2 clampedPoint = patch.closestPoint(point);
+    //Geodetic2 neCorner = patch.corner(NORTH_EAST);
     //REQUIRE(clampedPoint.lat == neCorner.lat);
     //REQUIRE(clampedPoint.lon == neCorner.lon);
 }
 
 TEST_CASE("LatLonPatch: Spherical Clamp 2", "[latlonpatch]") {
-    using namespace openspace::globebrowsing;
+    //using namespace openspace::globebrowsing;
 
-    GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
+    //GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
 
-    // inside patch latitude-wise, west of patch longitude-wise
-    Geodetic2 point { glm::pi<double>() / 6.0, glm::pi<double>() / 4.0 + 0.01 };
+    //// inside patch latitude-wise, west of patch longitude-wise
+    //Geodetic2 point { glm::pi<double>() / 6.0, glm::pi<double>() / 4.0 + 0.01 };
 
-    Geodetic2 clampedPoint = patch.closestPoint(point);
-    Geodetic2 nwCorner = patch.corner(NORTH_WEST);
+    //Geodetic2 clampedPoint = patch.closestPoint(point);
+    //Geodetic2 nwCorner = patch.corner(NORTH_WEST);
     //REQUIRE(clampedPoint.lat == nwCorner.lat);
     //REQUIRE(clampedPoint.lon == nwCorner.lon);
 }
 
 TEST_CASE("LatLonPatch: Spherical Clamp 3", "[latlonpatch]") {
-    using namespace openspace::globebrowsing;
+    //using namespace openspace::globebrowsing;
 
-    GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
+    //GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
 
-    // North east of patch
-    Geodetic2 point { glm::pi<double>() / 3.0, glm::pi<double>() / 4.0 - 0.01 };
+    //// North east of patch
+    //Geodetic2 point { glm::pi<double>() / 3.0, glm::pi<double>() / 4.0 - 0.01 };
 
-    Geodetic2 clampedPoint = patch.closestPoint(point);
-    Geodetic2 neCorner = patch.corner(NORTH_EAST);
+    //Geodetic2 clampedPoint = patch.closestPoint(point);
+    //Geodetic2 neCorner = patch.corner(NORTH_EAST);
     //REQUIRE(clampedPoint.lat == neCorner.lat);
     //REQUIRE(clampedPoint.lon == neCorner.lon);
 }
 
 TEST_CASE("LatLonPatch: Spherical Clamp 4", "[latlonpatch]") {
-    using namespace openspace::globebrowsing;
+    //using namespace openspace::globebrowsing;
 
-    GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
+    //GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
 
-    // South east of patch
-    Geodetic2 point { -glm::pi<double>() / 3.0, glm::pi<double>() / 4.0 - 0.01 };
+    //// South east of patch
+    //Geodetic2 point { -glm::pi<double>() / 3.0, glm::pi<double>() / 4.0 - 0.01 };
 
-    Geodetic2 clampedPoint = patch.closestPoint(point);
-    Geodetic2 seCorner = patch.corner(SOUTH_EAST);
+    //Geodetic2 clampedPoint = patch.closestPoint(point);
+    //Geodetic2 seCorner = patch.corner(SOUTH_EAST);
     //REQUIRE(clampedPoint.lat == seCorner.lat);
     //REQUIRE(clampedPoint.lon == seCorner.lon);
 }
 
 TEST_CASE("LatLonPatch: Spherical Clamp 5", "[latlonpatch]") {
-    using namespace openspace::globebrowsing;
+    //using namespace openspace::globebrowsing;
 
-    GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
+    //GeodeticPatch patch(0, 0, glm::pi<float>() / 4.f, glm::pi<float>() / 4.f);
 
-    // South west of patch
-    Geodetic2 point { -glm::pi<double>() / 3.0, 3 * glm::pi<double>() / 4.0 + 0.01 };
+    //// South west of patch
+    //Geodetic2 point { -glm::pi<double>() / 3.0, 3 * glm::pi<double>() / 4.0 + 0.01 };
 
-    Geodetic2 clampedPoint = patch.closestPoint(point);
-    Geodetic2 swCorner = patch.corner(SOUTH_WEST);
+    //Geodetic2 clampedPoint = patch.closestPoint(point);
+    //Geodetic2 swCorner = patch.corner(SOUTH_WEST);
     //REQUIRE(clampedPoint.lat == swCorner.lat);
     //REQUIRE(clampedPoint.lon == swCorner.lon);
 }
diff --git a/tests/test_lrucache.cpp b/tests/test_lrucache.cpp
index 27e95f02c3..8e3dae567f 100644
--- a/tests/test_lrucache.cpp
+++ b/tests/test_lrucache.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_lua_createsinglecolorimage.cpp b/tests/test_lua_createsinglecolorimage.cpp
new file mode 100644
index 0000000000..e2311a5cf9
--- /dev/null
+++ b/tests/test_lua_createsinglecolorimage.cpp
@@ -0,0 +1,162 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * 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/engine/openspaceengine.h>
+#include <ghoul/filesystem/file.h>
+#include <ghoul/filesystem/filesystem.h>
+#include <ghoul/lua/ghoul_lua.h>
+#include <ghoul/lua/luastate.h>
+#include <ghoul/lua/lua_helper.h>
+
+TEST_CASE("CreateSingleColorImage: Create image and check return value",
+          "[createsinglecolorimage]")
+{
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, "colorFile");
+    ghoul::lua::push(L, std::vector{ 1.0, 0.0, 0.0 });
+
+    int res = openspace::luascriptfunctions::createSingeColorImage(L);
+
+    // One return value
+    CHECK(res == 1);
+    CHECK(lua_gettop(L) == 1);
+    CHECK(lua_isstring(L, 1));
+
+    std::string path = ghoul::lua::value<std::string>(L, 1);
+    CHECK_THAT(
+        path,
+        Catch::Matchers::Contains("OpenSpace\\cache\\colorFile.ppm")
+    );
+}
+
+TEST_CASE("CreateSingleColorImage: Faulty 1st input type", "[createsinglecolorimage]") {
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, std::vector{ 1.0, 0.0, 0.0 });
+    ghoul::lua::push(L, std::vector{ 1.0, 0.0, 0.0 });
+
+    CHECK_THROWS_WITH(
+        openspace::luascriptfunctions::createSingeColorImage(L),
+        Catch::Matchers::Contains("parameter 1 was not the expected type")
+    );
+}
+
+TEST_CASE("CreateSingleColorImage: Faulty 2nd input type", "[createsinglecolorimage]") {
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, "notCreatedColorFile");
+    ghoul::lua::push(L, "not a vector");
+
+    CHECK_THROWS_WITH(
+        openspace::luascriptfunctions::createSingeColorImage(L),
+        Catch::Matchers::Contains("parameter 2 was not the expected type")
+    );
+}
+
+TEST_CASE("CreateSingleColorImage: Invalid number of inputs", "[createsinglecolorimage]")
+{
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, std::vector{ 1.0, 0.0, 0.0 });
+
+    CHECK_THROWS_WITH(
+        openspace::luascriptfunctions::createSingeColorImage(L),
+        Catch::Matchers::Contains("Expected 2 arguments, got 1")
+    );
+}
+
+TEST_CASE("CreateSingleColorImage: Faulty color value (vec4)",
+          "[createsinglecolorimage]")
+{
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, "notCreatedColorFile");
+    ghoul::lua::push(L, std::vector{ 1.0, 0.0, 0.0, 0.0 });
+
+    CHECK_THROWS_WITH(
+        openspace::luascriptfunctions::createSingeColorImage(L),
+        Catch::Matchers::Contains(
+            "Invalid color. Expected three double values {r, g, b} in range 0 to 1"
+        )
+    );
+}
+
+TEST_CASE("CreateSingleColorImage: Faulty color value (invalid values)",
+          "[createsinglecolorimage]")
+{
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, "notCreatedColorFile");
+    ghoul::lua::push(L, std::vector{ 255.0, 0.0, 0.0 });
+
+    // @TODO (emmbr 2020-02-04) This test case should be here, but as of now this case is
+    // not handled. Finish it up when we have a better way of verifying that a dictionary
+    // is a color
+
+    //CHECK_THROWS_WITH(
+    //    openspace::luascriptfunctions::createSingeColorImage(L),
+    //    Catch::Matchers::Contains(
+    //        "Invalid color. Expected three double values {r, g, b} in range 0 to 1"
+    //    )
+    //);
+}
+
+TEST_CASE("CreateSingleColorImage: Check if file was created",
+          "[createsinglecolorimage]")
+{
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, "colorFile2");
+    ghoul::lua::push(L, std::vector{ 0.0, 1.0, 0.0 });
+
+    int res = openspace::luascriptfunctions::createSingeColorImage(L);
+
+    CHECK(res == 1);
+    std::string path = ghoul::lua::value<std::string>(L, 1);
+    CHECK(FileSys.fileExists(path));
+}
+
+TEST_CASE("CreateSingleColorImage: Load created image", "[createsinglecolorimage]") {
+    ghoul::lua::LuaState L;
+    ghoul::lua::push(L, "colorFile");
+    ghoul::lua::push(L, std::vector{ 1.0, 0.0, 0.0 });
+
+    // Loads the same file that was created in a previous test case
+    int res = openspace::luascriptfunctions::createSingeColorImage(L);
+    CHECK(res == 1);
+    CHECK(lua_gettop(L) == 1);
+
+    std::string path = ghoul::lua::value<std::string>(L, 1);
+
+    // Read the PPM file and check the image dimensions
+    // (maybe too hard coded, but cannot load a texture here...)
+    std::ifstream ppmFile(path, std::ifstream::binary);
+    REQUIRE(ppmFile.is_open());
+
+    std::string version;
+    unsigned int width;
+    unsigned int height;
+
+    ppmFile >> version >> width >> height;
+
+    REQUIRE(width == 1);
+    REQUIRE(height == 1);
+}
+
diff --git a/tests/test_luaconversions.cpp b/tests/test_luaconversions.cpp
index ea138ace75..958b73db65 100644
--- a/tests/test_luaconversions.cpp
+++ b/tests/test_luaconversions.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -77,6 +77,7 @@
 #include <openspace/properties/stringproperty.h>
 #include <ghoul/lua/ghoul_lua.h>
 #include <random>
+#include <iostream>
 
 namespace {
     constexpr const int NumberFuzzTests = 10000;
@@ -304,8 +305,12 @@ TEMPLATE_TEST_CASE("LuaConversion Float Fuzz", "[luaconversion]", float, double,
             success2
         );
         REQUIRE(success2);
-        REQUIRE(value == val);
 
+        if (typeid(T) == typeid(long double)) {
+            if (value != std::numeric_limits<long double>::infinity()) {
+                REQUIRE(value == val);
+            }
+        }
         lua_pop(state, 1);
     }
 
diff --git a/tests/test_optionproperty.cpp b/tests/test_optionproperty.cpp
index 74161629bc..175ca4e8e4 100644
--- a/tests/test_optionproperty.cpp
+++ b/tests/test_optionproperty.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index 834105d882..813b39e9c0 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_rawvolumeio.cpp b/tests/test_rawvolumeio.cpp
index 02bf9d7cab..bdf11abc51 100644
--- a/tests/test_rawvolumeio.cpp
+++ b/tests/test_rawvolumeio.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_scriptscheduler.cpp b/tests/test_scriptscheduler.cpp
index fc3b2d9b40..baa7618d6d 100644
--- a/tests/test_scriptscheduler.cpp
+++ b/tests/test_scriptscheduler.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
@@ -38,18 +38,20 @@ TEST_CASE("ScriptScheduler: Simple Forward", "[scriptscheduler]") {
     );
 
     using namespace openspace::scripting;
-    using namespace std::string_literals;
     
     ScriptScheduler scheduler;
 
-    ghoul::Dictionary testDictionary = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script;
+        script.time = openspace::Time::convertTime("2000 JAN 03");
+        script.forwardScript = "ForwardScript1";
+        script.backwardScript = "BackwardScript1";
+        scripts.push_back(script);
+    }
     
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({ { "1", testDictionary } });
+    scheduler.loadScripts(scripts);
     
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02"));
     REQUIRE(res.first == res.second);
@@ -68,28 +70,25 @@ TEST_CASE("ScriptScheduler: Multiple Forward Single Jump", "[scriptscheduler]")
     );
 
     using namespace openspace::scripting;
-    using namespace std::string_literals;
 
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
 
-    };
-    
+        ScriptScheduler::ScheduledScript script2;
+        script2.time = openspace::Time::convertTime("2000 JAN 05");
+        script2.forwardScript = "ForwardScript2";
+        script2.backwardScript = "BackwardScript2";
+        scripts.push_back(script2);
+    }
     ScriptScheduler scheduler;
 
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({
-        { "1", testDictionary1 },
-        { "2", testDictionary2 }
-    });
+    scheduler.loadScripts(scripts);
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02"));
     REQUIRE(res.first == res.second);
@@ -114,25 +113,24 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+
+        ScriptScheduler::ScheduledScript script2;
+        script2.time = openspace::Time::convertTime("2000 JAN 05");
+        script2.forwardScript = "ForwardScript2";
+        script2.backwardScript = "BackwardScript2";
+        scripts.push_back(script2);
+    }
     
     ScriptScheduler scheduler;
-
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({
-        { "1", testDictionary1 },
-        { "2", testDictionary2 }
-    });
+    scheduler.loadScripts(scripts);
     
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02"));
     REQUIRE(res.first == res.second);
@@ -154,18 +152,18 @@ TEST_CASE("ScriptScheduler: Simple Backward", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+    }
+    
     ScriptScheduler scheduler;
-    
-    ghoul::Dictionary testDictionary = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 05"));
-    scheduler.loadScripts({
-        { "1", testDictionary }
-    });
+    scheduler.loadScripts(scripts);
     
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04"));
     REQUIRE(res.first == res.second);
@@ -186,25 +184,24 @@ TEST_CASE("ScriptScheduler: Multiple Backward Single Jump", "[scriptscheduler]")
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+
+        ScriptScheduler::ScheduledScript script2;
+        script2.time = openspace::Time::convertTime("2000 JAN 05");
+        script2.forwardScript = "ForwardScript2";
+        script2.backwardScript = "BackwardScript2";
+        scripts.push_back(script2);
+    }
+    
     ScriptScheduler scheduler;
-    
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-    
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07"));
-    scheduler.loadScripts({
-        { "1", testDictionary1 },
-        { "2", testDictionary2 }
-    });
+    scheduler.loadScripts(scripts);
     
     auto res =  scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06"));
     REQUIRE(res.first == res.second);
@@ -229,25 +226,24 @@ TEST_CASE("ScriptScheduler: Multiple Backward Ordering", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+
+        ScriptScheduler::ScheduledScript script2;
+        script2.time = openspace::Time::convertTime("2000 JAN 05");
+        script2.forwardScript = "ForwardScript2";
+        script2.backwardScript = "BackwardScript2";
+        scripts.push_back(script2);
+    }
+    
     ScriptScheduler scheduler;
-    
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-    
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07"));
-    scheduler.loadScripts({
-        { "1", testDictionary1 },
-        { "2", testDictionary2 }
-    });
+    scheduler.loadScripts(scripts);
     
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06"));
     REQUIRE(res.first == res.second);
@@ -299,25 +295,24 @@ TEST_CASE("ScriptScheduler: Forward Backwards", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
     
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+
+        ScriptScheduler::ScheduledScript script2;
+        script2.time = openspace::Time::convertTime("2000 JAN 05");
+        script2.forwardScript = "ForwardScript2";
+        script2.backwardScript = "BackwardScript2";
+        scripts.push_back(script2);
+    }
+    
     ScriptScheduler scheduler;
-    
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-    
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({
-        { "1", testDictionary1 },
-        { "2", testDictionary2 }
-    });
+    scheduler.loadScripts(scripts);
     
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04"));
     REQUIRE(std::distance(res.first, res.second) == 1);
@@ -346,25 +341,24 @@ TEST_CASE("ScriptScheduler: Rewind", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+
+        ScriptScheduler::ScheduledScript script2;
+        script2.time = openspace::Time::convertTime("2000 JAN 05");
+        script2.forwardScript = "ForwardScript2";
+        script2.backwardScript = "BackwardScript2";
+        scripts.push_back(script2);
+    }
+    
     ScriptScheduler scheduler;
-    
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-    
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({
-        { "1", testDictionary1 },
-        { "2", testDictionary2 }
-    });
+    scheduler.loadScripts(scripts);
     
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07"));
     REQUIRE(std::distance(res.first, res.second) == 2);
@@ -409,31 +403,29 @@ TEST_CASE("ScriptScheduler: All Scripts", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
     
-    ScriptScheduler scheduler;
-    
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-    
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
 
-    ghoul::Dictionary testDictionary3 = {
-        { "Time", "2000 JAN 10"s },
-        { "ForwardScript", "ForwardScript3"s },
-        { "BackwardScript", "BackwardScript3"s }
-    };
+        ScriptScheduler::ScheduledScript script2;
+        script2.time = openspace::Time::convertTime("2000 JAN 05");
+        script2.forwardScript = "ForwardScript2";
+        script2.backwardScript = "BackwardScript2";
+        scripts.push_back(script2);
+
+        ScriptScheduler::ScheduledScript script3;
+        script3.time = openspace::Time::convertTime("2000 JAN 10");
+        script3.forwardScript = "ForwardScript3";
+        script3.backwardScript = "BackwardScript3";
+        scripts.push_back(script3);
+    }
     
-    scheduler.loadScripts({
-        { "1", testDictionary1 },
-        { "2", testDictionary2 },
-        { "3", testDictionary3 }
-    });
+    ScriptScheduler scheduler;
+    scheduler.loadScripts(scripts);
 
     auto allScripts = scheduler.allScripts();
     REQUIRE(allScripts.size() == 3);
@@ -453,17 +445,17 @@ TEST_CASE("ScriptScheduler: Jump Equal", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03 12:00:00");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+    }
+
     ScriptScheduler scheduler;
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03 12:00:00"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    scheduler.loadScripts({
-        { "1", testDictionary1 }
-    });
+    scheduler.loadScripts(scripts);
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 11:00:00"));
     REQUIRE(res.first == res.second);
@@ -491,15 +483,17 @@ TEST_CASE("ScriptScheduler: Same Time", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03 12:00:00");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+    }
+
     ScriptScheduler scheduler;
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03 12:00:00"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    scheduler.loadScripts({ { "1", testDictionary1 } });
+    scheduler.loadScripts(scripts);
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 12:00:00"));
     REQUIRE(std::distance(res.first, res.second) == 1);
@@ -520,15 +514,17 @@ TEST_CASE("ScriptScheduler: Multi Inner Jump", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    std::vector<ScriptScheduler::ScheduledScript> scripts;
+    {
+        ScriptScheduler::ScheduledScript script1;
+        script1.time = openspace::Time::convertTime("2000 JAN 03 12:00:00");
+        script1.forwardScript = "ForwardScript1";
+        script1.backwardScript = "BackwardScript1";
+        scripts.push_back(script1);
+    }
+
     ScriptScheduler scheduler;
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03 12:00:00"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    scheduler.loadScripts({ { "1", testDictionary1 } });
+    scheduler.loadScripts(scripts);
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 03 10:00:00"));
     REQUIRE(res.first == res.second);
@@ -558,25 +554,21 @@ TEST_CASE(
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
 
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
 
-    };
 
     ScriptScheduler scheduler;
-
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-
-    scheduler.loadScripts({ { "1", testDictionary2 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2 });
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02"));
     REQUIRE(res.first == res.second);
@@ -602,23 +594,20 @@ TEST_CASE("ScriptScheduler: Multiple Forward Ordering Multiple Load" "[scriptsch
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
 
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
 
     ScriptScheduler scheduler;
-
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-    scheduler.loadScripts({ { "1", testDictionary2 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2 });
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 02"));
     REQUIRE(res.first == res.second);
@@ -643,23 +632,20 @@ TEST_CASE(
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
+
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
+
     ScriptScheduler scheduler;
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07"));
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-    scheduler.loadScripts({ { "1", testDictionary2 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2 });
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06"));
     REQUIRE(res.first == res.second);
@@ -689,21 +675,19 @@ TEST_CASE(
 
     ScriptScheduler scheduler;
 
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
 
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
 
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07"));
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-    scheduler.loadScripts({ { "1", testDictionary2 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2 });
 
     std::pair<ScriptScheduler::ScriptIt, ScriptScheduler::ScriptIt> res =
         scheduler.progressTo(openspace::Time::convertTime("2000 JAN 06"));
@@ -726,23 +710,20 @@ TEST_CASE("ScriptScheduler: Forward Backwards Multiple Load", "[scriptscheduler]
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
+
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
+
     ScriptScheduler scheduler;
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-    scheduler.loadScripts({ { "1", testDictionary2 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2 });
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 04"));
     REQUIRE(std::distance(res.first, res.second) == 1);
@@ -771,23 +752,20 @@ TEST_CASE("ScriptScheduler: Rewind Multiple Load", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
+
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
+
     ScriptScheduler scheduler;
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-
     scheduler.progressTo(openspace::Time::convertTime("2000 JAN 01"));
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-    scheduler.loadScripts({ { "1", testDictionary2 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2 });
 
     auto res = scheduler.progressTo(openspace::Time::convertTime("2000 JAN 07"));
     REQUIRE(std::distance(res.first, res.second) == 2);
@@ -810,30 +788,25 @@ TEST_CASE("ScriptScheduler: All Scripts Multiple Load", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
+
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
+
+    ScriptScheduler::ScheduledScript script3;
+    script3.time = openspace::Time::convertTime("2000 JAN 10");
+    script3.forwardScript = "ForwardScript3";
+    script3.backwardScript = "BackwardScript3";
+
     ScriptScheduler scheduler;
-
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-
-    ghoul::Dictionary testDictionary3 = {
-        { "Time", "2000 JAN 10"s },
-        { "ForwardScript", "ForwardScript3"s },
-        { "BackwardScript", "BackwardScript3"s }
-    };
-
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-    scheduler.loadScripts({ { "1", testDictionary2 } });
-    scheduler.loadScripts({ { "1", testDictionary3 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2 });
+    scheduler.loadScripts({ script3 });
 
     auto allScripts = scheduler.allScripts();
     REQUIRE(allScripts.size() == 3);
@@ -853,29 +826,26 @@ TEST_CASE("ScriptScheduler: All Scripts Mixed Load", "[scriptscheduler]") {
     using namespace openspace::scripting;
     using namespace std::string_literals;
 
+
+
+    ScriptScheduler::ScheduledScript script1;
+    script1.time = openspace::Time::convertTime("2000 JAN 03");
+    script1.forwardScript = "ForwardScript1";
+    script1.backwardScript = "BackwardScript1";
+
+    ScriptScheduler::ScheduledScript script2;
+    script2.time = openspace::Time::convertTime("2000 JAN 05");
+    script2.forwardScript = "ForwardScript2";
+    script2.backwardScript = "BackwardScript2";
+
+    ScriptScheduler::ScheduledScript script3;
+    script3.time = openspace::Time::convertTime("2000 JAN 10");
+    script3.forwardScript = "ForwardScript3";
+    script3.backwardScript = "BackwardScript3";
+
     ScriptScheduler scheduler;
-
-
-    ghoul::Dictionary testDictionary1 = {
-        { "Time", "2000 JAN 03"s },
-        { "ForwardScript", "ForwardScript1"s },
-        { "BackwardScript", "BackwardScript1"s }
-    };
-
-    ghoul::Dictionary testDictionary2 = {
-        { "Time", "2000 JAN 05"s },
-        { "ForwardScript", "ForwardScript2"s },
-        { "BackwardScript", "BackwardScript2"s }
-    };
-
-    ghoul::Dictionary testDictionary3 = {
-        { "Time", "2000 JAN 10"s },
-        { "ForwardScript", "ForwardScript3"s },
-        { "BackwardScript", "BackwardScript3"s }
-    };
-
-    scheduler.loadScripts({ { "1", testDictionary1 } });
-    scheduler.loadScripts({ { "1", testDictionary2 }, { "2", testDictionary3 } });
+    scheduler.loadScripts({ script1 });
+    scheduler.loadScripts({ script2, script3 });
 
     auto allScripts = scheduler.allScripts();
     REQUIRE(allScripts.size() == 3);
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index 3f54a37a1f..0881135772 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_temporaltileprovider.cpp b/tests/test_temporaltileprovider.cpp
index 0141fcc619..e01dfe1fad 100644
--- a/tests/test_temporaltileprovider.cpp
+++ b/tests/test_temporaltileprovider.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_timeline.cpp b/tests/test_timeline.cpp
index 3547677bfb..7590e37b89 100644
--- a/tests/test_timeline.cpp
+++ b/tests/test_timeline.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index 0eee8201ed..cb7506a4f4 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -2,7 +2,7 @@
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
- * Copyright (c) 2014-2020                                                               *
+ * 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 *