LocalIP (Windows): detect gateway ip

2026-09-12 18:32:10 +02:00 · 2024-03-05 10:59:05 +08:00
114 changed files with 849 additions and 1219 deletions
@@ -245,7 +245,8 @@ jobs:

      - name: install required packages
        run: |
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite vulkan-loader vulkan-headers molten-vk imagemagick chafa
+          brew update
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install vulkan-loader vulkan-headers molten-vk imagemagick chafa

      - name: Initialize CodeQL
        uses: github/codeql-action/init@v3
@@ -377,7 +378,7 @@ jobs:
        with:
          msystem: CLANG64
          update: true
-          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-vulkan-headers mingw-w64-clang-x86_64-opencl-icd
+          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-opencl-icd

      - name: print msys version
        run: uname -a
@@ -439,7 +440,7 @@ jobs:
        with:
          msystem: CLANG32
          update: true
-          install: git mingw-w64-clang-i686-7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-vulkan-headers mingw-w64-clang-i686-opencl-icd
+          install: git mingw-w64-clang-i686-7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-opencl-icd

      - name: print msys version
        run: uname -a
@@ -1,9 +1,9 @@
-build/
-.vs/
-.vscode/
-.cache/
-.kdev4/
-.DS_Store
+**/build/
+**/.vscode/
+**/.cache/
+**/.kdev4/
+**/.DS_Store
+/.vs
 cscope.*
 tags
 fastfetch.kdev4
@@ -1,63 +1,3 @@
-# 2.9.0
-
-Features:
-* Support Lxterminal version detection (Terminal, Linux)
-* Support weston-terminal version and font detection (TerminalFont, Linux)
-* Support `am` package manager detection (#771, Packages, Linux)
-* Support network prefix length detection for IPv6 (LocalIP)
-* Display all IPs when multiple IPs are assigned to the same interface (LocalIP)
-* Add option `--localip-show-prefix-len` to show network prefix length for both IPv4 and IPv6. Defaults to `true` (LocalIP)
-
-Bugfixes:
-* Fix network prefix length detection when the value is greater than 24 (#773, LocalIP, Linux)
-* For xfce4-terminal, use system mono font if no config file is found (TerminalFont, Linux)
-
-# 2.8.10
-
-Bugfixes:
-* Don't display 0.00 GHz (CPU, FreeBSD)
-* Don't detect manufactor of Qualcomm as ARM (CPU, Android)
-* Ignore `chezmoi` (Terminal, Linux)
-* Trim trailing possible whitespaces (PublicIP)
-* Fix detection compatibility for KDE 6 (Font, Linux)
-* Always use Metal API to detect vmem size (GPU, macOS)
-
-Features:
-* Improve stability; print more useful error message; avoid misuse (PublicIP / Weather)
-* Use MS-DOS device name as mountFrom result, instead of useless GUID volume name (Windows, Disk)
-* Some adjustments to Terminal detection (Terminal, Windows)
-    * Don't pretty print CMD
-    * Print conhost as Windows Console
-    * Don't detect `wininit` as Terminal
-
-Logo:
-* Fix color of Arco Linux
-
-# 2.8.9
-
-Bugfixes:
-* Don't detect `SessionLeader` as terminal, actually (Terminal, Linux)
-* Fix blurry chafa result when specifying both width and height (#757, Logo)
-
-Features:
-* Support new MacBook Air (Host, macOS)
-* Distinguish min frequency and base frequency (CPU)
-
-Logo:
-* Fix proxmox
-
-# 2.8.8
-
-Bugfixes:
-* Fix old fish version compatibility (#744)
-* Fix truncated texts in `--help format` (#745)
-* Fix old vulkan-header and libdrm library compatibility (#748, Linux)
-* Fix possible segfaults in `--help *-format` (#749)
-* Fix invalid resolution detection when using libdrm (Linux, Display)
-* Fix segfault when `/sys/devices/system/cpu/cpufreq/` doesn't exist (#750, CPU, Linux)
-* Don't detect `SessionLeader` as terminal (Terminal, Linux)
-* Fix detection of client IP (Users, Linux)
-
 # 2.8.7

 Bugfixes:
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url

 project(fastfetch
-    VERSION 2.9.0
+    VERSION 2.8.7
    LANGUAGES C
    DESCRIPTION "Fast neofetch-like system information tool"
    HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -27,10 +27,8 @@ There are [screenshots on different platforms](https://github.com/fastfetch-cli/

 ### Linux

-Some distros packaged a outdated fastfetch version. Older version is not supported, please always ensure that the latest version is used.
-
-* Ubuntu: [`ppa:zhangsongcui3371/fastfetch`](https://launchpad.net/~zhangsongcui3371/+archive/ubuntu/fastfetch) (for Ubuntu 22.04 or above)
-* Debian / Ubuntu: Download `fastfetch-<version>-Linux.deb` from [Github release page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and `dpkg -i fastfetch-<version>-Linux.deb` (for Ubuntu 22.04 or above and Debian 12 or above).
+* Ubuntu: `ppa:zhangsongcui3371/fastfetch`
+* Debian / Ubuntu: Download `fastfetch-<version>-Linux.deb` from [Github release page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and `dpkg -i fastfetch-<version>-Linux.deb`
 * Arch Linux: `sudo pacman -S fastfetch`. You can also find fastfetch [on the AUR](https://aur.archlinux.org/packages/fastfetch-git).
 * Fedora: `sudo dnf install fastfetch`
 * Gentoo: `sudo emerge --ask app-misc/fastfetch`
@@ -1,21 +1,3 @@
-fastfetch (2.8.10) jammy; urgency=medium
-
-  * Update to 2.8.10
-
- -- Carter Li <zhangsongcui@live.cn>  Mon, 25 Mar 2024 15:01:53 +0800
-
-fastfetch (2.8.9) jammy; urgency=medium
-
-  * Update to 2.8.9
-
- -- Carter Li <zhangsongcui@live.cn>  Fri, 15 Mar 2024 10:49:42 +0800
-
-fastfetch (2.8.8) jammy; urgency=medium
-
-  * Update to 2.8.8
-
- -- Carter Li <zhangsongcui@live.cn>  Fri, 08 Mar 2024 09:59:41 +0800
-
 fastfetch (2.8.6) jammy; urgency=medium

  * Update to 2.8.6
@@ -1 +1 @@
-fastfetch_2.8.10_source.buildinfo universe/utils optional
+fastfetch_2.8.6_source.buildinfo universe/utils optional
@@ -1438,11 +1438,6 @@
                                        "type": "boolean",
                                        "default": false
                                    },
-                                    "showPrefixLen": {
-                                        "description": "Show network prefix length (/N)",
-                                        "type": "boolean",
-                                        "default": true
-                                    },
                                    "compact": {
                                        "description": "Show all IPs in one line",
                                        "type": "boolean",
@@ -1,104 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
-        "type": "none"
-    },
-    "display": {
-        "separator": "->   "
-    },
-    "modules": [
-        {
-            "type": "title",
-            "format": "                                {6}{7}{8}"
-        },
-        "break",
-        {
-            "type": "custom",
-            "format": "┌───────────────────────────── \u001b[1mSystem Information\u001b[0m ─────────────────────────────┐" // `\u001b` is `\033`, or `\e`
-        },
-        "break",
-        {
-            "key": "     OS           ",
-            "keyColor": "red",
-            "type": "os"
-        },
-        {
-            "key": "     Machine      ",
-            "keyColor": "green",
-            "type": "host"
-        },
-        {
-            "key": "     Kernel       ",
-            "keyColor": "magenta",
-            "type": "kernel"
-        },
-        {
-            "key": "    󰅐 Uptime       ",
-            "keyColor": "red",
-            "type": "uptime"
-        },
-        {
-            "key": "    󰍹 Resolution   ",
-            "keyColor": "yellow",
-            "type": "display",
-            "compactType": "original-with-refresh-rate"
-        },
-        {
-            "key": "     WM           ",
-            "keyColor": "blue",
-            "type": "wm"
-        },
-        {
-            "key": "     DE           ",
-            "keyColor": "green",
-            "type": "de"
-        },
-        {
-            "key": "     Shell        ",
-            "keyColor": "cyan",
-            "type": "shell"
-        },
-        {
-            "key": "     Terminal     ",
-            "keyColor": "red",
-            "type": "terminal"
-        },
-        {
-            "key": "     CPU          ",
-            "keyColor": "yellow",
-            "type": "cpu"
-        },
-        {
-            "key": "    ﬙ GPU          ",
-            "keyColor": "blue",
-            "type": "gpu"
-        },
-        {
-            "key": "    󰑭 Memory       ",
-            "keyColor": "magenta",
-            "type": "memory"
-        },
-        {
-            "key": "    󰩟 Local IP     ",
-            "keyColor": "red",
-            "type": "localip",
-            "compact": true
-        },
-        {
-            "key": "    󰩠 Public IP    ",
-            "keyColor": "cyan",
-            "type": "publicip"
-        },
-        "break",
-        {
-            "type": "custom",
-            "format": "└──────────────────────────────────────────────────────────────────────────────┘" // `\u001b` is `\033`, or `\e`
-        },
-        "break",
-        {
-            "type": "colors",
-            "paddingLeft": 34,
-            "symbol": "circle"
-        }
-    ]
-}
@@ -118,7 +118,7 @@ static void parseStructureCommand(
        }
    }

-    ffPrintError(line, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "<no implementation provided>");
+    ffPrintErrorString(line, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "<no implementation provided>");
 }

 void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
@@ -2,7 +2,6 @@
 #include "common/font.h"

 #include <string.h>
-#include <ctype.h>

 void ffFontInit(FFfont* font)
 {
@@ -67,33 +66,59 @@ void ffFontInitQt(FFfont* font, const char* data)
    //See https://doc.qt.io/qt-5/qfont.html#toString

    //Family
-    data = ffStrbufAppendSUntilC(&font->name, data, ',');
+    while(*data != ',' && *data != '\0')
+    {
+        ffStrbufAppendC(&font->name, *data);
+        ++data;
+    }
+    if(*data != '\0')
+        ++data;
    ffStrbufTrim(&font->name, ' ');
-    if (!data) goto exit;
-    data++;

    //Size
-    data = ffStrbufAppendSUntilC(&font->size, data, ',');
-    ffStrbufTrim(&font->size, ' ');
-    if (!data) goto exit;
-    data++;
-
-    //Style
-    data = strrchr(data, ',');
-    if (!data) goto exit;
-    data++;
-    if (isalpha(*data))
+    while(*data != ',' && *data != '\0')
    {
-        do
+        ffStrbufAppendC(&font->size, *data);
+        ++data;
+    }
+    if(*data != '\0')
+        ++data;
+    ffStrbufTrim(&font->size, ' ');
+
+    #define FF_FONT_QT_SKIP_VALUE \
+        while(*data != ',' && *data != '\0') \
+            ++data; \
+        if(*data != '\0') \
+             ++data;
+
+    FF_FONT_QT_SKIP_VALUE //Pixel size
+    FF_FONT_QT_SKIP_VALUE //Style hint
+    FF_FONT_QT_SKIP_VALUE //Font weight
+    FF_FONT_QT_SKIP_VALUE //Font style
+    FF_FONT_QT_SKIP_VALUE //Underline
+    FF_FONT_QT_SKIP_VALUE //Strike out
+    FF_FONT_QT_SKIP_VALUE //Fixed pitch
+    FF_FONT_QT_SKIP_VALUE //Always 0
+
+    #undef FF_FONT_QT_SKIP_VALUE
+
+    while(*data != '\0')
+    {
+        while(*data == ' ')
+            ++data;
+
+        if(*data == '\0')
+            break;
+
+        FFstrbuf* style = ffListAdd(&font->styles);
+        ffStrbufInit(style);
+        while(*data != ' ' && *data != '\0')
        {
-            FFstrbuf* style = ffListAdd(&font->styles);
-            ffStrbufInit(style);
-            data = ffStrbufAppendSUntilC(style, data, ' ');
-            if (data) data++;
-        } while (data);
+            ffStrbufAppendC(style, *data);
+            ++data;
+        }
    }

-exit:
    fontInitPretty(font);
 }

@@ -24,7 +24,3 @@ typedef struct FFformatarg

 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
 void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
-#define FF_PARSE_FORMAT_STRING_CHECKED(buffer, formatstr, numArgs, arguments) do {\
-    static_assert(sizeof(arguments) / sizeof(*(arguments)) == (numArgs), "Invalid number of format arguments");\
-    ffParseFormatString((buffer), (formatstr), (numArgs), (arguments));\
-} while (0)
@@ -235,6 +235,6 @@ void ffPrintJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
            yyjson_mut_doc_set_root(jsonDoc, obj);
        }
        else
-            ffPrintError("JsonConfig", 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);
+            ffPrintErrorString("JsonConfig", 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "%s", error);
    }
 }
@@ -20,9 +20,15 @@ typedef struct FFNetworkingState {
            FFThreadType thread;
        #endif
    #endif
-
-    uint32_t timeout;
 } FFNetworkingState;

-const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers);
-const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer);
+bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers);
+bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, uint32_t timeout);
+
+static inline bool ffNetworkingGetHttp(const char* host, const char* path, uint32_t timeout, const char* headers, FFstrbuf* buffer)
+{
+    FFNetworkingState state;
+    if(ffNetworkingSendHttpRequest(&state, host, path, headers))
+        return ffNetworkingRecvHttpResponse(&state, buffer, timeout);
+    return false;
+}
@@ -5,50 +5,30 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <netinet/in.h> // For FreeBSD
-#include <netinet/tcp.h>

-static const char* connectAndSend(FFNetworkingState* state)
+static void connectAndSend(FFNetworkingState* state)
 {
-    const char* ret = NULL;
-    struct addrinfo* addr;
-
-    if(getaddrinfo(state->host.chars, "80", &(struct addrinfo) {
+    struct addrinfo hints = {
        .ai_family = AF_INET,
        .ai_socktype = SOCK_STREAM,
-    }, &addr) != 0)
-    {
-        ret = "getaddrinfo() failed";
+    };
+
+    struct addrinfo* addr;
+
+    if(getaddrinfo(state->host.chars, "80", &hints, &addr) != 0)
        goto error;
-    }

    state->sockfd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
    if(state->sockfd == -1)
    {
        freeaddrinfo(addr);
-        ret = "socket() failed";
        goto error;
    }

-    if (state->timeout > 0)
-    {
-        FF_MAYBE_UNUSED uint32_t sec = state->timeout / 1000;
-        if (sec == 0) sec = 1;
-
-        #ifdef TCP_CONNECTIONTIMEOUT
-        setsockopt(state->sockfd, IPPROTO_TCP, TCP_CONNECTIONTIMEOUT, &sec, sizeof(sec));
-        #elif defined(TCP_KEEPINIT)
-        setsockopt(state->sockfd, IPPROTO_TCP, TCP_KEEPINIT, &sec, sizeof(sec));
-        #elif defined(TCP_USER_TIMEOUT)
-        setsockopt(state->sockfd, IPPROTO_TCP, TCP_USER_TIMEOUT, &state->timeout, sizeof(state->timeout));
-        #endif
-    }
-
    if(connect(state->sockfd, addr->ai_addr, addr->ai_addrlen) == -1)
    {
        close(state->sockfd);
        freeaddrinfo(addr);
-        ret = "connect() failed";
        goto error;
    }

@@ -57,7 +37,6 @@ static const char* connectAndSend(FFNetworkingState* state)
    if(send(state->sockfd, state->command.chars, state->command.length, 0) < 0)
    {
        close(state->sockfd);
-        ret = "send() failed";
        goto error;
    }

@@ -69,13 +48,11 @@ error:
 exit:
    ffStrbufDestroy(&state->host);
    ffStrbufDestroy(&state->command);
-
-    return ret;
 }

 FF_THREAD_ENTRY_DECL_WRAPPER(connectAndSend, FFNetworkingState*);

-const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers)
+bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers)
 {
    ffStrbufInitS(&state->host, host);

@@ -89,30 +66,22 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
    ffStrbufAppendS(&state->command, "\r\n");

    #ifdef FF_HAVE_THREADS
-    if (instance.config.general.multithreading)
-    {
        state->thread = ffThreadCreate(connectAndSendThreadMain, state);
-        return state->thread ? NULL : "ffThreadCreate(connectAndSend) failed";
-    }
+        return !!state->thread;
+    #else
+        connectAndSend(state);
+        return state->sockfd != -1;
    #endif
-
-    return connectAndSend(state);
 }

-const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer)
+bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, uint32_t timeout)
 {
-    uint32_t timeout = state->timeout;
-
    #ifdef FF_HAVE_THREADS
-    if (instance.config.general.multithreading)
-    {
        if (!ffThreadJoin(state->thread, timeout))
-            return "ffThreadJoin() failed or timeout";
-    }
+            return false;
    #endif
-
    if(state->sockfd == -1)
-        return "ffNetworkingSendHttpRequest() failed";
+        return false;

    if(timeout > 0)
    {
@@ -122,15 +91,14 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf
        setsockopt(state->sockfd, SOL_SOCKET, SO_RCVTIMEO, &timev, sizeof(timev));
    }

-    uint32_t recvStart;
-    do {
-        recvStart = buffer->length;
-        ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, ffStrbufGetFree(buffer), 0);
-        if (received <= 0) break;
+    ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, ffStrbufGetFree(buffer), 0);
+
+    if(received > 0)
+    {
        buffer->length += (uint32_t) received;
        buffer->chars[buffer->length] = '\0';
-    } while (ffStrbufGetFree(buffer) > 0 && strstr(buffer->chars + recvStart, "\r\n\r\n") == NULL);
+    }

    close(state->sockfd);
-    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n") ? NULL : "Invalid response";
+    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n");
 }
@@ -33,20 +33,21 @@ static const char* initWsaData(WSADATA* wsaData)
    return NULL;
 }

-const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers)
+bool ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* host, const char* path, const char* headers)
 {
    static WSADATA wsaData;
    if (wsaData.wVersion == 0)
    {
-        const char* error = initWsaData(&wsaData);
-        if (error != NULL)
+        if (initWsaData(&wsaData) != NULL)
        {
            wsaData.wVersion = (WORD) -1;
-            return error;
+            return false;
        }
    }
    else if (wsaData.wVersion == (WORD) -1)
-        return "initWsaData() failed before";
+        return false;
+
+    memset(state, 0, sizeof(*state));

    struct addrinfo* addr;

@@ -54,27 +55,26 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
        .ai_family = AF_INET,
        .ai_socktype = SOCK_STREAM,
    }, &addr) != 0)
-        return "getaddrinfo() failed";
+        return false;

    state->sockfd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
    if(state->sockfd == INVALID_SOCKET)
    {
        freeaddrinfo(addr);
-        return "socket() failed";
+        return false;
    }

    {
        //ConnectEx requires the socket to be initially bound
-        if(bind(state->sockfd, (SOCKADDR *) &(struct sockaddr_in) {
+        struct sockaddr_in addr = {
            .sin_family = AF_INET,
            .sin_addr.s_addr = INADDR_ANY,
            .sin_port = 0,
-        }, sizeof(struct sockaddr_in)) != 0)
+        };
+        if(bind(state->sockfd, (SOCKADDR *)&addr, sizeof(addr)) != 0)
        {
-            closesocket(state->sockfd);
-            freeaddrinfo(addr);
-            state->sockfd = INVALID_SOCKET;
-            return "bind() failed";
+            printf("bind %d\n", WSAGetLastError());
+            return false;
        }
    }

@@ -93,52 +93,35 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
    if(!result && WSAGetLastError() != WSA_IO_PENDING)
    {
        closesocket(state->sockfd);
-        freeaddrinfo(addr);
-        state->sockfd = INVALID_SOCKET;
-        return "ConnectEx() failed";
+        return false;
    }

-    return NULL;
+    return true;
 }

-const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer)
+bool ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buffer, uint32_t timeout)
 {
-    if (state->sockfd == INVALID_SOCKET)
-        return "ffNetworkingSendHttpRequest() failed";
-
-    uint32_t timeout = state->timeout;
-    if (timeout > 0)
-    {
-        if (WaitForSingleObject((HANDLE) state->sockfd, timeout) != WAIT_OBJECT_0)
-        {
-            CancelIo((HANDLE) state->sockfd);
-            closesocket(state->sockfd);
-            return "WaitForSingleObject(state->sockfd) failed or timeout";
-        }
-    }
-
    DWORD transfer, flags;
    if (!WSAGetOverlappedResult(state->sockfd, &state->overlapped, &transfer, TRUE, &flags))
    {
        closesocket(state->sockfd);
-        return "WSAGetOverlappedResult() failed";
+        return false;
    }

    if(timeout > 0)
    {
        //https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-setsockopt
-        setsockopt(state->sockfd, SOL_SOCKET, SO_RCVTIMEO, (const char*) &timeout, sizeof(timeout));
+        setsockopt(state->sockfd, SOL_SOCKET, SO_RCVTIMEO, (const char*)&timeout, sizeof(timeout));
    }

-    uint32_t recvStart;
-    do {
-        recvStart = buffer->length;
-        ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, (int) ffStrbufGetFree(buffer), 0);
-        if (received <= 0) break;
-        buffer->length = recvStart + (uint32_t) received;
+    ssize_t received = recv(state->sockfd, buffer->chars + buffer->length, (int)ffStrbufGetFree(buffer), 0);
+
+    if(received > 0)
+    {
+        buffer->length += (uint32_t) received;
        buffer->chars[buffer->length] = '\0';
-    } while (ffStrbufGetFree(buffer) > 0 && strstr(buffer->chars + recvStart, "\r\n\r\n") == NULL);
+    }

    closesocket(state->sockfd);
-    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n") ? NULL : "Invalid response";
+    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n");
 }
@@ -37,9 +37,9 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
    else
    {
        FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 1, ((FFformatarg[]){
+        ffParseFormatString(&key, &moduleArgs->key, 1, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex}
-        }));
+        });
        ffStrbufWriteTo(&key, stdout);
    }

@@ -60,7 +60,7 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
    }
 }

-void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments)
+void ffPrintFormatString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments)
 {
    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
    if (moduleArgs)
@@ -93,7 +93,7 @@ static void printError(const char* moduleName, uint8_t moduleIndex, const FFModu
    putchar('\n');
 }

-void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...)
+void ffPrintErrorString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...)
 {
    va_list arguments;
    va_start(arguments, message);
@@ -101,6 +101,14 @@ void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArg
    va_end(arguments);
 }

+void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...)
+{
+    va_list arguments;
+    va_start(arguments, message);
+    printError(moduleName, moduleIndex, moduleArgs, FF_PRINT_TYPE_DEFAULT, message, arguments);
+    va_end(arguments);
+}
+
 void ffPrintColor(const FFstrbuf* colorValue)
 {
    //If the color is not set, this would reset in \033[m, which resets everything.
@@ -12,17 +12,14 @@ typedef enum FFPrintType {
 } FFPrintType;

 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType);
-void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments);
-#define FF_PRINT_FORMAT_CHECKED(moduleName, moduleIndex, moduleArgs, printType, numArgs, arguments) do {\
-    static_assert(sizeof(arguments) / sizeof(*(arguments)) == (numArgs), "Invalid number of format arguments");\
-    ffPrintFormat((moduleName), (moduleIndex), (moduleArgs), (printType), (numArgs), (arguments));\
-} while (0)
-FF_C_PRINTF(5, 6) void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...);
+void ffPrintFormatString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments);
+static inline void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, uint32_t numArgs, const FFformatarg* arguments)
+{
+    ffPrintFormatString(moduleName, moduleIndex, moduleArgs, FF_PRINT_TYPE_DEFAULT, numArgs, arguments);
+}
+FF_C_PRINTF(5, 6) void ffPrintErrorString(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...);
+FF_C_PRINTF(4, 5) void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, const char* message, ...);
 void ffPrintColor(const FFstrbuf* colorValue);
 void ffPrintCharTimes(char c, uint32_t times);

 void ffPrintModuleFormatHelp(const char* name, const char* def, uint32_t numArgs, const char* args[]);
-#define FF_PRINT_MODULE_FORMAT_HELP_CHECKED(moduleName, def, numArgs, args) do {\
-    static_assert(sizeof(args) / sizeof(*(args)) == (numArgs), "Invalid number of format arguments");\
-    ffPrintModuleFormatHelp((moduleName), (def), (numArgs), (args));\
-} while (0)
@@ -1261,15 +1261,6 @@
                "default": false
            }
        },
-        {
-            "long": "localip-show-prefix-len",
-            "desc": "Show network prefix length (/N) in local ip module",
-            "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": true
-            }
-        },
        {
            "long": "localip-name-prefix",
            "desc": "Show interfaces with given interface name prefix only",
@@ -13,12 +13,10 @@ typedef struct FFCPUResult
    uint16_t coresLogical;
    uint16_t coresOnline;

-    double frequencyBase; // GHz
-    double frequencyMax; // GHz
    double frequencyMin; // GHz
+    double frequencyMax; // GHz

    double temperature;
 } FFCPUResult;

-const char* ffCPUDetectByCpuid(FFCPUResult* cpu);
 const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu);
@@ -60,13 +60,14 @@ static const char* detectFrequency(FFCPUResult* cpu)
        ffCfDictGetData(properties, CFSTR("voltage-states5-sram"), pCoreLength - 8, 4, (uint8_t*) &aMax, NULL);
        cpu->frequencyMax = aMax / (1000.0 * 1000 * 1000);
    }
+    else
+        cpu->frequencyMax = 0.0;

    return NULL;
 }
 #else
 static const char* detectFrequency(FFCPUResult* cpu)
 {
-    cpu->frequencyBase = ffSysctlGetInt64("hw.cpufrequency", 0) / 1000.0 / 1000.0 / 1000.0;
    cpu->frequencyMin = ffSysctlGetInt64("hw.cpufrequency_min", 0) / 1000.0 / 1000.0 / 1000.0;
    cpu->frequencyMax = ffSysctlGetInt64("hw.cpufrequency_max", 0);
    if(cpu->frequencyMax > 0.0)
@@ -11,8 +11,8 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
    cpu->coresLogical = cpu->coresPhysical;
    cpu->coresOnline = cpu->coresPhysical;

-    int clockRate = ffSysctlGetInt("hw.clockrate", 0);
-    cpu->frequencyBase = clockRate <= 0 ? 0.0/0.0 : clockRate / 1000.0;
+    cpu->frequencyMin = ffSysctlGetInt("hw.clockrate", 0) / 1000.0;
+    cpu->frequencyMax = cpu->frequencyMin;
    cpu->temperature = FF_CPU_TEMP_UNSET;

    if (options->temp)
@@ -17,10 +17,7 @@
 static void detectAndroid(FFCPUResult* cpu)
 {
    if (cpu->name.length == 0)
-    {
        ffSettingsGetAndroidProperty("ro.soc.model", &cpu->name);
-        ffStrbufClear(&cpu->vendor); // We usually detect the vendor of CPU core as ARM, but instead we want the vendor of SOC
-    }
    if (cpu->vendor.length == 0)
    {
        if (!ffSettingsGetAndroidProperty("ro.soc.manufacturer", &cpu->vendor))
@@ -97,14 +94,11 @@ static double getFrequency(FFstrbuf* basePath, const char* cpuinfoFileName, cons
    if (ok)
        return ffStrbufToDouble(buffer) / 1e6;

-    if (scalingFileName)
-    {
-        ffStrbufAppendS(basePath, scalingFileName);
-        ok = ffReadFileBuffer(basePath->chars, buffer);
-        ffStrbufSubstrBefore(basePath, baseLen);
-        if (ok)
-            return ffStrbufToDouble(buffer) / 1e6;
-    }
+    ffStrbufAppendS(basePath, scalingFileName);
+    ok = ffReadFileBuffer(basePath->chars, buffer);
+    ffStrbufSubstrBefore(basePath, baseLen);
+    if (ok)
+        return ffStrbufToDouble(buffer) / 1e6;

    return 0.0/0.0;
 }
@@ -113,10 +107,9 @@ static bool detectFrequency(FFCPUResult* cpu)
 {
    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateS("/sys/devices/system/cpu/cpufreq/");
    FF_AUTO_CLOSE_DIR DIR* dir = opendir(path.chars);
-    if (!dir) return false;
-
    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
    uint32_t baseLen = path.length;
+    bool flag = false;

    struct dirent* entry;
    while((entry = readdir(dir)) != NULL)
@@ -124,34 +117,26 @@ static bool detectFrequency(FFCPUResult* cpu)
        if (ffStrStartsWith(entry->d_name, "policy") && isdigit(entry->d_name[strlen("policy")]))
        {
            ffStrbufAppendS(&path, entry->d_name);
-            double fbase = getFrequency(&path, "/base_frequency", NULL, &buffer);
-            if (fbase == fbase)
-            {
-                if (cpu->frequencyBase == cpu->frequencyBase)
-                    cpu->frequencyBase = cpu->frequencyBase > fbase ? cpu->frequencyBase : fbase;
-                else
-                    cpu->frequencyBase = fbase;
-            }
-            double fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
-            if (fmax == fmax)
-            {
-                if (cpu->frequencyMax == cpu->frequencyMax)
-                    cpu->frequencyMax = cpu->frequencyMax > fmax ? cpu->frequencyMax : fmax;
-                else
-                    cpu->frequencyMax = fmax;
-            }
            double fmin = getFrequency(&path, "/cpuinfo_min_freq", "/scaling_min_freq", &buffer);
-            if (fmin == fmin)
+            if (fmin != fmin) continue;
+            double fmax = getFrequency(&path, "/cpuinfo_max_freq", "/scaling_max_freq", &buffer);
+            if (fmax != fmax) continue;
+
+            if (flag)
            {
-                if (cpu->frequencyMin == cpu->frequencyMin)
-                    cpu->frequencyMin = cpu->frequencyMin < fmin ? cpu->frequencyMin : fmin;
-                else
-                    cpu->frequencyMin = fmin;
+                cpu->frequencyMin = cpu->frequencyMin < fmin ? cpu->frequencyMin : fmin;
+                cpu->frequencyMax = cpu->frequencyMax > fmax ? cpu->frequencyMax : fmax;
+            }
+            else
+            {
+                cpu->frequencyMin = fmin;
+                cpu->frequencyMax = fmax;
+                flag = true;
            }
            ffStrbufSubstrBefore(&path, baseLen);
        }
    }
-    return true;
+    return flag;
 }

 static double detectCPUTemp(void)
@@ -247,8 +232,8 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
    cpu->coresOnline = (uint16_t) get_nprocs();
    cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, cpu->coresLogical);

-    if (!detectFrequency(cpu) || cpu->frequencyBase != cpu->frequencyBase)
-        cpu->frequencyBase = ffStrbufToDouble(&cpuMHz) / 1000;
+    if (!detectFrequency(cpu))
+        cpu->frequencyMin = cpu->frequencyMax = ffStrbufToDouble(&cpuMHz) / 1000;

    if(cpuUarch.length > 0)
    {
@@ -64,53 +64,50 @@ static const char* detectMaxSpeedBySmbios(FFCPUResult* cpu)
            return "No active CPU is found in SMBIOS data";
    }

+    double speed;
    if (data->MaxSpeed > 0 && data->MaxSpeed < 30000) // VMware reports weird values
-    {
-        double speed = data->MaxSpeed / 1000.0;
-        if (cpu->frequencyBase < speed)
-            cpu->frequencyMax = speed;
-    }
+        speed = data->MaxSpeed / 1000.0;
+    else
+        speed = data->CurrentSpeed / 1000.0;

+    if (cpu->frequencyMax < speed)
+        cpu->frequencyMax = speed;

    return NULL;
 }

-static const char* detectNCores(FFCPUResult* cpu)
+static const char* detectByOS(FFCPUResult* cpu)
 {
-    DWORD length = 0;
-    GetLogicalProcessorInformationEx(RelationAll, NULL, &length);
-    if (length == 0)
-        return "GetLogicalProcessorInformationEx(RelationAll, NULL, &length) failed";
-
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* FF_AUTO_FREE
-        pProcessorInfo = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)malloc(length);
-
-    if (!pProcessorInfo || !GetLogicalProcessorInformationEx(RelationAll, pProcessorInfo, &length))
-        return "GetLogicalProcessorInformationEx(RelationAll, pProcessorInfo, &length) failed";
-
-    for(
-        SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* ptr = pProcessorInfo;
-        (uint8_t*)ptr < ((uint8_t*)pProcessorInfo) + length;
-        ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
-    )
    {
-        if(ptr->Relationship == RelationProcessorCore)
-            ++cpu->coresPhysical;
-        else if(ptr->Relationship == RelationGroup)
+        DWORD length = 0;
+        GetLogicalProcessorInformationEx(RelationAll, NULL, &length);
+        if (length == 0)
+            return "GetLogicalProcessorInformationEx(RelationAll, NULL, &length) failed";
+
+        SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* FF_AUTO_FREE
+            pProcessorInfo = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)malloc(length);
+
+        if (pProcessorInfo && GetLogicalProcessorInformationEx(RelationAll, pProcessorInfo, &length))
        {
-            for (uint32_t index = 0; index < ptr->Group.ActiveGroupCount; ++index)
+            for(
+                SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* ptr = pProcessorInfo;
+                (uint8_t*)ptr < ((uint8_t*)pProcessorInfo) + length;
+                ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
+            )
            {
-                cpu->coresOnline += ptr->Group.GroupInfo[index].ActiveProcessorCount;
-                cpu->coresLogical += ptr->Group.GroupInfo[index].MaximumProcessorCount;
+                if(ptr->Relationship == RelationProcessorCore)
+                    ++cpu->coresPhysical;
+                else if(ptr->Relationship == RelationGroup)
+                {
+                    cpu->coresOnline += ptr->Group.GroupInfo->ActiveProcessorCount;
+                    cpu->coresLogical += ptr->Group.GroupInfo->MaximumProcessorCount;
+                }
            }
        }
+        else
+            return "GetLogicalProcessorInformationEx(RelationAll, pProcessorInfo, &length) failed";
    }

-    return NULL;
-}
-
-static const char* detectByRegistry(FFCPUResult* cpu)
-{
    FF_HKEY_AUTO_DESTROY hKey = NULL;
    if(!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0", &hKey, NULL))
        return "ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L\"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0\", &hKey, NULL) failed";
@@ -118,34 +115,24 @@ static const char* detectByRegistry(FFCPUResult* cpu)
    {
        uint32_t mhz;
        if(ffRegReadUint(hKey, L"~MHz", &mhz, NULL))
-            cpu->frequencyBase = mhz / 1000.0;
+            cpu->frequencyMin = cpu->frequencyMax = mhz / 1000.0;
    }

    ffRegReadStrbuf(hKey, L"ProcessorNameString", &cpu->name, NULL);
    ffRegReadStrbuf(hKey, L"VendorIdentifier", &cpu->vendor, NULL);

-    if (cpu->coresLogical == 0)
-    {
-        DWORD cores;
-        if (RegQueryInfoKeyW(HKEY_LOCAL_MACHINE, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor", NULL, NULL, &cores, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS)
-            cpu->coresOnline = cpu->coresPhysical = cpu->coresLogical = (uint16_t) cores;
-    }
-
    return NULL;
 }

 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
-    detectNCores(cpu);
-
-    const char* error = detectByRegistry(cpu);
+    const char* error = detectByOS(cpu);
    if (error)
        return error;

-    detectMaxSpeedBySmbios(cpu);
-
    if(options->temp)
        ffDetectSmbiosTemp(&cpu->temperature, NULL);

+    detectMaxSpeedBySmbios(cpu);
    return NULL;
 }
@@ -15,7 +15,7 @@ const char* ffDetectDisksImpl(FFlist* disks)

    for(uint32_t i = 0; i < length; i++)
    {
-        wchar_t* mountpoint = buf + i;
+        const wchar_t* mountpoint = buf + i;

        UINT driveType = GetDriveTypeW(mountpoint);
        if(driveType == DRIVE_NO_ROOT_DIR)
@@ -25,6 +25,13 @@ const char* ffDetectDisksImpl(FFlist* disks)
        }

        FFDisk* disk = ffListAdd(disks);
+        ffStrbufInitWS(&disk->mountpoint, mountpoint);
+
+        wchar_t volumeName[64];
+        if(GetVolumeNameForVolumeMountPointW(mountpoint, volumeName, sizeof(volumeName) / sizeof(*volumeName)))
+            ffStrbufInitWS(&disk->mountFrom, volumeName);
+        else
+            ffStrbufInit(&disk->mountFrom);

        if(!GetDiskFreeSpaceExW(
            mountpoint,
@@ -71,17 +78,6 @@ const char* ffDetectDisksImpl(FFlist* disks)
                disk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
        }

-        ffStrbufInitWS(&disk->mountpoint, mountpoint);
-        if (mountpoint[2] == L'\\' && mountpoint[3] == L'\0')
-        {
-            wchar_t volumeName[MAX_PATH + 1];
-            mountpoint[2] = L'\0';
-            if(QueryDosDeviceW(mountpoint, volumeName, sizeof(volumeName) / sizeof(*volumeName)))
-                ffStrbufInitWS(&disk->mountFrom, volumeName);
-            else
-                ffStrbufInit(&disk->mountFrom);
-        }
-
        //Unsupported
        disk->filesUsed = 0;
        disk->filesTotal = 0;
@@ -143,7 +143,7 @@ static inline const char* drmType2Name(uint32_t connector_type)
        return "DPI";
    case DRM_MODE_CONNECTOR_WRITEBACK:
        return "Writeback";
-    case 19 /*DRM_MODE_CONNECTOR_SPI*/:
+    case DRM_MODE_CONNECTOR_SPI:
        return "SPI";
    case 20 /*DRM_MODE_CONNECTOR_USB*/:
        return "USB";
@@ -250,8 +250,8 @@ static const char* drmConnectLibdrm(FFDisplayServerResult* result)
                    drmModeCrtc* crtc = ffdrmModeGetCrtc(fd, encoder->crtc_id);
                    if (crtc)
                    {
-                        width = crtc->mode.hdisplay;
-                        height = crtc->mode.vdisplay;
+                        width = crtc->mode.vdisplay;
+                        height = crtc->mode.hdisplay;
                        refreshRate = crtc->mode.vrefresh;
                        if (refreshRate == 0)
                        {
@@ -63,6 +63,10 @@ const char* ffDetectGPUImpl(const FFGPUOptions* options, FFlist* gpus)
        ffStrbufInit(&gpu->driver); // Ok for both Apple and Intel
        ffCfDictGetString(properties, CFSTR("CFBundleIdentifier"), &gpu->driver);

+        int vram; // Supported on Intel
+        if(!ffCfDictGetInt(properties, CFSTR("VRAM,totalMB"), &vram))
+            gpu->dedicated.total = (uint64_t) vram * 1024 * 1024;
+
        if(ffCfDictGetInt(properties, CFSTR("gpu-core-count"), &gpu->coreCount)) // For Apple
            gpu->coreCount = FF_GPU_CORE_COUNT_UNSET;

@@ -111,8 +111,6 @@ static const char* getProductNameWithHwModel(const FFstrbuf* hwModel)
    else if(ffStrbufStartsWithS(hwModel, "Mac"))
    {
        const char* version = hwModel->chars + strlen("Mac");
-        if(ffStrEquals(version, "15,13"))       return "MacBook Air (15-inch, M3, 2024)";
-        if(ffStrEquals(version, "15,2"))        return "MacBook Air (13-inch, M3, 2024)";
        if(ffStrEquals(version, "15,3"))        return "MacBook Pro (14-inch, Nov 2023, Two Thunderbolt / USB 4 ports)";
        if(ffStrEquals(version, "15,4"))        return "iMac (24-inch, 2023, Two Thunderbolt / USB 4 ports)";
        if(ffStrEquals(version, "15,5"))        return "iMac (24-inch, 2023, Two Thunderbolt / USB 4 ports, Two USB 3 ports)";
@@ -7,6 +7,8 @@ typedef struct FFLocalIpResult
    FFstrbuf name;
    FFstrbuf ipv4;
    FFstrbuf ipv6;
+    FFstrbuf gateway4;
+    FFstrbuf gateway6;
    FFstrbuf mac;
    bool defaultRoute;
 } FFLocalIpResult;
@@ -40,12 +40,10 @@ static void addNewIp(FFlist* list, const char* name, const char* addr, int type,
    switch (type)
    {
        case AF_INET:
-            if (ip->ipv4.length) ffStrbufAppendC(&ip->ipv4, ',');
-            ffStrbufAppendS(&ip->ipv4, addr);
+            ffStrbufSetS(&ip->ipv4, addr);
            break;
        case AF_INET6:
-            if (ip->ipv6.length) ffStrbufAppendC(&ip->ipv6, ',');
-            ffStrbufAppendS(&ip->ipv6, addr);
+            ffStrbufSetS(&ip->ipv6, addr);
            break;
        case -1:
            ffStrbufSetS(&ip->mac, addr);
@@ -85,15 +83,12 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
            char addressBuffer[INET_ADDRSTRLEN + 4];
            inet_ntop(AF_INET, &ipv4->sin_addr, addressBuffer, INET_ADDRSTRLEN);

-            if (options->showType & FF_LOCALIP_TYPE_PREFIX_LEN_BIT)
+            struct sockaddr_in* netmask = (struct sockaddr_in*) ifa->ifa_netmask;
+            int cidr = __builtin_popcount(inet_netof(netmask->sin_addr));
+            if (cidr != 0)
            {
-                struct sockaddr_in* netmask = (struct sockaddr_in*) ifa->ifa_netmask;
-                int cidr = __builtin_popcount(netmask->sin_addr.s_addr);
-                if (cidr != 0)
-                {
-                    size_t len = strlen(addressBuffer);
-                    snprintf(addressBuffer + len, 4, "/%d", cidr);
-                }
+                size_t len = strlen(addressBuffer);
+                snprintf(addressBuffer + len, 4, "/%d", cidr);
            }

            addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET, isDefaultRoute);
@@ -104,23 +99,8 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
                continue;

            struct sockaddr_in6* ipv6 = (struct sockaddr_in6 *)ifa->ifa_addr;
-            char addressBuffer[INET6_ADDRSTRLEN + 4];
+            char addressBuffer[INET6_ADDRSTRLEN];
            inet_ntop(AF_INET6, &ipv6->sin6_addr, addressBuffer, INET6_ADDRSTRLEN);
-
-            if (options->showType & FF_LOCALIP_TYPE_PREFIX_LEN_BIT)
-            {
-                struct sockaddr_in6* netmask = (struct sockaddr_in6*) ifa->ifa_netmask;
-                int cidr = 0;
-                static_assert(sizeof(netmask->sin6_addr) % sizeof(uint64_t) == 0, "");
-                for (uint32_t i = 0; i < sizeof(netmask->sin6_addr) / sizeof(uint64_t); ++i)
-                    cidr += __builtin_popcountll(((uint64_t*) &netmask->sin6_addr)[i]);
-                if (cidr != 0)
-                {
-                    size_t len = strlen(addressBuffer);
-                    snprintf(addressBuffer + len, 4, "/%d", cidr);
-                }
-            }
-
            addNewIp(results, ifa->ifa_name, addressBuffer, AF_INET6, isDefaultRoute);
        }
        #if defined(__FreeBSD__) || defined(__APPLE__)
@@ -6,7 +6,7 @@
 #include "util/windows/unicode.h"
 #include "localip.h"

-static void addNewIp(FFlist* list, const char* name, const char* addr, int type, bool newIp, bool defaultRoute)
+static void addNewIp(FFlist* list, const char* name, const char* value, int type, bool newIp, bool gateway, bool defaultRoute)
 {
    FFLocalIpResult* ip = NULL;

@@ -17,6 +17,8 @@ static void addNewIp(FFlist* list, const char* name, const char* addr, int type,
        ffStrbufInit(&ip->ipv4);
        ffStrbufInit(&ip->ipv6);
        ffStrbufInit(&ip->mac);
+        ffStrbufInit(&ip->gateway4);
+        ffStrbufInit(&ip->gateway6);
        ip->defaultRoute = defaultRoute;
    }
    else
@@ -27,15 +29,13 @@ static void addNewIp(FFlist* list, const char* name, const char* addr, int type,
    switch (type)
    {
        case AF_INET:
-            if (ip->ipv4.length) ffStrbufAppendC(&ip->ipv4, ',');
-            ffStrbufAppendS(&ip->ipv4, addr);
+            ffStrbufSetS(gateway ? &ip->gateway4 : &ip->ipv4, value);
            break;
        case AF_INET6:
-            if (ip->ipv6.length) ffStrbufAppendC(&ip->ipv6, ',');
-            ffStrbufAppendS(&ip->ipv6, addr);
+            ffStrbufSetS(gateway ? &ip->gateway6 : &ip->ipv6, value);
            break;
        case -1:
-            ffStrbufSetS(&ip->mac, addr);
+            ffStrbufSetS(&ip->mac, value);
            break;
    }
 }
@@ -59,7 +59,7 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
            options->showType & FF_LOCALIP_TYPE_IPV4_BIT
                ? options->showType & FF_LOCALIP_TYPE_IPV6_BIT ? AF_UNSPEC : AF_INET
                : AF_INET6,
-            GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER,
+            GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER | (options->showType & FF_LOCALIP_TYPE_GATEWAY_BIT ? GAA_FLAG_INCLUDE_GATEWAYS : 0),
            NULL,
            adapter_addresses,
            &adapter_addresses_buffer_size);
@@ -98,10 +98,30 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
            uint8_t* ptr = adapter->PhysicalAddress;
            snprintf(addressBuffer, sizeof(addressBuffer), "%02x:%02x:%02x:%02x:%02x:%02x",
                        ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5]);
-            addNewIp(results, name, addressBuffer, -1, newIp, isDefaultRoute);
+            addNewIp(results, name, addressBuffer, -1, newIp, false, isDefaultRoute);
            newIp = false;
        }

+        for (IP_ADAPTER_GATEWAY_ADDRESS_LH* ifa = adapter->FirstGatewayAddress; ifa; ifa = ifa->Next)
+        {
+            if (ifa->Address.lpSockaddr->sa_family == AF_INET)
+            {
+                SOCKADDR_IN* ipv4 = (SOCKADDR_IN*) ifa->Address.lpSockaddr;
+                char addressBuffer[INET_ADDRSTRLEN + 4];
+                inet_ntop(AF_INET, &ipv4->sin_addr, addressBuffer, INET_ADDRSTRLEN);
+                addNewIp(results, name, addressBuffer, AF_INET, newIp, true, isDefaultRoute);
+                newIp = false;
+            }
+            else if (ifa->Address.lpSockaddr->sa_family == AF_INET6)
+            {
+                SOCKADDR_IN6* ipv6 = (SOCKADDR_IN6*) ifa->Address.lpSockaddr;
+                char addressBuffer[INET6_ADDRSTRLEN];
+                inet_ntop(AF_INET6, &ipv6->sin6_addr, addressBuffer, INET6_ADDRSTRLEN);
+                addNewIp(results, name, addressBuffer, AF_INET6, newIp, true, isDefaultRoute);
+                newIp = false;
+            }
+        }
+
        for (IP_ADAPTER_UNICAST_ADDRESS* ifa = adapter->FirstUnicastAddress; ifa; ifa = ifa->Next)
        {
            if (ifa->Address.lpSockaddr->sa_family == AF_INET)
@@ -110,28 +130,21 @@ const char* ffDetectLocalIps(const FFLocalIpOptions* options, FFlist* results)
                char addressBuffer[INET_ADDRSTRLEN + 4];
                inet_ntop(AF_INET, &ipv4->sin_addr, addressBuffer, INET_ADDRSTRLEN);

-                if ((options->showType & FF_LOCALIP_TYPE_PREFIX_LEN_BIT) && ifa->OnLinkPrefixLength)
+                if (ifa->OnLinkPrefixLength)
                {
                    size_t len = strlen(addressBuffer);
                    snprintf(addressBuffer + len, 4, "/%u", (unsigned) ifa->OnLinkPrefixLength);
                }

-                addNewIp(results, name, addressBuffer, AF_INET, newIp, isDefaultRoute);
+                addNewIp(results, name, addressBuffer, AF_INET, newIp, false, isDefaultRoute);
                newIp = false;
            }
            else if (ifa->Address.lpSockaddr->sa_family == AF_INET6)
            {
                SOCKADDR_IN6* ipv6 = (SOCKADDR_IN6*) ifa->Address.lpSockaddr;
-                char addressBuffer[INET6_ADDRSTRLEN + 4];
+                char addressBuffer[INET6_ADDRSTRLEN];
                inet_ntop(AF_INET6, &ipv6->sin6_addr, addressBuffer, INET6_ADDRSTRLEN);
-
-                if ((options->showType & FF_LOCALIP_TYPE_PREFIX_LEN_BIT) && ifa->OnLinkPrefixLength)
-                {
-                    size_t len = strlen(addressBuffer);
-                    snprintf(addressBuffer + len, 4, "/%u", (unsigned) ifa->OnLinkPrefixLength);
-                }
-
-                addNewIp(results, name, addressBuffer, AF_INET6, newIp, isDefaultRoute);
+                addNewIp(results, name, addressBuffer, AF_INET6, newIp, false, isDefaultRoute);
                newIp = false;
            }
        }
@@ -4,7 +4,6 @@

 typedef struct FFPackagesResult
 {
-    uint32_t am;
    uint32_t apk;
    uint32_t brew;
    uint32_t brewCask;
@@ -253,43 +253,6 @@ static uint32_t getRpmFromLibrpm(void)

 #endif //FF_HAVE_RPM

-static uint32_t getAM(FFstrbuf* baseDir)
-{
-    // #771
-    uint32_t baseDirLength = baseDir->length;
-
-    ffStrbufAppendS(baseDir, "/opt");
-    uint32_t optDirLength = baseDir->length;
-
-    uint32_t result = 0;
-
-    ffStrbufAppendS(baseDir, "/am/APP-MANAGER");
-    if (ffPathExists(baseDir->chars, FF_PATHTYPE_FILE))
-    {
-        ++result; // `am` itself is counted as a package too
-        ffStrbufSubstrBefore(baseDir, optDirLength);
-        FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir->chars);
-        if(dirp)
-        {
-            struct dirent *entry;
-            while ((entry = readdir(dirp)) != NULL)
-            {
-                if (entry->d_name[0] == '.') continue;
-                if (entry->d_type == DT_DIR)
-                {
-                    ffStrbufAppendF(baseDir, "/%s/AM-updater", entry->d_name);
-                    if (ffPathExists(baseDir->chars, FF_PATHTYPE_FILE))
-                        ++result;
-                    ffStrbufSubstrBefore(baseDir, optDirLength);
-                }
-            }
-        }
-    }
-
-    ffStrbufSubstrBefore(baseDir, baseDirLength);
-    return result;
-}
-
 static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options)
 {
    if (!(options->disabled & FF_PACKAGES_FLAG_APK_BIT)) packageCounts->apk += getNumStrings(baseDir, "/lib/apk/db/installed", "C:Q");
@@ -314,7 +277,6 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
    }
    if (!(options->disabled & FF_PACKAGES_FLAG_PALUDIS_BIT)) packageCounts->paludis += countFilesRecursive(baseDir, "/var/db/paludis/repositories", "environment.bz2");
    if (!(options->disabled & FF_PACKAGES_FLAG_OPKG_BIT)) packageCounts->opkg += getNumStrings(baseDir, "/usr/lib/opkg/status", "Package:"); // openwrt
-    if (!(options->disabled & FF_PACKAGES_FLAG_AM_BIT)) packageCounts->am = getAM(baseDir);
 }

 static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options)
@@ -1,35 +1,23 @@
 #include "publicip.h"
 #include "common/networking.h"

-#define FF_UNITIALIZED ((const char*)(uintptr_t) -1)
 static FFNetworkingState state;
-static const char* status = FF_UNITIALIZED;
+static int status = -1;

 void ffPreparePublicIp(FFPublicIpOptions* options)
 {
-    if (status != FF_UNITIALIZED)
+    if (status != -1)
    {
        fputs("Error: this module can only be used once due to internal limitations\n", stderr);
        exit(1);
    }

-    state.timeout = options->timeout;
-
    if (options->url.length == 0)
        status = ffNetworkingSendHttpRequest(&state, "ipinfo.io", "/json", NULL);
    else
    {
        FF_STRBUF_AUTO_DESTROY host = ffStrbufCreateCopy(&options->url);
-        uint32_t hostStartIndex = ffStrbufFirstIndexS(&host, "://");
-        if (hostStartIndex < host.length)
-        {
-            if (hostStartIndex != 4 || !ffStrbufStartsWithIgnCaseS(&host, "http"))
-            {
-                fputs("Error: only http: protocol is supported. Use `Command` module with `curl` if needed\n", stderr);
-                exit(1);
-            }
-            ffStrbufSubstrAfter(&host, hostStartIndex + (strlen("://") - 1));
-        }
+        ffStrbufSubstrAfterFirstS(&host, "://");
        uint32_t pathStartIndex = ffStrbufFirstIndexC(&host, '/');

        FF_STRBUF_AUTO_DESTROY path = ffStrbufCreate();
@@ -53,21 +41,18 @@ static inline void wrapYyjsonFree(yyjson_doc** doc)

 const char* ffDetectPublicIp(FFPublicIpOptions* options, FFPublicIpResult* result)
 {
-    if (status == FF_UNITIALIZED)
+    if (status == -1)
        ffPreparePublicIp(options);

-    if (status != NULL)
-        return status;
+    if (status == 0)
+        return "Failed to connect to an IP detection server";

    FF_STRBUF_AUTO_DESTROY response = ffStrbufCreateA(4096);
-    const char* error = ffNetworkingRecvHttpResponse(&state, &response);
-    if (error == NULL)
-        ffStrbufSubstrAfterFirstS(&response, "\r\n\r\n");
-    else
-        return error;
+    bool success = ffNetworkingRecvHttpResponse(&state, &response, options->timeout);
+    if (success) ffStrbufSubstrAfterFirstS(&response, "\r\n\r\n");

-    if (response.length == 0)
-        return "Empty server response received";
+    if (!success || response.length == 0)
+        return "Failed to receive the server response";

    if (options->url.length == 0)
    {
@@ -84,6 +69,5 @@ const char* ffDetectPublicIp(FFPublicIpOptions* options, FFPublicIpResult* resul

    ffStrbufDestroy(&result->ip);
    ffStrbufInitMove(&result->ip, &response);
-    ffStrbufTrimRightSpace(&result->ip);
    return NULL;
 }
@@ -145,7 +145,13 @@ static void detectXFCETerminal(FFTerminalFontResult* terminalFont)
        });
    }

-    if(configFound && (useSysFont.length == 0 || ffStrbufIgnCaseCompS(&useSysFont, "false") == 0))
+    if (!configFound)
+    {
+        ffStrbufSetStatic(&terminalFont->error, "Couldn't find xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml or xfce4/terminal/terminalrc");
+        return;
+    }
+
+    if(useSysFont.length == 0 || ffStrbufIgnCaseCompS(&useSysFont, "false") == 0)
    {
        if(fontName.length == 0)
            ffStrbufAppendF(&terminalFont->error, "Couldn't find FontName in %s", path);
@@ -400,29 +400,6 @@ FF_MAYBE_UNUSED static bool getTerminalVersionSt(FF_MAYBE_UNUSED FFstrbuf* exe,
    return version->length > 0;
 }

-FF_MAYBE_UNUSED static bool getTerminalVersionLxterminal(FFstrbuf* exe, FFstrbuf* version)
-{
-    if(!getExeVersionRaw(exe, version)) return false;
-    // lxterminal 0.3.2
-    ffStrbufSubstrAfterFirstC(version, ' ');
-    return version->length > 0;
-}
-
-FF_MAYBE_UNUSED static bool getTerminalVersionWeston(FF_MAYBE_UNUSED FFstrbuf* exe, FFstrbuf* version)
-{
-    // weston-terminal doesn't report a version, use weston version instead
-    if(ffProcessAppendStdOut(version, (char* const[]){
-        "weston",
-        "--version",
-        NULL
-    })) return false;
-
-    //weston 8.0.0
-    ffStrbufSubstrAfterFirstC(version, ' ');
-
-    return version->length > 0;
-}
-
 static bool getTerminalVersionContour(FFstrbuf* exe, FFstrbuf* version)
 {
    const char* env = getenv("TERMINAL_VERSION_STRING");
@@ -433,7 +410,7 @@ static bool getTerminalVersionContour(FFstrbuf* exe, FFstrbuf* version)
    }
    if(!getExeVersionRaw(exe, version)) return false;
    // Contour Terminal Emulator 0.3.12.262
-    ffStrbufSubstrAfterLastC(version, ' ');
+    ffStrbufSubstrAfterFirstC(version, ' ');
    return version->length > 0;
 }

@@ -548,12 +525,6 @@ bool fftsGetTerminalVersion(FFstrbuf* processName, FF_MAYBE_UNUSED FFstrbuf* exe
    if(ffStrbufIgnCaseEqualS(processName, "st"))
        return getTerminalVersionSt(exe, version);

-    if(ffStrbufIgnCaseEqualS(processName, "lxterminal"))
-        return getTerminalVersionLxterminal(exe, version);
-
-    if(ffStrbufIgnCaseEqualS(processName, "weston-terminal"))
-        return getTerminalVersionWeston(exe, version);
-
    if(ffStrbufIgnCaseEqualS(processName, "urxvt") ||
        ffStrbufIgnCaseEqualS(processName, "urxvtd") ||
        ffStrbufIgnCaseEqualS(processName, "rxvt") ||
@@ -280,7 +280,6 @@ static pid_t getTerminalInfo(FFTerminalResult* result, pid_t pid)
            ffStrEquals(name, "xonsh")      || // works in Linux but not in macOS because kernel returns `Python` in this case
            ffStrEquals(name, "login")      ||
            ffStrEquals(name, "sshd")       ||
-            ffStrEquals(name, "chezmoi")    || // #762
            #ifdef __linux__
            ffStrStartsWith(name, "flatpak-") || // #707
            #endif
@@ -342,7 +341,6 @@ static void getTerminalFromEnv(FFTerminalResult* result)
        !ffStrbufEqualS(&result->processName, "systemd") &&
        !ffStrbufEqualS(&result->processName, "init") &&
        !ffStrbufEqualS(&result->processName, "(init)") &&
-        !ffStrbufEqualS(&result->processName, "SessionLeader") && // #750
        #endif

        !ffStrbufEqualS(&result->processName, "0")
@@ -143,7 +143,7 @@ static void setShellInfoDetails(FFShellResult* result)
        ffStrbufSetS(&result->prettyName, "Windows PowerShell ISE");
    else if(ffStrbufIgnCaseEqualS(&result->prettyName, "cmd"))
    {
-        ffStrbufSetS(&result->prettyName, "CMD");
+        ffStrbufClear(&result->prettyName);

        FF_AUTO_CLOSE_FD HANDLE snapshot = NULL;
        while(!(snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, result->pid)) && GetLastError() == ERROR_BAD_LENGTH) {}
@@ -156,13 +156,15 @@ static void setShellInfoDetails(FFShellResult* result)
            {
                if(wcsncmp(module.szModule, L"clink_dll_", strlen("clink_dll_")) == 0)
                {
-                    ffStrbufAppendS(&result->prettyName, " (with Clink ");
+                    ffStrbufAppendS(&result->prettyName, "CMD (with Clink ");
                    getProductVersion(module.szExePath, &result->prettyName);
                    ffStrbufAppendC(&result->prettyName, ')');
                    break;
                }
            }
        }
+        if(result->prettyName.length == 0)
+            ffStrbufAppendS(&result->prettyName, "Command Prompt");
    }
    else if(ffStrbufIgnCaseEqualS(&result->prettyName, "nu"))
        ffStrbufSetS(&result->prettyName, "nushell");
@@ -311,8 +313,7 @@ static uint32_t getTerminalInfo(FFTerminalResult* result, uint32_t pid)
            ffStrbufSubstrBefore(&result->prettyName, result->prettyName.length - 4);

        if(ffStrbufIgnCaseEqualS(&result->prettyName, "sihost")           ||
-            ffStrbufIgnCaseEqualS(&result->prettyName, "explorer")        ||
-            ffStrbufIgnCaseEqualS(&result->prettyName, "wininit")
+            ffStrbufIgnCaseEqualS(&result->prettyName, "explorer")
        ) {
            // A CUI program created by Windows Explorer will spawn a conhost as its child.
            // However the conhost process is just a placeholder;
@@ -343,7 +344,7 @@ static void setTerminalInfoDetails(FFTerminalResult* result)
            : "Windows Terminal"
        );
    else if(ffStrbufIgnCaseEqualS(&result->prettyName, "conhost"))
-        ffStrbufSetStatic(&result->prettyName, "Windows Console");
+        ffStrbufSetStatic(&result->prettyName, "Console Window Host");
    else if(ffStrbufIgnCaseEqualS(&result->prettyName, "Code"))
        ffStrbufSetStatic(&result->prettyName, "Visual Studio Code");
    else if(ffStrbufIgnCaseEqualS(&result->prettyName, "explorer"))
@@ -10,10 +10,6 @@
    #define setutxent setutent
    #define getutxent getutent
 #endif
-#ifdef __linux__
-    #include <netinet/in.h>
-    #include <arpa/inet.h>
-#endif

 const char* ffDetectUsers(FFlist* users)
 {
@@ -37,11 +33,11 @@ next:
        ffStrbufInitS(&user->hostName, n->ut_host);
        ffStrbufInitS(&user->sessionName, n->ut_line);
        #ifdef __linux__
-        // https://www.linuxquestions.org/questions/programming-9/get-the-ip-addr-out-from-an-int32_t-value-287687/#post1458622
-        ffStrbufInitS(&user->clientIp, inet_ntoa((struct in_addr) { .s_addr = (in_addr_t) n->ut_addr_v6[0] }));
-        #else
-        ffStrbufInit(&user->clientIp);
+        if(n->ut_addr_v6[0] || n->ut_addr_v6[1] || n->ut_addr_v6[2] || n->ut_addr_v6[3])
+            ffStrbufInitF(&user->clientIp, "%u.%u.%u.%u", n->ut_addr_v6[0], n->ut_addr_v6[1], n->ut_addr_v6[2], n->ut_addr_v6[3]);
+        else
        #endif
+        ffStrbufInit(&user->clientIp);
        user->loginTime = (uint64_t) n->ut_tv.tv_sec * 1000 + (uint64_t) n->ut_tv.tv_usec / 1000;
    }

@@ -32,21 +32,7 @@ void ffDetectVersion(FFVersionResult* version)
    version->cmakeBuiltType = FASTFETCH_PROJECT_CMAKE_BUILD_TYPE;
    version->compileTime = __DATE__ ", " __TIME__;
    #ifdef __clang__
-        version->compiler =
-            #ifdef _MSC_VER
-                "clang-cl " ;
-            #elif defined(__APPLE__) && defined(__apple_build_version__)
-                "Apple clang "
-            #else
-                "clang "
-            #endif
-
-            FF_STR(__clang_major__) "." FF_STR(__clang_minor__) "." FF_STR(__clang_patchlevel__)
-
-            #if defined(__APPLE__) && defined(__apple_build_version__)
-                " (" FF_STR(__apple_build_version__) ")"
-            #endif
-            ;
+        version->compiler = "clang " FF_STR(__clang_major__) "." FF_STR(__clang_minor__) "." FF_STR(__clang_patchlevel__);
    #elif defined(__GNUC__)
        version->compiler = "gcc " FF_STR(__GNUC__) "." FF_STR(__GNUC_MINOR__) "." FF_STR(__GNUC_PATCHLEVEL__);
    #elif defined(_MSC_VER)
@@ -18,7 +18,7 @@ static inline void applyVulkanVersion(uint32_t vulkanVersion, FFVersion* ffVersi
    ffVersion->patch = VK_VERSION_PATCH(vulkanVersion);
 }

-static void applyDriverName(VkPhysicalDeviceDriverPropertiesKHR* properties, FFstrbuf* result)
+static void applyDriverName(VkPhysicalDeviceDriverProperties* properties, FFstrbuf* result)
 {
    if(!ffStrSet(properties->driverName))
        return;
@@ -127,8 +127,8 @@ static const char* detectVulkan(FFVulkanResult* result)
        //On VK 1.1 and up, we use vkGetPhysicalDeviceProperties2, so we can put VkPhysicalDeviceDriverProperties in the pNext chain.
        //This is required to get the driver name and conformance version.

-        VkPhysicalDeviceDriverPropertiesKHR driverProperties = {
-            .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR,
+        VkPhysicalDeviceDriverProperties driverProperties = {
+            .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES,
        };
        VkPhysicalDeviceProperties2 physicalDeviceProperties = {
            .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2,
@@ -1,19 +1,16 @@
 #include "weather.h"

-#define FF_UNITIALIZED ((const char*)(uintptr_t) -1)
 static FFNetworkingState state;
-static const char* status = FF_UNITIALIZED;
+static int status = -1;

 void ffPrepareWeather(FFWeatherOptions* options)
 {
-    if (status != FF_UNITIALIZED)
+    if (status != -1)
    {
        fputs("Error: this module can only be used once due to internal limitations\n", stderr);
        exit(1);
    }

-    state.timeout = options->timeout;
-
    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateS("/");
    if (options->location.length)
        ffStrbufAppend(&path, &options->location);
@@ -24,24 +21,18 @@ void ffPrepareWeather(FFWeatherOptions* options)

 const char* ffDetectWeather(FFWeatherOptions* options, FFstrbuf* result)
 {
-    if(status == FF_UNITIALIZED)
+    if(status == -1)
        ffPrepareWeather(options);

-    if(status != NULL)
-        return status;
+    if(status == 0)
+        return "Failed to connect to 'wttr.in'";

    ffStrbufEnsureFree(result, 4095);
-    const char* error = ffNetworkingRecvHttpResponse(&state, result);
-    if (error == NULL)
-    {
-        ffStrbufSubstrAfterFirstS(result, "\r\n\r\n");
-        ffStrbufTrimRightSpace(result);
-    }
-    else
-        return error;
+    bool success = ffNetworkingRecvHttpResponse(&state, result, options->timeout);
+    if (success) ffStrbufSubstrAfterFirstS(result, "\r\n\r\n");

-    if(result->length == 0)
-        return "Empty server response received";
+    if(!success || result->length == 0)
+        return "Failed to receive the server response";

    return NULL;
 }
@@ -1,15 +1,20 @@
 #include "fastfetch.h"
 #include "common/commandoption.h"
+#include "common/printing.h"
+#include "common/parsing.h"
 #include "common/io/io.h"
+#include "common/time.h"
 #include "common/jsonconfig.h"
 #include "detection/version/version.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
+#include "logo/logo.h"
 #include "fastfetch_datatext.h"

 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
+#include <inttypes.h>

 #ifdef WIN32
    #include "util/windows/getline.h"
@@ -819,11 +824,7 @@ static void run(FFdata* data)
        ffPrintCommandOption(data, instance.state.resultDoc);

    if (instance.state.resultDoc)
-    {
        yyjson_mut_write_fp(stdout, instance.state.resultDoc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL);
-        //TODO should use YYJSON_WRITE_NEWLINE_AT_END when it is available
-        putchar('\n');
-    }
    else
        ffFinish();
 }
@@ -841,23 +842,24 @@ static void writeConfigFile(FFdata* data, const FFstrbuf* filename)
    ffOptionsGenerateLibraryJsonConfig(&instance.config.library, doc);
    ffMigrateCommandOptionToJsonc(data, doc);

-    FILE *fp = stdout;
-    bool writeToStdout = ffStrbufEqualS(filename, "-");
-    if (!writeToStdout)
-        fp = fopen(filename->chars, "w");
-
-    bool ok = yyjson_mut_write_fp(fp, doc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL);
-    //TODO should use YYJSON_WRITE_NEWLINE_AT_END when it is available
-    fputc('\n', fp);
-    if (!ok)
+    if (ffStrbufEqualS(filename, "-"))
+        yyjson_mut_write_fp(stdout, doc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, NULL, NULL);
+    else
    {
-        fprintf(stderr, "Error: failed to generate config in `%s`\n", writeToStdout ? "stdout" : filename->chars);
-        exit(1);
-    }
-    if (ok && !writeToStdout)
-    {
-        fclose(fp);
-        printf("The generated config file has been written in `%s`\n", filename->chars);
+        size_t len;
+        FF_AUTO_FREE const char* str = yyjson_mut_write(doc, YYJSON_WRITE_INF_AND_NAN_AS_NULL | YYJSON_WRITE_PRETTY_TWO_SPACES, &len);
+        if (!str)
+        {
+            printf("Error: failed to generate config file\n");
+            exit(1);
+        }
+        if (ffWriteFileData(filename->chars, len, str))
+            printf("The generated config file has been written in `%s`\n", filename->chars);
+        else
+        {
+            printf("Error: failed to write file in `%s`\n", filename->chars);
+            exit(1);
+        }
    }

    yyjson_mut_doc_free(doc);
@@ -21,7 +21,6 @@ int main(void)
        &options->title,
        &options->separator,
        &options->os,
-        &options->host,
        &options->kernel,
        &options->uptime,
        &options->packages,
@@ -1,4 +1,4 @@
-          A
+${c1}          A
         ooo
        ooooo
       ooooooo
@@ -413,7 +413,7 @@ static const FFlogo A[] = {
        .lines = FASTFETCH_DATATEXT_LOGO_ARCO,
        .colors = {
            FF_COLOR_FG_BLUE,
-            FF_COLOR_FG_WHITE,
+            FF_COLOR_FG_GREEN,
        },
        .colorKeys = FF_COLOR_FG_BLUE,
        .colorTitle = FF_COLOR_FG_BLUE,
@@ -425,7 +425,7 @@ static const FFlogo A[] = {
        .lines = FASTFETCH_DATATEXT_LOGO_ARCO_SMALL,
        .colors = {
            FF_COLOR_FG_BLUE,
-            FF_COLOR_FG_WHITE,
+            FF_COLOR_FG_GREEN,
        },
        .colorKeys = FF_COLOR_FG_BLUE,
        .colorTitle = FF_COLOR_FG_BLUE,
@@ -3299,17 +3299,6 @@ static const FFlogo P[] = {
            FF_COLOR_FG_WHITE,
        },
    },
-    // Proxmox
-    {
-        .names = {"proxmox"},
-        .lines = FASTFETCH_DATATEXT_LOGO_PROXMOX,
-        .colors = {
-            FF_COLOR_FG_WHITE,
-            FF_COLOR_FG_256 "202"
-        },
-        .colorKeys = FF_COLOR_FG_WHITE,
-        .colorTitle = FF_COLOR_FG_256 "202",
-    },
    // PuffOS
    {
        .names = {"PuffOS"},
@@ -3569,6 +3558,17 @@ static const FFlogo R[] = {
        .colorKeys = FF_COLOR_FG_BLUE,
        .colorTitle = FF_COLOR_FG_BLUE,
    },
+    // Proxmox
+    {
+        .names = {"proxmox"},
+        .lines = FASTFETCH_DATATEXT_LOGO_PROXMOX,
+        .colors = {
+            FF_COLOR_FG_WHITE,
+            FF_COLOR_FG_256 "202"
+        },
+        .colorKeys = FF_COLOR_FG_WHITE,
+        .colorTitle = FF_COLOR_FG_256 "202",
+    },
    // LAST
    {},
 };
@@ -768,8 +768,10 @@ static bool printImageIfExistsSlowPath(FFLogoType type, bool printError)
    requestData.characterPixelWidth = 1;
    requestData.characterPixelHeight = 1;

-    if(!getCharacterPixelDimensions(&requestData))
-    {
+    if(
+        (type != FF_LOGO_TYPE_IMAGE_CHAFA || instance.config.logo.width == 0 || instance.config.logo.height == 0) &&
+        !getCharacterPixelDimensions(&requestData)
+    ) {
        if(printError)
            fputs("Logo: getCharacterPixelDimensions() failed", stderr);
        return false;
@@ -7,7 +7,7 @@
 #include "modules/battery/battery.h"
 #include "util/stringUtils.h"

-#define FF_BATTERY_NUM_FORMAT_ARGS 9
+#define FF_BATTERY_NUM_FORMAT_ARGS 8

 static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uint8_t index)
 {
@@ -61,7 +61,7 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
        ffPercentAppendNum(&capacityStr, result->capacity, options->percent, false);
        FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
        ffTempsAppendNum(result->temperature, &tempStr, options->tempConfig);
-        FF_PRINT_FORMAT_CHECKED(FF_BATTERY_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BATTERY_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_BATTERY_MODULE_NAME, index, &options->moduleArgs, FF_BATTERY_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->manufacturer},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->modelName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->technology},
@@ -71,7 +71,7 @@ static void printBattery(FFBatteryOptions* options, FFBatteryResult* result, uin
            {FF_FORMAT_ARG_TYPE_UINT, &result->cycleCount},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->serial},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->manufactureDate},
-        }));
+        });
    }
 }

@@ -83,7 +83,7 @@ void ffPrintBattery(FFBatteryOptions* options)

    if (error)
    {
-        ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
    }
    else
    {
@@ -100,7 +100,7 @@ void ffPrintBattery(FFBatteryOptions* options)
            ffStrbufDestroy(&result->manufactureDate);
        }
        if(results.length == 0)
-            ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No batteries found");
+            ffPrintError(FF_BATTERY_MODULE_NAME, 0, &options->moduleArgs, "No batteries found");
    }
 }

@@ -155,7 +155,7 @@ void ffParseBatteryJsonObject(FFBatteryOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -216,7 +216,7 @@ void ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc,

 void ffPrintBatteryHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BATTERY_MODULE_NAME, "{4}, {5}", FF_BATTERY_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_BATTERY_MODULE_NAME, "{4}, {5}", FF_BATTERY_NUM_FORMAT_ARGS, (const char* []) {
        "Battery manufactor",
        "Battery model",
        "Battery technology",
@@ -226,7 +226,7 @@ void ffPrintBatteryHelpFormat(void)
        "Battery cycle count",
        "Battery serial number",
        "Battery manufactor date",
-    }));
+    });
 }

 void ffInitBatteryOptions(FFBatteryOptions* options)
@@ -21,13 +21,13 @@ void ffPrintBios(FFBiosOptions* options)

    if(error)
    {
-        ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_BIOS_MODULE_NAME, 0, &options->moduleArgs, "%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_BIOS_MODULE_NAME, 0, &options->moduleArgs, "bios_version is not set.");
        goto exit;
    }

@@ -43,9 +43,9 @@ void ffPrintBios(FFBiosOptions* options)
    else
    {
        ffStrbufClear(&key);
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 1, ((FFformatarg[]){
+        ffParseFormatString(&key, &options->moduleArgs.key, 3, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &bios.type},
-        }));
+        });
    }

    if(options->moduleArgs.outputFormat.length == 0)
@@ -59,13 +59,13 @@ void ffPrintBios(FFBiosOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BIOS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(key.chars, 0, &options->moduleArgs, FF_BIOS_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &bios.date},
            {FF_FORMAT_ARG_TYPE_STRBUF, &bios.release},
            {FF_FORMAT_ARG_TYPE_STRBUF, &bios.vendor},
            {FF_FORMAT_ARG_TYPE_STRBUF, &bios.version},
            {FF_FORMAT_ARG_TYPE_STRBUF, &bios.type},
-        }));
+        });
    }

 exit:
@@ -99,7 +99,7 @@ void ffParseBiosJsonObject(FFBiosOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -151,13 +151,13 @@ exit:

 void ffPrintBiosHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BIOS_MODULE_NAME, "{4} ({2})", FF_BIOS_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_BIOS_MODULE_NAME, "{4} ({2})", FF_BIOS_NUM_FORMAT_ARGS, (const char* []) {
        "bios date",
        "bios release",
        "bios vendor",
        "bios version",
        "firmware type",
-    }));
+    });
 }

 void ffInitBiosOptions(FFBiosOptions* options)
@@ -32,12 +32,12 @@ static void printDevice(FFBluetoothOptions* options, const FFBluetoothResult* de
        FF_STRBUF_AUTO_DESTROY percentageStr = ffStrbufCreate();
        ffPercentAppendNum(&percentageStr, device->battery, options->percent, false);

-        FF_PRINT_FORMAT_CHECKED(FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BLUETOOTH_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_BLUETOOTH_MODULE_NAME, index, &options->moduleArgs, FF_BLUETOOTH_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->address},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->type},
            {FF_FORMAT_ARG_TYPE_STRBUF, &percentageStr}
-        }));
+        });
    }
 }

@@ -48,7 +48,7 @@ void ffPrintBluetooth(FFBluetoothOptions* options)

    if(error)
    {
-        ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_BLUETOOTH_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
    }
    else
    {
@@ -64,7 +64,7 @@ void ffPrintBluetooth(FFBluetoothOptions* options)

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

        for(uint32_t i = 0; i < filtered.length; i++)
@@ -123,7 +123,7 @@ void ffParseBluetoothJsonObject(FFBluetoothOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -175,12 +175,12 @@ void ffGenerateBluetoothJsonResult(FF_MAYBE_UNUSED FFBluetoothOptions* options,

 void ffPrintBluetoothHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BLUETOOTH_MODULE_NAME, "{1} ({4})", FF_BLUETOOTH_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_BLUETOOTH_MODULE_NAME, "{1} ({4})", FF_BLUETOOTH_NUM_FORMAT_ARGS, (const char* []) {
        "Name",
        "Address",
        "Type",
        "Battery percentage"
-    }));
+    });
 }

 void ffInitBluetoothOptions(FFBluetoothOptions* options)
@@ -4,7 +4,7 @@
 #include "modules/board/board.h"
 #include "util/stringUtils.h"

-#define FF_BOARD_NUM_FORMAT_ARGS 4
+#define FF_BOARD_NUM_FORMAT_ARGS 3

 void ffPrintBoard(FFBoardOptions* options)
 {
@@ -17,13 +17,13 @@ void 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_BOARD_MODULE_NAME, 0, &options->moduleArgs, "%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_BOARD_MODULE_NAME, 0, &options->moduleArgs, "board_name is not set.");
        goto exit;
    }

@@ -37,12 +37,12 @@ void ffPrintBoard(FFBoardOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_BOARD_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_BOARD_MODULE_NAME, 0, &options->moduleArgs, FF_BOARD_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.vendor},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.version},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.serial},
-        }));
+        });
    }

 exit:
@@ -75,7 +75,7 @@ void ffParseBoardJsonObject(FFBoardOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -124,12 +124,12 @@ exit:

 void ffPrintBoardHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BOARD_MODULE_NAME, "{1} ({3})", FF_BOARD_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_BOARD_MODULE_NAME, "{1} ({3})", FF_BOARD_NUM_FORMAT_ARGS, (const char* []) {
        "board name",
        "board vendor",
        "board version",
        "board serial number",
-    }));
+    });
 }

 void ffInitBoardOptions(FFBoardOptions* options)
@@ -15,13 +15,13 @@ void ffPrintBrightness(FFBrightnessOptions* options)

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

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

@@ -37,10 +37,10 @@ void ffPrintBrightness(FFBrightnessOptions* options)
        else
        {
            uint32_t moduleIndex = result.length == 1 ? 0 : index + 1;
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){
+            ffParseFormatString(&key, &options->moduleArgs.key, 2, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_UINT, &moduleIndex},
                {FF_FORMAT_ARG_TYPE_STRBUF, &item->name}
-            }));
+            });
        }

        const double percent = (item->current - item->min) / (item->max - item->min) * 100;
@@ -69,13 +69,13 @@ void ffPrintBrightness(FFBrightnessOptions* options)
        {
            FF_STRBUF_AUTO_DESTROY valueStr = ffStrbufCreate();
            ffPercentAppendNum(&valueStr, percent, options->percent, false);
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BRIGHTNESS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_BRIGHTNESS_NUM_FORMAT_ARGS, (FFformatarg[]) {
                {FF_FORMAT_ARG_TYPE_STRBUF, &valueStr},
                {FF_FORMAT_ARG_TYPE_STRBUF, &item->name},
                {FF_FORMAT_ARG_TYPE_DOUBLE, &item->max},
                {FF_FORMAT_ARG_TYPE_DOUBLE, &item->min},
                {FF_FORMAT_ARG_TYPE_DOUBLE, &item->current},
-            }));
+            });
        }

        ffStrbufClear(&key);
@@ -125,7 +125,7 @@ void ffParseBrightnessJsonObject(FFBrightnessOptions* options, yyjson_val* modul
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -180,13 +180,13 @@ void ffGenerateBrightnessJsonResult(FF_MAYBE_UNUSED FFBrightnessOptions* options

 void ffPrintBrightnessHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_BRIGHTNESS_MODULE_NAME, "{1}", FF_BRIGHTNESS_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_BRIGHTNESS_MODULE_NAME, "{1}", FF_BRIGHTNESS_NUM_FORMAT_ARGS, (const char* []) {
        "Screen brightness (percentage)",
        "Screen name",
        "Maximum brightness value",
        "Minimum brightness value",
        "Current brightness value",
-    }));
+    });
 }

 void ffInitBrightnessOptions(FFBrightnessOptions* options)
@@ -5,7 +5,7 @@
 #include "modules/camera/camera.h"
 #include "util/stringUtils.h"

-#define FF_CAMERA_NUM_FORMAT_ARGS 6
+#define FF_CAMERA_NUM_FORMAT_ARGS 5

 static void printDevice(FFCameraOptions* options, const FFCameraResult* device, uint8_t index)
 {
@@ -27,14 +27,14 @@ static void printDevice(FFCameraOptions* options, const FFCameraResult* device,
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_CAMERA_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CAMERA_NUM_FORMAT_ARGS, (((FFformatarg[]) {
+        ffPrintFormat(FF_CAMERA_MODULE_NAME, index, &options->moduleArgs, FF_CAMERA_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->vendor},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->colorspace},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->id},
            {FF_FORMAT_ARG_TYPE_UINT, &device->width},
            {FF_FORMAT_ARG_TYPE_UINT, &device->height},
-        })));
+        });
    }
 }

@@ -45,13 +45,13 @@ void ffPrintCamera(FFCameraOptions* options)

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

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

@@ -92,7 +92,7 @@ void ffParseCameraJsonObject(FFCameraOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -138,14 +138,14 @@ void ffGenerateCameraJsonResult(FF_MAYBE_UNUSED FFCameraOptions* options, yyjson

 void ffPrintCameraHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CAMERA_MODULE_NAME, "{1} ({4}px x {5}px)", FF_CAMERA_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_CAMERA_MODULE_NAME, "{1} ({4}px x {5}px)", FF_CAMERA_NUM_FORMAT_ARGS, (const char* []) {
        "Device name",
        "Vendor",
        "Color space",
        "Identifier",
        "Width (in px)",
        "Height (in px)",
-    }));
+    });
 }

 void ffInitCameraOptions(FFCameraOptions* options)
@@ -4,7 +4,7 @@
 #include "modules/chassis/chassis.h"
 #include "util/stringUtils.h"

-#define FF_CHASSIS_NUM_FORMAT_ARGS 4
+#define FF_CHASSIS_NUM_FORMAT_ARGS 3

 void ffPrintChassis(FFChassisOptions* options)
 {
@@ -18,13 +18,13 @@ void ffPrintChassis(FFChassisOptions* options)

    if(error)
    {
-        ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, "%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_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, "chassis_type is not set by O.E.M.");
        goto exit;
    }

@@ -38,12 +38,12 @@ void ffPrintChassis(FFChassisOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CHASSIS_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_CHASSIS_MODULE_NAME, 0, &options->moduleArgs, FF_CHASSIS_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.type},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.vendor},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.version},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.serial},
-        }));
+        });
    }

 exit:
@@ -76,7 +76,7 @@ void ffParseChassisJsonObject(FFChassisOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -125,12 +125,12 @@ exit:

 void ffPrintChassisHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CHASSIS_MODULE_NAME, "{1}", FF_CHASSIS_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_CHASSIS_MODULE_NAME, "{1}", FF_CHASSIS_NUM_FORMAT_ARGS, (const char* []) {
        "chassis type",
        "chassis vendor",
        "chassis version",
        "chassis serial number",
-    }));
+    });
 }

 void ffInitChassisOptions(FFChassisOptions* options)
@@ -88,7 +88,7 @@ void ffPrintColors(FFColorsOptions* options)

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

@@ -166,7 +166,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module)
                {},
            });
            if (error)
-                ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error);
+                ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: %s", key, error);
            else
                options->symbol = (FFColorsSymbol) value;
            continue;
@@ -181,7 +181,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module)
        if (ffStrEqualsIgnCase(key, "block"))
        {
            if (!yyjson_is_obj(val))
-                ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", key);
+                ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s value: must be an object", key);
            else
            {
                yyjson_val* width = yyjson_obj_get(val, "width");
@@ -192,15 +192,15 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module)
                if (range)
                {
                    if (!yyjson_is_arr(range) || yyjson_arr_size(range) != 2)
-                        ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", key);
+                        ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: must be an array of 2 elements", 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, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", key);
+                            ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[0] > range[1]", key);
                        else if (end > 15)
-                            ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", key);
+                            ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Invalid %s.range value: range[1] > 15", key);
                        else
                        {
                            options->block.range[0] = start;
@@ -212,7 +212,7 @@ void ffParseColorsJsonObject(FFColorsOptions* options, yyjson_val* module)
            continue;
        }

-        ffPrintError(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
+        ffPrintErrorString(FF_COLORS_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
    }
 }

@@ -22,13 +22,13 @@ void ffPrintCommand(FFCommandOptions* options)

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

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

@@ -39,9 +39,9 @@ void ffPrintCommand(FFCommandOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_COMMAND_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, FF_COMMAND_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &result}
-        }));
+        });
    }
 }

@@ -92,7 +92,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", key);
+        ffPrintError(FF_COMMAND_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
    }
 }

@@ -141,9 +141,9 @@ void ffGenerateCommandJsonResult(FF_MAYBE_UNUSED FFCommandOptions* options, yyjs

 void ffPrintCommandHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_COMMAND_MODULE_NAME, "{1}", FF_COMMAND_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_COMMAND_MODULE_NAME, "{1}", FF_COMMAND_NUM_FORMAT_ARGS, (const char* []) {
        "Command result"
-    }));
+    });
 }

 void ffInitCommandOptions(FFCommandOptions* options)
@@ -13,7 +13,7 @@ void ffPrintCPU(FFCPUOptions* options)
    FFCPUResult cpu;
    cpu.temperature = FF_CPU_TEMP_UNSET;
    cpu.coresPhysical = cpu.coresLogical = cpu.coresOnline = 0;
-    cpu.frequencyMin = cpu.frequencyMax = cpu.frequencyBase = 0.0/0.0;
+    cpu.frequencyMax = cpu.frequencyMin = 0;
    ffStrbufInit(&cpu.name);
    ffStrbufInit(&cpu.vendor);

@@ -21,11 +21,11 @@ void ffPrintCPU(FFCPUOptions* options)

    if(error)
    {
-        ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, "%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_CPU_MODULE_NAME, 0, &options->moduleArgs, "No CPU detected");
    }
    else
    {
@@ -48,11 +48,8 @@ void ffPrintCPU(FFCPUOptions* options)
            if(cpu.coresOnline > 1)
                ffStrbufAppendF(&str, " (%u)", cpu.coresOnline);

-            double freq = cpu.frequencyMax;
-            if(freq != freq)
-                freq = cpu.frequencyBase;
-            if(freq == freq)
-                ffStrbufAppendF(&str, " @ %.*f GHz", options->freqNdigits, freq);
+            if(cpu.frequencyMax > 0.0)
+                ffStrbufAppendF(&str, " @ %.*f GHz", options->freqNdigits, cpu.frequencyMax);

            if(cpu.temperature == cpu.temperature) //FF_CPU_TEMP_UNSET
            {
@@ -66,16 +63,16 @@ void ffPrintCPU(FFCPUOptions* options)
        {
            FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
            ffTempsAppendNum(cpu.temperature, &tempStr, options->tempConfig);
-            FF_PRINT_FORMAT_CHECKED(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CPU_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            ffPrintFormat(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, FF_CPU_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_STRBUF, &cpu.name},
                {FF_FORMAT_ARG_TYPE_STRBUF, &cpu.vendor},
                {FF_FORMAT_ARG_TYPE_UINT16, &cpu.coresPhysical},
                {FF_FORMAT_ARG_TYPE_UINT16, &cpu.coresLogical},
                {FF_FORMAT_ARG_TYPE_UINT16, &cpu.coresOnline},
-                {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu.frequencyBase},
+                {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu.frequencyMin},
                {FF_FORMAT_ARG_TYPE_DOUBLE, &cpu.frequencyMax},
                {FF_FORMAT_ARG_TYPE_STRBUF, &tempStr}
-            }));
+            });
        }
    }

@@ -124,7 +121,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", key);
+        ffPrintError(FF_CPU_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
    }
 }

@@ -146,7 +143,7 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_
    FFCPUResult cpu;
    cpu.temperature = FF_CPU_TEMP_UNSET;
    cpu.coresPhysical = cpu.coresLogical = cpu.coresOnline = 0;
-    cpu.frequencyMin = cpu.frequencyMax = cpu.frequencyBase = 0.0/0.0;
+    cpu.frequencyMax = cpu.frequencyMin = 0;
    ffStrbufInit(&cpu.name);
    ffStrbufInit(&cpu.vendor);

@@ -172,9 +169,8 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_
        yyjson_mut_obj_add_uint(doc, cores, "online", cpu.coresOnline);

        yyjson_mut_val* frequency = yyjson_mut_obj_add_obj(doc, obj, "frequency");
-        yyjson_mut_obj_add_real(doc, frequency, "base", cpu.frequencyBase);
-        yyjson_mut_obj_add_real(doc, frequency, "max", cpu.frequencyMax);
        yyjson_mut_obj_add_real(doc, frequency, "min", cpu.frequencyMin);
+        yyjson_mut_obj_add_real(doc, frequency, "max", cpu.frequencyMax);

        yyjson_mut_obj_add_real(doc, obj, "temperature", cpu.temperature);
    }
@@ -185,16 +181,16 @@ void ffGenerateCPUJsonResult(FFCPUOptions* options, yyjson_mut_doc* doc, yyjson_

 void ffPrintCPUHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CPU_MODULE_NAME, "{1} ({5}) @ {7} GHz", FF_CPU_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_CPU_MODULE_NAME, "{1} ({5}) @ {7} GHz", FF_CPU_NUM_FORMAT_ARGS, (const char* []) {
        "Name",
        "Vendor",
        "Physical core count",
        "Logical core count",
        "Online core count",
-        "Base frequency",
+        "Min frequency",
        "Max frequency",
        "Temperature (formatted)"
-    }));
+    });
 }

 void ffInitCPUOptions(FFCPUOptions* options)
@@ -15,7 +15,7 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)

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

@@ -79,13 +79,13 @@ void ffPrintCPUUsage(FFCPUUsageOptions* options)
        ffPercentAppendNum(&minStr, minValue, options->percent, false);
        FF_STRBUF_AUTO_DESTROY maxStr = ffStrbufCreate();
        ffPercentAppendNum(&maxStr, maxValue, options->percent, false);
-        FF_PRINT_FORMAT_CHECKED(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CPUUSAGE_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_CPUUSAGE_DISPLAY_NAME, 0, &options->moduleArgs, FF_CPUUSAGE_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &avgStr},
            {FF_FORMAT_ARG_TYPE_STRBUF, &maxStr},
            {FF_FORMAT_ARG_TYPE_UINT, &maxIndex},
            {FF_FORMAT_ARG_TYPE_STRBUF, &minStr},
            {FF_FORMAT_ARG_TYPE_UINT, &minIndex},
-        }));
+        });
    }
 }

@@ -130,7 +130,7 @@ void ffParseCPUUsageJsonObject(FFCPUUsageOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -166,13 +166,13 @@ void ffGenerateCPUUsageJsonResult(FF_MAYBE_UNUSED FFCPUUsageOptions* options, yy

 void ffPrintCPUUsageHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CPUUSAGE_MODULE_NAME, "{1}", FF_CPUUSAGE_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_CPUUSAGE_MODULE_NAME, "{1}", FF_CPUUSAGE_NUM_FORMAT_ARGS, (const char* []) {
        "CPU usage (percentage, average)",
        "CPU usage (percentage, maximum)",
        "CPU core index of maximum usage",
        "CPU usage (percentage, minimum)",
        "CPU core index of minimum usage",
-    }));
+    });
 }

 void ffInitCPUUsageOptions(FFCPUUsageOptions* options)
@@ -16,7 +16,7 @@ void 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_CURSOR_MODULE_NAME, 0, &options->moduleArgs, "%s", result.error.chars);
    else
    {
        ffStrbufRemoveIgnCaseEndS(&result.theme, "cursors");
@@ -38,10 +38,10 @@ void ffPrintCursor(FFCursorOptions* options)
        }
        else
        {
-            FF_PRINT_FORMAT_CHECKED(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_CURSOR_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            ffPrintFormat(FF_CURSOR_MODULE_NAME, 0, &options->moduleArgs, FF_CURSOR_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_STRBUF, &result.theme},
                {FF_FORMAT_ARG_TYPE_STRBUF, &result.size}
-            }));
+            });
        }
    }

@@ -73,7 +73,7 @@ void ffParseCursorJsonObject(FFCursorOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -112,10 +112,10 @@ void ffGenerateCursorJsonResult(FF_MAYBE_UNUSED FFCursorOptions* options, yyjson

 void ffPrintCursorHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_CURSOR_MODULE_NAME, "{1} ({2}px)", FF_CURSOR_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_CURSOR_MODULE_NAME, "{1} ({2}px)", FF_CURSOR_NUM_FORMAT_ARGS, (const char* []) {
        "Cursor theme",
        "Cursor size"
-    }));
+    });
 }

 void ffInitCursorOptions(FFCursorOptions* options)
@@ -8,7 +8,7 @@ void ffPrintCustom(FFCustomOptions* options)
 {
    if (options->moduleArgs.outputFormat.length == 0)
    {
-        ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "output format must be set for custom module");
+        ffPrintError(FF_CUSTOM_MODULE_NAME, 0, &options->moduleArgs, "output format must be set for custom module");
        return;
    }

@@ -48,7 +48,7 @@ void ffParseCustomJsonObject(FFCustomOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -65,7 +65,7 @@ void ffPrintDateTimeFormat(struct tm* tm, const FFModuleArgs* moduleArgs)
    strftime(result.offsetFromUtc, sizeof(result.offsetFromUtc), "%z", tm);
    strftime(result.timezoneName, sizeof(result.timezoneName), "%Z", tm);

-    FF_PRINT_FORMAT_CHECKED(FF_DATETIME_DISPLAY_NAME, 0, moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_DATETIME_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+    ffPrintFormat(FF_DATETIME_DISPLAY_NAME, 0, moduleArgs, FF_DATETIME_NUM_FORMAT_ARGS, (FFformatarg[]) {
        {FF_FORMAT_ARG_TYPE_UINT16, &result.year}, // 1
        {FF_FORMAT_ARG_TYPE_UINT8, &result.yearShort}, // 2
        {FF_FORMAT_ARG_TYPE_UINT8, &result.month}, // 3
@@ -88,7 +88,7 @@ void ffPrintDateTimeFormat(struct tm* tm, const FFModuleArgs* moduleArgs)
        {FF_FORMAT_ARG_TYPE_STRING, result.secondPretty}, // 20
        {FF_FORMAT_ARG_TYPE_STRING, result.offsetFromUtc}, // 21
        {FF_FORMAT_ARG_TYPE_STRING, result.timezoneName}, // 22
-    }));
+    });
 }

 void ffPrintDateTime(FFDateTimeOptions* options)
@@ -106,7 +106,7 @@ void ffPrintDateTime(FFDateTimeOptions* options)
    char buffer[32];
    if (strftime(buffer, sizeof(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_DATETIME_DISPLAY_NAME, 0, &options->moduleArgs, "strftime() failed");
        return;
    }

@@ -138,7 +138,7 @@ void ffParseDateTimeJsonObject(FFDateTimeOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -157,7 +157,7 @@ void ffGenerateDateTimeJsonResult(FF_MAYBE_UNUSED FFDateTimeOptions* options, yy

 void ffPrintDateTimeHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DATETIME_MODULE_NAME, "{1}-{4}-{11} {14}:{18}:{20}", FF_DATETIME_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_DATETIME_MODULE_NAME, "{1}-{4}-{11} {14}:{18}:{20}", FF_DATETIME_NUM_FORMAT_ARGS, (const char* []) {
        "year",
        "last two digits of year",
        "month",
@@ -180,7 +180,7 @@ void ffPrintDateTimeHelpFormat(void)
        "second with leading zero",
        "offset from UTC in the ISO 8601 format",
        "locale-dependent timezone name or abbreviation",
-    }));
+    });
 }

 void ffInitDateTimeOptions(FFDateTimeOptions* options)
@@ -13,7 +13,7 @@ void ffPrintDE(FFDEOptions* options)

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

@@ -36,11 +36,11 @@ void ffPrintDE(FFDEOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_DE_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_DE_MODULE_NAME, 0, &options->moduleArgs, FF_DE_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->deProcessName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->dePrettyName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &version}
-        }));
+        });
    }
 }

@@ -79,7 +79,7 @@ void ffParseDEJsonObject(FFDEOptions* options, yyjson_val* module)
            continue;
        }

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

@@ -115,11 +115,11 @@ void ffGenerateDEJsonResult(FF_MAYBE_UNUSED FFDEOptions* options, yyjson_mut_doc

 void ffPrintDEHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DE_MODULE_NAME, "{2} {3}", FF_DE_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_DE_MODULE_NAME, "{2} {3}", FF_DE_NUM_FORMAT_ARGS, (const char* []) {
        "DE process name",
        "DE pretty name",
        "DE version"
-    }));
+    });
 }

 void ffInitDEOptions(FFDEOptions* options)
@@ -34,11 +34,11 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk)
    }
    else
    {
-        FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+        ffParseFormatString(&key, &options->moduleArgs.key, 3, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &disk->mountpoint},
            {FF_FORMAT_ARG_TYPE_STRBUF, &disk->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &disk->mountFrom},
-        }));
+        });
    }

    FF_STRBUF_AUTO_DESTROY usedPretty = ffStrbufCreate();
@@ -112,7 +112,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk)
        bool isExternal = !!(disk->type & FF_DISK_VOLUME_TYPE_EXTERNAL_BIT);
        bool isHidden = !!(disk->type & FF_DISK_VOLUME_TYPE_HIDDEN_BIT);
        bool isReadOnly = !!(disk->type & FF_DISK_VOLUME_TYPE_READONLY_BIT);
-        FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISK_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISK_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &usedPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &totalPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &bytesPercentageStr},
@@ -124,7 +124,7 @@ static void printDisk(FFDiskOptions* options, const FFDisk* disk)
            {FF_FORMAT_ARG_TYPE_STRBUF, &disk->filesystem},
            {FF_FORMAT_ARG_TYPE_STRBUF, &disk->name},
            {FF_FORMAT_ARG_TYPE_BOOL, &isReadOnly},
-        }));
+        });
    }
 }

@@ -139,7 +139,7 @@ static void printMountpoint(FFDiskOptions* options, const FFlist* disks, const c
        }
    }

-    ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No disk found for mountpoint: %s", mountpoint);
+    ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, "No disk found for mountpoint: %s", mountpoint);
 }

 static void printMountpoints(FFDiskOptions* options, const FFlist* disks)
@@ -183,7 +183,7 @@ void ffPrintDisk(FFDiskOptions* options)

    if(error)
    {
-        ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_DISK_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
    }
    else
    {
@@ -360,7 +360,7 @@ void ffParseDiskJsonObject(FFDiskOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -422,16 +422,8 @@ void ffGenerateDiskJsonResult(FFDiskOptions* options, yyjson_mut_doc* doc, yyjso
        yyjson_mut_obj_add_uint(doc, bytes, "used", item->bytesUsed);

        yyjson_mut_val* files = yyjson_mut_obj_add_obj(doc, obj, "files");
-        if (item->filesTotal == 0 && item->filesUsed == 0)
-        {
-            yyjson_mut_obj_add_null(doc, files, "total");
-            yyjson_mut_obj_add_null(doc, files, "used");
-        }
-        else
-        {
-            yyjson_mut_obj_add_uint(doc, files, "total", item->filesTotal);
-            yyjson_mut_obj_add_uint(doc, files, "used", item->filesUsed);
-        }
+        yyjson_mut_obj_add_uint(doc, files, "total", item->filesTotal);
+        yyjson_mut_obj_add_uint(doc, files, "used", item->filesUsed);

        yyjson_mut_obj_add_strbuf(doc, obj, "filesystem", &item->filesystem);
        yyjson_mut_obj_add_strbuf(doc, obj, "mountpoint", &item->mountpoint);
@@ -461,7 +453,7 @@ void ffGenerateDiskJsonResult(FFDiskOptions* options, yyjson_mut_doc* doc, yyjso

 void ffPrintDiskHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DISK_MODULE_NAME, "{1} / {2} ({3}) - {9}", FF_DISK_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_DISK_MODULE_NAME, "{1} / {2} ({3}) - {9}", FF_DISK_NUM_FORMAT_ARGS, (const char* []) {
        "Size used",
        "Size total",
        "Size percentage",
@@ -470,10 +462,8 @@ void ffPrintDiskHelpFormat(void)
        "Files percentage",
        "True if external volume",
        "True if hidden volume",
-        "Filesystem",
-        "Label / name",
-        "True if read-only",
-    }));
+        "Filesystem"
+    });
 }

 void ffInitDiskOptions(FFDiskOptions* options)
@@ -22,11 +22,11 @@ static void formatKey(const FFDiskIOOptions* options, FFDiskIOResult* dev, uint3
    else
    {
        ffStrbufClear(key);
-        FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+        ffParseFormatString(key, &options->moduleArgs.key, 2, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT, &index},
            {FF_FORMAT_ARG_TYPE_STRBUF, &dev->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &dev->devPath},
-        }));
+        });
    }
 }

@@ -37,7 +37,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)

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

@@ -74,7 +74,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)
            ffParseSize(dev->bytesWritten, &buffer2);
            if (!options->detectTotal) ffStrbufAppendS(&buffer, "/s");

-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISKIO_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISKIO_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_STRBUF, &buffer},
                {FF_FORMAT_ARG_TYPE_STRBUF, &buffer2},
                {FF_FORMAT_ARG_TYPE_STRBUF, &dev->name},
@@ -83,7 +83,7 @@ void ffPrintDiskIO(FFDiskIOOptions* options)
                {FF_FORMAT_ARG_TYPE_UINT64, &dev->bytesWritten},
                {FF_FORMAT_ARG_TYPE_UINT64, &dev->readCount},
                {FF_FORMAT_ARG_TYPE_UINT64, &dev->writeCount},
-            }));
+            });
        }
        ++index;
    }
@@ -142,7 +142,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", key);
+        ffPrintError(FF_DISKIO_MODULE_NAME, 0, &options->moduleArgs, "Unknown JSON key %s", key);
    }
 }

@@ -192,7 +192,7 @@ void ffGenerateDiskIOJsonResult(FFDiskIOOptions* options, yyjson_mut_doc* doc, y

 void ffPrintDiskIOHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DISKIO_MODULE_NAME, "{1} (R) - {2} (W)", FF_DISKIO_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_DISKIO_MODULE_NAME, "{1} (R) - {2} (W)", FF_DISKIO_NUM_FORMAT_ARGS, (const char* []) {
        "Size of data read [per second] (formatted)",
        "Size of data written [per second] (formatted)",
        "Device name",
@@ -201,7 +201,7 @@ void ffPrintDiskIOHelpFormat(void)
        "Size of data written [per second] (in bytes)",
        "Number of reads",
        "Number of writes",
-    }));
+    });
 }

 void ffInitDiskIOOptions(FFDiskIOOptions* options)
@@ -4,7 +4,7 @@
 #include "modules/display/display.h"
 #include "util/stringUtils.h"

-#define FF_DISPLAY_NUM_FORMAT_ARGS 9
+#define FF_DISPLAY_NUM_FORMAT_ARGS 8

 static int sortByNameAsc(FFDisplayResult* a, FFDisplayResult* b)
 {
@@ -22,7 +22,7 @@ void ffPrintDisplay(FFDisplayOptions* options)

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

@@ -89,11 +89,11 @@ void ffPrintDisplay(FFDisplayOptions* options)
        }
        else
        {
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+            ffParseFormatString(&key, &options->moduleArgs.key, 3, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_UINT, &moduleIndex},
                {FF_FORMAT_ARG_TYPE_STRBUF, &result->name},
                {FF_FORMAT_ARG_TYPE_STRING, displayType},
-            }));
+            });
        }

        if(options->moduleArgs.outputFormat.length == 0)
@@ -125,7 +125,7 @@ void ffPrintDisplay(FFDisplayOptions* options)
        }
        else
        {
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISPLAY_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_DISPLAY_NUM_FORMAT_ARGS, (FFformatarg[]) {
                {FF_FORMAT_ARG_TYPE_UINT, &result->width},
                {FF_FORMAT_ARG_TYPE_UINT, &result->height},
                {FF_FORMAT_ARG_TYPE_DOUBLE, &result->refreshRate},
@@ -135,7 +135,7 @@ void ffPrintDisplay(FFDisplayOptions* options)
                {FF_FORMAT_ARG_TYPE_STRING, displayType},
                {FF_FORMAT_ARG_TYPE_UINT, &result->rotation},
                {FF_FORMAT_ARG_TYPE_BOOL, &result->primary},
-            }));
+            });
        }
    }
 }
@@ -205,7 +205,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", key, error);
+                ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error);
            else
                options->compactType = (FFDisplayCompactType) value;
            continue;
@@ -227,13 +227,13 @@ 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", key, error);
+                ffPrintError(FF_DISPLAY_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error);
            else
                options->order = (FFDisplayOrder) value;
            continue;
        }

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

@@ -309,7 +309,7 @@ void ffGenerateDisplayJsonResult(FF_MAYBE_UNUSED FFDisplayOptions* options, yyjs

 void ffPrintDisplayHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_DISPLAY_MODULE_NAME, "{1}x{2} @ {3}Hz (as {4}x{5}) [{7}]", FF_DISPLAY_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_DISPLAY_MODULE_NAME, "{1}x{2} @ {3}Hz (as {4}x{5}) [{7}]", FF_DISPLAY_NUM_FORMAT_ARGS, (const char* []) {
        "Screen width (in pixels)",
        "Screen height (in pixels)",
        "Screen refresh rate (in Hz)",
@@ -318,8 +318,7 @@ void ffPrintDisplayHelpFormat(void)
        "Screen name",
        "Screen type (builtin, external or unknown)",
        "Screen rotation (in degrees)",
-        "True if being the primary screen",
-    }));
+    });
 }

 void ffInitDisplayOptions(FFDisplayOptions* options)
@@ -17,7 +17,7 @@ void ffPrintFont(FFFontOptions* options)

    if(error)
    {
-        ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
    }
    else
    {
@@ -28,13 +28,13 @@ void ffPrintFont(FFFontOptions* options)
        }
        else
        {
-            FF_PRINT_FORMAT_CHECKED(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_FONT_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            ffPrintFormat(FF_FONT_MODULE_NAME, 0, &options->moduleArgs, FF_FONT_NUM_FORMAT_ARGS, (FFformatarg[]) {
                {FF_FORMAT_ARG_TYPE_STRBUF, &font.fonts[0]},
                {FF_FORMAT_ARG_TYPE_STRBUF, &font.fonts[1]},
                {FF_FORMAT_ARG_TYPE_STRBUF, &font.fonts[2]},
                {FF_FORMAT_ARG_TYPE_STRBUF, &font.fonts[3]},
                {FF_FORMAT_ARG_TYPE_STRBUF, &font.display},
-            }));
+            });
        }
    }

@@ -66,7 +66,7 @@ void ffParseFontJsonObject(FFFontOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -106,13 +106,13 @@ void ffGenerateFontJsonResult(FF_MAYBE_UNUSED FFFontOptions* options, yyjson_mut

 void ffPrintFontHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_FONT_MODULE_NAME, "{5}", FF_FONT_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_FONT_MODULE_NAME, "{5}", FF_FONT_NUM_FORMAT_ARGS, (const char* []) {
        "Font 1",
        "Font 2",
        "Font 3",
        "Font 4",
        "Combined fonts"
-    }));
+    });
 }

 void ffInitFontOptions(FFFontOptions* options)
@@ -5,7 +5,7 @@
 #include "modules/gamepad/gamepad.h"
 #include "util/stringUtils.h"

-#define FF_GAMEPAD_NUM_FORMAT_ARGS 3
+#define FF_GAMEPAD_NUM_FORMAT_ARGS 2

 static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device, uint8_t index)
 {
@@ -28,11 +28,11 @@ static void printDevice(FFGamepadOptions* options, const FFGamepadDevice* device
        FF_STRBUF_AUTO_DESTROY percentageStr = ffStrbufCreate();
        ffPercentAppendNum(&percentageStr, device->battery, options->percent, false);

-        FF_PRINT_FORMAT_CHECKED(FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_GAMEPAD_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_GAMEPAD_MODULE_NAME, index, &options->moduleArgs, FF_GAMEPAD_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->serial},
            {FF_FORMAT_ARG_TYPE_STRBUF, &percentageStr},
-        }));
+        });
    }
 }

@@ -44,13 +44,13 @@ void ffPrintGamepad(FFGamepadOptions* options)

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

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

@@ -92,7 +92,7 @@ void ffParseGamepadJsonObject(FFGamepadOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -141,11 +141,11 @@ void ffGenerateGamepadJsonResult(FF_MAYBE_UNUSED FFGamepadOptions* options, yyjs

 void ffPrintGamepadHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_GAMEPAD_MODULE_NAME, "{1} ({3})", FF_GAMEPAD_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_GAMEPAD_MODULE_NAME, "{1} ({3})", FF_GAMEPAD_NUM_FORMAT_ARGS, (const char* []) {
        "Name",
        "Serial number",
        "Battery percentage",
-    }));
+    });
 }

 void ffInitGamepadOptions(FFGamepadOptions* options)
@@ -75,7 +75,7 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu
    {
        FF_STRBUF_AUTO_DESTROY tempStr = ffStrbufCreate();
        ffTempsAppendNum(gpu->temperature, &tempStr, options->tempConfig);
-        FF_PRINT_FORMAT_CHECKED(FF_GPU_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_GPU_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_GPU_MODULE_NAME, index, &options->moduleArgs, FF_GPU_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &gpu->vendor},
            {FF_FORMAT_ARG_TYPE_STRBUF, &gpu->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &gpu->driver},
@@ -88,7 +88,7 @@ static void printGPUResult(FFGPUOptions* options, uint8_t index, const FFGPUResu
            {FF_FORMAT_ARG_TYPE_UINT64, &gpu->shared.used},
            {FF_FORMAT_ARG_TYPE_STRBUF, &gpu->platformApi},
            {FF_FORMAT_ARG_TYPE_DOUBLE, &gpu->frequency},
-        }));
+        });
    }
 }

@@ -98,7 +98,7 @@ void ffPrintGPU(FFGPUOptions* options)
    const char* error = ffDetectGPU(options, &gpus);
    if (error)
    {
-        ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
        return;
    }

@@ -120,7 +120,7 @@ void ffPrintGPU(FFGPUOptions* options)
        printGPUResult(options, selectedGPUs.length == 1 ? 0 : (uint8_t) (i + 1), * (const FFGPUResult**) ffListGet(&selectedGPUs, i));

    if(selectedGPUs.length == 0)
-        ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No GPUs found");
+        ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, "No GPUs found");

    FF_LIST_FOR_EACH(FFGPUResult, gpu, gpus)
    {
@@ -206,7 +206,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", key, error);
+                ffPrintError(FF_GPU_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error);
            else
                options->hideType = (FFGPUType) value;
            continue;
@@ -215,7 +215,7 @@ void ffParseGPUJsonObject(FFGPUOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -332,7 +332,7 @@ void ffGenerateGPUJsonResult(FFGPUOptions* options, yyjson_mut_doc* doc, yyjson_

 void ffPrintGPUHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_GPU_MODULE_NAME, "{1} {2}", FF_GPU_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_GPU_MODULE_NAME, "{1} {2}", FF_GPU_NUM_FORMAT_ARGS, (const char* []) {
        "GPU vendor",
        "GPU name",
        "GPU driver",
@@ -345,7 +345,7 @@ void ffPrintGPUHelpFormat(void)
        "GPU used shared memory",
        "The platform API that GPU supports",
        "Current frequency in GHz",
-    }));
+    });
 }

 void ffInitGPUOptions(FFGPUOptions* options)
@@ -20,13 +20,13 @@ void 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_HOST_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
        goto exit;
    }

    if(host.family.length == 0 && host.name.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_HOST_MODULE_NAME, 0, &options->moduleArgs, "neither product_family nor product_name is set by O.E.M.");
        goto exit;
    }

@@ -48,7 +48,7 @@ void ffPrintHost(FFHostOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_HOST_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_HOST_MODULE_NAME, 0, &options->moduleArgs, FF_HOST_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &host.family},
            {FF_FORMAT_ARG_TYPE_STRBUF, &host.name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &host.version},
@@ -56,7 +56,7 @@ void ffPrintHost(FFHostOptions* options)
            {FF_FORMAT_ARG_TYPE_STRBUF, &host.vendor},
            {FF_FORMAT_ARG_TYPE_STRBUF, &host.serial},
            {FF_FORMAT_ARG_TYPE_STRBUF, &host.uuid},
-        }));
+        });
    }

 exit:
@@ -92,7 +92,7 @@ void ffParseHostJsonObject(FFHostOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -149,7 +149,7 @@ exit:

 void ffPrintHostHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_HOST_MODULE_NAME, "{2} {3}", FF_HOST_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_HOST_MODULE_NAME, "{2} {3}", FF_HOST_NUM_FORMAT_ARGS, (const char* []) {
        "product family",
        "product name",
        "product version",
@@ -157,7 +157,7 @@ void ffPrintHostHelpFormat(void)
        "product vendor",
        "product serial number",
        "product uuid",
-    }));
+    });
 }

 void ffInitHostOptions(FFHostOptions* options)
@@ -13,7 +13,7 @@ void ffPrintIcons(FFIconsOptions* options)

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

@@ -24,9 +24,9 @@ void ffPrintIcons(FFIconsOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_ICONS_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_ICONS_MODULE_NAME, 0, &options->moduleArgs, FF_ICONS_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &icons}
-        }));
+        });
    }
 }

@@ -53,7 +53,7 @@ void ffParseIconsJsonObject(FFIconsOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -81,9 +81,9 @@ void ffGenerateIconsJsonResult(FF_MAYBE_UNUSED FFIconsOptions* options, yyjson_m

 void ffPrintIconsHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_ICONS_MODULE_NAME, "{1}", FF_ICONS_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_ICONS_MODULE_NAME, "{1}", FF_ICONS_NUM_FORMAT_ARGS, (const char* []) {
        "Combined icons"
-    }));
+    });
 }

 void ffInitIconsOptions(FFIconsOptions* options)
@@ -3,7 +3,7 @@
 #include "modules/kernel/kernel.h"
 #include "util/stringUtils.h"

-#define FF_KERNEL_NUM_FORMAT_ARGS 5
+#define FF_KERNEL_NUM_FORMAT_ARGS 4

 void ffPrintKernel(FFKernelOptions* options)
 {
@@ -20,13 +20,13 @@ void ffPrintKernel(FFKernelOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_KERNEL_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_KERNEL_MODULE_NAME, 0, &options->moduleArgs, FF_KERNEL_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &platform->systemName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &platform->systemRelease},
            {FF_FORMAT_ARG_TYPE_STRBUF, &platform->systemVersion},
            {FF_FORMAT_ARG_TYPE_STRBUF, &platform->systemArchitecture},
            {FF_FORMAT_ARG_TYPE_STRBUF, &platform->systemDisplayVersion}
-        }));
+        });
    }
 }

@@ -53,7 +53,7 @@ void ffParseKernelJsonObject(FFKernelOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -77,13 +77,11 @@ void ffGenerateKernelJsonResult(FF_MAYBE_UNUSED FFKernelOptions* options, yyjson

 void ffPrintKernelHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_KERNEL_MODULE_NAME, "{2}", FF_KERNEL_NUM_FORMAT_ARGS, ((const char* []) {
-        "Sysname",
-        "Release",
-        "Version",
-        "Architecture",
-        "Display version",
-    }));
+    ffPrintModuleFormatHelp(FF_KERNEL_MODULE_NAME, "{2}", FF_KERNEL_NUM_FORMAT_ARGS, (const char* []) {
+        "Kernel sysname",
+        "Kernel release",
+        "Kernel version"
+    });
 }

 void ffInitKernelOptions(FFKernelOptions* options)
@@ -16,13 +16,13 @@ void ffPrintLM(FFLMOptions* options)

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

    if(result.service.length == 0)
    {
-        ffPrintError(FF_LM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No LM service found");
+        ffPrintError(FF_LM_MODULE_NAME, 0, &options->moduleArgs, "No LM service found");
        return;
    }

@@ -38,11 +38,11 @@ void ffPrintLM(FFLMOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_LM_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_LM_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_LM_MODULE_NAME, 0, &options->moduleArgs, FF_LM_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.service},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.type},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.version},
-        }));
+        });
    }
    ffStrbufDestroy(&result.service);
    ffStrbufDestroy(&result.type);
@@ -72,7 +72,7 @@ void ffParseLMJsonObject(FFLMOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -117,11 +117,11 @@ exit:

 void ffPrintLMHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_LM_MODULE_NAME, "{1} {3} ({2})", FF_LM_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_LM_MODULE_NAME, "{1} {3} ({2})", FF_LM_NUM_FORMAT_ARGS, (const char* []) {
        "LM service",
        "LM type",
        "LM version"
-    }));
+    });
 }

 void ffInitLMOptions(FFLMOptions* options)
@@ -13,7 +13,7 @@ void ffPrintLocale(FFLocaleOptions* options)
    ffDetectLocale(&locale);
    if(locale.length == 0)
    {
-        ffPrintError(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No locale found");
+        ffPrintError(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, "No locale found");
        return;
    }

@@ -24,9 +24,9 @@ void ffPrintLocale(FFLocaleOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_LOCALE_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_LOCALE_MODULE_NAME, 0, &options->moduleArgs, FF_LOCALE_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &locale}
-        }));
+        });
    }
 }

@@ -53,7 +53,7 @@ void ffParseLocaleJsonObject(FFLocaleOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -81,9 +81,9 @@ void ffGenerateLocaleJsonResult(FF_MAYBE_UNUSED FFLocaleOptions* options, yyjson

 void ffPrintLocaleHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_LOCALE_MODULE_NAME, "{1}", FF_LOCALE_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_LOCALE_MODULE_NAME, "{1}", FF_LOCALE_NUM_FORMAT_ARGS, (const char* []) {
        "Locale code"
-    }));
+    });
 }

 void ffInitLocaleOptions(FFLocaleOptions* options)
@@ -5,7 +5,7 @@
 #include "util/stringUtils.h"

 #define FF_LOCALIP_DISPLAY_NAME "Local IP"
-#define FF_LOCALIP_NUM_FORMAT_ARGS 5
+#define FF_LOCALIP_NUM_FORMAT_ARGS 7
 #pragma GCC diagnostic ignored "-Wsign-conversion"

 static int sortIps(const FFLocalIpResult* left, const FFLocalIpResult* right)
@@ -25,11 +25,11 @@ static void formatKey(const FFLocalIpOptions* options, FFLocalIpResult* ip, uint
    else
    {
        ffStrbufClear(key);
-        FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+        ffParseFormatString(key, &options->moduleArgs.key, 3, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT, &index},
            {FF_FORMAT_ARG_TYPE_STRBUF, &ip->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &ip->mac},
-        }));
+        });
    }
 }

@@ -40,12 +40,18 @@ static void printIp(FFLocalIpResult* ip, bool markDefaultRoute)
    {
        ffStrbufWriteTo(&ip->ipv4, stdout);
        flag = true;
+
+        if (ip->gateway4.length)
+            printf(" [%s]", ip->gateway4.chars);
    }
    if (ip->ipv6.length)
    {
        if (flag) putchar(' ');
        ffStrbufWriteTo(&ip->ipv6, stdout);
        flag = true;
+
+        if (ip->gateway6.length)
+            printf(" [%s]", ip->gateway6.chars);
    }
    if (ip->mac.length)
    {
@@ -66,13 +72,13 @@ void ffPrintLocalIp(FFLocalIpOptions* options)

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

    if(results.length == 0)
    {
-        ffPrintError(FF_LOCALIP_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Failed to detect any IPs");
+        ffPrintError(FF_LOCALIP_DISPLAY_NAME, 0, &options->moduleArgs, "Failed to detect any IPs");
        return;
    }

@@ -110,13 +116,15 @@ void ffPrintLocalIp(FFLocalIpOptions* options)
            }
            else
            {
-                FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_LOCALIP_NUM_FORMAT_ARGS, ((FFformatarg[]){
+                ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_LOCALIP_NUM_FORMAT_ARGS, (FFformatarg[]){
                    {FF_FORMAT_ARG_TYPE_STRBUF, &ip->ipv4},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &ip->ipv6},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &ip->mac},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &ip->name},
                    {FF_FORMAT_ARG_TYPE_BOOL, &ip->defaultRoute},
-                }));
+                    {FF_FORMAT_ARG_TYPE_STRBUF, &ip->gateway4},
+                    {FF_FORMAT_ARG_TYPE_STRBUF, &ip->gateway6},
+                });
            }
            ++index;
        }
@@ -127,6 +135,8 @@ void ffPrintLocalIp(FFLocalIpOptions* options)
        ffStrbufDestroy(&ip->name);
        ffStrbufDestroy(&ip->ipv4);
        ffStrbufDestroy(&ip->ipv6);
+        ffStrbufDestroy(&ip->gateway4);
+        ffStrbufDestroy(&ip->gateway6);
        ffStrbufDestroy(&ip->mac);
    }
 }
@@ -165,6 +175,15 @@ bool ffParseLocalIpCommandOptions(FFLocalIpOptions* options, const char* key, co
        return true;
    }

+    if (ffStrEqualsIgnCase(subKey, "show-gateway"))
+    {
+        if (ffOptionParseBoolean(value))
+            options->showType |= FF_LOCALIP_TYPE_GATEWAY_BIT;
+        else
+            options->showType &= ~FF_LOCALIP_TYPE_GATEWAY_BIT;
+        return true;
+    }
+
    if (ffStrEqualsIgnCase(subKey, "show-loop"))
    {
        if (ffOptionParseBoolean(value))
@@ -174,15 +193,6 @@ bool ffParseLocalIpCommandOptions(FFLocalIpOptions* options, const char* key, co
        return true;
    }

-    if (ffStrEqualsIgnCase(subKey, "show-prefix-len"))
-    {
-        if (ffOptionParseBoolean(value))
-            options->showType |= FF_LOCALIP_TYPE_PREFIX_LEN_BIT;
-        else
-            options->showType &= ~FF_LOCALIP_TYPE_PREFIX_LEN_BIT;
-        return true;
-    }
-
    if(ffStrEqualsIgnCase(subKey, "compact"))
    {
        if (ffOptionParseBoolean(value))
@@ -247,6 +257,15 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module)
            continue;
        }

+        if (ffStrEqualsIgnCase(key, "showGateway"))
+        {
+            if (yyjson_get_bool(val))
+                options->showType |= FF_LOCALIP_TYPE_GATEWAY_BIT;
+            else
+                options->showType &= ~FF_LOCALIP_TYPE_GATEWAY_BIT;
+            continue;
+        }
+
        if (ffStrEqualsIgnCase(key, "showLoop"))
        {
            if (yyjson_get_bool(val))
@@ -256,15 +275,6 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module)
            continue;
        }

-        if (ffStrEqualsIgnCase(key, "showPrefixLen"))
-        {
-            if (yyjson_get_bool(val))
-                options->showType |= FF_LOCALIP_TYPE_PREFIX_LEN_BIT;
-            else
-                options->showType &= ~FF_LOCALIP_TYPE_PREFIX_LEN_BIT;
-            continue;
-        }
-
        if (ffStrEqualsIgnCase(key, "compact"))
        {
            if (yyjson_get_bool(val))
@@ -286,7 +296,7 @@ void ffParseLocalIpJsonObject(FFLocalIpOptions* options, yyjson_val* module)
            continue;
        }

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

@@ -311,9 +321,6 @@ void ffGenerateLocalIpJsonConfig(FFLocalIpOptions* options, yyjson_mut_doc* doc,
        if (options->showType & FF_LOCALIP_TYPE_LOOP_BIT)
            yyjson_mut_obj_add_bool(doc, module, "showLoop", true);

-        if (options->showType & FF_LOCALIP_TYPE_PREFIX_LEN_BIT)
-            yyjson_mut_obj_add_bool(doc, module, "showPrefixLen", true);
-
        if (options->showType & FF_LOCALIP_TYPE_COMPACT_BIT)
            yyjson_mut_obj_add_bool(doc, module, "compact", true);
    }
@@ -350,6 +357,8 @@ void ffGenerateLocalIpJsonResult(FF_MAYBE_UNUSED FFLocalIpOptions* options, yyjs
        yyjson_mut_obj_add_bool(doc, obj, "defaultRoute", ip->defaultRoute);
        yyjson_mut_obj_add_strbuf(doc, obj, "ipv4", &ip->ipv4);
        yyjson_mut_obj_add_strbuf(doc, obj, "ipv6", &ip->ipv6);
+        yyjson_mut_obj_add_strbuf(doc, obj, "gateway4", &ip->gateway4);
+        yyjson_mut_obj_add_strbuf(doc, obj, "gateway6", &ip->gateway6);
        yyjson_mut_obj_add_strbuf(doc, obj, "mac", &ip->mac);
        yyjson_mut_obj_add_strbuf(doc, obj, "name", &ip->name);
    }
@@ -360,19 +369,23 @@ exit:
        ffStrbufDestroy(&ip->name);
        ffStrbufDestroy(&ip->ipv4);
        ffStrbufDestroy(&ip->ipv6);
+        ffStrbufDestroy(&ip->gateway4);
+        ffStrbufDestroy(&ip->gateway6);
        ffStrbufDestroy(&ip->mac);
    }
 }

 void ffPrintLocalIpHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_LOCALIP_MODULE_NAME, "{1}", FF_LOCALIP_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_LOCALIP_MODULE_NAME, "{1}", FF_LOCALIP_NUM_FORMAT_ARGS, (const char* []) {
        "Local IPv4 address",
        "Local IPv6 address",
        "Physical (MAC) address",
        "Interface name",
-        "Is default route"
-    }));
+        "Is default route",
+        "Gateway IPv4 address",
+        "Gateway IPv6 address",
+    });
 }

 void ffInitLocalIpOptions(FFLocalIpOptions* options)
@@ -390,7 +403,7 @@ void ffInitLocalIpOptions(FFLocalIpOptions* options)
    );
    ffOptionInitModuleArg(&options->moduleArgs);

-    options->showType = FF_LOCALIP_TYPE_IPV4_BIT | FF_LOCALIP_TYPE_PREFIX_LEN_BIT;
+    options->showType = FF_LOCALIP_TYPE_IPV4_BIT;
    ffStrbufInit(&options->namePrefix);
    options->defaultRouteOnly =
        #ifdef __ANDROID__
@@ -7,13 +7,13 @@
 typedef enum FFLocalIpType
 {
    FF_LOCALIP_TYPE_NONE,
-    FF_LOCALIP_TYPE_LOOP_BIT        = 1 << 0,
-    FF_LOCALIP_TYPE_IPV4_BIT        = 1 << 1,
-    FF_LOCALIP_TYPE_IPV6_BIT        = 1 << 2,
-    FF_LOCALIP_TYPE_MAC_BIT         = 1 << 3,
-    FF_LOCALIP_TYPE_PREFIX_LEN_BIT  = 1 << 4,
+    FF_LOCALIP_TYPE_LOOP_BIT = 1 << 0,
+    FF_LOCALIP_TYPE_IPV4_BIT = 1 << 1,
+    FF_LOCALIP_TYPE_IPV6_BIT = 1 << 2,
+    FF_LOCALIP_TYPE_MAC_BIT  = 1 << 3,
+    FF_LOCALIP_TYPE_GATEWAY_BIT  = 1 << 4,

-    FF_LOCALIP_TYPE_COMPACT_BIT     = 1 << 10,
+    FF_LOCALIP_TYPE_COMPACT_BIT = 1 << 10,
 } FFLocalIpType;

 typedef struct FFLocalIpOptions
@@ -49,7 +49,7 @@ void ffPrintMedia(FFMediaOptions* options)

    if(media->error.length > 0)
    {
-        ffPrintError(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", media->error.chars);
+        ffPrintError(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, "%s", media->error.chars);
        return;
    }

@@ -95,13 +95,13 @@ void ffPrintMedia(FFMediaOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_MEDIA_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_MEDIA_MODULE_NAME, 0, &options->moduleArgs, FF_MEDIA_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &songPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &media->song},
            {FF_FORMAT_ARG_TYPE_STRBUF, &media->artist},
            {FF_FORMAT_ARG_TYPE_STRBUF, &media->album},
            {FF_FORMAT_ARG_TYPE_STRBUF, &media->status}
-        }));
+        });
    }
 }

@@ -128,7 +128,7 @@ void ffParseMediaJsonObject(FFMediaOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -159,13 +159,13 @@ void ffGenerateMediaJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_m

 void ffPrintMediaHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_MEDIA_MODULE_NAME, "{3} - {1} ({5})", FF_MEDIA_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_MEDIA_MODULE_NAME, "{3} - {1} ({5})", FF_MEDIA_NUM_FORMAT_ARGS, (const char* []) {
        "Pretty media name",
        "Media name",
        "Artist name",
        "Album name",
        "Status",
-    }));
+    });
 }

 void ffInitMediaOptions(FFMediaOptions* options)
@@ -15,7 +15,7 @@ void ffPrintMemory(FFMemoryOptions* options)

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

@@ -58,11 +58,11 @@ void ffPrintMemory(FFMemoryOptions* options)
    {
        FF_STRBUF_AUTO_DESTROY percentageStr = ffStrbufCreate();
        ffPercentAppendNum(&percentageStr, percentage, options->percent, false);
-        FF_PRINT_FORMAT_CHECKED(FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_MEMORY_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_MEMORY_MODULE_NAME, 0, &options->moduleArgs, FF_MEMORY_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &usedPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &totalPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &percentageStr},
-        }));
+        });
    }
 }

@@ -95,7 +95,7 @@ void ffParseMemoryJsonObject(FFMemoryOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -127,11 +127,11 @@ void ffGenerateMemoryJsonResult(FF_MAYBE_UNUSED FFMemoryOptions* options, yyjson

 void ffPrintMemoryHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_MEMORY_MODULE_NAME, "{1} / {2} ({3})", FF_MEMORY_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_MEMORY_MODULE_NAME, "{1} / {2} ({3})", FF_MEMORY_NUM_FORMAT_ARGS, (const char* []) {
        "Used size",
        "Total size",
-        "Percentage used",
-    }));
+        "Percentage used"
+    });
 }

 void ffInitMemoryOptions(FFMemoryOptions* options)
@@ -6,7 +6,7 @@

 #include <math.h>

-#define FF_MONITOR_NUM_FORMAT_ARGS 10
+#define FF_MONITOR_NUM_FORMAT_ARGS 7

 void ffPrintMonitor(FFMonitorOptions* options)
 {
@@ -16,13 +16,13 @@ void ffPrintMonitor(FFMonitorOptions* options)

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

    if(!result.length)
    {
-        ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No physical display detected");
+        ffPrintError(FF_MONITOR_MODULE_NAME, 0, &options->moduleArgs, "No physical display detected");
        return;
    }

@@ -41,10 +41,10 @@ void ffPrintMonitor(FFMonitorOptions* options)
        else
        {
            uint32_t moduleIndex = result.length == 1 ? 0 : index + 1;
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &options->moduleArgs.key, 2, ((FFformatarg[]){
+            ffParseFormatString(&key, &options->moduleArgs.key, 2, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_UINT, &moduleIndex},
                {FF_FORMAT_ARG_TYPE_STRBUF, &display->name},
-            }));
+            });
        }

        if(options->moduleArgs.outputFormat.length == 0)
@@ -68,7 +68,7 @@ void ffPrintMonitor(FFMonitorOptions* options)
            else
                buf[0] = '\0';

-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_MONITOR_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_MONITOR_NUM_FORMAT_ARGS, (FFformatarg[]) {
                {FF_FORMAT_ARG_TYPE_STRBUF, &display->name},
                {FF_FORMAT_ARG_TYPE_UINT, &display->width},
                {FF_FORMAT_ARG_TYPE_UINT, &display->height},
@@ -79,7 +79,7 @@ void ffPrintMonitor(FFMonitorOptions* options)
                {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureYear},
                {FF_FORMAT_ARG_TYPE_UINT16, &display->manufactureWeek},
                {FF_FORMAT_ARG_TYPE_STRING, buf},
-            }));
+            });
        }

        ffStrbufDestroy(&display->name);
@@ -110,7 +110,7 @@ void ffParseMonitorJsonObject(FFMonitorOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -179,18 +179,17 @@ void ffGenerateMonitorJsonResult(FF_MAYBE_UNUSED FFMonitorOptions* options, yyjs

 void ffPrintMonitorHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_MONITOR_MODULE_NAME, "{2}x{3} px - {4}x{5} mm ({6} inches, {7} ppi)", FF_MONITOR_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_MONITOR_MODULE_NAME, "{2}x{3} px - {4}x{5} mm ({6} inches, {7} ppi)", FF_MONITOR_NUM_FORMAT_ARGS, (const char* []) {
        "Display name",
-        "Native resolution width in pixels",
-        "Native resolution height in pixels",
-        "Physical width in millimeters",
-        "Physical height in millimeters",
-        "Physical diagonal length in inches",
-        "Pixels per inch (PPI)",
+        "Display native resolution width in pixels",
+        "Display native resolution height in pixels",
+        "Display physical width in millimeters",
+        "Display physical height in millimeters",
+        "Display physical diagonal length in inches",
        "Year of manufacturing",
        "Nth week of manufacturing in the year",
        "Serial number",
-    }));
+    });
 }

 void ffInitMonitorOptions(FFMonitorOptions* options)
@@ -25,10 +25,10 @@ static void formatKey(const FFNetIOOptions* options, FFNetIOResult* inf, uint32_
    else
    {
        ffStrbufClear(key);
-        FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 2, ((FFformatarg[]){
+        ffParseFormatString(key, &options->moduleArgs.key, 2, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT, &index},
            {FF_FORMAT_ARG_TYPE_STRBUF, &inf->name},
-        }));
+        });
    }
 }

@@ -39,7 +39,7 @@ void ffPrintNetIO(FFNetIOOptions* options)

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

@@ -79,7 +79,7 @@ void ffPrintNetIO(FFNetIOOptions* options)
            ffParseSize(inf->txBytes, &buffer2);
            if (!options->detectTotal) ffStrbufAppendS(&buffer2, "/s");

-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_NETIO_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_NETIO_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_STRBUF, &buffer},
                {FF_FORMAT_ARG_TYPE_STRBUF, &buffer2},
                {FF_FORMAT_ARG_TYPE_STRBUF, &inf->name},
@@ -92,7 +92,7 @@ void ffPrintNetIO(FFNetIOOptions* options)
                {FF_FORMAT_ARG_TYPE_UINT64, &inf->txErrors},
                {FF_FORMAT_ARG_TYPE_UINT64, &inf->rxDrops},
                {FF_FORMAT_ARG_TYPE_UINT64, &inf->txDrops},
-            }));
+            });
        }
        ++index;
    }
@@ -162,7 +162,7 @@ void ffParseNetIOJsonObject(FFNetIOOptions* options, yyjson_val* module)
            continue;
        }

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

@@ -218,7 +218,7 @@ void ffGenerateNetIOJsonResult(FFNetIOOptions* options, yyjson_mut_doc* doc, yyj

 void ffPrintNetIOHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_NETIO_MODULE_NAME, "{1} (IN) - {2} (OUT)", FF_NETIO_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_NETIO_MODULE_NAME, "{1} (IN) - {2} (OUT)", FF_NETIO_NUM_FORMAT_ARGS, (const char* []) {
        "Size of data received [per second] (formatted)",
        "Size of data sent [per second] (formatted)",
        "Interface name",
@@ -231,7 +231,7 @@ void ffPrintNetIOHelpFormat(void)
        "Number of errors sent [per second]",
        "Number of packets dropped when receiving [per second]",
        "Number of packets dropped when sending [per second]",
-    }));
+    });
 }

 void ffInitNetIOOptions(FFNetIOOptions* options)
@@ -16,7 +16,7 @@ void ffPrintOpenCL(FFOpenCLOptions* options)
    const char* error = ffDetectOpenCL(&opencl);

    if(error != NULL)
-        ffPrintError(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
    else
    {
        if(options->moduleArgs.outputFormat.length == 0)
@@ -26,11 +26,11 @@ void ffPrintOpenCL(FFOpenCLOptions* options)
        }
        else
        {
-            FF_PRINT_FORMAT_CHECKED(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_OPENCL_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+            ffPrintFormat(FF_OPENCL_MODULE_NAME, 0, &options->moduleArgs, FF_OPENCL_NUM_FORMAT_ARGS, (FFformatarg[]) {
                {FF_FORMAT_ARG_TYPE_STRBUF, &opencl.version},
                {FF_FORMAT_ARG_TYPE_STRBUF, &opencl.device},
                {FF_FORMAT_ARG_TYPE_STRBUF, &opencl.vendor},
-            }));
+            });
        }
    }

@@ -62,7 +62,7 @@ void ffParseOpenCLJsonObject(FFOpenCLOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -102,11 +102,11 @@ void ffGenerateOpenCLJsonResult(FF_MAYBE_UNUSED FFOpenCLOptions* options, yyjson

 void ffPrintOpenCLHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_OPENCL_MODULE_NAME, "{1}", FF_OPENCL_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_OPENCL_MODULE_NAME, "{1}", FF_OPENCL_NUM_FORMAT_ARGS, (const char* []) {
        "version",
        "device",
        "vendor"
-    }));
+    });
 }

 void ffInitOpenCLOptions(FFOpenCLOptions* options)
@@ -17,7 +17,7 @@ void ffPrintOpenGL(FFOpenGLOptions* options)
    const char* error = ffDetectOpenGL(options, &result);
    if(error)
    {
-        ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, "%s", error);
        return;
    }

@@ -28,12 +28,12 @@ void ffPrintOpenGL(FFOpenGLOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_OPENGL_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_OPENGL_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.version},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.renderer},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.vendor},
-            {FF_FORMAT_ARG_TYPE_STRBUF, &result.slv},
-        }));
+            {FF_FORMAT_ARG_TYPE_STRBUF, &result.slv}
+        });
    }

    ffStrbufDestroy(&result.version);
@@ -90,14 +90,14 @@ void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module)
                {},
            });
            if (error)
-                ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error);
+                ffPrintError(FF_OPENGL_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error);
            else
                options->library = (FFOpenGLLibrary) value;
            continue;
        }
        #endif

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

@@ -160,12 +160,12 @@ void ffGenerateOpenGLJsonResult(FF_MAYBE_UNUSED FFOpenGLOptions* options, yyjson

 void ffPrintOpenGLHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_OPENGL_MODULE_NAME, "{1}", FF_OPENGL_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_OPENGL_MODULE_NAME, "{1}", FF_OPENGL_NUM_FORMAT_ARGS, (const char* []) {
        "version",
        "renderer",
        "vendor",
        "shading language version"
-    }));
+    });
 }

 void ffInitOpenGLOptions(FFOpenGLOptions* options)
@@ -101,7 +101,7 @@ void ffPrintOS(FFOSOptions* options)

    if(os->name.length == 0 && os->prettyName.length == 0 && os->id.length == 0)
    {
-        ffPrintError(FF_OS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Could not detect OS");
+        ffPrintError(FF_OS_MODULE_NAME, 0, &options->moduleArgs, "Could not detect OS");
        return;
    }

@@ -119,7 +119,7 @@ void ffPrintOS(FFOSOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_OS_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_OS_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_OS_MODULE_NAME, 0, &options->moduleArgs, FF_OS_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &instance.state.platform.systemName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &os->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &os->prettyName},
@@ -132,7 +132,7 @@ void ffPrintOS(FFOSOptions* options)
            {FF_FORMAT_ARG_TYPE_STRBUF, &os->codename},
            {FF_FORMAT_ARG_TYPE_STRBUF, &os->buildID},
            {FF_FORMAT_ARG_TYPE_STRBUF, &instance.state.platform.systemArchitecture}
-        }));
+        });
    }
 }

@@ -159,7 +159,7 @@ void ffParseOSJsonObject(FFOSOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -196,7 +196,7 @@ void ffGenerateOSJsonResult(FF_MAYBE_UNUSED FFOSOptions* options, yyjson_mut_doc

 void ffPrintOSHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_OS_MODULE_NAME, "{3} {10} {12}", FF_OS_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_OS_MODULE_NAME, "{3} {10} {12}", FF_OS_NUM_FORMAT_ARGS, (const char* []) {
        "Name of the kernel (Linux, WIN32_NT, Darwin, FreeBSD)",
        "Name of the OS",
        "Pretty name of the OS",
@@ -209,7 +209,7 @@ void ffPrintOSHelpFormat(void)
        "Version codename of the OS",
        "Build ID of the OS",
        "Architecture of the OS"
-    }));
+    });
 }

 void ffInitOSOptions(FFOSOptions* options)
@@ -26,7 +26,6 @@ typedef enum FFPackagesFlags
    FF_PACKAGES_FLAG_SNAP_BIT = 1 << 16,
    FF_PACKAGES_FLAG_WINGET_BIT = 1 << 17,
    FF_PACKAGES_FLAG_XBPS_BIT = 1 << 18,
-    FF_PACKAGES_FLAG_AM_BIT = 1 << 19,
 } FFPackagesFlags;

 typedef struct FFPackagesOptions
@@ -4,7 +4,7 @@
 #include "modules/packages/packages.h"
 #include "util/stringUtils.h"

-#define FF_PACKAGES_NUM_FORMAT_ARGS 26
+#define FF_PACKAGES_NUM_FORMAT_ARGS 25

 void ffPrintPackages(FFPackagesOptions* options)
 {
@@ -15,7 +15,7 @@ void ffPrintPackages(FFPackagesOptions* options)

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

@@ -64,13 +64,12 @@ void ffPrintPackages(FFPackagesOptions* options)
        FF_PRINT_PACKAGE(paludis)
        FF_PRINT_PACKAGE(winget)
        FF_PRINT_PACKAGE(opkg)
-        FF_PRINT_PACKAGE(am)

        putchar('\n');
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PACKAGES_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PACKAGES_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT, &counts.all},
            {FF_FORMAT_ARG_TYPE_UINT, &counts.pacman},
            {FF_FORMAT_ARG_TYPE_STRBUF, &counts.pacmanBranch},
@@ -96,8 +95,7 @@ void ffPrintPackages(FFPackagesOptions* options)
            {FF_FORMAT_ARG_TYPE_UINT, &counts.paludis},
            {FF_FORMAT_ARG_TYPE_UINT, &counts.winget},
            {FF_FORMAT_ARG_TYPE_UINT, &counts.opkg},
-            {FF_FORMAT_ARG_TYPE_UINT, &counts.am},
-        }));
+        });
    }

    ffStrbufDestroy(&counts.pacmanBranch);
@@ -143,7 +141,6 @@ bool ffParsePackagesCommandOptions(FFPackagesOptions* options, const char* key,
            FF_TEST_PACKAGE_NAME(SNAP)
            FF_TEST_PACKAGE_NAME(WINGET)
            FF_TEST_PACKAGE_NAME(XBPS)
-            FF_TEST_PACKAGE_NAME(AM)
            #undef FF_TEST_PACKAGE_NAME

            if (end)
@@ -178,7 +175,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
        {
            if (!yyjson_is_null(val) && !yyjson_is_arr(val))
            {
-                ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid JSON value for %s", key);
+                ffPrintError(FF_PACKAGES_MODULE_NAME, 0, &options->moduleArgs, "Invalid JSON value for %s", key);
                continue;
            }

@@ -213,13 +210,12 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
                    FF_TEST_PACKAGE_NAME(SNAP)
                    FF_TEST_PACKAGE_NAME(WINGET)
                    FF_TEST_PACKAGE_NAME(XBPS)
-                    FF_TEST_PACKAGE_NAME(AM)
                    #undef FF_TEST_PACKAGE_NAME
                }
            }
        }

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

@@ -254,7 +250,6 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
        FF_TEST_PACKAGE_NAME(SNAP)
        FF_TEST_PACKAGE_NAME(WINGET)
        FF_TEST_PACKAGE_NAME(XBPS)
-        FF_TEST_PACKAGE_NAME(AM)
        #undef FF_TEST_PACKAGE_NAME
    }
 }
@@ -300,13 +295,12 @@ void ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy
    FF_APPEND_PACKAGE_COUNT(winget)
    FF_APPEND_PACKAGE_COUNT(xbps)
    FF_APPEND_PACKAGE_COUNT(opkg)
-    FF_APPEND_PACKAGE_COUNT(am)
    yyjson_mut_obj_add_strbuf(doc, obj, "pacmanBranch", &counts.pacmanBranch);
 }

 void ffPrintPackagesHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PACKAGES_MODULE_NAME, "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak-system), {15} (flatpack-user), {16} (snap), {17} (brew), {18} (brew-cask), {19} (MacPorts), {20} (scoop), {21} (choco), {22} (pkgtool), {23} (paludis), {24} (winget), {25} (opkg)", FF_PACKAGES_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_PACKAGES_MODULE_NAME, "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak-system), {15} (flatpack-user), {16} (snap), {17} (brew), {18} (brew-cask), {19} (MacPorts), {20} (scoop), {21} (choco), {22} (pkgtool), {23} (paludis), {24} (winget), {25} (opkg)", FF_PACKAGES_NUM_FORMAT_ARGS, (const char* []) {
        "Number of all packages",
        "Number of pacman packages",
        "Pacman branch on manjaro",
@@ -331,9 +325,8 @@ void ffPrintPackagesHelpFormat(void)
        "Number of pkgtool packages",
        "Number of paludis packages",
        "Number of winget packages",
-        "Number of opkg packages",
-        "Number of am packages",
-    }));
+        "Number of opkg packages"
+    });
 }

 void ffInitPackagesOptions(FFPackagesOptions* options)
@@ -7,7 +7,7 @@
 #include "util/stringUtils.h"

 #define FF_PHYSICALDISK_DISPLAY_NAME "Physical Disk"
-#define FF_PHYSICALDISK_NUM_FORMAT_ARGS 10
+#define FF_PHYSICALDISK_NUM_FORMAT_ARGS 9

 static int sortDevices(const FFPhysicalDiskResult* left, const FFPhysicalDiskResult* right)
 {
@@ -23,11 +23,11 @@ static void formatKey(const FFPhysicalDiskOptions* options, FFPhysicalDiskResult
    else
    {
        ffStrbufClear(key);
-        FF_PARSE_FORMAT_STRING_CHECKED(key, &options->moduleArgs.key, 3, ((FFformatarg[]){
+        ffParseFormatString(key, &options->moduleArgs.key, 2, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT, &index},
            {FF_FORMAT_ARG_TYPE_STRBUF, &dev->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &dev->devPath},
-        }));
+        });
    }
 }

@@ -38,7 +38,7 @@ void ffPrintPhysicalDisk(FFPhysicalDiskOptions* options)

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

@@ -108,7 +108,7 @@ void ffPrintPhysicalDisk(FFPhysicalDiskOptions* options)
            if (dev->type & FF_PHYSICALDISK_TYPE_READWRITE)
                readOnlyType = "Read-write";
            ffParseSize(dev->size, &buffer);
-            FF_PRINT_FORMAT_CHECKED(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_PHYSICALDISK_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            ffPrintFormatString(key.chars, 0, &options->moduleArgs, FF_PRINT_TYPE_NO_CUSTOM_KEY, FF_PHYSICALDISK_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_STRBUF, &buffer},
                {FF_FORMAT_ARG_TYPE_STRBUF, &dev->name},
                {FF_FORMAT_ARG_TYPE_STRBUF, &dev->interconnect},
@@ -119,7 +119,7 @@ void ffPrintPhysicalDisk(FFPhysicalDiskOptions* options)
                {FF_FORMAT_ARG_TYPE_STRING, readOnlyType},
                {FF_FORMAT_ARG_TYPE_STRBUF, &dev->revision},
                {FF_FORMAT_ARG_TYPE_DOUBLE, &tempStr},
-            }));
+            });
        }
        ++index;
    }
@@ -175,7 +175,7 @@ void ffParsePhysicalDiskJsonObject(FFPhysicalDiskOptions* options, yyjson_val* m
        if (ffTempsParseJsonObject(key, val, &options->temp, &options->tempConfig))
            continue;

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

@@ -252,7 +252,7 @@ void ffGeneratePhysicalDiskJsonResult(FFPhysicalDiskOptions* options, yyjson_mut

 void ffPrintPhysicalDiskHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PHYSICALDISK_MODULE_NAME, "{1}", FF_PHYSICALDISK_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_PHYSICALDISK_MODULE_NAME, "{1}", FF_PHYSICALDISK_NUM_FORMAT_ARGS, (const char* []) {
        "Device size (formatted)",
        "Device name",
        "Device interconnect type",
@@ -263,7 +263,7 @@ void ffPrintPhysicalDiskHelpFormat(void)
        "Device kind (Read-only or Read-write)",
        "Product revision",
        "Device temperature (formatted)",
-    }));
+    });
 }

 void ffInitPhysicalDiskOptions(FFPhysicalDiskOptions* options)
@@ -15,7 +15,7 @@ void ffPrintPlayer(FFPlayerOptions* options)

    if(media->error.length > 0)
    {
-        ffPrintError(FF_PLAYER_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", media->error.chars);
+        ffPrintError(FF_PLAYER_DISPLAY_NAME, 0, &options->moduleArgs, "%s", media->error.chars);
        return;
    }

@@ -64,12 +64,12 @@ void ffPrintPlayer(FFPlayerOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_PLAYER_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PLAYER_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_PLAYER_DISPLAY_NAME, 0, &options->moduleArgs, FF_PLAYER_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &playerPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &media->player},
            {FF_FORMAT_ARG_TYPE_STRBUF, &media->playerId},
            {FF_FORMAT_ARG_TYPE_STRBUF, &media->url}
-        }));
+        });
    }
 }

@@ -96,7 +96,7 @@ void ffParsePlayerJsonObject(FFPlayerOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -126,12 +126,12 @@ void ffGeneratePlayerJsonResult(FF_MAYBE_UNUSED FFMediaOptions* options, yyjson_

 void ffPrintPlayerHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PLAYER_MODULE_NAME, "{1}", FF_PLAYER_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_PLAYER_MODULE_NAME, "{1}", FF_PLAYER_NUM_FORMAT_ARGS, (const char* []) {
        "Pretty player name",
        "Player name",
        "Player Identifier",
        "URL name"
-    }));
+    });
 }

 void ffInitPlayerOptions(FFPlayerOptions* options)
@@ -15,11 +15,11 @@ void ffPrintPowerAdapter(FFPowerAdapterOptions* options)

    if (error)
    {
-        ffPrintError(FF_POWERADAPTER_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", error);
+        ffPrintError(FF_POWERADAPTER_DISPLAY_NAME, 0, &options->moduleArgs, "%s", error);
    }
    else if(results.length == 0)
    {
-        ffPrintError(FF_POWERADAPTER_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No power adapters found");
+        ffPrintError(FF_POWERADAPTER_DISPLAY_NAME, 0, &options->moduleArgs, "No power adapters found");
    }
    else
    {
@@ -38,14 +38,14 @@ void ffPrintPowerAdapter(FFPowerAdapterOptions* options)
            }
            else
            {
-                FF_PRINT_FORMAT_CHECKED(FF_POWERADAPTER_DISPLAY_NAME, i, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_POWERADAPTER_NUM_FORMAT_ARGS, ((FFformatarg[]){
+                ffPrintFormat(FF_POWERADAPTER_DISPLAY_NAME, i, &options->moduleArgs, FF_POWERADAPTER_NUM_FORMAT_ARGS, (FFformatarg[]){
                    {FF_FORMAT_ARG_TYPE_INT, &result->watts},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &result->name},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &result->manufacturer},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &result->modelName},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &result->description},
                    {FF_FORMAT_ARG_TYPE_STRBUF, &result->serial},
-                }));
+                });
            }

            ffStrbufDestroy(&result->manufacturer);
@@ -88,7 +88,7 @@ void ffParsePowerAdapterJsonObject(FFPowerAdapterOptions* options, yyjson_val* m
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -124,14 +124,14 @@ void ffGeneratePowerAdapterJsonResult(FF_MAYBE_UNUSED FFPowerAdapterOptions* opt

 void ffPrintPowerAdapterHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_POWERADAPTER_MODULE_NAME, "{1}W", FF_POWERADAPTER_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_POWERADAPTER_MODULE_NAME, "{1}W", FF_POWERADAPTER_NUM_FORMAT_ARGS, (const char* []) {
        "PowerAdapter watts",
        "PowerAdapter name",
        "PowerAdapter manufacturer",
        "PowerAdapter model",
-        "PowerAdapter description",
-        "PowerAdapter serial number",
-    }));
+        "PowerAdapter description"
+        "PowerAdapter serial number"
+    });
 }

 void ffInitPowerAdapterOptions(FFPowerAdapterOptions* options)
@@ -13,7 +13,7 @@ void ffPrintProcesses(FFProcessesOptions* options)

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

@@ -25,9 +25,9 @@ void ffPrintProcesses(FFProcessesOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PROCESSES_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_PROCESSES_MODULE_NAME, 0, &options->moduleArgs, FF_PROCESSES_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_UINT, &numProcesses}
-        }));
+        });
    }
 }

@@ -54,7 +54,7 @@ void ffParseProcessesJsonObject(FFProcessesOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -82,7 +82,7 @@ void ffGenerateProcessesJsonResult(FF_MAYBE_UNUSED FFProcessesOptions* options,

 void ffPrintProcessesHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PROCESSES_MODULE_NAME, "{1}", FF_PROCESSES_NUM_FORMAT_ARGS, (const char* []) {
+    ffPrintModuleFormatHelp(FF_PROCESSES_MODULE_NAME, "{1}", FF_PROCESSES_NUM_FORMAT_ARGS, (const char* []) {
        "Count"
    });
 }
@@ -5,7 +5,7 @@
 #include "util/stringUtils.h"

 #define FF_PUBLICIP_DISPLAY_NAME "Public IP"
-#define FF_PUBLICIP_NUM_FORMAT_ARGS 2
+#define FF_PUBLICIP_NUM_FORMAT_ARGS 1

 void ffPrintPublicIp(FFPublicIpOptions* options)
 {
@@ -16,7 +16,7 @@ void ffPrintPublicIp(FFPublicIpOptions* options)

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

@@ -30,10 +30,10 @@ void ffPrintPublicIp(FFPublicIpOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_PUBLICIP_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_PUBLICIP_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_PUBLICIP_DISPLAY_NAME, 0, &options->moduleArgs, FF_PUBLICIP_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.ip},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result.location},
-        }));
+        });
    }

    ffStrbufDestroy(&result.ip);
@@ -87,7 +87,7 @@ void ffParsePublicIpJsonObject(FFPublicIpOptions* options, yyjson_val* module)
            continue;
        }

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

@@ -125,10 +125,10 @@ void ffGeneratePublicIpJsonResult(FFPublicIpOptions* options, yyjson_mut_doc* do

 void ffPrintPublicIpHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_PUBLICIP_MODULE_NAME, "{1} ({2})", FF_PUBLICIP_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_PUBLICIP_MODULE_NAME, "{1} ({2})", FF_PUBLICIP_NUM_FORMAT_ARGS, (const char* []) {
        "Public IP address",
        "Location"
-    }));
+    });
 }

 void ffInitPublicIpOptions(FFPublicIpOptions* options)
@@ -105,7 +105,7 @@ void ffParseSeparatorJsonObject(FFSeparatorOptions* options, yyjson_val* module)
            continue;
        }

-        ffPrintError(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
+        ffPrintErrorString(FF_SEPARATOR_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
    }
 }

@@ -4,7 +4,7 @@
 #include "modules/shell/shell.h"
 #include "util/stringUtils.h"

-#define FF_SHELL_NUM_FORMAT_ARGS 8
+#define FF_SHELL_NUM_FORMAT_ARGS 6

 void ffPrintShell(FFShellOptions* options)
 {
@@ -12,7 +12,7 @@ void ffPrintShell(FFShellOptions* options)

    if(result->processName.length == 0)
    {
-        ffPrintError(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Couldn't detect shell");
+        ffPrintError(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, "Couldn't detect shell");
        return;
    }

@@ -31,7 +31,7 @@ void ffPrintShell(FFShellOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_SHELL_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_SHELL_MODULE_NAME, 0, &options->moduleArgs, FF_SHELL_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->processName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->exe},
            {FF_FORMAT_ARG_TYPE_STRING, result->exeName},
@@ -40,7 +40,7 @@ void ffPrintShell(FFShellOptions* options)
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->prettyName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->exePath},
            {FF_FORMAT_ARG_TYPE_INT, &result->tty},
-        }));
+        });
    }
 }

@@ -67,7 +67,7 @@ void ffParseShellJsonObject(FFShellOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -106,7 +106,7 @@ void ffGenerateShellJsonResult(FF_MAYBE_UNUSED FFShellOptions* options, yyjson_m

 void ffPrintShellHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_SHELL_MODULE_NAME, "{3} {4}", FF_SHELL_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_SHELL_MODULE_NAME, "{3} {4}", FF_SHELL_NUM_FORMAT_ARGS, (const char* []) {
        "Shell process name",
        "The first argument of the command line when running the shell",
        "Shell base name of arg0",
@@ -114,8 +114,7 @@ void ffPrintShellHelpFormat(void)
        "Shell pid",
        "Shell pretty name",
        "Shell full exe path",
-        "Shell tty used",
-    }));
+    });
 }

 void ffInitShellOptions(FFShellOptions* options)
@@ -49,12 +49,12 @@ static void printDevice(FFSoundOptions* options, const FFSoundDevice* device, ui
        FF_STRBUF_AUTO_DESTROY percentageStr = ffStrbufCreate();
        ffPercentAppendNum(&percentageStr, device->volume, options->percent, false);

-        FF_PRINT_FORMAT_CHECKED(FF_SOUND_MODULE_NAME, index, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_SOUND_NUM_FORMAT_ARGS, ((FFformatarg[]) {
+        ffPrintFormat(FF_SOUND_MODULE_NAME, index, &options->moduleArgs, FF_SOUND_NUM_FORMAT_ARGS, (FFformatarg[]) {
            {FF_FORMAT_ARG_TYPE_BOOL, &device->main},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->name},
            {FF_FORMAT_ARG_TYPE_STRBUF, &percentageStr},
            {FF_FORMAT_ARG_TYPE_STRBUF, &device->identifier}
-        }));
+        });
    }
 }

@@ -66,7 +66,7 @@ void ffPrintSound(FFSoundOptions* options)

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

@@ -86,7 +86,7 @@ void ffPrintSound(FFSoundOptions* options)

    if(filtered.length == 0)
    {
-        ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "No active sound devices found");
+        ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, "No active sound devices found");
        return;
    }

@@ -150,7 +150,7 @@ void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module)
                {},
            });
            if (error)
-                ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Invalid %s value: %s", key, error);
+                ffPrintError(FF_SOUND_MODULE_NAME, 0, &options->moduleArgs, "Invalid %s value: %s", key, error);
            else
                options->soundType = (FFSoundType) value;
            continue;
@@ -159,7 +159,7 @@ void ffParseSoundJsonObject(FFSoundOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -231,12 +231,12 @@ void ffGenerateSoundJsonResult(FF_MAYBE_UNUSED FFSoundOptions* options, yyjson_m

 void ffPrintSoundHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_SOUND_MODULE_NAME, "{2} ({3}%)", FF_SOUND_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_SOUND_MODULE_NAME, "{2} ({3}%)", FF_SOUND_NUM_FORMAT_ARGS, (const char* []) {
        "Is main sound device",
        "Device name",
        "Volume",
        "Identifier"
-    }));
+    });
 }

 void ffInitSoundOptions(FFSoundOptions* options)
@@ -15,7 +15,7 @@ void ffPrintSwap(FFSwapOptions* options)

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

@@ -67,11 +67,11 @@ void ffPrintSwap(FFSwapOptions* options)
    {
        FF_STRBUF_AUTO_DESTROY percentageStr = ffStrbufCreate();
        ffPercentAppendNum(&percentageStr, percentage, options->percent, false);
-        FF_PRINT_FORMAT_CHECKED(FF_SWAP_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_SWAP_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_SWAP_MODULE_NAME, 0, &options->moduleArgs, FF_SWAP_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &usedPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &totalPretty},
            {FF_FORMAT_ARG_TYPE_STRBUF, &percentageStr},
-        }));
+        });
    }
 }

@@ -104,7 +104,7 @@ void ffParseSwapJsonObject(FFSwapOptions* options, yyjson_val* module)
        if (ffPercentParseJsonObject(key, val, &options->percent))
            continue;

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

@@ -136,11 +136,11 @@ void ffGenerateSwapJsonResult(FF_MAYBE_UNUSED FFSwapOptions* options, yyjson_mut

 void ffPrintSwapHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_SWAP_MODULE_NAME, "{1} / {2} ({3})", FF_SWAP_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_SWAP_MODULE_NAME, "{1} / {2} ({3})", FF_SWAP_NUM_FORMAT_ARGS, (const char* []) {
        "Used size",
        "Total size",
        "Percentage used"
-    }));
+    });
 }

 void ffInitSwapOptions(FFSwapOptions* options)
@@ -14,7 +14,7 @@ void ffPrintTerminal(FFTerminalOptions* options)

    if(result->processName.length == 0)
    {
-        ffPrintError(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Couldn't detect terminal");
+        ffPrintError(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, "Couldn't detect terminal");
        return;
    }

@@ -29,7 +29,7 @@ void ffPrintTerminal(FFTerminalOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_TERMINAL_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_TERMINAL_MODULE_NAME, 0, &options->moduleArgs, FF_TERMINAL_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->processName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->exe},
            {FF_FORMAT_ARG_TYPE_STRING, result->exeName},
@@ -38,7 +38,7 @@ void ffPrintTerminal(FFTerminalOptions* options)
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->version},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->exePath},
            {FF_FORMAT_ARG_TYPE_STRBUF, &result->tty},
-        }));
+        });
    }
 }

@@ -65,7 +65,7 @@ void ffParseTerminalJsonObject(FFTerminalOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -101,7 +101,7 @@ void ffGenerateTerminalJsonResult(FF_MAYBE_UNUSED FFTerminalOptions* options, yy

 void ffPrintTerminalHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_TERMINAL_MODULE_NAME, "{5} {6}", FF_TERMINAL_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_TERMINAL_MODULE_NAME, "{5} {6}", FF_TERMINAL_NUM_FORMAT_ARGS, (const char* []) {
        "Terminal process name",
        "The first argument of the command line when running the terminal",
        "Terminal base name of arg0",
@@ -110,7 +110,7 @@ void ffPrintTerminalHelpFormat(void)
        "Terminal version",
        "Terminal full exe path",
        "Terminal tty / pts used",
-    }));
+    });
 }

 void ffInitTerminalOptions(FFTerminalOptions* options)
@@ -16,7 +16,7 @@ void ffPrintTerminalFont(FFTerminalFontOptions* options)

    if(!ffDetectTerminalFont(&terminalFont))
    {
-        ffPrintError(FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "%s", terminalFont.error.chars);
+        ffPrintError(FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, "%s", terminalFont.error.chars);
    }
    else
    {
@@ -33,12 +33,12 @@ void ffPrintTerminalFont(FFTerminalFontOptions* options)
        }
        else
        {
-            FF_PRINT_FORMAT_CHECKED(FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_TERMINALFONT_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            ffPrintFormat(FF_TERMINALFONT_DISPLAY_NAME, 0, &options->moduleArgs, FF_TERMINALFONT_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont.font.pretty},
                {FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont.font.name},
                {FF_FORMAT_ARG_TYPE_STRBUF, &terminalFont.font.size},
                {FF_FORMAT_ARG_TYPE_LIST,   &terminalFont.font.styles}
-            }));
+            });
        }
    }

@@ -70,7 +70,7 @@ void ffParseTerminalFontJsonObject(FFTerminalFontOptions* options, yyjson_val* m
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -123,12 +123,12 @@ void ffGenerateTerminalFontJsonResult(FF_MAYBE_UNUSED FFTerminalOptions* options

 void ffPrintTerminalFontHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_TERMINALFONT_MODULE_NAME, "{1}", FF_TERMINALFONT_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_TERMINALFONT_MODULE_NAME, "{1}", FF_TERMINALFONT_NUM_FORMAT_ARGS, (const char* []) {
        "Terminal font combined",
        "Terminal font name",
        "Terminal font size",
        "Terminal font styles"
-    }));
+    });
 }

 void ffInitTerminalFontOptions(FFTerminalFontOptions* options)
@@ -13,7 +13,7 @@ void ffPrintTerminalSize(FFTerminalSizeOptions* options)

    if(!ffDetectTerminalSize(&result))
    {
-        ffPrintError(FF_TERMINALSIZE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Failed to detect terminal size");
+        ffPrintError(FF_TERMINALSIZE_DISPLAY_NAME, 0, &options->moduleArgs, "Failed to detect terminal size");
    }
    else
    {
@@ -29,12 +29,12 @@ void ffPrintTerminalSize(FFTerminalSizeOptions* options)
        }
        else
        {
-            FF_PRINT_FORMAT_CHECKED(FF_TERMINALSIZE_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_TERMINALSIZE_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            ffPrintFormat(FF_TERMINALSIZE_DISPLAY_NAME, 0, &options->moduleArgs, FF_TERMINALSIZE_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_UINT16, &result.rows},
                {FF_FORMAT_ARG_TYPE_UINT16, &result.columns},
                {FF_FORMAT_ARG_TYPE_UINT16, &result.width},
                {FF_FORMAT_ARG_TYPE_UINT16, &result.height}
-            }));
+            });
        }
    }
 }
@@ -62,7 +62,7 @@ void ffParseTerminalSizeJsonObject(FFTerminalSizeOptions* options, yyjson_val* m
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -93,12 +93,12 @@ void ffGenerateTerminalSizeJsonResult(FF_MAYBE_UNUSED FFTerminalOptions* options

 void ffPrintTerminalSizeHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_TERMINALSIZE_MODULE_NAME, "{1} columns x {2} rows ({3}px x {4}px)", FF_TERMINALSIZE_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_TERMINALSIZE_MODULE_NAME, "{1} columns x {2} rows ({3}px x {4}px)", FF_TERMINALSIZE_NUM_FORMAT_ARGS, (const char* []) {
        "Terminal rows",
        "Terminal columns",
        "Terminal width (in pixels)",
        "Terminal height (in pixels)"
-    }));
+    });
 }

 void ffInitTerminalSizeOptions(FFTerminalSizeOptions* options)
@@ -15,7 +15,7 @@ void ffPrintTerminalTheme(FFTerminalThemeOptions* options)

    if(!ffDetectTerminalTheme(&result))
    {
-        ffPrintError(FF_TERMINALTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, "Failed to detect terminal theme");
+        ffPrintError(FF_TERMINALTHEME_DISPLAY_NAME, 0, &options->moduleArgs, "Failed to detect terminal theme");
    }
    else
    {
@@ -32,12 +32,12 @@ void ffPrintTerminalTheme(FFTerminalThemeOptions* options)
            char fg[32], bg[32];
            snprintf(fg, sizeof(fg), "#%02" PRIX16 "%02" PRIX16 "%02" PRIX16, result.fg.r, result.fg.g, result.fg.b);
            snprintf(bg, sizeof(bg), "#%02" PRIX16 "%02" PRIX16 "%02" PRIX16, result.bg.r, result.bg.g, result.bg.b);
-            FF_PRINT_FORMAT_CHECKED(FF_TERMINALTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_TERMINALTHEME_NUM_FORMAT_ARGS, ((FFformatarg[]){
+            ffPrintFormat(FF_TERMINALTHEME_DISPLAY_NAME, 0, &options->moduleArgs, FF_TERMINALTHEME_NUM_FORMAT_ARGS, (FFformatarg[]){
                {FF_FORMAT_ARG_TYPE_STRING, fg},
                {FF_FORMAT_ARG_TYPE_STRING, result.fg.dark ? "Dark" : "Light"},
                {FF_FORMAT_ARG_TYPE_STRING, bg},
                {FF_FORMAT_ARG_TYPE_STRING, result.bg.dark ? "Dark" : "Light"},
-            }));
+            });
        }
    }
 }
@@ -65,7 +65,7 @@ void ffParseTerminalThemeJsonObject(FFTerminalThemeOptions* options, yyjson_val*
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -104,12 +104,12 @@ void ffGenerateTerminalThemeJsonResult(FF_MAYBE_UNUSED FFTerminalOptions* option

 void ffPrintTerminalThemeHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_TERMINALTHEME_MODULE_NAME, "{1} (FG) {3} (BG) [{4}]", FF_TERMINALTHEME_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_TERMINALTHEME_MODULE_NAME, "{1} (FG) {3} (BG) [{4}]", FF_TERMINALTHEME_NUM_FORMAT_ARGS, (const char* []) {
        "Terminal foreground color",
        "Terminal foreground type (Dark / Light)",
        "Terminal background color",
        "Terminal background type (Dark / Light)",
-    }));
+    });
 }

 void ffInitTerminalThemeOptions(FFTerminalThemeOptions* options)
@@ -13,7 +13,7 @@ void ffPrintTheme(FFThemeOptions* options)

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

@@ -24,9 +24,9 @@ void ffPrintTheme(FFThemeOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_THEME_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_THEME_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_THEME_MODULE_NAME, 0, &options->moduleArgs, FF_THEME_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &theme}
-        }));
+        });
    }
 }

@@ -53,7 +53,7 @@ void ffParseThemeJsonObject(FFThemeOptions* options, yyjson_val* module)
        if (ffJsonConfigParseModuleArgs(key, val, &options->moduleArgs))
            continue;

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

@@ -81,9 +81,9 @@ void ffGenerateThemeJsonResult(FF_MAYBE_UNUSED FFThemeOptions* options, yyjson_m

 void ffPrintThemeHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_THEME_MODULE_NAME, "{1}", FF_THEME_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_THEME_MODULE_NAME, "{1}", FF_THEME_NUM_FORMAT_ARGS, (const char* []) {
        "Combined themes"
-    }));
+    });
 }

 void ffInitThemeOptions(FFThemeOptions* options)
@@ -56,7 +56,7 @@ void ffPrintTitle(FFTitleOptions* options)
    }
    else
    {
-        FF_PRINT_FORMAT_CHECKED(FF_TITLE_MODULE_NAME, 0, &options->moduleArgs, FF_PRINT_TYPE_DEFAULT, FF_TITLE_NUM_FORMAT_ARGS, ((FFformatarg[]){
+        ffPrintFormat(FF_TITLE_MODULE_NAME, 0, &options->moduleArgs, FF_TITLE_NUM_FORMAT_ARGS, (FFformatarg[]){
            {FF_FORMAT_ARG_TYPE_STRBUF, &instance.state.platform.userName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &hostName},
            {FF_FORMAT_ARG_TYPE_STRBUF, &instance.state.platform.homeDir},
@@ -65,7 +65,7 @@ void ffPrintTitle(FFTitleOptions* options)
            {FF_FORMAT_ARG_TYPE_STRBUF, &userNameColored},
            {FF_FORMAT_ARG_TYPE_STRBUF, &atColored},
            {FF_FORMAT_ARG_TYPE_STRBUF, &hostNameColored},
-        }));
+        });
    }
 }

@@ -139,7 +139,7 @@ void ffParseTitleJsonObject(FFTitleOptions* options, yyjson_val* module)
            continue;
        }

-        ffPrintError(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
+        ffPrintErrorString(FF_TITLE_MODULE_NAME, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "Unknown JSON key %s", key);
    }
 }

@@ -181,7 +181,7 @@ void ffGenerateTitleJsonResult(FF_MAYBE_UNUSED FFTitleOptions* options, yyjson_m

 void ffPrintTitleHelpFormat(void)
 {
-    FF_PRINT_MODULE_FORMAT_HELP_CHECKED(FF_TITLE_MODULE_NAME, "{6}{7}{8}", FF_TITLE_NUM_FORMAT_ARGS, ((const char* []) {
+    ffPrintModuleFormatHelp(FF_TITLE_MODULE_NAME, "{6}{7}{8}", FF_TITLE_NUM_FORMAT_ARGS, (const char* []) {
        "User name",
        "Host name",
        "Home directory",
@@ -190,7 +190,7 @@ void ffPrintTitleHelpFormat(void)
        "User name (colored)",
        "@ symbol (colored)",
        "Host name (colored)"
-    }));
+    });
 }

 void ffInitTitleOptions(FFTitleOptions* options)
--- a/Show More
+++ b/Show More