diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 8586b6d98e..b97d159420 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -655,7 +655,7 @@ int main_main(int argc, char** argv) {
         "Unknown OpenGL version. Missing statement in version mapping map"
     );
 
-    using IsInitialized = ghoul::Boolean;
+    BooleanType(IsInitialized);
     auto cleanup = [&](IsInitialized isInitialized){
         if (isInitialized) {
             OsEng.deinitialize();
diff --git a/ext/ghoul b/ext/ghoul
index f1bc4ab860..fd1187437c 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit f1bc4ab860f3155c0b90f9af4bb08339663b449a
+Subproject commit fd1187437c59553f2dba74684b791220cbb8d7fc
diff --git a/include/openspace/documentation/documentation.h b/include/openspace/documentation/documentation.h
index 5f521328ff..14ed0595fe 100644
--- a/include/openspace/documentation/documentation.h
+++ b/include/openspace/documentation/documentation.h
@@ -36,7 +36,7 @@ namespace ghoul { class Dictionary; }
 
 namespace openspace::documentation {
 
-using Optional = ghoul::Boolean;
+BooleanType(Optional);
 
 /**
  * The TestResult structure returns the information from the #testSpecification method. It
diff --git a/include/openspace/engine/syncengine.h b/include/openspace/engine/syncengine.h
index d4f994057d..acd5da35bd 100644
--- a/include/openspace/engine/syncengine.h
+++ b/include/openspace/engine/syncengine.h
@@ -42,7 +42,7 @@ class Syncable;
  */
 class SyncEngine {
 public:
-    using IsMaster = ghoul::Boolean;
+    BooleanType(IsMaster);
 
     /**
      * Creates a new SyncEngine which a buffer size of \p syncBufferSize
diff --git a/include/openspace/interaction/keybindingmanager.h b/include/openspace/interaction/keybindingmanager.h
index 31ee66044f..c4a47d7631 100644
--- a/include/openspace/interaction/keybindingmanager.h
+++ b/include/openspace/interaction/keybindingmanager.h
@@ -40,8 +40,8 @@ namespace openspace::interaction {
 
 class KeyBindingManager : public DocumentationGenerator {
 public:
-    using IsLocalBind = ghoul::Boolean;
-    using IsSynchronized = ghoul::Boolean;
+    BooleanType(IsLocalBind);
+    BooleanType(IsSynchronized);
 
     struct KeyInformation {
         std::string command;
diff --git a/include/openspace/rendering/deferredcasterlistener.h b/include/openspace/rendering/deferredcasterlistener.h
index dd84e98bc9..c9f57d4351 100644
--- a/include/openspace/rendering/deferredcasterlistener.h
+++ b/include/openspace/rendering/deferredcasterlistener.h
@@ -33,7 +33,8 @@ class Deferredcaster;
 
 class DeferredcasterListener {
 public:
-    using isAttached = ghoul::Boolean;
+    BooleanType(isAttached);
+
     virtual ~DeferredcasterListener() = default;
 
     virtual void deferredcastersChanged(Deferredcaster& deferredcaster,
diff --git a/include/openspace/rendering/framebufferrenderer.h b/include/openspace/rendering/framebufferrenderer.h
index 470abafe84..66fc0801f0 100644
--- a/include/openspace/rendering/framebufferrenderer.h
+++ b/include/openspace/rendering/framebufferrenderer.h
@@ -91,7 +91,7 @@ public:
 
     virtual void raycastersChanged(VolumeRaycaster& raycaster, bool attached) override;
     virtual void deferredcastersChanged(Deferredcaster& deferredcaster,
-        ghoul::Boolean isAttached) override;
+        isAttached isAttached) override;
 
 private:
     std::map<VolumeRaycaster*, RaycastData> _raycastData;
diff --git a/include/openspace/rendering/loadingscreen.h b/include/openspace/rendering/loadingscreen.h
index e823d9eefb..899bcc6f71 100644
--- a/include/openspace/rendering/loadingscreen.h
+++ b/include/openspace/rendering/loadingscreen.h
@@ -49,10 +49,10 @@ namespace openspace {
 
 class LoadingScreen {
 public:
-    using ShowMessage = ghoul::Boolean;
-    using ShowNodeNames = ghoul::Boolean;
-    using ShowProgressbar = ghoul::Boolean;
-    using CatastrophicError = ghoul::Boolean;
+    BooleanType(ShowMessage);
+    BooleanType(ShowNodeNames);
+    BooleanType(ShowProgressbar);
+    BooleanType(CatastrophicError);
 
     LoadingScreen(ShowMessage showMessage, ShowNodeNames showNodeNames,
         ShowProgressbar showProgressbar);
diff --git a/include/openspace/scene/scene.h b/include/openspace/scene/scene.h
index b25d0bdb21..5321349519 100644
--- a/include/openspace/scene/scene.h
+++ b/include/openspace/scene/scene.h
@@ -54,7 +54,7 @@ class Scene
     : public properties::PropertyOwner
 {
 public:
-    using UpdateDependencies = ghoul::Boolean;
+    BooleanType(UpdateDependencies);
 
     struct InvalidSceneError : ghoul::RuntimeError {
         /**
diff --git a/include/openspace/scene/scenegraphnode.h b/include/openspace/scene/scenegraphnode.h
index 363d3bd659..65f497f33a 100644
--- a/include/openspace/scene/scenegraphnode.h
+++ b/include/openspace/scene/scenegraphnode.h
@@ -61,7 +61,7 @@ public:
         GLInitialized
     };
 
-    using UpdateScene = ghoul::Boolean;
+    BooleanType(UpdateScene);
 
     struct PerformanceRecord {
         long long renderTime;  // time in ns
diff --git a/include/openspace/scripting/scriptengine.h b/include/openspace/scripting/scriptengine.h
index 562da4427a..65e7d26242 100644
--- a/include/openspace/scripting/scriptengine.h
+++ b/include/openspace/scripting/scriptengine.h
@@ -52,7 +52,7 @@ namespace openspace::scripting {
  */
 class ScriptEngine : public Syncable, public DocumentationGenerator {
 public:
-    using RemoteScripting = ghoul::Boolean;
+    BooleanType(RemoteScripting);
 
     ScriptEngine();
 
diff --git a/include/openspace/util/httprequest.h b/include/openspace/util/httprequest.h
index 76eb42baa8..de515ef4fe 100644
--- a/include/openspace/util/httprequest.h
+++ b/include/openspace/util/httprequest.h
@@ -222,7 +222,7 @@ private:
 
 class HttpFileDownload : public virtual HttpDownload {
 public:
-    using Overwrite = ghoul::Boolean;
+    BooleanType(Overwrite);
 
     HttpFileDownload() = default;
     HttpFileDownload(std::string destination, Overwrite = Overwrite::No);
diff --git a/include/openspace/util/spicemanager.h b/include/openspace/util/spicemanager.h
index b1dbdd8a1b..f764619794 100644
--- a/include/openspace/util/spicemanager.h
+++ b/include/openspace/util/spicemanager.h
@@ -45,7 +45,7 @@ class SpiceManager : public ghoul::Singleton<SpiceManager> {
     friend class ghoul::Singleton<SpiceManager>;
 public:
     using TransformMatrix = std::array<double, 36>;
-    using UseException = ghoul::Boolean;
+    BooleanType(UseException);
     using KernelHandle = unsigned int;
 
     struct SpiceException : public ghoul::RuntimeError {
diff --git a/modules/globebrowsing/meshes/trianglesoup.h b/modules/globebrowsing/meshes/trianglesoup.h
index 166b20df44..f31db1e413 100644
--- a/modules/globebrowsing/meshes/trianglesoup.h
+++ b/modules/globebrowsing/meshes/trianglesoup.h
@@ -44,12 +44,11 @@ namespace openspace::globebrowsing {
 // that is faster
 class TriangleSoup {
 public:
-    using Positions = ghoul::Boolean;
-    using TextureCoordinates = ghoul::Boolean;
-    using Normals = ghoul::Boolean;
+    BooleanType(Positions);
+    BooleanType(TextureCoordinates);
+    BooleanType(Normals);
 
-    TriangleSoup(
-        std::vector<unsigned int> elements, // At least elements are required
+    TriangleSoup(std::vector<unsigned int> elements, // At least elements are required
         Positions usePositions = Positions::No,
         TextureCoordinates useTextures = TextureCoordinates::No,
         Normals useNormals = Normals::No);
diff --git a/modules/globebrowsing/other/statscollector.h b/modules/globebrowsing/other/statscollector.h
index b2bfb7ec4b..46b42304c8 100644
--- a/modules/globebrowsing/other/statscollector.h
+++ b/modules/globebrowsing/other/statscollector.h
@@ -78,7 +78,7 @@ class StatsCollector {
 public:
     StatsCollector() = delete;
 
-    using Enabled = ghoul::Boolean;
+    BooleanType(Enabled);
 
     StatsCollector(const std::string& filename, int dumpEveryXRecord,
         Enabled enabled = Enabled::Yes, const std::string& delimiter = ",");
diff --git a/modules/globebrowsing/tile/asynctiledataprovider.h b/modules/globebrowsing/tile/asynctiledataprovider.h
index 2a4f10c31d..4c0328c140 100644
--- a/modules/globebrowsing/tile/asynctiledataprovider.h
+++ b/modules/globebrowsing/tile/asynctiledataprovider.h
@@ -82,7 +82,7 @@ public:
     float noDataValueAsFloat() const;
 
 protected:
-    using ResetRawTileDataReader = ghoul::Boolean;
+    BooleanType(ResetRawTileDataReader);
 
     enum class ResetMode {
         ShouldResetAll,
diff --git a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h
index 9fbb139b8c..e510457688 100644
--- a/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h
+++ b/modules/globebrowsing/tile/rawtiledatareader/rawtiledatareader.h
@@ -46,7 +46,7 @@ class GeodeticPatch;
 
 class RawTileDataReader {
 public:
-    using PerformPreprocessing = ghoul::Boolean;
+    BooleanType(PerformPreprocessing);
 
     RawTileDataReader(const TileTextureInitData& initData,
                       PerformPreprocessing preprocess = PerformPreprocessing::No);
diff --git a/modules/globebrowsing/tile/tiletextureinitdata.h b/modules/globebrowsing/tile/tiletextureinitdata.h
index fb5e103306..d7732ad965 100644
--- a/modules/globebrowsing/tile/tiletextureinitdata.h
+++ b/modules/globebrowsing/tile/tiletextureinitdata.h
@@ -39,7 +39,7 @@ namespace openspace::globebrowsing {
 class TileTextureInitData {
 public:
     using HashKey = unsigned long long;
-    using ShouldAllocateDataOnCPU = ghoul::Boolean;
+    BooleanType(ShouldAllocateDataOnCPU);
     using Format = ghoul::opengl::Texture::Format;
 
     TileTextureInitData(size_t width, size_t height, GLenum glType, Format textureFormat,
diff --git a/modules/imgui/include/guipropertycomponent.h b/modules/imgui/include/guipropertycomponent.h
index 8475dfad06..1b54282e00 100644
--- a/modules/imgui/include/guipropertycomponent.h
+++ b/modules/imgui/include/guipropertycomponent.h
@@ -48,7 +48,7 @@ class GuiPropertyComponent : public GuiComponent {
 public:
     using SourceFunction = std::function<std::vector<properties::PropertyOwner*>()>;
 
-    using UseTreeLayout = ghoul::Boolean;
+    BooleanType(UseTreeLayout);
 
 
     GuiPropertyComponent(std::string identifier, std::string guiName = "",
diff --git a/modules/imgui/include/renderproperties.h b/modules/imgui/include/renderproperties.h
index 6ddbbb9a5b..d09a0a8fe4 100644
--- a/modules/imgui/include/renderproperties.h
+++ b/modules/imgui/include/renderproperties.h
@@ -29,14 +29,12 @@
 
 #include <string>
 
-namespace openspace::properties {
-    class Property;
-} // namespace openspace::properties
+namespace openspace::properties { class Property; }
 
 namespace openspace {
 
-using IsRegularProperty = ghoul::Boolean;
-using ShowToolTip = ghoul::Boolean;
+BooleanType(IsRegularProperty);
+BooleanType(ShowToolTip);
 
 void executeScript(const std::string& id, const std::string& value,
     IsRegularProperty isRegular = IsRegularProperty::Yes);
diff --git a/modules/sync/syncs/httpsynchronization.cpp b/modules/sync/syncs/httpsynchronization.cpp
index b1eb47d5e7..53f8c96705 100644
--- a/modules/sync/syncs/httpsynchronization.cpp
+++ b/modules/sync/syncs/httpsynchronization.cpp
@@ -167,7 +167,7 @@ void HttpSynchronization::createSyncFile() {
     std::string directoryName = directory();
     std::string filepath = directoryName + ".ossync";
 
-    FileSys.createDirectory(directoryName, ghoul::filesystem::Directory::Recursive::Yes);
+    FileSys.createDirectory(directoryName, ghoul::filesystem::FileSystem::Recursive::Yes);
 
     std::ofstream syncFile(filepath, std::ofstream::out);
     syncFile << "Synchronized";
diff --git a/modules/sync/syncs/torrentsynchronization.cpp b/modules/sync/syncs/torrentsynchronization.cpp
index bd16bb8e9c..b96c0f74c3 100644
--- a/modules/sync/syncs/torrentsynchronization.cpp
+++ b/modules/sync/syncs/torrentsynchronization.cpp
@@ -168,7 +168,7 @@ void TorrentSynchronization::createSyncFile() {
     std::string directoryName = directory();
     std::string filepath = directoryName + ".ossync";
 
-    FileSys.createDirectory(directoryName, ghoul::filesystem::Directory::Recursive::Yes);
+    FileSys.createDirectory(directoryName, ghoul::filesystem::FileSystem::Recursive::Yes);
 
     std::ofstream syncFile(filepath, std::ofstream::out);
     syncFile << "Synchronized";
diff --git a/modules/sync/syncs/urlsynchronization.cpp b/modules/sync/syncs/urlsynchronization.cpp
index 11ee8b6e21..51a06cfe4b 100644
--- a/modules/sync/syncs/urlsynchronization.cpp
+++ b/modules/sync/syncs/urlsynchronization.cpp
@@ -265,7 +265,7 @@ bool UrlSynchronization::nTotalBytesIsKnown() {
 void UrlSynchronization::createSyncFile() {
     std::string dir = directory();
     std::string filepath = dir + ".ossync";
-    FileSys.createDirectory(dir, ghoul::filesystem::Directory::Recursive::Yes);
+    FileSys.createDirectory(dir, ghoul::filesystem::FileSystem::Recursive::Yes);
     std::ofstream syncFile(filepath, std::ofstream::out);
     syncFile << "Synchronized";
     syncFile.close();
diff --git a/src/interaction/luaconsole.cpp b/src/interaction/luaconsole.cpp
index 57cf60be1f..f1da932d49 100644
--- a/src/interaction/luaconsole.cpp
+++ b/src/interaction/luaconsole.cpp
@@ -263,13 +263,13 @@ void LuaConsole::initialize() {
     _font = OsEng.fontManager().font(
         FontName,
         EntryFontSize,
-        ghoul::fontrendering::Font::Outline::No
+        ghoul::fontrendering::FontManager::Outline::No
     );
 
     _historyFont = OsEng.fontManager().font(
         FontName,
         HistoryFontSize,
-        ghoul::fontrendering::Font::Outline::No
+        ghoul::fontrendering::FontManager::Outline::No
     );
 
     OsEng.parallelPeer().connectionEvent()->subscribe(
diff --git a/src/rendering/deferredcastermanager.cpp b/src/rendering/deferredcastermanager.cpp
index 5321684a7b..eabf05fb86 100644
--- a/src/rendering/deferredcastermanager.cpp
+++ b/src/rendering/deferredcastermanager.cpp
@@ -40,7 +40,10 @@ void DeferredcasterManager::attachDeferredcaster(Deferredcaster& deferredcaster)
         _deferredcasters.push_back(&deferredcaster);
     }
     for (auto &listener : _listeners) {
-        listener->deferredcastersChanged(deferredcaster, ghoul::Boolean::Yes);
+        listener->deferredcastersChanged(
+            deferredcaster,
+            DeferredcasterListener::isAttached::Yes
+        );
     }
 }
 
@@ -53,7 +56,10 @@ void DeferredcasterManager::detachDeferredcaster(Deferredcaster& deferredcaster)
     if (it != _deferredcasters.end()) {
         _deferredcasters.erase(it);
         for (auto &listener : _listeners) {
-            listener->deferredcastersChanged(deferredcaster, ghoul::Boolean::No);
+            listener->deferredcastersChanged(
+                deferredcaster,
+                DeferredcasterListener::isAttached::No
+            );
         }
     }
 }
diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp
index 1d4a732904..7984166b24 100644
--- a/src/rendering/framebufferrenderer.cpp
+++ b/src/rendering/framebufferrenderer.cpp
@@ -261,7 +261,7 @@ void FramebufferRenderer::raycastersChanged(VolumeRaycaster&, bool) {
 }
 
 void FramebufferRenderer::deferredcastersChanged(Deferredcaster& deferredcaster,
-                                                 ghoul::Boolean isAttached)
+                                                 isAttached isAttached)
 {
     (void) deferredcaster;
     (void) isAttached;
diff --git a/src/util/httprequest.cpp b/src/util/httprequest.cpp
index 41fde1bc65..86a8765ad9 100644
--- a/src/util/httprequest.cpp
+++ b/src/util/httprequest.cpp
@@ -331,7 +331,7 @@ bool HttpFileDownload::initDownload() {
     {
         std::lock_guard<std::mutex> g(_directoryCreationMutex);
         if (!FileSys.directoryExists(d)) {
-            FileSys.createDirectory(d, ghoul::filesystem::Directory::Recursive::Yes);
+            FileSys.createDirectory(d, ghoul::filesystem::FileSystem::Recursive::Yes);
         }
     }