CI: Bump the github-actions group with 4 updates

Bumps the github-actions group with 4 updates: [cross-platform-actions/action](https://github.com/cross-platform-actions/action), [github/codeql-action/init](https://github.com/github/codeql-action), [github/codeql-action/analyze](https://github.com/github/codeql-action) and [signpath/github-action-submit-signing-request](https://github.com/signpath/github-action-submit-signing-request). Updates `cross-platform-actions/action` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/cross-platform-actions/action/releases) - [Changelog](https://github.com/cross-platform-actions/action/blob/master/changelog.md) - [Commits](https://github.com/cross-platform-actions/action/compare/5ea7e8e4677bd726033a10b094ba1c5762b15dee...24ef01df165c76df1ed2b9f9e9212e78dc2fc963) Updates `github/codeql-action/init` from 4.37.6 to 4.37.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5595ccaf912efad79be6eef63a5619ff05969be3...ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd) Updates `github/codeql-action/analyze` from 4.37.6 to 4.37.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5595ccaf912efad79be6eef63a5619ff05969be3...ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd) Updates `signpath/github-action-submit-signing-request` from 2.2 to 2.3 - [Release notes](https://github.com/signpath/github-action-submit-signing-request/releases) - [Commits](https://github.com/signpath/github-action-submit-signing-request/compare/b9d91eadd323de506c0c81cf0c7fe7438f3360fd...c92b958760219087e01f8d67a1669ed57afe2627) --- updated-dependencies: - dependency-name: cross-platform-actions/action dependency-version: 1.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action/init dependency-version: 4.37.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: github/codeql-action/analyze dependency-version: 4.37.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: signpath/github-action-submit-signing-request dependency-version: '2.3' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com>
Doc: updates README [ci skip]
2026-09-12 10:22:12 +02:00 · 2026-08-23 18:07:14 +00:00 · 2026-08-21 10:40:50 +08:00 · 2026-08-21 10:19:06 +08:00 · 2026-08-21 08:31:42 +08:00 · 2026-08-21 00:25:32 +08:00
190 changed files with 3421 additions and 854 deletions
@@ -2,4 +2,4 @@
 check-filenames =
 builtin = clear,rare,usage,informal
 skip = */.git,*/cmake-build-*,*/.idea,*/completions,*/presets,*/screenshots,*/tests,*/3rdparty,*/logo/ascii,./src/detection/gpu/asahi_drm.h,./src/detection/cpu/cpu_x86.c,./src/detection/gpu/gpu_bsddrm.c,./src/detection/displayserver/linux/wayland/*-protocol.*,./build,./build-*,./build_*,./src/common/impl/genconfig.c
-ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,slave,sur,doas,conexant,ags,bu,renderD,SME,Carmel,kinda
+ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,slave,sur,doas,conexant,ags,bu,renderD,SME,Carmel,kinda,symbole,connexion,comando,processus,lokale,adres,titel,som,environnement,Sistem,Lokal,Lokal,Sistem,Paket,Hava
@@ -18,7 +18,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Start VM
-        uses: cross-platform-actions/action@5ea7e8e4677bd726033a10b094ba1c5762b15dee # v1.3.0
+        uses: cross-platform-actions/action@24ef01df165c76df1ed2b9f9e9212e78dc2fc963 # v1.4.0
        with:
          operating_system: dragonflybsd
          version: '6.4.2'
@@ -18,7 +18,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Start VM
-        uses: cross-platform-actions/action@5ea7e8e4677bd726033a10b094ba1c5762b15dee # v1.3.0
+        uses: cross-platform-actions/action@24ef01df165c76df1ed2b9f9e9212e78dc2fc963 # v1.4.0
        with:
          operating_system: freebsd
          version: '15.1'
@@ -18,7 +18,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Start VM
-        uses: cross-platform-actions/action@5ea7e8e4677bd726033a10b094ba1c5762b15dee # v1.3.0
+        uses: cross-platform-actions/action@24ef01df165c76df1ed2b9f9e9212e78dc2fc963 # v1.4.0
        with:
          operating_system: haiku
          version: 'r1beta5'
@@ -52,7 +52,7 @@ jobs:

      - name: Initialize CodeQL
        if: inputs.arch == 'amd64'
-        uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
        with:
          languages: c

@@ -64,7 +64,7 @@ jobs:

      - name: perform CodeQL analysis
        if: inputs.arch == 'amd64'
-        uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+        uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

      - name: list features
        run: ./fastfetch --list-features
@@ -18,7 +18,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Start VM
-        uses: cross-platform-actions/action@5ea7e8e4677bd726033a10b094ba1c5762b15dee # v1.3.0
+        uses: cross-platform-actions/action@24ef01df165c76df1ed2b9f9e9212e78dc2fc963 # v1.4.0
        with:
          operating_system: netbsd
          version: '10.1'
@@ -18,7 +18,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Start VM
-        uses: cross-platform-actions/action@5ea7e8e4677bd726033a10b094ba1c5762b15dee # v1.3.0
+        uses: cross-platform-actions/action@24ef01df165c76df1ed2b9f9e9212e78dc2fc963 # v1.4.0
        with:
          operating_system: omnios
          version: 'r151058'
@@ -18,7 +18,7 @@ jobs:
        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

      - name: Start VM
-        uses: cross-platform-actions/action@5ea7e8e4677bd726033a10b094ba1c5762b15dee # v1.3.0
+        uses: cross-platform-actions/action@24ef01df165c76df1ed2b9f9e9212e78dc2fc963 # v1.4.0
        with:
          operating_system: openbsd
          version: '7.9'
@@ -94,7 +94,7 @@ jobs:

      - if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
        name: submit signing request
-        uses: signpath/github-action-submit-signing-request@b9d91eadd323de506c0c81cf0c7fe7438f3360fd # v2.2
+        uses: signpath/github-action-submit-signing-request@c92b958760219087e01f8d67a1669ed57afe2627 # v2.3
        with:
          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
          organization-id: '${{ vars.SIGNPATH_ORG_ID }}'
@@ -1,8 +1,30 @@
+# Unreleased
+
+Changes:
+* The DE / WM / LM modules now reports the full name "Desktop Environment" / "Window Manager" / "Login Manager" instead of the abbreviations.
+
+Features:
+* Added module key localization support. (General)
+    * Added a new option `--key-language <?lang>` (`display.key.language: "<?lang>"` in JSON config). When left empty, it defaults to the system locale.
+    * See `fastfetch -h key-language` for all supported languages.
+* Improved Wi-Fi module
+    * Added Wifi channel width detection, exposed via `{channel-width}` in custom format (reports 0 when not supported).
+    * Improved Wifi channel frequency accuracy and fortified detection on Windows, macOS.
+    * Added Wifi detection support on SunOS, Haiku.
+* Added Battery detection support on SunOS. (Battery, SunOS)
+* Added terminal font size detection support on Termux. (TerminalFont, Android)
+* Improved GTK theme/icons/font detection on standalone WMs such as Hyprland, sway, niri and i3. (Theme, Linux)
+* Improved fish completion scripts to print enum descriptions. (Completion)
+
+Bugfixes:
+* Fixed I/O rate calculation precision in DiskIO and NetIO, and prevented division by zero. (DiskIO / NetIO)
+* Some internal cleanups and optimizations.
+
 # 2.67.1

 Bugfixes:
-* Fixed a `Symbol not found` error when running on macOS 10.15. (Codec, macOS)
-* Fixed Alacritty font size never being parsed from the TOML config. (TerminalFont)
+* Fixed a `Symbol not found` error when running on macOS 10.15. (#2499, Codec, macOS)
+* Fixed Alacritty font size never being parsed from the TOML config. (#2501, TerminalFont)
 * Fixed bright colors incorrectly being active when the terminal uses a light theme. (#2509, Display)
 * Fixed Ghostty terminal font detection (TerminalFont)
    * Now tries to load the config with the `.ghostty` extension. (#2500)
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
+cmake_minimum_required(VERSION 3.21.0) # C_STANDARD

 project(fastfetch
    VERSION 2.67.1
@@ -1169,7 +1169,7 @@ elseif(SunOS)
        src/common/impl/FFPlatform_unix.c
        src/common/impl/binary_linux.c
        src/common/impl/kmod_sunos.c
-        src/detection/battery/battery_nosupport.c
+        src/detection/battery/battery_sunos.c
        src/detection/bios/bios_windows.c
        src/detection/board/board_windows.c
        src/detection/bootmgr/bootmgr_nosupport.c
@@ -1235,7 +1235,7 @@ elseif(SunOS)
        src/detection/uptime/uptime_sunos.c
        src/detection/users/users_linux.c
        src/detection/wallpaper/wallpaper_linux.c
-        src/detection/wifi/wifi_nosupport.c
+        src/detection/wifi/wifi_sunos.c
        src/detection/wm/wm_nosupport.c
        src/detection/de/de_linux.c
        src/detection/wmtheme/wmtheme_linux.c
@@ -1305,7 +1305,7 @@ elseif(Haiku)
        src/detection/uptime/uptime_haiku.c
        src/detection/users/users_linux.c
        src/detection/wallpaper/wallpaper_haiku.cpp
-        src/detection/wifi/wifi_nosupport.c
+        src/detection/wifi/wifi_haiku.cpp
        src/detection/wm/wm_nosupport.c
        src/detection/de/de_nosupport.c
        src/detection/wmtheme/wmtheme_haiku.cpp
@@ -99,7 +99,7 @@ See the Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building
 * View all data that fastfetch detects: `fastfetch -s <module1>[:<module2>][:<module3>] --format json`
 * Display help messages: `fastfetch --help`
 * Generate a minimal config file: `fastfetch [-s <module1>[:<module2>]] --gen-config [</path/to/config.jsonc>]`
-    * Use: `--gen-config-full` to generate a full config file with all optional options
+    * Use [The online configuration generator](https://fastfetch-cli.github.io/fastfetch-config/) to generate a full config file with all optional options

 ## Customization

@@ -63,46 +63,78 @@ echo '
 import json, subprocess, sys


+def escape_fish_dq(s: str) -> str:
+    """Escape special characters for Fish double quotes to prevent unexpected expansions. One slash in output needs four slashes in script"""
+    return str(s).replace("\\\\", "\\\\\\\\").replace("\\"", "\\\\\\"").replace("$", "\\\\$")
+
+
 def main():
    data: dict[str, list[dict]] = json.loads(subprocess.check_output(["fastfetch", "--help-raw"]))

+    enum_functions = []
+    complete_commands = []
+
    for key in data:
        for flag in data[key]:
-            if flag["long"] == "logo-color-[1-9]":
+            long_name = flag.get("long", "")
+
+            # Handle pseudo flag logo-color-[1-9]
+            if long_name == "logo-color-[1-9]":
+                safe_desc_global = escape_fish_dq(flag.get("desc", ""))
                for i in range(1, 10):
-                    print(f"""complete -c fastfetch -d "{flag["desc"]}" -l "logo-color-{i}" -x -a "(__fastfetch_complete_color)" """)
+                    complete_commands.append(f"complete -c fastfetch -d \"{safe_desc_global}\" -l \"logo-color-{i}\" -x -a \"(__fastfetch_complete_color)\"")
                continue

            if flag.get("pseudo", False):
                continue

-            command_prefix = f"""complete -c fastfetch -d "{flag["desc"]}" -l "{flag["long"]}\""""
+            safe_desc_global = escape_fish_dq(flag.get("desc", ""))
+            command_prefix = f"complete -c fastfetch -d \"{safe_desc_global}\" -l \"{long_name}\""
+
            if "short" in flag:
-                command_prefix += f""" -o {flag["short"]}"""
+                short_name = flag["short"]
+                command_prefix += f" -o {short_name}"

            if "arg" in flag:
-                type: str = flag["arg"]["type"]
-                if type == "bool":
-                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_bool)\"")
-                elif type == "color":
-                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_color)\"")
-                elif type == "command":
-                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_command)\"")
-                elif type == "config":
-                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_config)\"")
-                elif type == "enum":
-                    temp: str = " ".join(flag["arg"]["enum"])
-                    print(f"{command_prefix} -x -a \"{temp}\"")
-                elif type == "logo":
-                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_logo)\"")
-                elif type == "structure":
-                    print(f"{command_prefix} -x -a \"(__fish_complete_list : __fastfetch_complete_structure)\"")
-                elif type == "path":
-                    print(f"{command_prefix} -r -F")
+                arg_type: str = flag["arg"]["type"]
+                if arg_type == "bool":
+                    complete_commands.append(f"{command_prefix} -x -a \"(__fastfetch_complete_bool)\"")
+                elif arg_type == "color":
+                    complete_commands.append(f"{command_prefix} -x -a \"(__fastfetch_complete_color)\"")
+                elif arg_type == "command":
+                    complete_commands.append(f"{command_prefix} -x -a \"(__fastfetch_complete_command)\"")
+                elif arg_type == "config":
+                    complete_commands.append(f"{command_prefix} -x -a \"(__fastfetch_complete_config)\"")
+                elif arg_type == "enum":
+                    # Sanitize flag name to create a valid Fish function name
+                    func_name = long_name.replace("-", "_").replace("[", "_").replace("]", "_")
+                    func_name = f"__fastfetch_complete_enum_{func_name}"
+
+                    # Generate the enum function
+                    func_lines = [f"function {func_name}"]
+                    for enum_val, enum_desc in flag["arg"]["enum"].items():
+                        safe_val = escape_fish_dq(enum_val)
+                        safe_desc = escape_fish_dq(enum_desc)
+                        func_lines.append(f"    echo -e \"{safe_val}\\t{safe_desc}\"")
+                    func_lines.append("end\n")
+                    enum_functions.append("\n".join(func_lines))
+
+                    # Append complete command pointing to the new function
+                    complete_commands.append(f"{command_prefix} -x -a \"({func_name})\"")
+                elif arg_type == "logo":
+                    complete_commands.append(f"{command_prefix} -x -a \"(__fastfetch_complete_logo)\"")
+                elif arg_type == "structure":
+                    complete_commands.append(f"{command_prefix} -x -a \"(__fish_complete_list : __fastfetch_complete_structure)\"")
+                elif arg_type == "path":
+                    complete_commands.append(f"{command_prefix} -r -F")
                else:
-                    print(f"{command_prefix} -x")
+                    complete_commands.append(f"{command_prefix} -x")
            else:
-                print(f"{command_prefix} -f")
+                complete_commands.append(f"{command_prefix} -f")
+
+    # Print generated enum functions first, then complete rules
+    print("\n".join(enum_functions))
+    print("\n".join(complete_commands))


 if __name__ == "__main__":
@@ -585,6 +585,38 @@
                "default": "string"
            }
        },
+        {
+            "long": "key-language",
+            "desc": "Specify the language used for module keys",
+            "remark": "Leave empty for auto-detection based on the system locale. Unsupported locales fall back to English",
+            "arg": {
+                "type": "enum",
+                "default": "en",
+                "optional": true,
+                "enum": {
+                    "en": "English",
+                    "ar": "Arabic",
+                    "cs": "Czech",
+                    "de": "German",
+                    "es": "Spanish",
+                    "fr": "French",
+                    "gl": "Galician",
+                    "he": "Hebrew",
+                    "id": "Indonesian",
+                    "it": "Italian",
+                    "ja": "Japanese",
+                    "ko": "Korean",
+                    "pl": "Polish",
+                    "pt": "Portuguese",
+                    "ru": "Russian",
+                    "tr": "Turkish",
+                    "uk": "Ukrainian",
+                    "vi": "Vietnamese",
+                    "zh_CN": "Simplified Chinese",
+                    "zh_TW": "Traditional Chinese"
+                }
+            }
+        },
        {
            "long": "bright-color",
            "desc": "Specify whether keys, title, and ASCII logo should be printed in bright color",
@@ -1057,6 +1057,116 @@
                            "description": "Left padding for keys",
                            "minimum": 0,
                            "default": 0
+                        },
+                        "language": {
+                            "description": "Language used for module keys. `null` for auto detection based on system locale",
+                            "oneOf": [
+                                {
+                                    "type": "null",
+                                    "description": "Auto detection based on system locale"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "en",
+                                    "description": "English"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "ar",
+                                    "description": "Arabic"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "cs",
+                                    "description": "Czech"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "de",
+                                    "description": "German"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "es",
+                                    "description": "Spanish"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "fr",
+                                    "description": "French"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "gl",
+                                    "description": "Galician"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "he",
+                                    "description": "Hebrew"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "id",
+                                    "description": "Indonesian"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "it",
+                                    "description": "Italian"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "ja",
+                                    "description": "Japanese"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "ko",
+                                    "description": "Korean"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "pl",
+                                    "description": "Polish"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "pt",
+                                    "description": "Portuguese"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "ru",
+                                    "description": "Russian"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "tr",
+                                    "description": "Turkish"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "uk",
+                                    "description": "Ukrainian"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "vi",
+                                    "description": "Vietnamese"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "zh_CN",
+                                    "description": "Simplified Chinese"
+                                },
+                                {
+                                    "type": "string",
+                                    "const": "zh_TW",
+                                    "description": "Traditional Chinese"
+                                }
+                            ],
+                            "default": "en"
                        }
                    }
                },
@@ -2585,8 +2695,8 @@
                                    },
                                    "waitTime": {
                                        "type": "integer",
-                                        "description": "Wait time (in ms). Disk I/O = (totalBytesEnd - totalBytesStart) / waitTime",
-                                        "default": 200,
+                                        "description": "Wait time (in ms) used to measure the I/O rate (calculated in bytes/sec).\nAvoid setting this too low, as the kernel requires time to accurately update counters.\nIgnored if 'detectTotal' is true.",
+                                        "default": 500,
                                        "minimum": 1
                                    },
                                    "key": {
@@ -3486,8 +3596,8 @@
                                    },
                                    "waitTime": {
                                        "type": "integer",
-                                        "description": "Wait time (in ms). Net I/O = (totalBytesEnd - totalBytesStart) / waitTime",
-                                        "default": 200,
+                                        "description": "Wait time (in ms) used to measure the I/O rate (calculated in bytes/sec).\nAvoid setting this too low, as the kernel requires time to accurately update counters.\nIgnored if 'detectTotal' is true.",
+                                        "default": 500,
                                        "minimum": 1
                                    },
                                    "key": {
@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "common/memrchr.h"
+#include "common/arrutil.h"

 #ifdef FF_USE_SYSTEM_YYJSON
    #include <yyjson.h>
@@ -628,3 +629,4 @@ static inline void ffStrbufPutTo(const FFstrbuf* strbuf, FILE* file) {
 bool ffStrbufDecodeHexEscapeSequences(FFstrbuf* strbuf);

 #define FF_STRBUF_AUTO_DESTROY [[gnu::cleanup(ffStrbufDestroy)]] FFstrbuf
+#define FF_STRBUF_STATIC(str) { .allocated = 0, .length = (uint32_t) sizeof(str) - 1, .chars = str }
@@ -83,6 +83,7 @@ void ffStrbufEnsureFreeNoCheck(FFstrbuf* strbuf, uint32_t free) {

        // Round up to the next power of 2.
        // If the value is already a power of 2, it will be rounded up to the next power of 2.
+        // allocate = __builtin_stdc_bit_ceil(allocate + 1); // Currently generates worse asm code
        allocate = 1U << (32 - __builtin_clz(allocate));
    }

@@ -67,13 +67,13 @@ void ffPrepareCommandOption(FFdata* data) {
    char* moduleType = nullptr;
    size_t moduleLen = 0;
    while (ffStrbufGetdelim(&moduleType, &moduleLen, ':', &data->structure)) {
-#define FF_IF_MODULE_MATCH(moduleNameConstant) if (moduleLen == strlen(moduleNameConstant) && ffStrEqualsIgnCase(moduleType, moduleNameConstant) && !ffStrbufSeparatedContainIgnCaseS(&data->structureDisabled, moduleNameConstant, ':'))
+#define FF_IF_MODULE_MATCH(moduleNameConstant) if (ffStrEqualsIgnCase(moduleType, moduleNameConstant) && !ffStrbufSeparatedContainIgnCaseS(&data->structureDisabled, moduleNameConstant, ':'))

        switch (moduleType[0]) {
            #if !FF_MODULE_DISABLE_CPUUSAGE
            case 'C':
            case 'c':
-                FF_IF_MODULE_MATCH(FF_CPUUSAGE_MODULE_NAME)
+                FF_IF_MODULE_MATCH(ffCPUUsageModuleInfo.name)
                ffPrepareCPUUsage();
                break;
            #endif
@@ -81,7 +81,7 @@ void ffPrepareCommandOption(FFdata* data) {
            #if !FF_MODULE_DISABLE_DISKIO
            case 'D':
            case 'd':
-                FF_IF_MODULE_MATCH(FF_DISKIO_MODULE_NAME) {
+                FF_IF_MODULE_MATCH(ffDiskIOModuleInfo.name) {
                    [[gnu::cleanup(ffDestroyDiskIOOptions)]] FFDiskIOOptions options;
                    ffInitDiskIOOptions(&options);
                    ffPrepareDiskIO(&options);
@@ -92,7 +92,7 @@ void ffPrepareCommandOption(FFdata* data) {
            #if !FF_MODULE_DISABLE_NETIO
            case 'N':
            case 'n':
-                FF_IF_MODULE_MATCH(FF_NETIO_MODULE_NAME) {
+                FF_IF_MODULE_MATCH(ffNetIOModuleInfo.name) {
                    [[gnu::cleanup(ffDestroyNetIOOptions)]] FFNetIOOptions options;
                    ffInitNetIOOptions(&options);
                    ffPrepareNetIO(&options);
@@ -103,7 +103,7 @@ void ffPrepareCommandOption(FFdata* data) {
            #if !FF_MODULE_DISABLE_PUBLICIP
            case 'P':
            case 'p':
-                FF_IF_MODULE_MATCH(FF_PUBLICIP_MODULE_NAME) {
+                FF_IF_MODULE_MATCH(ffPublicIPModuleInfo.name) {
                    [[gnu::cleanup(ffDestroyPublicIpOptions)]] FFPublicIPOptions options;
                    ffInitPublicIpOptions(&options);
                    ffPreparePublicIp(&options);
@@ -114,7 +114,7 @@ void ffPrepareCommandOption(FFdata* data) {
            #if !FF_MODULE_DISABLE_WEATHER
            case 'W':
            case 'w':
-                FF_IF_MODULE_MATCH(FF_WEATHER_MODULE_NAME) {
+                FF_IF_MODULE_MATCH(ffWeatherModuleInfo.name) {
                    [[gnu::cleanup(ffDestroyWeatherOptions)]] FFWeatherOptions options;
                    ffInitWeatherOptions(&options);
                    ffPrepareWeather(&options);
@@ -136,9 +136,9 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) {
        #if !FF_MODULE_DISABLE_CPUUSAGE
        case 'c':
        case 'C': {
-            if (ffStrEqualsIgnCase(type, FF_CPUUSAGE_MODULE_NAME)) {
+            if (ffStrEqualsIgnCase(type, ffCPUUsageModuleInfo.name)) {
                ffPrepareCPUUsage();
-            } else if (ffStrEqualsIgnCase(type, FF_COMMAND_MODULE_NAME)) {
+            } else if (ffStrEqualsIgnCase(type, ffCommandModuleInfo.name)) {
                [[gnu::cleanup(ffDestroyCommandOptions)]] FFCommandOptions options;
                ffInitCommandOptions(&options);
                if (module) {
@@ -153,7 +153,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) {
        #if !FF_MODULE_DISABLE_DISKIO
        case 'd':
        case 'D': {
-            if (ffStrEqualsIgnCase(type, FF_DISKIO_MODULE_NAME)) {
+            if (ffStrEqualsIgnCase(type, ffDiskIOModuleInfo.name)) {
                [[gnu::cleanup(ffDestroyDiskIOOptions)]] FFDiskIOOptions options;
                ffInitDiskIOOptions(&options);
                if (module) {
@@ -168,7 +168,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) {
        #if !FF_MODULE_DISABLE_NETIO
        case 'n':
        case 'N': {
-            if (ffStrEqualsIgnCase(type, FF_NETIO_MODULE_NAME)) {
+            if (ffStrEqualsIgnCase(type, ffNetIOModuleInfo.name)) {
                [[gnu::cleanup(ffDestroyNetIOOptions)]] FFNetIOOptions options;
                ffInitNetIOOptions(&options);
                if (module) {
@@ -183,7 +183,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) {
        #if !FF_MODULE_DISABLE_PUBLICIP
        case 'p':
        case 'P': {
-            if (ffStrEqualsIgnCase(type, FF_PUBLICIP_MODULE_NAME)) {
+            if (ffStrEqualsIgnCase(type, ffPublicIPModuleInfo.name)) {
                [[gnu::cleanup(ffDestroyPublicIpOptions)]] FFPublicIPOptions options;
                ffInitPublicIpOptions(&options);
                if (module) {
@@ -198,7 +198,7 @@ static void prepareModuleJsonObject(const char* type, yyjson_val* module) {
        #if !FF_MODULE_DISABLE_WEATHER
        case 'w':
        case 'W': {
-            if (ffStrEqualsIgnCase(type, FF_WEATHER_MODULE_NAME)) {
+            if (ffStrEqualsIgnCase(type, ffWeatherModuleInfo.name)) {
                [[gnu::cleanup(ffDestroyWeatherOptions)]] FFWeatherOptions options;
                ffInitWeatherOptions(&options);
                if (module) {
@@ -18,10 +18,35 @@ typedef struct FFModuleFormatArgList {

 #define FF_FORMAT_ARG_LIST(list) { .args = list, .count = sizeof(list) / sizeof(FFModuleFormatArg) }

+typedef struct FFModuleDisplayName {
+    const char* en; // English
+
+    const char* ar; // Arabic
+    const char* cs; // Czech
+    const char* de; // German
+    const char* es; // Spanish
+    const char* fr; // French
+    const char* gl; // Galician
+    const char* he; // Hebrew
+    const char* id; // Indonesian
+    const char* it; // Italian
+    const char* ja; // Japanese
+    const char* ko; // Korean
+    const char* pl; // Polish
+    const char* pt; // (Brazilian) Portuguese
+    const char* ru; // Russian
+    const char* tr; // Turkish
+    const char* uk; // Ukrainian
+    const char* vi; // Vietnamese
+    const char* zh_CN; // Simplified Chinese
+    const char* zh_TW; // Traditional Chinese
+} FFModuleDisplayName;
+
 // Must be the first field of FFModuleOptions
 typedef struct FFModuleBaseInfo {
    const char* name;
    const char* description;
+    FFModuleDisplayName displayName;
    // A dirty polymorphic implementation in C.
    // This is UB, because `void*` is not compatible with `FF*Options*`.
    // However we can't do it better unless we move to C++, so that `option` becomes a `this` pointer
@@ -94,3 +119,5 @@ static inline void ffOptionDestroyModuleArg(FFModuleArgs* args) {
 }

 enum { FF_OPTION_MAX_SIZE = 1 << 8 }; // Maximum size of a single option value, used for static allocation
+
+#define FF_MODULE_GET_DISPLAY_NAME(moduleName) (*(const char**) ((uint8_t*) &ff ## moduleName ## ModuleInfo.displayName + instance.config.display.keyLanguage))
@@ -169,7 +169,7 @@ NTSTATUS NTAPI NtQuerySystemEnvironmentValueEx(
 );

 NTSTATUS NTAPI RtlGUIDFromString(IN PCUNICODE_STRING GuidString, OUT GUID* Guid);
-NTSTATUS NTAPI RtlStringFromGUIDEx(IN GUID* Guid, OUT PCUNICODE_STRING GuidString, _In_ BOOLEAN AllocateGuidString);
+NTSTATUS NTAPI RtlStringFromGUIDEx(IN const GUID* Guid, OUT PUNICODE_STRING GuidString, IN BOOLEAN AllocateGuidString);

 typedef struct _SYSTEM_SECUREBOOT_INFORMATION {
    BOOLEAN SecureBootEnabled;
@@ -0,0 +1,113 @@
+#include "battery.h"
+
+#include <kstat.h>
+
+static inline void kstatFreeWrap(kstat_ctl_t** pkc) {
+    assert(pkc);
+    if (*pkc) {
+        kstat_close(*pkc);
+    }
+}
+
+static bool getUint32(kstat_t* ksp, const char* name, uint32_t* value) {
+    kstat_named_t* stat = kstat_data_lookup(ksp, name);
+    if (!stat) {
+        return false;
+    }
+
+    switch (stat->data_type) {
+        case KSTAT_DATA_UINT32:
+            *value = stat->value.ui32;
+            return true;
+        case KSTAT_DATA_INT32:
+            if (stat->value.i32 >= 0) {
+                *value = (uint32_t) stat->value.i32;
+                return true;
+            }
+            break;
+#ifdef _INT64_TYPE
+        case KSTAT_DATA_UINT64:
+            if (stat->value.ui64 <= UINT32_MAX) {
+                *value = (uint32_t) stat->value.ui64;
+                return true;
+            }
+            break;
+        case KSTAT_DATA_INT64:
+            if (stat->value.i64 >= 0 && (uint64_t) stat->value.i64 <= UINT32_MAX) {
+                *value = (uint32_t) stat->value.i64;
+                return true;
+            }
+            break;
+#endif
+        default:
+            break;
+    }
+
+    return false;
+}
+
+const char* ffDetectBattery([[maybe_unused]] FFBatteryOptions* options, FFlist* results) {
+    // https://github.com/illumos/illumos-gate/blob/master/usr/src/cmd/powertop/common/battery.c
+    [[gnu::cleanup(kstatFreeWrap)]] kstat_ctl_t* kc = kstat_open();
+    if (!kc) {
+        return "kstat_open() failed";
+    }
+
+    // illumos exposes battery information through either of these modules.
+    const char* modules[] = { "battery", "acpi_drv" };
+    kstat_t* bif = nullptr;
+    kstat_t* bst = nullptr;
+    for (size_t i = 0; i < ARRAY_SIZE(modules); ++i) {
+        bif = kstat_lookup(kc, modules[i], 0, "battery BIF0");
+        bst = kstat_lookup(kc, modules[i], 0, "battery BST0");
+        if (bif && bst) {
+            break;
+        }
+        bif = nullptr;
+        bst = nullptr;
+    }
+
+    if (!bif || !bst || kstat_read(kc, bif, nullptr) < 0 || kstat_read(kc, bst, nullptr) < 0) {
+        return nullptr;
+    }
+
+    uint32_t lastCapacity, remainingCapacity, rate, state;
+    if (!getUint32(bif, "bif_last_cap", &lastCapacity) ||
+        !getUint32(bst, "bst_rem_cap", &remainingCapacity) ||
+        !getUint32(bst, "bst_state", &state)) {
+        return "kstat_data_lookup() failed";
+    }
+
+    if (lastCapacity == 0 || remainingCapacity == UINT32_MAX) {
+        return nullptr;
+    }
+
+    FFBatteryResult* battery = FF_LIST_ADD(FFBatteryResult, *results);
+    ffStrbufInit(&battery->manufacturer);
+    ffStrbufInit(&battery->manufactureDate);
+    ffStrbufInit(&battery->modelName);
+    ffStrbufInit(&battery->technology);
+    ffStrbufInit(&battery->serial);
+    battery->status = FF_BATTERY_STATUS_NONE;
+    battery->capacity = (double) remainingCapacity * 100.0 / (double) lastCapacity;
+    battery->temperature = FF_BATTERY_TEMP_UNSET;
+    battery->cycleCount = 0;
+    battery->timeRemaining = -1;
+
+    // illumos BST state: bit 0 discharging, bit 1 charging, bit 2 critical.
+    if (state & (1u << 0)) {
+        battery->status |= FF_BATTERY_STATUS_DISCHARGING;
+    }
+    if (state & (1u << 1)) {
+        battery->status |= FF_BATTERY_STATUS_CHARGING;
+    }
+    if (state & (1u << 2)) {
+        battery->status |= FF_BATTERY_STATUS_CRITICAL;
+    }
+
+    if ((state & (1u << 0)) && getUint32(bst, "bst_rate", &rate) && rate > 0 && rate != UINT32_MAX) {
+        battery->timeRemaining = (int32_t) (((uint64_t) remainingCapacity * 3600) / rate);
+    }
+
+    return nullptr;
+}
@@ -72,8 +72,7 @@ const char* ffDetectDiskIO(FFlist* result, FFDiskIOOptions* options) {
            uint64_t* prevValue = (uint64_t*) ((uint8_t*) icPrev + off);
            uint64_t* currValue = (uint64_t*) ((uint8_t*) icCurr + off);
            uint64_t temp = *currValue;
-            *currValue -= *prevValue;
-            *currValue /= (time2 - time1) / 1000 /* seconds */;
+            *currValue = (*currValue - *prevValue) * 1000 / (time2 - time1); // Calculate per second

            // For next function call
            *prevValue = temp;
@@ -14,74 +14,68 @@
    #define MTLFeatureSet_macOS_GPUFamily2_v1 ((MTLFeatureSet) 10005)
 #endif

-const char* ffGpuDetectDriverVersion(FFlist* gpus)
-{
-    if (@available(macOS 10.7, *))
-    {
-        NSMutableArray* arr = NSMutableArray.new;
-        FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
-            [arr addObject:@(x->driver.chars)];
-
-        NSDictionary* dict = CFBridgingRelease(KextManagerCopyLoadedKextInfo((__bridge CFArrayRef)arr, (__bridge CFArrayRef)@[@"CFBundleVersion"]));
-        FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
-        {
-            NSString* version = dict[@(x->driver.chars)][@"CFBundleVersion"];
-            if (version)
-            {
-                ffStrbufAppendC(&x->driver, ' ');
-                ffStrbufAppendS(&x->driver, version.UTF8String);
-            }
-        }
-        return nullptr;
+const char* ffGpuDetectDriverVersion(FFlist* gpus) {
+    NSMutableArray* arr = NSMutableArray.new;
+    FF_LIST_FOR_EACH (FFGPUResult, x, *gpus) {
+        [arr addObject:@(x->driver.chars)];
    }
-    return "Unsupported macOS version";
+
+    NSDictionary* dict = CFBridgingRelease(KextManagerCopyLoadedKextInfo((__bridge CFArrayRef) arr, (__bridge CFArrayRef) @[ @"CFBundleVersion" ]));
+    FF_LIST_FOR_EACH (FFGPUResult, x, *gpus) {
+        NSString* version = dict[@(x->driver.chars)][@"CFBundleVersion"];
+        if (version) {
+            ffStrbufAppendC(&x->driver, ' ');
+            ffStrbufAppendS(&x->driver, version.UTF8String);
+        }
+    }
+    return nullptr;
 }

-const char* ffGpuDetectMetal(FFlist* gpus)
-{
-    if (@available(macOS 10.13, *))
-    {
-        for (id<MTLDevice> device in MTLCopyAllDevices())
-        {
-            FFGPUResult* gpu = nullptr;
-            FF_LIST_FOR_EACH(FFGPUResult, x, *gpus)
-            {
-                if (x->deviceId == device.registryID)
-                {
-                    gpu = x;
-                    break;
-                }
+const char* ffGpuDetectMetal(FFlist* gpus) {
+    // Metal.framework is statically linked into the application,
+    // so `MTLCopyAllDevices` is always available, or the application will not start.
+    for (id<MTLDevice> device in MTLCopyAllDevices()) {
+        FFGPUResult* gpu = nullptr;
+        FF_LIST_FOR_EACH (FFGPUResult, x, *gpus) {
+            if (x->deviceId == device.registryID) {
+                gpu = x;
+                break;
            }
-            if (!gpu) continue;
-
-            #ifndef MAC_OS_X_VERSION_10_15
-            if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily2_v1])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 2");
-            else if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily1_v1])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 1");
-            #else // MAC_OS_X_VERSION_10_15
-            #pragma clang diagnostic push
-            #pragma clang diagnostic ignored "-Wunguarded-availability-new"
-            if ([device supportsFamily:MTLGPUFamilyMetal4])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal 4");
-            else if ([device supportsFamily:MTLGPUFamilyMetal3])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal 3");
-            #pragma clang diagnostic pop
-            else if ([device supportsFamily:MTLGPUFamilyCommon3])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Common 3");
-            else if ([device supportsFamily:MTLGPUFamilyCommon2])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Common 2");
-            else if ([device supportsFamily:MTLGPUFamilyCommon1])
-                ffStrbufSetStatic(&gpu->platformApi, "Metal Common 1");
-
-            gpu->type = device.hasUnifiedMemory ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
-            gpu->index = (uint32_t) device.locationNumber;
-
-            if (device.hasUnifiedMemory && device.recommendedMaxWorkingSetSize > 0)
-                gpu->shared.total = device.recommendedMaxWorkingSetSize;
-            #endif
        }
-        return nullptr;
+        if (!gpu) {
+            continue;
+        }
+
+#ifndef MAC_OS_X_VERSION_10_15
+        if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily2_v1]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 2");
+        } else if ([device supportsFeatureSet:MTLFeatureSet_macOS_GPUFamily1_v1]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Feature Set 1");
+        }
+#else // MAC_OS_X_VERSION_10_15
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wunguarded-availability-new"
+        if ([device supportsFamily:MTLGPUFamilyMetal4]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal 4");
+        } else if ([device supportsFamily:MTLGPUFamilyMetal3]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal 3");
+        }
+    #pragma clang diagnostic pop
+        else if ([device supportsFamily:MTLGPUFamilyCommon3]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Common 3");
+        } else if ([device supportsFamily:MTLGPUFamilyCommon2]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Common 2");
+        } else if ([device supportsFamily:MTLGPUFamilyCommon1]) {
+            ffStrbufSetStatic(&gpu->platformApi, "Metal Common 1");
+        }
+
+        gpu->type = device.hasUnifiedMemory ? FF_GPU_TYPE_INTEGRATED : FF_GPU_TYPE_DISCRETE;
+        gpu->index = (uint32_t) device.locationNumber;
+
+        if (device.hasUnifiedMemory && device.recommendedMaxWorkingSetSize > 0) {
+            gpu->shared.total = device.recommendedMaxWorkingSetSize;
+        }
+#endif
    }
-    return "Metal API is not supported by this macOS version";
+    return nullptr;
 }
@@ -62,50 +62,63 @@ static void detectGTKFromSettings(FFGTKResult* result) {

    const FFDisplayServerResult* wmde = ffConnectDisplayServer();

-    if (ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_XFCE4)) {
-        themeName = ffSettingsGetXFConf("xsettings", "/Net/ThemeName", FF_VARIANT_TYPE_STRING).strValue;
-        iconsName = ffSettingsGetXFConf("xsettings", "/Net/IconThemeName", FF_VARIANT_TYPE_STRING).strValue;
-        fontName = ffSettingsGetXFConf("xsettings", "/Gtk/FontName", FF_VARIANT_TYPE_STRING).strValue;
-        cursorTheme = ffSettingsGetXFConf("xsettings", "/Gtk/CursorThemeName", FF_VARIANT_TYPE_STRING).strValue;
-        cursorSize = ffSettingsGetXFConf("xsettings", "/Gtk/CursorThemeSize", FF_VARIANT_TYPE_INT).intValue;
-        wallpaper = ffSettingsGetXFConfFirstMatch("xfce4-desktop", "/backdrop/screen0", FF_VARIANT_TYPE_STRING, nullptr, testXfconfWallpaperPropKey).strValue;
-    } else if (ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_CINNAMON)) {
-        themeName = ffSettingsGetGnome("/org/cinnamon/desktop/interface/gtk-theme", "org.cinnamon.desktop.interface", nullptr, "gtk-theme", FF_VARIANT_TYPE_STRING).strValue;
-        iconsName = ffSettingsGetGnome("/org/cinnamon/desktop/interface/icon-theme", "org.cinnamon.desktop.interface", nullptr, "icon-theme", FF_VARIANT_TYPE_STRING).strValue;
-        fontName = ffSettingsGetGnome("/org/cinnamon/desktop/interface/font-name", "org.cinnamon.desktop.interface", nullptr, "font-name", FF_VARIANT_TYPE_STRING).strValue;
-        cursorTheme = ffSettingsGetGnome("/org/cinnamon/desktop/interface/cursor-theme", "org.cinnamon.desktop.interface", nullptr, "cursor-theme", FF_VARIANT_TYPE_STRING).strValue;
-        cursorSize = ffSettingsGetGnome("/org/cinnamon/desktop/interface/cursor-size", "org.cinnamon.desktop.interface", nullptr, "cursor-size", FF_VARIANT_TYPE_INT).intValue;
-        wallpaper = ffSettingsGetGnome("/org/cinnamon/desktop/background/picture-uri", "org.cinnamon.desktop.background", nullptr, "picture-uri", FF_VARIANT_TYPE_STRING).strValue;
-    } else if (ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_MATE)) {
-        themeName = ffSettingsGetGnome("/org/mate/interface/gtk-theme", "org.mate.interface", nullptr, "gtk-theme", FF_VARIANT_TYPE_STRING).strValue;
-        iconsName = ffSettingsGetGnome("/org/mate/interface/icon-theme", "org.mate.interface", nullptr, "icon-theme", FF_VARIANT_TYPE_STRING).strValue;
-        fontName = ffSettingsGetGnome("/org/mate/interface/font-name", "org.mate.interface", nullptr, "font-name", FF_VARIANT_TYPE_STRING).strValue;
-        cursorTheme = ffSettingsGetGnome("/org/mate/peripherals-mouse/cursor-theme", "org.mate.peripherals-mouse", nullptr, "cursor-theme", FF_VARIANT_TYPE_STRING).strValue;
-        cursorSize = ffSettingsGetGnome("/org/mate/peripherals-mouse/cursor-size", "org.mate.peripherals-mouse", nullptr, "cursor-size", FF_VARIANT_TYPE_INT).intValue;
-        wallpaper = ffSettingsGetGnome("/org/mate/desktop/background", "org.mate.background", nullptr, "picture-filename", FF_VARIANT_TYPE_STRING).strValue;
-    } else if (
-        ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_GNOME) ||
-        ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_GNOME_CLASSIC) ||
-        ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_UNITY) ||
-        ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_BUDGIE) ||
-        ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_NEBIDE)) {
-        themeName = ffSettingsGetGnome("/org/gnome/desktop/interface/gtk-theme", "org.gnome.desktop.interface", nullptr, "gtk-theme", FF_VARIANT_TYPE_STRING).strValue;
-        iconsName = ffSettingsGetGnome("/org/gnome/desktop/interface/icon-theme", "org.gnome.desktop.interface", nullptr, "icon-theme", FF_VARIANT_TYPE_STRING).strValue;
-        fontName = ffSettingsGetGnome("/org/gnome/desktop/interface/font-name", "org.gnome.desktop.interface", nullptr, "font-name", FF_VARIANT_TYPE_STRING).strValue;
-        cursorTheme = ffSettingsGetGnome("/org/gnome/desktop/interface/cursor-theme", "org.gnome.desktop.interface", nullptr, "cursor-theme", FF_VARIANT_TYPE_STRING).strValue;
-        cursorSize = ffSettingsGetGnome("/org/gnome/desktop/interface/cursor-size", "org.gnome.desktop.interface", nullptr, "cursor-size", FF_VARIANT_TYPE_INT).intValue;
-        wallpaper = ffSettingsGetGnome("/org/gnome/desktop/background/picture-uri", "org.gnome.desktop.background", nullptr, "picture-uri", FF_VARIANT_TYPE_STRING).strValue;
-    } else if (
-        ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_ENLIGHTENMENT)) {
-        ffEnlightenmentSettings settings = {};
-        if (ffSettingsGetEnlightenmentProperty(&settings)) {
-            themeName = settings.theme;
-            iconsName = settings.icon_theme;
-            fontName = settings.font;
-            cursorTheme = settings.use_e_cursor ? "Enlightenment" : "Application";
-            cursorSize = settings.cursor_size;
-            wallpaper = settings.desktop_default_background;
+    if (wmde->dePrettyName.length > 0) {
+        if (ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_XFCE4)) {
+            themeName = ffSettingsGetXFConf("xsettings", "/Net/ThemeName", FF_VARIANT_TYPE_STRING).strValue;
+            iconsName = ffSettingsGetXFConf("xsettings", "/Net/IconThemeName", FF_VARIANT_TYPE_STRING).strValue;
+            fontName = ffSettingsGetXFConf("xsettings", "/Gtk/FontName", FF_VARIANT_TYPE_STRING).strValue;
+            cursorTheme = ffSettingsGetXFConf("xsettings", "/Gtk/CursorThemeName", FF_VARIANT_TYPE_STRING).strValue;
+            cursorSize = ffSettingsGetXFConf("xsettings", "/Gtk/CursorThemeSize", FF_VARIANT_TYPE_INT).intValue;
+            wallpaper = ffSettingsGetXFConfFirstMatch("xfce4-desktop", "/backdrop/screen0", FF_VARIANT_TYPE_STRING, nullptr, testXfconfWallpaperPropKey).strValue;
+        } else if (ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_CINNAMON)) {
+            themeName = ffSettingsGetGnome("/org/cinnamon/desktop/interface/gtk-theme", "org.cinnamon.desktop.interface", nullptr, "gtk-theme", FF_VARIANT_TYPE_STRING).strValue;
+            iconsName = ffSettingsGetGnome("/org/cinnamon/desktop/interface/icon-theme", "org.cinnamon.desktop.interface", nullptr, "icon-theme", FF_VARIANT_TYPE_STRING).strValue;
+            fontName = ffSettingsGetGnome("/org/cinnamon/desktop/interface/font-name", "org.cinnamon.desktop.interface", nullptr, "font-name", FF_VARIANT_TYPE_STRING).strValue;
+            cursorTheme = ffSettingsGetGnome("/org/cinnamon/desktop/interface/cursor-theme", "org.cinnamon.desktop.interface", nullptr, "cursor-theme", FF_VARIANT_TYPE_STRING).strValue;
+            cursorSize = ffSettingsGetGnome("/org/cinnamon/desktop/interface/cursor-size", "org.cinnamon.desktop.interface", nullptr, "cursor-size", FF_VARIANT_TYPE_INT).intValue;
+            wallpaper = ffSettingsGetGnome("/org/cinnamon/desktop/background/picture-uri", "org.cinnamon.desktop.background", nullptr, "picture-uri", FF_VARIANT_TYPE_STRING).strValue;
+        } else if (ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_MATE)) {
+            themeName = ffSettingsGetGnome("/org/mate/interface/gtk-theme", "org.mate.interface", nullptr, "gtk-theme", FF_VARIANT_TYPE_STRING).strValue;
+            iconsName = ffSettingsGetGnome("/org/mate/interface/icon-theme", "org.mate.interface", nullptr, "icon-theme", FF_VARIANT_TYPE_STRING).strValue;
+            fontName = ffSettingsGetGnome("/org/mate/interface/font-name", "org.mate.interface", nullptr, "font-name", FF_VARIANT_TYPE_STRING).strValue;
+            cursorTheme = ffSettingsGetGnome("/org/mate/peripherals-mouse/cursor-theme", "org.mate.peripherals-mouse", nullptr, "cursor-theme", FF_VARIANT_TYPE_STRING).strValue;
+            cursorSize = ffSettingsGetGnome("/org/mate/peripherals-mouse/cursor-size", "org.mate.peripherals-mouse", nullptr, "cursor-size", FF_VARIANT_TYPE_INT).intValue;
+            wallpaper = ffSettingsGetGnome("/org/mate/desktop/background", "org.mate.background", nullptr, "picture-filename", FF_VARIANT_TYPE_STRING).strValue;
+        } else if (
+            ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_GNOME) ||
+            ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_GNOME_CLASSIC) ||
+            ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_UNITY) ||
+            ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_BUDGIE) ||
+            ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_NEBIDE)) {
+            themeName = ffSettingsGetGnome("/org/gnome/desktop/interface/gtk-theme", "org.gnome.desktop.interface", nullptr, "gtk-theme", FF_VARIANT_TYPE_STRING).strValue;
+            iconsName = ffSettingsGetGnome("/org/gnome/desktop/interface/icon-theme", "org.gnome.desktop.interface", nullptr, "icon-theme", FF_VARIANT_TYPE_STRING).strValue;
+            fontName = ffSettingsGetGnome("/org/gnome/desktop/interface/font-name", "org.gnome.desktop.interface", nullptr, "font-name", FF_VARIANT_TYPE_STRING).strValue;
+            cursorTheme = ffSettingsGetGnome("/org/gnome/desktop/interface/cursor-theme", "org.gnome.desktop.interface", nullptr, "cursor-theme", FF_VARIANT_TYPE_STRING).strValue;
+            cursorSize = ffSettingsGetGnome("/org/gnome/desktop/interface/cursor-size", "org.gnome.desktop.interface", nullptr, "cursor-size", FF_VARIANT_TYPE_INT).intValue;
+            wallpaper = ffSettingsGetGnome("/org/gnome/desktop/background/picture-uri", "org.gnome.desktop.background", nullptr, "picture-uri", FF_VARIANT_TYPE_STRING).strValue;
+        } else if (
+            ffStrbufIgnCaseEqualS(&wmde->dePrettyName, FF_DE_PRETTY_ENLIGHTENMENT)) {
+            ffEnlightenmentSettings settings = {};
+            if (ffSettingsGetEnlightenmentProperty(&settings)) {
+                themeName = settings.theme;
+                iconsName = settings.icon_theme;
+                fontName = settings.font;
+                cursorTheme = settings.use_e_cursor ? "Enlightenment" : "Application";
+                cursorSize = settings.cursor_size;
+                wallpaper = settings.desktop_default_background;
+            }
        }
+    } else {
+        // Standalone WMs (Hyprland, sway, niri, i3, ...) report no DE and have no settings
+        // daemon, but GTK apps on them still read org.gnome.desktop.interface.
+        // Read via DConf, not GSettings: GSettings synthesises the schema default for keys
+        // the user never set, DConf returns nothing. Runs last; applyGTKSettings() only
+        // fills still-empty fields, so config files always win.
+        themeName = ffSettingsGetDConf("/org/gnome/desktop/interface/gtk-theme", FF_VARIANT_TYPE_STRING).strValue;
+        iconsName = ffSettingsGetDConf("/org/gnome/desktop/interface/icon-theme", FF_VARIANT_TYPE_STRING).strValue;
+        fontName = ffSettingsGetDConf("/org/gnome/desktop/interface/font-name", FF_VARIANT_TYPE_STRING).strValue;
+        cursorTheme = ffSettingsGetDConf("/org/gnome/desktop/interface/cursor-theme", FF_VARIANT_TYPE_STRING).strValue;
+        cursorSize = ffSettingsGetDConf("/org/gnome/desktop/interface/cursor-size", FF_VARIANT_TYPE_INT).intValue;
    }

    applyGTKSettings(result, themeName, iconsName, fontName, cursorTheme, cursorSize, wallpaper);
@@ -70,8 +70,7 @@ const char* ffDetectNetIO(FFlist* result, FFNetIOOptions* options) {
            uint64_t* prevValue = (uint64_t*) ((uint8_t*) icPrev + off);
            uint64_t* currValue = (uint64_t*) ((uint8_t*) icCurr + off);
            uint64_t temp = *currValue;
-            *currValue -= *prevValue;
-            *currValue /= (time2 - time1) / 1000 /* seconds */;
+            *currValue = (*currValue - *prevValue) * 1000 / (time2 - time1); // Calculate per second
            *prevValue = temp;
        }
    }
@@ -2,6 +2,7 @@
 #include "terminalfont.h"
 #include "detection/terminalshell/terminalshell.h"
 #include "common/io.h"
+#include "common/properties.h"

 #ifdef FF_HAVE_FREETYPE
    #include "common/library.h"
@@ -10,10 +11,17 @@
 #endif

 #define FF_TERMUX_FONT_PATH FASTFETCH_TARGET_DIR_HOME "/.termux/font.ttf"
+#define FF_TERMUX_PREF_PATH "/data/data/com.termux/shared_prefs/com.termux_preferences.xml"

 const char* detectTermux(FFTerminalFontResult* terminalFont) {
+    FF_STRBUF_AUTO_DESTROY fontSize = ffStrbufCreate();
+    // SharedPreferences XML: <string name="fontsize">14</string>, in px
+    if (ffParsePropFile(FF_TERMUX_PREF_PATH, "<string name=\"fontsize\">", &fontSize)) {
+        ffStrbufAppendS(&fontSize, "px");
+    }
+
    if (!ffPathExists(FF_TERMUX_FONT_PATH, FF_PATHTYPE_FILE)) {
-        ffFontInitCopy(&terminalFont->font, "monospace");
+        ffFontInitValues(&terminalFont->font, "monospace", fontSize.length ? fontSize.chars : nullptr);
        return nullptr;
    }

@@ -39,7 +47,7 @@ const char* detectTermux(FFTerminalFontResult* terminalFont) {
        goto exit;
    }

-    ffFontInitCopy(&terminalFont->font, face->family_name);
+    ffFontInitValues(&terminalFont->font, face->family_name, fontSize.length ? fontSize.chars : nullptr);

 exit:
    if (face) {
@@ -53,7 +61,7 @@ exit:

 #else

-    FF_UNUSED(terminalFont);
+    ffFontInitValues(&terminalFont->font, "monospace", fontSize.length ? fontSize.chars : nullptr);
    return "Fastfetch was built without freetype2 support";

 #endif
@@ -18,7 +18,8 @@ struct FFWifiConnection {
    double rxRate;
    double txRate;
    uint16_t channel;
-    uint16_t frequency; // MHz
+    uint16_t channelWidth; // MHz
+    uint16_t frequency;    // MHz
 };

 typedef struct FFWifiResult {
@@ -60,3 +61,18 @@ static inline uint16_t ffWifiFreqToChannel(uint16_t frequency) {

    return 0;
 }
+
+static inline uint16_t ffWifiChannelToFreq(uint16_t channel) {
+    // Inverse of ffWifiFreqToChannel for the common 2.4 GHz and 5 GHz bands.
+    // 4.9 GHz and 6 GHz channels overlap numerically, so they are not handled here.
+    if (channel == 14) {
+        return 2484;
+    }
+    if (channel >= 1 && channel <= 13) {
+        return (uint16_t) (2407 + 5 * channel);
+    }
+    if (channel >= 36 && channel <= 177) { // 5 GHz: 5000 + 5*channel covers 36..177
+        return (uint16_t) (5000 + 5 * channel);
+    }
+    return 0;
+}
@@ -42,6 +42,7 @@ const char* ffDetectWifi(FFlist* result) {
    item->conn.rxRate = -DBL_MAX;
    item->conn.txRate = -DBL_MAX;
    item->conn.channel = 0;
+    item->conn.channelWidth = 0;
    item->conn.frequency = 0;

    ffStrbufAppendJsonVal(&item->inf.status, yyjson_obj_get(root, "supplicant_state"));
@@ -1,26 +1,28 @@
 #include "wifi.h"
 #include "common/processing.h"
 #include "common/strutil.h"
+#include "common/apple/cf_helpers.h"

 #import <CoreWLAN/CoreWLAN.h>
+#import <IOKit/IOKitLib.h>
+#import <IOKit/kext/KextManager.h>

-static inline double rssiToSignalQuality(int rssi)
-{
-    return (double) (rssi >= -50 ? 100 : rssi <= -100 ? 0 : (rssi + 100) * 2);
+static inline double rssiToSignalQuality(int rssi) {
+    return (double) (rssi >= -50 ? 100 : rssi <= -100 ? 0
+                                                      : (rssi + 100) * 2);
 }

-@interface CWNetworkProfile()
-@property(readonly, retain, nullable) NSArray<NSDictionary *> *bssidList;
+@interface CWNetworkProfile ()
+@property (readonly, retain, nullable) NSArray<NSDictionary*>* bssidList;
@end

-const char* ffDetectWifi(FFlist* result)
-{
+const char* ffDetectWifi(FFlist* result) {
    NSArray<CWInterface*>* interfaces = CWWiFiClient.sharedWiFiClient.interfaces;
-    if (!interfaces)
+    if (!interfaces) {
        return "CWWiFiClient.sharedWiFiClient.interfaces is nil";
+    }

-    for (CWInterface* inf in interfaces)
-    {
+    for (CWInterface* inf in interfaces) {
        FFWifiResult* item = FF_LIST_ADD(FFWifiResult, *result);
        ffStrbufInit(&item->inf.description);
        ffStrbufInit(&item->inf.status);
@@ -33,37 +35,42 @@ const char* ffDetectWifi(FFlist* result)
        item->conn.rxRate = -DBL_MAX;
        item->conn.txRate = -DBL_MAX;
        item->conn.channel = 0;
+        item->conn.channelWidth = 0;
        item->conn.frequency = 0;

-        ffStrbufAppendS(&item->inf.description, inf.interfaceName.UTF8String);
+        ffStrbufSetS(&item->inf.description, inf.interfaceName.UTF8String);
        ffStrbufSetStatic(&item->inf.status, inf.powerOn ? "Power On" : "Power Off");
-        if(!inf.powerOn)
+
+        if (!inf.powerOn) {
            continue;
+        }

        ffStrbufSetStatic(&item->conn.status, inf.interfaceMode != kCWInterfaceModeNone ? "Active" : "Inactive");
-        if(inf.interfaceMode == kCWInterfaceModeNone)
+        if (inf.interfaceMode == kCWInterfaceModeNone) {
            continue;
+        }

        FF_STRBUF_AUTO_DESTROY ipconfig = ffStrbufCreate();

        CWNetworkProfile* networkProfile = inf.configuration.networkProfiles.firstObject;

-        if (inf.ssid) // https://developer.apple.com/forums/thread/732431
+        if (inf.ssid) { // https://developer.apple.com/forums/thread/732431
            ffStrbufAppendS(&item->conn.ssid, inf.ssid.UTF8String);
-        else if (networkProfile.ssid)
+        } else if (networkProfile.ssid) {
            ffStrbufSetStatic(&item->conn.ssid, inf.configuration.networkProfiles.firstObject.ssid.UTF8String);
-        else
+        } else {
            ffStrbufSetStatic(&item->conn.ssid, "<redacted>"); // https://developer.apple.com/forums/thread/732431
+        }

-        if (inf.bssid)
+        if (inf.bssid) {
            ffStrbufAppendS(&item->conn.bssid, inf.bssid.UTF8String);
-        else if (networkProfile.bssidList)
+        } else if (networkProfile.bssidList) {
            ffStrbufSetStatic(&item->conn.bssid, [networkProfile.bssidList.firstObject[@"BSSID"] UTF8String]);
-        else
+        } else {
            ffStrbufSetStatic(&item->conn.bssid, "<redacted>");
+        }

-        switch(inf.activePHYMode)
-        {
+        switch (inf.activePHYMode) {
            case kCWPHYModeNone:
                ffStrbufSetStatic(&item->conn.protocol, "none");
                break;
@@ -89,15 +96,15 @@ const char* ffDetectWifi(FFlist* result)
                ffStrbufSetStatic(&item->conn.protocol, "802.11be (Wi-Fi 7)");
                break;
            default:
-                if (inf.activePHYMode < 8)
+                if (inf.activePHYMode < 8) {
                    ffStrbufAppendF(&item->conn.protocol, "Unknown (%ld)", inf.activePHYMode);
+                }
                break;
        }
        item->conn.signalQuality = rssiToSignalQuality((int) inf.rssiValue);
        item->conn.txRate = inf.transmitRate;

-        switch(inf.security)
-        {
+        switch (inf.security) {
            case kCWSecurityNone:
                ffStrbufSetStatic(&item->conn.security, "Insecure");
                break;
@@ -152,12 +159,33 @@ const char* ffDetectWifi(FFlist* result)
        }

        item->conn.channel = (uint16_t) inf.wlanChannel.channelNumber;
-        switch (inf.wlanChannel.channelBand)
-        {
-            case kCWChannelBand2GHz: item->conn.frequency = 2400; break;
-            case kCWChannelBand5GHz: item->conn.frequency = 5400; break;
-            case 3 /*kCWChannelBand6GHz*/: item->conn.frequency = 6400; break;
-            default: item->conn.frequency = 0; break;
+        switch (inf.wlanChannel.channelWidth) {
+            case kCWChannelWidth20MHz: item->conn.channelWidth = 20; break;
+            case kCWChannelWidth40MHz: item->conn.channelWidth = 40; break;
+            case kCWChannelWidth80MHz: item->conn.channelWidth = 80; break;
+            case kCWChannelWidth160MHz: item->conn.channelWidth = 160; break;
+            default: item->conn.channelWidth = 0; break;
+        }
+
+        FF_IOOBJECT_AUTO_RELEASE io_object_t service = IOServiceGetMatchingService(MACH_PORT_NULL, IOBSDNameMatching(MACH_PORT_NULL, 0, item->inf.description.chars));
+        FF_CFTYPE_AUTO_RELEASE CFNumberRef frequency;
+        // Note: IO80211ChannelFrequency is only available when the interface is connected
+        while (!(frequency = IORegistryEntryCreateCFProperty(service, CFSTR("IO80211ChannelFrequency"), nullptr, kNilOptions))) {
+            io_object_t parentService = IO_OBJECT_NULL;
+            if (IORegistryEntryGetParentEntry(service, kIOServicePlane, &parentService) == KERN_SUCCESS) {
+                IOObjectRelease(service);
+                service = parentService;
+            } else {
+                IOObjectRelease(service);
+                service = IO_OBJECT_NULL;
+                break;
+            }
+        }
+        if (frequency) {
+            int64_t value;
+            if (ffCfNumGetInt64(frequency, &value) == nil) {
+                item->conn.frequency = (uint16_t) value;
+            }
        }
    }

@@ -37,6 +37,7 @@ const char* ffDetectWifi(FFlist* result) {
        item->conn.rxRate = -DBL_MAX;
        item->conn.txRate = -DBL_MAX;
        item->conn.channel = 0;
+        item->conn.channelWidth = 0;
        item->conn.frequency = 0;

        char ssid[IEEE80211_NWID_LEN + 1] = {};
@@ -80,6 +81,16 @@ const char* ffDetectWifi(FFlist* result) {
            item->conn.channel = curchan.ic_ieee;
            item->conn.frequency = curchan.ic_freq;

+            // Determine channel width from channel flags
+            if (curchan.ic_flags & IEEE80211_CHAN_VHT160)
+                item->conn.channelWidth = 160;
+            else if (curchan.ic_flags & IEEE80211_CHAN_VHT80)
+                item->conn.channelWidth = 80;
+            else if (curchan.ic_flags & IEEE80211_CHAN_HT40)
+                item->conn.channelWidth = 40;
+            else
+                item->conn.channelWidth = 20;
+
 #ifdef IEEE80211_IS_CHAN_HE // for future use
            if (IEEE80211_IS_CHAN_HE(&curchan)) {
                ffStrbufSetStatic(&item->conn.protocol, "802.11ax (Wi-Fi 6)");
@@ -0,0 +1,101 @@
+extern "C" {
+    #include "wifi.h"
+}
+
+#include <NetworkDevice.h>
+#include <NetworkInterface.h>
+#include <NetworkRoster.h>
+
+static void initWifiResult(FFWifiResult* item, const char* name) {
+    ffStrbufInitS(&item->inf.description, name);
+    ffStrbufInit(&item->inf.status);
+    ffStrbufInit(&item->conn.status);
+    ffStrbufInit(&item->conn.ssid);
+    ffStrbufInit(&item->conn.bssid);
+    ffStrbufInit(&item->conn.protocol);
+    ffStrbufInit(&item->conn.security);
+    item->conn.signalQuality = -DBL_MAX;
+    item->conn.rxRate = -DBL_MAX;
+    item->conn.txRate = -DBL_MAX;
+    item->conn.channel = 0;
+    item->conn.channelWidth = 0;
+    item->conn.frequency = 0;
+}
+
+static void setWifiSecurity(FFstrbuf* security, const wireless_network& network) {
+    switch (network.authentication_mode) {
+        case B_NETWORK_AUTHENTICATION_NONE:
+            if (network.flags & B_NETWORK_IS_ENCRYPTED) {
+                ffStrbufSetStatic(security, "Encrypted");
+            } else {
+                ffStrbufSetStatic(security, "Insecure");
+            }
+            break;
+        case B_NETWORK_AUTHENTICATION_WEP:
+            ffStrbufSetStatic(security, "WEP");
+            break;
+        case B_NETWORK_AUTHENTICATION_WPA:
+            ffStrbufSetStatic(security, "WPA");
+            break;
+        case B_NETWORK_AUTHENTICATION_WPA2:
+            ffStrbufSetStatic(security, "WPA2");
+            break;
+        case B_NETWORK_AUTHENTICATION_EAP:
+            ffStrbufSetStatic(security, "WPA Enterprise");
+            break;
+        default:
+            ffStrbufSetF(security, "Unknown (%lu)", (unsigned long) network.authentication_mode);
+            break;
+    }
+}
+
+static void setWifiBssid(FFstrbuf* bssid, const wireless_network& network) {
+    const uint8* address = network.address.LinkLevelAddress();
+    if (address == nullptr || network.address.LinkLevelAddressLength() < 6) {
+        return;
+    }
+
+    ffStrbufSetF(bssid, "%02X:%02X:%02X:%02X:%02X:%02X",
+        address[0], address[1], address[2], address[3], address[4], address[5]);
+}
+
+const char* ffDetectWifi(FFlist* result) {
+    BNetworkRoster& roster = BNetworkRoster::Default();
+    BNetworkInterface interface;
+    uint32 cookie = 0;
+
+    while (roster.GetNextInterface(&cookie, interface) == B_OK) {
+        if (!interface.Exists()) {
+            continue;
+        }
+
+        BNetworkDevice device(interface.Name());
+        if (!device.Exists() || !device.IsWireless()) {
+            continue;
+        }
+
+        FFWifiResult* item = FF_LIST_ADD(FFWifiResult, *result);
+        initWifiResult(item, interface.Name());
+
+        ffStrbufSetStatic(&item->inf.status, interface.HasLink() ? "Up" : "Down");
+        if (!interface.HasLink() || !device.HasLink()) {
+            ffStrbufSetStatic(&item->conn.status, "Not connected");
+            continue;
+        }
+
+        ffStrbufSetStatic(&item->conn.status, "Connected");
+
+        uint32 networkCookie = 0;
+        wireless_network network = {};
+        if (device.GetNextAssociatedNetwork(networkCookie, network) != B_OK) {
+            continue;
+        }
+
+        ffStrbufSetNS(&item->conn.ssid, (uint32_t) strnlen(network.name, sizeof(network.name)), network.name);
+        setWifiBssid(&item->conn.bssid, network);
+        item->conn.signalQuality = network.signal_strength > 100 ? 100 : network.signal_strength;
+        setWifiSecurity(&item->conn.security, network);
+    }
+
+    return nullptr;
+}
@@ -212,8 +212,9 @@ static bool ffWifiNlInit(FFWifiNlContext* ctx) {
    return true;
 }

-static double ffWifiParseBitrateFromRateInfo(const struct nlattr* rateAttr, FFstrbuf* protocol) {
+static double ffWifiParseBitrateFromRateInfo(const struct nlattr* rateAttr, FFstrbuf* protocol, uint16_t* channelWidth) {
    double rate = -DBL_MAX;
+    uint16_t width = 0;
    size_t remaining = ffWifiNlAttrPayload(rateAttr);

    for (const struct nlattr* info = (const struct nlattr*) ffWifiNlAttrData(rateAttr);
@@ -223,6 +224,40 @@ static double ffWifiParseBitrateFromRateInfo(const struct nlattr* rateAttr, FFst
        size_t payload = ffWifiNlAttrPayload(info);

        switch (type) {
+            case NL80211_RATE_INFO_40_MHZ_WIDTH:
+                width = 40;
+                break;
+            case NL80211_RATE_INFO_80_MHZ_WIDTH:
+            case NL80211_RATE_INFO_80P80_MHZ_WIDTH:
+                width = 80;
+                break;
+            case NL80211_RATE_INFO_160_MHZ_WIDTH:
+                width = 160;
+                break;
+            case 18 /* NL80211_RATE_INFO_320_MHZ_WIDTH */:
+                width = 320;
+                break;
+            case NL80211_RATE_INFO_10_MHZ_WIDTH:
+                width = 10;
+                break;
+            case NL80211_RATE_INFO_5_MHZ_WIDTH:
+                width = 5;
+                break;
+            case 25 /* NL80211_RATE_INFO_1_MHZ_WIDTH */:
+                width = 1;
+                break;
+            case 26 /* NL80211_RATE_INFO_2_MHZ_WIDTH */:
+                width = 2;
+                break;
+            case 27 /* NL80211_RATE_INFO_4_MHZ_WIDTH */:
+                width = 4;
+                break;
+            case 28 /* NL80211_RATE_INFO_8_MHZ_WIDTH */:
+                width = 8;
+                break;
+            case 29 /* NL80211_RATE_INFO_16_MHZ_WIDTH */:
+                width = 16;
+                break;
            case 30 /* NL80211_RATE_INFO_UHR_MCS */:
                ffStrbufSetStatic(protocol, "802.11bn (Wi-Fi 8)");
                break;
@@ -254,9 +289,126 @@ static double ffWifiParseBitrateFromRateInfo(const struct nlattr* rateAttr, FFst
        }
    }

+    if (rate != -DBL_MAX && *channelWidth == 0) {
+        *channelWidth = width;
+    }
+
    return rate;
 }

+static uint16_t ffWifiChannelWidthToMhz(uint32_t width) {
+    switch (width) {
+        case NL80211_CHAN_WIDTH_20_NOHT:
+        case NL80211_CHAN_WIDTH_20:
+            return 20;
+        case NL80211_CHAN_WIDTH_40:
+            return 40;
+        case NL80211_CHAN_WIDTH_80:
+        case NL80211_CHAN_WIDTH_80P80:
+            return 80;
+        case NL80211_CHAN_WIDTH_160:
+            return 160;
+        case NL80211_CHAN_WIDTH_5:
+            return 5;
+        case NL80211_CHAN_WIDTH_10:
+            return 10;
+        case NL80211_CHAN_WIDTH_1:
+            return 1;
+        case NL80211_CHAN_WIDTH_2:
+            return 2;
+        case NL80211_CHAN_WIDTH_4:
+            return 4;
+        case NL80211_CHAN_WIDTH_8:
+            return 8;
+        case NL80211_CHAN_WIDTH_16:
+            return 16;
+        case 13 /* NL80211_CHAN_WIDTH_320 */:
+            return 320;
+        default:
+            return 0;
+    }
+}
+
+static bool ffWifiFetchInterfaceInfo(FFWifiNlContext* ctx, FFWifiResult* item, uint32_t ifIndex) {
+    struct {
+        struct nlmsghdr nlh;
+        struct genlmsghdr genl;
+        char attrs[32];
+    } req = {
+        .nlh = {
+            .nlmsg_len = NLMSG_LENGTH(sizeof(struct genlmsghdr)),
+            .nlmsg_type = ctx->nl80211FamilyId,
+            .nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK,
+            .nlmsg_seq = ++ctx->seq,
+            .nlmsg_pid = ctx->portId,
+        },
+        .genl = {
+            .cmd = NL80211_CMD_GET_INTERFACE,
+            .version = 0,
+        },
+    };
+
+    if (!ffWifiNlAppendAttr(&req.nlh, sizeof(req), NL80211_ATTR_IFINDEX, &ifIndex, sizeof(ifIndex))) {
+        FF_DEBUG("Failed to build nl80211 interface request");
+        return false;
+    }
+
+    struct sockaddr_nl addr = {
+        .nl_family = AF_NETLINK,
+    };
+
+    ssize_t sent = sendto(ctx->sockFd, &req, req.nlh.nlmsg_len, 0, (struct sockaddr*) &addr, sizeof(addr));
+    if (sent != (ssize_t) req.nlh.nlmsg_len) {
+        FF_DEBUG("Failed to send nl80211 interface request");
+        return false;
+    }
+
+    uint8_t buffer[8192];
+    while (true) {
+        ssize_t received = recvfrom(ctx->sockFd, buffer, sizeof(buffer), 0, nullptr, nullptr);
+        if (received < 0) {
+            FF_DEBUG("Failed to receive nl80211 interface reply: %s", strerror(errno));
+            return false;
+        }
+
+        for (const struct nlmsghdr* nlh = (const struct nlmsghdr*) buffer;
+            NLMSG_OK(nlh, received);
+            nlh = NLMSG_NEXT(nlh, received)) {
+            if (nlh->nlmsg_seq != req.nlh.nlmsg_seq) {
+                continue;
+            }
+
+            if (nlh->nlmsg_type == NLMSG_ERROR) {
+                const struct nlmsgerr* err = (const struct nlmsgerr*) NLMSG_DATA(nlh);
+                if (err->error != 0) {
+                    FF_DEBUG("nl80211 interface request failed: %s", strerror(-err->error));
+                }
+                return false;
+            }
+
+            if (nlh->nlmsg_type != ctx->nl80211FamilyId) {
+                continue;
+            }
+
+            const struct genlmsghdr* genl = (const struct genlmsghdr*) NLMSG_DATA(nlh);
+            size_t attrRemaining = nlh->nlmsg_len - NLMSG_HDRLEN - GENL_HDRLEN;
+            for (const struct nlattr* attr = (const struct nlattr*) ((const char*) genl + GENL_HDRLEN);
+                ffWifiNlAttrOk(attr, attrRemaining);
+                attr = ffWifiNlAttrNext(attr, &attrRemaining)) {
+                if ((attr->nla_type & NLA_TYPE_MASK) != NL80211_ATTR_CHANNEL_WIDTH ||
+                    ffWifiNlAttrPayload(attr) < sizeof(uint32_t)) {
+                    continue;
+                }
+
+                item->conn.channelWidth = ffWifiChannelWidthToMhz(*(const uint32_t*) ffWifiNlAttrData(attr));
+                return item->conn.channelWidth != 0;
+            }
+
+            return false;
+        }
+    }
+}
+
 static void ffWifiApplySecurityFlags(FFWifiResult* item, const FFWifiSecurityFlags* sec) {
    ffStrbufClear(&item->conn.security);

@@ -566,13 +718,13 @@ static void ffWifiParseStationInfo(const struct nlattr* staInfoAttr, FFWifiResul
        if (type == NL80211_STA_INFO_SIGNAL && payload >= sizeof(uint8_t) && item->conn.signalQuality == -DBL_MAX) {
            int rssi = (int8_t) *(const uint8_t*) ffWifiNlAttrData(attr);
            item->conn.signalQuality = rssiToSignalQuality(rssi);
-        } else if (type == NL80211_STA_INFO_TX_BITRATE && item->conn.txRate == -DBL_MAX) {
-            double tx = ffWifiParseBitrateFromRateInfo(attr, &item->conn.protocol);
+        } else if (type == NL80211_STA_INFO_TX_BITRATE && (item->conn.txRate == -DBL_MAX || item->conn.channelWidth == 0)) {
+            double tx = ffWifiParseBitrateFromRateInfo(attr, &item->conn.protocol, &item->conn.channelWidth);
            if (tx != -DBL_MAX) {
                item->conn.txRate = tx;
            }
-        } else if (type == NL80211_STA_INFO_RX_BITRATE && item->conn.rxRate == -DBL_MAX) {
-            double rx = ffWifiParseBitrateFromRateInfo(attr, &item->conn.protocol);
+        } else if (type == NL80211_STA_INFO_RX_BITRATE && (item->conn.rxRate == -DBL_MAX || item->conn.channelWidth == 0)) {
+            double rx = ffWifiParseBitrateFromRateInfo(attr, &item->conn.protocol, &item->conn.channelWidth);
            if (rx != -DBL_MAX) {
                item->conn.rxRate = rx;
            }
@@ -680,6 +832,7 @@ static const char* detectWithNetlink(FFWifiNlContext* ctx, FFWifiResult* item, u
    if (ffWifiFetchScanInfo(ctx, item, ifIndex)) {
        FF_DEBUG("found associated BSS: %s", item->conn.ssid.chars);
        ffStrbufSetStatic(&item->conn.status, "connected");
+        ffWifiFetchInterfaceInfo(ctx, item, ifIndex);
        ffWifiFetchStationInfo(ctx, item, ifIndex);
        if (!item->conn.protocol.length && item->conn.txRate != -DBL_MAX) {
            FF_DEBUG("nl80211 station info did not include MCS family fields");
@@ -923,6 +1076,7 @@ const char* ffDetectWifi(FFlist* result) {
        item->conn.rxRate = -DBL_MAX;
        item->conn.txRate = -DBL_MAX;
        item->conn.channel = 0;
+        item->conn.channelWidth = 0;
        item->conn.frequency = 0;

        char operstate;
@@ -47,6 +47,7 @@ const char* ffDetectWifi(FFlist* result) {
        item->conn.rxRate = -DBL_MAX;
        item->conn.txRate = -DBL_MAX;
        item->conn.channel = 0;
+        item->conn.channelWidth = 0;
        item->conn.frequency = 0;

        char ssid[IEEE80211_NWID_LEN + 1] = {};
@@ -91,6 +92,16 @@ const char* ffDetectWifi(FFlist* result) {
            item->conn.channel = ffWifiFreqToChannel(curchan.ic_freq);
            item->conn.frequency = curchan.ic_freq;

+            // Determine channel width from channel flags
+            if (curchan.ic_flags & IEEE80211_CHAN_VHT160)
+                item->conn.channelWidth = 160;
+            else if (curchan.ic_flags & IEEE80211_CHAN_VHT80)
+                item->conn.channelWidth = 80;
+            else if (curchan.ic_flags & IEEE80211_CHAN_HT40)
+                item->conn.channelWidth = 40;
+            else
+                item->conn.channelWidth = 20;
+
 #ifdef IEEE80211_IS_CHAN_HE // for future use
            if (IEEE80211_IS_CHAN_HE(&curchan)) {
                ffStrbufSetStatic(&item->conn.protocol, "802.11ax (Wi-Fi 6)");
@@ -1,6 +1,5 @@
 #include "wifi.h"
 #include "common/io.h"
-#include "common/strutil.h"

 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -17,12 +16,20 @@ const char* ffDetectWifi(FFlist* result) {

    FF_AUTO_CLOSE_FD int sock = socket(AF_INET, SOCK_DGRAM, 0);
    if (sock < 0) {
+        if_freenameindex(infs);
        return "socket() failed";
    }

    for (struct if_nameindex* i = infs; !(i->if_index == 0 && i->if_name == nullptr); ++i) {
-        if (!ffStrStartsWith(i->if_name, "iwm")) {
-            continue;
+        struct ieee80211_nodereq nr = {};
+        strlcpy(nr.nr_ifname, i->if_name, sizeof(nr.nr_ifname));
+
+        int err = 0;
+        if (ioctl(sock, SIOCG80211NODE, &nr) < 0) {
+            err = errno;
+            if (err == ENXIO || err == ENODEV || err == EINVAL || err == ENOTTY) {
+                continue; // Not a Wi-Fi interface
+            }
        }

        FFWifiResult* item = FF_LIST_ADD(FFWifiResult, *result);
@@ -37,11 +44,9 @@ const char* ffDetectWifi(FFlist* result) {
        item->conn.rxRate = -DBL_MAX;
        item->conn.txRate = -DBL_MAX;
        item->conn.channel = 0;
+        item->conn.channelWidth = 0; // not exposed by ieee80211_nodereq
        item->conn.frequency = 0;

-        struct ieee80211_nodereq nr = {};
-        strlcpy(nr.nr_ifname, i->if_name, sizeof(nr.nr_ifname));
-
        struct ifreq ifr = {};
        strlcpy(ifr.ifr_name, i->if_name, sizeof(ifr.ifr_name));
        if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
@@ -50,31 +55,34 @@ const char* ffDetectWifi(FFlist* result) {
            ffStrbufSetStatic(&item->inf.status, ifr.ifr_flags & IFF_UP ? "Up" : "Down");
        }

-        if (ioctl(sock, SIOCG80211NODE, &nr) < 0) {
-            ffStrbufSetStatic(&item->conn.status, "Not associated");
-            continue;
-        }
-
-        if (nr.nr_nwid_len > 0) {
-            ffStrbufSetStatic(&item->conn.status, "Associated");
-            ffStrbufAppendNS(&item->conn.ssid, nr.nr_nwid_len, (char*) nr.nr_nwid);
-        } else {
+        if (err != 0 || nr.nr_nwid_len == 0) {
            ffStrbufSetStatic(&item->conn.status, "Not associated");
            continue;
        }

+        ffStrbufSetStatic(&item->conn.status, "Associated");
+        ffStrbufAppendNS(&item->conn.ssid, nr.nr_nwid_len, (char*) nr.nr_nwid);
        ffStrbufSetF(&item->conn.bssid, "%02X:%02X:%02X:%02X:%02X:%02X", nr.nr_bssid[0], nr.nr_bssid[1], nr.nr_bssid[2], nr.nr_bssid[3], nr.nr_bssid[4], nr.nr_bssid[5]);

        item->conn.channel = nr.nr_channel;
+        if (item->conn.channel == 0) {
+            struct ieee80211chanreq chreq = {};
+            strlcpy(chreq.i_name, i->if_name, sizeof(chreq.i_name));
+            if (ioctl(sock, SIOCG80211CHANNEL, &chreq) >= 0) {
+                item->conn.channel = chreq.i_channel;
+            }
+        }
+        item->conn.frequency = ffWifiChannelToFreq(item->conn.channel);

        if (nr.nr_max_rssi) {
-            item->conn.signalQuality = ((float) nr.nr_rssi / nr.nr_max_rssi) * 100.0;
+            item->conn.signalQuality = ((double) nr.nr_rssi / (double) nr.nr_max_rssi) * 100.0;
        }

-        if (nr.nr_flags & IEEE80211_NODEREQ_HT) {
-            ffStrbufSetStatic(&item->conn.protocol, "802.11n (Wi-Fi 4)");
-        } else if (nr.nr_flags & IEEE80211_NODEREQ_VHT) {
+        // VHT implies HT, so test VHT first
+        if (nr.nr_flags & IEEE80211_NODEREQ_VHT) {
            ffStrbufSetStatic(&item->conn.protocol, "802.11ac (Wi-Fi 5)");
+        } else if (nr.nr_flags & IEEE80211_NODEREQ_HT) {
+            ffStrbufSetStatic(&item->conn.protocol, "802.11n (Wi-Fi 4)");
        } else if (nr.nr_chan_flags & IEEE80211_CHANINFO_5GHZ) {
            ffStrbufSetStatic(&item->conn.protocol, "802.11a");
        } else if (nr.nr_chan_flags & IEEE80211_CHANINFO_2GHZ) {
@@ -85,15 +93,22 @@ const char* ffDetectWifi(FFlist* result) {
        strlcpy(wpa.i_name, i->if_name, sizeof(wpa.i_name));

        if (ioctl(sock, SIOCG80211WPAPARMS, &wpa) >= 0 && wpa.i_enabled) {
-            if (wpa.i_protos & IEEE80211_WPA_PROTO_WPA2) {
+            if (wpa.i_akms & IEEE80211_WPA_AKM_SAE) {
+                if (wpa.i_protos & IEEE80211_WPA_PROTO_WPA2) {
+                    ffStrbufSetStatic(&item->conn.security, "WPA2/WPA3");
+                } else {
+                    ffStrbufSetStatic(&item->conn.security, "WPA3");
+                }
+            } else if (wpa.i_protos & IEEE80211_WPA_PROTO_WPA2) {
                ffStrbufSetStatic(&item->conn.security, "WPA2");
            } else if (wpa.i_protos & IEEE80211_WPA_PROTO_WPA1) {
                ffStrbufSetStatic(&item->conn.security, "WPA");
+            } else {
+                ffStrbufSetStatic(&item->conn.security, "Unknown");
            }
        } else {
            struct ieee80211_nwkey nwkey = {};
            strlcpy(nwkey.i_name, i->if_name, sizeof(nwkey.i_name));
-
            if (ioctl(sock, SIOCG80211NWKEY, &nwkey) >= 0) {
                if (nwkey.i_wepon) {
                    ffStrbufSetStatic(&item->conn.security, "WEP");
@@ -0,0 +1,195 @@
+#include "wifi.h"
+#include "common/io.h"
+#include "common/mallocHelper.h"
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <stropts.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
+#include <inet/wifi_ioctl.h>
+
+static bool getWifiValue(int fd, uint32_t id, void* value, size_t valueSize, wldp_t* buffer) {
+    memset(buffer, 0, MAX_BUF_LEN);
+    buffer->wldp_type = NET_802_11;
+    buffer->wldp_id = id;
+
+    struct strioctl request = {
+        .ic_cmd = WLAN_GET_PARAM,
+        .ic_timout = 0,
+        .ic_len = MAX_BUF_LEN,
+        .ic_dp = (char*) buffer,
+    };
+
+    if (ioctl(fd, I_STR, &request) != 0 || buffer->wldp_result != WL_SUCCESS || buffer->wldp_length < WIFI_BUF_OFFSET + valueSize || buffer->wldp_length > MAX_BUF_LEN) {
+        return false;
+    }
+
+    memcpy(value, buffer->wldp_buf, valueSize);
+    return true;
+}
+
+static void setWifiProtocol(FFstrbuf* protocol, uint32_t subtype, bool htEnabled) {
+    switch (subtype) {
+        case WL_FHSS:
+            ffStrbufSetStatic(protocol, "802.11 (FHSS)");
+            break;
+        case WL_DSSS:
+            ffStrbufSetStatic(protocol, "802.11 (DSSS)");
+            break;
+        case WL_IRBASE:
+            ffStrbufSetStatic(protocol, "802.11 (IR)");
+            break;
+        case WL_OFDM:
+            ffStrbufSetStatic(protocol, htEnabled ? "802.11n (Wi-Fi 4)" : "802.11a");
+            break;
+        case WL_HRDS:
+            ffStrbufSetStatic(protocol, "802.11b");
+            break;
+        case WL_ERP:
+            ffStrbufSetStatic(protocol, htEnabled ? "802.11n (Wi-Fi 4)" : "802.11g");
+            break;
+        default:
+            break;
+    }
+}
+
+static void setWifiSecurity(FFstrbuf* security, uint32_t encryption, bool haveAuthMode, uint32_t authMode) {
+    switch (encryption) {
+        case WL_NOENCRYPTION:
+            ffStrbufSetStatic(security, "Insecure");
+            break;
+        case WL_ENC_WEP:
+            ffStrbufSetStatic(security, "WEP");
+            break;
+        case WL_ENC_WPA:
+            ffStrbufSetStatic(security, haveAuthMode && authMode == WL_SHAREDKEY ? "WPA Shared Key" : "WPA");
+            break;
+        default:
+            ffStrbufSetStatic(security, "Unknown");
+            break;
+    }
+}
+
+const char* ffDetectWifi(FFlist* result) {
+    // https://github.com/illumos/illumos-gate/blob/master/usr/src/cmd/cmd-inet/usr.sbin/wificonfig/wificonfig.c
+
+    FF_AUTO_CLOSE_DIR DIR* directory = opendir("/dev/wifi");
+    if (!directory) {
+        return nullptr;
+    }
+
+    FF_AUTO_FREE void* bufferMemory = malloc(MAX_BUF_LEN);
+    if (!bufferMemory) {
+        return "malloc() failed";
+    }
+    wldp_t* buffer = (wldp_t*) bufferMemory;
+
+    struct dirent* entry;
+    while ((entry = readdir(directory)) != nullptr) {
+        size_t nameLength = strlen(entry->d_name);
+        if (nameLength == 0 || entry->d_name[nameLength - 1] < '0' || entry->d_name[nameLength - 1] > '9') {
+            continue;
+        }
+
+        char devicePath[PATH_MAX];
+        int pathLength = snprintf(devicePath, sizeof(devicePath), "/dev/wifi/%s", entry->d_name);
+        if (pathLength < 0 || (size_t) pathLength >= sizeof(devicePath)) {
+            continue;
+        }
+
+        FF_AUTO_CLOSE_FD int fd = open(devicePath, O_RDWR | O_CLOEXEC);
+        if (fd < 0) {
+            continue;
+        }
+        if (!isastream(fd)) {
+            continue;
+        }
+
+        FFWifiResult* item = FF_LIST_ADD(FFWifiResult, *result);
+        ffStrbufInitS(&item->inf.description, entry->d_name);
+        ffStrbufInit(&item->inf.status);
+        ffStrbufInit(&item->conn.status);
+        ffStrbufInit(&item->conn.ssid);
+        ffStrbufInit(&item->conn.bssid);
+        ffStrbufInit(&item->conn.protocol);
+        ffStrbufInit(&item->conn.security);
+        item->conn.signalQuality = -DBL_MAX;
+        item->conn.rxRate = -DBL_MAX;
+        item->conn.txRate = -DBL_MAX;
+        item->conn.channel = 0;
+        item->conn.channelWidth = 0;
+        item->conn.frequency = 0;
+
+        wl_radio_t radio;
+        if (getWifiValue(fd, WL_RADIO, &radio, sizeof(radio), buffer)) {
+            ffStrbufSetStatic(&item->inf.status, radio ? "Up" : "Down");
+        } else {
+            ffStrbufSetStatic(&item->inf.status, "Unknown");
+        }
+
+        wl_linkstatus_t linkStatus;
+        if (!getWifiValue(fd, WL_LINKSTATUS, &linkStatus, sizeof(linkStatus), buffer)) {
+            ffStrbufSetStatic(&item->conn.status, "Unknown");
+            continue;
+        }
+        if (linkStatus != WL_CONNECTED) {
+            ffStrbufSetStatic(&item->conn.status, "Not connected");
+            continue;
+        }
+        ffStrbufSetStatic(&item->conn.status, "Connected");
+
+        wl_essid_t essid;
+        if (getWifiValue(fd, WL_ESSID, &essid, sizeof(essid), buffer) && essid.wl_essid_length > 0 && essid.wl_essid_length < sizeof(essid.wl_essid_essid) && essid.wl_essid_length <= MAX_ESSID_LENGTH - 1) {
+            ffStrbufSetNS(&item->conn.ssid, essid.wl_essid_length, essid.wl_essid_essid);
+        }
+
+        wl_bssid_t bssid;
+        if (getWifiValue(fd, WL_BSSID, bssid, sizeof(bssid), buffer)) {
+            ffStrbufSetF(&item->conn.bssid, "%02X:%02X:%02X:%02X:%02X:%02X", (uint8_t) bssid[0], (uint8_t) bssid[1], (uint8_t) bssid[2], (uint8_t) bssid[3], (uint8_t) bssid[4], (uint8_t) bssid[5]);
+        }
+
+        wl_rssi_t rssi;
+        if (getWifiValue(fd, WL_RSSI, &rssi, sizeof(rssi), buffer)) {
+            item->conn.signalQuality = rssi >= MAX_RSSI ? 100.0 : ((double) rssi / MAX_RSSI) * 100.0;
+        }
+
+        wl_phy_conf_t phy;
+        if (getWifiValue(fd, WL_PHY_CONFIG, &phy, sizeof(phy), buffer)) {
+            uint32_t subtype = phy.wl_phy_dsss_conf.wl_dsss_subtype;
+            switch (subtype) {
+                case WL_FHSS:
+                    item->conn.channel = (uint16_t) phy.wl_phy_fhss_conf.wl_fhss_channel;
+                    setWifiProtocol(&item->conn.protocol, subtype, false);
+                    break;
+                case WL_DSSS:
+                    item->conn.channel = (uint16_t) phy.wl_phy_dsss_conf.wl_dsss_channel;
+                    setWifiProtocol(&item->conn.protocol, subtype, false);
+                    break;
+                case WL_OFDM:
+                    item->conn.frequency = (uint16_t) phy.wl_phy_ofdm_conf.wl_ofdm_frequency;
+                    item->conn.channel = ffWifiFreqToChannel(item->conn.frequency);
+                    setWifiProtocol(&item->conn.protocol, subtype, phy.wl_phy_ofdm_conf.wl_ofdm_ht_enabled);
+                    break;
+                case WL_ERP:
+                    item->conn.channel = (uint16_t) phy.wl_phy_erp_conf.wl_erp_channel;
+                    setWifiProtocol(&item->conn.protocol, subtype, phy.wl_phy_erp_conf.wl_erp_ht_enabled);
+                    break;
+                default:
+                    setWifiProtocol(&item->conn.protocol, subtype, false);
+                    break;
+            }
+        }
+
+        wl_encryption_t encryption;
+        wl_authmode_t authMode;
+        bool haveEncryption = getWifiValue(fd, WL_ENCRYPTION, &encryption, sizeof(encryption), buffer);
+        bool haveAuthMode = getWifiValue(fd, WL_AUTH_MODE, &authMode, sizeof(authMode), buffer);
+        if (haveEncryption) {
+            setWifiSecurity(&item->conn.security, encryption, haveAuthMode, authMode);
+        }
+    }
+
+    return nullptr;
+}
@@ -5,41 +5,59 @@
 #include <windows.h>
 #include <wlanapi.h>

-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch"
-
 static void convertIfStateToString(WLAN_INTERFACE_STATE state, FFstrbuf* result) {
    switch (state) {
        case wlan_interface_state_not_ready:
-            ffStrbufAppendS(result, "Not ready");
+            ffStrbufSetStatic(result, "Not ready");
            break;
        case wlan_interface_state_connected:
-            ffStrbufAppendS(result, "Connected");
+            ffStrbufSetStatic(result, "Connected");
            break;
        case wlan_interface_state_ad_hoc_network_formed:
-            ffStrbufAppendS(result, "Ad hoc network formed");
+            ffStrbufSetStatic(result, "Ad hoc network formed");
            break;
        case wlan_interface_state_disconnecting:
-            ffStrbufAppendS(result, "Disconnecting");
+            ffStrbufSetStatic(result, "Disconnecting");
            break;
        case wlan_interface_state_disconnected:
-            ffStrbufAppendS(result, "Disconnected");
+            ffStrbufSetStatic(result, "Disconnected");
            break;
        case wlan_interface_state_associating:
-            ffStrbufAppendS(result, "Associating");
+            ffStrbufSetStatic(result, "Associating");
            break;
        case wlan_interface_state_discovering:
-            ffStrbufAppendS(result, "Discovering");
+            ffStrbufSetStatic(result, "Discovering");
            break;
        case wlan_interface_state_authenticating:
-            ffStrbufAppendS(result, "Authenticating");
+            ffStrbufSetStatic(result, "Authenticating");
            break;
        default:
-            ffStrbufAppendS(result, "Unknown");
+            ffStrbufSetStatic(result, "Unknown");
            break;
    }
 }

+typedef struct _WLAN_REALTIME_CONNECTION_QUALITY_LINK_INFO {
+    UCHAR ucLinkID;
+    ULONG ulChannelCenterFrequencyMhz;
+    ULONG ulBandwidth;
+    LONG lRssi;
+    WLAN_RATE_SET wlanRateSet;
+} WLAN_REALTIME_CONNECTION_QUALITY_LINK_INFO, *PWLAN_REALTIME_CONNECTION_QUALITY_LINK_INFO;
+
+typedef struct _WLAN_REALTIME_CONNECTION_QUALITY {
+    DOT11_PHY_TYPE dot11PhyType;
+    ULONG ulLinkQuality;
+    ULONG ulRxRate;
+    ULONG ulTxRate;
+    BOOL bIsMLOConnection;
+    ULONG ulNumLinks;
+    // Array of size ulNumLinks
+    WLAN_REALTIME_CONNECTION_QUALITY_LINK_INFO linksInfo[];
+} WLAN_REALTIME_CONNECTION_QUALITY, *PWLAN_REALTIME_CONNECTION_QUALITY;
+
+enum { wlan_intf_opcode_realtime_connection_quality = 19 };
+
 const char* ffDetectWifi(FFlist* result) {
    FF_LIBRARY_LOAD_MESSAGE(wlanapi, "wlanapi" FF_LIBRARY_EXTENSION, 1)
    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(wlanapi, WlanOpenHandle)
@@ -54,7 +72,7 @@ const char* ffDetectWifi(FFlist* result) {
    WLAN_INTERFACE_INFO_LIST* ifList = nullptr;
    const char* error = nullptr;

-    if (ffWlanOpenHandle(2, nullptr, &curVersion, &hClient) != ERROR_SUCCESS) {
+    if (ffWlanOpenHandle(2 /*maxClientVersion*/, nullptr, &curVersion, &hClient) != ERROR_SUCCESS) {
        error = "WlanOpenHandle() failed";
        goto exit;
    }
@@ -79,6 +97,7 @@ const char* ffDetectWifi(FFlist* result) {
        item->conn.rxRate = -DBL_MAX;
        item->conn.txRate = -DBL_MAX;
        item->conn.channel = 0;
+        item->conn.channelWidth = 0;
        item->conn.frequency = 0;

        convertIfStateToString(ifInfo->isState, &item->inf.status);
@@ -200,17 +219,44 @@ const char* ffDetectWifi(FFlist* result) {
            ffStrbufAppendS(&item->conn.security, "Insecure");
        }

-        WLAN_BSS_LIST* bssList = nullptr;
-        if (ffWlanGetNetworkBssList(hClient,
+        WLAN_REALTIME_CONNECTION_QUALITY* connectionQuality = nullptr;
+        bufSize = 0;
+        if (ffWlanQueryInterface(hClient,
                &ifInfo->InterfaceGuid,
-                &connInfo->wlanAssociationAttributes.dot11Ssid,
-                connInfo->wlanAssociationAttributes.dot11BssType,
-                connInfo->wlanSecurityAttributes.bSecurityEnabled,
+                wlan_intf_opcode_realtime_connection_quality,
                nullptr,
-                &bssList) == ERROR_SUCCESS &&
-            bssList->dwNumberOfItems > 0) {
-            item->conn.frequency = (uint16_t) (bssList->wlanBssEntries[0].ulChCenterFrequency / 1000);
-            ffWlanFreeMemory(bssList);
+                &bufSize,
+                (PVOID*) &connectionQuality,
+                &opCode) == ERROR_SUCCESS) {
+            const WLAN_REALTIME_CONNECTION_QUALITY_LINK_INFO* bestLink = nullptr;
+            for (ULONG linkIndex = 0; linkIndex < connectionQuality->ulNumLinks; ++linkIndex) {
+                const WLAN_REALTIME_CONNECTION_QUALITY_LINK_INFO* link = &connectionQuality->linksInfo[linkIndex];
+                if (!bestLink || link->lRssi > bestLink->lRssi) {
+                    bestLink = link;
+                }
+            }
+            if (bestLink) {
+                item->conn.channelWidth = (uint16_t) bestLink->ulBandwidth;
+                item->conn.frequency = (uint16_t) bestLink->ulChannelCenterFrequencyMhz;
+            }
+        }
+        if (connectionQuality) {
+            ffWlanFreeMemory(connectionQuality);
+        }
+
+        if (item->conn.frequency == 0) {
+            WLAN_BSS_LIST* bssList = nullptr;
+            if (ffWlanGetNetworkBssList(hClient,
+                    &ifInfo->InterfaceGuid,
+                    &connInfo->wlanAssociationAttributes.dot11Ssid,
+                    connInfo->wlanAssociationAttributes.dot11BssType,
+                    connInfo->wlanSecurityAttributes.bSecurityEnabled,
+                    nullptr,
+                    &bssList) == ERROR_SUCCESS &&
+                bssList->dwNumberOfItems > 0) {
+                item->conn.frequency = (uint16_t) (bssList->wlanBssEntries[0].ulChCenterFrequency / 1000);
+                ffWlanFreeMemory(bssList);
+            }
        }

        ffWlanFreeMemory(connInfo);
@@ -238,5 +284,3 @@ exit:
    }
    return error;
 }
-
-#pragma GCC diagnostic pop
@@ -11,9 +11,9 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
    FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
    if (options->moduleArgs.key.length == 0) {
        if (result->modelName.length > 0) {
-            ffStrbufSetF(&key, "%s (%s)", FF_BATTERY_MODULE_NAME, result->modelName.chars);
+            ffStrbufSetF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(Battery), result->modelName.chars);
        } else {
-            ffStrbufSetS(&key, FF_BATTERY_MODULE_NAME);
+            ffStrbufSetS(&key, FF_MODULE_GET_DISPLAY_NAME(Battery));
        }
    } else {
        ffStrbufClear(&key);
@@ -170,11 +170,11 @@ bool ffPrintBattery(FFBatteryOptions* options) {
    const char* error = ffDetectBattery(options, &results);

    if (error) {
-        ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Battery), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }
    if (results.length == 0) {
-        ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "No batteries found");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Battery), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "No batteries found");
        return false;
    }

@@ -209,7 +209,7 @@ void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Battery), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -297,8 +297,30 @@ void ffDestroyBatteryOptions(FFBatteryOptions* options) {
 }

 FFModuleBaseInfo ffBatteryModuleInfo = {
-    .name = FF_BATTERY_MODULE_NAME,
+    .name = "Battery",
    .description = "Print battery information",
+    .displayName = {
+        .en = "Battery",
+        .ar = "البطارية",
+        .cs = "Baterie",
+        .de = "Akku",
+        .es = "Batería",
+        .fr = "Batterie",
+        .gl = "Batería",
+        .he = "סוללה",
+        .id = "Baterai",
+        .it = "Batteria",
+        .ja = "バッテリー",
+        .ko = "배터리",
+        .pl = "Bateria",
+        .pt = "Bateria",
+        .ru = "Батарея",
+        .tr = "Pil",
+        .uk = "Батарея",
+        .vi = "Pin",
+        .zh_CN = "电池",
+        .zh_TW = "電池",
+    },
    .initOptions = (void*) ffInitBatteryOptions,
    .destroyOptions = (void*) ffDestroyBatteryOptions,
    .parseJsonObject = (void*) ffParseBatteryJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BATTERY_MODULE_NAME "Battery"
-
 bool ffPrintBattery(FFBatteryOptions* options);
 void ffInitBatteryOptions(FFBatteryOptions* options);
 void ffDestroyBatteryOptions(FFBatteryOptions* options);
@@ -18,12 +18,12 @@ bool ffPrintBios(FFBiosOptions* options) {
    FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();

    if (error) {
-        ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bios), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    }

    if (bios.version.length == 0) {
-        ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "bios_version is not set.");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bios), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "bios_version is not set.");
        goto exit;
    }

@@ -34,7 +34,7 @@ bool ffPrintBios(FFBiosOptions* options) {
            ffStrbufSetStatic(&bios.type, "Legacy");
        }

-        ffStrbufSetF(&key, FF_BIOS_MODULE_NAME " (%s)", bios.type.chars);
+        ffStrbufSetF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(Bios), bios.type.chars);
    } else {
        ffStrbufClear(&key);
        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
@@ -80,7 +80,7 @@ void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bios), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -130,8 +130,30 @@ void ffDestroyBiosOptions(FFBiosOptions* options) {
 }

 FFModuleBaseInfo ffBiosModuleInfo = {
-    .name = FF_BIOS_MODULE_NAME,
+    .name = "BIOS",
    .description = "Print first-stage bootloader information (name, version, release date, etc.)",
+    .displayName = {
+        .en = "BIOS",
+        .ar = "BIOS",
+        .cs = "BIOS",
+        .de = "BIOS",
+        .es = "BIOS",
+        .fr = "BIOS",
+        .gl = "BIOS",
+        .he = "BIOS",
+        .id = "BIOS",
+        .it = "BIOS",
+        .ja = "BIOS",
+        .ko = "BIOS",
+        .pl = "BIOS",
+        .pt = "BIOS",
+        .ru = "BIOS",
+        .tr = "BIOS",
+        .uk = "BIOS",
+        .vi = "BIOS",
+        .zh_CN = "BIOS",
+        .zh_TW = "BIOS",
+    },
    .initOptions = (void*) ffInitBiosOptions,
    .destroyOptions = (void*) ffDestroyBiosOptions,
    .parseJsonObject = (void*) ffParseBiosJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BIOS_MODULE_NAME "BIOS"
-
 bool ffPrintBios(FFBiosOptions* options);
 void ffInitBiosOptions(FFBiosOptions* options);
 void ffDestroyBiosOptions(FFBiosOptions* options);
@@ -8,7 +8,7 @@
 static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* device, uint8_t index) {
    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Bluetooth), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
        bool showBatteryLevel = device->battery > 0 && device->battery <= 100;
@@ -44,7 +44,7 @@ static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* de
            ffPercentAppendBar(&percentageBar, device->battery, options->percent, &options->moduleArgs);
        }

-        FF_PRINT_FORMAT_CHECKED(FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Bluetooth), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                                  FF_ARG(device->name, "name"),
                                                                                                                  FF_ARG(device->address, "address"),
                                                                                                                  FF_ARG(device->type, "type"),
@@ -60,12 +60,12 @@ bool ffPrintBluetooth(FFBluetoothOptions* options) {
    const char* error = ffDetectBluetooth(options, &devices);

    if (error) {
-        ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bluetooth), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (devices.length == 0) {
-        ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No bluetooth devices found");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bluetooth), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No bluetooth devices found");
        return false;
    }

@@ -100,7 +100,7 @@ void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module)
            continue;
        }

-        ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bluetooth), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -151,8 +151,30 @@ void ffDestroyBluetoothOptions(FFBluetoothOptions* options) {
 }

 FFModuleBaseInfo ffBluetoothModuleInfo = {
-    .name = FF_BLUETOOTH_MODULE_NAME,
+    .name = "Bluetooth",
    .description = "List connected Bluetooth devices",
+    .displayName = {
+        .en = "Bluetooth",
+        .ar = "بلوتوث",
+        .cs = "Bluetooth",
+        .de = "Bluetooth",
+        .es = "Bluetooth",
+        .fr = "Bluetooth",
+        .gl = "Bluetooth",
+        .he = "בלוטות'",
+        .id = "Bluetooth",
+        .it = "Bluetooth",
+        .ja = "ブルートゥース",
+        .ko = "블루투스",
+        .pl = "Bluetooth",
+        .pt = "Bluetooth",
+        .ru = "Bluetooth",
+        .tr = "Bluetooth",
+        .uk = "Bluetooth",
+        .vi = "Bluetooth",
+        .zh_CN = "蓝牙设备",
+        .zh_TW = "藍牙裝置",
+    },
    .initOptions = (void*) ffInitBluetoothOptions,
    .destroyOptions = (void*) ffDestroyBluetoothOptions,
    .parseJsonObject = (void*) ffParseBluetoothJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BLUETOOTH_MODULE_NAME "Bluetooth"
-
 bool ffPrintBluetooth(FFBluetoothOptions* options);
 void ffInitBluetoothOptions(FFBluetoothOptions* options);
 void ffDestroyBluetoothOptions(FFBluetoothOptions* options);
@@ -5,8 +5,6 @@
 #include "detection/bluetoothradio/bluetoothradio.h"
 #include "modules/bluetoothradio/bluetoothradio.h"

-#define FF_BLUETOOTHRADIO_DISPLAY_NAME "Bluetooth Radio"
-
 static void destroyBluetoothRadios(FFlist* radios) {
    FF_LIST_FOR_EACH (FFBluetoothRadioResult, radio, *radios) {
        ffStrbufDestroy(&radio->name);
@@ -18,7 +16,7 @@ static void destroyBluetoothRadios(FFlist* radios) {
 static void printDevice(FFBluetoothRadioOptions* options, const FFBluetoothRadioResult* radio, uint8_t index) {
    FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
    if (options->moduleArgs.key.length == 0) {
-        ffStrbufAppendF(&key, "%s (%s)", FF_BLUETOOTHRADIO_DISPLAY_NAME, radio->name.chars);
+        ffStrbufAppendF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(BluetoothRadio), radio->name.chars);
    } else {
        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
                                                                           FF_ARG(index, "index"),
@@ -101,7 +99,7 @@ bool ffPrintBluetoothRadio(FFBluetoothRadioOptions* options) {
    const char* error = ffDetectBluetoothRadio(&radios);

    if (error) {
-        ffPrintError(FF_BLUETOOTHRADIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(BluetoothRadio), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

@@ -117,9 +115,9 @@ bool ffPrintBluetoothRadio(FFBluetoothRadioOptions* options) {

    if (index == 0) {
        if (radios.length > 0) {
-            ffPrintError(FF_BLUETOOTHRADIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Bluetooth radios found but none enabled");
+            ffPrintError(FF_MODULE_GET_DISPLAY_NAME(BluetoothRadio), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Bluetooth radios found but none enabled");
        } else {
-            ffPrintError(FF_BLUETOOTHRADIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No devices detected");
+            ffPrintError(FF_MODULE_GET_DISPLAY_NAME(BluetoothRadio), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No devices detected");
        }
        destroyBluetoothRadios(&radios);
        return false;
@@ -137,7 +135,7 @@ void ffParseBluetoothRadioJsonObject(FFBluetoothRadioOptions* options, yyjson_va
            continue;
        }

-        ffPrintError(FF_BLUETOOTHRADIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(BluetoothRadio), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -190,8 +188,30 @@ void ffDestroyBluetoothRadioOptions(FFBluetoothRadioOptions* options) {
 }

 FFModuleBaseInfo ffBluetoothRadioModuleInfo = {
-    .name = FF_BLUETOOTHRADIO_MODULE_NAME,
+    .name = "BluetoothRadio",
    .description = "List Bluetooth radios (supported versions, vendors, etc.)",
+    .displayName = {
+        .en = "Bluetooth Radio",
+        .ar = "راديو بلوتوث",
+        .cs = "Bluetooth rádio",
+        .de = "Bluetooth-Adapter",
+        .es = "Adaptador Bluetooth",
+        .fr = "Adaptateur Bluetooth",
+        .gl = "Adaptador Bluetooth",
+        .he = "רדיו בלוטות'",
+        .id = "Radio Bluetooth",
+        .it = "Adattatore Bluetooth",
+        .ja = "ブルートゥースアダプター",
+        .ko = "블루투스 어댑터",
+        .pl = "Adapter Bluetooth",
+        .pt = "Adaptador Bluetooth",
+        .ru = "Bluetooth-адаптер",
+        .tr = "Bluetooth Radyosu",
+        .uk = "Радіомодуль Bluetooth",
+        .vi = "Radio Bluetooth",
+        .zh_CN = "蓝牙适配器",
+        .zh_TW = "藍牙配接器",
+    },
    .initOptions = (void*) ffInitBluetoothRadioOptions,
    .destroyOptions = (void*) ffDestroyBluetoothRadioOptions,
    .parseJsonObject = (void*) ffParseBluetoothRadioJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BLUETOOTHRADIO_MODULE_NAME "BluetoothRadio"
-
 bool ffPrintBluetoothRadio(FFBluetoothRadioOptions* options);
 void ffInitBluetoothRadioOptions(FFBluetoothRadioOptions* options);
 void ffDestroyBluetoothRadioOptions(FFBluetoothRadioOptions* options);
@@ -14,24 +14,24 @@ bool ffPrintBoard(FFBoardOptions* options) {

    const char* error = ffDetectBoard(&result);
    if (error) {
-        ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Board), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    }

    if (result.name.length == 0) {
-        ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "board_name is not set.");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Board), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "board_name is not set.");
        goto exit;
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Board), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
        ffStrbufWriteTo(&result.name, stdout);
        if (result.version.length) {
            printf(" (%s)", result.version.chars);
        }
        putchar('\n');
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Board), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                          FF_ARG(result.name, "name"),
                                                                                                          FF_ARG(result.vendor, "vendor"),
                                                                                                          FF_ARG(result.version, "version"),
@@ -56,7 +56,7 @@ void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Board), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -108,8 +108,30 @@ void ffDestroyBoardOptions(FFBoardOptions* options) {
 }

 FFModuleBaseInfo ffBoardModuleInfo = {
-    .name = FF_BOARD_MODULE_NAME,
+    .name = "Board",
    .description = "Print motherboard name and other information",
+    .displayName = {
+        .en = "Board",
+        .ar = "اللوحة الأم",
+        .cs = "Základní deska",
+        .de = "Mainboard",
+        .es = "Placa base",
+        .fr = "Carte mère",
+        .gl = "Placa base",
+        .he = "לוח אם",
+        .id = "Papan Induk",
+        .it = "Scheda madre",
+        .ja = "マザーボード",
+        .ko = "메인보드",
+        .pl = "Płyta główna",
+        .pt = "Placa-mãe",
+        .ru = "Материнская плата",
+        .tr = "Anakart",
+        .uk = "Материнська плата",
+        .vi = "Bo mạch chủ",
+        .zh_CN = "主板",
+        .zh_TW = "主機板",
+    },
    .initOptions = (void*) ffInitBoardOptions,
    .destroyOptions = (void*) ffDestroyBoardOptions,
    .parseJsonObject = (void*) ffParseBoardJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BOARD_MODULE_NAME "Board"
-
 bool ffPrintBoard(FFBoardOptions* options);
 void ffInitBoardOptions(FFBoardOptions* options);
 void ffDestroyBoardOptions(FFBoardOptions* options);
@@ -14,7 +14,7 @@ bool ffPrintBootmgr(FFBootmgrOptions* options) {
    const char* error = ffDetectBootmgr(&bootmgr);

    if (error) {
-        ffPrintError(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bootmgr), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    } else {
        FF_STRBUF_AUTO_DESTROY firmwareName = ffStrbufCreateCopy(&bootmgr.firmware);
@@ -25,7 +25,7 @@ bool ffPrintBootmgr(FFBootmgrOptions* options) {
 #endif

        if (options->moduleArgs.outputFormat.length == 0) {
-            ffPrintLogoAndKey(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Bootmgr), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
            ffStrbufWriteTo(&bootmgr.name, stdout);
            if (firmwareName.length > 0) {
                printf(" - %s\n", firmwareName.chars);
@@ -33,7 +33,7 @@ bool ffPrintBootmgr(FFBootmgrOptions* options) {
                putchar('\n');
            }
        } else {
-            FF_PRINT_FORMAT_CHECKED(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Bootmgr), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                                FF_ARG(bootmgr.name, "name"),
                                                                                                                FF_ARG(bootmgr.firmware, "firmware-path"),
                                                                                                                FF_ARG(firmwareName, "firmware-name"),
@@ -59,7 +59,7 @@ void ffParseBootmgrJsonObject(FFBootmgrOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_BOOTMGR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Bootmgr), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -103,8 +103,30 @@ void ffDestroyBootmgrOptions(FFBootmgrOptions* options) {
 }

 FFModuleBaseInfo ffBootmgrModuleInfo = {
-    .name = FF_BOOTMGR_MODULE_NAME,
+    .name = "Bootmgr",
    .description = "Print second-stage bootloader information (name, firmware, etc.)",
+    .displayName = {
+        .en = "Boot Manager",
+        .ar = "مدير الإقلاع",
+        .cs = "Správce spouštění",
+        .de = "Boot-Manager",
+        .es = "Gestor de arranque",
+        .fr = "Gestionnaire de démarrage",
+        .gl = "Xestor de arranque",
+        .he = "מנהל אתחול",
+        .id = "Manajer Boot",
+        .it = "Gestore di avvio",
+        .ja = "ブートマネージャー",
+        .ko = "부트 매니저",
+        .pl = "Menedżer rozruchu",
+        .pt = "Gerenciador de inicialização",
+        .ru = "Менеджер загрузки",
+        .tr = "Önyükleme Yöneticisi",
+        .uk = "Менеджер завантаження",
+        .vi = "Trình quản lý khởi động",
+        .zh_CN = "启动管理器",
+        .zh_TW = "啟動管理器",
+    },
    .initOptions = (void*) ffInitBootmgrOptions,
    .destroyOptions = (void*) ffDestroyBootmgrOptions,
    .parseJsonObject = (void*) ffParseBootmgrJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BOOTMGR_MODULE_NAME "Bootmgr"
-
 bool ffPrintBootmgr(FFBootmgrOptions* options);
 void ffInitBootmgrOptions(FFBootmgrOptions* options);
 void ffDestroyBootmgrOptions(FFBootmgrOptions* options);
@@ -16,7 +16,7 @@ void ffParseBreakJsonObject([[maybe_unused]] FFBreakOptions* options, [[maybe_un
            continue;
        }

-        ffPrintError(FF_BREAK_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Break), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -27,8 +27,30 @@ void ffDestroyBreakOptions([[maybe_unused]] FFBreakOptions* options) {
 }

 FFModuleBaseInfo ffBreakModuleInfo = {
-    .name = FF_BREAK_MODULE_NAME,
+    .name = "Break",
    .description = "Print an empty line",
+    .displayName = {
+        .en = "Break",
+        .ar = "فاصل",
+        .cs = "Konec řádku",
+        .de = "Umbruch",
+        .es = "Salto de línea",
+        .fr = "Saut de ligne",
+        .gl = "Salto de liña",
+        .he = "מעבר שורה",
+        .id = "Baris Baru",
+        .it = "Interruzione",
+        .ja = "改行",
+        .ko = "줄 바꿈",
+        .pl = "Przerwa",
+        .pt = "Quebra",
+        .ru = "Разрыв",
+        .tr = "Satır Sonu",
+        .uk = "Розрив рядка",
+        .vi = "Xuống dòng",
+        .zh_CN = "换行",
+        .zh_TW = "換行",
+    },
    .initOptions = (void*) ffInitBreakOptions,
    .destroyOptions = (void*) ffDestroyBreakOptions,
    .parseJsonObject = (void*) ffParseBreakJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BREAK_MODULE_NAME "Break"
-
 bool ffPrintBreak(FFBreakOptions* options);
 void ffInitBreakOptions(FFBreakOptions* options);
 void ffDestroyBreakOptions(FFBreakOptions* options);
@@ -11,12 +11,12 @@ bool ffPrintBrightness(FFBrightnessOptions* options) {
    const char* error = ffDetectBrightness(options, &result);

    if (error) {
-        ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Brightness), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (result.length == 0) {
-        ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No result is detected.");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Brightness), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No result is detected.");
        return false;
    }

@@ -34,7 +34,7 @@ bool ffPrintBrightness(FFBrightnessOptions* options) {
            ffPercentAppendNum(&str, percent, options->percent, false, &options->moduleArgs);
        }

-        ffPrintLogoAndKey(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Brightness), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
        ffStrbufPutTo(&str, stdout);
        return true;
    }
@@ -44,7 +44,7 @@ bool ffPrintBrightness(FFBrightnessOptions* options) {
    uint32_t index = 0;
    FF_LIST_FOR_EACH (FFBrightnessResult, item, result) {
        if (options->moduleArgs.key.length == 0) {
-            ffStrbufAppendF(&key, "%s (%s)", FF_BRIGHTNESS_MODULE_NAME, item->name.chars);
+            ffStrbufAppendF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(Brightness), item->name.chars);
        } else {
            uint32_t moduleIndex = result.length == 1 ? 0 : index + 1;
            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
@@ -130,7 +130,7 @@ void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* modul
            continue;
        }

-        ffPrintError(FF_BRIGHTNESS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Brightness), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -190,8 +190,30 @@ void ffDestroyBrightnessOptions(FFBrightnessOptions* options) {
 }

 FFModuleBaseInfo ffBrightnessModuleInfo = {
-    .name = FF_BRIGHTNESS_MODULE_NAME,
+    .name = "Brightness",
    .description = "Print the current brightness level of your monitors",
+    .displayName = {
+        .en = "Brightness",
+        .ar = "السطوع",
+        .cs = "Jas",
+        .de = "Helligkeit",
+        .es = "Brillo",
+        .fr = "Luminosité",
+        .gl = "Brillo",
+        .he = "בהירות",
+        .id = "Kecerahan",
+        .it = "Luminosità",
+        .ja = "明るさ",
+        .ko = "밝기",
+        .pl = "Jasność",
+        .pt = "Brilho",
+        .ru = "Яркость",
+        .tr = "Parlaklık",
+        .uk = "Яскравість",
+        .vi = "Độ sáng",
+        .zh_CN = "亮度",
+        .zh_TW = "亮度",
+    },
    .initOptions = (void*) ffInitBrightnessOptions,
    .destroyOptions = (void*) ffDestroyBrightnessOptions,
    .parseJsonObject = (void*) ffParseBrightnessJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BRIGHTNESS_MODULE_NAME "Brightness"
-
 bool ffPrintBrightness(FFBrightnessOptions* options);
 void ffInitBrightnessOptions(FFBrightnessOptions* options);
 void ffDestroyBrightnessOptions(FFBrightnessOptions* options);
@@ -10,9 +10,9 @@ static void printBtrfs(FFBtrfsOptions* options, FFBtrfsResult* result, uint8_t i
    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
    if (options->moduleArgs.key.length == 0) {
        if (result->name.length > 0) {
-            ffStrbufSetF(&buffer, "%s (%s)", FF_BTRFS_MODULE_NAME, result->name.chars);
+            ffStrbufSetF(&buffer, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(Btrfs), result->name.chars);
        } else {
-            ffStrbufSetS(&buffer, FF_BTRFS_MODULE_NAME);
+            ffStrbufSetS(&buffer, FF_MODULE_GET_DISPLAY_NAME(Btrfs));
        }
    } else {
        ffStrbufClear(&buffer);
@@ -100,11 +100,11 @@ bool ffPrintBtrfs(FFBtrfsOptions* options) {
    const char* error = ffDetectBtrfs(&results);

    if (error) {
-        ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Btrfs), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }
    if (results.length == 0) {
-        ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "No btrfs drive found");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Btrfs), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "No btrfs drive found");
        return false;
    }

@@ -136,7 +136,7 @@ void ffParseBtrfsJsonObject(FFBtrfsOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_BTRFS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Btrfs), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -198,8 +198,30 @@ void ffDestroyBtrfsOptions(FFBtrfsOptions* options) {
 }

 FFModuleBaseInfo ffBtrfsModuleInfo = {
-    .name = FF_BTRFS_MODULE_NAME,
+    .name = "Btrfs",
    .description = "Print Linux BTRFS volumes",
+    .displayName = {
+        .en = "BTRFS",
+        .ar = "BTRFS",
+        .cs = "BTRFS",
+        .de = "BTRFS",
+        .es = "BTRFS",
+        .fr = "BTRFS",
+        .gl = "BTRFS",
+        .he = "BTRFS",
+        .id = "BTRFS",
+        .it = "BTRFS",
+        .ja = "BTRFS",
+        .ko = "BTRFS",
+        .pl = "BTRFS",
+        .pt = "BTRFS",
+        .ru = "BTRFS",
+        .tr = "BTRFS",
+        .uk = "BTRFS",
+        .vi = "BTRFS",
+        .zh_CN = "BTRFS",
+        .zh_TW = "BTRFS",
+    },
    .initOptions = (void*) ffInitBtrfsOptions,
    .destroyOptions = (void*) ffDestroyBtrfsOptions,
    .parseJsonObject = (void*) ffParseBtrfsJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_BTRFS_MODULE_NAME "Btrfs"
-
 bool ffPrintBtrfs(FFBtrfsOptions* options);
 void ffInitBtrfsOptions(FFBtrfsOptions* options);
 void ffDestroyBtrfsOptions(FFBtrfsOptions* options);
@@ -5,7 +5,7 @@

 static void printDevice(FFCameraOptions* options, const FFCameraResult* device, uint8_t index) {
    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_CAMERA_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Camera), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        ffStrbufWriteTo(&device->name, stdout);
        if (device->colorspace.length > 0) {
@@ -19,7 +19,7 @@ static void printDevice(FFCameraOptions* options, const FFCameraResult* device,
            putchar('\n');
        }
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_CAMERA_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, (((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Camera), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, (((FFformatarg[]) {
                                                                                                               FF_ARG(device->name, "name"),
                                                                                                               FF_ARG(device->vendor, "vendor"),
                                                                                                               FF_ARG(device->colorspace, "colorspace"),
@@ -35,12 +35,12 @@ bool ffPrintCamera(FFCameraOptions* options) {
    const char* error = ffDetectCamera(&result);

    if (error) {
-        ffPrintError(FF_CAMERA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Camera), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (result.length == 0) {
-        ffPrintError(FF_CAMERA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No camera found");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Camera), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No camera found");
        return false;
    }

@@ -67,7 +67,7 @@ void ffParseCameraJsonObject(FFCameraOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_CAMERA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Camera), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -115,8 +115,30 @@ void ffDestroyCameraOptions(FFCameraOptions* options) {
 }

 FFModuleBaseInfo ffCameraModuleInfo = {
-    .name = FF_CAMERA_MODULE_NAME,
+    .name = "Camera",
    .description = "Print available cameras",
+    .displayName = {
+        .en = "Camera",
+        .ar = "الكاميرا",
+        .cs = "Kamera",
+        .de = "Kamera",
+        .es = "Cámara",
+        .fr = "Caméra",
+        .gl = "Cámara",
+        .he = "מצלמה",
+        .id = "Kamera",
+        .it = "Fotocamera",
+        .ja = "カメラ",
+        .ko = "카메라",
+        .pl = "Kamera",
+        .pt = "Câmera",
+        .ru = "Камера",
+        .tr = "Kamera",
+        .uk = "Камера",
+        .vi = "Máy ảnh",
+        .zh_CN = "摄像头",
+        .zh_TW = "攝像頭",
+    },
    .initOptions = (void*) ffInitCameraOptions,
    .destroyOptions = (void*) ffDestroyCameraOptions,
    .parseJsonObject = (void*) ffParseCameraJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CAMERA_MODULE_NAME "Camera"
-
 bool ffPrintCamera(FFCameraOptions* options);
 void ffInitCameraOptions(FFCameraOptions* options);
 void ffDestroyCameraOptions(FFCameraOptions* options);
@@ -16,24 +16,24 @@ bool ffPrintChassis(FFChassisOptions* options) {
    const char* error = ffDetectChassis(&result);

    if (error) {
-        ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Chassis), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    }

    if (result.type.length == 0) {
-        ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "chassis_type is not set by O.E.M.");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Chassis), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "chassis_type is not set by O.E.M.");
        goto exit;
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Chassis), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
        ffStrbufWriteTo(&result.type, stdout);
        if (result.version.length) {
            printf(" (%s)", result.version.chars);
        }
        putchar('\n');
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Chassis), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                            FF_ARG(result.type, "type"),
                                                                                                            FF_ARG(result.vendor, "vendor"),
                                                                                                            FF_ARG(result.version, "version"),
@@ -58,7 +58,7 @@ void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Chassis), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -110,8 +110,30 @@ void ffDestroyChassisOptions(FFChassisOptions* options) {
 }

 FFModuleBaseInfo ffChassisModuleInfo = {
-    .name = FF_CHASSIS_MODULE_NAME,
+    .name = "Chassis",
    .description = "Print chassis type information (desktop, laptop, etc.)",
+    .displayName = {
+        .en = "Chassis",
+        .ar = "الهيكل",
+        .cs = "Skříň",
+        .de = "Gehäuse",
+        .es = "Chasis",
+        .fr = "Châssis",
+        .gl = "Chasis",
+        .he = "מארז",
+        .id = "Casing",
+        .it = "Telaio",
+        .ja = "シャーシ",
+        .ko = "섀시",
+        .pl = "Obudowa",
+        .pt = "Chassi",
+        .ru = "Корпус",
+        .tr = "Kasa",
+        .uk = "Корпус",
+        .vi = "Vỏ máy",
+        .zh_CN = "机箱",
+        .zh_TW = "機箱",
+    },
    .initOptions = (void*) ffInitChassisOptions,
    .destroyOptions = (void*) ffDestroyChassisOptions,
    .parseJsonObject = (void*) ffParseChassisJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CHASSIS_MODULE_NAME "Chassis"
-
 bool ffPrintChassis(FFChassisOptions* options);
 void ffInitChassisOptions(FFChassisOptions* options);
 void ffDestroyChassisOptions(FFChassisOptions* options);
@@ -51,9 +51,9 @@ static void printCodecLine(const FFCodecOptions* options, uint8_t index, FFstrbu
    FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
    if (options->moduleArgs.key.length == 0) {
        if (gpu->length > 0) {
-            ffStrbufSetF(&key, "%s (%s - %s)", FF_CODEC_MODULE_NAME, direction, gpu->chars);
+            ffStrbufSetF(&key, "%s (%s - %s)", FF_MODULE_GET_DISPLAY_NAME(Codec), direction, gpu->chars);
        } else {
-            ffStrbufSetF(&key, "%s (%s)", FF_CODEC_MODULE_NAME, direction);
+            ffStrbufSetF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(Codec), direction);
        }
    } else {
        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]){
@@ -100,12 +100,12 @@ bool ffPrintCodec(FFCodecOptions* options) {
    const char* error = ffDetectCodec(options, &result);

    if (error) {
-        ffPrintError(FF_CODEC_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Codec), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (result.length == 0) {
-        ffPrintError(FF_CODEC_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No hardware video acceleration found");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Codec), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No hardware video acceleration found");
        return false;
    }

@@ -174,14 +174,14 @@ void ffParseCodecJsonObject(FFCodecOptions* options, yyjson_val* module) {
                                                                       {},
                                                                   });
            if (error) {
-                ffPrintError(FF_CODEC_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Codec), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
            } else {
                options->showType = (FFCodecShowType) value;
            }
            continue;
        }

-        ffPrintError(FF_CODEC_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Codec), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -251,8 +251,30 @@ void ffDestroyCodecOptions(FFCodecOptions* options) {
 }

 FFModuleBaseInfo ffCodecModuleInfo = {
-    .name = FF_CODEC_MODULE_NAME,
+    .name = "Codec",
    .description = "Print hardware video acceleration codec types (decode / encode)",
+    .displayName = {
+        .en = "Codec",
+        .ar = "الترميز",
+        .cs = "Kodek",
+        .de = "Codec",
+        .es = "Códec",
+        .fr = "Codec",
+        .gl = "Códec",
+        .he = "קודק",
+        .id = "Kodek",
+        .it = "Codec",
+        .ja = "コーデック",
+        .ko = "코덱",
+        .pl = "Kodek",
+        .pt = "Codec",
+        .ru = "Кодек",
+        .tr = "Kodek",
+        .uk = "Кодек",
+        .vi = "Codec",
+        .zh_CN = "编解码器",
+        .zh_TW = "編解碼器",
+    },
    .initOptions = (void*) ffInitCodecOptions,
    .destroyOptions = (void*) ffDestroyCodecOptions,
    .parseJsonObject = (void*) ffParseCodecJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CODEC_MODULE_NAME "Codec"
-
 bool ffPrintCodec(FFCodecOptions* options);
 void ffInitCodecOptions(FFCodecOptions* options);
 void ffDestroyCodecOptions(FFCodecOptions* options);
@@ -37,7 +37,7 @@ bool ffPrintColors(FFColorsOptions* options) {
            }
        }
        if (result.length > 0) {
-            ffPrintLogoAndKey(FF_COLORS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
            flag = true;

            if (options->paddingLeft > 0) {
@@ -122,7 +122,7 @@ bool ffPrintColors(FFColorsOptions* options) {
        if (flag) {
            ffLogoPrintLine();
        } else {
-            ffPrintLogoAndKey(FF_COLORS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
            flag = true;
        }

@@ -136,7 +136,7 @@ bool ffPrintColors(FFColorsOptions* options) {
    }

    if (!flag) {
-        ffPrintError(FF_COLORS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "Nothing to print");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", "Nothing to print");
        return false;
    }

@@ -164,7 +164,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {
                                                                       {},
                                                                   });
            if (error) {
-                ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
            } else {
                options->symbol = (FFColorsSymbol) value;
            }
@@ -178,7 +178,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {

        if (unsafe_yyjson_equals_str(key, "block")) {
            if (!yyjson_is_obj(val)) {
-                ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", unsafe_yyjson_get_str(key));
+                ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", unsafe_yyjson_get_str(key));
            } else {
                yyjson_val* width = yyjson_obj_get(val, "width");
                if (width) {
@@ -188,14 +188,14 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {
                yyjson_val* range = yyjson_obj_get(val, "range");
                if (range) {
                    if (!yyjson_is_arr(range) || yyjson_arr_size(range) != 2) {
-                        ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", unsafe_yyjson_get_str(key));
+                        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", unsafe_yyjson_get_str(key));
                    } else {
                        uint8_t start = (uint8_t) yyjson_get_uint(yyjson_arr_get(range, 0));
                        uint8_t end = (uint8_t) yyjson_get_uint(yyjson_arr_get(range, 1));
                        if (start > end) {
-                            ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", unsafe_yyjson_get_str(key));
+                            ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", unsafe_yyjson_get_str(key));
                        } else if (end > 15) {
-                            ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", unsafe_yyjson_get_str(key));
+                            ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", unsafe_yyjson_get_str(key));
                        } else {
                            options->block.range[0] = start;
                            options->block.range[1] = end;
@@ -215,14 +215,14 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module) {
                                                                       {},
                                                                   });
            if (error) {
-                ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
            } else {
                options->brightness = (FFColorsBrightness) value;
            }
            continue;
        }

-        ffPrintError(FF_COLORS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Colors), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -295,8 +295,30 @@ void ffDestroyColorsOptions(FFColorsOptions* options) {
 }

 FFModuleBaseInfo ffColorsModuleInfo = {
-    .name = FF_COLORS_MODULE_NAME,
+    .name = "Colors",
    .description = "Display the terminal's 16-color palette",
+    .displayName = {
+        .en = "Colors",
+        .ar = "الألوان",
+        .cs = "Barvy",
+        .de = "Farben",
+        .es = "Colores",
+        .fr = "Couleurs",
+        .gl = "Cores",
+        .he = "צבעים",
+        .id = "Warna",
+        .it = "Colori",
+        .ja = "色",
+        .ko = "색상",
+        .pl = "Kolory",
+        .pt = "Cores",
+        .ru = "Цвета",
+        .tr = "Renkler",
+        .uk = "Кольори",
+        .vi = "Màu sắc",
+        .zh_CN = "颜色",
+        .zh_TW = "顏色",
+    },
    .initOptions = (void*) ffInitColorsOptions,
    .destroyOptions = (void*) ffDestroyColorsOptions,
    .parseJsonObject = (void*) ffParseColorsJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_COLORS_MODULE_NAME "Colors"
-
 bool ffPrintColors(FFColorsOptions* options);
 void ffInitColorsOptions(FFColorsOptions* options);
 void ffDestroyColorsOptions(FFColorsOptions* options);
@@ -8,12 +8,12 @@ bool ffPrintCommand(FFCommandOptions* options) {
    const char* error = ffDetectCommand(options, &result);

    if (error) {
-        ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Command), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (!result.length) {
-        ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No result generated");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Command), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No result generated");
        return false;
    }

@@ -23,18 +23,18 @@ bool ffPrintCommand(FFCommandOptions* options) {
        size_t len = 0;
        while (ffStrbufGetline(&line, &len, &result)) {
            if (options->moduleArgs.outputFormat.length == 0) {
-                ffPrintLogoAndKey(FF_COMMAND_MODULE_NAME, ++index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+                ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Command), ++index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
                puts(line);
            } else {
-                FF_PRINT_FORMAT_CHECKED(FF_COMMAND_MODULE_NAME, ++index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) { FF_ARG(line, "result") }));
+                FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Command), ++index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) { FF_ARG(line, "result") }));
            }
        }
    } else {
        if (options->moduleArgs.outputFormat.length == 0) {
-            ffPrintLogoAndKey(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Command), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
            ffStrbufPutTo(&result, stdout);
        } else {
-            FF_PRINT_FORMAT_CHECKED(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) { FF_ARG(result, "result") }));
+            FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Command), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) { FF_ARG(result, "result") }));
        }
    }

@@ -79,7 +79,7 @@ void ffParseCommandJsonObject(FFCommandOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Command), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -153,8 +153,30 @@ void ffDestroyCommandOptions(FFCommandOptions* options) {
 }

 FFModuleBaseInfo ffCommandModuleInfo = {
-    .name = FF_COMMAND_MODULE_NAME,
+    .name = "Command",
    .description = "Run custom shell scripts",
+    .displayName = {
+        .en = "Command",
+        .ar = "الأمر",
+        .cs = "Příkaz",
+        .de = "Befehl",
+        .es = "Comando",
+        .fr = "Commande",
+        .gl = "Comando",
+        .he = "פקודה",
+        .id = "Perintah",
+        .it = "Comando",
+        .ja = "コマンド",
+        .ko = "명령어",
+        .pl = "Polecenie",
+        .pt = "Comando",
+        .ru = "Команда",
+        .tr = "Komut",
+        .uk = "Команда",
+        .vi = "Lệnh",
+        .zh_CN = "命令",
+        .zh_TW = "命令",
+    },
    .initOptions = (void*) ffInitCommandOptions,
    .destroyOptions = (void*) ffDestroyCommandOptions,
    .parseJsonObject = (void*) ffParseCommandJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_COMMAND_MODULE_NAME "Command"
-
 bool ffPrepareCommand(FFCommandOptions* options);

 bool ffPrintCommand(FFCommandOptions* options);
@@ -23,9 +23,9 @@ bool ffPrintCPU(FFCPUOptions* options) {
    const char* error = ffDetectCPU(options, &cpu);

    if (error) {
-        ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
    } else if (cpu.vendor.length == 0 && cpu.name.length == 0 && cpu.coresOnline <= 1) {
-        ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No CPU detected");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No CPU detected");
    } else {
        FF_STRBUF_AUTO_DESTROY coreTypes = ffStrbufCreate();
        if (options->showPeCoreCount) {
@@ -43,7 +43,7 @@ bool ffPrintCPU(FFCPUOptions* options) {
        }

        if (options->moduleArgs.outputFormat.length == 0) {
-            ffPrintLogoAndKey(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(CPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

            FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();

@@ -85,7 +85,7 @@ bool ffPrintCPU(FFCPUOptions* options) {

            FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
            ffTempsAppendNum(cpu.temperature, &tempStr, options->tempConfig, &options->moduleArgs);
-            FF_PRINT_FORMAT_CHECKED(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(CPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                            FF_ARG(cpu.name, "name"),
                                                                                                            FF_ARG(cpu.vendor, "vendor"),
                                                                                                            FF_ARG(cpu.coresPhysical, "cores-physical"),
@@ -131,7 +131,7 @@ void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module) {
        }

        if (unsafe_yyjson_equals_str(key, "freqNdigits")) {
-            ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "modules.CPU.freqNdigits has been moved to display.freq.ndigits");
+            ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "modules.CPU.freqNdigits has been moved to display.freq.ndigits");
            continue;
        }

@@ -140,7 +140,7 @@ void ffParseCPUJsonObject(FFCPUOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -251,8 +251,30 @@ void ffDestroyCPUOptions(FFCPUOptions* options) {
 }

 FFModuleBaseInfo ffCPUModuleInfo = {
-    .name = FF_CPU_MODULE_NAME,
+    .name = "CPU",
    .description = "Print CPU name, frequency, etc.",
+    .displayName = {
+        .en = "CPU",
+        .ar = "المعالج",
+        .cs = "CPU",
+        .de = "CPU",
+        .es = "CPU",
+        .fr = "CPU",
+        .gl = "CPU",
+        .he = "מעבד",
+        .id = "CPU",
+        .it = "CPU",
+        .ja = "CPU",
+        .ko = "CPU",
+        .pl = "CPU",
+        .pt = "CPU",
+        .ru = "Процессор",
+        .tr = "CPU",
+        .uk = "CPU",
+        .vi = "CPU",
+        .zh_CN = "CPU",
+        .zh_TW = "CPU",
+    },
    .initOptions = (void*) ffInitCPUOptions,
    .destroyOptions = (void*) ffDestroyCPUOptions,
    .parseJsonObject = (void*) ffParseCPUJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CPU_MODULE_NAME "CPU"
-
 bool ffPrintCPU(FFCPUOptions* options);
 void ffInitCPUOptions(FFCPUOptions* options);
 void ffDestroyCPUOptions(FFCPUOptions* options);
@@ -5,8 +5,6 @@
 #include "detection/cpucache/cpucache.h"
 #include "modules/cpucache/cpucache.h"

-#define FF_CPUCACHE_DISPLAY_NAME "CPU Cache"
-
 static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOptions* options) {
    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
    FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
@@ -16,7 +14,7 @@ static void printCPUCacheNormal(const FFCPUCacheResult* result, FFCPUCacheOption
        ffStrbufClear(&key);
        levelStr[1] = (char) ('1' + i);
        if (options->moduleArgs.key.length == 0) {
-            ffStrbufAppendF(&key, "%s (%s)", FF_CPUCACHE_DISPLAY_NAME, levelStr);
+            ffStrbufAppendF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(CPUCache), levelStr);
        } else {
            uint32_t index = i + 1;
            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
@@ -88,12 +86,12 @@ static void printCPUCacheCompact(const FFCPUCacheResult* result, FFCPUCacheOptio
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(CPUCache), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
        ffStrbufPutTo(&buffer, stdout);
    } else {
        FF_STRBUF_AUTO_DESTROY buffer2 = ffStrbufCreate();
        ffSizeAppendNum(sum, &buffer2);
-        FF_PRINT_FORMAT_CHECKED(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(CPUCache), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                              FF_ARG(buffer, "result"),
                                                                                                              FF_ARG(buffer2, "sum"),
                                                                                                          }));
@@ -114,7 +112,7 @@ bool ffPrintCPUCache(FFCPUCacheOptions* options) {
    const char* error = ffDetectCPUCache(&result);

    if (error) {
-        ffPrintError(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPUCache), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    }

@@ -147,7 +145,7 @@ void ffParseCPUCacheJsonObject(FFCPUCacheOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_CPUCACHE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPUCache), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -223,8 +221,30 @@ void ffDestroyCPUCacheOptions(FFCPUCacheOptions* options) {
 }

 FFModuleBaseInfo ffCPUCacheModuleInfo = {
-    .name = FF_CPUCACHE_MODULE_NAME,
+    .name = "CPUCache",
    .description = "Print CPU cache sizes",
+    .displayName = {
+        .en = "CPU Cache",
+        .ar = "ذاكرة المعالج المؤقتة",
+        .cs = "Mezipaměť CPU",
+        .de = "CPU-Cache",
+        .es = "Caché de la CPU",
+        .fr = "Cache CPU",
+        .gl = "Caché da CPU",
+        .he = "מטמון מעבד",
+        .id = "Cache CPU",
+        .it = "Cache CPU",
+        .ja = "CPUキャッシュ",
+        .ko = "CPU 캐시",
+        .pl = "Pamięć podręczna CPU",
+        .pt = "Cache da CPU",
+        .ru = "Кэш процессора",
+        .tr = "CPU Önbelleği",
+        .uk = "Кеш ЦП",
+        .vi = "Bộ nhớ đệm CPU",
+        .zh_CN = "CPU缓存",
+        .zh_TW = "CPU快取記憶體",
+    },
    .initOptions = (void*) ffInitCPUCacheOptions,
    .destroyOptions = (void*) ffDestroyCPUCacheOptions,
    .parseJsonObject = (void*) ffParseCPUCacheJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CPUCACHE_MODULE_NAME "CPUCache"
-
 bool ffPrintCPUCache(FFCPUCacheOptions* options);
 void ffInitCPUCacheOptions(FFCPUCacheOptions* options);
 void ffDestroyCPUCacheOptions(FFCPUCacheOptions* options);
@@ -5,14 +5,12 @@
 #include "detection/cpuusage/cpuusage.h"
 #include "modules/cpuusage/cpuusage.h"

-#define FF_CPUUSAGE_DISPLAY_NAME "CPU Usage"
-
 bool ffPrintCPUUsage(FFCPUUsageOptions* options) {
    FF_LIST_AUTO_DESTROY percentages = ffListCreate();
    const char* error = ffGetCpuUsageResult(options, &percentages);

    if (error) {
-        ffPrintError(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPUUsage), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

@@ -54,7 +52,7 @@ bool ffPrintCPUUsage(FFCPUUsageOptions* options) {
    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(CPUUsage), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        FF_STRBUF_AUTO_DESTROY str = ffStrbufCreate();
        if (!options->separate) {
@@ -102,7 +100,7 @@ bool ffPrintCPUUsage(FFCPUUsageOptions* options) {
            ffPercentAppendBar(&maxBar, maxValue, options->percent, &options->moduleArgs);
        }

-        FF_PRINT_FORMAT_CHECKED(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(CPUUsage), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                              FF_ARG(avgNum, "avg"),
                                                                                                              FF_ARG(maxNum, "max"),
                                                                                                              FF_ARG(maxIndex, "max-index"),
@@ -139,7 +137,7 @@ void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_CPUUSAGE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(CPUUsage), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -181,8 +179,30 @@ void ffDestroyCPUUsageOptions(FFCPUUsageOptions* options) {
 }

 FFModuleBaseInfo ffCPUUsageModuleInfo = {
-    .name = FF_CPUUSAGE_MODULE_NAME,
+    .name = "CPUUsage",
    .description = "Print CPU usage. Collecting data takes some time",
+    .displayName = {
+        .en = "CPU Usage",
+        .ar = "استخدام المعالج",
+        .cs = "Využití CPU",
+        .de = "CPU-Auslastung",
+        .es = "Uso de la CPU",
+        .fr = "Utilisation du CPU",
+        .gl = "Uso da CPU",
+        .he = "שימוש במעבד",
+        .id = "Penggunaan CPU",
+        .it = "Utilizzo della CPU",
+        .ja = "CPU使用率",
+        .ko = "CPU 사용량",
+        .pl = "Użycie CPU",
+        .pt = "Uso da CPU",
+        .ru = "Использование процессора",
+        .tr = "CPU Kullanımı",
+        .uk = "Використання ЦП",
+        .vi = "Mức sử dụng CPU",
+        .zh_CN = "CPU使用率",
+        .zh_TW = "CPU使用率",
+    },
    .initOptions = (void*) ffInitCPUUsageOptions,
    .destroyOptions = (void*) ffDestroyCPUUsageOptions,
    .parseJsonObject = (void*) ffParseCPUUsageJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CPUUSAGE_MODULE_NAME "CPUUsage"
-
 void ffPrepareCPUUsage();

 bool ffPrintCPUUsage(FFCPUUsageOptions* options);
@@ -14,7 +14,7 @@ bool ffPrintCursor(FFCursorOptions* options) {
    ffDetectCursor(&result);

    if (result.error.length) {
-        ffPrintError(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", result.error.chars);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Cursor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", result.error.chars);
    } else {
        ffStrbufRemoveIgnCaseEndS(&result.theme, "cursors");
        ffStrbufRemoveIgnCaseEndS(&result.theme, "cursor");
@@ -25,7 +25,7 @@ bool ffPrintCursor(FFCursorOptions* options) {
        }

        if (options->moduleArgs.outputFormat.length == 0) {
-            ffPrintLogoAndKey(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Cursor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
            ffStrbufWriteTo(&result.theme, stdout);

            if (result.size.length > 0 && !ffStrbufEqualS(&result.size, "0")) {
@@ -34,7 +34,7 @@ bool ffPrintCursor(FFCursorOptions* options) {

            putchar('\n');
        } else {
-            FF_PRINT_FORMAT_CHECKED(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Cursor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                               FF_ARG(result.theme, "theme"),
                                                                                                               FF_ARG(result.size, "size"),
                                                                                                           }));
@@ -58,7 +58,7 @@ void ffParseCursorJsonObject(FFCursorOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Cursor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -100,8 +100,30 @@ void ffDestroyCursorOptions(FFCursorOptions* options) {
 }

 FFModuleBaseInfo ffCursorModuleInfo = {
-    .name = FF_CURSOR_MODULE_NAME,
+    .name = "Cursor",
    .description = "Print cursor style name",
+    .displayName = {
+        .en = "Cursor",
+        .ar = "المؤشر",
+        .cs = "Kurzor",
+        .de = "Mauszeiger",
+        .es = "Cursor",
+        .fr = "Curseur",
+        .gl = "Cursor",
+        .he = "סמן",
+        .id = "Kursor",
+        .it = "Cursore",
+        .ja = "カーソル",
+        .ko = "커서",
+        .pl = "Kursor",
+        .pt = "Cursor",
+        .ru = "Курсор",
+        .tr = "İmleç",
+        .uk = "Курсор",
+        .vi = "Con trỏ",
+        .zh_CN = "光标",
+        .zh_TW = "游標",
+    },
    .initOptions = (void*) ffInitCursorOptions,
    .destroyOptions = (void*) ffDestroyCursorOptions,
    .parseJsonObject = (void*) ffParseCursorJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CURSOR_MODULE_NAME "Cursor"
-
 bool ffPrintCursor(FFCursorOptions* options);
 void ffInitCursorOptions(FFCursorOptions* options);
 void ffDestroyCursorOptions(FFCursorOptions* options);
@@ -5,7 +5,7 @@
 #include "modules/custom/custom.h"

 bool ffPrintCustom(FFCustomOptions* options) {
-    ffPrintFormat(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, 0, ((FFformatarg[]) {}));
+    ffPrintFormat(FF_MODULE_GET_DISPLAY_NAME(Custom), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, 0, ((FFformatarg[]) {}));
    return true;
 }

@@ -21,7 +21,7 @@ void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Custom), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -35,8 +35,29 @@ void ffDestroyCustomOptions(FFCustomOptions* options) {
 }

 FFModuleBaseInfo ffCustomModuleInfo = {
-    .name = FF_CUSTOM_MODULE_NAME,
+    .name = "Custom",
    .description = "Print a custom string, with or without key",
+    .displayName = {
+        .en = "Custom",
+        .ar = "مخصص",
+        .cs = "Vlastní",
+        .de = "Benutzerdefiniert",
+        .es = "Personalizado",
+        .fr = "Personnalisé",
+        .he = "מותאם אישית",
+        .id = "Kustom",
+        .it = "Personalizzato",
+        .ja = "カスタム",
+        .ko = "사용자 정의",
+        .pl = "Niestandardowy",
+        .pt = "Personalizado",
+        .ru = "Пользовательский",
+        .tr = "Özel",
+        .uk = "Власний",
+        .vi = "Tùy chỉnh",
+        .zh_CN = "自定义",
+        .zh_TW = "自訂",
+    },
    .initOptions = (void*) ffInitCustomOptions,
    .destroyOptions = (void*) ffDestroyCustomOptions,
    .parseJsonObject = (void*) ffParseCustomJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_CUSTOM_MODULE_NAME "Custom"
-
 bool ffPrintCustom(FFCustomOptions* options);
 void ffInitCustomOptions(FFCustomOptions* options);
 void ffDestroyCustomOptions(FFCustomOptions* options);
@@ -8,8 +8,6 @@

 #pragma GCC diagnostic ignored "-Wformat" // warning: unknown conversion type character 'F' in format

-#define FF_DATETIME_DISPLAY_NAME "Date & Time"
-
 typedef struct FFDateTimeResult {
    // Examples for 21.02.2022 - 15:18:37
    uint16_t year;                                       // 2022
@@ -67,7 +65,7 @@ static void printDateTimeFormat(struct tm* tm, const FFModuleArgs* moduleArgs) {
    strftime(result.amPm, sizeof(result.amPm), "%p", tm);

    FF_PRINT_FORMAT_CHECKED(
-        FF_DATETIME_DISPLAY_NAME,
+        FF_MODULE_GET_DISPLAY_NAME(DateTime),
        0,
        moduleArgs,
        FF_PRINT_TYPE_DEFAULT,
@@ -112,11 +110,11 @@ bool ffPrintDateTime(FFDateTimeOptions* options) {
    char buffer[32];
    if (strftime(buffer, ARRAY_SIZE(buffer), "%F %T", tm) == 0) // yyyy-MM-dd HH:mm:ss
    {
-        ffPrintError(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "strftime() failed");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DateTime), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "strftime() failed");
        return false;
    }

-    ffPrintLogoAndKey(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+    ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(DateTime), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

    puts(buffer);
    return true;
@@ -130,7 +128,7 @@ void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DateTime), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -152,8 +150,30 @@ void ffDestroyDateTimeOptions(FFDateTimeOptions* options) {
 }

 FFModuleBaseInfo ffDateTimeModuleInfo = {
-    .name = FF_DATETIME_MODULE_NAME,
+    .name = "DateTime",
    .description = "Print the current date and time",
+    .displayName = {
+        .en = "Date & Time",
+        .ar = "التاريخ والوقت",
+        .cs = "Datum a čas",
+        .de = "Datum & Uhrzeit",
+        .es = "Fecha y hora",
+        .fr = "Date et heure",
+        .gl = "Data e hora",
+        .he = "תאריך ושעה",
+        .id = "Tanggal & Waktu",
+        .it = "Data e ora",
+        .ja = "日付と時刻",
+        .ko = "날짜/시간",
+        .pl = "Data i godzina",
+        .pt = "Data e hora",
+        .ru = "Дата и время",
+        .tr = "Tarih ve Saat",
+        .uk = "Дата й час",
+        .vi = "Ngày giờ",
+        .zh_CN = "日期时间",
+        .zh_TW = "日期時間",
+    },
    .initOptions = (void*) ffInitDateTimeOptions,
    .destroyOptions = (void*) ffDestroyDateTimeOptions,
    .parseJsonObject = (void*) ffParseDateTimeJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_DATETIME_MODULE_NAME "DateTime"
-
 bool ffPrintDateTime(FFDateTimeOptions* options);
 void ffInitDateTimeOptions(FFDateTimeOptions* options);
 void ffDestroyDateTimeOptions(FFDateTimeOptions* options);
@@ -9,7 +9,7 @@ bool ffPrintDE(FFDEOptions* options) {
    const FFDisplayServerResult* result = ffConnectDisplayServer();

    if (result->dePrettyName.length == 0) {
-        ffPrintError(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No DE found");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DE), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No DE found");
        return false;
    }

@@ -17,7 +17,7 @@ bool ffPrintDE(FFDEOptions* options) {
    ffDetectDEVersion(&result->dePrettyName, &version, options);

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(DE), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        ffStrbufWriteTo(&result->dePrettyName, stdout);

@@ -28,7 +28,7 @@ bool ffPrintDE(FFDEOptions* options) {

        putchar('\n');
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) { FF_ARG(result->deProcessName, "process-name"), FF_ARG(result->dePrettyName, "pretty-name"), FF_ARG(version, "version") }));
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(DE), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) { FF_ARG(result->deProcessName, "process-name"), FF_ARG(result->dePrettyName, "pretty-name"), FF_ARG(version, "version") }));
    }

    return true;
@@ -43,11 +43,11 @@ void ffParseDEJsonObject(FFDEOptions* options, yyjson_val* module) {
        }

        if (unsafe_yyjson_equals_str(key, "slowVersionDetection")) {
-            ffPrintError(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Key `slowVersionDetection` is deprecated, it's always true");
+            ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DE), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Key `slowVersionDetection` is deprecated, it's always true");
            continue;
        }

-        ffPrintError(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DE), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -82,8 +82,30 @@ void ffDestroyDEOptions(FFDEOptions* options) {
 }

 FFModuleBaseInfo ffDEModuleInfo = {
-    .name = FF_DE_MODULE_NAME,
+    .name = "DE",
    .description = "Print desktop environment name",
+    .displayName = {
+        .en = "Desktop Environment",
+        .ar = "بيئة سطح المكتب",
+        .cs = "Pracovní prostředí",
+        .de = "Desktop-Umgebung",
+        .es = "Entorno de escritorio",
+        .fr = "Environnement de Bureau",
+        .gl = "Contorno do Escritorio",
+        .he = "סביבת שולחן עבודה",
+        .id = "Lingkungan Desktop",
+        .it = "Ambiente Desktop",
+        .ja = "デスクトップ環境",
+        .ko = "데스크탑 환경",
+        .pl = "Środowisko graficzne",
+        .pt = "Ambiente de desktop",
+        .ru = "Рабочее окружение",
+        .tr = "Masaüstü Ortamı",
+        .uk = "Стільниче середовище",
+        .vi = "Môi trường desktop",
+        .zh_CN = "桌面环境",
+        .zh_TW = "桌面環境",
+    },
    .initOptions = (void*) ffInitDEOptions,
    .destroyOptions = (void*) ffDestroyDEOptions,
    .parseJsonObject = (void*) ffParseDEJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_DE_MODULE_NAME "DE"
-
 bool ffPrintDE(FFDEOptions* options);
 void ffInitDEOptions(FFDEOptions* options);
 void ffDestroyDEOptions(FFDEOptions* options);
@@ -16,7 +16,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk, uint32_t index
    FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();

    if (options->moduleArgs.key.length == 0) {
-        ffStrbufSetF(&key, "%s (%s)", FF_DISK_MODULE_NAME, disk->mountpoint.chars);
+        ffStrbufSetF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(Disk), disk->mountpoint.chars);
    } else {
        FF_STRBUF_AUTO_DESTROY mountpointLink = ffStrbufCreate();
        FF_STRBUF_AUTO_DESTROY nameLink = ffStrbufCreate();
@@ -187,12 +187,12 @@ bool ffPrintDisk(FFDiskOptions* options) {
    const char* error = ffDetectDisks(options, &disks);

    if (error) {
-        ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Disk), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (disks.length == 0) {
-        ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No disks found");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Disk), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No disks found");
        return false;
    }

@@ -327,7 +327,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Disk), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -451,8 +451,30 @@ void ffDestroyDiskOptions(FFDiskOptions* options) {
 }

 FFModuleBaseInfo ffDiskModuleInfo = {
-    .name = FF_DISK_MODULE_NAME,
+    .name = "Disk",
    .description = "Print partitions, space usage, file system, etc",
+    .displayName = {
+        .en = "Disk",
+        .ar = "القرص",
+        .cs = "Disk",
+        .de = "Festplatte",
+        .es = "Disco",
+        .fr = "Disque",
+        .gl = "Disco",
+        .he = "דיסק",
+        .id = "Disk",
+        .it = "Disco",
+        .ja = "ディスク",
+        .ko = "디스크",
+        .pl = "Dysk",
+        .pt = "Disco",
+        .ru = "Диск",
+        .tr = "Disk",
+        .uk = "Диск",
+        .vi = "Ổ đĩa",
+        .zh_CN = "磁盘分区",
+        .zh_TW = "硬碟分割",
+    },
    .initOptions = (void*) ffInitDiskOptions,
    .destroyOptions = (void*) ffDestroyDiskOptions,
    .parseJsonObject = (void*) ffParseDiskJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_DISK_MODULE_NAME "Disk"
-
 bool ffPrintDisk(FFDiskOptions* options);
 void ffInitDiskOptions(FFDiskOptions* options);
 void ffDestroyDiskOptions(FFDiskOptions* options);
@@ -5,15 +5,13 @@
 #include "detection/diskio/diskio.h"
 #include "modules/diskio/diskio.h"

-#define FF_DISKIO_DISPLAY_NAME "Disk IO"
-
 static int sortDevices(const FFDiskIOResult* left, const FFDiskIOResult* right) {
    return ffStrbufComp(&left->name, &right->name);
 }

 static void formatKey(const FFDiskIOOptions* options, FFDiskIOResult* dev, uint32_t index, FFstrbuf* key) {
    if (options->moduleArgs.key.length == 0) {
-        ffStrbufSetF(key, FF_DISKIO_DISPLAY_NAME " (%s)", dev->name.length ? dev->name.chars : dev->devPath.chars);
+        ffStrbufSetF(key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(DiskIO), dev->name.length ? dev->name.chars : dev->devPath.chars);
    } else {
        ffStrbufClear(key);
        FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, ((FFformatarg[]) {
@@ -30,7 +28,7 @@ bool ffPrintDiskIO(FFDiskIOOptions* options) {
    const char* error = ffDetectDiskIO(&result, options);

    if (error) {
-        ffPrintError(FF_DISKIO_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DiskIO), 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);
        return false;
    }

@@ -116,7 +114,7 @@ void ffParseDiskIOJsonObject(FFDiskIOOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_DISKIO_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DiskIO), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -163,7 +161,7 @@ void ffInitDiskIOOptions(FFDiskIOOptions* options) {

    ffStrbufInit(&options->namePrefix);
    options->detectTotal = false;
-    options->waitTime = 1000;
+    options->waitTime = 500;
 }

 void ffDestroyDiskIOOptions(FFDiskIOOptions* options) {
@@ -172,8 +170,30 @@ void ffDestroyDiskIOOptions(FFDiskIOOptions* options) {
 }

 FFModuleBaseInfo ffDiskIOModuleInfo = {
-    .name = FF_DISKIO_MODULE_NAME,
+    .name = "DiskIO",
    .description = "Print physical disk I/O throughput",
+    .displayName = {
+        .en = "Disk I/O",
+        .ar = "إدخال/إخراج القرص",
+        .cs = "Diskové I/O",
+        .de = "Festplatten I/O",
+        .es = "E/S del disco",
+        .fr = "Entrée/Sortie disque",
+        .gl = "E/S do disco",
+        .he = "קלט/פלט דיסק",
+        .id = "I/O Disk",
+        .it = "I/O del disco",
+        .ja = "ディスク I/O",
+        .ko = "디스크 I/O",
+        .pl = "Dysk I/O",
+        .pt = "Disco I/O",
+        .ru = "Дисковый I/O",
+        .tr = "Disk G/Ç",
+        .uk = "Диск В/В",
+        .vi = "Đĩa I/O",
+        .zh_CN = "磁盘 I/O",
+        .zh_TW = "磁碟 I/O",
+    },
    .initOptions = (void*) ffInitDiskIOOptions,
    .destroyOptions = (void*) ffDestroyDiskIOOptions,
    .parseJsonObject = (void*) ffParseDiskIOJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_DISKIO_MODULE_NAME "DiskIO"
-
 void ffPrepareDiskIO(FFDiskIOOptions* options);

 bool ffPrintDiskIO(FFDiskIOOptions* options);
@@ -19,7 +19,7 @@ bool ffPrintDisplay(FFDisplayOptions* options) {
    const FFDisplayServerResult* dsResult = ffConnectDisplayServer();

    if (dsResult->displays.length == 0) {
-        ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Couldn't detect display");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Display), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Couldn't detect display");
        return false;
    }

@@ -28,7 +28,7 @@ bool ffPrintDisplay(FFDisplayOptions* options) {
    }

    if (options->compactType != FF_DISPLAY_COMPACT_TYPE_NONE) {
-        ffPrintLogoAndKey(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Display), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
        FF_LIST_FOR_EACH (FFDisplayResult, result, dsResult->displays) {
@@ -71,11 +71,11 @@ bool ffPrintDisplay(FFDisplayOptions* options) {
        ffStrbufClear(&key);
        if (options->moduleArgs.key.length == 0) {
            if (result->name.length) {
-                ffStrbufAppendF(&key, "%s (%s)", FF_DISPLAY_MODULE_NAME, result->name.chars);
+                ffStrbufAppendF(&key, "%s (%s)", FF_MODULE_GET_DISPLAY_NAME(Display), result->name.chars);
            } else if (moduleIndex > 0) {
-                ffStrbufAppendF(&key, "%s (%d)", FF_DISPLAY_MODULE_NAME, moduleIndex);
+                ffStrbufAppendF(&key, "%s (%d)", FF_MODULE_GET_DISPLAY_NAME(Display), moduleIndex);
            } else {
-                ffStrbufAppendS(&key, FF_DISPLAY_MODULE_NAME);
+                ffStrbufAppendS(&key, FF_MODULE_GET_DISPLAY_NAME(Display));
            }
        } else {
            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, ((FFformatarg[]) {
@@ -221,7 +221,7 @@ void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) {
                                                                           {},
                                                                       });
                if (error) {
-                    ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                    ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Display), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
                } else {
                    options->compactType = (FFDisplayCompactType) value;
                }
@@ -246,7 +246,7 @@ void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) {
                                                                           {},
                                                                       });
                if (error) {
-                    ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                    ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Display), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
                } else {
                    options->order = (FFDisplayOrder) value;
                }
@@ -254,7 +254,7 @@ void ffParseDisplayJsonObject(FFDisplayOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Display), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -411,8 +411,30 @@ void ffDestroyDisplayOptions(FFDisplayOptions* options) {
 }

 FFModuleBaseInfo ffDisplayModuleInfo = {
-    .name = FF_DISPLAY_MODULE_NAME,
+    .name = "Display",
    .description = "Print resolutions, refresh rates, etc",
+    .displayName = {
+        .en = "Display",
+        .ar = "الشاشة",
+        .cs = "Displej",
+        .de = "Anzeige",
+        .es = "Pantalla",
+        .fr = "Écran",
+        .gl = "Pantalla",
+        .he = "תצוגה",
+        .id = "Tampilan",
+        .it = "Display",
+        .ja = "ディスプレイ",
+        .ko = "디스플레이",
+        .pl = "Wyświetlacz",
+        .pt = "Tela",
+        .ru = "Дисплей",
+        .tr = "Ekran",
+        .uk = "Дисплей",
+        .vi = "Hiển thị",
+        .zh_CN = "显示器",
+        .zh_TW = "顯示器",
+    },
    .initOptions = (void*) ffInitDisplayOptions,
    .destroyOptions = (void*) ffDestroyDisplayOptions,
    .parseJsonObject = (void*) ffParseDisplayJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_DISPLAY_MODULE_NAME "Display"
-
 bool ffPrintDisplay(FFDisplayOptions* options);
 void ffInitDisplayOptions(FFDisplayOptions* options);
 void ffDestroyDisplayOptions(FFDisplayOptions* options);
@@ -10,12 +10,12 @@ bool ffPrintDNS(FFDNSOptions* options) {
    const char* error = ffDetectDNS(options, &result);

    if (error) {
-        ffPrintError(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DNS), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (result.length == 0) {
-        ffPrintError(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "NO DNS servers detected");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DNS), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "NO DNS servers detected");
        return false;
    }

@@ -40,11 +40,11 @@ bool ffPrintDNS(FFDNSOptions* options) {
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(DNS), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        ffStrbufPutTo(&buf, stdout);
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(DNS), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                        FF_ARG(buf, "result"),
                                                                                                    }));
    }
@@ -73,14 +73,14 @@ void ffParseDNSJsonObject(FFDNSOptions* options, yyjson_val* module) {
                                                                       {},
                                                                   });
            if (error) {
-                ffPrintError(FF_DNS_MODULE_NAME, 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DNS), 0, nullptr, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
            } else {
                options->showType = (FFDNSShowType) value;
            }
            continue;
        }

-        ffPrintError(FF_DNS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(DNS), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -134,8 +134,30 @@ void ffDestroyDNSOptions(FFDNSOptions* options) {
 }

 FFModuleBaseInfo ffDNSModuleInfo = {
-    .name = FF_DNS_MODULE_NAME,
+    .name = "DNS",
    .description = "Print configured DNS servers",
+    .displayName = {
+        .en = "DNS",
+        .ar = "DNS",
+        .cs = "DNS",
+        .de = "DNS",
+        .es = "DNS",
+        .fr = "DNS",
+        .gl = "DNS",
+        .he = "DNS",
+        .id = "DNS",
+        .it = "DNS",
+        .ja = "DNS",
+        .ko = "DNS",
+        .pl = "DNS",
+        .pt = "DNS",
+        .ru = "DNS",
+        .tr = "DNS",
+        .uk = "DNS",
+        .vi = "DNS",
+        .zh_CN = "DNS",
+        .zh_TW = "DNS",
+    },
    .initOptions = (void*) ffInitDNSOptions,
    .destroyOptions = (void*) ffDestroyDNSOptions,
    .parseJsonObject = (void*) ffParseDNSJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_DNS_MODULE_NAME "DNS"
-
 bool ffPrintDNS(FFDNSOptions* options);
 void ffInitDNSOptions(FFDNSOptions* options);
 void ffDestroyDNSOptions(FFDNSOptions* options);
@@ -16,12 +16,12 @@ bool ffPrintEditor(FFEditorOptions* options) {
    const char* error = ffDetectEditor(&result);

    if (error) {
-        ffPrintError(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Editor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Editor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
        if (result.exe.length) {
            ffStrbufWriteTo(&result.exe, stdout);
            if (result.version.length) {
@@ -32,7 +32,7 @@ bool ffPrintEditor(FFEditorOptions* options) {
        }
        putchar('\n');
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Editor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                           FF_ARG(result.type, "type"),
                                                                                                           FF_ARG(result.name, "name"),
                                                                                                           FF_ARG(result.exe, "exe-name"),
@@ -57,7 +57,7 @@ void ffParseEditorJsonObject(FFEditorOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_EDITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Editor), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -103,8 +103,30 @@ void ffDestroyEditorOptions(FFEditorOptions* options) {
 }

 FFModuleBaseInfo ffEditorModuleInfo = {
-    .name = FF_EDITOR_MODULE_NAME,
+    .name = "Editor",
    .description = "Print information about the default editor ($VISUAL or $EDITOR)",
+    .displayName = {
+        .en = "Editor",
+        .ar = "المحرر",
+        .cs = "Editor",
+        .de = "Editor",
+        .es = "Editor",
+        .fr = "Éditeur",
+        .gl = "Editor",
+        .he = "עורך",
+        .id = "Editor",
+        .it = "Editor",
+        .ja = "エディター",
+        .ko = "편집기",
+        .pl = "Edytor",
+        .pt = "Editor",
+        .ru = "Редактор",
+        .tr = "Düzenleyici",
+        .uk = "Редактор",
+        .vi = "Trình soạn thảo",
+        .zh_CN = "编辑器",
+        .zh_TW = "編輯器",
+    },
    .initOptions = (void*) ffInitEditorOptions,
    .destroyOptions = (void*) ffDestroyEditorOptions,
    .parseJsonObject = (void*) ffParseEditorJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_EDITOR_MODULE_NAME "Editor"
-
 bool ffPrintEditor(FFEditorOptions* options);
 void ffInitEditorOptions(FFEditorOptions* options);
 void ffDestroyEditorOptions(FFEditorOptions* options);
@@ -15,13 +15,13 @@ bool ffPrintFont(FFFontOptions* options) {
    const char* error = ffDetectFont(&font);

    if (error) {
-        ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Font), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
    } else {
        if (options->moduleArgs.outputFormat.length == 0) {
-            ffPrintLogoAndKey(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+            ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Font), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
            ffStrbufPutTo(&font.display, stdout);
        } else {
-            FF_PRINT_FORMAT_CHECKED(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+            FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Font), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                             FF_ARG(font.fonts[0], "font1"),
                                                                                                             FF_ARG(font.fonts[1], "font2"),
                                                                                                             FF_ARG(font.fonts[2], "font3"),
@@ -49,7 +49,7 @@ void ffParseFontJsonObject(FFFontOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Font), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -95,8 +95,30 @@ void ffDestroyFontOptions(FFFontOptions* options) {
 }

 FFModuleBaseInfo ffFontModuleInfo = {
-    .name = FF_FONT_MODULE_NAME,
+    .name = "Font",
    .description = "Print system font names",
+    .displayName = {
+        .en = "Font",
+        .ar = "الخط",
+        .cs = "Písmo",
+        .de = "Schriftart",
+        .es = "Fuente",
+        .fr = "Police",
+        .gl = "Fonte",
+        .he = "גופן",
+        .id = "Font",
+        .it = "Carattere",
+        .ja = "フォント",
+        .ko = "글꼴",
+        .pl = "Czcionka",
+        .pt = "Fonte",
+        .ru = "Шрифт",
+        .tr = "Yazı Tipi",
+        .uk = "Шрифт",
+        .vi = "Phông chữ",
+        .zh_CN = "字体",
+        .zh_TW = "字型",
+    },
    .initOptions = (void*) ffInitFontOptions,
    .destroyOptions = (void*) ffDestroyFontOptions,
    .parseJsonObject = (void*) ffParseFontJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_FONT_MODULE_NAME "Font"
-
 bool ffPrintFont(FFFontOptions* options);
 void ffInitFontOptions(FFFontOptions* options);
 void ffDestroyFontOptions(FFFontOptions* options);
@@ -8,7 +8,7 @@
 static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device, uint8_t index) {
    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;
    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Gamepad), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
        bool showBatteryLevel = device->battery > 0 && device->battery <= 100;
@@ -39,7 +39,7 @@ static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device
            ffPercentAppendBar(&percentageBar, device->battery, options->percent, &options->moduleArgs);
        }

-        FF_PRINT_FORMAT_CHECKED(FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Gamepad), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                                FF_ARG(device->name, "name"),
                                                                                                                FF_ARG(device->serial, "serial"),
                                                                                                                FF_ARG(percentageNum, "battery-percentage"),
@@ -54,12 +54,12 @@ bool ffPrintGamepad(FFGamepadOptions* options) {
    const char* error = ffDetectGamepad(&result);

    if (error) {
-        ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Gamepad), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

    if (!result.length) {
-        ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No devices detected");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Gamepad), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No devices detected");
        return false;
    }

@@ -80,7 +80,7 @@ bool ffPrintGamepad(FFGamepadOptions* options) {

    bool ret = true;
    if (!filtered.length) {
-        ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "All devices are ignored");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Gamepad), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "All devices are ignored");
        ret = false;
    } else {
        uint8_t index = 0;
@@ -122,7 +122,7 @@ void ffParseGamepadJsonObject(FFGamepadOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_GAMEPAD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Gamepad), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -189,8 +189,30 @@ void ffDestroyGamepadOptions(FFGamepadOptions* options) {
 }

 FFModuleBaseInfo ffGamepadModuleInfo = {
-    .name = FF_GAMEPAD_MODULE_NAME,
+    .name = "Gamepad",
    .description = "List connected gamepads",
+    .displayName = {
+        .en = "Gamepad",
+        .ar = "يد التحكم",
+        .cs = "Gamepad",
+        .de = "Gamepad",
+        .es = "Gamepad",
+        .fr = "Manette",
+        .gl = "Gamepad",
+        .he = "משטח משחק",
+        .id = "Gamepad",
+        .it = "Gamepad",
+        .ja = "ゲームパッド",
+        .ko = "게임패드",
+        .pl = "Gamepad",
+        .pt = "Gamepad",
+        .ru = "Геймпад",
+        .tr = "Oyun Kumandası",
+        .uk = "Геймпад",
+        .vi = "Tay cầm chơi game",
+        .zh_CN = "游戏手柄",
+        .zh_TW = "遊戲手把",
+    },
    .initOptions = (void*) ffInitGamepadOptions,
    .destroyOptions = (void*) ffDestroyGamepadOptions,
    .parseJsonObject = (void*) ffParseGamepadJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_GAMEPAD_MODULE_NAME "Gamepad"
-
 bool ffPrintGamepad(FFGamepadOptions* options);
 void ffInitGamepadOptions(FFGamepadOptions* options);
 void ffDestroyGamepadOptions(FFGamepadOptions* options);
@@ -28,7 +28,7 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu
    FFPercentageTypeFlags percentType = options->percent.type == 0 ? instance.config.display.percentType : options->percent.type;

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_GPU_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(GPU), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        FF_STRBUF_AUTO_DESTROY output = ffStrbufCreate();

@@ -145,7 +145,7 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu
            snprintf(currSpeed, sizeof(currSpeed), "%d x%d", gpu->psCurr.gen, gpu->psCurr.lanes);
        }

-        FF_PRINT_FORMAT_CHECKED(FF_GPU_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(GPU), index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                            FF_ARG(gpu->vendor, "vendor"),
                                                                                                            FF_ARG(gpu->name, "name"),
                                                                                                            FF_ARG(gpu->driver, "driver"),
@@ -176,7 +176,7 @@ bool ffPrintGPU(FFGPUOptions* options) {
    FF_LIST_AUTO_DESTROY gpus = ffListCreate();
    const char* error = ffDetectGPU(options, &gpus);
    if (error) {
-        ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(GPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        return false;
    }

@@ -213,7 +213,7 @@ bool ffPrintGPU(FFGPUOptions* options) {
    }

    if (selectedGPUs.length == 0) {
-        ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, (gpus.length > 0 ? "GPUs found but all hidden by hideType option" : "No GPUs detected"));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(GPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, (gpus.length > 0 ? "GPUs found but all hidden by hideType option" : "No GPUs detected"));
        return false;
    }

@@ -249,7 +249,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) {
                                                                       {},
                                                                   });
            if (error) {
-                ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                ffPrintError(FF_MODULE_GET_DISPLAY_NAME(GPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
            } else {
                options->detectionMethod = (FFGPUDetectionMethod) value;
            }
@@ -269,7 +269,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) {
                                                                           {},
                                                                       });
                if (error) {
-                    ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
+                    ffPrintError(FF_MODULE_GET_DISPLAY_NAME(GPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", unsafe_yyjson_get_str(key), error);
                } else {
                    options->hideType = (FFGPUType) value;
                }
@@ -281,7 +281,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(GPU), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -479,8 +479,30 @@ void ffDestroyGPUOptions(FFGPUOptions* options) {
 }

 FFModuleBaseInfo ffGPUModuleInfo = {
-    .name = FF_GPU_MODULE_NAME,
+    .name = "GPU",
    .description = "Print GPU names, memory sizes, types, etc",
+    .displayName = {
+        .en = "GPU",
+        .ar = "معالج الرسوميات",
+        .cs = "GPU",
+        .de = "GPU",
+        .es = "GPU",
+        .fr = "GPU",
+        .gl = "GPU",
+        .he = "מעבד גרפי",
+        .id = "GPU",
+        .it = "GPU",
+        .ja = "GPU",
+        .ko = "GPU",
+        .pl = "GPU",
+        .pt = "GPU",
+        .ru = "Видеокарта",
+        .tr = "GPU",
+        .uk = "GPU",
+        .vi = "GPU",
+        .zh_CN = "显卡",
+        .zh_TW = "顯卡",
+    },
    .initOptions = (void*) ffInitGPUOptions,
    .destroyOptions = (void*) ffDestroyGPUOptions,
    .parseJsonObject = (void*) ffParseGPUJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_GPU_MODULE_NAME "GPU"
-
 bool ffPrintGPU(FFGPUOptions* options);
 void ffInitGPUOptions(FFGPUOptions* options);
 void ffDestroyGPUOptions(FFGPUOptions* options);
@@ -17,17 +17,17 @@ bool ffPrintHost(FFHostOptions* options) {

    const char* error = ffDetectHost(&host);
    if (error) {
-        ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Host), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    }

    if (host.name.length == 0 && host.family.length == 0) {
-        ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "neither product_family nor product_name is set by O.E.M.");
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Host), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "neither product_family nor product_name is set by O.E.M.");
        goto exit;
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Host), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);

        FF_STRBUF_AUTO_DESTROY output = ffStrbufCreate();

@@ -43,7 +43,7 @@ bool ffPrintHost(FFHostOptions* options) {

        ffStrbufPutTo(&output, stdout);
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Host), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                         FF_ARG(host.family, "family"),
                                                                                                         FF_ARG(host.name, "name"),
                                                                                                         FF_ARG(host.version, "version"),
@@ -75,7 +75,7 @@ void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Host), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -136,8 +136,30 @@ void ffDestroyHostOptions(FFHostOptions* options) {
 }

 FFModuleBaseInfo ffHostModuleInfo = {
-    .name = FF_HOST_MODULE_NAME,
+    .name = "Host",
    .description = "Print your computer's product name",
+    .displayName = {
+        .en = "Host",
+        .ar = "المضيف",
+        .cs = "Hostitel",
+        .de = "Rechner",
+        .es = "Host",
+        .fr = "Hôte",
+        .gl = "Host",
+        .he = "מארח",
+        .id = "Host",
+        .it = "Host",
+        .ja = "ホスト",
+        .ko = "호스트",
+        .pl = "Host",
+        .pt = "Host",
+        .ru = "Модель",
+        .tr = "Ana Bilgisayar",
+        .uk = "Хост",
+        .vi = "Máy chủ",
+        .zh_CN = "主机",
+        .zh_TW = "主機",
+    },
    .initOptions = (void*) ffInitHostOptions,
    .destroyOptions = (void*) ffDestroyHostOptions,
    .parseJsonObject = (void*) ffParseHostJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_HOST_MODULE_NAME "Host"
-
 bool ffPrintHost(FFHostOptions* options);
 void ffInitHostOptions(FFHostOptions* options);
 void ffDestroyHostOptions(FFHostOptions* options);
@@ -13,12 +13,12 @@ bool ffPrintIcons(FFIconsOptions* options) {
    const char* error = ffDetectIcons(&result);

    if (error) {
-        ffPrintError(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Icons), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(Icons), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
        if (result.icons1.length) {
            ffStrbufWriteTo(&result.icons1, stdout);
        }
@@ -30,7 +30,7 @@ bool ffPrintIcons(FFIconsOptions* options) {
        }
        putchar('\n');
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(Icons), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                          FF_ARG(result.icons1, "icons1"),
                                                                                                          FF_ARG(result.icons2, "icons2"),
                                                                                                      }));
@@ -52,7 +52,7 @@ void ffParseIconsJsonObject(FFIconsOptions* options, yyjson_val* module) {
            continue;
        }

-        ffPrintError(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(Icons), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -94,8 +94,30 @@ void ffDestroyIconsOptions(FFIconsOptions* options) {
 }

 FFModuleBaseInfo ffIconsModuleInfo = {
-    .name = FF_ICONS_MODULE_NAME,
+    .name = "Icons",
    .description = "Print icon style name",
+    .displayName = {
+        .en = "Icons",
+        .ar = "الأيقونات",
+        .cs = "Ikony",
+        .de = "Symbole",
+        .es = "Iconos",
+        .fr = "Icônes",
+        .gl = "Iconas",
+        .he = "סמלים",
+        .id = "Ikon",
+        .it = "Icone",
+        .ja = "アイコン",
+        .ko = "아이콘",
+        .pl = "Ikony",
+        .pt = "Ícones",
+        .ru = "Иконки",
+        .tr = "Simgeler",
+        .uk = "Піктограми",
+        .vi = "Biểu tượng",
+        .zh_CN = "图标",
+        .zh_TW = "圖示",
+    },
    .initOptions = (void*) ffInitIconsOptions,
    .destroyOptions = (void*) ffDestroyIconsOptions,
    .parseJsonObject = (void*) ffParseIconsJsonObject,
@@ -2,8 +2,6 @@

 #include "option.h"

-#define FF_ICONS_MODULE_NAME "Icons"
-
 bool ffPrintIcons(FFIconsOptions* options);
 void ffInitIconsOptions(FFIconsOptions* options);
 void ffDestroyIconsOptions(FFIconsOptions* options);
@@ -4,8 +4,6 @@
 #include "detection/initsystem/initsystem.h"
 #include "modules/initsystem/initsystem.h"

-#define FF_INITSYSTEM_DISPLAY_NAME "Init System"
-
 bool ffPrintInitSystem(FFInitSystemOptions* options) {
    bool success = false;
    FFInitSystemResult result = {
@@ -18,12 +16,12 @@ bool ffPrintInitSystem(FFInitSystemOptions* options) {
    const char* error = ffDetectInitSystem(&result);

    if (error) {
-        ffPrintError(FF_INITSYSTEM_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(InitSystem), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
        goto exit;
    }

    if (options->moduleArgs.outputFormat.length == 0) {
-        ffPrintLogoAndKey(FF_INITSYSTEM_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
+        ffPrintLogoAndKey(FF_MODULE_GET_DISPLAY_NAME(InitSystem), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT);
        ffStrbufWriteTo(&result.name, stdout);
        if (result.version.length) {
            printf(" %s\n", result.version.chars);
@@ -31,7 +29,7 @@ bool ffPrintInitSystem(FFInitSystemOptions* options) {
            putchar('\n');
        }
    } else {
-        FF_PRINT_FORMAT_CHECKED(FF_INITSYSTEM_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
+        FF_PRINT_FORMAT_CHECKED(FF_MODULE_GET_DISPLAY_NAME(InitSystem), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, ((FFformatarg[]) {
                                                                                                                FF_ARG(result.name, "name"),
                                                                                                                FF_ARG(result.exe, "exe"),
                                                                                                                FF_ARG(result.version, "version"),
@@ -56,7 +54,7 @@ void ffParseInitSystemJsonObject(FFInitSystemOptions* options, yyjson_val* modul
            continue;
        }

-        ffPrintError(FF_INITSYSTEM_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
+        ffPrintError(FF_MODULE_GET_DISPLAY_NAME(InitSystem), 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Unknown JSON key %s", unsafe_yyjson_get_str(key));
    }
 }

@@ -103,8 +101,30 @@ void ffDestroyInitSystemOptions(FFInitSystemOptions* options) {
 }

 FFModuleBaseInfo ffInitSystemModuleInfo = {
-    .name = FF_INITSYSTEM_MODULE_NAME,
+    .name = "InitSystem",
    .description = "Print init system (pid 1) name and version",
+    .displayName = {
+        .en = "Init System",
+        .ar = "نظام الإقلاع",
+        .cs = "Init systém",
+        .de = "Init-System",
+        .es = "Sistema de inicio",
+        .fr = "Système d'init",
+        .gl = "Sistema de inicio",
+        .he = "מערכת אתחול",
+        .id = "Sistem Init",
+        .it = "Sistema di init",
+        .ja = "initシステム",
+        .ko = "초기화 시스템",
+        .pl = "System init",
+        .pt = "Sistema de inicialização",
+        .ru = "Система инициализации",
+        .tr = "Init Sistemi",
+        .uk = "Init-система",
+        .vi = "Hệ thống init",
+        .zh_CN = "Init 系统",
+        .zh_TW = "Init 系統",
+    },
    .initOptions = (void*) ffInitInitSystemOptions,
    .destroyOptions = (void*) ffDestroyInitSystemOptions,
    .parseJsonObject = (void*) ffParseInitSystemJsonObject,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]	37ec63d1bd	CI: Bump the github-actions group with 4 updates Bumps the github-actions group with 4 updates: [cross-platform-actions/action](https://github.com/cross-platform-actions/action), [github/codeql-action/init](https://github.com/github/codeql-action), [github/codeql-action/analyze](https://github.com/github/codeql-action) and [signpath/github-action-submit-signing-request](https://github.com/signpath/github-action-submit-signing-request). Updates `cross-platform-actions/action` from 1.3.0 to 1.4.0 - [Release notes](https://github.com/cross-platform-actions/action/releases) - [Changelog](https://github.com/cross-platform-actions/action/blob/master/changelog.md) - [Commits](https://github.com/cross-platform-actions/action/compare/5ea7e8e4677bd726033a10b094ba1c5762b15dee...24ef01df165c76df1ed2b9f9e9212e78dc2fc963) Updates `github/codeql-action/init` from 4.37.6 to 4.37.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5595ccaf912efad79be6eef63a5619ff05969be3...ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd) Updates `github/codeql-action/analyze` from 4.37.6 to 4.37.7 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/5595ccaf912efad79be6eef63a5619ff05969be3...ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd) Updates `signpath/github-action-submit-signing-request` from 2.2 to 2.3 - [Release notes](https://github.com/signpath/github-action-submit-signing-request/releases) - [Commits](https://github.com/signpath/github-action-submit-signing-request/compare/b9d91eadd323de506c0c81cf0c7fe7438f3360fd...c92b958760219087e01f8d67a1669ed57afe2627) --- updated-dependencies: - dependency-name: cross-platform-actions/action dependency-version: 1.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: github/codeql-action/init dependency-version: 4.37.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: github/codeql-action/analyze dependency-version: 4.37.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: signpath/github-action-submit-signing-request dependency-version: '2.3' dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com>	2026-08-23 18:07:14 +00:00
Carter Li	e7ecba4460	Doc: updates README [ci skip]	2026-08-21 10:40:50 +08:00
Carter Li	e0c239729b	L10n: adds `cs` `id` `tr` `uk` `vi` Assisted-By: LLM	2026-08-21 10:19:06 +08:00
Samuel Torres	6570a7accc	L10n (ES): fixes Spanish translations (#2537 )	2026-08-21 08:31:42 +08:00
Samuel Torres	0c4ec62cac	L10n: (gl) Added Galician Support	2026-08-21 00:25:32 +08:00
Carter Li	5d11b65d53	TerminalFont (Android): adds font size detection	2026-08-20 16:18:07 +08:00
Carter Li	8b40117c08	Wifi (OpenBSD): fortifies detection and adds channel to frequency helper	2026-08-20 16:04:00 +08:00
Carter Li	b1f2bf3526	WM: uses full name in EN, as DE and LM modules do	2026-08-20 15:23:21 +08:00
Carter Li	d8452f71ed	Wifi (SunOS): fortifies code	2026-08-20 15:05:18 +08:00
Carter Li	2a269bfd4c	Wifi: removes driver detection support	2026-08-19 23:28:23 +08:00
Carter Li	cafe82b462	Battery (SunOS): adds basic detection impl	2026-08-19 13:24:05 +08:00
Carter Li	db8ee8159d	Wifi (Haiku): adds basic Wifi detection impl	2026-08-19 11:05:35 +08:00
Carter Li	f0765b1a13	Wifi (SunOS): adds basic Wifi detection impl	2026-08-19 10:43:34 +08:00
Carter Li	93566cb73c	Wifi (Android / OpenBSD): inits unsupported properties	2026-08-19 10:16:30 +08:00
Carter Li	6d0d093d62	Wifi (NetBSD): adds channel width detection	2026-08-19 10:15:30 +08:00
Carter Li	54fe4ffece	Wifi (FreeBSD): adds channel width detection	2026-08-19 09:40:23 +08:00
Carter Li	124bbb06f9	Wifi (macOS): fixes compatibility for old Intel MBP	2026-08-19 09:17:12 +08:00
Carter Li	f04a53337d	Wifi (macOS): adds channel width, accurate channel frequency and device driver detection	2026-08-18 19:32:01 +08:00
李通洲	514efab8eb	Wifi (Windows): adds channel width and device driver detection	2026-08-18 19:32:01 +08:00
Carter Li	232cd6659b	Wifi (Linux): adds channel width and device driver detection	2026-08-18 19:32:01 +08:00
Carter Li	7c93f9c82a	GPU (macOS): removes useless `@available` tests	2026-08-18 19:32:01 +08:00
Wehrwolfmann	e5b6e3612a	L10n: falls back to English when the auto-detected locale is unsupported --key-language with an empty value (and "language": null in the config) asks for the system locale, not for a specific language. When that locale has no translation, fastfetch aborted with exit 477 instead of printing anything, so the same config broke on every locale outside the twelve supported ones, and under LC_ALL=C variants such as POSIX. Auto-detected locales now fall back to English. An explicitly requested language still errors out, so typos and zh are still reported.	2026-08-17 20:14:39 -05:00
Carter Li	6cb15885c7	L10n: don't use `ffStrbufCreateStatic` for buffers that will be modified later	2026-08-18 09:11:50 +08:00
Carter Li	e6d90c2081	L10n (Zh): uses a different name for `Monitor`	2026-08-17 14:20:46 +08:00
Carter Li	679d868b4a	L10n (Zh): clarifies `Disk` actually detects `Disk partitions`	2026-08-17 13:57:23 +08:00
Carter Li	72d240f325	L10n (Zh): clarifies `Bluetooth` actually detects `Bluetooth devices`	2026-08-17 13:42:30 +08:00
Carter Li	2ca7e037ef	L10n (Zh): translates `shell`	2026-08-17 13:36:09 +08:00
Carter Li	5e9c31ac31	Completion (Fish): prints enum description [ci skip]	2026-08-17 10:42:24 +08:00
Wehrwolfmann	bcb48774a0	Modules: proofreads Russian l10n strings	2026-08-16 12:01:42 -05:00
Wehrwolfmann	9ff7969acf	Bluetooth / BluetoothRadio: keeps the brand name in Latin script in Russian keys	2026-08-16 12:01:42 -05:00
李通洲	7fbd06a135	Doc: updates README.md [ci skip]	2026-08-16 22:16:56 +08:00
Hashing	bbb906ba10	L10n (Pt): matches all Portuguese locales, not only bare `pt` (#2521 ) `359cb0a79a` renamed the key from `pt_BR` to `pt` but kept the exact-match guard, so only the literal string `pt` matched. Every real Portuguese locale (`pt_BR`, `pt_PT` and their charset and modifier variants) fell through to `goto error` and aborted. Return the offset unconditionally, matching every other two-letter case.	2026-08-16 02:15:39 -05:00
李通洲	2de674ec9a	L10n (Ar / He): adds support Fixes #2520	2026-08-16 10:52:23 +08:00
李通洲	b700d9ded5	L10n (Ru): changes `Блютус` to `Блютуз` Ref: https://github.com/fastfetch-cli/fastfetch/issues/2503#issuecomment-5304614812	2026-08-16 10:52:23 +08:00
李通洲	359cb0a79a	L10n (Pt): renames `pt_BR` to `pt`	2026-08-16 10:52:14 +08:00
李通洲	45f9de6cd2	L10n: improves performance	2026-08-16 10:36:33 +08:00
Guiorgy	233c481f7a	CMAKE: bumps minimum CMake version to 3.21.0 (#2517 ) C_STANDARD 23 was added in 3.21	2026-08-15 09:15:03 +08:00
Carter Li	b677f1e902	Theme: improves GTK theme/icons/font detection on standalone WMs (Hyprland, sway, niri, i3) Fixes #2504	2026-08-15 09:08:29 +08:00
Carter Li	8d82eedaef	DiskIO / NetIO: updates default value of waitTime to reduce latency Also corrects docs.	2026-08-15 08:53:00 +08:00
Carter Li	4dc27b365f	DiskIO / NetIO: fixes I/O rate calculation precision, prevent div-by-zero	2026-08-15 08:51:45 +08:00
李通洲	e5c3fa4023	CI: fixes compiling errors	2026-08-15 00:00:27 +08:00
李通洲	bdba78c45c	CI: silences codespell errors	2026-08-14 23:56:29 +08:00
Carter Li	f95167e907	Global: adds option `key-language` Fixes #2503	2026-08-14 23:33:54 +08:00
Carter Li	3908c39ce2	Modules: adds l10n strings	2026-08-14 22:47:24 +08:00
李通洲	858d3749f4	FFstrbuf: adds `FF_STRBUF_STATIC`	2026-08-14 18:27:53 +08:00
李通洲	51f36fa4b4	FFstrbuf: adds comments [ci skip]	2026-08-14 17:54:36 +08:00
李通洲	bfe30eec79	Doc: updates changelog [ci skip]	2026-08-14 17:05:06 +08:00