diff --git a/CMakeLists.txt b/CMakeLists.txt
index e58949ddc..d423e07f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,7 +264,7 @@ set(LIBFASTFETCH_SRC
     src/modules/battery/battery.c
     src/modules/bios/bios.c
     src/modules/bluetooth/bluetooth.c
-    src/modules/board.c
+    src/modules/board/board.c
     src/modules/brightness.c
     src/modules/break.c
     src/modules/chassis.c
diff --git a/src/common/init.c b/src/common/init.c
index 62a877fba..0bfbeb164 100644
--- a/src/common/init.c
+++ b/src/common/init.c
@@ -61,7 +61,7 @@ static void defaultConfig(FFinstance* instance)
     ffInitOSOptions(&instance->config.os);
     ffInitHostOptions(&instance->config.host);
     ffInitBiosOptions(&instance->config.bios);
-    initModuleArg(&instance->config.board);
+    ffInitBoardOptions(&instance->config.board);
     initModuleArg(&instance->config.brightness);
     initModuleArg(&instance->config.chassis);
     ffInitCommandOptions(&instance->config.command);
@@ -297,7 +297,7 @@ static void destroyConfig(FFinstance* instance)
     ffDestroyOSOptions(&instance->config.os);
     ffDestroyHostOptions(&instance->config.host);
     ffDestroyBiosOptions(&instance->config.bios);
-    destroyModuleArg(&instance->config.board);
+    ffDestroyBoardOptions(&instance->config.board);
     destroyModuleArg(&instance->config.chassis);
     ffDestroyCommandOptions(&instance->config.command);
     ffDestroyKernelOptions(&instance->config.kernel);
diff --git a/src/fastfetch.c b/src/fastfetch.c
index 89c54fbbb..650a30923 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -1012,7 +1012,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
     else if(ffParseOSCommandOptions(&instance->config.os, key, value)) {}
     else if(ffParseHostCommandOptions(&instance->config.host, key, value)) {}
     else if(ffParseBiosCommandOptions(&instance->config.bios, key, value)) {}
-    else if(optionParseModuleArgs(key, value, "board", &instance->config.board)) {}
+    else if(ffParseBoardCommandOptions(&instance->config.board, key, value)) {}
     else if(optionParseModuleArgs(key, value, "chassis", &instance->config.chassis)) {}
     else if(ffParseCommandCommandOptions(&instance->config.command, key, value)) {}
     else if(ffParseKernelCommandOptions(&instance->config.kernel, key, value)) {}
@@ -1263,7 +1263,7 @@ static void parseStructureCommand(FFinstance* instance, FFdata* data, const char
     else if(strcasecmp(line, "bios") == 0)
         ffPrintBios(instance, &instance->config.bios);
     else if(strcasecmp(line, "board") == 0)
-        ffPrintBoard(instance);
+        ffPrintBoard(instance, &instance->config.board);
     else if(strcasecmp(line, "brightness") == 0)
         ffPrintBrightness(instance);
     else if(strcasecmp(line, "chassis") == 0)
diff --git a/src/fastfetch.h b/src/fastfetch.h
index 8001cdf5d..bd6e4ee72 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -95,7 +95,7 @@ typedef struct FFconfig
     FFOSOptions os;
     FFHostOptions host;
     FFBiosOptions bios;
-    FFModuleArgs board;
+    FFBoardOptions board;
     FFModuleArgs brightness;
     FFModuleArgs chassis;
     FFCommandOptions command;
@@ -251,7 +251,6 @@ void ffPrepareWeather(FFinstance* instance);
 
 void ffPrintCustom(FFinstance* instance, const char* key, const char* value);
 void ffPrintBreak(FFinstance* instance);
-void ffPrintBoard(FFinstance* instance);
 void ffPrintChassis(FFinstance* instance);
 void ffPrintUptime(FFinstance* instance);
 void ffPrintProcesses(FFinstance* instance);
diff --git a/src/flashfetch.c b/src/flashfetch.c
index 9c24a9ee8..ef097343e 100644
--- a/src/flashfetch.c
+++ b/src/flashfetch.c
@@ -25,7 +25,7 @@ int main(int argc, char** argv)
     ffPrintOS(&instance, &instance.config.os);
     ffPrintHost(&instance, &instance.config.host);
     //ffPrintBios(&instance, &instance.config.bios);
-    //ffPrintBoard(&instance);
+    //ffPrintBoard(&instance, &instance.config.board);
     //ffPrintChassis(&instance);
     ffPrintKernel(&instance, &instance.config.kernel);
     ffPrintUptime(&instance);
diff --git a/src/modules/board.c b/src/modules/board.c
deleted file mode 100644
index 558653892..000000000
--- a/src/modules/board.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "fastfetch.h"
-#include "common/printing.h"
-#include "detection/board/board.h"
-
-#define FF_BOARD_MODULE_NAME "Board"
-#define FF_BOARD_NUM_FORMAT_ARGS 3
-
-void ffPrintBoard(FFinstance* instance)
-{
-    FFBoardResult result;
-    ffDetectBoard(&result);
-
-    if(result.error.length > 0)
-    {
-        ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board, "%*s", result.error.length, result.error.chars);
-        goto exit;
-    }
-
-    if(result.boardName.length == 0)
-    {
-        ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board, "board_name is not set.");
-        goto exit;
-    }
-
-    if(instance->config.board.outputFormat.length == 0)
-    {
-        ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board.key);
-        puts(result.boardName.chars);
-    }
-    else
-    {
-        ffPrintFormat(instance, FF_BOARD_MODULE_NAME, 0, &instance->config.board, FF_BOARD_NUM_FORMAT_ARGS, (FFformatarg[]) {
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardName},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVendor},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVersion},
-        });
-    }
-
-exit:
-    ffStrbufDestroy(&result.boardName);
-    ffStrbufDestroy(&result.boardVendor);
-    ffStrbufDestroy(&result.boardVersion);
-    ffStrbufDestroy(&result.error);
-}
diff --git a/src/modules/board/board.c b/src/modules/board/board.c
new file mode 100644
index 000000000..6f41aa76e
--- /dev/null
+++ b/src/modules/board/board.c
@@ -0,0 +1,97 @@
+#include "fastfetch.h"
+#include "common/printing.h"
+#include "detection/board/board.h"
+#include "modules/board/board.h"
+
+#define FF_BOARD_MODULE_NAME "Board"
+#define FF_BOARD_NUM_FORMAT_ARGS 3
+
+void ffPrintBoard(FFinstance* instance, FFBoardOptions* options)
+{
+    FFBoardResult result;
+    ffDetectBoard(&result);
+
+    if(result.error.length > 0)
+    {
+        ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "%*s", result.error.length, result.error.chars);
+        goto exit;
+    }
+
+    if(result.boardName.length == 0)
+    {
+        ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, "board_name is not set.");
+        goto exit;
+    }
+
+    if(options->moduleArgs.outputFormat.length == 0)
+    {
+        ffPrintLogoAndKey(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs.key);
+        puts(result.boardName.chars);
+    }
+    else
+    {
+        ffPrintFormat(instance, FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_BOARD_NUM_FORMAT_ARGS, (FFformatarg[]) {
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardName},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVendor},
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result.boardVersion},
+        });
+    }
+
+exit:
+    ffStrbufDestroy(&result.boardName);
+    ffStrbufDestroy(&result.boardVendor);
+    ffStrbufDestroy(&result.boardVersion);
+    ffStrbufDestroy(&result.error);
+}
+
+void ffInitBoardOptions(FFBoardOptions* options)
+{
+    options->moduleName = FF_BOARD_MODULE_NAME;
+    ffOptionInitModuleArg(&options->moduleArgs);
+}
+
+bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const char* value)
+{
+    const char* subKey = ffOptionTestPrefix(key, FF_BOARD_MODULE_NAME);
+    if (!subKey) return false;
+    if (ffOptionParseModuleArgs(key, subKey, value, &options->moduleArgs))
+        return true;
+
+    return false;
+}
+
+void ffDestroyBoardOptions(FFBoardOptions* options)
+{
+    ffOptionDestroyModuleArg(&options->moduleArgs);
+}
+
+#ifdef FF_HAVE_JSONC
+bool ffParseBoardJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module)
+{
+    if (strcasecmp(type, FF_BOARD_MODULE_NAME) != 0)
+        return false;
+
+    FFBoardOptions __attribute__((__cleanup__(ffDestroyBoardOptions))) options;
+    ffInitBoardOptions(&options);
+
+    if (module)
+    {
+        struct lh_entry* entry;
+        lh_foreach(data->ffjson_object_get_object(module), entry)
+        {
+            const char* key = (const char *)lh_entry_k(entry);
+            if (strcasecmp(key, "type") == 0)
+                continue;
+            json_object* val = (struct json_object *)lh_entry_v(entry);
+
+            if (ffJsonConfigParseModuleArgs(data, key, val, &options.moduleArgs))
+                continue;
+
+            ffPrintError(instance, FF_BOARD_MODULE_NAME, 0, &options.moduleArgs, "Unknown JSON key %s", key);
+        }
+    }
+
+    ffPrintBoard(instance, &options);
+    return true;
+}
+#endif
diff --git a/src/modules/board/board.h b/src/modules/board/board.h
new file mode 100644
index 000000000..2027baf4b
--- /dev/null
+++ b/src/modules/board/board.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "fastfetch.h"
+
+void ffPrintBoard(FFinstance* instance, FFBoardOptions* options);
+void ffInitBoardOptions(FFBoardOptions* options);
+bool ffParseBoardCommandOptions(FFBoardOptions* options, const char* key, const char* value);
+void ffDestroyBoardOptions(FFBoardOptions* options);
+
+#ifdef FF_HAVE_JSONC
+#include "common/config.h"
+bool ffParseBoardJsonObject(FFinstance* instance, const char* type, JSONCData* data, json_object* module);
+#endif
diff --git a/src/modules/board/option.h b/src/modules/board/option.h
new file mode 100644
index 000000000..582854d23
--- /dev/null
+++ b/src/modules/board/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 FFBoardOptions
+{
+    const char* moduleName;
+    FFModuleArgs moduleArgs;
+} FFBoardOptions;
diff --git a/src/modules/jsonconfig/jsonconfig.c b/src/modules/jsonconfig/jsonconfig.c
index bcfd07f7c..221c1050a 100644
--- a/src/modules/jsonconfig/jsonconfig.c
+++ b/src/modules/jsonconfig/jsonconfig.c
@@ -16,6 +16,7 @@ static inline bool parseModuleJsonObject(FFinstance* instance, const char* type,
         ffParseBatteryJsonObject(instance, type, data, module) ||
         ffParseBiosJsonObject(instance, type, data, module) ||
         ffParseBluetoothJsonObject(instance, type, data, module) ||
+        ffParseBoardJsonObject(instance, type, data, module) ||
         ffParseCommandJsonObject(instance, type, data, module) ||
         ffParseDateTimeJsonObject(instance, type, data, module) ||
         ffParseDisplayJsonObject(instance, type, data, module) ||
diff --git a/src/modules/modules.h b/src/modules/modules.h
index 19a6414c7..846b18b08 100644
--- a/src/modules/modules.h
+++ b/src/modules/modules.h
@@ -6,6 +6,7 @@
 #include "modules/battery/battery.h"
 #include "modules/bios/bios.h"
 #include "modules/bluetooth/bluetooth.h"
+#include "modules/board/board.h"
 #include "modules/command/command.h"
 #include "modules/datetime/datetime.h"
 #include "modules/display/display.h"
diff --git a/src/modules/options.h b/src/modules/options.h
index 9f992996a..3872909fb 100644
--- a/src/modules/options.h
+++ b/src/modules/options.h
@@ -5,6 +5,7 @@
 #include "modules/battery/option.h"
 #include "modules/bios/option.h"
 #include "modules/bluetooth/option.h"
+#include "modules/board/option.h"
 #include "modules/command/option.h"
 #include "modules/datetime/option.h"
 #include "modules/display/option.h"