diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e1dfe677..67e4808d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -276,7 +276,7 @@ set(LIBFASTFETCH_SRC
     src/modules/custom/custom.c
     src/modules/command/command.c
     src/modules/datetime/datetime.c
-    src/modules/de.c
+    src/modules/de/de.c
     src/modules/disk/disk.c
     src/modules/font/font.c
     src/modules/gpu/gpu.c
diff --git a/src/common/init.c b/src/common/init.c
index 32392623a..25407f2e8 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -72,7 +72,7 @@ static void defaultConfig(FFinstance* instance)
     ffInitPackagesOptions(&instance->config.packages);
     ffInitShellOptions(&instance->config.shell);
     ffInitDisplayOptions(&instance->config.display);
-    initModuleArg(&instance->config.de);
+    ffInitDEOptions(&instance->config.de);
     initModuleArg(&instance->config.wm);
     ffInitWMThemeOptions(&instance->config.wmTheme);
     initModuleArg(&instance->config.theme);
@@ -291,7 +291,7 @@ static void destroyConfig(FFinstance* instance)
     ffDestroyPackagesOptions(&instance->config.packages);
     ffDestroyShellOptions(&instance->config.shell);
     ffDestroyDisplayOptions(&instance->config.display);
-    destroyModuleArg(&instance->config.de);
+    ffDestroyDEOptions(&instance->config.de);
     destroyModuleArg(&instance->config.wm);
     ffDestroyWMThemeOptions(&instance->config.wmTheme);
     destroyModuleArg(&instance->config.theme);
diff --git a/src/fastfetch.c b/src/fastfetch.c
index 532656160..310c26881 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -988,7 +988,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
     else if(ffParseShellCommandOptions(&instance->config.shell, key, value)) {}
     else if(ffParseDisplayCommandOptions(&instance->config.display, key, value)) {}
     else if(ffParseBrightnessCommandOptions(&instance->config.brightness, key, value)) {}
-    else if(optionParseModuleArgs(key, value, "de", &instance->config.de)) {}
+    else if(ffParseDECommandOptions(&instance->config.de, key, value)) {}
     else if(ffParseWifiCommandOptions(&instance->config.wifi, key, value)) {}
     else if(optionParseModuleArgs(key, value, "wm", &instance->config.wm)) {}
     else if(ffParseWMThemeCommandOptions(&instance->config.wmTheme, key, value)) {}
@@ -1192,8 +1192,8 @@ static void parseStructureCommand(FFinstance* instance, const char* line)
         ffPrintShell(instance, &instance->config.shell);
     else if(strcasecmp(line, FF_DISPLAY_MODULE_NAME) == 0)
         ffPrintDisplay(instance, &instance->config.display);
-    else if(strcasecmp(line, "desktopenvironment") == 0 || strcasecmp(line, "de") == 0)
-        ffPrintDesktopEnvironment(instance);
+    else if(strcasecmp(line, FF_DE_MODULE_NAME) == 0)
+        ffPrintDE(instance, &instance->config.de);
     else if(strcasecmp(line, "windowmanager") == 0 || strcasecmp(line, "wm") == 0)
         ffPrintWM(instance);
     else if(strcasecmp(line, "theme") == 0)
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 684417b8a..53a43d80a 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -70,7 +70,7 @@ typedef struct FFconfig
     FFPackagesOptions packages;
     FFShellOptions shell;
     FFDisplayOptions display;
-    FFModuleArgs de;
+    FFDEOptions de;
     FFWallpaperOptions wallpaper;
     FFWifiOptions wifi;
     FFModuleArgs wm;
@@ -198,7 +198,6 @@ void ffPrepareWeather(FFinstance* instance);
 
 void ffPrintChassis(FFinstance* instance);
 void ffPrintProcesses(FFinstance* instance);
-void ffPrintDesktopEnvironment(FFinstance* instance);
 void ffPrintWM(FFinstance* instance);
 void ffPrintTheme(FFinstance* instance);
 void ffPrintPlayer(FFinstance* instance);
diff --git a/src/flashfetch.c b/src/flashfetch.c
index f676da276..320357e65 100644
--- a/src/flashfetch.c
+++ b/src/flashfetch.c
@@ -34,7 +34,7 @@ int main(int argc, char** argv)
     ffPrintShell(&instance, &instance.config.shell);
     ffPrintDisplay(&instance, &instance.config.display);
     // ffPrintBrightness(&instance);
-    ffPrintDesktopEnvironment(&instance);
+    ffPrintDE(&instance, &instance.config.de);
     ffPrintWM(&instance);
     ffPrintWMTheme(&instance, &instance.config.wmTheme);
     ffPrintTheme(&instance);
diff --git a/src/modules/de.c b/src/modules/de.c
deleted file mode 100644
index eb2cb5062..000000000
--- a/src/modules/de.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/displayserver/displayserver.h"
-
-#define FF_DE_MODULE_NAME "DE"
-#define FF_DE_NUM_FORMAT_ARGS 3
-
-void ffPrintDesktopEnvironment(FFinstance* instance)
-{
-    #ifdef __ANDROID__
-        ffPrintError(instance, FF_DE_MODULE_NAME, 0, &instance->config.de, "DE detection is not supported on Android");
-        return;
-    #endif
-
-    const FFDisplayServerResult* result = ffConnectDisplayServer(instance);
-
-    if(result->dePrettyName.length == 0)
-    {
-        ffPrintError(instance, FF_DE_MODULE_NAME, 0, &instance->config.de, "No DE found");
-        return;
-    }
-
-    if(instance->config.de.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_DE_MODULE_NAME, 0, &instance->config.de.key);
-
-        ffStrbufWriteTo(&result->dePrettyName, stdout);
-
-        if(result->deVersion.length > 0)
-        {
-            putchar(' ');
-            ffStrbufWriteTo(&result->deVersion, stdout);
-        }
-
-        putchar('\n');
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_DE_MODULE_NAME, 0, &instance->config.de, FF_DE_NUM_FORMAT_ARGS, (FFformatarg[]){
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->deProcessName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->dePrettyName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result->deVersion}
-        });
-    }
-}
diff --git a/src/modules/de/de.c b/src/modules/de/de.c
new file mode 100644
index 000000000..1a0310a33
--- /dev/null
+++ b/src/modules/de/de.c
@@ -0,0 +1,82 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/displayserver/displayserver.h"
+#include "modules/de/de.h"
+
+#define FF_DE_NUM_FORMAT_ARGS 3
+
+void ffPrintDE(FFinstance* instance, FFDEOptions* options)
+{
+    const FFDisplayServerResult* result = ffConnectDisplayServer(instance);
+
+    if(result->dePrettyName.length == 0)
+    {
+        ffPrintError(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs, "No DE found");
+        return;
+    }
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs.key);
+
+        ffStrbufWriteTo(&result->dePrettyName, stdout);
+
+        if(result->deVersion.length > 0)
+        {
+            putchar(' ');
+            ffStrbufWriteTo(&result->deVersion, stdout);
+        }
+
+        putchar('\n');
+    }
+    else
+    {
+        ffPrintFormat(instance, FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_DE_NUM_FORMAT_ARGS, (FFformatarg[]){
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->deProcessName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->dePrettyName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result->deVersion}
+        });
+    }
+}
+
+void ffInitDEOptions(FFDEOptions* options)
+{
+    options->moduleName = FF_DE_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+}
+
+bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_DE_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    return false;
+}
+
+void ffDestroyDEOptions(FFDEOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+void ffParseDEJsonObject(FFinstance* instance, json_object* module)
+{
+    FFDEOptions __attribute__((__cleanup__(ffDestroyDEOptions))) options;
+    ffInitDEOptions(&options);
+
+    if (module)
+    {
+        json_object_object_foreach(module, key, val)
+        {
+            if (ffJsonConfigParseModuleArgs(key, val, &options.moduleArgs))
+                continue;
+
+            ffPrintError(instance, FF_DE_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintDE(instance, &options);
+}
+#endif
diff --git a/src/modules/de/de.h b/src/modules/de/de.h
new file mode 100644
index 000000000..ee393e225
--- /dev/null
+++ b/src/modules/de/de.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "fastfetch.h"
+
+#define FF_DE_MODULE_NAME "DE"
+
+void ffPrintDE(FFinstance* instance, FFDEOptions* options);
+void ffInitDEOptions(FFDEOptions* options);
+bool ffParseDECommandOptions(FFDEOptions* options, const char* key, const char* value);
+void ffDestroyDEOptions(FFDEOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/jsonconfig.h"
+void ffParseDEJsonObject(FFinstance* instance, json_object* module);
+#endif
diff --git a/src/modules/de/option.h b/src/modules/de/option.h
new file mode 100644
index 000000000..52b8954e7
--- /dev/null
+++ b/src/modules/de/option.h
@@ -0,0 +1,11 @@
+#pragma once
+
+// This file will be included in "fastfetch.h", do NOT put unnecessary things here
+
+#include "common/option.h"
+
+typedef struct FFDEOptions
+{
+    const char* moduleName;
+    FFModuleArgs moduleArgs;
+} FFDEOptions;
diff --git a/src/modules/jsonconfig/jsonconfig.c b/src/modules/jsonconfig/jsonconfig.c
index bde0382d7..5c0769dc9 100644
--- a/src/modules/jsonconfig/jsonconfig.c
+++ b/src/modules/jsonconfig/jsonconfig.c
@@ -53,6 +53,7 @@ static bool parseModuleJsonObject(FFinstance* instance, const char* type, json_o
                 tryModule(instance, type, module, FF_DATETIME_MODULE_NAME, ffParseDateTimeJsonObject) ||
                 tryModule(instance, type, module, FF_DISPLAY_MODULE_NAME, ffParseDisplayJsonObject) ||
                 tryModule(instance, type, module, FF_DISK_MODULE_NAME, ffParseDiskJsonObject) ||
+                tryModule(instance, type, module, FF_DE_MODULE_NAME, ffParseDEJsonObject) ||
                 false;
         }
 
diff --git a/src/modules/modules.h b/src/modules/modules.h
index fcde11156..d6dd4eb6c 100644
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -17,6 +17,7 @@
 #include "modules/datetime/datetime.h"
 #include "modules/disk/disk.h"
 #include "modules/display/display.h"
+#include "modules/de/de.h"
 #include "modules/font/font.h"
 #include "modules/gamepad/gamepad.h"
 #include "modules/gpu/gpu.h"
diff --git a/src/modules/options.h b/src/modules/options.h
index 2e3eab4f3..01d13a26c 100644
--- a/src/modules/options.h
+++ b/src/modules/options.h
@@ -13,6 +13,7 @@
 #include "modules/custom/option.h"
 #include "modules/command/option.h"
 #include "modules/datetime/option.h"
+#include "modules/de/option.h"
 #include "modules/disk/option.h"
 #include "modules/display/option.h"
 #include "modules/font/option.h"