Merge pull request #2370 from fastfetch-cli/dev

Release: v2.64.1
2026-09-12 10:22:12 +02:00 · 2026-06-04 23:45:19 +08:00 · 2026-06-04 20:15:54 +08:00 · 2026-06-04 20:15:54 +08:00 · 2026-06-04 17:22:24 +08:00 · 2026-06-04 17:22:24 +08:00
1405 changed files with 58510 additions and 43883 deletions
@@ -0,0 +1,89 @@
+# find . -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" -o -name "*.m" -o -name "*.mm" \) -print0 | xargs -0 clang-format -i
+
+BasedOnStyle: LLVM
+
+UseTab: Never
+IndentWidth: 4
+TabWidth: 4
+ContinuationIndentWidth: 4
+
+ColumnLimit: 0
+ReflowComments: true
+
+BreakBeforeBraces: Attach
+BreakBeforeCloseBracketBracedList: true
+BraceWrapping:
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeElse: false
+  BeforeCatch: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+IndentExternBlock: NoIndent
+
+AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortLoopsOnASingleLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Empty
+InsertBraces: true
+
+PointerAlignment: Left
+DerivePointerAlignment: false
+SpaceBeforeParens: ControlStatements
+SpacesInParentheses: false
+SpaceAfterCStyleCast: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: 1
+SpacesInContainerLiterals: true
+
+SortIncludes: Never
+IndentPPDirectives: BeforeHash
+PPIndentWidth: 4
+
+IndentCaseLabels: true
+
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: DontAlign
+
+BinPackParameters: false
+BinPackArguments: false
+AlignAfterOpenBracket: DontAlign
+BracedInitializerIndentWidth: 4
+Cpp11BracedListStyle: Block
+
+ForEachMacros:
+  - FF_LIST_FOR_EACH
+  - yyjson_obj_foreach
+  - yyjson_arr_foreach
+  - yyjson_mut_obj_foreach
+  - yyjson_mut_arr_foreach
+
+AttributeMacros:
+  - FF_A_FALLTHROUGH
+  - FF_A_DEPRECATED
+  - FF_A_CLEANUP
+  - FF_A_NODISCARD
+  - FF_A_PRINTF
+  - FF_A_SCANF
+  - FF_A_NONNULL
+  - FF_A_RETURNS_NONNULL
+  - FF_A_UNUSED
+  - FF_A_PACKED
+  - FF_A_WEAK_IMPORT
+
+MaxEmptyLinesToKeep: 1
+KeepEmptyLinesAtTheStartOfBlocks: false
+
+---
+Language: ObjC
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+ObjCBreakBeforeNestedBlockParam: true
@@ -0,0 +1,3 @@
+src/3rdparty/**
+build/**
+src/logo/builtin.c
@@ -16,6 +16,15 @@ body:
      options:
        - label: I have checked the FAQ but the issue is not covered
          required: true
+  - type: checkboxes
+    attributes:
+      label: Not a known issue
+      description: Please check if the issue is already known and being worked on.
+      options:
+        - label: I have checked the existing issues but the issue is not covered
+          required: true
+        - label: My issue is not about crashing on Fedora and KDE 6.6
+          required: true
  - type: markdown
    attributes:
      value: "### General description of the bug"
@@ -6,35 +6,42 @@ body:
  - type: markdown
    attributes:
      value: |
-        Tip: A logo can be displayed by fastfetch without getting into fastfetch's official repo.
-        For highly customized logo for personal use, it's recommended to keep it locally.
+        Tip: You can display a logo in fastfetch without adding it to fastfetch's official repo.
+        For highly customized, personal logos, we recommend keeping them locally.
        Please refer to https://github.com/fastfetch-cli/fastfetch/wiki/Migrate-Neofetch-Logo-To-Fastfetch
  - type: textarea
    attributes:
      label: OS
-      description: Paste content of `/etc/os-release` and `/etc/lsb-release` here. If none of these files exist, describe a way to identify the distro
+      description: Paste the contents of `/etc/os-release` and `/etc/lsb-release` here. If neither file exists, describe how to identify the distro.
      placeholder: cat /etc/os-release
    validations:
      required: true
+  - type: input
+    attributes:
+      label: Distro Website
+      description: To help prevent spam and verify the request, a distro website is required, and a downloadable ISO must be available on that site.
+      placeholder: https://example.com
+    validations:
+      required: true
  - type: textarea
    attributes:
      label: ASCII Art
-      description: An ASCII logo should not take up too much space (smaller than 50x20 characters). Please also include the color codes if not available in `os-release`
+      description: The ASCII logo should not take up too much space (smaller than 50x20 characters, W x H). Please also include the color codes if they are not available in `os-release`.
      placeholder: Paste ASCII art here
    validations:
      required: true
  - type: input
    attributes:
-      label: Original Image
-      description: If the ASCII art is based on an image, please provide a link to the original image
-      placeholder: Image URL or distro website URL
+      label: Original Image URL
+      description: If the ASCII art is based on an image, please provide a link to the original image file.
+      placeholder: Image URL from the distro website mentioned above
  - type: checkboxes
    attributes:
      label: Checklist
      options:
-        - label: The ASCII art is smaller than 50x20 characters (width x height)
+        - label: The ASCII art is smaller than 50x20 characters (W x H).
          required: true
-        - label: The ASCII art contains color codes, or the color codes are available in `os-release`
+        - label: The ASCII art includes color codes, or the color codes are available in `os-release`.
          required: true
-        - label: The ASCII art contains no internal paddings (spaces at the start and the end of lines)
+        - label: The ASCII art has no internal padding (spaces at the start and/or end of lines).
          required: true
@@ -0,0 +1,30 @@
+## Summary
+
+<!-- Briefly describe what this PR does. -->
+
+## Related issue (required for new logos for new distros)
+
+<!--
+If this PR adds a new logo, it MUST be linked to an existing "Logo Request" issue and has the requests fulfilled.
+
+Use one of the following formats so GitHub links it properly:
+- Closes #1234
+- Fixes #1234
+- Resolves #1234
+
+PRs that add logos without an associated Logo Request issue will not be accepted.
+-->
+
+Closes #
+
+## Changes
+
+- 
+
+## Screenshots
+
+<!-- Required if this PR introduces visual changes. -->
+
+## Checklist
+
+- [ ] I have tested my changes locally.
@@ -0,0 +1,40 @@
+name: Reusable DragonFly amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: vmactions/dragonflybsd-vm@v1
+        with:
+          usesh: yes
+          envs: 'CMAKE_BUILD_TYPE'
+          prepare: |
+            uname -a
+            pkg update
+            pkg install -y llvm cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl egl opencl ocl-icd v4l_compat chafa libelf lua54 libva libvdpau
+
+          run: |
+            env CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-dragonfly-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,42 @@
+name: Reusable FreeBSD amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: cross-platform-actions/action@master
+        with:
+          operating_system: freebsd
+          architecture: x86-64
+          cpu_count: 4
+          shell: bash
+          version: '15.0'
+          environment_variables: 'CMAKE_BUILD_TYPE'
+          run: |
+            uname -a
+            sudo pkg update
+            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl egl opencl ocl-icd v4l_compat chafa lua54 libva libvdpau
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-freebsd-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,40 @@
+name: Reusable Haiku amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: cross-platform-actions/action@master
+        with:
+          operating_system: haiku
+          version: 'r1beta5'
+          architecture: x86-64
+          cpu_count: 4
+          shell: bash
+          environment_variables: 'CMAKE_BUILD_TYPE'
+          run: |
+            uname -a
+            pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10 || pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10 lua
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-haiku-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,40 @@
+name: Reusable Linux armv6l
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: uraimo/run-on-arch-action@v3
+        id: runcmd
+        with:
+          arch: armv6
+          distro: bookworm
+          githubToken: ${{ github.token }}
+          run: |
+            uname -a
+            apt-get update && apt-get install -y wget
+            apt-get install -y cmake make gcc libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libefl-all-dev liblua5.4-dev libvdpau-dev libva-dev rpm
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-linux-armv6l
+          path: ./fastfetch-*.*
@@ -0,0 +1,44 @@
+name: Reusable Linux armv7l
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: uraimo/run-on-arch-action@v3
+        id: runcmd
+        with:
+          arch: armv7
+          distro: ubuntu22.04
+          githubToken: ${{ github.token }}
+          run: |
+            uname -a
+            apt-get update && apt-get install -y software-properties-common ca-certificates gpg curl
+            add-apt-repository -y ppa:ubuntu-toolchain-r/test
+            curl -L https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
+            echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
+            echo -e 'Acquire::https::Verify-Peer "false";\nAcquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99ignore-certificates
+            apt-get update && apt-get install -y cmake make gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libefl-all-dev liblua5.4-dev libvdpau-dev libva-dev rpm
+            CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-linux-armv7l
+          path: ./fastfetch-*.*
@@ -0,0 +1,103 @@
+name: Reusable Linux Hosts
+
+on:
+  workflow_call:
+    inputs:
+      arch:
+        required: true
+        type: string
+      runs-on:
+        required: true
+        type: string
+    outputs:
+      ffversion:
+        description: fastfetch version from linux host build
+        value: ${{ jobs.build.outputs.ffversion }}
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ${{ inputs.runs-on }}
+    outputs:
+      ffversion: ${{ steps.ffversion.outputs.ffversion }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: uname -a
+        run: uname -a
+
+      - name: cat /etc/os-release
+        run: cat /etc/os-release
+
+      - name: cat /proc/cpuinfo
+        run: cat /proc/cpuinfo
+
+      - name: add gcc-13 repo
+        run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+
+      - name: install required packages
+        run: sudo apt-get update && sudo apt-get install -y gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev libefl-all-dev libunwind-dev liblua5.4-dev libvdpau-dev libva-dev rpm ninja-build
+
+      - name: install linuxbrew packages
+        run: |
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+          /home/linuxbrew/.linuxbrew/bin/brew install imagemagick chafa quickjs-ng --ignore-dependencies
+
+      - name: Initialize CodeQL
+        if: inputs.arch == 'amd64'
+        uses: github/codeql-action/init@v4
+        with:
+          languages: c
+
+      - name: configure project
+        run: CC=gcc-13 CMAKE_PREFIX_PATH=/home/linuxbrew/.linuxbrew PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
+
+      - name: build project
+        run: cmake --build . --target package --verbose -j4
+
+      - name: perform CodeQL analysis
+        if: inputs.arch == 'amd64'
+        uses: github/codeql-action/analyze@v4
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
+
+      - name: run fastfetch --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: print dependencies
+        run: ldd fastfetch
+
+      - name: run tests
+        run: ctest --output-on-failure
+
+      - name: get fastfetch version
+        id: ffversion
+        run: echo "ffversion=$(./fastfetch --version-raw)" >> $GITHUB_OUTPUT
+
+      - name: polyfill glibc
+        run: |
+          wget https://github.com/CarterLi/polyfill-glibc/releases/download/v0.0.1/polyfill-glibc-${{ inputs.arch }} -O polyfill-glibc
+          chmod +x polyfill-glibc
+          strip fastfetch && ./polyfill-glibc fastfetch --target-glibc=2.17
+          strip flashfetch && ./polyfill-glibc flashfetch --target-glibc=2.17
+          echo 'set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-polyfilled")' >> CPackConfig.cmake
+          echo 'set(CPACK_PACKAGE_RELOCATABLE OFF)' >> CPackConfig.cmake
+          echo 'set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.17)")' >> CPackConfig.cmake
+          echo 'set(CPACK_RPM_SPEC_MORE_DEFINE "%global __os_install_post %{nil}")' >> CPackConfig.cmake
+          cpack -V
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-linux-${{ inputs.arch }}
+          path: ./fastfetch-*.*
@@ -0,0 +1,70 @@
+name: Reusable Linux i686
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: uname -a
+        run: uname -a
+
+      - name: cat /etc/os-release
+        run: cat /etc/os-release
+
+      - name: cat /proc/cpuinfo
+        run: cat /proc/cpuinfo
+
+      - name: add gcc-13 repo
+        run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+
+      - name: install required packages
+        run: sudo apt-get update && sudo apt-get install -y gcc-13 gcc-13-multilib libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev libefl-all-dev libunwind-dev liblua5.4-dev libvdpau-dev libva-dev rpm ninja-build
+
+      - name: install linuxbrew packages
+        run: |
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+          /home/linuxbrew/.linuxbrew/bin/brew install imagemagick chafa quickjs-ng --ignore-dependencies
+
+      - name: cmake version
+        run: cmake --version
+
+      - name: configure project
+        run: CC=gcc-13 CMAKE_PREFIX_PATH=/home/linuxbrew/.linuxbrew PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DCMAKE_C_FLAGS="-m32 -march=i686 -mtune=i686" -DCMAKE_SYSTEM_PROCESSOR_OVERRIDE=i686 -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
+
+      - name: build project
+        run: cmake --build . --target package --verbose -j4
+
+      - name: check deb package
+        run: dpkg -I fastfetch-*.deb
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
+
+      - name: run fastfetch --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: print dependencies
+        run: ldd fastfetch
+
+      - name: run tests
+        run: ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-linux-i686
+          path: ./fastfetch-*.*
@@ -0,0 +1,45 @@
+name: Reusable Linux VMs
+
+on:
+  workflow_call:
+    inputs:
+      arch:
+        required: true
+        type: string
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: uraimo/run-on-arch-action@v3
+        id: runcmd
+        with:
+          arch: ${{ inputs.arch }}
+          distro: ubuntu22.04
+          githubToken: ${{ github.token }}
+          run: |
+            uname -a
+            apt-get update && apt-get install -y software-properties-common
+            add-apt-repository -y ppa:ubuntu-toolchain-r/test
+            apt-get update && apt-get install -y cmake make gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev libefl-all-dev liblua5.4-dev libvdpau-dev libva-dev rpm
+            CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-linux-${{ inputs.arch }}
+          path: ./fastfetch-*.*
@@ -0,0 +1,59 @@
+name: Reusable macOS Hosts
+
+on:
+  workflow_call:
+    inputs:
+      arch:
+        required: true
+        type: string
+      runs-on:
+        required: true
+        type: string
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ${{ inputs.runs-on }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: uname -a
+        run: uname -a
+
+      - name: install required packages
+        run: |
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew update
+          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite vulkan-loader vulkan-headers molten-vk imagemagick chafa lua quickjs-ng
+
+      - name: configure project
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+
+      - name: build project
+        run: cmake --build . --target package --verbose -j4
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch -c presets/ci.jsonc --structure-disabled vulkan --stat false
+
+      - name: run fastfetch --format json
+        run: time ./fastfetch -c presets/ci.jsonc --structure-disabled vulkan --format json
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: print dependencies
+        run: otool -L fastfetch
+
+      - name: run tests
+        run: ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-macos-${{ inputs.arch }}
+          path: ./fastfetch-*.*
@@ -0,0 +1,47 @@
+name: Reusable Musl amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: setup alpine linux
+        uses: jirutka/setup-alpine@master
+        with:
+          branch: edge
+
+      - name: install dependencies
+        run: |
+          cat /etc/alpine-release
+          uname -a
+          apk add cmake samurai vulkan-loader-dev libxcb-dev libxrandr-dev rpm-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev lua5.4-dev quickjs-ng-dev libvdpau-dev libva-dev gcc g++
+        shell: alpine.sh --root {0}
+
+      - name: build
+        run: |
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -GNinja .
+            cmake --build . --target package --verbose -j4
+        shell: alpine.sh {0}
+
+      - name: run
+        run: |
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+        shell: alpine.sh {0}
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-musl-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,41 @@
+name: Reusable NetBSD amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: cross-platform-actions/action@master
+        with:
+          operating_system: netbsd
+          architecture: x86-64
+          cpu_count: 4
+          shell: bash
+          version: '10.1'
+          environment_variables: 'CMAKE_BUILD_TYPE'
+          run: |
+            uname -a
+            sudo pkgin -y install clang cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick libva libvdpau
+            CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-netbsd-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,42 @@
+name: Reusable No Features Test
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: uname -a
+        run: uname -a
+
+      - name: configure project
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_EET=OFF -DENABLE_THREADS=OFF
+
+      - name: build project
+        run: cmake --build . --target package --verbose -j4
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
+
+      - name: run fastfetch --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: print dependencies
+        run: ldd fastfetch
+
+      - name: run tests
+        run: ctest --output-on-failure
@@ -0,0 +1,42 @@
+name: Reusable OmniOS amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: vmactions/omnios-vm@v1
+        with:
+          usesh: true
+          envs: 'CMAKE_BUILD_TYPE'
+          prepare: |
+            uname -a
+            pkg update --accept || true
+            pkg install gcc14 cmake git pkg-config glib2 dbus sqlite-3 imagemagick ninja
+
+          run: |
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -GNinja .
+            cmake --build . --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+            echo 'set(CPACK_PACKAGE_FILE_NAME "fastfetch-omnios-amd64")' >> CPackConfig.cmake
+            cpack -V
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-omnios-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,42 @@
+name: Reusable OpenBSD amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: cross-platform-actions/action@master
+        with:
+          operating_system: openbsd
+          architecture: x86-64
+          cpu_count: 4
+          shell: bash
+          version: '7.8'
+          environment_variables: 'CMAKE_BUILD_TYPE'
+          run: |
+            uname -a
+            sudo pkg_add -u
+            sudo pkg_add -r llvm-21.1.2p0 cmake git wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 imagemagick chafa lua-5.4.7 # pkg-config is preinstalled
+            CC=clang-21 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-openbsd-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,58 @@
+name: Reusable Release
+
+on:
+  workflow_call:
+    inputs:
+      ffversion:
+        required: true
+        type: string
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: get latest release version
+        id: get_version_release
+        uses: pozetroninc/github-action-get-latest-release@master
+        with:
+          repository: ${{ github.repository }}
+
+      - name: download artifacts
+        if: inputs.ffversion != steps.get_version_release.outputs.release
+        uses: actions/download-artifact@v8
+
+      - name: create release
+        if: inputs.ffversion != steps.get_version_release.outputs.release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ inputs.ffversion }}
+          commit: ${{ github.sha }}
+          artifactErrorsFailBuild: true
+          artifacts: fastfetch-*/fastfetch-*
+          body: "Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ inputs.ffversion }}/CHANGELOG.md) for details."
+
+      - name: download source tarballs
+        if: inputs.ffversion != steps.get_version_release.outputs.release
+        run: |
+          for i in 1 2 3 4 5; do curl -L --remote-name-all --output-dir fastfetch-source --create-dirs https://github.com/${{ github.repository }}/archive/refs/tags/${{ inputs.ffversion }}.{tar.gz,zip} && break || sleep 5; done
+          ls fastfetch-*/*
+
+      - name: generate release notes
+        if: inputs.ffversion != steps.get_version_release.outputs.release
+        run: |
+          echo "Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ inputs.ffversion }}/CHANGELOG.md) for details." > fastfetch-release-notes.md
+          echo -e "\n---\n\n<details><summary>SHA256SUMs</summary><br>\n\n\`\`\`" >> fastfetch-release-notes.md
+          sha256sum fastfetch-*/* >> fastfetch-release-notes.md
+          echo -e "\`\`\`\n</details>" >> fastfetch-release-notes.md
+          echo -e "\n<details><summary>SHA512SUMs</summary><br>\n\n\`\`\`" >> fastfetch-release-notes.md
+          sha512sum fastfetch-*/* >> fastfetch-release-notes.md
+          echo -e "\`\`\`\n</details>" >> fastfetch-release-notes.md
+
+      - name: update release body
+        if: inputs.ffversion != steps.get_version_release.outputs.release
+        uses: ncipollo/release-action@v1
+        with:
+          tag: ${{ inputs.ffversion }}
+          commit: ${{ github.sha }}
+          bodyFile: fastfetch-release-notes.md
+          allowUpdates: true
@@ -0,0 +1,43 @@
+name: Reusable Solaris amd64
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: run VM
+        uses: vmactions/solaris-vm@v1
+        with:
+          usesh: true
+          envs: 'CMAKE_BUILD_TYPE'
+          release: "11.4-gcc-14"
+          prepare: |
+            uname -a
+            pkg install cmake git pkg-config glib2 dbus sqlite-3 imagemagick ninja dconf mesa lua
+
+          run: |
+            export PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -GNinja .
+            cmake --build . --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest --output-on-failure
+            echo 'set(CPACK_PACKAGE_FILE_NAME "fastfetch-solaris-amd64")' >> CPackConfig.cmake
+            cpack -V
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-solaris-amd64
+          path: ./fastfetch-*.*
@@ -0,0 +1,24 @@
+name: Reusable Spellcheck
+
+on:
+  workflow_call:
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  spellcheck:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install codespell
+        shell: bash
+        run: |
+          sudo apt-get update || true
+          sudo apt-get install -y codespell
+
+      - name: Run Spellchecker
+        run: codespell
@@ -0,0 +1,106 @@
+name: Reusable Windows Hosts
+
+on:
+  workflow_call:
+    inputs:
+      arch:
+        required: true
+        type: string
+      runs-on:
+        required: true
+        type: string
+      msystem:
+        required: true
+        type: string
+      msystem-lower:
+        required: true
+        type: string
+      msys-arch:
+        required: true
+        type: string
+
+env:
+  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
+
+jobs:
+  build:
+    runs-on: ${{ inputs.runs-on }}
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - name: setup-msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ inputs.msystem }}
+          update: true
+          install: git mingw-w64-clang-${{ inputs.msys-arch }}-7zip mingw-w64-clang-${{ inputs.msys-arch }}-cmake mingw-w64-clang-${{ inputs.msys-arch }}-clang mingw-w64-clang-${{ inputs.msys-arch }}-vulkan-loader mingw-w64-clang-${{ inputs.msys-arch }}-vulkan-headers mingw-w64-clang-${{ inputs.msys-arch }}-opencl-icd mingw-w64-clang-${{ inputs.msys-arch }}-opencl-headers mingw-w64-clang-${{ inputs.msys-arch }}-cppwinrt mingw-w64-clang-${{ inputs.msys-arch }}-imagemagick mingw-w64-clang-${{ inputs.msys-arch }}-chafa mingw-w64-clang-${{ inputs.msys-arch }}-lua mingw-w64-clang-${{ inputs.msys-arch }}-quickjs-ng mingw-w64-clang-${{ inputs.msys-arch }}-directx-headers
+
+      - name: print msys version
+        run: uname -a
+
+      - name: configure project
+        run: env PKG_CONFIG_PATH=/${{ inputs.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+
+      - name: build project
+        run: cmake --build . --verbose -j4
+
+      - name: copy necessary dlls
+        run: cp /${{ inputs.msystem-lower }}/bin/{lua55,libqjs-0}.dll .
+
+      - name: list features
+        run: ./fastfetch --list-features
+
+      - name: run fastfetch
+        run: time ./fastfetch -c presets/ci.jsonc --stat false
+
+      - name: run fastfetch --format json
+        run: time ./fastfetch -c presets/ci.jsonc --format json
+
+      - name: run flashfetch
+        run: time ./flashfetch
+
+      - name: print dependencies
+        run: ldd fastfetch
+
+      - name: run tests
+        run: ctest --output-on-failure
+
+      - if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
+        id: upload-unsigned-artifact
+        name: upload artifacts for signing
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-windows-${{ inputs.arch }}
+          path: |
+            *.dll
+            fastfetch.exe
+            flashfetch.exe
+
+      - if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
+        name: submit signing request
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: '${{ vars.SIGNPATH_ORG_ID }}'
+          project-slug: 'fastfetch'
+          signing-policy-slug: ${{ github.ref == 'refs/heads/master' && 'release-signing' || 'test-signing' }}
+          github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: '.'
+
+      - name: create zip archive
+        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ inputs.arch }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
+
+      - name: create 7z archive
+        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ inputs.arch }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
+
+      - name: upload true artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: fastfetch-windows-${{ inputs.arch }}
+          path: ./fastfetch-windows-${{ inputs.arch }}.*
+          overwrite: true
@@ -4,66 +4,20 @@ on:
  - push
  - pull_request

-env:
-  CMAKE_BUILD_TYPE: ${{ vars.CMAKE_BUILD_TYPE || 'RelWithDebInfo' }}
-
 jobs:
  spellcheck:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: Install codespell
-        shell: bash
-        run: |
-          sudo apt-get update || true
-          sudo apt-get install -y codespell
-
-      - name: Run Spellchecker
-        run: codespell
+    uses: ./.github/workflows/build-spellcheck.yml

  no-features-test:
    name: No-features-test
-    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: uname -a
-        run: uname -a
-
-      - name: configure project
-        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
-
-      - name: build project
-        run: cmake --build . --target package --verbose -j4
-
-      - name: list features
-        run: ./fastfetch --list-features
-
-      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc --stat false
-
-      - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci.jsonc --format json
-
-      - name: run flashfetch
-        run: time ./flashfetch
-
-      - name: print dependencies
-        run: ldd fastfetch
-
-      - name: run tests
-        run: ctest --output-on-failure
+    uses: ./.github/workflows/build-no-features-test.yml
+    secrets: inherit

  linux-hosts:
    name: Linux-${{ matrix.arch }}
-    runs-on: ${{ matrix.runs-on }}
    permissions:
      security-events: write
      contents: read
@@ -74,230 +28,38 @@ jobs:
            runs-on: ubuntu-22.04
          - arch: aarch64
            runs-on: ubuntu-22.04-arm
-    outputs:
-      ffversion: ${{ steps.ffversion.outputs.ffversion }}
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: uname -a
-        run: uname -a
-
-      - name: cat /etc/os-release
-        run: cat /etc/os-release
-
-      - name: cat /proc/cpuinfo
-        run: cat /proc/cpuinfo
-
-      - name: add gcc-13 repo
-        run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-
-      - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y gcc-13 g++-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev libchafa-dev directx-headers-dev rpm ninja-build
-
-      - name: install linuxbrew packages
-        run: |
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          /home/linuxbrew/.linuxbrew/bin/brew install imagemagick --ignore-dependencies
-
-      - name: Initialize CodeQL
-        if: matrix.arch == 'amd64'
-        uses: github/codeql-action/init@v3
-        with:
-          languages: c
-
-      - name: configure project
-        run: CC=gcc-13 CXX=g++-13 PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
-
-      - name: build project
-        run: cmake --build . --target package --verbose -j4
-
-      - name: perform CodeQL analysis
-        if: matrix.arch == 'amd64'
-        uses: github/codeql-action/analyze@v3
-
-      - name: list features
-        run: ./fastfetch --list-features
-
-      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc --stat false
-
-      - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci.jsonc --format json
-
-      - name: run flashfetch
-        run: time ./flashfetch
-
-      - name: print dependencies
-        run: ldd fastfetch
-
-      - name: run tests
-        run: ctest --output-on-failure
-
-      - name: get fastfetch version
-        id: ffversion
-        run: echo "ffversion=$(./fastfetch --version-raw)" >> $GITHUB_OUTPUT
-
-      - name: polyfill glibc
-        run: |
-          wget https://github.com/CarterLi/polyfill-glibc/releases/download/v0.0.1/polyfill-glibc-${{ matrix.arch }} -O polyfill-glibc
-          chmod +x polyfill-glibc
-          strip fastfetch && ./polyfill-glibc fastfetch --target-glibc=2.17
-          strip flashfetch && ./polyfill-glibc flashfetch --target-glibc=2.17
-          echo 'set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-polyfilled")' >> CPackConfig.cmake
-          echo 'set(CPACK_PACKAGE_RELOCATABLE OFF)' >> CPackConfig.cmake
-          echo 'set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.17)")' >> CPackConfig.cmake
-          echo 'set(CPACK_RPM_SPEC_MORE_DEFINE "%global __os_install_post %{nil}")' >> CPackConfig.cmake
-          cpack -V
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-linux-${{ matrix.arch }}
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-linux-hosts.yml
+    with:
+      arch: ${{ matrix.arch }}
+      runs-on: ${{ matrix.runs-on }}
+    secrets: inherit

  linux-i686:
    name: Linux-i686
-    runs-on: ubuntu-22.04
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: uname -a
-        run: uname -a
-
-      - name: cat /etc/os-release
-        run: cat /etc/os-release
-
-      - name: cat /proc/cpuinfo
-        run: cat /proc/cpuinfo
-
-      - name: add gcc-13 repo
-        run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-
-      - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y gcc-13 gcc-13-multilib libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev libddcutil-dev rpm ninja-build
-
-      - name: install linuxbrew packages
-        run: |
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          /home/linuxbrew/.linuxbrew/bin/brew install imagemagick chafa --ignore-dependencies
-
-      - name: cmake version
-        run: cmake --version
-
-      - name: configure project
-        run: CC=gcc-13 PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DCMAKE_C_FLAGS="-m32 -march=i686 -mtune=i686" -DCMAKE_SYSTEM_PROCESSOR_OVERRIDE=i686 -GNinja -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_DIRECTX_HEADERS=Off .
-
-      - name: build project
-        run: cmake --build . --target package --verbose -j4
-
-      - name: list features
-        run: ./fastfetch --list-features
-
-      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc --stat false
-
-      - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci.jsonc --format json
-
-      - name: run flashfetch
-        run: time ./flashfetch
-
-      - name: print dependencies
-        run: ldd fastfetch
-
-      - name: run tests
-        run: ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-linux-i686
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-linux-i686.yml
+    secrets: inherit

  linux-armv7l:
    name: Linux-armv7l
-    runs-on: ubuntu-24.04
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: uraimo/run-on-arch-action@v3
-        id: runcmd
-        with:
-          arch: armv7
-          distro: ubuntu20.04
-          githubToken: ${{ github.token }}
-          run: |
-            uname -a
-            apt-get update && apt-get install -y software-properties-common ca-certificates gpg curl
-            add-apt-repository -y ppa:ubuntu-toolchain-r/test
-            curl -L https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
-            echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
-            echo -e 'Acquire::https::Verify-Peer "false";\nAcquire::https::Verify-Host "false";' >> /etc/apt/apt.conf.d/99ignore-certificates
-            apt-get update && apt-get install -y cmake make gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev rpm
-            CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_DIRECTX_HEADERS=Off -DCMAKE_INSTALL_PREFIX=/usr .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-linux-armv7l
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-linux-armv7l.yml
+    secrets: inherit

  linux-armv6l:
    name: Linux-armv6l
-    runs-on: ubuntu-24.04
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: uraimo/run-on-arch-action@v3
-        id: runcmd
-        with:
-          arch: armv6
-          distro: bookworm
-          githubToken: ${{ github.token }}
-          run: |
-            uname -a
-            apt-get update && apt-get install -y wget
-            apt-get install -y cmake make gcc libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev rpm
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_DIRECTX_HEADERS=Off -DCMAKE_INSTALL_PREFIX=/usr .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-linux-armv6l
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-linux-armv6l.yml
+    secrets: inherit

  linux-vms:
    name: Linux-${{ matrix.arch }}
-    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
@@ -307,78 +69,18 @@ jobs:
          - arch: riscv64
          - arch: ppc64le
          - arch: s390x
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: uraimo/run-on-arch-action@v3
-        id: runcmd
-        with:
-          arch: ${{ matrix.arch }}
-          distro: ubuntu22.04
-          githubToken: ${{ github.token }}
-          run: |
-            uname -a
-            apt-get update && apt-get install -y software-properties-common
-            add-apt-repository -y ppa:ubuntu-toolchain-r/test
-            apt-get update && apt-get install -y cmake make gcc-13 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev rpm
-            CC=gcc-13 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_DIRECTX_HEADERS=Off -DCMAKE_INSTALL_PREFIX=/usr .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-linux-${{ matrix.arch }}
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-linux-vms.yml
+    with:
+      arch: ${{ matrix.arch }}
+    secrets: inherit

  musl-amd64:
    name: Musl-amd64
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: setup alpine linux
-        uses: jirutka/setup-alpine@master
-
-      - name: install dependencies
-        run: |
-          cat /etc/alpine-release
-          uname -a
-          apk add cmake samurai vulkan-loader-dev libxcb-dev libxrandr-dev rpm-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev gcc g++
-        shell: alpine.sh --root {0}
-
-      - name: build
-        run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -GNinja .
-            cmake --build . --target package --verbose -j4
-        shell: alpine.sh {0}
-
-      - name: run
-        run: |
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-        shell: alpine.sh {0}
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-musl-amd64
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-musl-amd64.yml
+    secrets: inherit

  macos-hosts:
    name: macOS-${{ matrix.arch }}
-    runs-on: ${{ matrix.runs-on }}
    permissions:
      security-events: write
      contents: read
@@ -389,264 +91,64 @@ jobs:
            runs-on: macos-15-intel
          - arch: aarch64
            runs-on: macos-latest
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
+    uses: ./.github/workflows/build-macos-hosts.yml
+    with:
+      arch: ${{ matrix.arch }}
+      runs-on: ${{ matrix.runs-on }}
+    secrets: inherit

-      - name: uname -a
-        run: uname -a
+  omnios-amd64:
+    name: OmniOS-amd64
+    uses: ./.github/workflows/build-omnios-amd64.yml
+    secrets: inherit

-      - name: install required packages
-        run: |
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite vulkan-loader vulkan-headers molten-vk imagemagick chafa
-
-      - name: configure project
-        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-
-      - name: build project
-        run: cmake --build . --target package --verbose -j4
-
-      - name: list features
-        run: ./fastfetch --list-features
-
-      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc --stat false
-
-      - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci.jsonc --format json
-
-      - name: run flashfetch
-        run: time ./flashfetch
-
-      - name: print dependencies
-        run: otool -L fastfetch
-
-      - name: run tests
-        run: ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-macos-${{ matrix.arch }}
-          path: ./fastfetch-*.*
-
-  sunos-amd64:
-    runs-on: ubuntu-latest
-    name: SunOS-amd64
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: vmactions/omnios-vm@v1
-        with:
-          usesh: true
-          prepare: |
-            uname -a
-            pkg install pkg:/package/pkg
-            pkg update --accept
-            pkg install gcc14 cmake git pkg-config glib2 dbus sqlite-3 imagemagick
-
-          run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-            cpack
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-sunos-amd64
-          path: ./fastfetch-*.*
+  solaris-amd64:
+    name: Solaris-amd64
+    uses: ./.github/workflows/build-solaris-amd64.yml
+    secrets: inherit

  freebsd-amd64:
    name: FreeBSD-amd64
-    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: cross-platform-actions/action@master
-        with:
-          operating_system: freebsd
-          architecture: x86-64
-          cpu_count: 4
-          shell: bash
-          version: '14.3'
-          run: |
-            uname -a
-            sudo pkg update
-            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl egl opencl ocl-icd v4l_compat chafa
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-freebsd-amd64
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-freebsd-amd64.yml
+    secrets: inherit

  openbsd-amd64:
    name: OpenBSD-amd64
-    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: cross-platform-actions/action@master
-        with:
-          operating_system: openbsd
-          architecture: x86-64
-          cpu_count: 4
-          shell: bash
-          version: '7.7'
-          run: |
-            uname -a
-            sudo pkg_add -u
-            sudo pkg_add -r llvm-19.1.7p3 cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 imagemagick chafa
-            CC=clang-19 cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-openbsd-amd64
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-openbsd-amd64.yml
+    secrets: inherit

  netbsd-amd64:
    name: NetBSD-amd64
-    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: cross-platform-actions/action@master
-        with:
-          operating_system: netbsd
-          architecture: x86-64
-          cpu_count: 4
-          shell: bash
-          version: '10.1'
-          run: |
-            uname -a
-            sudo pkgin -y install clang cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick
-            CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-netbsd-amd64
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-netbsd-amd64.yml
+    secrets: inherit

  dragonfly-amd64:
    name: DragonFly-amd64
-    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: vmactions/dragonflybsd-vm@v1
-        with:
-          usesh: yes
-          prepare: |
-            uname -a
-            pkg update
-            pkg install -y llvm cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl egl opencl ocl-icd v4l_compat chafa libelf
-
-          run: |
-            env CC=clang cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-dragonfly-amd64
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-dragonfly-amd64.yml
+    secrets: inherit

  haiku-amd64:
    name: Haiku-amd64
-    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: run VM
-        uses: cross-platform-actions/action@master
-        with:
-          operating_system: haiku
-          version: 'r1beta5'
-          architecture: x86-64
-          cpu_count: 4
-          shell: bash
-          run: |
-            uname -a
-            pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10 || pkgman install -y git dbus_devel mesa_devel libelf_devel imagemagick_devel opencl_headers ocl_icd_devel vulkan_devel zlib_devel chafa_devel cmake gcc make pkgconfig python3.10
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
-            cmake --build . --target package --verbose -j4
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ctest --output-on-failure
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-haiku-amd64
-          path: ./fastfetch-*.*
+    uses: ./.github/workflows/build-haiku-amd64.yml
+    secrets: inherit

  windows-hosts:
    name: Windows-${{ matrix.arch }}
-    runs-on: ${{ matrix.runs-on }}
    permissions:
      security-events: write
      contents: read
@@ -663,90 +165,18 @@ jobs:
            msystem: CLANGARM64
            msystem-lower: clangarm64
            msys-arch: aarch64
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v5
-
-      - name: setup-msys2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.msystem }}
-          update: true
-          install: git mingw-w64-clang-${{ matrix.msys-arch }}-7zip mingw-w64-clang-${{ matrix.msys-arch }}-cmake mingw-w64-clang-${{ matrix.msys-arch }}-clang mingw-w64-clang-${{ matrix.msys-arch }}-vulkan-loader mingw-w64-clang-${{ matrix.msys-arch }}-vulkan-headers mingw-w64-clang-${{ matrix.msys-arch }}-opencl-icd mingw-w64-clang-${{ matrix.msys-arch }}-opencl-headers mingw-w64-clang-${{ matrix.msys-arch }}-cppwinrt mingw-w64-clang-${{ matrix.msys-arch }}-imagemagick mingw-w64-clang-${{ matrix.msys-arch }}-chafa
-
-      - name: print msys version
-        run: uname -a
-
-      - name: configure project
-        run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-
-      - name: build project
-        run: cmake --build . --verbose -j4
-
-      - name: copy necessary dlls
-        run: cp /${{ matrix.msystem-lower }}/bin/{OpenCL,vulkan-1}.dll .
-
-      - name: list features
-        run: ./fastfetch --list-features
-
-      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc --stat false
-
-      - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci.jsonc --format json
-
-      - name: run flashfetch
-        run: time ./flashfetch
-
-      - name: print dependencies
-        run: ldd fastfetch
-
-      - name: run tests
-        run: ctest --output-on-failure
-
-      - if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
-        id: upload-unsigned-artifact
-        name: upload artifacts for signing
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-windows-${{ matrix.arch }}
-          path: |
-            *.dll
-            fastfetch.exe
-            flashfetch.exe
-
-      - if: github.event_name == 'push' && github.repository == 'fastfetch-cli/fastfetch'
-        name: submit signing request
-        uses: signpath/github-action-submit-signing-request@v1
-        with:
-          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
-          organization-id: '${{ vars.SIGNPATH_ORG_ID }}'
-          project-slug: 'fastfetch'
-          signing-policy-slug: ${{ github.ref == 'refs/heads/master' && 'release-signing' || 'test-signing' }}
-          github-artifact-id: '${{ steps.upload-unsigned-artifact.outputs.artifact-id }}'
-          wait-for-completion: true
-          output-artifact-directory: '.'
-
-      - name: create zip archive
-        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
-
-      - name: create 7z archive
-        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
-
-      - name: upload true artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-windows-${{ matrix.arch }}
-          path: ./fastfetch-windows-${{ matrix.arch }}.*
-          overwrite: true
+    uses: ./.github/workflows/build-windows-hosts.yml
+    with:
+      arch: ${{ matrix.arch }}
+      runs-on: ${{ matrix.runs-on }}
+      msystem: ${{ matrix.msystem }}
+      msystem-lower: ${{ matrix.msystem-lower }}
+      msys-arch: ${{ matrix.msys-arch }}
+    secrets: inherit

  release:
    if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'fastfetch-cli/fastfetch'
    name: Release
-    runs-on: ubuntu-latest
    needs:
      - linux-hosts
      - linux-i686
@@ -759,54 +189,13 @@ jobs:
      - openbsd-amd64
      - netbsd-amd64
      - dragonfly-amd64
-      - sunos-amd64
+      - solaris-amd64
+      - omnios-amd64
      - haiku-amd64
      - windows-hosts
    permissions:
      contents: write
-    steps:
-      - name: get latest release version
-        id: get_version_release
-        uses: pozetroninc/github-action-get-latest-release@master
-        with:
-          repository: ${{ github.repository }}
-
-      - name: download artifacts
-        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
-        uses: actions/download-artifact@v5
-
-      - name: create release
-        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ needs.linux-hosts.outputs.ffversion }}
-          commit: ${{ github.sha }}
-          artifactErrorsFailBuild: true
-          artifacts: fastfetch-*/fastfetch-*
-          body: "Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ needs.linux-hosts.outputs.ffversion }}/CHANGELOG.md) for details."
-
-      - name: download source tarballs
-        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
-        run: |
-          for i in 1 2 3 4 5; do curl -L --remote-name-all --output-dir fastfetch-source --create-dirs https://github.com/${{ github.repository }}/archive/refs/tags/${{ needs.linux-hosts.outputs.ffversion }}.{tar.gz,zip} && break || sleep 5; done
-          ls fastfetch-*/*
-
-      - name: generate release notes
-        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
-        run: |
-          echo "Please refer to [CHANGELOG.md](https://github.com/${{ github.repository }}/blob/${{ needs.linux-hosts.outputs.ffversion }}/CHANGELOG.md) for details." > fastfetch-release-notes.md
-          echo -e "\n---\n\n<details><summary>SHA256SUMs</summary><br>\n\n\`\`\`" >> fastfetch-release-notes.md
-          sha256sum fastfetch-*/* >> fastfetch-release-notes.md
-          echo -e "\`\`\`\n</details>" >> fastfetch-release-notes.md
-          echo -e "\n<details><summary>SHA512SUMs</summary><br>\n\n\`\`\`" >> fastfetch-release-notes.md
-          sha512sum fastfetch-*/* >> fastfetch-release-notes.md
-          echo -e "\`\`\`\n</details>" >> fastfetch-release-notes.md
-
-      - name: update release body
-        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
-        uses: ncipollo/release-action@v1
-        with:
-          tag: ${{ needs.linux-hosts.outputs.ffversion }}
-          commit: ${{ github.sha }}
-          bodyFile: fastfetch-release-notes.md
-          allowUpdates: true
+    uses: ./.github/workflows/build-release.yml
+    with:
+      ffversion: ${{ needs.linux-hosts.outputs.ffversion }}
+    secrets: inherit
@@ -1,6 +1,437 @@
+# 2.64.1
+
+Features:
+* Adds a CMake option `-DPACKAGES_REMOVE_DISABLED` to remove detection code of disabled packages (`-DPACKAGES_DISABLE_<PACKAGE_NAME>`) for slightly smaller binary size (Packages)
+
+Bugfixes:
+* Fixes compatibility issues with Lua 5.3
+* Avoid possible infinite recursion in `encode_json` when encoding deeply nested tables or circular references
+* Fixes compilation issues when building with old macOS SDKs
+
+# 2.64.0
+
+New **optional build** dependencies:
+* [`libva`](https://github.com/intel/libva) and [`libvdpau`](https://www.freedesktop.org/wiki/Software/VDPAU) for the new `Codec` module.
+* [Lua 5.3 to 5.5](https://www.lua.org/) for Lua scripting support, or [QuickJS](https://github.com/quickjs-ng/quickjs) v0.15.0 or newer for JavaScript scripting support.
+
+Features:
+* Adds `Codec` module support for Windows, macOS, Linux, and Android for hardware-accelerated video codec detection (Codec)
+    * Backends used (results may vary depending on the backend due to driver differences):
+        * Linux and BSD: VA-API (default) and VDPAU (fallback for NVIDIA). Fastfetch must be built with `libva` and `libvdpau` support to enable these backends.
+        * Windows: D3D12VA (Windows 11) and D3D11VA+MFT (Windows 10 or older)
+        * macOS: VideoToolbox
+        * Android: AMediaCodec
+        * Common: Vulkan Video (disabled by default; can be enabled with `"useVulkan": true`)
+    * By default, both encoders and decoders are reported. If no codecs are detected for a given type, `None` is reported. This behavior can be configured using the `"showType": "encoder|decoder"` option.
+* Adds experimental Lua script support for custom formats (Global)
+    * Basic usage (using `Title` as an example): `{ "type": "title", "format": "lua:return string.format('Hello %s@%s', (...).userName, (...).hostName)" }`. The `lua:` prefix indicates a Lua script. A `return` statement is required to pass the final result back to the fastfetch module; otherwise, `nil` is returned implicitly and the entire module output is skipped.
+    * Parameters are passed via variable arguments `(...)`. Users can assign them to named variables for better readability. For example: `lua:local args = ...; string.format('Hello %s@%s', args.userName, args.hostName)`.
+    * The Lua interpreter instance is shared across all modules. This allows users to store and manipulate data across modules. For example:
+        * `{ "type": "shell", "format": "lua:shell = ..." } // Note: no "return" here`
+        * `{ "type": "terminal", "format": "lua:return shell.prettyName .. ' in ' .. (...).prettyName" } // This will print the detected shell and terminal names`
+    * A `json_encode(table, is_pretty)` function has been added to the Lua API for easier debugging. For example, `lua:return json_encode(...)` will print all available variables and their values in JSON format.
+    * Supported Lua versions: Lua 5.3 to 5.5 (Lua 5.1 and LuaJIT are not supported). The Lua version is auto-detected at build time. Once built, users can check the configured Lua version using `fastfetch --list-features`.
+* Adds experimental QuickJS script support for custom formats as an alternative to Lua (Global)
+    * Basic usage: `{ "type": "title", "format": "qjs:`Hello ${this.userName}@${this.hostName}`" }`. The `qjs:` prefix indicates a JavaScript script. No `return` statement is needed; the final result is simply the evaluated value of the script.
+    * Parameters are passed via the `this` object. Usage is mostly the same as Lua, but using JavaScript syntax.
+    * Requires [quickjs-ng v0.15.0](https://github.com/quickjs-ng/quickjs/releases/tag/v0.15.0) or newer.
+* Adds CMake options `-DMODULE_DISABLE_<MODULE_NAME>=ON` to disable modules at compile time for a smaller binary size
+    * Use `cmake -L . | grep MODULE_DISABLE_` to list all available options.
+    * These options rely on LTO for dead code elimination (`-DCMAKE_BUILD_TYPE=Release` should enable LTO by default).
+* Adds the ability to remove unneeded ASCII logos without modifying the fastfetch source code, further reducing binary size
+    * Simply remove the corresponding logo file from the logo directory (`src/logo/ascii/[a-z]/*`) and re-run `cmake`.
+* Improves string manipulation specifiers in custom formats
+    * They are now ANSI escape-aware and work correctly with colored output (e.g., percentages with `num-color`) (#2364). Limitations:
+        * They are still not wide-character aware and treat CJK and emoji characters as raw bytes.
+        * Escape sequences in the middle of strings are not supported.
+    * A new `|` specifier has been added to center strings. For example, `{user-name|20}` will center the username in a 20-character-wide field.
+* Adds preliminary `Bootmgr`, `Brightness`, and `WMTheme` detection support for Haiku (#2358, Haiku)
+* Adds `Wallpaper` and `WMTheme` detection support for the COSMIC desktop environment (Linux)
+* Improves terminal name detection for Nix packages (#2352, Terminal, Linux)
+* Adds DDC/CI brightness detection support for FreeBSD (Brightness, FreeBSD)
+    * DDC/CI communication can be very slow. Users can set the `ddcciSleep: null` option to skip DDC/CI detection.
+* Reworks the built-in logo printing logic. ASCII logos and modules are now printed line by line, avoiding issues like #2239
+    * Note: Image logos are not affected by this change and still print the entire image first before printing any modules.
+* Adds a new `--logo-padding-bottom` option to control the padding between the bottom of the logo and the first module when `--logo-position top` is used
+    * Previously, `--logo-padding-right` was used for both right and bottom padding.
+* Adds `Samsung Exynos 2600` to CPU detection (CPU, Android)
+* Adds terminal font detection support for the Muxy terminal (TerminalFont, macOS)
+* Improves the performance of BusyBox (ash) version detection and always reports `ash` as the pretty name (Shell, Linux)
+
+Bugfixes:
+* Fixes SwayFX version detection (WM, Linux)
+* Fixes fallback font detection for Ghostty (TerminalFont, macOS)
+* Fixes `--stat` output to correctly align with the right border (Global)
+* Fixes boot manager on macOS 26 (mBoot) is incorrectly reported as `iBoot` (Bootmgr, macOS)
+
+Logos:
+* Adds Quasar (#2338, #2323), Origami, Origami_small (#2321, #2322), BerserkArch (#2324, #2310), and NixOS2 (#2346)
+* Minor tweaks and color fixes for the NixOS_small logo (#2357)
+* Updates NurOS (#2366)
+
+# 2.63.1
+
+Bugfixes:
+* Fixes media length detection for Chrome on Linux (Media, Linux)
+* Fixes segmentation fault when specifying unsupported modules on command line
+* Disables usage of Netlink for Wi-Fi detection on s390x architectures (Wifi, Linux)
+
+# 2.63.0
+
+Changes:
+* Introduces a new **build-only** dependency, `libefl`, for querying the Enlightenment window manager configuration:
+    * `libefl-all-dev` on Debian/Ubuntu
+    * `libefl-devel` on Fedora
+    * `efl` on Arch Linux
+* The Windows-specific options `battery.useSetupApi` and `global.wmiTimeout` have been removed. (Windows)
+
+Features:
+* Adds wallpaper detection support on Haiku (#2314, Wallpaper, Haiku)
+* Adds Wi-Fi 6 GHz channel detection and improves protocol reporting (Wifi, Linux)
+* Improves Deepin version detection using `/etc/os-version` (#2300, OS, Linux)
+* Adds Ubuntu Kylin and Ubuntu Unity flavor detection (OS, Linux)
+* Adds NebiDE support (WMTheme, Linux)
+* Adds package counting for `cards` on NuTyX (#2287, Packages, Linux)
+* Adds `{am-pm}` to custom format for 12-hour time with am/pm (DateTime)
+* Adds support for the Enlightenment desktop environment (#2165, WM, Linux)
+* Adds support for playback progress detection (Media)
+    * The module now prints the current playback position and total media duration when supported by the player. If you prefer the previous behavior, you can set `media.percent.type: ["hide-others"]` to hide the new fields.
+* Adds support for `global.playerName` for Windows (Media, Windows)
+    * This allows detecting a specified media player while ignoring others.
+* Multi-battery detection is enabled on Windows by default (Battery, Windows)
+
+Bugfixes:
+* Improves DisplayServer compatibility on Linux by handling newer `kde-output-device-v2` protocol updates (DisplayServer, Linux)
+    * This fixes a long-standing issue where display detection fails with an `interface 'kde_output_device_mode_v2' has no event X` error.
+* Improves Wi-Fi reliability on Linux by switching to a netlink implementation (Wifi, Linux)
+* Improves network interface reliability and default route selection on macOS and Windows (Netif, macOS / Windows)
+* Validates temperature color thresholds as integers when parsing JSON configs (Temps)
+* Fixes TDE Konsole version detection (#2319, Terminal, Linux)
+* Various internal cleanups and optimizations
+
+Logos:
+* Adds KibaOS, NebiOS, XJ380, openRuyi, Ximper
+* Fixes GNOME OS built-in logo detection (#2296)
+
+# 2.62.1
+
+Bugfixes:
+* Fixes the Host module not working on some devices (#2279, Host, Linux)
+    * Regression from v2.61.0
+
+Logos:
+* Adds EN-OS, LimeOS, Redrose and Uzbek
+
+# 2.62.0
+
+Changes:
+* Sort package managers alphabetically in output and format arguments (Packages)
+    * The positional order of format arguments has changed — this is a breaking change for users relying on numeric placeholders. Named arguments are always preferred; e.g., use `{pacman}` (refer to `fastfetch -h packages-format`) instead of `{1}` to keep your config future-proof.
+
+Features:
+* Reports `Unused` instead of `Disabled` for zero-size swap on macOS (#2248, Swap, macOS)
+* Improves the robustness of default route detection on Linux (#2252, LocalIP, Linux)
+* PhysicalDisk module improvements
+    * Detects virtual disks and adds support for hiding them via `hideVirtual` option (defaults to `false`)
+    * Detects unused/disconnected disks and adds support for hiding them via `hideUnused` option (defaults to `true`)
+    * Adds support for OpenBSD and NetBSD (root privileges are required to access disk information)
+    * Improves interconnect type detection on SunOS
+    * Adds floppy drive support on Windows
+* Rewrites Windows GPU detection with D3DKMT APIs, unifying it with WSL GPU detection (GPU, Windows)
+* Verifies that the battery and power adapter are present before detection (Battery / PowerAdapter, Linux)
+* Improves PhysicalMemory reliability on OpenBSD and FreeBSD, including support for x86 UEFI systems on OpenBSD and non-UEFI systems on FreeBSD (PhysicalMemory, OpenBSD / FreeBSD)
+* Adds `display.common.(ndigits|spaceBeforeUnit)` options to configure common formatting for duration, percent, size, frequency and temperature values (#2234)
+* Slightly improves performance by skipping probes for ignored device types (Sound)
+* Adds support for AppImage package detection (#2179, Packages, Linux)
+
+Bugfixes:
+* Fixes a potential crash on certain Intel GPU models when using `--gpu-driver-specific` (#2259, GPU, Linux)
+* Doesn't report partitions as physical disks (DiskIO, NetBSD)
+* Fixes a typo (#2260, Wifi, macOS)
+* Corrects documentation for zpool format placeholders (#2261, Zpool)
+* Restores Windows 8.1 support (Cursor, Windows)
+* Fixes an out-of-bounds memory access when swaps are disabled (Swap, Windows)
+* Fixes battery status being incorrectly reported as `Charging` on systems with multiple batteries (#2263, Battery, Linux)
+* Fixes ash shell version detection (#2271, Shell, Linux)
+* Uses the `iterm` image protocol automatically on iTerm terminals for auto logo type (Logo)
+* Adds missing options when generating full config file
+
+Logos:
+* Updates AerynOS (#2272)
+
+# 2.61.0
+
+Changes:
+* Support for Windows 7 and 8 has been removed.
+    * Windows 8.1 is now the oldest version supported by fastfetch.
+* The GPU module on WSL no longer relies on `DXCore`.
+    * The `directx-headers` dependency is no longer required.
+    * Fastfetch on Linux is now pure C; a C++ compiler is no longer required.
+    * GPU type detection is now slightly less accurate, but detection speed should be slightly faster.
+* The GPU module on Windows now uses `DXCore` for more accurate GPU type detection (requires Windows 10 or later).
+    * This feature is built only when `DXCore` headers are available, which requires installing `mingw-w64-<msystem>-x86_64-directx-headers` on MSYS2.
+
+Features:
+* Adds a `brightness` option for color display configuration (#2238, Colors)
+* Adds support for detecting Bluetooth keyboards on Linux (#2220, Keyboard)
+* Adds support for detecting GlazeWM (WM, macOS)
+* Adds a `showEmptySlots` option to display empty memory slots on Linux (#2222, PhysicalMemory)
+* Adds marketing product name detection on Asahi Linux (Host, Linux)
+* Adds support for new M5 Mac models (Host, macOS)
+* Improves SMBIOS robustness by validating malformed data and improving error handling
+* Improves reliability when terminating child processes (Processing, Windows)
+* Improves Intel Mac support by querying SMBIOS data directly (Global, macOS)
+* Includes numerous internal cleanups and optimizations
+
+Bugfixes:
+* Fixes missing memory devices on some machines (PhysicalMemory)
+* Fixes CPUCache deduplication for shared caches (#2228, CPUCache, Linux)
+* Fixes WM version reporting for niri (#2218, WM, Linux)
+* Fixes SSID decoding issues from `iw` output (Wifi, Linux)
+* Fixes the CMD code page being changed after running fastfetch on Windows (#2245, Windows)
+
+# 2.60.0
+
+Changes:
+* The CMake option `ENABLE_WIN7_COMPAT:BOOLEAN` now defaults to `OFF` and will be removed in v2.61.0, effectively dropping support for Windows 7 in the next release.
+    * This follows the Windows 7 deprecation notice introduced in v2.57.0.
+* `wm.detectPlugin` now defaults to `true` (WM)
+
+Features:
+* Adds `{cwd}` for custom title formatting, which displays the current working directory (Title)
+* Adds support for detecting the Zed version (#2200, Editor)
+* Adds support for detecting `moss` packages (Packages, Linux)
+* Adds support for detecting komorebi, FancyWM, and GlazeWM (WM, Windows)
+* Adds support for WM plugin version detection on macOS (WM, macOS)
+* Adds support for retrieving the executable path on OpenBSD (#2195, OpenBSD)
+
+Bugfixes:
+* Fixes a potential segmentation fault caused by dereferencing a negative index (#2198)
+* Fixes `tempSensor` parsing so that it accepts only string values (#2202, CPU)
+* Fixes an issue that unexpectedly caused fewer devices to be reported (Keyboard, Linux)
+* Improves WM detection on LXQt by querying WM settings only when no WM has already been detected (#2199, WM, Linux)
+* Fixes memory leaks in DBus connection handling and in the OpenGL EGL context lifecycle
+* Fixes niri version detection on Fedora (WM, Linux)
+* Includes various internal cleanups and optimizations
+
+Logos:
+* Adds `RengeOS` (#2170)
+* Adds `Emmabuntüs` (#2207)
+* Updates Artix Linux (#2157)
+* Updates Linux Mint (#2186)
+* Renames `Refracted Devuan` to `Refracta`
+* Renames `ExodiaPredator` to `ExodiaOS`
+
+# 2.59.0
+
+Changes:
+* Fastfetch no longer relies on the unreliable environment variables `$USER` or `%USERPROFILE%` to determine the current username (Title)
+    * People who set `$USER` to customize the Fastfetch title should use `{ "type": "title", "format": "your-custom-user-name" }` to achieve the same result.
+* Fastfetch no longer tries to probe inaccessible remote disk drives on Windows (Disk, Windows)
+    * People who have remote drives may use `{ "type": "disk", "hideFolders": "X:\\" }` to ignore problematic ones.
+    * This change removes some ugly hacks from the codebase and matches the behavior on `*nix`.
+
+Features:
+* Adds Oracle Solaris support (#2176, SunOS)
+* Adds UID / SID detection (Title)
+    * In custom format: `{user-id}`
+* Switches to native GPU detection on GNU/Hurd and removes the `libpciaccess` dependency (GPU, Hurd)
+* Improves memory size detection on macOS (Memory, macOS)
+    * Avoids relying on `hw.memsize_usable` by default, which may not be available on older macOS versions
+* Improves Windows disk detection accuracy and performance (Disk, Windows)
+* Adds more ARM CPU parts and removes duplicated cases (CPU, ARM)
+
+Logos:
+* Adds 6-color support to the NixOS logo (including the small variant) (#2180)
+
+# 2.58.0
+
+An early release to fix compatibility issues with KDE Plasma 6.6.
+
+Breaking changes:
+* The `de.slowVersionDetection` option has been removed. Slow version detection is now always enabled, as required on non-FHS-compliant distros (e.g., NixOS). (#2149, DE, Linux)
+
+Features:
+* Adds the `--structure-disabled <modules...>` command-line flag to temporarily disable module structure printing.
+    * For example: `fastfetch --structure-disabled colors` removes the color blocks from the default output.
+* Supports chassis type detection on Linux ARM devices when reported via the device tree (Chassis, Linux)
+* Supports Bedrock Linux version detection (#2155, OS, Linux)
+* Honors the `DBPath` and `RootDir` settings in `pacman.conf` when detecting Pacman packages (#2154, Packages, Linux)
+
+Bugfixes:
+* Fixes a crash issue on KDE Plasma 6.6 (Display, Linux)
+* Fixes the Command module not working with `--dynamic-interval` (#2152, Command)
+* Fixes Quartz Compositor version detection. It now correctly reports the version of `WindowServer` (`SkyLight`) instead of `WindowManager`. (WM, macOS)
+
+Logos:
+* Adds Kiss2
+
+# 2.57.1
+
+Features:
+* Tiny performance improvements (Windows)
+* Improves the reliability of hostname retrieval (Title, Windows)
+
+Bugfixes:
+* Fixes potential compilation issues on Linux (#2142, Linux)
+* Fixes compilation errors on macOS when building with older SDKs (#2140, macOS)
+* Fixes compilation issues when building with `-DENABLE_SYSTEM_YYJSON=ON` (#2143)
+
+Logos:
+* Updates PrismLinux and adds a small variant
+
+# 2.57.0
+
+Deprecation notice:
+* Support for Windows 7 (and 8.x) is deprecated and will be removed in a future release. Extended support for Windows 7 (and 8.1) ended on January 10, 2023. These versions do not officially support ANSI escape codes (running fastfetch on them requires a third-party terminal such as ConEmu). In addition, Windows 7 lacks some APIs used by fastfetch. Fastfetch currently loads these APIs dynamically at runtime to maintain compatibility, but this adds complexity to the codebase and increases the maintenance burden.
+    * A CMake flag `ENABLE_WIN7_COMPAT:BOOLEAN` has been introduced (defaults to `ON` for now). If set to `OFF`, Windows 7 compatibility code is excluded, and the resulting binaries will support only Windows 10 (version 1607 and later) and Windows 11.
+    * The main prebuilt Windows binaries on the Release page (`fastfetch-windows-amd64.*`) are built with `ENABLE_WIN7_COMPAT=OFF`. These are the binaries used by `scoop` and `winget`. Users who need Windows 7 (or 8.x) support can download the `-win7` variant instead.
+    * ~~The `ENABLE_WIN7_COMPAT` CMake option and the `-win7` variant binaries are planned to be removed in 2.60.0~~.
+
+Features:
+* Supports COSMIC DE version detection (DE, Linux)
+* Supports niri version detection (#2121, WM, Linux)
+* Supports cosmic-term version and terminal font detection (Terminal / TerminalFont, Linux)
+* Supports urxvt font detection (TerminalFont, Linux) (#2105)
+* Improves xterm font detection by checking `xterm.vt100.faceName` (TerminalFont, Linux)
+* Supports Secure Boot detection (Bootmgr, macOS)
+* Supports DPI scale factor detection on Windows 7 (Display, Windows)
+* Supports xterm 256-color codes in color configuration
+    * In `display.color`: "`@<color-index>`" (e.g., "`@34`" for color index `34`)
+    * In `*.format` strings: "`#@<color-index>`" (e.g., "`#@34`" for color index `34`)
+* Improves uptime accuracy on Windows 10+ (Uptime, Windows)
+* Adds a new module `Logo` to query built-in logo raw data in JSON output (Logo)
+    * Usage: `fastfetch -s logo -l <logo-name> -j # Supported in JSON format only`
+* Supports shell version detection even if the binary has been deleted (#2136, Shell, Linux)
+* Overall code refinements and optimizations
+
+Bugfixes:
+* Skips local / loopback routes when detecting network interfaces (LocalIP, Linux) (#2127)
+* Fixes CPU speed detection on s390x (CPU, Linux) (#2129)
+* Fixes GPU detection error handling and supports case-insensitive PCI ID parsing (GPU, Windows)
+* Fixes some networking issues and memory leaks (Networking)
+* Fixes `exePath` reporting relative paths on macOS (Shell, macOS)
+
+Logos:
+* Adds openSUSE Tumbleweed braille logo
+* Adds Xinux
+* Renames HydraPWK to NetHydra
+* Fixes colors of deepin and UOS
+* Fixes colors of macOS and variants
+
+# 2.56.1
+
+Features:
+* Improves compatibility with KDE Plasma 6.5 (#2093, Display)
+* Adds a `tempSensor` option to specify the sensor name used for CPU temperature detection (CPU)
+    * Example: `{ "type": "cpu", "tempSensor": "hwmon0" /* Use /sys/class/hwmon/hwmon0 for temperature detection */ }`
+* Refines Memory usage detection on macOS to match Activity Monitor more closely (Memory, macOS)
+* Minor optimizations
+
+Bugfixes:
+* Fixes cache line size detection (CPU, macOS)
+
+Logos:
+* Removes Opak
+* Updates GXDE
+
+# 2.56.0
+
+Features:
+* Enhances config file loading. `--config` and `-c` with relative path now also searches paths defined in `fastfetch --list-config-paths` (typically `~/.config/fastfetch/`)
+    * This allows users to use `fastfetch -c my-config` without needing to specify the full path.
+* Adds NUMA node count detection (CPU)
+    * Exposed via `{numa-nodes}` in custom format
+    * Supported on Linux, FreeBSD and Windows
+* Supports the newest Alacritty config format (#2070, TerminalFont)
+* Detects driver specific info for Zhaoxin GPUs (GPU, Linux)
+* Detects Android OEM UI for certain OSes (DE, Android)
+* Improves users detection on Linux (#2064, Users, Linux)
+    * Adds systemd fallback when utmp is unavailable
+    * Fixes resource leaks
+    * Always reports the newest session info
+* Adds kiss package manager support (#2072, Packages, Linux)
+* Reports `sshd` if `$SSH_TTY` is not available (Terminal)
+* Zpool module rewrite (#2051, Zpool)
+    * Adds new Zpool properties: allocated, guid, readOnly
+    * Zpool module now uses runtime lookup for properties to ensure portability
+    * Adds NetBSD (requires `sudo`) and macOS support
+* Adds `splitLines` option for Command module, which splits the output into sub modules, each containing one line of the output (Command)
+```
+* Command output:
+Line 1
+Line 2
+Line 3
+
+* Old behavior:
+Command: Line 1
+Line 2
+Line 3
+
+* With `"splitLines": true`:
+Command 1: Line 1
+Command 2: Line 2
+Command 3: Line 3
+```
+
+Bugfixes:
+* Fixes {m,o}ksh version detection on Linux (Shell)
+* Fixes Alacritty config parsing for TOML format (#2070, TerminalFont)
+* Improves builtin logo printing for piping and buffering (#2065, Logo)
+* Uses absolute path when detecting shell and terminal version if available (#2067, TerminalShell)
+
+Logos:
+* Updates Codex Linux logo (#2071)
+* Adds OS/2 Warp logo (#2062)
+* Adds Amiga logo (#2061)
+
+# 2.55.1
+
+Bugfixes:
+* Fix parallel command execution breaks randomly (#2056 / #2058, Command)
+    * Regression from v2.55.0
+* Fix `dylib` searching path on macOS (macOS)
+    * Regression from v2.55.0
+* Fix an uninitialized field (#2057, Display)
+
+# 2.55.0
+
+Changes:
+* Commands are now executed in parallel by default to improve performance (#2045, Command)
+    * This behavior can be disabled in the config file with `"parallel": false` if it causes problems with certain scripts
+* Folder/filesystem hiding is moved to the detection stage; hidden entries are no longer probed, improving performance (#2043, Disk)
+
+Features:
+* Adds `command.parallel` and `command.useStdErr` config options (Command)
+    * `parallel`: set to `false` to disable parallel execution (see Changes above)
+    * `useStdErr`: set to `true` to use stderr output instead of stdout
+* Adds the command-line flag `--dynamic-interval <interval-in-ms>` to enable dynamic output auto-refresh (#2041)
+    * Due to internal limitations, some modules do not support dynamic updates (notably Display and Media)
+* Adds support for using the current playing media's cover art as a logo source (Media / Logo)
+    * Usage: `"logo": { "type": "<image-protocol>", "source": "media-cover" }` in JSON config; or `--<image-protocol> media-cover` in command line
+    * Supports local sources only
+* Adds native GPU detection support on OpenBSD and NetBSD (instead of depending on `libpciaccess`) (GPU)
+    * No functional changes
+    * Root privileges are required to access PCI config space on OpenBSD (as always)
+* Adds GPU detection support on GNU/Hurd (GPU)
+    * Requires building with `libpciaccess`
+* Shows Debian point release on Raspberry Pi OS (#2032, OS, Linux)
+* Adds `Brush` shell version detection (Shell)
+* Improves Mac family detection via prefix matching (Host)
+
+Bugfixes:
+* Ignores `run-parts` during terminal/shell detection (#2048, Terminal / Shell, Linux)
+* Fixes fish version detection when `LC_ALL` is set (#2014, Shell, Linux)
+* Hides the module when no desktop icons are found (#2023, Icons, Windows)
+* Skips auxiliary display controllers to prevent the module from reporting duplicate entries (#2034, GPU, Linux)
+* Refines Apple rpath handling; fixes building for the Homebrew version on macOS (#1998, CMake)
+
+Logos:
+* Adds Vincent OS and MacaroniOS
+
 # 2.54.0

-Windows binaries in Release page are now signed using SignPath.
+Windows binaries in Release page are now signed by SignPath.

 Changes:
 * Moves macOS and Windows design language detection from the DE module to the Theme module
@@ -1,7 +1,7 @@
 MIT License

 Copyright (c) 2021-2023 Linus Dierheimer
-Copyright (c) 2022-2025 Carter Li
+Copyright (c) 2022-2026 Carter Li

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -13,7 +13,9 @@
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/fastfetch-cli/fastfetch)
 [![中文README](https://img.shields.io/badge/%E4%B8%AD%E6%96%87-README-red)](README-cn.md)

-Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying it in a visually appealing way. It is written mainly in C, with a focus on performance and customizability. Currently, it supports Linux, macOS, Windows 7+, Android, FreeBSD, OpenBSD, NetBSD, DragonFly, Haiku, and SunOS.
+Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for fetching system information and displaying it in a visually appealing way. It is written mainly in C, with a focus on performance and customizability. Currently, it supports Linux, macOS, Windows 8.1+, Android, FreeBSD, OpenBSD, NetBSD, DragonFly, Haiku and SunOS (illumos, Solaris).
+
+> Note: Fastfetch is only actively tested on x86-64 and aarch64 platforms. It may work on other platforms but is not guaranteed to do so.

 <img src="screenshots/example1.png" width="49%" align="left" />
 <img src="https://upload.wikimedia.org/wikipedia/commons/2/24/Transparent_Square_Tiles_Texture.png" width="49%" height="16px" align="left" />
@@ -37,7 +39,8 @@ Some distributions package outdated versions of fastfetch. Older versions receiv
    <img src="https://repology.org/badge/vertical-allrepos/fastfetch.svg?columns=2" alt="Packaging status" align="right">
 </a>

-* Debian: `apt install fastfetch` (for Debian 13 or newer)
+* Ubuntu: [`ppa:zhangsongcui3371/fastfetch`](https://launchpad.net/~zhangsongcui3371/+archive/ubuntu/fastfetch) (Ubuntu 22.04 or newer; latest version)
+* Debian / Ubuntu: `apt install fastfetch` (Debian 13 or newer; Ubuntu 25.04 or newer)
 * Debian / Ubuntu: Download `fastfetch-linux-<proper architecture>.deb` from [Github release page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and double-click it (for Ubuntu 20.04 or newer and Debian 11 or newer).
 * Arch Linux: `pacman -S fastfetch`
 * Fedora: `dnf install fastfetch`
@@ -322,6 +325,11 @@ If you find Fastfetch useful, please consider donating.
 * Current maintainer: [@CarterLi](https://paypal.me/zhangsongcui)
 * Original author: [@LinusDierheimer](https://github.com/sponsors/LinusDierheimer)

+## Code signing
+
+* Free code signing provided by [SignPath.io](https://about.signpath.io/), certificate by [SignPath Foundation](https://signpath.org/)
+* This program will not transfer any information to other networked systems unless specifically requested by the user or the person installing or operating it
+
 ## Star History

 Give us a star to show your support!
@@ -1,3 +1,88 @@
+fastfetch (2.63.1~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.63.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 15 May 2026 09:31:54 +0800
+
+fastfetch (2.63.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.63.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 13 May 2026 16:02:28 +0800
+
+fastfetch (2.62.1~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.62.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 24 Apr 2026 15:45:15 +0800
+
+fastfetch (2.62.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.62.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 22 Apr 2026 09:49:55 +0800
+
+fastfetch (2.61.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.61.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 30 Mar 2026 09:51:18 +0800
+
+fastfetch (2.58.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.58.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 22 Jan 2026 15:30:58 +0800
+
+fastfetch (2.57.1~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.57.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 14 Jan 2026 14:00:17 +0800
+
+fastfetch (2.57.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.57.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 12 Jan 2026 10:11:21 +0800
+
+fastfetch (2.56.1~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.56.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 18 Dec 2025 14:57:36 +0800
+
+fastfetch (2.56.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.56.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 08 Dec 2025 09:21:58 +0800
+
+fastfetch (2.55.1~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.55.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 17 Nov 2025 10:15:44 +0800
+
+fastfetch (2.55.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.55.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 12 Nov 2025 09:15:24 +0800
+
+fastfetch (2.54.1~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Fix building on plucky
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 20 Oct 2025 14:27:02 +0800
+
+fastfetch (2.54.0~#UBUNTU_CODENAME#) #UBUNTU_CODENAME#; urgency=medium
+
+  * Update to 2.54.0
+  * Test independent changelog entries for different Ubuntu releases
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 20 Oct 2025 10:47:02 +0800
+
 fastfetch (2.53.0) jammy; urgency=medium

  * Update to 2.53.0
@@ -435,4 +520,3 @@ fastfetch (2.7.1) jammy; urgency=medium
  * Initial release.

 -- Carter Li <zhangsongcui@live.cn>  Tue, 06 Feb 2024 15:01:11 +0800
-
@@ -2,7 +2,7 @@ Source: fastfetch
 Section: universe/utils
 Priority: optional
 Maintainer: Carter Li <zhangsongcui@live.cn>
-Build-Depends: libelf-dev, libvulkan-dev, libwayland-dev, libxrandr-dev, libxcb-randr0-dev, libdconf-dev, libdbus-1-dev, libmagickcore-dev, libsqlite3-dev, librpm-dev, libegl-dev, libglx-dev, ocl-icd-opencl-dev, libpulse-dev, libdrm-dev, libddcutil-dev, libchafa-dev, directx-headers-dev, pkgconf, cmake (>= 3.12), debhelper (>= 11.2), dh-cmake, dh-cmake-compat (= 1), dh-sequence-cmake, dh-sequence-ctest, ninja-build
+Build-Depends: libelf-dev, libvulkan-dev, libwayland-dev, libxrandr-dev, libxcb-randr0-dev, libdconf-dev, libdbus-1-dev, libmagickcore-dev, libsqlite3-dev, librpm-dev, libegl-dev, libglx-dev, ocl-icd-opencl-dev, libpulse-dev, libdrm-dev, libddcutil-dev, libchafa-dev, libefl-all-dev, pkgconf, cmake (>= 3.12), debhelper (>= 11.2), dh-cmake, dh-cmake-compat (= 1), dh-sequence-cmake, dh-sequence-ctest, ninja-build, python3-setuptools
 Standards-Version: 4.0.0
 Homepage: https://github.com/fastfetch-cli/fastfetch

@@ -1 +0,0 @@
-fastfetch_2.53.0_source.buildinfo universe/utils optional
@@ -1,4 +1,76 @@
 #!/usr/bin/env bash
+# WARNING: DO NOT RUN THIS SCRIPT UNLESS YOU KNOW WHAT YOU ARE DOING.

-debuild -S -i -I
-dput ppa:zhangsongcui3371/fastfetch ~/fastfetch_*.changes
+set -euo pipefail
+
+command -v debuild >/dev/null 2>&1 || { echo "debuild not found. Install devscripts." >&2; exit 1; }
+command -v dput >/dev/null 2>&1 || { echo "dput not found." >&2; exit 1; }
+
+SCRIPT_DIR="$(cd -- "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+ROOT_DIR="$(cd -- "$SCRIPT_DIR/.." >/dev/null 2>&1 && pwd)"
+OUT_DIR="$(dirname "$ROOT_DIR")"
+PPA="ppa:zhangsongcui3371/fastfetch"
+CODENAMES=( jammy noble plucky questing resolute )
+DRY_RUN=0
+
+if [[ -d "$OUT_DIR/build" ]]; then
+    echo "Output directory exists: $OUT_DIR/build" >&2
+    echo "Please move or delete it before proceeding." >&2
+    exit 1
+fi
+
+TEMPLATE="$ROOT_DIR/debian/changelog.tpl"
+CHANGELOG_DEBIAN="$ROOT_DIR/debian/changelog"
+
+if [[ ! -f "$TEMPLATE" ]]; then
+  echo "Template not found: $TEMPLATE" >&2
+  exit 1
+fi
+
+if ! grep -q '#UBUNTU_CODENAME#' "$TEMPLATE"; then
+  echo "Template missing placeholder: #UBUNTU_CODENAME#" >&2
+  exit 1
+fi
+
+echo "IMPORTANT: Before proceeding, please ensure that 'debian/changelog.tpl' is up-to-date"
+echo "   with the correct version number, release notes, and maintainer information."
+echo
+echo "   The template must contain a placeholder like '#UBUNTU_CODENAME#' for the codename."
+echo
+read -p "Have you reviewed and updated 'debian/changelog.tpl'? (y/N): " -r
+echo
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+    exit 1
+fi
+
+cleanup() {
+    rm -f "$CHANGELOG_DEBIAN"
+    rm -f "$ROOT_DIR/debian/files"
+}
+trap cleanup EXIT
+
+shopt -s nullglob
+
+for codename in "${CODENAMES[@]}"; do
+  echo "==> Publishing distro: $codename"
+  sed "s/#UBUNTU_CODENAME#/${codename}/g" "$TEMPLATE" > "$CHANGELOG_DEBIAN"
+
+  ( cd "$ROOT_DIR" && debuild -S -i -I )
+
+  changes=( "$OUT_DIR"/fastfetch_*~${codename}_source.changes )
+  if [[ ${#changes[@]} -ne 1 ]]; then
+    echo "Unable to uniquely identify .changes for '$codename' in: $OUT_DIR" >&2
+    printf 'Found:\n'; printf '  %s\n' "${changes[@]}" >&2 || true
+    exit 1
+  fi
+
+  if [[ $DRY_RUN -eq 1 ]]; then
+    echo "[DRY-RUN] dput \"$PPA\" \"${changes[0]}\""
+  else
+    dput "$PPA" "${changes[0]}"
+  fi
+
+  rm -f "$OUT_DIR"/fastfetch_*~${codename}_source.{changes,dsc,tar.*}
+
+  echo "<== Done: $codename"
+done
@@ -3,7 +3,7 @@
        {
            "short": "h",
            "long": "help",
-            "desc": "Display this help message or help for a specific command",
+            "desc": "Show this help message or help for a specific command",
            "arg": {
                "type": "command",
                "optional": true
@@ -12,11 +12,11 @@
        {
            "short": "v",
            "long": "version",
-            "desc": "Show the full version of fastfetch"
+            "desc": "Show the full Fastfetch version"
        },
        {
            "long": "version-raw",
-            "desc": "Display the raw version string (major.minor.patch)"
+            "desc": "Show the raw version string (major.minor.patch)"
        },
        {
            "long": "list-config-paths",
@@ -36,7 +36,7 @@
        },
        {
            "long": "list-presets",
-            "desc": "List presets that fastfetch knows about",
+            "desc": "List available presets",
            "remark": "Presets can be loaded with \"--config <preset-name>\""
        },
        {
@@ -46,15 +46,15 @@
        },
        {
            "long": "print-logos",
-            "desc": "Display available logos"
+            "desc": "Show available logos"
        },
        {
            "long": "print-structure",
-            "desc": "Display the default structure"
+            "desc": "Show the default structure"
        },
        {
            "long": "format",
-            "desc": "Set output format",
+            "desc": "Set the output format",
            "arg": {
                "type": "enum",
                "enum": {
@@ -74,6 +74,15 @@
            },
            "desc": "Enable or disable JSON output",
            "remark": "Shortcut for `--format json`"
+        },
+        {
+            "long": "dynamic-interval",
+            "desc": "Keep Fastfetch running and refresh the output every <num> milliseconds",
+            "remark": "Set to 0 (default) to disable this behavior; does not work with --json",
+            "arg": {
+                "type": "num",
+                "default": 0
+            }
        }
    ],
    "Config": [
@@ -81,7 +90,7 @@
            "short": "c",
            "long": "config",
            "desc": "Specify the config file or preset to load",
-            "remark": "The file will be searched according to the order shown by \"fastfetch --list-config-paths\". Use \"none\" to disable further config loading. See also https://github.com/fastfetch-cli/fastfetch/wiki/Configuration for more info",
+            "remark": "The file is searched in the order shown by \"fastfetch --list-config-paths\". Use \"-\" to read config from stdin, or \"none\" to disable further config loading. See also https://github.com/fastfetch-cli/fastfetch/wiki/Configuration for details",
            "arg": {
                "type": "config"
            }
@@ -89,7 +98,7 @@
        {
            "long": "gen-config",
            "desc": "Generate a minimal config file at the specified path",
-            "remark": "Defaults to \"~/.config/fastfetch/config.jsonc\". Will print the generated config if <path> is \"-\"",
+            "remark": "Defaults to \"~/.config/fastfetch/config.jsonc\". Prints the generated config if <path> is \"-\"",
            "arg": {
                "type": "path",
                "optional": true
@@ -97,8 +106,8 @@
        },
        {
            "long": "gen-config-full",
-            "desc": "Generate a full config file with all optional options at the specified path",
-            "remark": "Defaults to \"~/.config/fastfetch/config.jsonc\". Will print the generated config if <path> is \"-\"",
+            "desc": "Generate a full config file with all optional settings at the specified path",
+            "remark": "Defaults to \"~/.config/fastfetch/config.jsonc\". Prints the generated config if <path> is \"-\"",
            "arg": {
                "type": "path",
                "optional": true
@@ -143,7 +152,7 @@
        },
        {
            "long": "ds-force-drm",
-            "desc": "Specify whether only DRM should be used to detect displays",
+            "desc": "Specify whether display detection should use DRM only",
            "remark": [
                "Use this option if you encounter problems with other detection methods.",
                "Linux only"
@@ -161,7 +170,7 @@
        },
        {
            "long": "detect-version",
-            "desc": "Specify whether to detect and display versions of terminal, shell, editor, and others",
+            "desc": "Specify whether to detect and display versions for terminal, shell, editor, and others",
            "remark": "Mainly for benchmarking",
            "arg": {
                "type": "bool",
@@ -174,31 +183,31 @@
        {
            "short": "l",
            "long": "logo",
-            "desc": "Set the logo source. Use \"none\" to disable the logo",
-            "remark": "Should be the name of a built-in logo or a path to an image file. See also https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options",
+            "desc": "Set the logo source. Use \"none\" to disable logo output",
+            "remark": "Use either a built-in logo name or a path to an image file. See also https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options",
            "arg": {
                "type": "logo"
            }
        },
        {
            "long": "logo-type",
-            "desc": "Set the type of the logo specified in \"--logo\"",
+            "desc": "Set the type of logo specified by \"--logo\"",
            "remark": "See also https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options",
            "arg": {
                "type": "enum",
                "enum": {
-                    "auto": "If something is given, first try built-in, then file. Otherwise detect logo",
+                    "auto": "If a value is provided, try built-in first, then file. Otherwise auto-detect the logo",
                    "builtin": "Built-in ASCII art",
                    "small": "Built-in ASCII art, small version",
                    "file": "Text file, printed with color code replacement",
                    "file-raw": "Text file, printed as is",
                    "data": "Text data, printed with color code replacement",
                    "data-raw": "Text data, printed as is",
-                    "sixel": "Image file, printed as sixel codes",
-                    "kitty": "Image file, printed using kitty graphics protocol",
+                    "sixel": "Image file, rendered as sixel",
+                    "kitty": "Image file, rendered using the Kitty graphics protocol",
                    "kitty-direct": "Image file, tells the terminal emulator to read image data from the specified file",
-                    "kitty-icat": "Image file, uses `kitten icat` to display the image. Requires binary `kitten` to be installed",
-                    "iterm": "Image file, printed using iterm graphics protocol",
+                    "kitty-icat": "Image file, displayed using `kitten icat`. Requires the `kitten` binary",
+                    "iterm": "Image file, rendered using the iTerm graphics protocol",
                    "chafa": "Image file, printed as ASCII art using libchafa",
                    "raw": "Image file, printed as raw binary string",
                    "none": "Disable logo printing"
@@ -270,7 +279,7 @@
        },
        {
            "long": "logo-print-remaining",
-            "desc": "Specify whether to print the remaining logo if it has more lines than modules to display",
+            "desc": "Specify whether to print remaining logo lines when the logo is taller than the module list",
            "arg": {
                "type": "bool",
                "optional": true,
@@ -279,7 +288,7 @@
        },
        {
            "long": "logo-position",
-            "desc": "Set the position where the logo should be displayed",
+            "desc": "Set the display position of the logo",
            "arg": {
                "type": "enum",
                "enum": {
@@ -389,7 +398,7 @@
        {
            "long": "chafa-fg-only",
            "desc": "Produce character-cell output using foreground colors only",
-            "remark": "See chafa document for detail",
+            "remark": "See the Chafa documentation for details",
            "arg": {
                "type": "bool",
                "optional": true,
@@ -399,7 +408,7 @@
        {
            "long": "chafa-symbols",
            "desc": "Specify character symbols to employ in final output",
-            "remark": "See chafa document for detail",
+            "remark": "See the Chafa documentation for details",
            "arg": {
                "type": "str"
            }
@@ -407,7 +416,7 @@
        {
            "long": "chafa-canvas-mode",
            "desc": "Determine how colors are used in the output",
-            "remark": "This value maps the int value of enum ChafaCanvasMode. See chafa document for detail",
+            "remark": "This value maps to the integer value of enum ChafaCanvasMode. See the Chafa documentation for details",
            "arg": {
                "type": "enum",
                "enum": {
@@ -424,8 +433,8 @@
        },
        {
            "long": "chafa-color-space",
-            "desc": "Set color space used for quantization",
-            "remark": "This value maps the int value of enum ChafaColorSpace. See chafa document for detail",
+            "desc": "Set the color space used for quantization",
+            "remark": "This value maps to the integer value of enum ChafaColorSpace. See the Chafa documentation for details",
            "arg": {
                "type": "enum",
                "enum": {
@@ -436,8 +445,8 @@
        },
        {
            "long": "chafa-dither-mode",
-            "desc": "Set output dither mode (No effect with 24-bit color)",
-            "remark": "This value maps the int value of enum ChafaDitherMode. See chafa document for detail",
+            "desc": "Set the output dithering mode (no effect with 24-bit color)",
+            "remark": "This value maps to the integer value of enum ChafaDitherMode. See the Chafa documentation for details",
            "arg": {
                "type": "enum",
                "enum": {
@@ -453,15 +462,23 @@
            "short": "s",
            "long": "structure",
            "desc": "Set the structure of the fetch",
-            "remark": "Must be a colon-separated list of keys. Use \"fastfetch --list-modules\" to see available options",
+            "remark": "Must be a colon-separated list of module keys. Use \"fastfetch --list-modules\" to see available options",
            "arg": {
                "type": "structure",
                "default": "\"fastfetch --print-structure\""
            }
        },
+        {
+            "long": "structure-disabled",
+            "desc": "Disable specific modules in the structure",
+            "remark": "Must be a colon-separated list of keys",
+            "arg": {
+                "type": "structure"
+            }
+        },
        {
            "long": "stat",
-            "desc": "Show time usage (in ms) for individual modules",
+            "desc": "Show execution time (ms) for individual modules",
            "arg": {
                "type": "bool",
                "optional": true,
@@ -524,7 +541,7 @@
        {
            "long": "duration-abbreviation",
            "desc": "Specify whether to abbreviate duration values",
-            "remark": "If true, the output will be in the form of \"1h 2m\" instead of \"1 hour, 2 mins\"",
+            "remark": "If true, output is shown as \"1h 2m\" instead of \"1 hour, 2 mins\"",
            "arg": {
                "type": "bool",
                "optional": true,
@@ -565,7 +582,7 @@
                "enum": {
                    "none": "Disable keys",
                    "string": "Show string",
-                    "icon": "Show icon (requires newest nerd font)",
+                    "icon": "Show icon (requires a recent Nerd Font)",
                    "both": "Show both icon and string (alias of `both-1`)",
                    "both-0": "Show both icon and string with no spaces between them",
                    "both-1": "Show both icon and string with a space between them",
@@ -622,7 +639,7 @@
        },
        {
            "long": "percent-type",
-            "desc": "Set the percentage output type",
+            "desc": "Set the percentage output style",
            "remark": [
                "1 for percentage number",
                "2 for multi-color bar",
@@ -638,7 +655,7 @@
        },
        {
            "long": "percent-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when formatting percentage numbers",
+            "desc": "Set the number of decimal places to use when formatting percentages",
            "arg": {
                "type": "num",
                "default": 0
@@ -685,7 +702,7 @@
        },
        {
            "long": "percent-width",
-            "desc": "Specify the width of the percentage number, in number of characters",
+            "desc": "Specify the width of the percentage number, in characters",
            "remark": "This option affects only percentage numbers, not bars",
            "arg": {
                "type": "num",
@@ -694,7 +711,7 @@
        },
        {
            "long": "bar-char-elapsed",
-            "desc": "Set the character to use in the elapsed part of percentage bars",
+            "desc": "Set the character used for the elapsed part of percentage bars",
            "arg": {
                "type": "str",
                "default": "\u25a0"
@@ -702,7 +719,7 @@
        },
        {
            "long": "bar-char-total",
-            "desc": "Set the character to use in the total part of percentage bars",
+            "desc": "Set the character used for the total part of percentage bars",
            "arg": {
                "type": "str",
                "default": "-"
@@ -726,7 +743,7 @@
        },
        {
            "long": "bar-border-left-elapsed",
-            "desc": "If both bar-border-left-elapsed and bar-border-right-elapsed are set, the border will be used as parts of bar content",
+            "desc": "If both bar-border-left-elapsed and bar-border-right-elapsed are set, the border is used as part of the bar content",
            "arg": {
                "type": "string",
                "default": ""
@@ -734,7 +751,7 @@
        },
        {
            "long": "bar-border-right-elapsed",
-            "desc": "If both bar-border-left-elapsed and bar-border-right-elapsed are set, the border will be used as parts of bar content",
+            "desc": "If both bar-border-left-elapsed and bar-border-right-elapsed are set, the border is used as part of the bar content",
            "arg": {
                "type": "string",
                "default": ""
@@ -742,8 +759,8 @@
        },
        {
            "long": "bar-color-elapsed",
-            "desc": "Set the color to use in the elapsed part of percentage bars",
-            "remark": "By default, auto selected by percent-color-{green,yellow,red}",
+            "desc": "Set the color used for the elapsed part of percentage bars",
+            "remark": "By default, this is auto-selected by percent-color-{green,yellow,red}",
            "arg": {
                "type": "color",
                "default": "<auto>"
@@ -751,7 +768,7 @@
        },
        {
            "long": "bar-color-total",
-            "desc": "Set the color to use in the total part of percentage bars",
+            "desc": "Set the color used for the total part of percentage bars",
            "arg": {
                "type": "color",
                "default": "light_white"
@@ -759,7 +776,7 @@
        },
        {
            "long": "bar-color-border",
-            "desc": "Set the color to use in the borders of percentage bars",
+            "desc": "Set the color used for percentage bar borders",
            "arg": {
                "type": "color",
                "default": "light_white"
@@ -775,7 +792,7 @@
        },
        {
            "long": "no-buffer",
-            "desc": "Specify whether the stdout application buffer should be disabled",
+            "desc": "Specify whether stdout buffering should be disabled",
            "arg": {
                "type": "bool",
                "optional": true,
@@ -784,7 +801,7 @@
        },
        {
            "long": "size-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when formatting sizes",
+            "desc": "Set the number of decimal places to use when formatting sizes",
            "arg": {
                "type": "num"
            }
@@ -835,7 +852,7 @@
        },
        {
            "long": "freq-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when printing CPU/GPU frequency in GHz",
+            "desc": "Set the number of decimal places to use when printing CPU/GPU frequency in GHz",
            "arg": {
                "type": "num",
                "default": 2
@@ -855,7 +872,7 @@
        },
        {
            "long": "fraction-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when printing ordinary fraction numbers",
+            "desc": "Set the number of decimal places to use when printing fractional values",
            "remark": "If negative, the number of digits will be automatically determined based on the value",
            "arg": {
                "type": "num",
@@ -868,7 +885,7 @@
            "arg": {
                "type": "enum",
                "enum": {
-                    "default": "Use the behavior defined internally",
+                    "default": "Use the built-in behavior",
                    "always": "Always keep trailing zeros",
                    "never": "Never keep trailing zeros"
                }
@@ -890,7 +907,7 @@
        },
        {
            "long": "temp-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when printing temperature",
+            "desc": "Set the number of decimal places to use when printing temperatures",
            "arg": {
                "type": "num",
                "default": 2
@@ -50,6 +50,10 @@
            "driverSpecific": true,
            "temp": true
        },
+        {
+            "type": "codec",
+            "splitGPU": true
+        },
        "memory",
        "physicalmemory",
        {
@@ -52,6 +52,10 @@
            "driverSpecific": true,
            "temp": true
        },
+        {
+            "type": "codec",
+            "splitGPU": true
+        },
        "memory",
        "physicalmemory",
        {
@@ -109,6 +113,7 @@
        },
        "tpm",
        "version",
+        "logo",
        "break",
        "colors"
    ]
@@ -1,6 +1,3 @@
-// Load with --load-config examples/2.jsonc
-// Note that you must replace the image path to an existing image to display it.
-
 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
    "logo": {
@@ -1,4 +1,4 @@
-// Load with --load-config examples/2.jsonc
+// Load with --config examples/2.jsonc
 // Note that you must replace the image path to an existing image to display it.

 {
@@ -9,25 +9,26 @@
        // Constants are reusable strings referenced by {$1}, {$2}, etc.
        // These contain ANSI escape codes for cursor positioning
        "constants": [
-            "──────────────────────────────────────────────", // {$1} - horizontal line for borders
+            "──────────────────────────────────────────────", // {$1} - horizontal line for inner borders
            "\u001b[47D",                                     // {$2} - move cursor left 47 columns
            "\u001b[47C",                                     // {$3} - move cursor right 47 columns
-            "\u001b[46C"                                      // {$4} - move cursor right 46 columns
+            "\u001b[46C",                                     // {$4} - move cursor right 46 columns
+            "══════════════════════════════════════════════"  // {$5} - horizontal line for outer borders
        ],
        "brightColor": false
    },
    "modules": [
        {
            "type": "version",
-            "key": "┌───────────────┬─{$1}┐\u001b[41D",
+            "key": "╔═══════════════╦═{$5}╗\u001b[41D",
            "format": "\u001b[1m{#keys} {1} - {2} "
        },
        {
            "type": "os",
            // Key format breakdown for OS module:
-            // "│  {icon}  \u001b[s{sysname}\u001b[u\u001b[10C│{$3}│{$2}"
+            // "║  {icon}  \u001b[s{sysname}\u001b[u\u001b[10C│{$3}║{$2}"
            //
-            // │                    - Left border of key block
+            // ║                    - Left border of key block
            //   {icon}             - OS icon (defined internally by fastfetch)
            //   \u001b[s           - ANSI escape: save cursor position (ESC[s)
            // {sysname}            - Format variable: system name (e.g., "Linux", "Darwin")
@@ -36,28 +37,28 @@
            // \u001b[10C           - ANSI escape: move cursor right 10 columns (ESC[10C)
            // │                    - Right border of key block (always 10 columns from left border)
            // {$3}                 - Reference to constants[2]: move cursor right 47 columns
-            // │                    - Right border of value block
+            // ║                    - Right border of value block
            // {$2}                 - Reference to constants[1]: move cursor left 47 columns
            //
            // This creates a fixed-width layout where the key block is exactly 10 columns wide,
            // regardless of the actual content length. The cursor manipulation ensures proper
            // alignment for the table-like structure.
-            "key": "│  {icon}  \u001b[s{sysname}\u001b[u\u001b[10C│{$3}│{$2}"
+            "key": "║  {icon}  \u001b[s{sysname}\u001b[u\u001b[10C║{$3}║{$2}"
        },
        {
            "type": "datetime",
-            "key": "│  {icon}  Fetched   │{$3}│{$2}",
+            "key": "║  {icon}  Fetched   ║{$3}║{$2}",
            "format": "{year}-{month-pretty}-{day-pretty} {hour-pretty}:{minute-pretty}:{second-pretty} {timezone-name}"
        },
        {
            "type": "locale",
-            "key": "│  {icon}  Locale    │{$3}│{$2}"
+            "key": "║  {icon}  Locale    ║{$3}║{$2}"
        },

        // Hardware section with cyan color theme
        {
            "type": "custom",
-            "key": "│{#cyan}┌──────────────┬{$1}┐{#keys}│\u001b[37D",
+            "key": "║{#cyan}┌──────────────┬{$1}┐{#keys}║\u001b[37D",
            "format": "{#bright_cyan} Hardware "
        },
        {
@@ -66,113 +67,113 @@
            // │{#cyan}│             - Left border with cyan color
            //  {icon}               - Chassis icon
            //  Chassis             - Fixed label text
-            // │{$4}│{#keys}│{$2}    - Positioning and borders for value area
-            "key": "│{#cyan}│ {icon}  Chassis   │{$4}│{#keys}│{$2}"
+            // │{$4}│{#keys}║{$2}    - Positioning and borders for value area
+            "key": "║{#cyan}│ {icon}  Chassis   │{$4}│{#keys}║{$2}"
        },
        {
            "type": "memory",
-            "key": "│{#cyan}│ {icon}  RAM       │{$4}│{#keys}│{$2}"
+            "key": "║{#cyan}│ {icon}  RAM       │{$4}│{#keys}║{$2}"
        },
        {
            "type": "swap",
-            "key": "│{#cyan}│ {icon}  SWAP      │{$4}│{#keys}│{$2}"
+            "key": "║{#cyan}│ {icon}  SWAP      │{$4}│{#keys}║{$2}"
        },
        {
            "type": "cpu",
-            "key": "│{#cyan}│ {icon}  CPU       │{$4}│{#keys}│{$2}",
+            "key": "║{#cyan}│ {icon}  CPU       │{$4}│{#keys}║{$2}",
            "showPeCoreCount": true
        },
        {
            "type": "gpu",
-            "key": "│{#cyan}│ {icon}  GPU       │{$4}│{#keys}│{$2}"
+            "key": "║{#cyan}│ {icon}  GPU       │{$4}│{#keys}║{$2}"
        },
        {
            "type": "disk",
-            "key": "│{#cyan}│ {icon}  Disk      │{$4}│{#keys}│{$2}",
+            "key": "║{#cyan}│ {icon}  Disk      │{$4}│{#keys}║{$2}",
            "format": "{size-used} \/ {size-total} ({size-percentage}) - {filesystem}",
        },
        {
            "type": "battery",
-            "key": "│{#cyan}│ {icon}  Battery   │{$4}│{#keys}│{$2}"
+            "key": "║{#cyan}│ {icon}  Battery   │{$4}│{#keys}║{$2}"
        },
        {
            "type": "custom",
-            "key": "│{#cyan}└──────────────┴{$1}┘{#keys}│",
+            "key": "║{#cyan}└──────────────┴{$1}┘{#keys}║",
            "format": ""
        },

        // Desktop section with green color theme
        {
            "type": "custom",
-            "key": "│{#green}┌──────────────┬{$1}┐{#keys}│\u001b[37D",
+            "key": "║{#green}┌──────────────┬{$1}┐{#keys}║\u001b[37D",
            "format": "{#bright_green} Desktop "
        },
        {
            "type": "de",
-            "key": "│{#green}│ {icon}  Desktop   │{$4}│{#keys}│{$2}"
+            "key": "║{#green}│ {icon}  Desktop   │{$4}│{#keys}║{$2}"
        },
        {
            "type": "wm",
-            "key": "│{#green}│ {icon}  Session   │{$4}│{#keys}│{$2}"
+            "key": "║{#green}│ {icon}  Session   │{$4}│{#keys}║{$2}"
        },
        {
            "type": "display",
-            "key": "│{#green}│ {icon}  Display   │{$4}│{#keys}│{$2}",
+            "key": "║{#green}│ {icon}  Display   │{$4}│{#keys}║{$2}",
            "compactType": "original-with-refresh-rate"
        },
        {
            "type": "gpu",
-            "key": "│{#green}│ {icon}  G-Driver  │{$4}│{#keys}│{$2}",
+            "key": "║{#green}│ {icon}  G-Driver  │{$4}│{#keys}║{$2}",
            "format": "{driver}"
        },
        {
            "type": "custom",
-            "key": "│{#green}└──────────────┴{$1}┘{#keys}│",
+            "key": "║{#green}└──────────────┴{$1}┘{#keys}║",
            "format": ""
        },

        // Terminal section with yellow color theme
        {
            "type": "custom",
-            "key": "│{#yellow}┌──────────────┬{$1}┐{#keys}│\u001b[37D",
+            "key": "║{#yellow}┌──────────────┬{$1}┐{#keys}║\u001b[37D",
            "format": "{#bright_yellow} Terminal "
        },
        {
            "type": "shell",
-            "key": "│{#yellow}│ {icon}  Shell     │{$4}│{#keys}│{$2}"
+            "key": "║{#yellow}│ {icon}  Shell     │{$4}│{#keys}║{$2}"
        },
        {
            "type": "terminal",
-            "key": "│{#yellow}│ {icon}  Terminal  │{$4}│{#keys}│{$2}"
+            "key": "║{#yellow}│ {icon}  Terminal  │{$4}│{#keys}║{$2}"
        },
        {
            "type": "terminalfont",
-            "key": "│{#yellow}│ {icon}  Term Font │{$4}│{#keys}│{$2}"
+            "key": "║{#yellow}│ {icon}  Term Font │{$4}│{#keys}║{$2}"
        },
        {
            "type": "terminaltheme",
-            "key": "│{#yellow}│ {icon}  Colors    │{$4}│{#keys}│{$2}"
+            "key": "║{#yellow}│ {icon}  Colors    │{$4}│{#keys}║{$2}"
        },
        {
            "type": "packages",
-            "key": "│{#yellow}│ {icon}  Packages  │{$4}│{#keys}│{$2}"
+            "key": "║{#yellow}│ {icon}  Packages  │{$4}│{#keys}║{$2}"
        },
        {
            "type": "custom",
-            "key": "│{#yellow}└──────────────┴{$1}┘{#keys}│",
+            "key": "║{#yellow}└──────────────┴{$1}┘{#keys}║",
            "format": ""
        },

        // Development section with red color theme
        {
            "type": "custom",
-            "key": "│{#red}┌──────────────┬{$1}┐{#keys}│\u001b[39D",
+            "key": "║{#red}┌──────────────┬{$1}┐{#keys}║\u001b[39D",
            "format": "{#bright_red} Development "
        },
        {
            "type": "command",
            "keyIcon": "",                                   // Custom icon override
-            "key": "│{#red}│ {icon}  Rust      │{$4}│{#keys}│{$2}",
+            "key": "║{#red}│ {icon}  Rust      │{$4}│{#keys}║{$2}",
            "text": "rustc --version",
            "format": "rustc {~6,13}"                         // Print 6th to 13th characters (version number)
        },
@@ -182,8 +183,8 @@
                "!system": "Windows"                          // Posix version
            },
            "keyIcon": "",
-            "key": "│{#red}│ {icon}  Clang     │{$4}│{#keys}│{$2}",
-            "text": "clang --version | head -1 | awk '{print $NF}'",
+            "key": "║{#red}│ {icon}  Clang     │{$4}│{#keys}║{$2}",
+            "text": "clang --version | sed -n 's/.*version \\([0-9][0-9.]*\\).*/\\1/p'",
            "format": "clang {}"
        },
        {
@@ -192,67 +193,67 @@
                "system": "Windows"                           // Windows version
            },
            "keyIcon": "",
-            "key": "│{#red}│ {icon}  Clang     │{$4}│{#keys}│{$2}",
+            "key": "║{#red}│ {icon}  Clang     │{$4}│{#keys}║{$2}",
            "text": "clang --version | findstr version",      // Finds the line with "version"
            "format": "clang {~-6}"                           // Prints the last 6 characters (version number)
        },
        {
            "type": "command",
            "keyIcon": "",
-            "key": "│{#red}│ {icon}  NodeJS    │{$4}│{#keys}│{$2}",
+            "key": "║{#red}│ {icon}  NodeJS    │{$4}│{#keys}║{$2}",
            "text": "node --version",
            "format": "node {~1}"                             // {~1} removes first character (v)
        },
        {
            "type": "command",
            "keyIcon": "",
-            "key": "│{#red}│ {icon}  Go        │{$4}│{#keys}│{$2}",
+            "key": "║{#red}│ {icon}  Go        │{$4}│{#keys}║{$2}",
            "text": "go version | cut -d' ' -f3",
            "format": "go {~2}"                               // {~2} removes first 2 characters (go)
        },
        {
            "type": "command",
            "keyIcon": "",
-            "key": "│{#red}│ {icon}  Zig       │{$4}│{#keys}│{$2}",
+            "key": "║{#red}│ {icon}  Zig       │{$4}│{#keys}║{$2}",
            "text": "zig version",
            "format": "zig {}"
        },
        {
            "type": "editor",
-            "key": "│{#red}│ {icon}  Editor    │{$4}│{#keys}│{$2}"
+            "key": "║{#red}│ {icon}  Editor    │{$4}│{#keys}║{$2}"
        },
        {
            "type": "command",
            "keyIcon": "󰊢",
-            "key": "│{#red}│ {icon}  Git       │{$4}│{#keys}│{$2}",
+            "key": "║{#red}│ {icon}  Git       │{$4}│{#keys}║{$2}",
            "text": "git version",
            "format": "git {~12}"
        },
        {
            "type": "font",
-            "key": "│{#red}│ {icon}  Interface │{$4}│{#keys}│{$2}"
+            "key": "║{#red}│ {icon}  Interface │{$4}│{#keys}║{$2}"
        },
        {
            "type": "custom",
-            "key": "│{#red}└──────────────┴{$1}┘{#keys}│",
+            "key": "║{#red}└──────────────┴{$1}┘{#keys}║",
            "format": ""
        },

        // Uptime section with magenta color theme
        {
            "type": "custom",
-            "key": "│{#magenta}┌──────────────┬{$1}┐{#keys}│\u001b[36D",
+            "key": "║{#magenta}┌──────────────┬{$1}┐{#keys}║\u001b[36D",
            "format": "{#bright_magenta} Uptime "
        },
        {
            "type": "uptime",
-            "key": "│{#magenta}│ {icon}  Uptime    │{$4}│{#keys}│{$2}"
+            "key": "║{#magenta}│ {icon}  Uptime    │{$4}│{#keys}║{$2}"
        },
        {
            "type": "users",
            "myselfOnly": true,                               // Only show current user
            "keyIcon": "",
-            "key": "│{#magenta}│ {icon}  Login     │{$4}│{#keys}│{$2}"
+            "key": "║{#magenta}│ {icon}  Login     │{$4}│{#keys}║{$2}"
        },
        {
            "condition": {                                    // Conditional module: only show on non-macOS
@@ -260,7 +261,7 @@
            },
            "type": "disk",
            "keyIcon": "",
-            "key": "│{#magenta}│ {icon}  OS Age    │{$4}│{#keys}│{$2}",
+            "key": "║{#magenta}│ {icon}  OS Age    │{$4}│{#keys}║{$2}",
            "folders": "/",                                   // Check root filesystem
            "format": "{create-time:10} [{days} days]"        // Show creation time and age in days
        },
@@ -270,18 +271,18 @@
            },
            "type": "disk",
            "keyIcon": "",
-            "key": "│{#magenta}│ {icon}  OS Age    │{$4}│{#keys}│{$2}",
+            "key": "║{#magenta}│ {icon}  OS Age    │{$4}│{#keys}║{$2}",
            "folders": "/System/Volumes/VM",                 // Work around for APFS on macOS
            "format": "{create-time:10} [{days} days]"
        },
        {
            "type": "custom",
-            "key": "│{#magenta}└──────────────┴{$1}┘{#keys}│",
+            "key": "║{#magenta}└──────────────┴{$1}┘{#keys}║",
            "format": ""
        },
        {
            "type": "custom",
-            "key": "└─────────────────{$1}┘",                // Bottom border of the entire layout
+            "key": "╚═════════════════{$5}╝",                // Bottom border of the entire layout
            "format": ""
        },

@@ -1,4 +1,4 @@
-// Load with --load-config examples/3.jsonc
+// Load with --config examples/3.jsonc

 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
@@ -0,0 +1,57 @@
+// Inspired by microfetch
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "general": {
+        "detectVersion": false
+    },
+    "display": {
+        "separator": "  ",
+        "brightColor": false,
+        "key": {
+            "type": "both-2"
+        }
+    },
+    "modules": [
+        {
+            "type": "title",
+            "format": "{user-name-colored}{#light_red}@{host-name-colored} {#}{cwd}"
+        },
+        {
+            "type": "os",
+            "key": "System       "
+        },
+        {
+            "type": "kernel",
+            "key": "Kernel       "
+        },
+        {
+            "type": "shell",
+            "key": "Shell        "
+        },
+        {
+            "type": "uptime",
+            "key": "Uptime       "
+        },
+        {
+            "type": "wm",
+            "key": "Desktop      "
+        },
+        {
+            "type": "memory",
+            "key": "Memory       "
+        },
+        {
+            "type": "disk",
+            "key": "Storage (/)  ",
+            "folders": "/"
+        },
+        {
+            "type": "colors",
+            "key": "Colors       ",
+            "symbol": "circle"
+        }
+    ]
+}
@@ -1,4 +1,4 @@
-// Load with --load-config examples/4.jsonc
+// Load with --config examples/4.jsonc

 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
@@ -1,4 +1,4 @@
-// Load with --load-config examples/5.jsonc
+// Load with --config examples/5.jsonc

 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
@@ -1,6 +1,3 @@
-// Load with --load-config examples/2.jsonc
-// Note that you must replace the image path to an existing image to display it.
-
 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
    "display": {
@@ -1,6 +1,3 @@
-// Load with --load-config examples/2.jsonc
-// Note that you must replace the image path to an existing image to display it.
-
 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
    "logo": {
@@ -6,6 +6,9 @@ def main(amdgpu_ids_path: str):
    with open(amdgpu_ids_path, 'r') as f:
        full_text = f.read()

+    if full_text == '':
+        sys.exit(f'Error: {amdgpu_ids_path} file is empty')
+
    products = []
    for line in full_text.split('\n'):
        if not line or line[0] == '#' or not ',\t' in line:
@@ -33,7 +33,7 @@ endBold = r"\fR" # end bold text tag
 # path to the current directory
 pathToCurrentDir = path.dirname(__file__)
 # path to the JSON option file
-pathToHelpFile = path.join(pathToCurrentDir, "../src/data/help.json")
+pathToHelpFile = path.join(pathToCurrentDir, "../doc/help.json")
 # man page section
 manSection = 1
 # title (center header)
@@ -18,6 +18,9 @@ def main(keep_vendor_list: set, pci_ids_path: str):
    with open(pci_ids_path, 'r') as f:
        full_text = f.read()

+    if full_text == '':
+        sys.exit(f'Error: {pci_ids_path} file is empty')
+
    dev_list_text = full_text[:full_text.rfind('\n\n\n')]  # remove known classes
    for line in dev_list_text.split('\n'):
        if not line or line[0] == '#':
@@ -21,7 +21,7 @@
 // SOFTWARE.

 /// \file adl_defines.h
-/// \brief Contains all definitions exposed by ADL for \ALL platforms.\n <b>Included in ADL SDK</b>
+/// \brief Contains all definitions exposed by ADL for \WIN platforms.\n <b>Included in ADL SDK</b>
 ///
 /// This file contains all definitions used by ADL.
 /// The ADL definitions include the following:
@@ -61,6 +61,8 @@
 #define ADL_ADAPTER_INDEX_ALL                            -1
 ///    Defines APIs with iOption none
 #define ADL_MAIN_API_OPTION_NONE                        0
+///    Defines the maximum of RPC endpoint
+#define ADL_MAX_RPC_ENDPOINT                        32
 /// @}

 /// \name Definitions for iOption parameter used by
@@ -141,6 +143,12 @@
 #define ADL_ERR_FEATURESYNC_NOT_STARTED            -24
 /// Adapter is in an invalid power state
 #define ADL_ERR_INVALID_POWER_STATE             -25
+/// The RPC server is in busy state
+#define ADL_ERR_SERVER_BUSY             -26
+/// The GPU is occupied by application which cannot be powered off
+#define ADL_ERR_GPU_IN_USE            -27
+/// The general RPC connection error
+#define ADL_ERR_RPC            -28

 /// @}
 /// </A>
@@ -380,6 +388,7 @@
 #define ADL_BUSTYPE_PCIE_GEN2     3       /* PCI Express 2nd generation bus   */
 #define ADL_BUSTYPE_PCIE_GEN3     4       /* PCI Express 3rd generation bus   */
 #define ADL_BUSTYPE_PCIE_GEN4     5       /* PCI Express 4th generation bus   */
+#define ADL_BUSTYPE_PCIE_GEN5     6       /* PCI Express 5th generation bus   */
 /// @}

 /// \defgroup define_ws_caps    Workstation Capabilities
@@ -872,7 +881,7 @@
 typedef enum ADLThreadingModel
 {
    ADL_THREADING_UNLOCKED    = 0, /*!< Default behavior. ADL will not enforce serialization of ADL API executions by multiple threads.  Multiple threads will be allowed to enter to ADL at the same time. Note that ADL library is not guaranteed to be thread-safe. Client that calls ADL_Main_Control_Create have to provide its own mechanism for ADL calls serialization. */
-    ADL_THREADING_LOCKED     /*!< ADL will enforce serialization of ADL API when called by multiple threads.  Only single thread will be allowed to enter ADL API at the time. This option makes ADL calls thread-safe. You shouldn't use this option if ADL calls will be executed on Linux on x-server rendering thread. It can cause the application to hung.  */
+    ADL_THREADING_LOCKED     /*!< ADL will enforce serialization of ADL API when called by multiple threads.  Only single thread will be allowed to enter ADL API at the time. This option makes ADL calls thread-safe. */
 }ADLThreadingModel;

 /// @}
@@ -1844,12 +1853,12 @@ enum ADLOD8FeatureControl
    ADL_OD8_TEMPERATURE_FAN = 1 << 6,   //FanTargetTemperature
    ADL_OD8_TEMPERATURE_SYSTEM = 1 << 7,    //MaxOpTemp
    ADL_OD8_MEMORY_TIMING_TUNE = 1 << 8,
-    ADL_OD8_FAN_ZERO_RPM_CONTROL = 1 << 9 ,
-	ADL_OD8_AUTO_UV_ENGINE = 1 << 10,  //Auto under voltage
-	ADL_OD8_AUTO_OC_ENGINE = 1 << 11,  //Auto overclock engine
-	ADL_OD8_AUTO_OC_MEMORY = 1 << 12,  //Auto overclock memory
-	ADL_OD8_FAN_CURVE = 1 << 13,   //Fan curve
-	ADL_OD8_WS_AUTO_FAN_ACOUSTIC_LIMIT = 1 << 14, //Workstation Manual Fan controller
+    ADL_OD8_FAN_ZERO_RPM_CONTROL = 1 << 9,
+    ADL_OD8_AUTO_UV_ENGINE = 1 << 10,  //Auto under voltage
+    ADL_OD8_AUTO_OC_ENGINE = 1 << 11,  //Auto overclock engine
+    ADL_OD8_AUTO_OC_MEMORY = 1 << 12,  //Auto overclock memory
+    ADL_OD8_FAN_CURVE = 1 << 13,   //Fan curve
+    ADL_OD8_WS_AUTO_FAN_ACOUSTIC_LIMIT = 1 << 14, //Workstation Manual Fan controller
    ADL_OD8_GFXCLK_QUADRATIC_CURVE = 1 << 15,
    ADL_OD8_OPTIMIZED_GPU_POWER_MODE = 1 << 16,
    ADL_OD8_ODVOLTAGE_LIMIT = 1 << 17,
@@ -1860,43 +1869,45 @@ enum ADLOD8FeatureControl
    ADL_OD8_TDC_LIMIT = 1 << 22,  //TDC slider
    ADL_OD8_FULL_CONTROL_MODE = 1 << 23,  //Full control
    ADL_OD8_POWER_SAVING_FEATURE_CONTROL = 1 << 24,  //Power saving feature control
-    ADL_OD8_POWER_GAUGE = 1 << 25 //Power Gauge
+    ADL_OD8_ACTIMING_PARAMETERS_TUNE = 1 << 25,  // AC Timing Parameters Tuning
+    ADL_OD8_OVERDRIVE_INTERFACE = 1 << 26,  // Version info feature ID for RSX, do not expose in ADL.
+    ADL_OD8_AUTO_UV_ENGINE_V2 = 1 << 27,  // Auto UV 2.0 with actual stress testing.
+    ADL_OD8_POWER_GAUGE = 1 << 28 //Power Gauge
 };

-
 typedef enum ADLOD8SettingId
 {
-	OD8_GFXCLK_FMAX = 0,
-	OD8_GFXCLK_FMIN,
-	OD8_GFXCLK_FREQ1,
-	OD8_GFXCLK_VOLTAGE1,
-	OD8_GFXCLK_FREQ2,
-	OD8_GFXCLK_VOLTAGE2,
-	OD8_GFXCLK_FREQ3,
-	OD8_GFXCLK_VOLTAGE3,
-	OD8_UCLK_FMAX,
-	OD8_POWER_PERCENTAGE,
-	OD8_FAN_MIN_SPEED,
-	OD8_FAN_ACOUSTIC_LIMIT,
-	OD8_FAN_TARGET_TEMP,
-	OD8_OPERATING_TEMP_MAX,
-	OD8_AC_TIMING,
-	OD8_FAN_ZERORPM_CONTROL,
-	OD8_AUTO_UV_ENGINE_CONTROL,
-	OD8_AUTO_OC_ENGINE_CONTROL,
-	OD8_AUTO_OC_MEMORY_CONTROL,
-	OD8_FAN_CURVE_TEMPERATURE_1,
-	OD8_FAN_CURVE_SPEED_1,
-	OD8_FAN_CURVE_TEMPERATURE_2,
-	OD8_FAN_CURVE_SPEED_2,
-	OD8_FAN_CURVE_TEMPERATURE_3,
-	OD8_FAN_CURVE_SPEED_3,
-	OD8_FAN_CURVE_TEMPERATURE_4,
-	OD8_FAN_CURVE_SPEED_4,
-	OD8_FAN_CURVE_TEMPERATURE_5,
-	OD8_FAN_CURVE_SPEED_5,
-	OD8_WS_FAN_AUTO_FAN_ACOUSTIC_LIMIT,
-    OD8_GFXCLK_CURVE_COEFFICIENT_A, // As part of the agreement with UI team, the min/max voltage limits for the
+    OD8_GFXCLK_FMAX = 0,
+    OD8_GFXCLK_FMIN,
+    OD8_GFXCLK_FREQ1,
+    OD8_GFXCLK_VOLTAGE1,
+    OD8_GFXCLK_FREQ2,
+    OD8_GFXCLK_VOLTAGE2,
+    OD8_GFXCLK_FREQ3,
+    OD8_GFXCLK_VOLTAGE3,
+    OD8_UCLK_FMAX,
+    OD8_POWER_PERCENTAGE,
+    OD8_FAN_MIN_SPEED, //10
+    OD8_FAN_ACOUSTIC_LIMIT,
+    OD8_FAN_TARGET_TEMP,
+    OD8_OPERATING_TEMP_MAX,
+    OD8_AC_TIMING,
+    OD8_FAN_ZERORPM_CONTROL,
+    OD8_AUTO_UV_ENGINE_CONTROL,
+    OD8_AUTO_OC_ENGINE_CONTROL,
+    OD8_AUTO_OC_MEMORY_CONTROL,
+    OD8_FAN_CURVE_TEMPERATURE_1,
+    OD8_FAN_CURVE_SPEED_1, //20
+    OD8_FAN_CURVE_TEMPERATURE_2,
+    OD8_FAN_CURVE_SPEED_2,
+    OD8_FAN_CURVE_TEMPERATURE_3,
+    OD8_FAN_CURVE_SPEED_3,
+    OD8_FAN_CURVE_TEMPERATURE_4,
+    OD8_FAN_CURVE_SPEED_4,
+    OD8_FAN_CURVE_TEMPERATURE_5,
+    OD8_FAN_CURVE_SPEED_5,
+    OD8_WS_FAN_AUTO_FAN_ACOUSTIC_LIMIT,
+    OD8_GFXCLK_CURVE_COEFFICIENT_A, // 30 As part of the agreement with UI team, the min/max voltage limits for the
    OD8_GFXCLK_CURVE_COEFFICIENT_B, // quadratic curve graph will be stored in the min and max limits of
    OD8_GFXCLK_CURVE_COEFFICIENT_C, // coefficient a, b and c. A, b and c themselves do not have limits.
    OD8_GFXCLK_CURVE_VFT_FMIN,
@@ -1906,7 +1917,7 @@ typedef enum ADLOD8SettingId
    OD8_OD_VOLTAGE,// RSX - voltage offset feature
    OD8_ADV_OC_LIMITS_SETTING,
    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_1,
-    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_2,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_2, //40
    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_3,
    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_4,
    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_5,
@@ -1915,8 +1926,33 @@ typedef enum ADLOD8SettingId
    OD8_GFX_VOLTAGE_LIMIT_SETTING,
    OD8_TDC_PERCENTAGE,
    OD8_FULL_CONTROL_MODE_SETTING,
+    OD8_FULL_CONTROL_MODE_GFXCLK,
+    OD8_FULL_CONTROL_MODE_UCLK,               // 50,
    OD8_IDLE_POWER_SAVING_FEATURE_CONTROL,
    OD8_RUNTIME_POWER_SAVING_FEATURE_CONTROL,
+    OD8_FULL_CONTROL_MODE_FEATURE_CONTROL,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_FREQ_ANCHOR_1,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_FREQ_ANCHOR_2,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_FREQ_ANCHOR_3,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_FREQ_ANCHOR_4,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_FREQ_ANCHOR_5,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_FREQ_ANCHOR_6,
+    OD8_PER_ZONE_GFX_VOLTAGE_OFFSET_VOLTAGE_LIMIT, //60
+    OD8_ACTIMING_PARAMETER_TRRDS,
+    OD8_ACTIMING_PARAMETER_TCL,
+    OD8_ACTIMING_PARAMETER_TCWL,
+    OD8_ACTIMING_PARAMETER_TRCDRD,
+    OD8_ACTIMING_PARAMETER_TRCDWR,
+    OD8_ACTIMING_PARAMETER_TRAS,
+    OD8_ACTIMING_PARAMETER_TRPAB,
+    OD8_ACTIMING_PARAMETER_TRFC,
+    OD8_ACTIMING_PARAMETER_TRFCPB,
+    OD8_ACTIMING_PARAMETER_TRREFD, //70
+    OD8_ACTIMING_PARAMETER_TREF,
+    OD8_ACTIMING_PARAMETER_TWR,
+    OD8_ACTIMING_PARAMETER_TWTRS,
+    OD8_OVERDRIVE_INTERFACE_ID, //74
+    OD8_AUTO_UV_ENGINE_V2_ID,   //75
    OD8_POWER_GAUGE,
    OD8_COUNT
 } ADLOD8SettingId;
@@ -1980,28 +2016,28 @@ typedef enum ADLSensorType
    PMLOG_SSDGPU_POWERLIMIT     = 49, // DGPU Power limit
    PMLOG_TEMPERATURE_HOTSPOT_GCD      = 50,
    PMLOG_TEMPERATURE_HOTSPOT_MCD      = 51,
-    PMLOG_THROTTLER_TEMP_EDGE_PERCENTAGE        = 52,
-    PMLOG_THROTTLER_TEMP_HOTSPOT_PERCENTAGE     = 53,
-    PMLOG_THROTTLER_TEMP_HOTSPOT_GCD_PERCENTAGE = 54,
-    PMLOG_THROTTLER_TEMP_HOTSPOT_MCD_PERCENTAGE = 55,
-    PMLOG_THROTTLER_TEMP_MEM_PERCENTAGE     = 56,
-    PMLOG_THROTTLER_TEMP_VR_GFX_PERCENTAGE  = 57,
-    PMLOG_THROTTLER_TEMP_VR_MEM0_PERCENTAGE = 58,
-    PMLOG_THROTTLER_TEMP_VR_MEM1_PERCENTAGE = 59,
-    PMLOG_THROTTLER_TEMP_VR_SOC_PERCENTAGE  = 60,
-    PMLOG_THROTTLER_TEMP_LIQUID0_PERCENTAGE = 61,
-    PMLOG_THROTTLER_TEMP_LIQUID1_PERCENTAGE = 62,
-    PMLOG_THROTTLER_TEMP_PLX_PERCENTAGE = 63,
-    PMLOG_THROTTLER_TDC_GFX_PERCENTAGE  = 64,
-    PMLOG_THROTTLER_TDC_SOC_PERCENTAGE  = 65,
-    PMLOG_THROTTLER_TDC_USR_PERCENTAGE  = 66,
-    PMLOG_THROTTLER_PPT0_PERCENTAGE     = 67,
-    PMLOG_THROTTLER_PPT1_PERCENTAGE     = 68,
-    PMLOG_THROTTLER_PPT2_PERCENTAGE     = 69,
-    PMLOG_THROTTLER_PPT3_PERCENTAGE     = 70,
-    PMLOG_THROTTLER_FIT_PERCENTAGE           = 71,
-    PMLOG_THROTTLER_GFX_APCC_PLUS_PERCENTAGE = 72,
-    PMLOG_BOARD_POWER                        = 73,
+    PMLOG_THROTTLE_PERCENTAGE_TEMP_GFX = 52,
+    PMLOG_THROTTLE_PERCENTAGE_TEMP_MEM = 53,
+    PMLOG_THROTTLE_PERCENTAGE_TEMP_VR = 54,
+    PMLOG_THROTTLE_PERCENTAGE_POWER = 55,
+    PMLOG_THROTTLE_PERCENTAGE_TDC = 56,
+    PMLOG_THROTTLE_PERCENTAGE_VMAX = 57,
+    PMLOG_BUS_CURR_MAX_SPEED = 58, 
+    PMLOG_RESERVED_1 = 59, //Currently Unused
+    PMLOG_RESERVED_2 = 60, //Currently Unused
+    PMLOG_RESERVED_3 = 61, //Currently Unused
+    PMLOG_RESERVED_4 = 62, //Currently Unused
+    PMLOG_RESERVED_5 = 63, //Currently Unused
+    PMLOG_RESERVED_6 = 64, //Currently Unused
+    PMLOG_RESERVED_7 = 65, //Currently Unused
+    PMLOG_RESERVED_8 = 66, //Currently Unused
+    PMLOG_RESERVED_9 = 67, //Currently Unused
+    PMLOG_RESERVED_10 = 68, //Currently Unused
+    PMLOG_RESERVED_11 = 69, //Currently Unused
+    PMLOG_RESERVED_12 = 70, //Currently Unused
+    PMLOG_RESERVED_13 = 71, //Currently Unused
+    PMLOG_RESERVED_14 = 72,
+    PMLOG_BOARD_POWER = 73,
    PMLOG_MAX_SENSORS_REAL
 } ADLSensorType;

@@ -2068,28 +2104,29 @@ typedef enum ADL_PMLOG_SENSORS
    ADL_PMLOG_SSDGPU_POWERLIMIT     = 49, // DGPU Power limit
    ADL_PMLOG_TEMPERATURE_HOTSPOT_GCD      = 50,
    ADL_PMLOG_TEMPERATURE_HOTSPOT_MCD      = 51,
-    ADL_PMLOG_THROTTLER_TEMP_EDGE_PERCENTAGE        = 52,
-    ADL_PMLOG_THROTTLER_TEMP_HOTSPOT_PERCENTAGE     = 53,
-    ADL_PMLOG_THROTTLER_TEMP_HOTSPOT_GCD_PERCENTAGE = 54,
-    ADL_PMLOG_THROTTLER_TEMP_HOTSPOT_MCD_PERCENTAGE = 55,
-    ADL_PMLOG_THROTTLER_TEMP_MEM_PERCENTAGE     = 56,
-    ADL_PMLOG_THROTTLER_TEMP_VR_GFX_PERCENTAGE  = 57,
-    ADL_PMLOG_THROTTLER_TEMP_VR_MEM0_PERCENTAGE = 58,
-    ADL_PMLOG_THROTTLER_TEMP_VR_MEM1_PERCENTAGE = 59,
-    ADL_PMLOG_THROTTLER_TEMP_VR_SOC_PERCENTAGE  = 60,
-    ADL_PMLOG_THROTTLER_TEMP_LIQUID0_PERCENTAGE = 61,
-    ADL_PMLOG_THROTTLER_TEMP_LIQUID1_PERCENTAGE = 62,
-    ADL_PMLOG_THROTTLER_TEMP_PLX_PERCENTAGE = 63,
-    ADL_PMLOG_THROTTLER_TDC_GFX_PERCENTAGE  = 64,
-    ADL_PMLOG_THROTTLER_TDC_SOC_PERCENTAGE  = 65,
-    ADL_PMLOG_THROTTLER_TDC_USR_PERCENTAGE  = 66,
-    ADL_PMLOG_THROTTLER_PPT0_PERCENTAGE     = 67,
-    ADL_PMLOG_THROTTLER_PPT1_PERCENTAGE     = 68,
-    ADL_PMLOG_THROTTLER_PPT2_PERCENTAGE     = 69,
-    ADL_PMLOG_THROTTLER_PPT3_PERCENTAGE     = 70,
-    ADL_PMLOG_THROTTLER_FIT_PERCENTAGE           = 71,
-    ADL_PMLOG_THROTTLER_GFX_APCC_PLUS_PERCENTAGE = 72,
-    ADL_PMLOG_BOARD_POWER                        = 73,
+    ADL_PMLOG_THROTTLE_PERCENTAGE_TEMP_GFX = 52,
+    ADL_PMLOG_THROTTLE_PERCENTAGE_TEMP_MEM = 53,
+    ADL_PMLOG_THROTTLE_PERCENTAGE_TEMP_VR = 54,
+    ADL_PMLOG_THROTTLE_PERCENTAGE_POWER = 55,
+    ADL_PMLOG_THROTTLE_PERCENTAGE_TDC = 56,
+    ADL_PMLOG_THROTTLE_PERCENTAGE_VMAX = 57,
+    ADL_PMLOG_BUS_CURR_MAX_SPEED = 58, 
+    ADL_PMLOG_RESERVED_1 = 59, //Currently Unused
+    ADL_PMLOG_RESERVED_2 = 60, //Currently Unused
+    ADL_PMLOG_RESERVED_3 = 61, //Currently Unused
+    ADL_PMLOG_RESERVED_4 = 62, //Currently Unused
+    ADL_PMLOG_RESERVED_5 = 63, //Currently Unused
+    ADL_PMLOG_RESERVED_6 = 64, //Currently Unused
+    ADL_PMLOG_RESERVED_7 = 65, //Currently Unused
+    ADL_PMLOG_RESERVED_8 = 66, //Currently Unused
+    ADL_PMLOG_RESERVED_9 = 67, //Currently Unused
+    ADL_PMLOG_RESERVED_10 = 68, //Currently Unused
+    ADL_PMLOG_RESERVED_11 = 69, //Currently Unused
+    ADL_PMLOG_RESERVED_12 = 70, //Currently Unused
+    ADL_PMLOG_CLK_NPUCLK = 71,      //NPU frequency
+    ADL_PMLOG_NPU_BUSY_AVG = 72,    //NPU busy
+    ADL_PMLOG_BOARD_POWER = 73,
+    ADL_PMLOG_TEMPERATURE_INTAKE = 74,
    ADL_PMLOG_MAX_SENSORS_REAL
 } ADL_PMLOG_SENSORS;

@@ -2393,6 +2430,9 @@ typedef enum ADL_PMLOG_SENSORS
 /// Indicates there is crossGPU clone
 #define ADL_CROSSGPUDISPLAYCLONE                  0x2

+
+/// @}
+
 /// @}

 /// \defgroup define_D3DKMT_HANDLE
@@ -2493,7 +2533,11 @@ typedef enum ADL_UIFEATURES_GROUP
 	ADL_UIFEATURES_GROUP_PROVSR = 12,
    ADL_UIFEATURES_GROUP_SMA = 13,
    ADL_UIFEATURES_GROUP_CAMERA = 14,
-    ADL_UIFEATURES_GROUP_FRTCPRO = 15
+    ADL_UIFEATURES_GROUP_FRTCPRO = 15,
+    ADL_UIFEATURES_GROUP_DELAGNEXT = 16,
+    ADL_UIFEATURES_GROUP_RTBOOST = 17,
+    ADL_UIFEATURES_GROUP_UAI = 18
+
 } ADL_UIFEATURES_GROUP;


@@ -2587,9 +2631,18 @@ typedef enum ADL_USER_SETTINGS
    ADL_USER_SETTINGS_USU_PROFILE = 1 << 4,  		//notify USU settings change
    ADL_USER_SETTINGS_CVDC_PROFILE = 1 << 5,			//notify Color Vision Deficiency Corretion settings change
    ADL_USER_SETTINGS_SCE_PROFILE = 1 << 6,
-    ADL_USER_SETTINGS_PROVSR = 1 << 7
+    ADL_USER_SETTINGS_PROVSR = 1 << 7,
+    ADL_USER_SETTINGS_RTBOOST_PROFILE=1 << 8,
+    ADL_USER_SETTINGS_USU2_PROFILE = 1 << 9,  		//notify USU2 settings change
   } ADL_USER_SETTINGS;

+//FRAME_TIMESTAMPS_SHARED_MEMORY type
+typedef enum FRAME_TIMESTAMPS_SHARED_MEMORY_TYPE
+{
+    FRAME_TIMESTAMPS_SHARED_MEMORY_TYPE_UNKNOWN = 0,
+    FRAME_TIMESTAMPS_SHARED_MEMORY_TYPE_LEGACY,
+    FRAME_TIMESTAMPS_SHARED_MEMORY_TYPE_INDEXED
+}FRAME_TIMESTAMPS_SHARED_MEMORY_TYPE;
 #define ADL_REG_DEVICE_FUNCTION_1            0x00000001
 #endif /* ADL_DEFINES_H_ */

@@ -33,14 +33,10 @@

 #include "adl_structures.h"

-#if defined (LINUX)
-#define __stdcall
-#endif /* (LINUX) */
-
 /// Memory Allocation Call back 
 typedef void* ( __stdcall *ADL_MAIN_MALLOC_CALLBACK )( int );

-#define ADL_SDK_MAJOR_VERSION 17
-#define ADL_SDK_MINOR_VERSION 1
+#define ADL_SDK_MAJOR_VERSION 18
+#define ADL_SDK_MINOR_VERSION 0

 #endif /* ADL_SDK_H_ */
@@ -21,7 +21,7 @@
 // SOFTWARE.

 /// \file adl_structures.h
-///\brief This file contains the structure declarations that are used by the public ADL interfaces for \ALL platforms.\n <b>Included in ADL SDK</b>
+///\brief This file contains the structure declarations that are used by the public ADL interfaces for \WIN platforms.\n <b>Included in ADL SDK</b>
 ///
 /// All data structures used in AMD Display Library (ADL) public interfaces should be defined in this header file.
 ///
@@ -41,7 +41,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////
 typedef struct AdapterInfo
 {
-/// \ALL_STRUCT_MEM
+/// \WIN_STRUCT_MEM

 /// Size of the structure.
    int iSize;
@@ -59,7 +59,7 @@ typedef struct AdapterInfo
    int iVendorID;
 /// Adapter name.
    char strAdapterName[ADL_MAX_PATH];
-/// Display name. For example, "\\\\Display0" for Windows or ":0:0" for Linux.
+/// Display name. For example, "\\\\Display0" for Windows.
    char strDisplayName[ADL_MAX_PATH];
 /// Present or not; 1 if present and 0 if not present.It the logical adapter is present, the display name such as \\\\.\\Display1 can be found from OS
    int iPresent;
@@ -80,38 +80,8 @@ typedef struct AdapterInfo

 #endif /* (_WIN32) || (_WIN64) */

-#if defined (LINUX)
-/// \LNX_STRUCT_MEM
-
-/// Internal X screen number from GPUMapInfo (DEPRICATED use XScreenInfo)
-    int iXScreenNum;
-/// Internal driver index from GPUMapInfo
-    int iDrvIndex;
-/// \deprecated Internal x config file screen identifier name. Use XScreenInfo instead.
-    char strXScreenConfigName[ADL_MAX_PATH];
-
-#endif /* (LINUX) */
 } AdapterInfo, *LPAdapterInfo;

-/////////////////////////////////////////////////////////////////////////////////////////////
-///\brief Structure containing information about the Linux X screen information.
-///
-/// This structure is used to store the current screen number and xorg.conf ID name assoicated with an adapter index.
-/// This structure is updated during ADL_Main_Control_Refresh or ADL_ScreenInfo_Update.
-/// Note:  This structure should be used in place of iXScreenNum and strXScreenConfigName in AdapterInfo as they will be
-/// deprecated.
-/// \nosubgrouping
-////////////////////////////////////////////////////////////////////////////////////////////
-#if defined (LINUX)
-typedef struct XScreenInfo
-{
-/// Internal X screen number from GPUMapInfo.
-    int iXScreenNum;
-/// Internal x config file screen identifier name.
-    char strXScreenConfigName[ADL_MAX_PATH];
-} XScreenInfo, *LPXScreenInfo;
-#endif /* (LINUX) */
-
 /////////////////////////////////////////////////////////////////////////////////////////////
 ///\brief Structure containing information about an controller mode
 ///
@@ -453,8 +423,12 @@ typedef struct ADLDDCInfo2
    int ulMaxBacklightMinLuminanceData;
    int ulMinBacklightMinLuminanceData;

+    // Display screen width/height
+    int ulScreenWidth;
+    int ulScreenHeight;
+
    // Reserved for future use
-    int iReserved[4];
+    int iReserved[2];
 } ADLDDCInfo2, *LPADLDDCInfo2;

 /////////////////////////////////////////////////////////////////////////////////////////////
@@ -3614,6 +3588,23 @@ typedef struct ADL_BOOST_SETTINGS
 	int GlobalMinRes_Step; //Gloabl Min Resolution step  value
 }ADL_BOOST_SETTINGS;

+/////////////////////////////////////////////////////////////////////////////////////////////
+///\brief Structure containing information about BOOST Settings
+///
+///  Elements of BOOST settings.
+/// \nosubgrouping
+////////////////////////////////////////////////////////////////////////////////////////////
+typedef struct ADL_BOOST_SETTINGSX2
+{
+    int Hotkey; // Hotkey value
+    int GlobalEnable; //Global enable value
+    int GlobalMinRes; //Gloabl Min Resolution value
+    int GlobalMinRes_MinLimit; //Gloabl Min Resolution slider min limit value
+    int GlobalMinRes_MaxLimit; //Gloabl Min Resolution slider max limit value
+    int GlobalMinRes_Step; //Gloabl Min Resolution step  value
+    int VsrSupported; //Allows for interop with Upscaling/RSR
+}ADL_BOOST_SETTINGSX2;
+

 /////////////////////////////////////////////////////////////////////////////////////////////
 ///\brief Structure containing information about ProVSR Settings change reason
@@ -3817,7 +3808,7 @@ typedef struct ADL_RADEON_LED_PATTERN_CONFIG
 ////////////////////////////////////////////////////////////////////////////////////////////
 typedef struct AdapterInfoX2
 {
-    /// \ALL_STRUCT_MEM
+    /// \WIN_STRUCT_MEM

    /// Size of the structure.
    int iSize;
@@ -4164,6 +4155,7 @@ typedef struct ADLHDCPSettings
 ///
 /// This structure is used to store the Mantle Driver information
 /// \nosubgrouping
+/// \deprecated This structure has been deprecated.
 ////////////////////////////////////////////////////////////////////////////////////////////

 typedef struct ADLMantleAppInfo
@@ -4286,4 +4278,5 @@ typedef struct ADLSmartShiftSettings
 	int iCurrentValue;
    int iFlags; //refer to define_smartshift_bits
 }ADLSmartShiftSettings, *LPADLSmartShiftSettings;
-#endif /* ADL_STRUCTURES_H_ */
+
+#endif /* ADL_STRUCTURES_H_ */
@@ -1,6 +1,6 @@
 {
    "home": "https://github.com/GPUOpen-LibrariesAndSDKs/display-library",
    "license": "MIT (embeded in source)",
-    "version": "ADL SDK 17.1",
+    "version": "ADL SDK 18.1",
    "author": "Advanced Micro Devices, Inc"
 }
@@ -1,10 +1,9 @@
 #pragma once

-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"

-typedef struct FFPlatformSysinfo
-{
+typedef struct FFPlatformSysinfo {
    FFstrbuf name;
    FFstrbuf release;
    FFstrbuf version;
@@ -12,14 +11,20 @@ typedef struct FFPlatformSysinfo
    uint32_t pageSize;
 } FFPlatformSysinfo;

-typedef struct FFPlatform
-{
+typedef struct FFPlatform {
    FFstrbuf homeDir;  // Trailing slash included
    FFstrbuf cacheDir; // Trailing slash included
    FFlist configDirs; // List of FFstrbuf, trailing slash included
    FFlist dataDirs;   // List of FFstrbuf, trailing slash included
-    FFstrbuf exePath; // The real path of current exe
+    FFstrbuf exePath;  // The real path of current exe (empty if unavailable)
+    FFstrbuf cwd;      // Trailing slash included

+    uint32_t pid;
+#ifndef _WIN32
+    uint32_t uid;
+#else
+    FFstrbuf sid;
+#endif
    FFstrbuf userName;
    FFstrbuf fullUserName;
    FFstrbuf hostName;
@@ -0,0 +1,141 @@
+#pragma once
+
+#include "common/attributes.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <assert.h>
+#include <stdlib.h>
+
+#define FF_LIST_DEFAULT_ALLOC 16
+
+typedef struct FFlist {
+    uint8_t* data;
+    uint32_t length;
+    uint32_t capacity;
+} FFlist;
+
+void* ffListAdd(FFlist* list, uint32_t elementSize);
+
+// Removes the first element, and copy its value to `*result`
+bool ffListShift(FFlist* list, uint32_t elementSize, void* __restrict result);
+// Removes the last element, and copy its value to `*result`
+bool ffListPop(FFlist* list, uint32_t elementSize, void* __restrict result);
+
+static inline void ffListInit(FFlist* list) {
+    list->capacity = 0;
+    list->length = 0;
+    list->data = NULL;
+}
+
+static inline void ffListInitA(FFlist* list, uint32_t elementSize, uint32_t capacity) {
+    ffListInit(list);
+    list->capacity = capacity;
+    list->data = __builtin_expect(capacity == 0, 0) ? NULL : (uint8_t*) malloc((size_t) capacity * elementSize);
+}
+
+FF_A_NODISCARD static inline FFlist ffListCreate() {
+    FFlist result;
+    ffListInit(&result);
+    return result;
+}
+
+FF_A_NODISCARD static inline FFlist ffListCreateA(uint32_t elementSize, uint32_t capacity) {
+    FFlist result;
+    ffListInitA(&result, elementSize, capacity);
+    return result;
+}
+
+FF_A_NODISCARD static inline void* ffListGet(const FFlist* list, uint32_t elementSize, uint32_t index) {
+    assert(list->capacity > index);
+    return list->data + (index * elementSize);
+}
+
+FF_A_NODISCARD static inline uint32_t ffListFirstIndexComp(const FFlist* list, uint32_t elementSize, void* compElement, bool (*compFunc)(const void*, const void*)) {
+    for (uint32_t i = 0; i < list->length; i++) {
+        if (compFunc(ffListGet(list, elementSize, i), compElement)) {
+            return i;
+        }
+    }
+
+    return list->length;
+}
+
+FF_A_NODISCARD static inline bool ffListContains(const FFlist* list, uint32_t elementSize, void* compElement, bool (*compFunc)(const void*, const void*)) {
+    return ffListFirstIndexComp(list, elementSize, compElement, compFunc) != list->length;
+}
+
+static inline void ffListSort(FFlist* list, uint32_t elementSize, int (*compar)(const void*, const void*)) {
+    qsort(list->data, list->length, elementSize, compar);
+}
+
+// Move the contents of `src` into `list`, and left `src` empty
+static inline void ffListInitMove(FFlist* list, FFlist* src) {
+    if (src) {
+        list->capacity = src->capacity;
+        list->length = src->length;
+        list->data = src->data;
+        ffListInit(src);
+    } else {
+        ffListInit(list);
+    }
+}
+
+static inline void ffListDestroy(FFlist* list) {
+    if (!list->data) {
+        return;
+    }
+
+    // Avoid free-after-use. These 3 assignments are cheap so don't remove them
+    list->capacity = list->length = 0;
+    free(list->data);
+    list->data = NULL;
+}
+
+static inline void ffListClear(FFlist* list) {
+    list->length = 0;
+}
+
+static inline void ffListReserve(FFlist* list, uint32_t elementSize, uint32_t newCapacity) {
+    if (__builtin_expect(newCapacity <= list->capacity, false)) {
+        return;
+    }
+
+    list->data = (uint8_t*) realloc(list->data, (size_t) newCapacity * elementSize);
+    list->capacity = newCapacity;
+}
+
+#define FF_LIST_FOR_EACH(itemType, itemVarName, listVar)                        \
+    for (itemType* itemVarName = (itemType*) (listVar).data;                    \
+        itemVarName - (itemType*) (listVar).data < (intptr_t) (listVar).length; \
+        ++itemVarName)
+
+#define FF_LIST_AUTO_DESTROY FFlist FF_A_CLEANUP(ffListDestroy)
+
+#define FF_LIST_GET(itemType, listVar, index) \
+    ({                                        \
+        assert((listVar).capacity > (index)); \
+        (itemType*) (listVar).data + (index); \
+    })
+
+#define FF_LIST_ADD(itemType, listVar) (itemType*) ffListAdd(&(listVar), (uint32_t) sizeof(itemType))
+
+#define FF_LIST_FIRST(itemType, listVar) FF_LIST_GET(itemType, listVar, 0)
+#define FF_LIST_LAST(itemType, listVar)                         \
+    ({                                                          \
+        assert((listVar).length > 0);                           \
+        FF_LIST_GET(itemType, listVar, ((listVar).length - 1)); \
+    })
+
+#define FF_LIST_CONTAINS(listVar, pCompElement, compFunc)                                                                              \
+    ({                                                                                                                                 \
+        typedef __typeof__(*(pCompElement)) compElementType;                                                                           \
+        typedef bool compFuncType(const compElementType*, const compElementType*);                                                     \
+        static_assert(__builtin_types_compatible_p(__typeof__(compFunc), compFuncType), "Incompatible callback function");             \
+        ffListContains(&(listVar), (uint32_t) sizeof(*(pCompElement)), (pCompElement), (bool (*)(const void*, const void*)) compFunc); \
+    })
+
+#define FF_LIST_SHIFT(listVar, pResult) \
+    ffListShift(&(listVar), (uint32_t) sizeof(*(pResult)), (pResult))
+#define FF_LIST_POP(listVar, pResult) \
+    ffListPop(&(listVar), (uint32_t) sizeof(*(pResult)), (pResult))
@@ -1,6 +1,6 @@
 #pragma once

-#include "FFcheckmacros.h"
+#include "common/attributes.h"

 #include <stdint.h>
 #include <stdarg.h>
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
+#include "common/memrchr.h"

 #ifdef FF_USE_SYSTEM_YYJSON
    #include <yyjson.h>
@@ -17,15 +18,16 @@
 #endif

 #ifdef _WIN32
-    // #include <shlwapi.h>
-    __stdcall char* StrStrIA(const char* lpFirst, const char* lpSrch);
+// #include <shlwapi.h>
+__stdcall char* StrStrIA(const char* lpFirst, const char* lpSrch);
    #define strcasestr StrStrIA
 #endif

 #define FASTFETCH_STRBUF_DEFAULT_ALLOC 32

-typedef struct FFstrbuf
-{
+// static string (allocated == 0), chars points to a string literal
+// dynamic string (allocated > 0), chars points to a heap allocated buffer
+typedef struct FFstrbuf {
    uint32_t allocated;
    uint32_t length;
    char* chars;
@@ -34,6 +36,7 @@ typedef struct FFstrbuf
 static inline void ffStrbufInit(FFstrbuf* strbuf);
 void ffStrbufInitA(FFstrbuf* strbuf, uint32_t allocate);
 void ffStrbufInitVF(FFstrbuf* strbuf, const char* format, va_list arguments);
+void ffStrbufInitMoveNS(FFstrbuf* strbuf, uint32_t length, char* heapStr);

 void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free);
 void ffStrbufEnsureFixedLengthFree(FFstrbuf* strbuf, uint32_t free);
@@ -44,8 +47,8 @@ static inline void ffStrbufAppend(FFstrbuf* __restrict strbuf, const FFstrbuf* _
 void ffStrbufAppendC(FFstrbuf* strbuf, char c);
 void ffStrbufAppendNC(FFstrbuf* strbuf, uint32_t num, char c);
 void ffStrbufAppendNS(FFstrbuf* strbuf, uint32_t length, const char* value);
-void ffStrbufAppendTransformS(FFstrbuf* strbuf, const char* value, int(*transformFunc)(int));
-FF_C_PRINTF(2, 3) void ffStrbufAppendF(FFstrbuf* strbuf, const char* format, ...);
+void ffStrbufAppendTransformS(FFstrbuf* strbuf, const char* value, int (*transformFunc)(int));
+FF_A_PRINTF(2, 3) void ffStrbufAppendF(FFstrbuf* strbuf, const char* format, ...);
 void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments);
 const char* ffStrbufAppendSUntilC(FFstrbuf* strbuf, const char* value, char until);

@@ -54,7 +57,11 @@ void ffStrbufPrependC(FFstrbuf* strbuf, char c);

 void ffStrbufInsertNC(FFstrbuf* strbuf, uint32_t index, uint32_t num, char c);

-FF_C_PRINTF(2, 3) void ffStrbufSetF(FFstrbuf* strbuf, const char* format, ...);
+// Clear the content of strbuf and set new value
+// NOTE: Unlike ffStrbufAppend*, ffStrbufSet* functions may NOT reserve extra space
+void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value);
+void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value);
+FF_A_PRINTF(2, 3) void ffStrbufSetF(FFstrbuf* strbuf, const char* format, ...);

 void ffStrbufTrimLeft(FFstrbuf* strbuf, char c);
 void ffStrbufTrimRight(FFstrbuf* strbuf, char c);
@@ -65,11 +72,6 @@ bool ffStrbufRemoveSubstr(FFstrbuf* strbuf, uint32_t startIndex, uint32_t endInd
 void ffStrbufRemoveS(FFstrbuf* strbuf, const char* str);
 void ffStrbufRemoveStrings(FFstrbuf* strbuf, uint32_t numStrings, const char* strings[]);

-FF_C_NODISCARD uint32_t ffStrbufNextIndexC(const FFstrbuf* strbuf, uint32_t start, char c);
-FF_C_NODISCARD uint32_t ffStrbufNextIndexS(const FFstrbuf* strbuf, uint32_t start, const char* str);
-
-FF_C_NODISCARD uint32_t ffStrbufPreviousIndexC(const FFstrbuf* strbuf, uint32_t start, char c);
-
 void ffStrbufReplaceAllC(FFstrbuf* strbuf, char find, char replace);

 // Returns true if the strbuf is modified
@@ -80,7 +82,7 @@ bool ffStrbufSubstrAfterFirstS(FFstrbuf* strbuf, const char* str);
 bool ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, char c);
 bool ffStrbufSubstr(FFstrbuf* strbuf, uint32_t start, uint32_t end);

-FF_C_NODISCARD uint32_t ffStrbufCountC(const FFstrbuf* strbuf, char c);
+FF_A_NODISCARD uint32_t ffStrbufCountC(const FFstrbuf* strbuf, char c);

 bool ffStrbufRemoveIgnCaseEndS(FFstrbuf* strbuf, const char* end);

@@ -89,15 +91,46 @@ bool ffStrbufEnsureEndsWithC(FFstrbuf* strbuf, char c);
 void ffStrbufWriteTo(const FFstrbuf* strbuf, FILE* file);
 void ffStrbufPutTo(const FFstrbuf* strbuf, FILE* file);

-FF_C_NODISCARD double ffStrbufToDouble(const FFstrbuf* strbuf, double defaultValue);
-FF_C_NODISCARD int64_t ffStrbufToSInt(const FFstrbuf* strbuf, int64_t defaultValue);
-FF_C_NODISCARD uint64_t ffStrbufToUInt(const FFstrbuf* strbuf, uint64_t defaultValue);
+FF_A_NODISCARD double ffStrbufToDouble(const FFstrbuf* strbuf, double defaultValue);
+FF_A_NODISCARD int64_t ffStrbufToSInt(const FFstrbuf* strbuf, int64_t defaultValue);
+FF_A_NODISCARD uint64_t ffStrbufToUInt(const FFstrbuf* strbuf, uint64_t defaultValue);

 void ffStrbufUpperCase(FFstrbuf* strbuf);
 void ffStrbufLowerCase(FFstrbuf* strbuf);

-bool ffStrbufGetline(char** lineptr, size_t* n, FFstrbuf* buffer);
-void ffStrbufGetlineRestore(char** lineptr, size_t* n, FFstrbuf* buffer);
+// Function alters the buffer to extract lines or delimited segments (replaces the delimiter with '\0')
+// so that buffer MUST be heap allocated (NOT a static string)
+// `lineptr` must be `NULL` and `n` MUST be `0` for the first call
+// Caller MUST NOT free `*lineptr`
+bool ffStrbufGetdelim(char** lineptr, size_t* n, char delimiter, FFstrbuf* buffer);
+void ffStrbufGetdelimRestore(char** lineptr, size_t* n, char delimiter, FFstrbuf* buffer);
+
+/**
+ * @brief Read a line from a FFstrbuf.
+ *
+ * @details Behaves like getline(3) but reads from a FFstrbuf.
+ *
+ * @param[in,out] lineptr The pointer to a pointer that will be set to the start of the line
+                          (points to buffer's internal memory address to avoid memory allocation and copy).
+                          MUST NOT be freed by the caller, unlike `getline(3)`.
+ *                        MUST be NULL for the first call.
+ * @param[in,out] n The pointer to the size of the buffer of lineptr.
+                    MUST be 0 for the first call.
+ * @param[in] buffer The buffer to read from.
+                     MUST be heap allocated (NOT a static string).
+ *
+ * @return true if a line has been read, false if the end of the buffer has been reached.
+ */
+static inline bool ffStrbufGetline(char** lineptr, size_t* n, FFstrbuf* buffer) {
+    return ffStrbufGetdelim(lineptr, n, '\n', buffer);
+}
+/**
+ * @brief Restore the end of a line that was modified by ffStrbufGetline.
+ * @warning This function should be called before breaking an ffStrbufGetline loop if `buffer` will be used later.
+ */
+static inline void ffStrbufGetlineRestore(char** lineptr, size_t* n, FFstrbuf* buffer) {
+    ffStrbufGetdelimRestore(lineptr, n, '\n', buffer);
+}
 bool ffStrbufRemoveDupWhitespaces(FFstrbuf* strbuf);
 bool ffStrbufMatchSeparatedNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator);
 bool ffStrbufMatchSeparatedIgnCaseNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator);
@@ -112,71 +145,58 @@ void ffStrbufAppendUInt(FFstrbuf* strbuf, uint64_t value);
 // if `precision < 0`, let yyjson decide the precision
 void ffStrbufAppendDouble(FFstrbuf* strbuf, double value, int8_t precision, bool trailingZeros);

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateA(uint32_t allocate)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreateA(uint32_t allocate) {
    FFstrbuf strbuf;
    ffStrbufInitA(&strbuf, allocate);
    return strbuf;
 }

-static inline void ffStrbufInitCopy(FFstrbuf* __restrict strbuf, const FFstrbuf* __restrict src)
-{
-    if (src->allocated == 0) // static string
-        memcpy(strbuf, src, sizeof(FFstrbuf));
-    else
-    {
+static inline void ffStrbufInitCopy(FFstrbuf* __restrict strbuf, const FFstrbuf* __restrict src) {
+    if (src->allocated == 0) { // static string
+        *strbuf = *src;
+    } else {
        ffStrbufInitA(strbuf, src->allocated);
        ffStrbufAppend(strbuf, src);
    }
 }

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateCopy(const FFstrbuf* src)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreateCopy(const FFstrbuf* src) {
    FFstrbuf strbuf;
    ffStrbufInitCopy(&strbuf, src);
    return strbuf;
 }

 // Move the content of `src` into `strbuf`, and left `src` empty
-static inline void ffStrbufInitMove(FFstrbuf* strbuf, FFstrbuf* src)
-{
-    if (src)
-    {
-        strbuf->allocated = src->allocated;
-        strbuf->chars = src->chars;
-        strbuf->length = src->length;
+static inline void ffStrbufInitMove(FFstrbuf* strbuf, FFstrbuf* src) {
+    if (src) {
+        *strbuf = *src;
        ffStrbufInit(src);
-    }
-    else
+    } else {
        ffStrbufInit(strbuf);
+    }
 }

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateMove(FFstrbuf* src)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreateMove(FFstrbuf* src) {
    FFstrbuf strbuf;
    ffStrbufInitMove(&strbuf, src);
    return strbuf;
 }

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateVF(const char* format, va_list arguments)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreateVF(const char* format, va_list arguments) {
    FFstrbuf strbuf;
    ffStrbufInitVF(&strbuf, format, arguments);
    return strbuf;
 }

-FF_C_PRINTF(2, 3)
-static inline void ffStrbufInitF(FFstrbuf* strbuf, const char* format, ...)
-{
+FF_A_PRINTF(2, 3) static inline void ffStrbufInitF(FFstrbuf* strbuf, const char* format, ...) {
    va_list arguments;
    va_start(arguments, format);
    ffStrbufInitVF(strbuf, format, arguments);
    va_end(arguments);
 }

-FF_C_PRINTF(1, 2)
-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateF(const char* format, ...)
-{
+FF_A_PRINTF(1, 2) FF_A_NODISCARD static inline FFstrbuf
+ffStrbufCreateF(const char* format, ...) {
    FFstrbuf strbuf;

    va_list arguments;
@@ -187,416 +207,378 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateF(const char* format, ...)
    return strbuf;
 }

-static inline void ffStrbufDestroy(FFstrbuf* strbuf)
-{
-    extern char* CHAR_NULL_PTR;
-
-    if(strbuf->allocated == 0)
-    {
-        strbuf->length = 0;
-        strbuf->chars = CHAR_NULL_PTR;
-        return;
-    }
-
-    //Avoid free-after-use. These 3 assignments are cheap so don't remove them
-    strbuf->allocated = strbuf->length = 0;
-    free(strbuf->chars);
-    strbuf->chars = CHAR_NULL_PTR;
+static inline void ffStrbufInitMoveS(FFstrbuf* strbuf, char* heapStr) {
+    ffStrbufInitMoveNS(strbuf, (uint32_t) strlen(heapStr), heapStr);
 }

-FF_C_NODISCARD static inline uint32_t ffStrbufGetFree(const FFstrbuf* strbuf)
-{
+// Despite the name, this function resets strbuf to the initial/unallocated state
+static inline void ffStrbufDestroy(FFstrbuf* strbuf) {
+    if (strbuf->allocated > 0) {
+        free(strbuf->chars);
+    }
+
+    ffStrbufInit(strbuf);
+}
+
+FF_A_NODISCARD static inline uint32_t ffStrbufGetFree(const FFstrbuf* strbuf) {
    assert(strbuf != NULL);
-    if(strbuf->allocated == 0)
+    if (strbuf->allocated == 0) {
        return 0;
+    }

    return strbuf->allocated - strbuf->length - 1; // - 1 for the null byte
 }

-static inline void ffStrbufRecalculateLength(FFstrbuf* strbuf)
-{
+static inline void ffStrbufRecalculateLength(FFstrbuf* strbuf) {
    strbuf->length = (uint32_t) strlen(strbuf->chars);
 }

-static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value)
-{
-    if(value == NULL)
+static inline void ffStrbufSetS(FFstrbuf* strbuf, const char* value) {
+    assert(strbuf != NULL);
+
+    if (value == NULL) {
+        ffStrbufClear(strbuf);
+    } else {
+        ffStrbufSetNS(strbuf, (uint32_t) strlen(value), value);
+    }
+}
+
+static inline bool ffStrbufSetJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal) {
+    assert(strbuf != NULL);
+
+    if (yyjson_is_str(jsonVal)) {
+        ffStrbufSetNS(strbuf, (uint32_t) unsafe_yyjson_get_len(jsonVal), unsafe_yyjson_get_str(jsonVal));
+        return true;
+    }
+
+    ffStrbufClear(strbuf);
+    return false;
+}
+
+static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value) {
+    if (value == NULL) {
        return;
+    }
    ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);
 }

-static inline bool ffStrbufAppendJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal)
-{
-    if (yyjson_is_str(jsonVal))
-    {
+static inline bool ffStrbufAppendJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal) {
+    if (yyjson_is_str(jsonVal)) {
        ffStrbufAppendNS(strbuf, (uint32_t) unsafe_yyjson_get_len(jsonVal), unsafe_yyjson_get_str(jsonVal));
        return true;
    }
    return false;
 }

-static inline void ffStrbufSetS(FFstrbuf* strbuf, const char* value)
-{
-    ffStrbufClear(strbuf);
-
-    if(value != NULL)
-        ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);
-}
-
-static inline void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value)
-{
-    ffStrbufClear(strbuf);
-    ffStrbufAppendNS(strbuf, length, value);
-}
-
-static inline void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value)
-{
-    assert(value && value != strbuf);
-    if (strbuf->allocated == 0 && value->allocated == 0)
-    {
-        memcpy(strbuf, value, sizeof(FFstrbuf));
-        return;
-    }
-    ffStrbufSetNS(strbuf, value->length, value->chars);
-}
-
-static inline bool ffStrbufSetJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal)
-{
-    ffStrbufClear(strbuf);
-    return ffStrbufAppendJsonVal(strbuf, jsonVal);
-}
-
-static inline void ffStrbufInit(FFstrbuf* strbuf)
-{
+static inline void ffStrbufInit(FFstrbuf* strbuf) {
    extern char* CHAR_NULL_PTR;
-    strbuf->allocated = 0;
-    strbuf->length = 0;
+    strbuf->allocated = strbuf->length = 0;
    strbuf->chars = CHAR_NULL_PTR;
 }

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreate(void)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreate(void) {
    FFstrbuf strbuf;
    ffStrbufInit(&strbuf);
    return strbuf;
 }

-static inline void ffStrbufInitStatic(FFstrbuf* strbuf, const char* str)
-{
+static inline void ffStrbufInitStatic(FFstrbuf* strbuf, const char* str) {
    ffStrbufInit(strbuf);
-    if (!str) return;
+    if (!str) {
+        return;
+    }

    strbuf->allocated = 0;
    strbuf->length = (uint32_t) strlen(str);
    strbuf->chars = (char*) str;
 }

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateStatic(const char* str)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreateStatic(const char* str) {
    FFstrbuf strbuf;
    ffStrbufInitStatic(&strbuf, str);
    return strbuf;
 }

-static inline void ffStrbufSetStatic(FFstrbuf* strbuf, const char* value)
-{
-    if(strbuf->allocated > 0)
-        ffStrbufDestroy(strbuf);
+static inline void ffStrbufSetStatic(FFstrbuf* strbuf, const char* value) {
+    if (strbuf->allocated > 0) {
+        free(strbuf->chars);
+    }

-    if(value != NULL)
+    if (value != NULL) {
        ffStrbufInitStatic(strbuf, value);
+    } else {
+        ffStrbufInit(strbuf);
+    }
 }

-static inline void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* str)
-{
+static inline void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* str) {
    ffStrbufInit(strbuf);
    ffStrbufAppendNS(strbuf, length, str);
 }

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateNS(uint32_t length, const char* str)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreateNS(uint32_t length, const char* str) {
    FFstrbuf strbuf;
    ffStrbufInitNS(&strbuf, length, str);
    return strbuf;
 }

-static inline bool ffStrbufInitJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal)
-{
+static inline bool ffStrbufInitJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal) {
    ffStrbufInit(strbuf);
    return ffStrbufAppendJsonVal(strbuf, jsonVal);
 }

-static inline void ffStrbufInitS(FFstrbuf* strbuf, const char* str)
-{
+static inline void ffStrbufInitS(FFstrbuf* strbuf, const char* str) {
    ffStrbufInit(strbuf);
    ffStrbufAppendS(strbuf, str);
 }

-FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateS(const char* str)
-{
+FF_A_NODISCARD static inline FFstrbuf ffStrbufCreateS(const char* str) {
    FFstrbuf strbuf;
    ffStrbufInitS(&strbuf, str);
    return strbuf;
 }

-static inline void ffStrbufAppend(FFstrbuf* __restrict strbuf, const FFstrbuf* __restrict value)
-{
+static inline void ffStrbufAppend(FFstrbuf* __restrict strbuf, const FFstrbuf* __restrict value) {
    assert(value != strbuf);
-    if(value == NULL)
+    if (value == NULL) {
        return;
+    }
    ffStrbufAppendNS(strbuf, value->length, value->chars);
 }

-static inline void ffStrbufPrepend(FFstrbuf* strbuf, FFstrbuf* value)
-{
-    if(value == NULL)
+static inline void ffStrbufPrepend(FFstrbuf* strbuf, FFstrbuf* value) {
+    if (value == NULL) {
        return;
+    }
    ffStrbufPrependNS(strbuf, value->length, value->chars);
 }

-static inline void ffStrbufPrependS(FFstrbuf* strbuf, const char* value)
-{
-    if(value == NULL)
+static inline void ffStrbufPrependS(FFstrbuf* strbuf, const char* value) {
+    if (value == NULL) {
        return;
+    }
    ffStrbufPrependNS(strbuf, (uint32_t) strlen(value), value);
 }

-static inline int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp)
-{
+static inline FF_A_NODISCARD int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp) {
    uint32_t length = strbuf->length > comp->length ? comp->length : strbuf->length;
    return memcmp(strbuf->chars, comp->chars, length + 1);
 }

-static inline FF_C_NODISCARD bool ffStrbufEqual(const FFstrbuf* strbuf, const FFstrbuf* comp)
-{
+static inline FF_A_NODISCARD bool ffStrbufEqual(const FFstrbuf* strbuf, const FFstrbuf* comp) {
    return ffStrbufComp(strbuf, comp) == 0;
 }

-static inline FF_C_NODISCARD int ffStrbufCompS(const FFstrbuf* strbuf, const char* comp)
-{
+static inline FF_A_NODISCARD int ffStrbufCompS(const FFstrbuf* strbuf, const char* comp) {
    return strcmp(strbuf->chars, comp);
 }

-static inline FF_C_NODISCARD bool ffStrbufEqualS(const FFstrbuf* strbuf, const char* comp)
-{
+static inline FF_A_NODISCARD bool ffStrbufEqualS(const FFstrbuf* strbuf, const char* comp) {
    return ffStrbufCompS(strbuf, comp) == 0;
 }

-static inline FF_C_NODISCARD int ffStrbufIgnCaseCompS(const FFstrbuf* strbuf, const char* comp)
-{
+static inline FF_A_NODISCARD int ffStrbufIgnCaseCompS(const FFstrbuf* strbuf, const char* comp) {
    return strcasecmp(strbuf->chars, comp);
 }

-static inline FF_C_NODISCARD bool ffStrbufIgnCaseEqualS(const FFstrbuf* strbuf, const char* comp)
-{
+static inline FF_A_NODISCARD bool ffStrbufIgnCaseEqualS(const FFstrbuf* strbuf, const char* comp) {
    return ffStrbufIgnCaseCompS(strbuf, comp) == 0;
 }

-static inline FF_C_NODISCARD int ffStrbufIgnCaseComp(const FFstrbuf* strbuf, const FFstrbuf* comp)
-{
+static inline FF_A_NODISCARD int ffStrbufIgnCaseComp(const FFstrbuf* strbuf, const FFstrbuf* comp) {
    return ffStrbufIgnCaseCompS(strbuf, comp->chars);
 }

-static inline FF_C_NODISCARD bool ffStrbufIgnCaseEqual(const FFstrbuf* strbuf, const FFstrbuf* comp)
-{
+static inline FF_A_NODISCARD bool ffStrbufIgnCaseEqual(const FFstrbuf* strbuf, const FFstrbuf* comp) {
    return ffStrbufIgnCaseComp(strbuf, comp) == 0;
 }

-static inline FF_C_NODISCARD bool ffStrbufContainC(const FFstrbuf* strbuf, char c)
-{
+static inline FF_A_NODISCARD bool ffStrbufContainC(const FFstrbuf* strbuf, char c) {
    return memchr(strbuf->chars, c, strbuf->length) != NULL;
 }

-static inline FF_C_NODISCARD bool ffStrbufContainS(const FFstrbuf* strbuf, const char* str)
-{
+static inline FF_A_NODISCARD bool ffStrbufContainS(const FFstrbuf* strbuf, const char* str) {
    return strstr(strbuf->chars, str) != NULL;
 }

-static inline FF_C_NODISCARD bool ffStrbufContain(const FFstrbuf* strbuf, const FFstrbuf* str)
-{
+static inline FF_A_NODISCARD bool ffStrbufContain(const FFstrbuf* strbuf, const FFstrbuf* str) {
    return ffStrbufContainS(strbuf, str->chars);
 }

-static inline FF_C_NODISCARD bool ffStrbufContainIgnCaseS(const FFstrbuf* strbuf, const char* str)
-{
+static inline FF_A_NODISCARD bool ffStrbufContainIgnCaseS(const FFstrbuf* strbuf, const char* str) {
    return strcasestr(strbuf->chars, str) != NULL;
 }

-static inline FF_C_NODISCARD bool ffStrbufContainIgnCase(const FFstrbuf* strbuf, const FFstrbuf* str)
-{
+static inline FF_A_NODISCARD bool ffStrbufContainIgnCase(const FFstrbuf* strbuf, const FFstrbuf* str) {
    return ffStrbufContainIgnCaseS(strbuf, str->chars);
 }

-static inline FF_C_NODISCARD uint32_t ffStrbufFirstIndexC(const FFstrbuf* strbuf, char c)
-{
+FF_A_NODISCARD static inline uint32_t ffStrbufNextIndexC(const FFstrbuf* strbuf, uint32_t start, char c) {
+    assert(start <= strbuf->length);
+
+    const char* ptr = (const char*) memchr(strbuf->chars + start, c, strbuf->length - start);
+    return ptr ? (uint32_t) (ptr - strbuf->chars) : strbuf->length;
+}
+
+FF_A_NODISCARD static inline uint32_t ffStrbufNextIndexS(const FFstrbuf* strbuf, uint32_t start, const char* str) {
+    assert(start <= strbuf->length);
+
+    const char* ptr = strstr(strbuf->chars + start, str);
+    return ptr ? (uint32_t) (ptr - strbuf->chars) : strbuf->length;
+}
+
+FF_A_NODISCARD static inline uint32_t ffStrbufPreviousIndexC(const FFstrbuf* strbuf, uint32_t start, char c) {
+    assert(start <= strbuf->length);
+
+    const char* ptr = (const char*) memrchr(strbuf->chars, c, start + 1);
+    return ptr ? (uint32_t) (ptr - strbuf->chars) : strbuf->length;
+}
+
+static inline FF_A_NODISCARD uint32_t ffStrbufFirstIndexC(const FFstrbuf* strbuf, char c) {
    return ffStrbufNextIndexC(strbuf, 0, c);
 }

-static inline FF_C_NODISCARD uint32_t ffStrbufFirstIndex(const FFstrbuf* strbuf, const FFstrbuf* searched)
-{
+static inline FF_A_NODISCARD uint32_t ffStrbufFirstIndex(const FFstrbuf* strbuf, const FFstrbuf* searched) {
    return ffStrbufNextIndexS(strbuf, 0, searched->chars);
 }

-static inline FF_C_NODISCARD uint32_t ffStrbufFirstIndexS(const FFstrbuf* strbuf, const char* str)
-{
+static inline FF_A_NODISCARD uint32_t ffStrbufFirstIndexS(const FFstrbuf* strbuf, const char* str) {
    return ffStrbufNextIndexS(strbuf, 0, str);
 }

-static inline FF_C_NODISCARD uint32_t ffStrbufLastIndexC(const FFstrbuf* strbuf, char c)
-{
-    if(strbuf->length == 0)
+static inline FF_A_NODISCARD uint32_t ffStrbufLastIndexC(const FFstrbuf* strbuf, char c) {
+    if (strbuf->length == 0) {
        return 0;
+    }

    return ffStrbufPreviousIndexC(strbuf, strbuf->length - 1, c);
 }

-static inline bool ffStrbufSubstrBeforeFirstC(FFstrbuf* strbuf, char c)
-{
+static inline bool ffStrbufSubstrBeforeFirstC(FFstrbuf* strbuf, char c) {
    return ffStrbufSubstrBefore(strbuf, ffStrbufFirstIndexC(strbuf, c));
 }

-static inline bool ffStrbufSubstrBeforeLastC(FFstrbuf* strbuf, char c)
-{
+static inline bool ffStrbufSubstrBeforeLastC(FFstrbuf* strbuf, char c) {
    return ffStrbufSubstrBefore(strbuf, ffStrbufLastIndexC(strbuf, c));
 }

-static inline FF_C_NODISCARD bool ffStrbufStartsWithC(const FFstrbuf* strbuf, char c)
-{
+static inline FF_A_NODISCARD bool ffStrbufStartsWithC(const FFstrbuf* strbuf, char c) {
    return strbuf->chars[0] == c;
 }

-static inline FF_C_NODISCARD bool ffStrbufStartsWithSN(const FFstrbuf* strbuf, const char* start, uint32_t length)
-{
-    if (length > strbuf->length)
+static inline FF_A_NODISCARD bool ffStrbufStartsWithSN(const FFstrbuf* strbuf, const char* start, uint32_t length) {
+    if (length > strbuf->length) {
        return false;
+    }

    return memcmp(strbuf->chars, start, length) == 0;
 }

-static inline FF_C_NODISCARD bool ffStrbufStartsWithS(const FFstrbuf* strbuf, const char* start)
-{
+static inline FF_A_NODISCARD bool ffStrbufStartsWithS(const FFstrbuf* strbuf, const char* start) {
    return ffStrbufStartsWithSN(strbuf, start, (uint32_t) strlen(start));
 }

-static inline FF_C_NODISCARD bool ffStrbufStartsWith(const FFstrbuf* strbuf, const FFstrbuf* start)
-{
+static inline FF_A_NODISCARD bool ffStrbufStartsWith(const FFstrbuf* strbuf, const FFstrbuf* start) {
    return ffStrbufStartsWithSN(strbuf, start->chars, start->length);
 }

-static inline FF_C_NODISCARD bool ffStrbufStartsWithIgnCaseNS(const FFstrbuf* strbuf, uint32_t length, const char* start)
-{
-    if(length > strbuf->length)
+static inline FF_A_NODISCARD bool ffStrbufStartsWithIgnCaseNS(const FFstrbuf* strbuf, uint32_t length, const char* start) {
+    if (length > strbuf->length) {
        return false;
+    }
    return strncasecmp(strbuf->chars, start, length) == 0;
 }

-static inline FF_C_NODISCARD bool ffStrbufStartsWithIgnCaseS(const FFstrbuf* strbuf, const char* start)
-{
+static inline FF_A_NODISCARD bool ffStrbufStartsWithIgnCaseS(const FFstrbuf* strbuf, const char* start) {
    return ffStrbufStartsWithIgnCaseNS(strbuf, (uint32_t) strlen(start), start);
 }

-static inline FF_C_NODISCARD bool ffStrbufStartsWithIgnCase(const FFstrbuf* strbuf, const FFstrbuf* start)
-{
+static inline FF_A_NODISCARD bool ffStrbufStartsWithIgnCase(const FFstrbuf* strbuf, const FFstrbuf* start) {
    return ffStrbufStartsWithIgnCaseNS(strbuf, start->length, start->chars);
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithC(const FFstrbuf* strbuf, char c)
-{
-    return strbuf->length == 0 ? false :
-        strbuf->chars[strbuf->length - 1] == c;
+static inline FF_A_NODISCARD bool ffStrbufEndsWithC(const FFstrbuf* strbuf, char c) {
+    return strbuf->length == 0 ? false : strbuf->chars[strbuf->length - 1] == c;
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithNS(const FFstrbuf* strbuf, uint32_t endLength, const char* end)
-{
-    if(endLength > strbuf->length)
+static inline FF_A_NODISCARD bool ffStrbufEndsWithNS(const FFstrbuf* strbuf, uint32_t endLength, const char* end) {
+    if (endLength > strbuf->length) {
        return false;
+    }

    return memcmp(strbuf->chars + strbuf->length - endLength, end, endLength) == 0;
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithS(const FFstrbuf* strbuf, const char* end)
-{
+static inline FF_A_NODISCARD bool ffStrbufEndsWithS(const FFstrbuf* strbuf, const char* end) {
    return ffStrbufEndsWithNS(strbuf, (uint32_t) strlen(end), end);
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithFn(const FFstrbuf* strbuf, int (*const fn)(int))
-{
-    return strbuf->length == 0 ? false :
-        fn(strbuf->chars[strbuf->length - 1]);
+static inline FF_A_NODISCARD bool ffStrbufEndsWithFn(const FFstrbuf* strbuf, int (*const fn)(int)) {
+    return strbuf->length == 0 ? false : fn(strbuf->chars[strbuf->length - 1]);
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWith(const FFstrbuf* strbuf, const FFstrbuf* end)
-{
+static inline FF_A_NODISCARD bool ffStrbufEndsWith(const FFstrbuf* strbuf, const FFstrbuf* end) {
    return ffStrbufEndsWithNS(strbuf, end->length, end->chars);
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithIgnCaseNS(const FFstrbuf* strbuf, uint32_t endLength, const char* end)
-{
-    if(endLength > strbuf->length)
+static inline FF_A_NODISCARD bool ffStrbufEndsWithIgnCaseNS(const FFstrbuf* strbuf, uint32_t endLength, const char* end) {
+    if (endLength > strbuf->length) {
        return false;
+    }
    return strcasecmp(strbuf->chars + strbuf->length - endLength, end) == 0;
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithIgnCaseS(const FFstrbuf* strbuf, const char* end)
-{
+static inline FF_A_NODISCARD bool ffStrbufEndsWithIgnCaseS(const FFstrbuf* strbuf, const char* end) {
    return ffStrbufEndsWithIgnCaseNS(strbuf, (uint32_t) strlen(end), end);
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithIgnCase(const FFstrbuf* strbuf, const FFstrbuf* end)
-{
+static inline FF_A_NODISCARD bool ffStrbufEndsWithIgnCase(const FFstrbuf* strbuf, const FFstrbuf* end) {
    return ffStrbufEndsWithIgnCaseNS(strbuf, end->length, end->chars);
 }

-static inline void ffStrbufTrim(FFstrbuf* strbuf, char c)
-{
+static inline void ffStrbufTrim(FFstrbuf* strbuf, char c) {
    ffStrbufTrimRight(strbuf, c);
    ffStrbufTrimLeft(strbuf, c);
 }

-static inline void ffStrbufTrimSpace(FFstrbuf* strbuf)
-{
+static inline void ffStrbufTrimSpace(FFstrbuf* strbuf) {
    ffStrbufTrimRightSpace(strbuf);
    ffStrbufTrimLeftSpace(strbuf);
 }

-static inline bool ffStrbufMatchSeparatedS(const FFstrbuf* strbuf, const char* comp, char separator)
-{
+static inline bool ffStrbufMatchSeparatedS(const FFstrbuf* strbuf, const char* comp, char separator) {
    return ffStrbufMatchSeparatedNS(strbuf, (uint32_t) strlen(comp), comp, separator);
 }

-static inline bool ffStrbufMatchSeparated(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator)
-{
+static inline bool ffStrbufMatchSeparated(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator) {
    return ffStrbufMatchSeparatedNS(strbuf, comp->length, comp->chars, separator);
 }

-static inline bool ffStrbufMatchSeparatedIgnCaseS(const FFstrbuf* strbuf, const char* comp, char separator)
-{
+static inline bool ffStrbufMatchSeparatedIgnCaseS(const FFstrbuf* strbuf, const char* comp, char separator) {
    return ffStrbufMatchSeparatedIgnCaseNS(strbuf, (uint32_t) strlen(comp), comp, separator);
 }

-static inline bool ffStrbufMatchSeparatedIgnCase(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator)
-{
+static inline bool ffStrbufMatchSeparatedIgnCase(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator) {
    return ffStrbufMatchSeparatedIgnCaseNS(strbuf, comp->length, comp->chars, separator);
 }

-static inline bool ffStrbufSeparatedContainS(const FFstrbuf* strbuf, const char* comp, char separator)
-{
+static inline bool ffStrbufSeparatedContainS(const FFstrbuf* strbuf, const char* comp, char separator) {
    return ffStrbufSeparatedContainNS(strbuf, (uint32_t) strlen(comp), comp, separator);
 }

-static inline bool ffStrbufSeparatedContain(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator)
-{
+static inline bool ffStrbufSeparatedContain(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator) {
    return ffStrbufSeparatedContainNS(strbuf, comp->length, comp->chars, separator);
 }

-static inline bool ffStrbufSeparatedContainIgnCaseS(const FFstrbuf* strbuf, const char* comp, char separator)
-{
+static inline bool ffStrbufSeparatedContainIgnCaseS(const FFstrbuf* strbuf, const char* comp, char separator) {
    return ffStrbufSeparatedContainIgnCaseNS(strbuf, (uint32_t) strlen(comp), comp, separator);
 }

-static inline bool ffStrbufSeparatedContainIgnCase(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator)
-{
+static inline bool ffStrbufSeparatedContainIgnCase(const FFstrbuf* strbuf, const FFstrbuf* comp, char separator) {
    return ffStrbufSeparatedContainIgnCaseNS(strbuf, comp->length, comp->chars, separator);
 }

-#define FF_STRBUF_AUTO_DESTROY FFstrbuf __attribute__((__cleanup__(ffStrbufDestroy)))
+// Returns true if the strbuf is modified
+bool ffStrbufDecodeHexEscapeSequences(FFstrbuf* strbuf);
+
+#define FF_STRBUF_AUTO_DESTROY FFstrbuf FF_A_CLEANUP(ffStrbufDestroy)
@@ -0,0 +1,225 @@
+#include "cf_helpers.h"
+
+const char* ffCfNumGetInt64(CFTypeRef cf, int64_t* result) {
+    if (CFGetTypeID(cf) == CFNumberGetTypeID()) {
+        if (!CFNumberGetValue((CFNumberRef) cf, kCFNumberSInt64Type, result)) {
+            return "Number type is not SInt64";
+        }
+        return NULL;
+    } else if (CFGetTypeID(cf) == CFDataGetTypeID()) {
+        if (CFDataGetLength((CFDataRef) cf) != sizeof(int64_t)) {
+            return "Data length is not sizeof(int64_t)";
+        }
+        CFDataGetBytes((CFDataRef) cf, CFRangeMake(0, sizeof(int64_t)), (uint8_t*) result);
+        return NULL;
+    }
+
+    return "TypeID is neither 'CFNumber' nor 'CFData'";
+}
+
+const char* ffCfNumGetInt(CFTypeRef cf, int32_t* result) {
+    if (CFGetTypeID(cf) == CFNumberGetTypeID()) {
+        if (!CFNumberGetValue((CFNumberRef) cf, kCFNumberSInt32Type, result)) {
+            return "Number type is not SInt32";
+        }
+        return NULL;
+    } else if (CFGetTypeID(cf) == CFDataGetTypeID()) {
+        if (CFDataGetLength((CFDataRef) cf) != sizeof(*result)) {
+            return "Data length is not sizeof(int32_t)";
+        }
+        CFDataGetBytes((CFDataRef) cf, CFRangeMake(0, sizeof(*result)), (uint8_t*) result);
+        return NULL;
+    }
+
+    return "TypeID is neither 'CFNumber' nor 'CFData'";
+}
+
+const char* ffCfNumGetDouble(CFTypeRef cf, double* result) {
+    if (CFGetTypeID(cf) == CFNumberGetTypeID()) {
+        if (!CFNumberGetValue((CFNumberRef) cf, kCFNumberDoubleType, result) &&
+            !CFNumberGetValue((CFNumberRef) cf, kCFNumberFloatType, result)) {
+            return "Number type is not Double or Float";
+        }
+        return NULL;
+    }
+
+    return "TypeID is neither 'CFNumber'";
+}
+
+const char* ffCfDateGetEpoch(CFTypeRef cf, uint64_t* result) {
+    if (CFGetTypeID(cf) != CFDateGetTypeID()) {
+        return "TypeID is not 'CFDate'";
+    }
+
+    CFAbsoluteTime absTime = CFDateGetAbsoluteTime((CFDateRef) cf);
+    // Convert from seconds to milliseconds and add the difference between 1970 and 2001 in milliseconds
+    *result = (uint64_t) ((absTime + 978307200 /*kCFAbsoluteTimeIntervalSince1970*/) * 1000);
+    return NULL;
+}
+
+const char* ffCfStrGetString(CFTypeRef cf, FFstrbuf* result) {
+    ffStrbufClear(result);
+    if (!cf) {
+        return NULL;
+    }
+
+    if (CFGetTypeID(cf) == CFStringGetTypeID()) {
+        CFStringRef cfStr = (CFStringRef) cf;
+
+        const char* cstr = CFStringGetCStringPtr(cfStr, kCFStringEncodingUTF8);
+        if (cstr) {
+            ffStrbufSetS(result, cstr);
+        } else {
+            uint32_t length = (uint32_t) CFStringGetLength(cfStr);
+            if (length == 0) {
+                return NULL;
+            }
+            ffStrbufEnsureFixedLengthFree(result, (uint32_t) CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8));
+            if (!CFStringGetCString(cfStr, result->chars, result->allocated, kCFStringEncodingUTF8)) {
+                return "CFStringGetCString() failed";
+            }
+            // CFStringGetCString ensures the buffer is NUL terminated
+            // https://developer.apple.com/documentation/corefoundation/1542721-cfstringgetcstring
+            result->length = (uint32_t) strnlen(result->chars, (uint32_t) result->allocated);
+        }
+    } else if (CFGetTypeID(cf) == CFDataGetTypeID()) {
+        CFDataRef cfData = (CFDataRef) cf;
+        uint32_t length = (uint32_t) CFDataGetLength(cfData);
+        if (length == 0) {
+            return NULL;
+        }
+        ffStrbufEnsureFixedLengthFree(result, length + 1);
+        CFDataGetBytes(cfData, CFRangeMake(0, length), (uint8_t*) result->chars);
+        result->length = (uint32_t) strnlen(result->chars, length);
+        result->chars[result->length] = '\0';
+    } else {
+        return "TypeID is neither 'CFString' nor 'CFData'";
+    }
+
+    return NULL;
+}
+
+const char* ffCfDataGetDataAsString(CFTypeRef cf, FFstrbuf* result) {
+    ffStrbufClear(result);
+    if (!cf) {
+        return NULL;
+    }
+
+    if (CFGetTypeID(cf) == CFDataGetTypeID()) {
+        CFDataRef cfData = (CFDataRef) cf;
+        uint32_t length = (uint32_t) CFDataGetLength(cfData);
+        if (length == 0) {
+            return NULL;
+        }
+        ffStrbufEnsureFixedLengthFree(result, length + 1);
+        CFDataGetBytes(cfData, CFRangeMake(0, length), (uint8_t*) result->chars);
+        result->length = length;
+        result->chars[result->length] = '\0';
+    } else {
+        return "TypeID is not 'CFData'";
+    }
+
+    return NULL;
+}
+
+const char* ffCfDictGetString(CFDictionaryRef dict, CFStringRef key, FFstrbuf* result) {
+    CFTypeRef cf = (CFTypeRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    return ffCfStrGetString(cf, result);
+}
+
+const char* ffCfDictGetDataAsString(CFDictionaryRef dict, CFStringRef key, FFstrbuf* result) {
+    CFTypeRef cf = (CFTypeRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    return ffCfDataGetDataAsString(cf, result);
+}
+
+const char* ffCfDictGetBool(CFDictionaryRef dict, CFStringRef key, bool* result) {
+    CFBooleanRef cf = (CFBooleanRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    if (CFGetTypeID(cf) != CFBooleanGetTypeID()) {
+        return "TypeID is not 'CFBoolean'";
+    }
+
+    *result = CFBooleanGetValue(cf);
+    return NULL;
+}
+
+const char* ffCfDictGetInt(CFDictionaryRef dict, CFStringRef key, int* result) {
+    CFTypeRef cf = (CFTypeRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    return ffCfNumGetInt(cf, result);
+}
+
+const char* ffCfDictGetInt64(CFDictionaryRef dict, CFStringRef key, int64_t* result) {
+    CFTypeRef cf = (CFTypeRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    return ffCfNumGetInt64(cf, result);
+}
+
+const char* ffCfDictGetDouble(CFDictionaryRef dict, CFStringRef key, double* result) {
+    CFTypeRef cf = (CFTypeRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    return ffCfNumGetDouble(cf, result);
+}
+
+const char* ffCfDictGetData(CFDictionaryRef dict, CFStringRef key, uint32_t offset, uint32_t size, uint8_t* result, uint32_t* length) {
+    CFTypeRef cf = (CFTypeRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    if (CFGetTypeID(cf) != CFDataGetTypeID()) {
+        return "TypeID is not 'CFData'";
+    }
+
+    CFIndex trueLength = CFDataGetLength((CFDataRef) cf);
+
+    if (trueLength < offset + size) {
+        return "Data length is less than offset + size";
+    }
+
+    if (length) {
+        *length = (uint32_t) trueLength;
+    }
+
+    CFDataGetBytes((CFDataRef) cf, CFRangeMake(offset, size), result);
+    return NULL;
+}
+
+const char* ffCfDictGetDict(CFDictionaryRef dict, CFStringRef key, CFDictionaryRef* result) {
+    CFDictionaryRef cf = (CFDictionaryRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL || CFGetTypeID(cf) != CFDictionaryGetTypeID()) {
+        return "TypeID is not 'CFDictionary'";
+    }
+
+    *result = cf;
+    return NULL;
+}
+
+const char* ffCfDictGetDateAsEpoch(CFDictionaryRef dict, CFStringRef key, uint64_t* result) {
+    CFTypeRef cf = (CFTypeRef) CFDictionaryGetValue(dict, key);
+    if (cf == NULL) {
+        return "CFDictionaryGetValue() failed";
+    }
+
+    return ffCfDateGetEpoch(cf, result);
+}
@@ -4,34 +4,40 @@
 #include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOKitLib.h>

-//Return error info if failed, NULL otherwise
+// Return error info if failed, NULL otherwise
 const char* ffCfStrGetString(CFTypeRef cf, FFstrbuf* result);
 const char* ffCfNumGetInt(CFTypeRef cf, int32_t* result);
 const char* ffCfNumGetInt64(CFTypeRef cf, int64_t* result);
+const char* ffCfNumGetDouble(CFTypeRef cf, double* result);
+const char* ffCfDateGetEpoch(CFTypeRef cf, uint64_t* result);
+const char* ffCfDataGetDataAsString(CFTypeRef cf, FFstrbuf* result);
 const char* ffCfDictGetString(CFDictionaryRef dict, CFStringRef key, FFstrbuf* result);
 const char* ffCfDictGetBool(CFDictionaryRef dict, CFStringRef key, bool* result);
 const char* ffCfDictGetInt(CFDictionaryRef dict, CFStringRef key, int* result);
 const char* ffCfDictGetInt64(CFDictionaryRef dict, CFStringRef key, int64_t* result);
+const char* ffCfDictGetDouble(CFDictionaryRef dict, CFStringRef key, double* result);
 const char* ffCfDictGetData(CFDictionaryRef dict, CFStringRef key, uint32_t offset, uint32_t size, uint8_t* result, uint32_t* length);
+const char* ffCfDictGetDataAsString(CFDictionaryRef dict, CFStringRef key, FFstrbuf* result);
 const char* ffCfDictGetDict(CFDictionaryRef dict, CFStringRef key, CFDictionaryRef* result);
+const char* ffCfDictGetDateAsEpoch(CFDictionaryRef dict, CFStringRef key, uint64_t* result);

-static inline CFNumberRef ffCfCreateInt(int value)
-{
+static inline CFNumberRef ffCfCreateInt(int value) {
    return CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &value);
 }

-static inline void cfReleaseWrapper(void* type)
-{
-    if (*(CFTypeRef*) type)
+static inline void cfReleaseWrapper(void* type) {
+    assert(type);
+    if (*(CFTypeRef*) type) {
        CFRelease(*(CFTypeRef*) type);
+    }
 }

-#define FF_CFTYPE_AUTO_RELEASE __attribute__((__cleanup__(cfReleaseWrapper)))
+#define FF_CFTYPE_AUTO_RELEASE FF_A_CLEANUP(cfReleaseWrapper)

-static inline void wrapIoObjectRelease(io_object_t* service)
-{
+static inline void wrapIoObjectRelease(io_object_t* service) {
    assert(service);
-    if (*service)
+    if (*service) {
        IOObjectRelease(*service);
+    }
 }
-#define FF_IOOBJECT_AUTO_RELEASE __attribute__((__cleanup__(wrapIoObjectRelease)))
+#define FF_IOOBJECT_AUTO_RELEASE FF_A_CLEANUP(wrapIoObjectRelease)
@@ -1,8 +1,6 @@
 #include "osascript.h"

 #import <Foundation/Foundation.h>
-#import <AppKit/AppKit.h>
-#import <CoreData/CoreData.h>

 bool ffOsascript(const char* input, FFstrbuf* result)
 {
@@ -0,0 +1,465 @@
+#include "smc_temps.h"
+#include "common/apple/cf_helpers.h"
+#include "common/strutil.h"
+
+#include <stdint.h>
+#include <IOKit/IOKitLib.h>
+
+static const char kSmcCmdReadBytes = 5;
+static const char kSmcCmdReadKeyInfo = 9;
+static const uint32_t kKernelIndexSmc = 2;
+
+typedef struct
+{
+    char major;
+    char minor;
+    char build;
+    char reserved[1];
+    uint16_t release;
+} SmcKeyData_vers_t;
+
+typedef struct
+{
+    uint16_t version;
+    uint16_t length;
+    uint32_t cpuPLimit;
+    uint32_t gpuPLimit;
+    uint32_t memPLimit;
+} SmcKeyData_pLimitData_t;
+
+typedef struct
+{
+    uint32_t dataSize;
+    uint32_t dataType;
+    char dataAttributes;
+} SmcKeyData_keyInfo_t;
+
+typedef unsigned char SmcBytes_t[32];
+
+typedef struct
+{
+    uint32_t key;
+    SmcKeyData_vers_t vers;
+    SmcKeyData_pLimitData_t pLimitData;
+    SmcKeyData_keyInfo_t keyInfo;
+    char result;
+    char status;
+    char data8;
+    uint32_t data32;
+    SmcBytes_t bytes;
+} SmcKeyData_t;
+
+typedef char UInt32Char_t[5];
+
+typedef struct
+{
+    UInt32Char_t key;
+    uint32_t dataSize;
+    UInt32Char_t dataType;
+    SmcBytes_t bytes;
+} SmcVal_t;
+
+static uint32_t smcStrtoul(const char* str, int size, int base) {
+    uint32_t total = 0;
+
+    for (int i = 0; i < size; i++) {
+        if (base == 16) {
+            total += (uint32_t) (str[i] << (size - 1 - i) * 8);
+        } else {
+            total += (uint32_t) ((unsigned char) (str[i]) << (size - 1 - i) * 8);
+        }
+    }
+    return total;
+}
+
+static void smcUltostr(char* str, uint32_t val) {
+    str[0] = (char) (val >> 24);
+    str[1] = (char) (val >> 16);
+    str[2] = (char) (val >> 8);
+    str[3] = (char) val;
+    str[4] = '\0';
+}
+
+static const char* smcCall(io_connect_t conn, uint32_t selector, SmcKeyData_t* inputStructure, SmcKeyData_t* outputStructure) {
+    size_t size = sizeof(SmcKeyData_t);
+
+    if (IOConnectCallStructMethod(conn, selector, inputStructure, size, outputStructure, &size) != kIOReturnSuccess) {
+        return "IOConnectCallStructMethod(conn) failed";
+    }
+    return NULL;
+}
+
+// Provides key info, using a cache to dramatically improve the energy impact of smcFanControl
+static const char* smcGetKeyInfo(io_connect_t conn, const uint32_t key, SmcKeyData_keyInfo_t* key_info) {
+    SmcKeyData_t inputStructure = { 0 };
+    SmcKeyData_t outputStructure = { 0 };
+
+    inputStructure.key = key;
+    inputStructure.data8 = kSmcCmdReadKeyInfo;
+
+    const char* error = smcCall(conn, kKernelIndexSmc, &inputStructure, &outputStructure);
+    if (error) {
+        return error;
+    }
+
+    *key_info = outputStructure.keyInfo;
+    return NULL;
+}
+
+static const char* smcReadSmcVal(io_connect_t conn, const UInt32Char_t key, SmcVal_t* val) {
+    SmcKeyData_t inputStructure = { 0 };
+    SmcKeyData_t outputStructure = { 0 };
+
+    inputStructure.key = smcStrtoul(key, 4, 16);
+    strcpy(val->key, key);
+
+    const char* error = smcGetKeyInfo(conn, inputStructure.key, &outputStructure.keyInfo);
+    if (error) {
+        return error;
+    }
+
+    val->dataSize = outputStructure.keyInfo.dataSize;
+    smcUltostr(val->dataType, outputStructure.keyInfo.dataType);
+    inputStructure.keyInfo.dataSize = val->dataSize;
+    inputStructure.data8 = kSmcCmdReadBytes;
+
+    error = smcCall(conn, kKernelIndexSmc, &inputStructure, &outputStructure);
+    if (error) {
+        return error;
+    }
+
+    memcpy(val->bytes, outputStructure.bytes, sizeof(outputStructure.bytes));
+
+    return NULL;
+}
+
+static const char* smcOpen(io_connect_t* conn) {
+    FF_IOOBJECT_AUTO_RELEASE io_object_t device = IOServiceGetMatchingService(MACH_PORT_NULL, IOServiceMatching("AppleSMC"));
+    if (!device) {
+        return "No SMC device found";
+    }
+
+    if (IOServiceOpen(device, mach_task_self(), 0, conn) != kIOReturnSuccess) {
+        return "IOServiceOpen() failed";
+    }
+
+    return NULL;
+}
+
+static const char* smcReadValue(io_connect_t conn, const UInt32Char_t key, double* value) {
+    SmcVal_t val = { 0 };
+    const char* error = smcReadSmcVal(conn, key, &val);
+    if (error != NULL) {
+        return error;
+    }
+    if (val.dataSize == 0) {
+        return "Empty SMC result";
+    }
+
+    switch (val.dataType[0]) {
+        case 'u': // unsigned integer types
+            if (val.dataType[1] == 'i') {
+                switch (val.dataSize) {
+                    case 1:
+                        *value = *(uint8_t*) (val.bytes);
+                        break;
+                    case 2:
+                        *value = ntohs(*(uint16_t*) (val.bytes));
+                        break;
+                    case 4:
+                        *value = ntohl(*(uint32_t*) (val.bytes));
+                        break;
+                    case 8:
+                        *value = (double) ntohll(*(uint64_t*) (val.bytes));
+                        break;
+                    default:
+                        return "Unsupported SMC unsigned integer data size";
+                }
+            } else {
+                return "Unsupported SMC unsigned data type";
+            }
+            break;
+
+        case 'f': // floating point types
+            if (ffStrEquals(val.dataType, "flt ") && val.dataSize == 4) {
+                *value = *(float*) (val.bytes);
+            } else if (val.dataType[1] == 'p' && val.dataSize == 2) // fixed point types
+            {
+                if (ffStrEquals(val.dataType, "fp1f")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 32768.0;
+                } else if (ffStrEquals(val.dataType, "fp4c")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 4096.0;
+                } else if (ffStrEquals(val.dataType, "fp5b")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 2048.0;
+                } else if (ffStrEquals(val.dataType, "fp6a")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 1024.0;
+                } else if (ffStrEquals(val.dataType, "fp79")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 512.0;
+                } else if (ffStrEquals(val.dataType, "fp88")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 256.0;
+                } else if (ffStrEquals(val.dataType, "fpa6")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 64.0;
+                } else if (ffStrEquals(val.dataType, "fpc4")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 16.0;
+                } else if (ffStrEquals(val.dataType, "fpe2")) {
+                    *value = ntohs(*(uint16_t*) (val.bytes)) / 4.0;
+                } else {
+                    return "Unsupported SMC floating point data type";
+                }
+            } else {
+                return "Unsupported SMC floating point data type";
+            }
+            break;
+
+        case 's': // signed integer types
+            if (val.dataType[1] == 'i') {
+                switch (val.dataSize) {
+                    case 1:
+                        *value = *(int8_t*) (val.bytes);
+                        break;
+                    case 2:
+                        *value = ntohs(*(int16_t*) (val.bytes));
+                        break;
+                    case 4:
+                        *value = ntohl(*(int32_t*) (val.bytes));
+                        break;
+                    case 8:
+                        *value = (double) ntohll(*(int64_t*) (val.bytes));
+                        break;
+                    default:
+                        return "Unsupported SMC signed integer data size";
+                }
+            } else if (val.dataType[1] == 'p' && val.dataSize == 2) // signed fixed point types
+            {
+                if (ffStrEquals(val.dataType, "sp1e")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 16384.0;
+                } else if (ffStrEquals(val.dataType, "sp3c")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 4096.0;
+                } else if (ffStrEquals(val.dataType, "sp4b")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 2048.0;
+                } else if (ffStrEquals(val.dataType, "sp5a")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 1024.0;
+                } else if (ffStrEquals(val.dataType, "sp69")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 512.0;
+                } else if (ffStrEquals(val.dataType, "sp78")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 256.0;
+                } else if (ffStrEquals(val.dataType, "sp87")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 128.0;
+                } else if (ffStrEquals(val.dataType, "sp96")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 64.0;
+                } else if (ffStrEquals(val.dataType, "spb4")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 16.0;
+                } else if (ffStrEquals(val.dataType, "spf0")) {
+                    *value = (int16_t) ntohs(*(int16_t*) (val.bytes)) / 1.0;
+                } else {
+                    return "Unsupported SMC signed integer data type";
+                }
+            } else {
+                return "Unsupported SMC signed data type";
+            }
+            break;
+
+        case '{': // special types like pwm
+            if (ffStrEquals(val.dataType, "{pwm") && val.dataSize == 2) {
+                *value = (double) ntohs(*(uint16_t*) (val.bytes)) * 100 / 65536.0;
+            } else {
+                return "Unsupported SMC special data type";
+            }
+            break;
+
+        default:
+            return "Unsupported SMC data type";
+    }
+    return NULL;
+}
+
+static bool detectTemp(io_connect_t conn, const char* sensor, double* sum) {
+    double temp = 0;
+    const char* error = smcReadValue(conn, sensor, &temp);
+    if (error) {
+        return false;
+    }
+    // https://github.com/exelban/stats/blob/14e29c4d60229c363cca9c9d25c30c87b7870830/Modules/Sensors/readers.swift#L124
+    if (temp < 10 || temp > 120) {
+        return false;
+    }
+    *sum += temp;
+    return true;
+}
+
+static io_connect_t conn;
+
+const char* ffDetectSmcSpecificTemp(const char* sensor, double* result) {
+    if (!conn) {
+        if (smcOpen(&conn) != NULL) {
+            conn = (io_connect_t) -1;
+        }
+    }
+    if (conn == (io_connect_t) -1) {
+        return "Could not open SMC connection";
+    }
+
+    if (!detectTemp(conn, sensor, result)) {
+        return "Could not read SMC temperature";
+    }
+
+    return NULL;
+}
+
+const char* ffDetectSmcTemps(enum FFTempType type, double* result) {
+    if (!conn) {
+        if (smcOpen(&conn) != NULL) {
+            conn = (io_connect_t) -1;
+        }
+    }
+    if (conn == (io_connect_t) -1) {
+        return "Could not open SMC connection";
+    }
+
+    uint32_t count = 0;
+    *result = 0;
+
+    // https://github.com/exelban/stats/blob/master/Modules/Sensors/values.swift
+    switch (type) {
+        case FF_TEMP_CPU_X64:
+            count += detectTemp(conn, "TC0D", result); // CPU diode
+            count += detectTemp(conn, "TC0E", result); // CPU diode virtual
+            count += detectTemp(conn, "TC0F", result); // CPU diode filtered
+            count += detectTemp(conn, "TC0P", result); // CPU proximity
+            break;
+
+        case FF_TEMP_CPU_M1X:
+            count += detectTemp(conn, "Tp09", result); // CPU efficient core 1
+            count += detectTemp(conn, "Tp0T", result); // CPU efficient core 2
+
+            count += detectTemp(conn, "Tp01", result); // CPU performance core 1
+            count += detectTemp(conn, "Tp05", result); // CPU performance core 2
+            count += detectTemp(conn, "Tp0D", result); // CPU performance core 3
+            count += detectTemp(conn, "Tp0H", result); // CPU performance core 4
+            count += detectTemp(conn, "Tp0L", result); // CPU performance core 5
+            count += detectTemp(conn, "Tp0P", result); // CPU performance core 6
+            count += detectTemp(conn, "Tp0X", result); // CPU performance core 7
+            count += detectTemp(conn, "Tp0b", result); // CPU performance core 8
+            break;
+
+        case FF_TEMP_CPU_M2X:
+            count += detectTemp(conn, "Tp1h", result); // CPU efficiency core 1
+            count += detectTemp(conn, "Tp1t", result); // CPU efficiency core 2
+            count += detectTemp(conn, "Tp1p", result); // CPU efficiency core 3
+            count += detectTemp(conn, "Tp1l", result); // CPU efficiency core 4
+
+            count += detectTemp(conn, "Tp01", result); // CPU performance core 1
+            count += detectTemp(conn, "Tp05", result); // CPU performance core 2
+            count += detectTemp(conn, "Tp09", result); // CPU performance core 3
+            count += detectTemp(conn, "Tp0D", result); // CPU performance core 4
+            count += detectTemp(conn, "Tp0X", result); // CPU performance core 5
+            count += detectTemp(conn, "Tp0b", result); // CPU performance core 6
+            count += detectTemp(conn, "Tp0f", result); // CPU performance core 7
+            count += detectTemp(conn, "Tp0j", result); // CPU performance core 8
+            break;
+
+        case FF_TEMP_CPU_M3X:
+            count += detectTemp(conn, "Te05", result); // CPU efficiency core 1
+            count += detectTemp(conn, "Te0L", result); // CPU efficiency core 2
+            count += detectTemp(conn, "Te0P", result); // CPU efficiency core 3
+            count += detectTemp(conn, "Te0S", result); // CPU efficiency core 4
+            count += detectTemp(conn, "Tf04", result); // CPU performance core 1
+            count += detectTemp(conn, "Tf09", result); // CPU performance core 2
+            count += detectTemp(conn, "Tf0A", result); // CPU performance core 3
+            count += detectTemp(conn, "Tf0B", result); // CPU performance core 4
+            count += detectTemp(conn, "Tf0D", result); // CPU performance core 5
+            count += detectTemp(conn, "Tf0E", result); // CPU performance core 6
+            count += detectTemp(conn, "Tf44", result); // CPU performance core 7
+            count += detectTemp(conn, "Tf49", result); // CPU performance core 8
+            count += detectTemp(conn, "Tf4A", result); // CPU performance core 9
+            count += detectTemp(conn, "Tf4B", result); // CPU performance core 10
+            count += detectTemp(conn, "Tf4D", result); // CPU performance core 11
+            count += detectTemp(conn, "Tf4E", result); // CPU performance core 12
+            break;
+
+        case FF_TEMP_CPU_M4X:
+            count += detectTemp(conn, "Te05", result); // CPU efficiency core 1
+            count += detectTemp(conn, "Te0S", result); // CPU efficiency core 2
+            count += detectTemp(conn, "Te09", result); // CPU efficiency core 3
+            count += detectTemp(conn, "Te0H", result); // CPU efficiency core 4
+            count += detectTemp(conn, "Tp01", result); // CPU performance core 1
+            count += detectTemp(conn, "Tp05", result); // CPU performance core 2
+            count += detectTemp(conn, "Tp09", result); // CPU performance core 3
+            count += detectTemp(conn, "Tp0D", result); // CPU performance core 4
+            count += detectTemp(conn, "Tp0V", result); // CPU performance core 5
+            count += detectTemp(conn, "Tp0Y", result); // CPU performance core 6
+            count += detectTemp(conn, "Tp0b", result); // CPU performance core 7
+            count += detectTemp(conn, "Tp0e", result); // CPU performance core 8
+            break;
+
+        case FF_TEMP_GPU_INTEL:
+            count += detectTemp(conn, "TCGC", result); // GPU Intel Graphics
+            goto gpu_unknown;
+
+        case FF_TEMP_GPU_AMD:
+            count += detectTemp(conn, "TGDD", result); // GPU AMD Radeon
+            goto gpu_unknown;
+
+        case FF_TEMP_GPU_UNKNOWN: // Nvidia?
+        gpu_unknown:
+            count += detectTemp(conn, "TG0D", result); // GPU diode
+            count += detectTemp(conn, "TG0P", result); // GPU proximity
+            break;
+
+        case FF_TEMP_GPU_M1X:
+            count += detectTemp(conn, "Tg05", result); // GPU 1
+            count += detectTemp(conn, "Tg0D", result); // GPU 2
+            count += detectTemp(conn, "Tg0L", result); // GPU 3
+            count += detectTemp(conn, "Tg0T", result); // GPU 4
+            break;
+
+        case FF_TEMP_GPU_M2X:
+            count += detectTemp(conn, "Tg0f", result); // GPU 1
+            count += detectTemp(conn, "Tg0j", result); // GPU 2
+            break;
+
+        case FF_TEMP_GPU_M3X:
+            count += detectTemp(conn, "Tf14", result); // GPU 1
+            count += detectTemp(conn, "Tf18", result); // GPU 2
+            count += detectTemp(conn, "Tf19", result); // GPU 3
+            count += detectTemp(conn, "Tf1A", result); // GPU 4
+            count += detectTemp(conn, "Tf24", result); // GPU 5
+            count += detectTemp(conn, "Tf28", result); // GPU 6
+            count += detectTemp(conn, "Tf29", result); // GPU 7
+            count += detectTemp(conn, "Tf2A", result); // GPU 8
+            break;
+
+        case FF_TEMP_GPU_M4X:
+            count += detectTemp(conn, "Tg0G", result); // GPU 1 (Basic)
+            count += detectTemp(conn, "Tg0H", result); // GPU 2 (Basic)
+            count += detectTemp(conn, "Tg1U", result); // GPU 1 (Pro / Max)
+            count += detectTemp(conn, "Tg1k", result); // GPU 2 (Pro / Max)
+            count += detectTemp(conn, "Tg0K", result); // GPU 3
+            count += detectTemp(conn, "Tg0L", result); // GPU 4
+            count += detectTemp(conn, "Tg0d", result); // GPU 5
+            count += detectTemp(conn, "Tg0e", result); // GPU 6
+            count += detectTemp(conn, "Tg0j", result); // GPU 7
+            count += detectTemp(conn, "Tg0k", result); // GPU 8
+            break;
+
+        case FF_TEMP_BATTERY:
+            count += detectTemp(conn, "TB1T", result); // Battery
+            count += detectTemp(conn, "TB2T", result); // Battery
+            break;
+
+        case FF_TEMP_MEMORY:
+            count += detectTemp(conn, "Tm02", result); // Memory 1
+            count += detectTemp(conn, "Tm06", result); // Memory 2
+            count += detectTemp(conn, "Tm08", result); // Memory 3
+            count += detectTemp(conn, "Tm09", result); // Memory 4
+            break;
+    }
+
+    if (count == 0) {
+        return "No temperatures detected";
+    }
+
+    *result /= count;
+
+    return NULL;
+}
@@ -2,15 +2,13 @@

 #include "fastfetch.h"

-typedef struct FFTempValue
-{
+typedef struct FFTempValue {
    FFstrbuf name;
    FFstrbuf deviceClass;
    double value;
 } FFTempValue;

-enum FFTempType
-{
+enum FFTempType {
    FF_TEMP_CPU_X64,
    FF_TEMP_CPU_M1X,
    FF_TEMP_CPU_M2X,
@@ -30,4 +28,5 @@ enum FFTempType
    FF_TEMP_MEMORY,
 };

+const char* ffDetectSmcSpecificTemp(const char* sensor, double* result);
 const char* ffDetectSmcTemps(enum FFTempType type, double* result);
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "fastfetch.h"
+
+bool ffGetAppNameAndVersion(const char* exePath, FFstrbuf* retName, FFstrbuf* retVersion);
@@ -0,0 +1,43 @@
+#include "common/apple/version.h"
+#include "common/strutil.h"
+
+#import <Foundation/Foundation.h>
+
+#define APP_CONTENTS_MACOS ".app/Contents/MacOS"
+
+bool ffGetAppNameAndVersion(const char* exePath, FFstrbuf* retName, FFstrbuf* retVersion) {
+    char* lastSlash = strrchr(exePath, '/');
+    if (!lastSlash) {
+        return false;
+    }
+    if ((size_t) (lastSlash - exePath) > strlen("X" APP_CONTENTS_MACOS) && memcmp(lastSlash - strlen(APP_CONTENTS_MACOS), APP_CONTENTS_MACOS, strlen(APP_CONTENTS_MACOS)) != 0) {
+        return false;
+    }
+
+    lastSlash -= strlen("MacOS");
+    char infoPlistPath[PATH_MAX];
+    memcpy(infoPlistPath, exePath, lastSlash - exePath);
+    memcpy(infoPlistPath + (lastSlash - exePath), "Info.plist", sizeof("Info.plist")); // X.app/Contents/Info.plist
+    NSError* error;
+    NSDictionary* dict = [NSDictionary dictionaryWithContentsOfURL:[NSURL fileURLWithPath:@(infoPlistPath)]
+                                                             error:&error];
+    if (!dict) {
+        return false;
+    }
+
+    if (retName) {
+        NSString* bundleName = dict[@"CFBundleDisplayName"] ?: dict[@"CFBundleName"];
+        if (bundleName) {
+            ffStrbufSetS(retName, bundleName.UTF8String);
+        }
+    }
+
+    if (retVersion) {
+        NSString* bundleVersion = dict[@"CFBundleShortVersionString"];
+        if (bundleVersion) {
+            ffStrbufSetS(retVersion, bundleVersion.UTF8String);
+        }
+    }
+
+    return true;
+}
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "common/FFstrbuf.h"
+
+// For ffRegReadValue(s)
+// If length is 0, data will be allocated with malloc() and must be freed by the caller
+// Otherwise, data must point to a buffer of at least length bytes, and the actual length of the data will be written to length.
+typedef struct FFArgBuffer {
+    void* data;
+    uint32_t length;
+} FFArgBuffer;
+
+typedef enum FF_A_PACKED FFArgType {
+    FF_ARG_TYPE_NULL = 0,
+    FF_ARG_TYPE_UINT,
+    FF_ARG_TYPE_UINT64,
+    FF_ARG_TYPE_UINT16,
+    FF_ARG_TYPE_UINT8,
+    FF_ARG_TYPE_INT,
+    FF_ARG_TYPE_STRING,
+    FF_ARG_TYPE_STRBUF,
+    FF_ARG_TYPE_FLOAT,
+    FF_ARG_TYPE_DOUBLE,
+    FF_ARG_TYPE_LIST,
+    FF_ARG_TYPE_BOOL,
+    FF_ARG_TYPE_BUFFER,
+} FFArgType;
+
+#define FF_ARG(variable, var_name) { _Generic((variable),                                   \
+        uint32_t: FF_ARG_TYPE_UINT,                                                         \
+        uint64_t: FF_ARG_TYPE_UINT64,                                                       \
+        uint16_t: FF_ARG_TYPE_UINT16,                                                       \
+        uint8_t: FF_ARG_TYPE_UINT8,                                                         \
+        int32_t: FF_ARG_TYPE_INT,                                                           \
+        char*: FF_ARG_TYPE_STRING,                                                          \
+        const char*: FF_ARG_TYPE_STRING,                                                    \
+        FFstrbuf: FF_ARG_TYPE_STRBUF,                                                       \
+        float: FF_ARG_TYPE_FLOAT,                                                           \
+        double: FF_ARG_TYPE_DOUBLE,                                                         \
+        FFlist: FF_ARG_TYPE_LIST,                                                           \
+        bool: FF_ARG_TYPE_BOOL,                                                             \
+        FFArgBuffer: FF_ARG_TYPE_BUFFER),                                                   \
+    _Generic((variable), char*: (variable), const char*: (variable), default: &(variable)), \
+    (var_name) }
@@ -3,7 +3,9 @@
 #include <assert.h>

 #ifdef __has_builtin
-    #if __has_builtin(__is_array)
+    #if !__cplusplus && FF_SUPPORTS_COUNT_OF
+        #define ARRAY_SIZE(x) _Countof(x)
+    #elif __has_builtin(__is_array)
        #define ARRAY_SIZE(x) ({ static_assert(__is_array(__typeof__(x)), "Must be an array"); (uint32_t) (sizeof(x) / sizeof(*(x))); })
    #elif __has_builtin(__builtin_types_compatible_p)
        #define ARRAY_SIZE(x) ({ static_assert(!__builtin_types_compatible_p(__typeof__(x), __typeof__(&*(x))), "Must not be a pointer"); (uint32_t) (sizeof(x) / sizeof(*(x))); })
@@ -0,0 +1,19 @@
+#pragma once
+
+#ifndef __has_attribute
+    #error Unsupported compiler
+    #define __attribute__(x)
+#endif
+
+#define FF_A_FALLTHROUGH __attribute__((__fallthrough__))
+#define FF_A_DEPRECATED __attribute__((__deprecated__))
+#define FF_A_CLEANUP(func) __attribute__((__cleanup__(func)))
+#define FF_A_NODISCARD __attribute__((__warn_unused_result__))
+#define FF_A_PRINTF(formatStrIndex, argsStartIndex) __attribute__((__format__(printf, formatStrIndex, argsStartIndex)))
+#define FF_A_SCANF(formatStrIndex, argsStartIndex) __attribute__((__format__(scanf, formatStrIndex, argsStartIndex)))
+#define FF_A_NONNULL(argIndex, ...) __attribute__((__nonnull__(argIndex, ##__VA_ARGS__)))
+#define FF_A_RETURNS_NONNULL __attribute__((__returns_nonnull__))
+#define FF_A_UNUSED __attribute__((__unused__))
+#define FF_A_PACKED __attribute__((__packed__))
+#define FF_A_WEAK_IMPORT __attribute__((__weak_import__))
+#define FF_A_ALWAYS_INLINE __attribute__((__always_inline__))
@@ -2,9 +2,8 @@

 #include "fastfetch.h"

-void ffBase64EncodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output);
-static inline FFstrbuf ffBase64EncodeStrbuf(const FFstrbuf* in)
-{
+void ffBase64EncodeRaw(uint32_t size, const char* str, uint32_t* out_size, char* output);
+static inline FFstrbuf ffBase64EncodeStrbuf(const FFstrbuf* in) {
    FFstrbuf out = ffStrbufCreateA(10 + in->length * 4 / 3);
    ffBase64EncodeRaw(in->length, in->chars, &out.length, out.chars);
    assert(out.length < out.allocated);
@@ -12,9 +11,8 @@ static inline FFstrbuf ffBase64EncodeStrbuf(const FFstrbuf* in)
    return out;
 }

-bool ffBase64DecodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output);
-static inline FFstrbuf ffBase64DecodeStrbuf(const FFstrbuf* in)
-{
+bool ffBase64DecodeRaw(uint32_t size, const char* str, uint32_t* out_size, char* output);
+static inline FFstrbuf ffBase64DecodeStrbuf(const FFstrbuf* in) {
    FFstrbuf out = ffStrbufCreateA(10 + in->length * 3 / 4);
    ffBase64DecodeRaw(in->length, in->chars, &out.length, out.chars);
    assert(out.length < out.allocated);
@@ -1,232 +0,0 @@
-#include "commandoption.h"
-#include "common/color.h"
-#include "common/printing.h"
-#include "common/time.h"
-#include "common/jsonconfig.h"
-#include "fastfetch_datatext.h"
-#include "modules/modules.h"
-#include "util/stringUtils.h"
-
-#include <ctype.h>
-#include <inttypes.h>
-
-bool ffParseModuleOptions(const char* key, const char* value)
-{
-    if (!ffStrStartsWith(key, "--") || !ffCharIsEnglishAlphabet(key[2])) return false;
-    if (value && !*value) value = NULL;
-    for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(key[2]) - 'A']; *modules; ++modules)
-    {
-        FFModuleBaseInfo* baseInfo = *modules;
-        const char* subKey = ffOptionTestPrefix(key, baseInfo->name);
-        if (subKey != NULL)
-        {
-            if (subKey[0] == '\0' || subKey[0] == '-') // Key is exactly the module name or has a leading '-'
-            {
-                fprintf(stderr, "Error: unknown module key %s\n", key);
-                exit(477);
-            }
-
-            FF_STRBUF_AUTO_DESTROY moduleName = ffStrbufCreateS(baseInfo->name);
-            ffStrbufLowerCase(&moduleName);
-
-            FF_STRBUF_AUTO_DESTROY jsonKey = ffStrbufCreate();
-            bool flag = false;
-            for (const char* p = subKey; *p; ++p)
-            {
-                if (*p == '-')
-                {
-                    if (flag)
-                    {
-                        fprintf(stderr, "Error: invalid double `-` in module key %s\n", key);
-                        exit(477);
-                    }
-                    flag = true;
-                }
-                else
-                {
-                    if (!isalpha((unsigned char)*p) && !isdigit((unsigned char)*p))
-                    {
-                        fprintf(stderr, "Error: invalid character `%c` in module key %s\n", *p, key);
-                        exit(477);
-                    }
-
-                    if (flag)
-                    {
-                        flag = false;
-                        ffStrbufAppendC(&jsonKey, (char) toupper((unsigned char) *p));
-                    }
-                    else
-                        ffStrbufAppendC(&jsonKey, *p);
-                }
-            }
-            fprintf(stderr, "Error: Unsupported module option: %s\n", key);
-            fputs("       Support of module options has been removed. Please add the flag to the JSON config instead.\n", stderr);
-            fprintf(stderr, "       Example (demonstration only): `{ \"modules\": [ { \"type\": \"%s\", \"%s\": %s%s%s } ] }`\n", moduleName.chars, jsonKey.chars, value ? "\"" : "", value ? value : "true", value ? "\"" : "");
-            fputs("       See <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration> for more information.\n", stderr);
-            exit(477);
-        }
-    }
-    return false;
-}
-
-void ffPrepareCommandOption(FFdata* data)
-{
-    if(ffStrbufSeparatedContainIgnCaseS(&data->structure, FF_CPUUSAGE_MODULE_NAME, ':'))
-        ffPrepareCPUUsage();
-
-    if(ffStrbufSeparatedContainIgnCaseS(&data->structure, FF_DISKIO_MODULE_NAME, ':'))
-    {
-        __attribute__((__cleanup__(ffDestroyDiskIOOptions))) FFDiskIOOptions options;
-        ffInitDiskIOOptions(&options);
-        ffPrepareDiskIO(&options);
-    }
-
-    if(ffStrbufSeparatedContainIgnCaseS(&data->structure, FF_NETIO_MODULE_NAME, ':'))
-    {
-        __attribute__((__cleanup__(ffDestroyNetIOOptions))) FFNetIOOptions options;
-        ffInitNetIOOptions(&options);
-        ffPrepareNetIO(&options);
-    }
-
-    if(ffStrbufSeparatedContainIgnCaseS(&data->structure, FF_PUBLICIP_MODULE_NAME, ':'))
-    {
-        __attribute__((__cleanup__(ffDestroyPublicIpOptions))) FFPublicIPOptions options;
-        ffInitPublicIpOptions(&options);
-        ffPreparePublicIp(&options);
-    }
-
-    if(ffStrbufSeparatedContainIgnCaseS(&data->structure, FF_WEATHER_MODULE_NAME, ':'))
-    {
-        __attribute__((__cleanup__(ffDestroyWeatherOptions))) FFWeatherOptions options;
-        ffInitWeatherOptions(&options);
-        ffPrepareWeather(&options);
-    }
-}
-
-static void genJsonConfig(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_doc* doc)
-{
-    yyjson_mut_val* modules = yyjson_mut_obj_get(doc->root, "modules");
-    if (!modules)
-        modules = yyjson_mut_obj_add_arr(doc, doc->root, "modules");
-
-    FF_STRBUF_AUTO_DESTROY type = ffStrbufCreateS(baseInfo->name);
-    ffStrbufLowerCase(&type);
-
-    if (instance.state.fullConfig)
-    {
-        yyjson_mut_val* module = yyjson_mut_obj(doc);
-        yyjson_mut_obj_add_strbuf(doc, module, "type", &type);
-
-        if (baseInfo->generateJsonConfig)
-            baseInfo->generateJsonConfig(options, doc, module);
-
-        if (yyjson_mut_obj_size(module) > 1)
-            yyjson_mut_arr_add_val(modules, module);
-        else
-            yyjson_mut_arr_add_strbuf(doc, modules, &type);
-    }
-    else
-    {
-        yyjson_mut_arr_add_strbuf(doc, modules, &type);
-    }
-}
-
-static void genJsonResult(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_doc* doc)
-{
-    yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root);
-    yyjson_mut_obj_add_str(doc, module, "type", baseInfo->name);
-    if (baseInfo->generateJsonResult)
-        baseInfo->generateJsonResult(options, doc, module);
-    else
-        yyjson_mut_obj_add_str(doc, module, "error", "Unsupported for JSON format");
-}
-
-static void parseStructureCommand(
-    const char* line,
-    void (*fn)(FFModuleBaseInfo* baseInfo, void* options, yyjson_mut_doc* jsonDoc),
-    yyjson_mut_doc* jsonDoc
-)
-{
-    if(ffCharIsEnglishAlphabet(line[0]))
-    {
-        for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(line[0]) - 'A']; *modules; ++modules)
-        {
-            FFModuleBaseInfo* baseInfo = *modules;
-            if (ffStrEqualsIgnCase(line, baseInfo->name))
-            {
-                uint8_t optionBuf[FF_OPTION_MAX_SIZE];
-                baseInfo->initOptions(optionBuf);
-                if (__builtin_expect(jsonDoc != NULL, false))
-                    fn(baseInfo, optionBuf, jsonDoc);
-                else
-                    baseInfo->printModule(optionBuf);
-                baseInfo->destroyOptions(optionBuf);
-                return;
-            }
-        }
-    }
-
-    ffPrintError(line, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "<no implementation provided>");
-}
-
-void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc)
-{
-    //Parse the structure and call the modules
-    int32_t thres = instance.config.display.stat;
-    uint32_t startIndex = 0;
-    while (startIndex < data->structure.length)
-    {
-        uint32_t colonIndex = ffStrbufNextIndexC(&data->structure, startIndex, ':');
-        data->structure.chars[colonIndex] = '\0';
-
-        double ms = 0;
-        if(thres >= 0)
-            ms = ffTimeGetTick();
-
-        parseStructureCommand(data->structure.chars + startIndex, genJsonResult, jsonDoc);
-
-        if(thres >= 0)
-        {
-            ms = ffTimeGetTick() - ms;
-
-            if (jsonDoc)
-            {
-                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
-            }
-            else
-            {
-                char str[64];
-                int len = snprintf(str, sizeof str, "%.3fms", ms);
-                if (thres > 0)
-                    snprintf(str, sizeof str, "\e[%sm%.3fms\e[m", (ms <= thres ? FF_COLOR_FG_GREEN : ms <= 2 * thres ? FF_COLOR_FG_YELLOW : FF_COLOR_FG_RED), ms);
-                printf("\e7\e[1A\e[9999999C\e[%dD%s\e8", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
-            }
-        }
-
-        #if defined(_WIN32)
-            if (!jsonDoc && !instance.config.display.noBuffer) fflush(stdout);
-        #endif
-
-        startIndex = colonIndex + 1;
-    }
-}
-
-void ffMigrateCommandOptionToJsonc(FFdata* data, yyjson_mut_doc* jsonDoc)
-{
-    //If we don't have a custom structure, use the default one
-    if(data->structure.length == 0)
-        ffStrbufAppendS(&data->structure, FASTFETCH_DATATEXT_STRUCTURE); // Cannot use `ffStrbufSetStatic` here because we will modify the string
-
-    //Parse the structure and call the modules
-    uint32_t startIndex = 0;
-    while (startIndex < data->structure.length)
-    {
-        uint32_t colonIndex = ffStrbufNextIndexC(&data->structure, startIndex, ':');
-        data->structure.chars[colonIndex] = '\0';
-
-        parseStructureCommand(data->structure.chars + startIndex, genJsonConfig, jsonDoc);
-
-        startIndex = colonIndex + 1;
-    }
-}
@@ -1,15 +1,8 @@
 #pragma once

-#include "fastfetch.h"
-
-// Things only needed by fastfetch
-typedef struct FFdata
-{
-    FFstrbuf structure;
-    bool configLoaded;
-} FFdata;
+#include "common/ffdata.h"

 void ffPrepareCommandOption(FFdata* data);
-void ffPrintCommandOption(FFdata* data, yyjson_mut_doc* jsonDoc);
-void ffMigrateCommandOptionToJsonc(FFdata* data, yyjson_mut_doc* jsonDoc);
+void ffPrintCommandOption(FFdata* data);
+void ffMigrateCommandOptionToJsonc(FFdata* data);
 bool ffParseModuleOptions(const char* key, const char* value);
@@ -1,13 +1,12 @@
 #pragma once

 #ifdef FF_HAVE_DBUS
-#include <dbus/dbus.h>
+    #include <dbus/dbus.h>

-#include "util/FFstrbuf.h"
-#include "common/library.h"
+    #include "common/FFstrbuf.h"
+    #include "common/library.h"

-typedef struct FFDBusLibrary
-{
+typedef struct FFDBusLibrary {
    FF_LIBRARY_SYMBOL(dbus_bus_get)
    FF_LIBRARY_SYMBOL(dbus_message_new_method_call)
    FF_LIBRARY_SYMBOL(dbus_message_append_args)
@@ -19,27 +18,29 @@ typedef struct FFDBusLibrary
    FF_LIBRARY_SYMBOL(dbus_message_iter_next)
    FF_LIBRARY_SYMBOL(dbus_message_unref)
    FF_LIBRARY_SYMBOL(dbus_connection_send_with_reply_and_block)
+    FF_LIBRARY_SYMBOL(dbus_connection_unref)
 } FFDBusLibrary;

-typedef struct FFDBusData
-{
+typedef struct FFDBusData {
    const FFDBusLibrary* lib;
    DBusConnection* connection;
 } FFDBusData;

-const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data); //Returns an error message or NULL on success
+const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data); // Returns an error message or NULL on success
 bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result);
 bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result);
-bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint32_t* result);
+bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint64_t* result);
 DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg1, const char* arg2);
 DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property);
 bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result);
-bool ffDBusGetInt(FFDBusData* dbus, DBusMessageIter* iter, int32_t* result);
-bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result);
+bool ffDBusGetInt(FFDBusData* dbus, DBusMessageIter* iter, int64_t* result);
+bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint64_t* result);
+void ffDBusDestroyData(FFDBusData* data);

-static inline DBusMessage* ffDBusGetAllProperties(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface)
-{
+static inline DBusMessage* ffDBusGetAllProperties(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface) {
    return ffDBusGetMethodReply(dbus, busName, objectPath, "org.freedesktop.DBus.Properties", "GetAll", interface, NULL);
 }

+    #define FF_DBUS_AUTO_DESTROY_DATA FF_A_CLEANUP(ffDBusDestroyData)
+
 #endif // FF_HAVE_DBUS
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "fastfetch.h"
+#include "common/time.h"
+
+static inline const char* ffFindFileName(const char* file) {
+    const char* lastSlash = __builtin_strrchr(file, '/');
+#ifdef _WIN32
+    if (lastSlash == NULL) {
+        lastSlash = __builtin_strrchr(file, '\\');
+    }
+#endif
+    if (lastSlash != NULL) {
+        return lastSlash + 1;
+    }
+    return file;
+}
+
+#ifndef NDEBUG
+    #define FF_DEBUG_PRINT(file_, line_, format_, ...)                                                                                      \
+        do {                                                                                                                                \
+            if (instance.config.display.debugMode)                                                                                          \
+                fprintf(stderr, "[%s%4d, %s] " format_ "\n", ffFindFileName(file_), line_, ffTimeToTimeStr(ffTimeGetNow()), ##__VA_ARGS__); \
+        } while (0)
+#else
+    #define FF_DEBUG_PRINT(file_, line_, format_, ...) \
+        do {                                           \
+        } while (0)
+#endif
+
+#define FF_DEBUG(format, ...) FF_DEBUG_PRINT(__FILE__, __LINE__, format, ##__VA_ARGS__)
+
+#if _WIN32
+const char* ffDebugWin32Error(DWORD errorCode);
+const char* ffDebugNtStatus(NTSTATUS status);
+const char* ffDebugHResult(HRESULT hr);
+#endif
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "fastfetch.h"

 void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result);
@@ -1,7 +1,7 @@
 #pragma once

 #include <stdint.h>
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"

 void ffEdidGetVendorAndModel(const uint8_t edid[128], FFstrbuf* result);
 bool ffEdidGetName(const uint8_t edid[128], FFstrbuf* name);
@@ -10,3 +10,4 @@ void ffEdidGetPhysicalResolution(const uint8_t edid[128], uint32_t* width, uint3
 void ffEdidGetPhysicalSize(const uint8_t edid[128], uint32_t* width, uint32_t* height); // in mm
 void ffEdidGetSerialAndManufactureDate(const uint8_t edid[128], uint32_t* serial, uint16_t* year, uint16_t* week);
 bool ffEdidGetHdrCompatible(const uint8_t* edid, uint32_t length);
+bool ffEdidIsValid(const uint8_t edid[128], uint32_t length);
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "common/FFstrbuf.h"
+
+typedef enum FF_A_PACKED FFDataResultDocType {
+    FF_RESULT_DOC_TYPE_DEFAULT = 0,
+    FF_RESULT_DOC_TYPE_JSON,
+    FF_RESULT_DOC_TYPE_CONFIG,
+    FF_RESULT_DOC_TYPE_CONFIG_FULL,
+} FFDataResultDocType;
+
+// FFdata aggregates configuration, generation parameters, and output state used by fastfetch.
+// It holds the parsed configuration document, a mutable JSON document for results, and related metadata.
+typedef struct FFdata {
+    yyjson_doc* configDoc;       // Parsed JSON configuration document
+    yyjson_mut_doc* resultDoc;   // Mutable JSON document for storing results
+    FFstrbuf structure;          // Custom output structure from command line
+    FFstrbuf structureDisabled;  // Disabled modules in the output structure from command line
+    FFstrbuf genConfigPath;      // Path to generate configuration file
+    FFDataResultDocType docType; // Type of result document
+    bool configLoaded;
+} FFdata;
@@ -1,221 +0,0 @@
-#include "fastfetch.h"
-#include "common/font.h"
-
-#include <string.h>
-#include <ctype.h>
-
-void ffFontInit(FFfont* font)
-{
-    // Ensure no memory allocates
-    ffStrbufInit(&font->pretty);
-    ffStrbufInit(&font->name);
-    ffStrbufInit(&font->size);
-    ffListInit(&font->styles, sizeof(FFstrbuf));
-}
-
-static void strbufAppendNSExcludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude)
-{
-    if(value == NULL || length == 0)
-        return;
-
-    ffStrbufEnsureFree(strbuf, length);
-
-    for(uint32_t i = 0; i < length; i++)
-    {
-        if(value[i] != exclude)
-        strbuf->chars[strbuf->length++] = value[i];
-    }
-
-    strbuf->chars[strbuf->length] = '\0';
-}
-
-static void fontInitPretty(FFfont* font)
-{
-    ffStrbufAppend(&font->pretty, &font->name);
-
-    if(font->size.length == 0 && font->styles.length == 0)
-        return;
-    else if(font->pretty.length == 0)
-        ffStrbufAppendS(&font->pretty, "default");
-
-    ffStrbufAppendS(&font->pretty, " (");
-
-    if(font->size.length > 0)
-    {
-        ffStrbufAppend(&font->pretty, &font->size);
-        ffStrbufAppendS(&font->pretty, "pt");
-
-        if(font->styles.length > 0)
-            ffStrbufAppendS(&font->pretty, ", ");
-    }
-
-    for(uint32_t i = 0; i < font->styles.length; i++)
-    {
-        ffStrbufAppend(&font->pretty, FF_LIST_GET(FFstrbuf, font->styles, i));
-
-        if(i < font->styles.length - 1)
-            ffStrbufAppendS(&font->pretty, ", ");
-    }
-
-    ffStrbufAppendC(&font->pretty, ')');
-}
-
-void ffFontInitQt(FFfont* font, const char* data)
-{
-    ffFontInit(font);
-
-    //See https://doc.qt.io/qt-5/qfont.html#toString
-
-    //Family
-    data = ffStrbufAppendSUntilC(&font->name, 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))
-    {
-        do
-        {
-            FFstrbuf* style = (FFstrbuf*) ffListAdd(&font->styles);
-            ffStrbufInit(style);
-            data = ffStrbufAppendSUntilC(style, data, ' ');
-            if (data) data++;
-        } while (data);
-    }
-
-exit:
-    fontInitPretty(font);
-}
-
-static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* alternativeBuffer)
-{
-    while(**data == ' ' || **data == '\t' || **data == ',')
-        ++(*data);
-
-    const char* wordStart = *data;
-
-    while(**data != ' ' && **data != '\t' && **data != ',' && **data != '\0' && **data != '`' && **data != '\\')
-        ++(*data);
-
-    uint32_t wordLength = (uint32_t) (*data - wordStart);
-    if(wordLength == 0)
-        return;
-
-    if(**data == '\0' || **data == '`' || **data == '\\')
-    {
-        ffStrbufAppendNS(&font->size, wordLength, wordStart);
-        if(ffStrbufEndsWithS(&font->size, "px"))
-            ffStrbufSubstrBefore(&font->size, font->size.length - 2);
-
-        double dummy;
-        if(sscanf(font->size.chars, "%lf", &dummy) == 1)
-            return;
-
-        ffStrbufClear(&font->size);
-    }
-
-    if(
-        strncasecmp(wordStart, "Ultra", 5) == 0 ||
-        strncasecmp(wordStart, "Extra", 5) == 0 ||
-        strncasecmp(wordStart, "Semi", 4) == 0 ||
-        strncasecmp(wordStart, "Demi", 4) == 0 ||
-        strncasecmp(wordStart, "Normal", wordLength) == 0 ||
-        strncasecmp(wordStart, "Roman", wordLength) == 0 ||
-        strncasecmp(wordStart, "Oblique", wordLength) == 0 ||
-        strncasecmp(wordStart, "Italic", wordLength) == 0 ||
-        strncasecmp(wordStart, "Thin", wordLength) == 0 ||
-        strncasecmp(wordStart, "Light", wordLength) == 0 ||
-        strncasecmp(wordStart, "Bold", wordLength) == 0 ||
-        strncasecmp(wordStart, "Black", wordLength) == 0 ||
-        strncasecmp(wordStart, "Condensed", wordLength) == 0 ||
-        strncasecmp(wordStart, "Expanded", wordLength) == 0
-    ) {
-        if(alternativeBuffer == NULL)
-        {
-            alternativeBuffer = (FFstrbuf*) ffListAdd(&font->styles);
-            ffStrbufInit(alternativeBuffer);
-        }
-
-        strbufAppendNSExcludingC(alternativeBuffer, wordLength, wordStart, '-');
-
-        if(
-            strncasecmp(wordStart, "Ultra ", 6) == 0 ||
-            strncasecmp(wordStart, "Extra ", 6) == 0 ||
-            strncasecmp(wordStart, "Semi ", 5) == 0 ||
-            strncasecmp(wordStart, "Demi ", 5) == 0
-        ) {
-            fontPangoParseWord(data, font, alternativeBuffer);
-        }
-
-        return;
-    }
-
-    if(alternativeBuffer != NULL)
-    {
-        strbufAppendNSExcludingC(alternativeBuffer, wordLength, wordStart, '-');
-        return;
-    }
-
-    if(font->name.length > 0)
-        ffStrbufAppendC(&font->name, ' ');
-    ffStrbufAppendNS(&font->name, wordLength, wordStart);
-}
-
-void ffFontInitPango(FFfont* font, const char* data)
-{
-    ffFontInit(font);
-
-    while(*data != '\0' && *data != '`' && *data != '\\')
-        fontPangoParseWord(&data, font, NULL);
-
-    fontInitPretty(font);
-}
-
-void ffFontInitValues(FFfont* font, const char* name, const char* size)
-{
-    ffFontInit(font);
-
-    ffStrbufAppendS(&font->name, name);
-    ffStrbufTrim(&font->name, '"');
-    ffStrbufAppendS(&font->size, size);
-
-    fontInitPretty(font);
-}
-
-void ffFontInitWithSpace(FFfont* font, const char* rawName)
-{
-    const char* pspace = strrchr(rawName, ' ');
-    if(pspace == NULL)
-    {
-        ffFontInitCopy(font, rawName);
-        return;
-    }
-
-    ffFontInit(font);
-
-    ffStrbufAppendNS(&font->name, (uint32_t)(pspace - rawName), rawName);
-    ffStrbufAppendS(&font->size, pspace + 1);
-
-    fontInitPretty(font);
-}
-
-void ffFontDestroy(FFfont* font)
-{
-    ffStrbufDestroy(&font->pretty);
-    ffStrbufDestroy(&font->name);
-    ffStrbufDestroy(&font->size);
-
-    FF_LIST_FOR_EACH(FFstrbuf, str, font->styles)
-        ffStrbufDestroy(str);
-    ffListDestroy(&font->styles);
-}
@@ -1,10 +1,9 @@
 #pragma once

-#include "util/FFstrbuf.h"
-#include "util/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/FFlist.h"

-typedef struct FFfont
-{
+typedef struct FFfont {
    FFstrbuf pretty;
    FFstrbuf name;
    FFstrbuf size;
@@ -15,10 +14,12 @@ void ffFontInit(FFfont* font);
 void ffFontInitQt(FFfont* font, const char* data);
 void ffFontInitPango(FFfont* font, const char* data);
 void ffFontInitValues(FFfont* font, const char* name, const char* size);
+void ffFontInitXlfd(FFfont* font, const char* xlfd);
+void ffFontInitXft(FFfont* font, const char* xft);
+void ffFontInitMoveValues(FFfont* font, FFstrbuf* name, FFstrbuf* size, FFstrbuf* style);
 void ffFontInitWithSpace(FFfont* font, const char* rawName);
 void ffFontDestroy(FFfont* font);

-static inline void ffFontInitCopy(FFfont* font, const char* name)
-{
+static inline void ffFontInitCopy(FFfont* font, const char* name) {
    ffFontInitValues(font, name, NULL);
 }
@@ -1,413 +0,0 @@
-#include "fastfetch.h"
-#include "common/format.h"
-#include "common/parsing.h"
-#include "util/textModifier.h"
-#include "util/stringUtils.h"
-
-#include <inttypes.h>
-
-void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
-{
-    switch(formatarg->type)
-    {
-        case FF_FORMAT_ARG_TYPE_INT:
-            ffStrbufAppendSInt(buffer, *(int32_t*)formatarg->value);
-            break;
-        case FF_FORMAT_ARG_TYPE_UINT:
-            ffStrbufAppendUInt(buffer, *(uint32_t*)formatarg->value);
-            break;
-        case FF_FORMAT_ARG_TYPE_UINT64:
-            ffStrbufAppendUInt(buffer, *(uint64_t*)formatarg->value);
-            break;
-        case FF_FORMAT_ARG_TYPE_UINT16:
-            ffStrbufAppendUInt(buffer, *(uint16_t*)formatarg->value);
-            break;
-        case FF_FORMAT_ARG_TYPE_UINT8:
-            ffStrbufAppendUInt(buffer, *(uint8_t*)formatarg->value);
-            break;
-        case FF_FORMAT_ARG_TYPE_STRING:
-            ffStrbufAppendS(buffer, (const char*)formatarg->value);
-            break;
-        case FF_FORMAT_ARG_TYPE_STRBUF:
-            ffStrbufAppend(buffer, (const FFstrbuf*)formatarg->value);
-            break;
-        case FF_FORMAT_ARG_TYPE_FLOAT:
-            ffStrbufAppendDouble(buffer, *(float*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER);
-            break;
-        case FF_FORMAT_ARG_TYPE_DOUBLE:
-            ffStrbufAppendDouble(buffer, *(double*)formatarg->value, instance.config.display.fractionNdigits, instance.config.display.fractionTrailingZeros != FF_FRACTION_TRAILING_ZEROS_TYPE_NEVER);
-            break;
-        case FF_FORMAT_ARG_TYPE_BOOL:
-            ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false");
-            break;
-        case FF_FORMAT_ARG_TYPE_LIST:
-        {
-            const FFlist* list = (const FFlist*) formatarg->value;
-            for(uint32_t i = 0; i < list->length; i++)
-            {
-                ffStrbufAppend(buffer, FF_LIST_GET(FFstrbuf, *list, i));
-                if(i < list->length - 1)
-                    ffStrbufAppendS(buffer, ", ");
-            }
-            break;
-        }
-        default:
-            if(formatarg->type != FF_FORMAT_ARG_TYPE_NULL)
-                fprintf(stderr, "Error: format string \"%s\": argument is not implemented: %i\n", buffer->chars, formatarg->type);
-            break;
-    }
-}
-
-/**
- * @brief parses a string to a uint32_t
- *
- * If the string can't be parsed, or is < 1, uint32_t max is returned.
- *
- * @param placeholderValue the string to parse
- * @return uint32_t the parsed value
- */
-static uint32_t getArgumentIndex(const char* placeholderValue, uint32_t numArgs, const FFformatarg* arguments)
-{
-    char firstChar = placeholderValue[0];
-    if (firstChar == '\0')
-        return 0; // use arg counter
-
-    if (firstChar >= '0' && firstChar <= '9')
-    {
-        char* pEnd = NULL;
-        uint32_t result = (uint32_t) strtoul(placeholderValue, &pEnd, 10);
-        if (result > numArgs)
-            return UINT32_MAX;
-        if (*pEnd != '\0')
-            return UINT32_MAX;
-        return result;
-    }
-    else if (ffCharIsEnglishAlphabet(firstChar))
-    {
-        for (uint32_t i = 0; i < numArgs; ++i)
-        {
-            const FFformatarg* arg = &arguments[i];
-            if (arg->name && strcasecmp(placeholderValue, arg->name) == 0)
-                return i + 1;
-        }
-    }
-
-    return UINT32_MAX;
-}
-
-static inline void appendInvalidPlaceholder(FFstrbuf* buffer, const char* start, const FFstrbuf* placeholderValue, uint32_t index, uint32_t formatStringLength)
-{
-    ffStrbufAppendS(buffer, start);
-    ffStrbufAppend(buffer, placeholderValue);
-
-    if(index < formatStringLength)
-        ffStrbufAppendC(buffer, '}');
-}
-
-static inline bool formatArgSet(const FFformatarg* arg)
-{
-    return arg->value != NULL && (
-        (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0.0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_FLOAT && *(float*)arg->value > 0.0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_INT && *(int*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_STRBUF && ((FFstrbuf*)arg->value)->length > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet((char*)arg->value)) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_UINT8 && *(uint8_t*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_UINT16 && *(uint16_t*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_BOOL && *(bool*)arg->value) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_LIST && ((FFlist*)arg->value)->length > 0)
-    );
-}
-
-void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments)
-{
-    uint32_t argCounter = 0;
-
-    uint32_t numOpenIfs = 0;
-    uint32_t numOpenNotIfs = 0;
-
-    FF_STRBUF_AUTO_DESTROY placeholderValue = ffStrbufCreate();
-
-    for(uint32_t i = 0; i < formatstr->length; ++i)
-    {
-        // if we don't have a placeholder start just copy the chars over to output buffer
-        if(formatstr->chars[i] != '{')
-        {
-            ffStrbufAppendC(buffer, formatstr->chars[i]);
-            continue;
-        }
-
-        // jump to next char, the start of the placeholder value
-        ++i;
-
-        // double {{ elvaluates to a single { and doesn't count as start
-        if(formatstr->chars[i] == '{')
-        {
-            ffStrbufAppendC(buffer, '{');
-            continue;
-        }
-
-        ffStrbufClear(&placeholderValue);
-
-        {
-            uint32_t iEnd = ffStrbufNextIndexC(formatstr, i, '}');
-            ffStrbufAppendNS(&placeholderValue, iEnd - i, &formatstr->chars[i]);
-            i = iEnd;
-        }
-
-        char firstChar = placeholderValue.chars[0];
-
-        if (placeholderValue.length == 1)
-        {
-            // test if for stop, if so break the loop
-            if (firstChar == '-')
-                break;
-
-            // test for end of an if, if so do nothing
-            if (firstChar == '?')
-            {
-                if(numOpenIfs == 0)
-                    appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-                else
-                    --numOpenIfs;
-
-                continue;
-            }
-
-            // test for end of a not if, if so do nothing
-            if (firstChar == '/')
-            {
-                if(numOpenNotIfs == 0)
-                    appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-                else
-                    --numOpenNotIfs;
-
-                continue;
-            }
-
-            // test for end of a color, if so do nothing
-            if (firstChar == '#')
-            {
-                if (!instance.config.display.pipe)
-                    ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
-
-                continue;
-            }
-        }
-
-        // test for if, if so evaluate it
-        if (firstChar == '?')
-        {
-            ffStrbufSubstrAfter(&placeholderValue, 0);
-
-            uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
-
-            // testing for an invalid index
-            if (index > numArgs)
-            {
-                appendInvalidPlaceholder(buffer, "{?", &placeholderValue, i, formatstr->length);
-                continue;
-            }
-
-            // continue normally if an format arg is set and the value is > 0
-            if (formatArgSet(&arguments[index - 1]))
-            {
-                ++numOpenIfs;
-                continue;
-            }
-
-            // fastforward to the end of the if without printing the in between
-            i = ffStrbufNextIndexS(formatstr, i, "{?}") + 2; // 2 is the length of "{?}" - 1 because the loop will increment it again directly after continue
-            continue;
-        }
-
-        // test for not if, if so evaluate it
-        if (firstChar == '/')
-        {
-            ffStrbufSubstrAfter(&placeholderValue, 0);
-
-            uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
-
-            // testing for an invalid index
-            if (index > numArgs)
-            {
-                appendInvalidPlaceholder(buffer, "{/", &placeholderValue, i, formatstr->length);
-                continue;
-            }
-
-            //continue normally if an format arg is not set or the value is 0
-            if (!formatArgSet(&arguments[index - 1]))
-            {
-                ++numOpenNotIfs;
-                continue;
-            }
-
-            // fastforward to the end of the if without printing the in between
-            i = ffStrbufNextIndexS(formatstr, i, "{/}") + 2; // 2 is the length of "{/}" - 1 because the loop will increment it again directly after continue
-            continue;
-        }
-
-        //test for color, if so evaluate it
-        if (firstChar == '#')
-        {
-            if (!instance.config.display.pipe)
-            {
-                ffStrbufAppendS(buffer, "\e[");
-                ffOptionParseColorNoClear(placeholderValue.chars + 1, buffer);
-                ffStrbufAppendC(buffer, 'm');
-            }
-            continue;
-        }
-
-        //test for constant or env var, if so evaluate it
-        if (firstChar == '$')
-        {
-            char* pend = NULL;
-            int32_t indexSigned = (int32_t) strtol(placeholderValue.chars + 1, &pend, 10);
-            if (pend == placeholderValue.chars + 1)
-            {
-                // treat placeholder as an environment variable
-                char* envValue = getenv(placeholderValue.chars + 1);
-                if (envValue)
-                    ffStrbufAppendS(buffer, envValue);
-                else
-                    appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-            }
-            else
-            {
-                // treat placeholder as a constant
-                uint32_t index = (uint32_t) (indexSigned < 0 ? (int32_t) instance.config.display.constants.length + indexSigned : indexSigned - 1);
-
-                if (*pend != '\0' || instance.config.display.constants.length <= index)
-                    appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-                else
-                {
-                    FFstrbuf* item = FF_LIST_GET(FFstrbuf, instance.config.display.constants, index);
-                    ffStrbufAppend(buffer, item);
-                }
-            }
-            continue;
-        }
-
-        char* pSep = placeholderValue.chars;
-        char cSep = '\0';
-        while (*pSep && *pSep != ':' && *pSep != '<' && *pSep != '>' && *pSep != '~')
-            ++pSep;
-        if (*pSep)
-        {
-            cSep = *pSep;
-            *pSep = '\0';
-        }
-        else
-        {
-            pSep = NULL;
-        }
-
-        uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
-
-        // test for invalid index
-        if (index == 0)
-            index = ++argCounter;
-
-        if (index > numArgs)
-        {
-            if (pSep) *pSep = cSep;
-            appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-            continue;
-        }
-
-        if (!cSep)
-            ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
-        else if (cSep == '~')
-        {
-            FF_STRBUF_AUTO_DESTROY tempString = ffStrbufCreate();
-            ffFormatAppendFormatArg(&tempString, &arguments[index - 1]);
-
-            char* pEnd = NULL;
-            int32_t start = (int32_t) strtol(pSep + 1, &pEnd, 10);
-            if (start < 0)
-                start = (int32_t) tempString.length + start;
-            if (start >= 0 && (uint32_t) start < tempString.length)
-            {
-                if (*pEnd == '\0')
-                    ffStrbufAppendNS(buffer, tempString.length - (uint32_t) start, &tempString.chars[start]);
-                else if (*pEnd == ',')
-                {
-                    int32_t end = (int32_t) strtol(pEnd + 1, &pEnd, 10);
-                    if (!*pEnd)
-                    {
-                        if (end < 0)
-                            end = (int32_t) tempString.length + end;
-                        if ((uint32_t) end > tempString.length)
-                            end = (int32_t) tempString.length;
-                        if (end > start)
-                            ffStrbufAppendNS(buffer, (uint32_t) (end - start), &tempString.chars[start]);
-                    }
-                }
-            }
-
-            if (*pEnd)
-            {
-                *pSep = cSep;
-                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-                continue;
-            }
-        }
-        else
-        {
-            char* pEnd = NULL;
-            int32_t truncLength = (int32_t) strtol(pSep + 1, &pEnd, 10);
-            if (*pEnd != '\0')
-            {
-                *pSep = cSep;
-                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
-                continue;
-            }
-
-            bool ellipsis = false;
-            if (truncLength < 0)
-            {
-                ellipsis = true;
-                truncLength = -truncLength;
-            }
-
-            FF_STRBUF_AUTO_DESTROY tempString = ffStrbufCreate();
-            ffFormatAppendFormatArg(&tempString, &arguments[index - 1]);
-            if (tempString.length == (uint32_t) truncLength)
-                ffStrbufAppend(buffer, &tempString);
-            else if (tempString.length > (uint32_t) truncLength)
-            {
-                if (cSep == ':')
-                {
-                    ffStrbufSubstrBefore(&tempString, (uint32_t) truncLength);
-                    ffStrbufTrimRightSpace(&tempString);
-                }
-                else
-                    ffStrbufSubstrBefore(&tempString, (uint32_t) (!ellipsis? truncLength : truncLength - 1));
-                ffStrbufAppend(buffer, &tempString);
-
-                if (ellipsis)
-                    ffStrbufAppendS(buffer, "…");
-            }
-            else if (cSep == ':')
-                ffStrbufAppend(buffer, &tempString);
-            else
-            {
-                if (cSep == '<')
-                {
-                    ffStrbufAppend(buffer, &tempString);
-                    ffStrbufAppendNC(buffer, (uint32_t) truncLength - tempString.length, ' ');
-                }
-                else
-                {
-                    ffStrbufAppendNC(buffer, (uint32_t) truncLength - tempString.length, ' ');
-                    ffStrbufAppend(buffer, &tempString);
-                }
-            }
-        }
-    }
-
-    if (!instance.config.display.pipe)
-        ffStrbufAppendS(buffer, FASTFETCH_TEXT_MODIFIER_RESET);
-}
@@ -1,46 +1,14 @@
 #pragma once

-#include "util/FFstrbuf.h"
+#include "common/argType.h"

-typedef enum __attribute__((__packed__)) FFformatArgType
-{
-    FF_FORMAT_ARG_TYPE_NULL = 0,
-    FF_FORMAT_ARG_TYPE_UINT,
-    FF_FORMAT_ARG_TYPE_UINT64,
-    FF_FORMAT_ARG_TYPE_UINT16,
-    FF_FORMAT_ARG_TYPE_UINT8,
-    FF_FORMAT_ARG_TYPE_INT,
-    FF_FORMAT_ARG_TYPE_STRING,
-    FF_FORMAT_ARG_TYPE_STRBUF,
-    FF_FORMAT_ARG_TYPE_FLOAT,
-    FF_FORMAT_ARG_TYPE_DOUBLE,
-    FF_FORMAT_ARG_TYPE_LIST,
-    FF_FORMAT_ARG_TYPE_BOOL
-} FFformatArgType;
-
-#define FF_FORMAT_ARG(variable, var_name) { _Generic((variable), \
-        uint32_t: FF_FORMAT_ARG_TYPE_UINT, \
-        uint64_t: FF_FORMAT_ARG_TYPE_UINT64, \
-        uint16_t: FF_FORMAT_ARG_TYPE_UINT16, \
-        uint8_t: FF_FORMAT_ARG_TYPE_UINT8, \
-        int32_t: FF_FORMAT_ARG_TYPE_INT, \
-        char*: FF_FORMAT_ARG_TYPE_STRING, \
-        const char*: FF_FORMAT_ARG_TYPE_STRING, \
-        FFstrbuf: FF_FORMAT_ARG_TYPE_STRBUF, \
-        float: FF_FORMAT_ARG_TYPE_FLOAT, \
-        double: FF_FORMAT_ARG_TYPE_DOUBLE, \
-        FFlist: FF_FORMAT_ARG_TYPE_LIST, \
-        bool: FF_FORMAT_ARG_TYPE_BOOL \
-    ), _Generic((variable), char*: (variable), const char*: (variable), default: &(variable) ), (var_name) }
-
-typedef struct FFformatarg
-{
-    FFformatArgType type;
+typedef struct FFformatarg {
+    FFArgType type;
    const void* value;
    const char* name; // argument name, must start with an alphabet
 } FFformatarg;

 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
-void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
+bool ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
 #define FF_PARSE_FORMAT_STRING_CHECKED(buffer, formatstr, arguments) \
    ffParseFormatString((buffer), (formatstr), sizeof(arguments) / sizeof(*arguments), (arguments));
@@ -1,3 +1,5 @@
+#pragma once
+
 #include "fastfetch.h"

 bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result);
@@ -5,20 +5,22 @@ extern "C" {
 #include <File.h>
 #include <AppFileInfo.h>

-bool ffGetFileVersion(const char* filePath, FFstrbuf* version)
-{
+bool ffGetFileVersion(const char* filePath, FFstrbuf* version) {
    BFile f(filePath, B_READ_ONLY);
-    if (f.InitCheck() != B_OK)
+    if (f.InitCheck() != B_OK) {
        return false;
+    }

    BAppFileInfo fileInfo(&f);
-    if (f.InitCheck() != B_OK)
+    if (f.InitCheck() != B_OK) {
        return false;
+    }

    version_info info;
-    if (fileInfo.GetVersionInfo(&info, B_SYSTEM_VERSION_KIND) != B_OK)
+    if (fileInfo.GetVersionInfo(&info, B_SYSTEM_VERSION_KIND) != B_OK) {
        return false;
+    }

-    ffStrbufSetF(version, "%d.%d.%d", (int)info.major, (int)info.middle, (int)info.minor);
+    ffStrbufSetF(version, "%d.%d.%d", (int) info.major, (int) info.middle, (int) info.minor);
    return true;
 }
@@ -1,3 +1,3 @@
-#include "util/FFstrbuf.h"
+#include "common/FFstrbuf.h"

 bool ffGetFileVersion(const char* filePath, FFstrbuf* version);
@@ -1,56 +1,69 @@
 #include "FFPlatform_private.h"
-#include "util/stringUtils.h"
-#include "common/io/io.h"
+#include "common/strutil.h"
+#include "common/io.h"
 #include "detection/version/version.h"

-void ffPlatformInit(FFPlatform* platform)
-{
+void ffPlatformInit(FFPlatform* platform) {
    ffStrbufInit(&platform->homeDir);
    ffStrbufInit(&platform->cacheDir);
-    ffListInit(&platform->configDirs, sizeof(FFstrbuf));
-    ffListInit(&platform->dataDirs, sizeof(FFstrbuf));
+    ffListInit(&platform->configDirs);
+    ffListInit(&platform->dataDirs);
    ffStrbufInit(&platform->exePath);
+    ffStrbufInit(&platform->cwd);

    ffStrbufInit(&platform->userName);
    ffStrbufInit(&platform->fullUserName);
    ffStrbufInit(&platform->hostName);
    ffStrbufInit(&platform->userShell);

+#ifdef _WIN32
+    ffStrbufInit(&platform->sid);
+#endif
+
    FFPlatformSysinfo* info = &platform->sysinfo;

    ffStrbufInit(&info->name);
    ffStrbufInit(&info->release);
    ffStrbufInit(&info->version);
    ffStrbufInit(&info->architecture);
+    info->pageSize = 0;

    ffPlatformInitImpl(platform);

-    if(info->name.length == 0)
+    if (info->name.length == 0) {
        ffStrbufSetStatic(&info->name, ffVersionResult.sysName);
+    }

-    if(info->architecture.length == 0)
+    if (info->architecture.length == 0) {
        ffStrbufSetStatic(&info->architecture, ffVersionResult.architecture);
+    }
 }

-void ffPlatformDestroy(FFPlatform* platform)
-{
+void ffPlatformDestroy(FFPlatform* platform) {
    ffStrbufDestroy(&platform->homeDir);
    ffStrbufDestroy(&platform->cacheDir);

-    FF_LIST_FOR_EACH(FFstrbuf, dir, platform->configDirs)
+    FF_LIST_FOR_EACH (FFstrbuf, dir, platform->configDirs) {
        ffStrbufDestroy(dir);
+    }
    ffListDestroy(&platform->configDirs);

-    FF_LIST_FOR_EACH(FFstrbuf, dir, platform->dataDirs)
+    FF_LIST_FOR_EACH (FFstrbuf, dir, platform->dataDirs) {
        ffStrbufDestroy(dir);
+    }
    ffListDestroy(&platform->dataDirs);
    ffStrbufDestroy(&platform->exePath);
+    ffStrbufDestroy(&platform->cwd);

    ffStrbufDestroy(&platform->userName);
    ffStrbufDestroy(&platform->hostName);
    ffStrbufDestroy(&platform->userShell);
    ffStrbufDestroy(&platform->fullUserName);

+#ifdef _WIN32
+    ffStrbufDestroy(&platform->sid);
+#endif
+
    FFPlatformSysinfo* info = &platform->sysinfo;
    ffStrbufDestroy(&info->architecture);
    ffStrbufDestroy(&info->name);
@@ -58,23 +71,24 @@ void ffPlatformDestroy(FFPlatform* platform)
    ffStrbufDestroy(&info->version);
 }

-void ffPlatformPathAddAbsolute(FFlist* dirs, const char* path)
-{
-    if (!ffPathExists(path, FF_PATHTYPE_DIRECTORY))
+void ffPlatformPathAddAbsolute(FFlist* dirs, const char* path) {
+    if (!ffPathExists(path, FF_PATHTYPE_DIRECTORY)) {
        return;
+    }

    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateS(path);
    ffStrbufEnsureEndsWithC(&buffer, '/');
-    if (!ffListContains(dirs, &buffer, (void*) ffStrbufEqual))
-        ffStrbufInitMove((FFstrbuf*) ffListAdd(dirs), &buffer);
+    if (!FF_LIST_CONTAINS(*dirs, &buffer, ffStrbufEqual)) {
+        ffStrbufInitMove(FF_LIST_ADD(FFstrbuf, *dirs), &buffer);
+    }
 }

-void ffPlatformPathAddHome(FFlist* dirs, const FFPlatform* platform, const char* suffix)
-{
+void ffPlatformPathAddHome(FFlist* dirs, const FFPlatform* platform, const char* suffix) {
    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateA(64);
    ffStrbufAppend(&buffer, &platform->homeDir);
    ffStrbufAppendS(&buffer, suffix);
    ffStrbufEnsureEndsWithC(&buffer, '/');
-    if (ffPathExists(buffer.chars, FF_PATHTYPE_DIRECTORY) && !ffListContains(dirs, &buffer, (void*) ffStrbufEqual))
-        ffStrbufInitMove((FFstrbuf*) ffListAdd(dirs), &buffer);
+    if (ffPathExists(buffer.chars, FF_PATHTYPE_DIRECTORY) && !FF_LIST_CONTAINS(*dirs, &buffer, ffStrbufEqual)) {
+        ffStrbufInitMove(FF_LIST_ADD(FFstrbuf, *dirs), &buffer);
+    }
 }
@@ -1,6 +1,6 @@
 #pragma once

-#include "FFPlatform.h"
+#include "common/FFPlatform.h"

 void ffPlatformInitImpl(FFPlatform* platform);

@@ -0,0 +1,321 @@
+#include "FFPlatform_private.h"
+#include "common/FFstrbuf.h"
+#include "common/arrutil.h"
+#include "common/strutil.h"
+#include "common/io.h"
+#include "fastfetch_config.h"
+
+#include <unistd.h>
+#include <pwd.h>
+#include <limits.h>
+#include <sys/utsname.h>
+#include <paths.h>
+
+#ifdef __APPLE__
+    #include <mach-o/dyld.h>
+    #include <sys/sysctl.h>
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+    #include <sys/sysctl.h>
+#elif defined(__OpenBSD__)
+    #include <sys/sysctl.h>
+    #include <sys/stat.h>
+    #include <kvm.h>
+    #include "common/path.h"
+#elif defined(__HAIKU__)
+    #include <image.h>
+    #include <OS.h>
+#endif
+
+static void getExePath(FFPlatform* platform) {
+    char exePath[PATH_MAX];
+#if defined(__linux__) || defined(__GNU__)
+    ssize_t exePathLen = readlink("/proc/self/exe", exePath, sizeof(exePath) - 1);
+    if (exePathLen >= 0) {
+        exePath[exePathLen] = '\0';
+    }
+#elif defined(__APPLE__)
+    uint32_t exePathLen = sizeof(exePath);
+    if (_NSGetExecutablePath(exePath, &exePathLen) == 0) {
+        exePathLen = (uint32_t) strlen(exePath);
+    } else {
+        exePathLen = 0;
+    }
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+    size_t exePathLen = sizeof(exePath);
+    if (sysctl(
+            (int[]) { CTL_KERN,
+    #ifdef __FreeBSD__
+                KERN_PROC,
+                KERN_PROC_PATHNAME,
+                (pid_t) platform->pid
+    #else
+                KERN_PROC_ARGS,
+                (pid_t) platform->pid,
+                KERN_PROC_PATHNAME
+    #endif
+            },
+            4,
+            exePath,
+            &exePathLen,
+            NULL,
+            0) < 0)
+        exePathLen = 0;
+    else {
+        exePathLen--; // remove terminating NUL
+    }
+#elif defined(__OpenBSD__)
+    // OpenBSD doesn't have a reliable way to get the executable path.
+    // Current implementation uses argv[0], which can be easily spoofed.
+    // See #2195
+    size_t exePathLen = 0;
+    kvm_t* kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL);
+    if (kd) {
+        int kpCount;
+        struct kinfo_proc* kp = kvm_getprocs(kd, KERN_PROC_PID, (pid_t) platform->pid, sizeof(*kp), &kpCount);
+        if (kp && kpCount == 1) {
+            char** argv = kvm_getargv(kd, kp, 0);
+            if (argv && argv[0]) {
+                char* arg0 = argv[0];
+                if (arg0[0]) {
+                    if (strchr(arg0, '/') != NULL) // likely a path (absolute or relative)
+                    {
+                        exePathLen = strlen(arg0);
+                        if (exePathLen < ARRAY_SIZE(exePath)) {
+                            memcpy(exePath, arg0, exePathLen);
+                            exePath[exePathLen] = '\0';
+                        } else {
+                            exePathLen = 0;
+                        }
+                    } else {
+                        FF_STRBUF_AUTO_DESTROY tmpPath = ffStrbufCreate();
+                        if (ffFindExecutableInPath(arg0, &tmpPath) == NULL && tmpPath.length < ARRAY_SIZE(exePath)) {
+                            memcpy(exePath, tmpPath.chars, tmpPath.length + 1);
+                            exePathLen = tmpPath.length;
+                        }
+                    }
+
+                    if (exePathLen > 0) {
+                        struct stat st;
+                        if (stat(exePath, &st) == 0 && S_ISREG(st.st_mode)) {
+                            int cntp;
+                            struct kinfo_file* kf = kvm_getfiles(kd, KERN_FILE_BYPID, (pid_t) platform->pid, sizeof(*kf), &cntp);
+                            if (kf) {
+                                int i;
+                                for (i = 0; i < cntp; i++) {
+                                    if (kf[i].fd_fd == KERN_FILE_TEXT) {
+                                        // KERN_FILE_TEXT is the executable file, not a shared library, and should be unique in the list.
+                                        if (st.st_dev != (dev_t) kf[i].va_fsid || st.st_ino != (ino_t) kf[i].va_fileid) {
+                                            i = -1;
+                                        }
+                                        break;
+                                    }
+                                }
+                                if (i < 0) {
+                                    exePathLen = 0;
+                                }
+                            } else {
+                                // If we can't get the list of open files, we can't verify that the file is actually the executable
+                                // Assume it is
+                            }
+                        } else {
+                            exePathLen = 0;
+                        }
+                    }
+                }
+            }
+        }
+        kvm_close(kd);
+    }
+#elif defined(__sun)
+    ssize_t exePathLen = readlink("/proc/self/path/a.out", exePath, sizeof(exePath) - 1);
+    if (exePathLen >= 0) {
+        exePath[exePathLen] = '\0';
+    }
+#elif defined(__HAIKU__)
+    size_t exePathLen = 0;
+    image_info info;
+    int32 cookie = 0;
+
+    while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) {
+        if (info.type == B_APP_IMAGE) {
+            exePathLen = strlcpy(exePath, info.name, sizeof(exePath));
+            break;
+        }
+    }
+#endif
+    if (exePathLen > 0) {
+        ffStrbufEnsureFree(&platform->exePath, PATH_MAX);
+        if (realpath(exePath, platform->exePath.chars)) {
+            ffStrbufRecalculateLength(&platform->exePath);
+        } else {
+            ffStrbufSetNS(&platform->exePath, (uint32_t) exePathLen, exePath);
+        }
+    }
+}
+
+static void platformPathAddEnv(FFlist* dirs, const char* env) {
+    const char* envValue = getenv(env);
+    if (!ffStrSet(envValue)) {
+        return;
+    }
+
+    FF_STRBUF_AUTO_DESTROY value = ffStrbufCreateA(64);
+    ffStrbufAppendS(&value, envValue);
+
+    uint32_t startIndex = 0;
+    while (startIndex < value.length) {
+        uint32_t colonIndex = ffStrbufNextIndexC(&value, startIndex, ':');
+        value.chars[colonIndex] = '\0';
+
+        if (!ffStrSet(value.chars + startIndex)) {
+            startIndex = colonIndex + 1;
+            continue;
+        }
+
+        ffPlatformPathAddAbsolute(dirs, value.chars + startIndex);
+
+        startIndex = colonIndex + 1;
+    }
+}
+
+static void getHomeDir(FFPlatform* platform, const struct passwd* pwd) {
+    const char* home = pwd ? pwd->pw_dir : getenv("HOME");
+    ffStrbufAppendS(&platform->homeDir, home);
+    ffStrbufEnsureEndsWithC(&platform->homeDir, '/');
+}
+
+static void getCacheDir(FFPlatform* platform) {
+    const char* cache = getenv("XDG_CACHE_HOME");
+    if (ffStrSet(cache)) {
+        ffStrbufAppendS(&platform->cacheDir, cache);
+        ffStrbufEnsureEndsWithC(&platform->cacheDir, '/');
+    } else {
+        ffStrbufAppend(&platform->cacheDir, &platform->homeDir);
+        ffStrbufAppendS(&platform->cacheDir, ".cache/");
+    }
+}
+
+static void getConfigDirs(FFPlatform* platform) {
+    // Always make sure `${XDG_CONFIG_HOME:-$HOME/.config}` is the first entry
+    platformPathAddEnv(&platform->configDirs, "XDG_CONFIG_HOME");
+    ffPlatformPathAddHome(&platform->configDirs, platform, ".config/");
+
+#if defined(__APPLE__)
+    ffPlatformPathAddHome(&platform->configDirs, platform, "Library/Preferences/");
+    ffPlatformPathAddHome(&platform->configDirs, platform, "Library/Application Support/");
+#endif
+#if defined(__HAIKU__)
+    ffPlatformPathAddHome(&platform->configDirs, platform, "config/settings/");
+#endif
+
+    ffPlatformPathAddHome(&platform->configDirs, platform, "");
+    platformPathAddEnv(&platform->configDirs, "XDG_CONFIG_DIRS");
+
+#if !defined(__APPLE__)
+    ffPlatformPathAddAbsolute(&platform->configDirs, FASTFETCH_TARGET_DIR_ETC "/xdg/");
+#endif
+
+    ffPlatformPathAddAbsolute(&platform->configDirs, FASTFETCH_TARGET_DIR_ETC "/");
+    ffPlatformPathAddAbsolute(&platform->configDirs, FASTFETCH_TARGET_DIR_INSTALL_SYSCONF "/");
+}
+
+static void getDataDirs(FFPlatform* platform) {
+    platformPathAddEnv(&platform->dataDirs, "XDG_DATA_HOME");
+    ffPlatformPathAddHome(&platform->dataDirs, platform, ".local/share/");
+
+    // Add ${currentExePath}/../share
+    if (platform->exePath.length > 0) {
+        FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateCopy(&platform->exePath);
+        ffStrbufSubstrBeforeLastC(&path, '/');
+        ffStrbufSubstrBeforeLastC(&path, '/');
+        ffStrbufAppendS(&path, "/share");
+        ffPlatformPathAddAbsolute(&platform->dataDirs, path.chars);
+    }
+
+#ifdef __APPLE__
+    ffPlatformPathAddHome(&platform->dataDirs, platform, "Library/Application Support/");
+#endif
+
+    ffPlatformPathAddHome(&platform->dataDirs, platform, "");
+    platformPathAddEnv(&platform->dataDirs, "XDG_DATA_DIRS");
+#ifdef _PATH_LOCALBASE
+    ffPlatformPathAddAbsolute(&platform->dataDirs, _PATH_LOCALBASE "/share/");
+#endif
+    ffPlatformPathAddAbsolute(&platform->dataDirs, FASTFETCH_TARGET_DIR_USR "/local/share/");
+    ffPlatformPathAddAbsolute(&platform->dataDirs, FASTFETCH_TARGET_DIR_USR "/share/");
+}
+
+static void getUserName(FFPlatform* platform, const struct passwd* pwd) {
+    if (pwd) {
+        ffStrbufSetS(&platform->userName, pwd->pw_name);
+        ffStrbufSetS(&platform->fullUserName, pwd->pw_gecos);
+        ffStrbufTrimSpace(&platform->fullUserName);
+    } else {
+        ffStrbufSetS(&platform->userName, getenv("USER"));
+    }
+}
+
+static void getHostName(FFPlatform* platform, const struct utsname* uts) {
+    ffStrbufAppendS(&platform->hostName, uts->nodename);
+}
+
+static void getUserShell(FFPlatform* platform, const struct passwd* pwd) {
+    const char* shell = getenv("SHELL");
+    if (!ffStrSet(shell) && pwd) {
+        shell = pwd->pw_shell;
+    }
+
+    ffStrbufAppendS(&platform->userShell, shell);
+}
+
+static void getSysinfo(FFPlatformSysinfo* info, const struct utsname* uts) {
+    ffStrbufAppendS(&info->name, uts->sysname);
+    ffStrbufAppendS(&info->release, uts->release);
+    ffStrbufAppendS(&info->version, uts->version);
+#ifdef __HAIKU__
+    /* historical reason */
+    if (ffStrEquals(uts->machine, "BePC")) {
+        ffStrbufSetStatic(&info->architecture, "i386");
+    } else
+#endif
+        ffStrbufAppendS(&info->architecture, uts->machine);
+
+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
+    size_t length = sizeof(info->pageSize);
+    sysctl((int[]) { CTL_HW, HW_PAGESIZE }, 2, &info->pageSize, &length, NULL, 0);
+#else
+    info->pageSize = (uint32_t) sysconf(_SC_PAGESIZE);
+#endif
+}
+
+static void getCwd(FFPlatform* platform) {
+    char cwd[PATH_MAX];
+    if (getcwd(cwd, sizeof(cwd)) != NULL) {
+        ffStrbufSetS(&platform->cwd, cwd);
+        ffStrbufEnsureEndsWithC(&platform->cwd, '/');
+    }
+}
+
+void ffPlatformInitImpl(FFPlatform* platform) {
+    platform->pid = (uint32_t) getpid();
+    platform->uid = getuid();
+    struct passwd* pwd = getpwuid(platform->uid);
+
+    struct utsname uts;
+    if (uname(&uts) < 0) {
+        memset(&uts, 0, sizeof(uts));
+    }
+
+    getExePath(platform);
+    getCwd(platform);
+    getHomeDir(platform, pwd);
+    getCacheDir(platform);
+    getConfigDirs(platform);
+    getDataDirs(platform);
+
+    getUserName(platform, pwd);
+    getHostName(platform, &uts);
+    getUserShell(platform, pwd);
+
+    getSysinfo(&platform->sysinfo, &uts);
+}
@@ -0,0 +1,313 @@
+#include "FFPlatform_private.h"
+#include "common/io.h"
+#include "common/library.h"
+#include "common/strutil.h"
+#include "common/windows/unicode.h"
+#include "common/windows/registry.h"
+#include "common/windows/nt.h"
+
+#include <stdalign.h>
+#include <windows.h>
+#include <shlobj.h>
+#include <sddl.h>
+
+#define SECURITY_WIN32 1 // For secext.h
+#include <secext.h>
+
+static void getExePath(FFPlatform* platform) {
+    wchar_t exePathW[MAX_PATH];
+
+    FF_AUTO_CLOSE_FD HANDLE hPath = CreateFileW(
+        ffGetPeb()->ProcessParameters->ImagePathName.Buffer,
+        GENERIC_READ,
+        FILE_SHARE_READ,
+        NULL,
+        OPEN_EXISTING,
+        FILE_FLAG_BACKUP_SEMANTICS,
+        NULL);
+    if (hPath != INVALID_HANDLE_VALUE) {
+        DWORD len = GetFinalPathNameByHandleW(hPath, exePathW, MAX_PATH, FILE_NAME_NORMALIZED);
+        if (len > 0 && len < MAX_PATH) {
+            ffStrbufSetNWS(&platform->exePath, len, exePathW);
+            if (ffStrbufStartsWithS(&platform->exePath, "\\\\?\\")) {
+                ffStrbufSubstrAfter(&platform->exePath, 3);
+            }
+        }
+    }
+
+    if (platform->exePath.length == 0) {
+        PCUNICODE_STRING imagePathName = &ffGetPeb()->ProcessParameters->ImagePathName;
+        ffStrbufSetNWS(&platform->exePath, imagePathName->Length / sizeof(wchar_t), imagePathName->Buffer);
+    }
+
+    ffStrbufReplaceAllC(&platform->exePath, '\\', '/');
+}
+
+static void getHomeDir(FFPlatform* platform) {
+    PWSTR pPath = NULL;
+    if (SUCCEEDED(SHGetKnownFolderPath(&FOLDERID_Profile, KF_FLAG_DEFAULT, NULL, &pPath))) {
+        ffStrbufSetWS(&platform->homeDir, pPath);
+        ffStrbufReplaceAllC(&platform->homeDir, '\\', '/');
+        ffStrbufEnsureEndsWithC(&platform->homeDir, '/');
+    } else {
+        ffStrbufSetS(&platform->homeDir, getenv("USERPROFILE"));
+        ffStrbufReplaceAllC(&platform->homeDir, '\\', '/');
+        ffStrbufEnsureEndsWithC(&platform->homeDir, '/');
+    }
+    CoTaskMemFree(pPath);
+}
+
+static void getCacheDir(FFPlatform* platform) {
+    PWSTR pPath = NULL;
+    if (SUCCEEDED(SHGetKnownFolderPath(&FOLDERID_LocalAppData, KF_FLAG_DEFAULT, NULL, &pPath))) {
+        ffStrbufSetWS(&platform->cacheDir, pPath);
+        ffStrbufReplaceAllC(&platform->cacheDir, '\\', '/');
+        ffStrbufEnsureEndsWithC(&platform->cacheDir, '/');
+    } else {
+        ffStrbufAppend(&platform->cacheDir, &platform->homeDir);
+        ffStrbufAppendS(&platform->cacheDir, "AppData/Local/");
+    }
+    CoTaskMemFree(pPath);
+}
+
+static void platformPathAddKnownFolder(FFlist* dirs, REFKNOWNFOLDERID folderId) {
+    PWSTR pPath = NULL;
+    if (SUCCEEDED(SHGetKnownFolderPath(folderId, KF_FLAG_DEFAULT, NULL, &pPath))) {
+        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateWS(pPath);
+        CoTaskMemFree(pPath);
+        ffStrbufReplaceAllC(&buffer, '\\', '/');
+        ffStrbufEnsureEndsWithC(&buffer, '/');
+        if (!FF_LIST_CONTAINS(*dirs, &buffer, ffStrbufEqual)) {
+            ffStrbufInitMove(FF_LIST_ADD(FFstrbuf, *dirs), &buffer);
+        }
+    }
+}
+
+static void platformPathAddEnvSuffix(FFlist* dirs, const char* env, const char* suffix) {
+    const char* value = getenv(env);
+    if (!ffStrSet(value)) {
+        return;
+    }
+
+    FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateA(64);
+    ffStrbufAppendS(&buffer, value);
+    ffStrbufReplaceAllC(&buffer, '\\', '/');
+    ffStrbufEnsureEndsWithC(&buffer, '/');
+    if (suffix) {
+        ffStrbufAppendS(&buffer, suffix);
+        ffStrbufEnsureEndsWithC(&buffer, '/');
+    }
+
+    if (ffPathExists(buffer.chars, FF_PATHTYPE_DIRECTORY) && !FF_LIST_CONTAINS(*dirs, &buffer, ffStrbufEqual)) {
+        ffStrbufInitMove(FF_LIST_ADD(FFstrbuf, *dirs), &buffer);
+    }
+}
+
+static void getConfigDirs(FFPlatform* platform) {
+    if (getenv("MSYSTEM")) {
+        // We are in MSYS2 / Git Bash
+        platformPathAddEnvSuffix(&platform->configDirs, "HOME", ".config/");
+        platformPathAddEnvSuffix(&platform->configDirs, "HOME", NULL);
+        platformPathAddEnvSuffix(&platform->configDirs, "MINGW_PREFIX", "etc");
+    }
+
+    ffPlatformPathAddHome(&platform->configDirs, platform, ".config/");
+    platformPathAddKnownFolder(&platform->configDirs, &FOLDERID_ProgramData);
+    platformPathAddKnownFolder(&platform->configDirs, &FOLDERID_RoamingAppData);
+    platformPathAddKnownFolder(&platform->configDirs, &FOLDERID_LocalAppData);
+    ffPlatformPathAddHome(&platform->configDirs, platform, "");
+}
+
+static void getDataDirs(FFPlatform* platform) {
+    if (getenv("MSYSTEM") && getenv("HOME")) {
+        // We are in MSYS2 / Git Bash
+        platformPathAddEnvSuffix(&platform->dataDirs, "HOME", ".local/share/");
+        platformPathAddEnvSuffix(&platform->dataDirs, "HOME", NULL);
+        platformPathAddEnvSuffix(&platform->dataDirs, "MINGW_PREFIX", "share");
+    }
+    ffPlatformPathAddHome(&platform->dataDirs, platform, ".local/share/");
+    platformPathAddKnownFolder(&platform->dataDirs, &FOLDERID_ProgramData);
+    platformPathAddKnownFolder(&platform->dataDirs, &FOLDERID_RoamingAppData);
+    platformPathAddKnownFolder(&platform->dataDirs, &FOLDERID_LocalAppData);
+    ffPlatformPathAddHome(&platform->dataDirs, platform, "");
+}
+
+static void getUserName(FFPlatform* platform) {
+    wchar_t buffer[256];
+    DWORD size = ARRAY_SIZE(buffer);
+    if (GetUserNameExW(NameDisplay, buffer, &size)) {
+        ffStrbufSetWS(&platform->fullUserName, buffer);
+    }
+
+    NTSYSAPI NTSTATUS NTAPI LsaGetUserName(
+        _Outptr_ PLSA_UNICODE_STRING * UserName,
+        _Outptr_opt_ PLSA_UNICODE_STRING * DomainName);
+    PLSA_UNICODE_STRING userName = NULL;
+    if (NT_SUCCESS(LsaGetUserName(&userName, NULL))) {
+        ffStrbufSetNWS(&platform->userName, userName->Length / sizeof(wchar_t), userName->Buffer);
+        RtlFreeUnicodeString(userName); // Required. userName.Buffer is allocated separately
+        LsaFreeMemory(userName);
+    } else {
+        ffStrbufSetS(&platform->userName, getenv("USERNAME"));
+    }
+
+    alignas(TOKEN_USER) char buf[SECURITY_MAX_SID_SIZE + sizeof(TOKEN_USER)];
+    if (NT_SUCCESS(NtQueryInformationToken(NtCurrentProcessToken(), TokenUser, buf, sizeof(buf), &size))) {
+        TOKEN_USER* tokenUser = (TOKEN_USER*) buf;
+        UNICODE_STRING sidString = { .Buffer = buffer, .Length = 0, .MaximumLength = sizeof(buffer) };
+        if (NT_SUCCESS(RtlConvertSidToUnicodeString(&sidString, tokenUser->User.Sid, FALSE))) {
+            ffStrbufSetNWS(&platform->sid, sidString.Length / sizeof(wchar_t), sidString.Buffer);
+        }
+    }
+}
+
+static void getHostName(FFPlatform* platform) {
+    wchar_t buffer[256];
+    DWORD len = ARRAY_SIZE(buffer);
+    if (GetComputerNameExW(ComputerNameDnsHostname, buffer, &len) && len > 0) {
+        ffStrbufSetNWS(&platform->hostName, len, buffer);
+    } else {
+        len = ARRAY_SIZE(buffer);
+        if (GetComputerNameExW(ComputerNameNetBIOS, buffer, &len) && len > 0) {
+            ffStrbufSetNWS(&platform->hostName, len, buffer);
+        }
+    }
+}
+
+static void getUserShell(FFPlatform* platform) {
+    // Works in MSYS2
+    const char* userShell = getenv("SHELL");
+    if (userShell) {
+        ffStrbufAppendS(&platform->userShell, userShell);
+        ffStrbufReplaceAllC(&platform->userShell, '\\', '/');
+    }
+}
+
+static const char* detectWine(void) {
+    const char* __cdecl wine_get_version(void);
+    void* hntdll = ffLibraryGetModule(L"ntdll.dll");
+    if (!hntdll) {
+        return NULL;
+    }
+    FF_LIBRARY_LOAD_SYMBOL_LAZY(hntdll, wine_get_version);
+    if (!ffwine_get_version) {
+        return NULL;
+    }
+    return ffwine_get_version();
+}
+
+static void getSystemReleaseAndVersion(FFPlatformSysinfo* info) {
+    FF_AUTO_CLOSE_FD HANDLE hKey = NULL;
+    if (!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", &hKey, NULL)) {
+        return;
+    }
+
+    uint32_t ubr = 0;
+    ffRegReadValues(hKey, 2, (FFRegValueArg[]) {
+                                 FF_ARG(ubr, L"UBR"),
+                                 FF_ARG(info->version, L"BuildLabEx"),
+                             },
+        NULL);
+
+    PPEB_FULL peb = ffGetPeb();
+
+    ffStrbufSetF(&info->release,
+        "%u.%u.%u.%u",
+        (unsigned) peb->OSMajorVersion,
+        (unsigned) peb->OSMinorVersion,
+        (unsigned) peb->OSBuildNumber,
+        (unsigned) ubr);
+
+    const char* wineVersion = detectWine();
+    if (wineVersion) {
+        ffStrbufSetF(&info->name, "Wine_%s", wineVersion);
+    } else {
+        ffStrbufSetStatic(&info->name, "WIN32_NT");
+    }
+}
+
+static void getSystemPageSize(FFPlatformSysinfo* info) {
+    SYSTEM_BASIC_INFORMATION sbi;
+    if (NT_SUCCESS(NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL))) {
+        info->pageSize = sbi.PhysicalPageSize;
+    } else {
+        info->pageSize = 4096;
+    }
+}
+
+static void getSystemArchitecture(FFPlatformSysinfo* info) {
+    SYSTEM_PROCESSOR_INFORMATION spi;
+    if (NT_SUCCESS(NtQuerySystemInformation(SystemProcessorInformation, &spi, sizeof(spi), NULL))) {
+        switch (spi.ProcessorArchitecture) {
+            case PROCESSOR_ARCHITECTURE_AMD64:
+                ffStrbufSetStatic(&info->architecture, "x86_64");
+                break;
+            case PROCESSOR_ARCHITECTURE_IA64:
+                ffStrbufSetStatic(&info->architecture, "ia64");
+                break;
+            case PROCESSOR_ARCHITECTURE_INTEL:
+                switch (spi.ProcessorLevel) {
+                    case 4:
+                        ffStrbufSetStatic(&info->architecture, "i486");
+                        break;
+                    case 5:
+                        ffStrbufSetStatic(&info->architecture, "i586");
+                        break;
+                    case 6:
+                        ffStrbufSetStatic(&info->architecture, "i686");
+                        break;
+                    default:
+                        ffStrbufSetStatic(&info->architecture, "i386");
+                        break;
+                }
+                break;
+            case PROCESSOR_ARCHITECTURE_ARM64:
+                ffStrbufSetStatic(&info->architecture, "aarch64");
+                break;
+            case PROCESSOR_ARCHITECTURE_ARM:
+                ffStrbufSetStatic(&info->architecture, "arm");
+                break;
+            case PROCESSOR_ARCHITECTURE_PPC:
+                ffStrbufSetStatic(&info->architecture, "ppc");
+                break;
+            case PROCESSOR_ARCHITECTURE_MIPS:
+                ffStrbufSetStatic(&info->architecture, "mips");
+                break;
+            case PROCESSOR_ARCHITECTURE_ALPHA:
+                ffStrbufSetStatic(&info->architecture, "alpha");
+                break;
+            case PROCESSOR_ARCHITECTURE_ALPHA64:
+                ffStrbufSetStatic(&info->architecture, "alpha64");
+                break;
+            case PROCESSOR_ARCHITECTURE_UNKNOWN:
+            default:
+                ffStrbufSetStatic(&info->architecture, "unknown");
+                break;
+        }
+    }
+}
+
+static void getCwd(FFPlatform* platform) {
+    PCURDIR cwd = &ffGetPeb()->ProcessParameters->CurrentDirectory;
+    ffStrbufSetNWS(&platform->cwd, cwd->DosPath.Length / sizeof(WCHAR), cwd->DosPath.Buffer);
+    ffStrbufReplaceAllC(&platform->cwd, '\\', '/');
+    ffStrbufEnsureEndsWithC(&platform->cwd, '/');
+}
+
+void ffPlatformInitImpl(FFPlatform* platform) {
+    platform->pid = (uint32_t) (uintptr_t) ffGetTeb()->ClientId.UniqueProcess;
+    getExePath(platform);
+    getCwd(platform);
+    getHomeDir(platform);
+    getCacheDir(platform);
+    getConfigDirs(platform);
+    getDataDirs(platform);
+
+    getUserName(platform);
+    getHostName(platform);
+    getUserShell(platform);
+
+    getSystemReleaseAndVersion(&platform->sysinfo);
+    getSystemArchitecture(&platform->sysinfo);
+    getSystemPageSize(&platform->sysinfo);
+}
@@ -0,0 +1,34 @@
+#include "common/FFlist.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+void* ffListAdd(FFlist* list, uint32_t elementSize) {
+    if (list->length == list->capacity) {
+        ffListReserve(list, elementSize, list->capacity == 0 ? FF_LIST_DEFAULT_ALLOC : list->capacity * 2);
+    }
+
+    ++list->length;
+    return ffListGet(list, elementSize, list->length - 1);
+}
+
+bool ffListShift(FFlist* list, uint32_t elementSize, void* __restrict result) {
+    if (list->length == 0) {
+        return false;
+    }
+
+    memcpy(result, list->data, elementSize);
+    memmove(list->data, list->data + elementSize, (size_t) elementSize * (list->length - 1));
+    --list->length;
+    return true;
+}
+
+bool ffListPop(FFlist* list, uint32_t elementSize, void* __restrict result) {
+    if (list->length == 0) {
+        return false;
+    }
+
+    memcpy(result, ffListGet(list, elementSize, list->length - 1), elementSize);
+    --list->length;
+    return true;
+}
@@ -1,14 +1,12 @@
-#include "base64.h"
+#include "common/base64.h"

 // https://github.com/kostya/benchmarks/blob/master/base64/test-nolib.c#L145
-void ffBase64EncodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output)
-{
+void ffBase64EncodeRaw(uint32_t size, const char* str, uint32_t* out_size, char* output) {
    static const char chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    char *out = output;
-    const char *ends = str + (size - size % 3);
-    while (str != ends)
-    {
-        uint32_t n = __builtin_bswap32(*(uint32_t *)str);
+    char* out = output;
+    const char* ends = str + (size - size % 3);
+    while (str != ends) {
+        uint32_t n = __builtin_bswap32(*(uint32_t*) str);
        *out++ = chars[(n >> 26) & 63];
        *out++ = chars[(n >> 20) & 63];
        *out++ = chars[(n >> 14) & 63];
@@ -16,94 +14,94 @@ void ffBase64EncodeRaw(uint32_t size, const char *str, uint32_t *out_size, char
        str += 3;
    }

-    if (size % 3 == 1)
-    {
-        uint64_t n = (uint64_t)*str << 16;
+    if (size % 3 == 1) {
+        uint64_t n = (uint64_t) *str << 16;
        *out++ = chars[(n >> 18) & 63];
        *out++ = chars[(n >> 12) & 63];
        *out++ = '=';
        *out++ = '=';
-    }
-    else if (size % 3 == 2)
-    {
-        uint64_t n = (uint64_t)*str++ << 16;
-        n |= (uint64_t)*str << 8;
+    } else if (size % 3 == 2) {
+        uint64_t n = (uint64_t) *str++ << 16;
+        n |= (uint64_t) *str << 8;
        *out++ = chars[(n >> 18) & 63];
        *out++ = chars[(n >> 12) & 63];
        *out++ = chars[(n >> 6) & 63];
        *out++ = '=';
    }
    *out = '\0';
-    *out_size = (uint32_t)(out - output);
+    *out_size = (uint32_t) (out - output);
 }

 static uint8_t decode_table[256];

-void init_decode_table()
-{
+static void init_decode_table() {
    uint8_t ch = 0;
-    do
-    {
+    do {
        int32_t code = -1;
-        if (ch >= 'A' && ch <= 'Z')
+        if (ch >= 'A' && ch <= 'Z') {
            code = ch - 0x41;
-        if (ch >= 'a' && ch <= 'z')
+        }
+        if (ch >= 'a' && ch <= 'z') {
            code = ch - 0x47;
-        if (ch >= '0' && ch <= '9')
+        }
+        if (ch >= '0' && ch <= '9') {
            code = ch + 0x04;
-        if (ch == '+' || ch == '-')
+        }
+        if (ch == '+' || ch == '-') {
            code = 0x3E;
-        if (ch == '/' || ch == '_')
+        }
+        if (ch == '/' || ch == '_') {
            code = 0x3F;
+        }
        decode_table[ch] = (uint8_t) code;
    } while (ch++ < 0xFF);
 }

 #define next_char(x) uint8_t x = decode_table[(uint8_t) *str++];

-bool ffBase64DecodeRaw(uint32_t size, const char *str, uint32_t *out_size, char *output)
-{
-    if (*(uint64_t*) decode_table == 0)
+bool ffBase64DecodeRaw(uint32_t size, const char* str, uint32_t* out_size, char* output) {
+    if (*(uint64_t*) decode_table == 0) {
        init_decode_table();
+    }

-    char *out = output;
-    while (size > 0 && (str[size - 1] == '\n' || str[size - 1] == '\r' || str[size - 1] == '='))
+    char* out = output;
+    while (size > 0 && (str[size - 1] == '\n' || str[size - 1] == '\r' || str[size - 1] == '=')) {
        size--;
+    }

-    const char *ends = str + size - 4;
-    while (true)
-    {
-        if (str > ends)
+    const char* ends = str + size - 4;
+    while (true) {
+        if (str > ends) {
            break;
-        while (*str == '\n' || *str == '\r')
+        }
+        while (*str == '\n' || *str == '\r') {
            str++;
+        }

-        if (str > ends)
+        if (str > ends) {
            break;
+        }
        next_char(a);
        next_char(b);
        next_char(c);
        next_char(d);

-        *out++ = (char)(a << 2 | b >> 4);
-        *out++ = (char)(b << 4 | c >> 2);
-        *out++ = (char)(c << 6 | d >> 0);
+        *out++ = (char) (a << 2 | b >> 4);
+        *out++ = (char) (b << 4 | c >> 2);
+        *out++ = (char) (c << 6 | d >> 0);
    }

    uint8_t mod = (uint8_t) (ends - str + 4) % 4;
-    if (mod == 2)
-    {
+    if (mod == 2) {
        next_char(a);
        next_char(b);
-        *out++ = (char)(a << 2 | b >> 4);
-    }
-    else if (mod == 3)
-    {
+        *out++ = (char) (a << 2 | b >> 4);
+    } else if (mod == 3) {
        next_char(a);
        next_char(b);
        next_char(c);
-        *out++ = (char)(a << 2 | b >> 4);
-        *out++ = (char)(b << 4 | c >> 2);
+        *out++ = (char) (a << 2 | b >> 4);
+        *out++ = (char) (b << 4 | c >> 2);
    }

    *out = '\0';
@@ -0,0 +1,303 @@
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/strutil.h"
+
+#include <string.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <mach-o/loader.h>
+#include <mach-o/swap.h>
+#include <mach-o/fat.h>
+
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // swap_fat_arch
+
+// Ref: https://github.com/AlexDenisov/segment_dumper/blob/master/main.c
+
+typedef struct {
+    const uint8_t* data;
+    size_t length;
+} FFMemoryMapping;
+
+static inline void wrapMunmap(FFMemoryMapping* mapping) {
+    assert(mapping);
+    if (mapping->data == NULL || mapping->data == MAP_FAILED) {
+        return;
+    }
+    munmap((void*) mapping->data, mapping->length);
+}
+
+/**
+ * Helper function to access data from a memory-mapped file at a specific offset
+ */
+static inline const void* readData(const FFMemoryMapping* mapping, size_t size, off_t offset) {
+    if (offset < 0) {
+        return NULL;
+    }
+
+    size_t start = (size_t) offset;
+    if (start > mapping->length || size > mapping->length - start) {
+        return NULL;
+    }
+
+    return mapping->data + start;
+}
+
+/**
+ * Handles a Mach-O section by extracting strings from the __cstring section
+ *
+ * @param mapping Memory mapping of the Mach-O object file
+ * @param name Section name to check
+ * @param offset Offset of the section in the file
+ * @param size Size of the section
+ * @param cb Callback function to process strings
+ * @param userdata User data for the callback
+ * @param minLength Minimum string length to extract
+ *
+ * @return true to continue processing, false to stop
+ */
+static bool handleMachSection(const FFMemoryMapping* mapping, const char* name, off_t offset, size_t size, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength) {
+    if (!ffStrEquals(name, "__cstring")) {
+        return true;
+    }
+
+    const char* data = readData(mapping, size, offset);
+    if (!data) {
+        return true;
+    }
+
+    for (size_t off = 0; off < size; ++off) {
+        const char* p = data + off;
+        if (*p == '\0') {
+            continue;
+        }
+        uint32_t len = (uint32_t) strnlen(p, size - off);
+        if (len < minLength) {
+            off += len; // Skip short strings
+            continue;
+        }
+        if (*p >= ' ' && *p <= '~') { // Ignore control characters
+            if (!cb(p, len, userdata)) {
+                return false;
+            }
+        }
+        off += len;
+    }
+    return true;
+}
+
+/**
+ * Processes a Mach-O header (32-bit or 64-bit)
+ *
+ * This function parses the load commands in a Mach-O header, looking for
+ * LC_SEGMENT or LC_SEGMENT_64 commands that contain the __TEXT segment.
+ * It then processes the sections within that segment to extract strings.
+ *
+ * @param mapping Memory mapping of the Mach-O object file
+ * @param offset Offset of the Mach header in the file
+ * @param is_64 Whether this is a 64-bit Mach-O header
+ * @param cb Callback function to process strings
+ * @param userdata User data for the callback
+ * @param minLength Minimum string length to extract
+ *
+ * @return NULL on success, error message on failure
+ */
+static const char* dumpMachHeader(const FFMemoryMapping* mapping, off_t offset, bool is_64, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength) {
+    uint32_t ncmds;
+    off_t loadCommandsOffset = offset;
+
+    if (is_64) {
+        const struct mach_header_64* header = readData(mapping, sizeof(struct mach_header_64), offset);
+        if (!header) {
+            return "read mach header failed";
+        }
+
+        ncmds = header->ncmds;
+        loadCommandsOffset += sizeof(*header);
+    } else {
+        const struct mach_header* header = readData(mapping, sizeof(struct mach_header), offset);
+        if (!header) {
+            return "read mach header failed";
+        }
+
+        ncmds = header->ncmds;
+        loadCommandsOffset += sizeof(*header);
+    }
+
+    off_t commandOffset = loadCommandsOffset;
+    const struct load_command* cmd = NULL;
+    for (uint32_t i = 0U; i < ncmds; i++, commandOffset += cmd->cmdsize) {
+        cmd = readData(mapping, sizeof(*cmd), commandOffset);
+        if (!cmd) {
+            break;
+        }
+
+        if (cmd->cmdsize < sizeof(*cmd)) {
+            break;
+        }
+
+        if (cmd->cmd == LC_SEGMENT_64) {
+            const struct segment_command_64* segment = readData(mapping, sizeof(struct segment_command_64), commandOffset);
+            if (!segment) {
+                continue;
+            }
+
+            if (!ffStrEquals(segment->segname, "__TEXT")) {
+                continue;
+            }
+
+            for (uint32_t j = 0U; j < segment->nsects; j++) {
+                off_t sectionOffset = commandOffset + (off_t) sizeof(*segment) + (off_t) (j * sizeof(struct section_64));
+                const struct section_64* section = readData(mapping, sizeof(struct section_64), sectionOffset);
+                if (!section) {
+                    continue;
+                }
+
+                if (!handleMachSection(mapping, section->sectname, (off_t) section->offset, (size_t) section->size, cb, userdata, minLength)) {
+                    return NULL;
+                }
+            }
+        } else if (cmd->cmd == LC_SEGMENT) {
+            const struct segment_command* segment = readData(mapping, sizeof(struct segment_command), commandOffset);
+            if (!segment) {
+                continue;
+            }
+
+            if (!ffStrEquals(segment->segname, "__TEXT")) {
+                continue;
+            }
+
+            for (uint32_t j = 0; j < segment->nsects; j++) {
+                off_t sectionOffset = commandOffset + (off_t) sizeof(*segment) + (off_t) (j * sizeof(struct section));
+                const struct section* section = readData(mapping, sizeof(struct section), sectionOffset);
+                if (!section) {
+                    continue;
+                }
+
+                if (!handleMachSection(mapping, section->sectname, (off_t) section->offset, (size_t) section->size, cb, userdata, minLength)) {
+                    return NULL;
+                }
+            }
+        }
+    }
+
+    return NULL;
+}
+
+/**
+ * Processes a Fat binary header (Universal binary)
+ *
+ * This function handles the fat header of a universal binary, which can contain
+ * multiple Mach-O binaries for different architectures. It extracts and processes
+ * each embedded Mach-O file.
+ *
+ * @param mapping Memory mapping of the universal binary
+ * @param cb Callback function to process strings
+ * @param userdata User data for the callback
+ * @param minLength Minimum string length to extract
+ *
+ * @return NULL on success, error message on failure
+ */
+static const char* dumpFatHeader(const FFMemoryMapping* mapping, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength) {
+    const struct fat_header* headerRaw = readData(mapping, sizeof(struct fat_header), 0);
+    if (!headerRaw) {
+        return "read fat header failed";
+    }
+
+    struct fat_header header = *headerRaw;
+
+    bool needSwap = header.magic == FAT_CIGAM || header.magic == FAT_CIGAM_64;
+
+    if (needSwap) {
+        swap_fat_header(&header, NX_UnknownByteOrder);
+    }
+
+    for (uint32_t i = 0U; i < header.nfat_arch; i++) {
+        off_t machHeaderOffset = 0;
+        if (header.magic == FAT_MAGIC) {
+            off_t archOffset = (off_t) sizeof(struct fat_header) + (off_t) (i * sizeof(struct fat_arch));
+            const struct fat_arch* archRaw = readData(mapping, sizeof(struct fat_arch), archOffset);
+            if (!archRaw) {
+                continue;
+            }
+
+            struct fat_arch arch = *archRaw;
+
+            if (needSwap) {
+                swap_fat_arch(&arch, 1, NX_UnknownByteOrder);
+            }
+            machHeaderOffset = (off_t) arch.offset;
+        } else {
+            off_t archOffset = (off_t) sizeof(struct fat_header) + (off_t) (i * sizeof(struct fat_arch_64));
+            const struct fat_arch_64* archRaw = readData(mapping, sizeof(struct fat_arch_64), archOffset);
+            if (!archRaw) {
+                continue;
+            }
+
+            struct fat_arch_64 arch = *archRaw;
+
+            if (needSwap) {
+                swap_fat_arch_64(&arch, 1, NX_UnknownByteOrder);
+            }
+
+            machHeaderOffset = (off_t) arch.offset;
+        }
+
+        const uint32_t* magic = readData(mapping, sizeof(uint32_t), machHeaderOffset);
+        if (!magic) {
+            continue;
+        }
+
+        if (*magic == MH_MAGIC_64 || *magic == MH_MAGIC) {
+            return dumpMachHeader(mapping, machHeaderOffset, *magic == MH_MAGIC_64, cb, userdata, minLength);
+        }
+    }
+    return "Unsupported fat header";
+}
+
+/**
+ * Extracts string literals from a Mach-O (Apple) binary file
+ *
+ * This function supports both single-architecture Mach-O files and
+ * universal binaries (fat binaries) containing multiple architectures.
+ * It locates the __cstring section in the __TEXT segment which contains
+ * the string literals used in the program.
+ */
+const char* ffBinaryExtractStrings(const char* machoFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength) {
+    FF_AUTO_CLOSE_FD int fd = open(machoFile, O_RDONLY | O_CLOEXEC);
+    if (fd < 0) {
+        return "File could not be opened";
+    }
+
+    struct stat st;
+    if (fstat(fd, &st) != 0 || st.st_size <= 0) {
+        return "Failed to stat file";
+    }
+
+    FF_A_CLEANUP(wrapMunmap) FFMemoryMapping mapping = {
+        .data = mmap(NULL, (size_t) st.st_size, PROT_READ, MAP_PRIVATE, fd, 0),
+        .length = (size_t) st.st_size,
+    };
+    if (mapping.data == MAP_FAILED) {
+        return "mmap failed";
+    }
+
+    // Read the magic number to determine the type of binary
+    const uint32_t* magic = readData(&mapping, sizeof(uint32_t), 0);
+    if (!magic) {
+        return "read magic number failed";
+    }
+
+    // Check for supported formats
+    // MH_CIGAM and MH_CIGAM_64 seem to be no longer used, as `swap_mach_header` is marked as deprecated.
+    // However FAT_CIGAM and FAT_CIGAM_64 are still used (/usr/bin/vim).
+    if (*magic != MH_MAGIC && *magic != MH_MAGIC_64 && *magic != FAT_CIGAM && *magic != FAT_CIGAM_64 && *magic != FAT_MAGIC && *magic != FAT_MAGIC_64) {
+        return "Unsupported format or big endian mach-o file";
+    }
+
+    // Process either a fat binary or a regular Mach-O binary
+    if (*magic == FAT_MAGIC || *magic == FAT_MAGIC_64 || *magic == FAT_CIGAM || *magic == FAT_CIGAM_64) {
+        return dumpFatHeader(&mapping, cb, userdata, minLength);
+    } else {
+        return dumpMachHeader(&mapping, 0, *magic == MH_MAGIC_64, cb, userdata, minLength);
+    }
+}
@@ -1,13 +1,13 @@
-#include "binary.h"
+#include "common/binary.h"

 #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__)

-#include "common/io/io.h"
-#include "common/library.h"
-#include "util/stringUtils.h"
+    #include "common/io.h"
+    #include "common/library.h"
+    #include "common/strutil.h"

-#include <libelf.h> // #1254
-#include <fcntl.h>
+    #include <libelf.h> // #1254
+    #include <fcntl.h>

 /**
 * Structure to hold dynamically loaded libelf function pointers
@@ -36,15 +36,15 @@ struct FFElfData {
 *
 * The function supports both 32-bit and 64-bit ELF formats.
 */
-const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength)
-{
+const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength) {
    // Initialize libelf if not already done
-    if (!elfData.inited)
-    {
+    if (!elfData.inited) {
        elfData.inited = true;
-        FF_LIBRARY_LOAD(libelf, "dlopen libelf" FF_LIBRARY_EXTENSION " failed", "libelf" FF_LIBRARY_EXTENSION, 1);
+        FF_LIBRARY_LOAD_MESSAGE(libelf, "libelf" FF_LIBRARY_EXTENSION, 1);
        FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libelf, elfData, elf_version)
-        if (elfData.ffelf_version(EV_CURRENT) == EV_NONE) return "elf_version() failed";
+        if (elfData.ffelf_version(EV_CURRENT) == EV_NONE) {
+            return "elf_version() failed";
+        }

        // Load all required libelf functions
        FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libelf, elfData, elf_begin)
@@ -59,56 +59,70 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s
        libelf = NULL;
    }

-    if (elfData.ffelf_end == NULL)
+    if (elfData.ffelf_end == NULL) {
        return "load libelf failed";
+    }

    // Open the ELF file
    FF_AUTO_CLOSE_FD int fd = open(elfFile, O_RDONLY | O_CLOEXEC);
-    if (fd < 0) return "open() failed";
+    if (fd < 0) {
+        return "open() failed";
+    }

    Elf* elf = elfData.ffelf_begin(fd, ELF_C_READ, NULL);
-    if (elf == NULL) return "elf_begin() failed";
+    if (elf == NULL) {
+        return "elf_begin() failed";
+    }

    // Get the section header string table index
    size_t shstrndx = 0;
-    if (elfData.ffelf_getshdrstrndx(elf, &shstrndx) < 0)
-    {
+    if (elfData.ffelf_getshdrstrndx(elf, &shstrndx) < 0) {
        elfData.ffelf_end(elf);
        return "elf_getshdrstrndx() failed";
    }

    // Iterate through all sections, looking for .rodata which contains string literals
    Elf_Scn* scn = NULL;
-    while ((scn = elfData.ffelf_nextscn(elf, scn)) != NULL)
-    {
+    while ((scn = elfData.ffelf_nextscn(elf, scn)) != NULL) {
        // Try 64-bit section header first, then 32-bit if that fails
        Elf64_Shdr* shdr64 = elfData.ffelf64_getshdr(scn);
        Elf32_Shdr* shdr32 = NULL;
-        if (shdr64 == NULL)
-        {
+        if (shdr64 == NULL) {
            shdr32 = elfData.ffelf32_getshdr(scn);
-            if (shdr32 == NULL) continue;
+            if (shdr32 == NULL) {
+                continue;
+            }
        }

        // Get the section name and check if it's .rodata
        const char* name = elfData.ffelf_strptr(elf, shstrndx, shdr64 ? shdr64->sh_name : shdr32->sh_name);
-        if (name == NULL || !ffStrEquals(name, ".rodata")) continue;
+        if (name == NULL || !ffStrEquals(name, ".rodata")) {
+            continue;
+        }

        // Get the section data
        Elf_Data* data = elfData.ffelf_getdata(scn, NULL);
-        if (data == NULL) continue;
+        if (data == NULL) {
+            continue;
+        }

        // Scan the section for string literals
-        for (size_t off = 0; off < data->d_size; ++off)
-        {
+        for (size_t off = 0; off < data->d_size; ++off) {
            const char* p = (const char*) data->d_buf + off;
-            if (*p == '\0') continue;
-            uint32_t len = (uint32_t) strlen(p);
-            if (len < minLength) continue;
+            if (*p == '\0') {
+                continue;
+            }
+            uint32_t len = (uint32_t) strnlen(p, data->d_size - off);
+            if (len < minLength) {
+                off += len;
+                continue;
+            }
            // Only process printable ASCII characters
            if (*p >= ' ' && *p <= '~') // Ignore control characters
            {
-                if (!cb(p, len, userdata)) break;
+                if (!cb(p, len, userdata)) {
+                    break;
+                }
            }
            off += len;
        }
@@ -125,8 +139,7 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s
 /**
 * Fallback implementation when libelf is not available
 */
-const char* ffBinaryExtractStrings(const char* file, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength)
-{
+const char* ffBinaryExtractStrings(const char* file, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength) {
    FF_UNUSED(file, cb, userdata, minLength);
    return "Fastfetch was built without libelf support";
 }
@@ -0,0 +1,71 @@
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/strutil.h"
+#include "common/windows/nt.h"
+
+#include <windows.h>
+#include <stdlib.h>
+#include <string.h>
+
+/**
+ * Extracts string literals from a PE (Windows) executable
+ *
+ * This function maps the PE file into memory, locates the .rdata section
+ * (which typically contains string literals), and scans it for valid strings.
+ * Each string found is passed to the callback function for processing.
+ */
+const char* ffBinaryExtractStrings(const char* peFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength) {
+    FF_AUTO_CLOSE_FD HANDLE hFile = CreateFileA(peFile, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (hFile == INVALID_HANDLE_VALUE) {
+        return "CreateFileA() failed";
+    }
+
+    FF_AUTO_CLOSE_FD HANDLE hSection = NULL;
+    if (!NT_SUCCESS(NtCreateSection(&hSection, SECTION_MAP_READ, NULL, NULL, PAGE_READONLY, SEC_COMMIT, hFile))) {
+        return "NtCreateSection() failed";
+    }
+
+    PVOID base = NULL;
+    SIZE_T viewSize = 0;
+    if (!NT_SUCCESS(NtMapViewOfSection(hSection, NtCurrentProcess(), &base, 0, 0, NULL, &viewSize, ViewUnmap, 0, PAGE_READONLY))) {
+        return "NtMapViewOfSection() failed";
+    }
+
+    PIMAGE_NT_HEADERS ntHeaders = RtlImageNtHeader(base);
+    if (!ntHeaders) {
+        NtUnmapViewOfSection(NtCurrentProcess(), base);
+        return "RtlImageNtHeader() failed";
+    }
+
+    PIMAGE_SECTION_HEADER section = IMAGE_FIRST_SECTION(ntHeaders);
+    for (WORD i = 0; i < ntHeaders->FileHeader.NumberOfSections; ++i, ++section) {
+        // Look for initialized data sections with the name ".rdata" which typically contains string literals
+        if ((section->Characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA) && ffStrEquals((const char*) section->Name, ".rdata")) {
+            uint8_t* data = (uint8_t*) base + section->PointerToRawData;
+
+            // Scan the section for string literals
+            for (size_t off = 0; off < section->SizeOfRawData; ++off) {
+                const char* p = (const char*) data + off;
+                if (*p == '\0') {
+                    continue;
+                }
+                uint32_t len = (uint32_t) strnlen(p, section->SizeOfRawData - off);
+                if (len < minLength) {
+                    off += len;
+                    continue;
+                }
+                // Only process printable ASCII characters
+                if (*p >= ' ' && *p <= '~') // Ignore control characters
+                {
+                    if (!cb(p, len, userdata)) {
+                        break;
+                    }
+                }
+                off += len;
+            }
+        }
+    }
+
+    NtUnmapViewOfSection(NtCurrentProcess(), base);
+    return NULL;
+}
@@ -0,0 +1,261 @@
+#include "common/commandoption.h"
+#include "common/color.h"
+#include "common/printing.h"
+#include "common/time.h"
+#include "common/jsonconfig.h"
+#include "common/strutil.h"
+#include "fastfetch_datatext.h"
+#include "modules/modules.h"
+
+#include <ctype.h>
+#include <inttypes.h>
+
+bool ffParseModuleOptions(const char* key, const char* value) {
+    if (!ffStrStartsWith(key, "--") || !ffCharIsEnglishAlphabet(key[2])) {
+        return false;
+    }
+    if (value && !*value) {
+        value = NULL;
+    }
+    for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(key[2]) - 'A']; *modules; ++modules) {
+        FFModuleBaseInfo* baseInfo = *modules;
+        const char* subKey = ffOptionTestPrefix(key, baseInfo->name);
+        if (subKey != NULL) {
+            if (subKey[0] == '\0' || subKey[0] == '-') // Key is exactly the module name or has a leading '-'
+            {
+                fprintf(stderr, "Error: unknown module key %s\n", key);
+                exit(477);
+            }
+
+            FF_STRBUF_AUTO_DESTROY moduleName = ffStrbufCreateS(baseInfo->name);
+            ffStrbufLowerCase(&moduleName);
+
+            FF_STRBUF_AUTO_DESTROY jsonKey = ffStrbufCreate();
+            bool flag = false;
+            for (const char* p = subKey; *p; ++p) {
+                if (*p == '-') {
+                    if (flag) {
+                        fprintf(stderr, "Error: invalid double `-` in module key %s\n", key);
+                        exit(477);
+                    }
+                    flag = true;
+                } else {
+                    if (!isalpha((unsigned char) *p) && !isdigit((unsigned char) *p)) {
+                        fprintf(stderr, "Error: invalid character `%c` in module key %s\n", *p, key);
+                        exit(477);
+                    }
+
+                    if (flag) {
+                        flag = false;
+                        ffStrbufAppendC(&jsonKey, (char) toupper((unsigned char) *p));
+                    } else {
+                        ffStrbufAppendC(&jsonKey, *p);
+                    }
+                }
+            }
+            fprintf(stderr, "Error: Unsupported module option: %s\n", key);
+            fputs("       Support of module options has been removed. Please add the flag to the JSON config instead.\n", stderr);
+            fprintf(stderr, "       Example (demonstration only): `{ \"modules\": [ { \"type\": \"%s\", \"%s\": %s%s%s } ] }`\n", moduleName.chars, jsonKey.chars, value ? "\"" : "", value ?: "true", value ? "\"" : "");
+            fputs("       See <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration> for more information.\n", stderr);
+            exit(477);
+        }
+    }
+    return false;
+}
+
+void ffPrepareCommandOption(FFdata* data) {
+    char* moduleType = NULL;
+    size_t moduleLen = 0;
+    while (ffStrbufGetdelim(&moduleType, &moduleLen, ':', &data->structure)) {
+#define FF_IF_MODULE_MATCH(moduleNameConstant) if (moduleLen == strlen(moduleNameConstant) && ffStrEqualsIgnCase(moduleType, moduleNameConstant) && !ffStrbufSeparatedContainIgnCaseS(&data->structureDisabled, moduleNameConstant, ':'))
+
+        switch (moduleType[0]) {
+            #if !FF_MODULE_DISABLE_CPUUSAGE
+            case 'C':
+            case 'c':
+                FF_IF_MODULE_MATCH(FF_CPUUSAGE_MODULE_NAME)
+                ffPrepareCPUUsage();
+                break;
+            #endif
+
+            #if !FF_MODULE_DISABLE_DISKIO
+            case 'D':
+            case 'd':
+                FF_IF_MODULE_MATCH(FF_DISKIO_MODULE_NAME) {
+                    FF_A_CLEANUP(ffDestroyDiskIOOptions) FFDiskIOOptions options;
+                    ffInitDiskIOOptions(&options);
+                    ffPrepareDiskIO(&options);
+                }
+                break;
+            #endif
+
+            #if !FF_MODULE_DISABLE_NETIO
+            case 'N':
+            case 'n':
+                FF_IF_MODULE_MATCH(FF_NETIO_MODULE_NAME) {
+                    FF_A_CLEANUP(ffDestroyNetIOOptions) FFNetIOOptions options;
+                    ffInitNetIOOptions(&options);
+                    ffPrepareNetIO(&options);
+                }
+                break;
+            #endif
+
+            #if !FF_MODULE_DISABLE_PUBLICIP
+            case 'P':
+            case 'p':
+                FF_IF_MODULE_MATCH(FF_PUBLICIP_MODULE_NAME) {
+                    FF_A_CLEANUP(ffDestroyPublicIpOptions) FFPublicIPOptions options;
+                    ffInitPublicIpOptions(&options);
+                    ffPreparePublicIp(&options);
+                }
+                break;
+            #endif
+
+            #if !FF_MODULE_DISABLE_WEATHER
+            case 'W':
+            case 'w':
+                FF_IF_MODULE_MATCH(FF_WEATHER_MODULE_NAME) {
+                    FF_A_CLEANUP(ffDestroyWeatherOptions) FFWeatherOptions options;
+                    ffInitWeatherOptions(&options);
+                    ffPrepareWeather(&options);
+                }
+                break;
+            #endif
+        }
+
+#undef FF_IF_MODULE_MATCH
+    }
+}
+
+static void genJsonConfig(FFdata* data, FFModuleBaseInfo* baseInfo, void* options) {
+    yyjson_mut_doc* doc = data->resultDoc;
+
+    yyjson_mut_val* modules = yyjson_mut_obj_get(doc->root, "modules");
+    if (!modules) {
+        modules = yyjson_mut_obj_add_arr(doc, doc->root, "modules");
+    }
+
+    FF_STRBUF_AUTO_DESTROY type = ffStrbufCreateS(baseInfo->name);
+    ffStrbufLowerCase(&type);
+
+    if (data->docType == FF_RESULT_DOC_TYPE_CONFIG_FULL) {
+        yyjson_mut_val* module = yyjson_mut_obj(doc);
+        yyjson_mut_obj_add_strbuf(doc, module, "type", &type);
+
+        if (baseInfo->generateJsonConfig) {
+            baseInfo->generateJsonConfig(options, doc, module);
+        }
+
+        if (yyjson_mut_obj_size(module) > 1) {
+            yyjson_mut_arr_add_val(modules, module);
+        } else {
+            yyjson_mut_arr_add_strbuf(doc, modules, &type);
+        }
+    } else {
+        yyjson_mut_arr_add_strbuf(doc, modules, &type);
+    }
+}
+
+static void genJsonResult(FFdata* data, FFModuleBaseInfo* baseInfo, void* options) {
+    yyjson_mut_doc* doc = data->resultDoc;
+    yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root);
+    yyjson_mut_obj_add_str(doc, module, "type", baseInfo->name);
+    if (baseInfo->generateJsonResult) {
+        baseInfo->generateJsonResult(options, doc, module);
+    } else {
+        yyjson_mut_obj_add_str(doc, module, "error", "Unsupported for JSON format");
+    }
+}
+
+static bool parseStructureCommand(
+    FFdata* data,
+    const char* line,
+    void (*fn)(FFdata*, FFModuleBaseInfo* baseInfo, void* options)) {
+    if (ffCharIsEnglishAlphabet(line[0])) {
+        for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(line[0]) - 'A']; *modules; ++modules) {
+            FFModuleBaseInfo* baseInfo = *modules;
+            if (ffStrEqualsIgnCase(line, baseInfo->name)) {
+                uint8_t optionBuf[FF_OPTION_MAX_SIZE];
+                baseInfo->initOptions(optionBuf);
+                if (data->resultDoc != NULL) {
+                    fn(data, baseInfo, optionBuf);
+                } else {
+                    baseInfo->printModule(optionBuf);
+                }
+                baseInfo->destroyOptions(optionBuf);
+                return true;
+            }
+        }
+    }
+
+    if (data->resultDoc) {
+        yyjson_mut_doc* doc = data->resultDoc;
+        yyjson_mut_val* module = yyjson_mut_arr_add_obj(doc, doc->root);
+        yyjson_mut_obj_add_str(doc, module, "type", line);
+        yyjson_mut_obj_add_str(doc, module, "error", "Unknown module type");
+    } else {
+        ffPrintError(line, 0, NULL, FF_PRINT_TYPE_NO_CUSTOM_KEY, "<no implementation provided>");
+    }
+    return false;
+}
+
+void ffPrintCommandOption(FFdata* data) {
+    // Parse the structure and call the modules
+    int32_t thres = instance.config.display.stat;
+
+    char* moduleType = NULL;
+    size_t moduleLen = 0;
+    while (ffStrbufGetdelim(&moduleType, &moduleLen, ':', &data->structure)) {
+        if (ffStrbufSeparatedContainIgnCaseS(&data->structureDisabled, moduleType, ':')) {
+            continue;
+        }
+
+        double ms = 0;
+        if (thres >= 0) {
+            ms = ffTimeGetTick();
+        }
+
+        parseStructureCommand(data, moduleType, genJsonResult);
+
+        if (thres >= 0) {
+            ms = ffTimeGetTick() - ms;
+
+            if (data->resultDoc) {
+                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(data->resultDoc->root);
+                yyjson_mut_obj_add_real(data->resultDoc, moduleJson, "stat", ms);
+            } else {
+                char str[64];
+                int len = snprintf(str, sizeof str, "%.3fms", ms);
+                if (thres > 0) {
+                    snprintf(str, sizeof str, "\e[%sm%.3fms\e[m", (ms <= thres ? FF_COLOR_FG_GREEN : ms <= 2 * thres ? FF_COLOR_FG_YELLOW
+                                                                                                                     : FF_COLOR_FG_RED),
+                        ms);
+                }
+                printf("\e7\e[1A\e[9999999C\e[%dD%s\e8", len - 1, str); // Save; Up 1; Right 9999999; Left <len - 1>; Print <str>; Load
+            }
+        }
+
+#if defined(_WIN32)
+        if (!data->resultDoc && !instance.config.display.noBuffer) {
+            fflush(stdout);
+        }
+#endif
+    }
+}
+
+void ffMigrateCommandOptionToJsonc(FFdata* data) {
+    // If we don't have a custom structure, use the default one
+    if (data->structure.length == 0) {
+        ffStrbufAppendS(&data->structure, FASTFETCH_DATATEXT_STRUCTURE); // Cannot use `ffStrbufSetStatic` here because we will modify the string
+    }
+
+    char* moduleType = NULL;
+    size_t moduleLen = 0;
+    while (ffStrbufGetdelim(&moduleType, &moduleLen, ':', &data->structure)) {
+        if (ffStrbufSeparatedContainIgnCaseS(&data->structureDisabled, moduleType, ':')) {
+            continue;
+        }
+
+        parseStructureCommand(data, moduleType, genJsonConfig);
+    }
+}
@@ -1,12 +1,11 @@
-#include "dbus.h"
+#include "common/dbus.h"

 #ifdef FF_HAVE_DBUS

-#include "common/thread.h"
-#include "util/stringUtils.h"
+    #include "common/thread.h"
+    #include "common/strutil.h"

-static bool loadLibSymbols(FFDBusLibrary* lib)
-{
+static bool loadLibSymbols(FFDBusLibrary* lib) {
    FF_LIBRARY_LOAD(dbus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_bus_get, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_new_method_call, false)
@@ -19,18 +18,17 @@ static bool loadLibSymbols(FFDBusLibrary* lib)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_next, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_unref, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_send_with_reply_and_block, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_unref, false)
    dbus = NULL; // don't auto dlclose
    return true;
 }

-static const FFDBusLibrary* loadLib(void)
-{
+static const FFDBusLibrary* loadLib(void) {
    static FFDBusLibrary lib;
    static bool loaded = false;
    static bool loadSuccess = false;

-    if(!loaded)
-    {
+    if (!loaded) {
        loaded = true;
        loadSuccess = loadLibSymbols(&lib);
    }
@@ -38,190 +36,234 @@ static const FFDBusLibrary* loadLib(void)
    return loadSuccess ? &lib : NULL;
 }

-const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data)
-{
+const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data) {
    data->lib = loadLib();
-    if(data->lib == NULL)
+    if (data->lib == NULL) {
        return "Failed to load DBus library";
+    }

    data->connection = data->lib->ffdbus_bus_get(busType, NULL);
-    if(data->connection == NULL)
+    if (data->connection == NULL) {
        return "Failed to connect to DBus";
+    }

    return NULL;
 }

-bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
-{
+void ffDBusDestroyData(FFDBusData* data) {
+    if (data->connection != NULL) {
+        data->lib->ffdbus_connection_unref(data->connection);
+        data->connection = NULL;
+    }
+}
+
+bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result) {
    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);

-    if(argType == DBUS_TYPE_STRING || argType == DBUS_TYPE_OBJECT_PATH)
-    {
+    if (argType == DBUS_TYPE_STRING || argType == DBUS_TYPE_OBJECT_PATH) {
        const char* value = NULL;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);

-        if(!ffStrSet(value))
+        if (!ffStrSet(value)) {
            return false;
+        }

        ffStrbufAppendS(result, value);
        return true;
    }

-    if (argType == DBUS_TYPE_BYTE)
-    {
+    if (argType == DBUS_TYPE_BYTE) {
        uint8_t value;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
        ffStrbufAppendC(result, (char) value);
-        return false; // Don't append a comma
+        return true;
    }

-    if(argType != DBUS_TYPE_VARIANT && argType != DBUS_TYPE_ARRAY)
+    if (argType != DBUS_TYPE_VARIANT && argType != DBUS_TYPE_ARRAY) {
        return false;
+    }

    DBusMessageIter subIter;
    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);

-    if(argType == DBUS_TYPE_VARIANT)
+    if (argType == DBUS_TYPE_VARIANT) {
        return ffDBusGetString(dbus, &subIter, result);
+    }

-    //At this point we have an array
+    // At this point we have an array
+
+    int subArgType = dbus->lib->ffdbus_message_iter_get_arg_type(&subIter);
+    if (subArgType == DBUS_TYPE_INVALID) {
+        return false;
+    }
+
+    if (subArgType == DBUS_TYPE_BYTE) {
+        while (true) {
+            uint8_t value;
+            dbus->lib->ffdbus_message_iter_get_basic(&subIter, &value);
+            ffStrbufAppendC(result, (char) value);
+
+            if (!dbus->lib->ffdbus_message_iter_next(&subIter)) {
+                break;
+            }
+        }
+
+        return true;
+    }

    bool foundAValue = false;

-    while(true)
-    {
-        if(ffDBusGetString(dbus, &subIter, result))
-        {
+    while (true) {
+        if (ffDBusGetString(dbus, &subIter, result)) {
            foundAValue = true;
            ffStrbufAppendS(result, ", ");
        }

-        if(!dbus->lib->ffdbus_message_iter_next(&subIter))
+        if (!dbus->lib->ffdbus_message_iter_next(&subIter)) {
            break;
-        else
+        } else {
            continue;
+        }
    }

-    if(foundAValue)
+    if (foundAValue) {
        ffStrbufSubstrBefore(result, result->length - 2);
+    }

    return foundAValue;
 }

-bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result)
-{
+bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result) {
    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);

-    if(argType == DBUS_TYPE_BOOLEAN)
-    {
+    if (argType == DBUS_TYPE_BOOLEAN) {
        dbus_bool_t value = 0;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
        *result = value != 0;
        return true;
    }

-    if(argType != DBUS_TYPE_VARIANT)
+    if (argType != DBUS_TYPE_VARIANT) {
        return false;
+    }

    DBusMessageIter subIter;
    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
    return ffDBusGetBool(dbus, &subIter, result);
 }

-bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint32_t* result)
-{
+bool ffDBusGetUint(FFDBusData* dbus, DBusMessageIter* iter, uint64_t* result) {
    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);

-    if(argType == DBUS_TYPE_BYTE)
-    {
+    if (argType == DBUS_TYPE_BYTE) {
        uint8_t value = 0;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
        *result = value;
        return true;
    }

-    if(argType == DBUS_TYPE_UINT16)
-    {
+    if (argType == DBUS_TYPE_UINT16) {
        uint16_t value = 0;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
        *result = value;
        return true;
    }

-    if(argType == DBUS_TYPE_UINT32)
-    {
+    if (argType == DBUS_TYPE_UINT32) {
+        uint32_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
+        return true;
+    }
+
+    if (argType == DBUS_TYPE_UINT64) {
        dbus->lib->ffdbus_message_iter_get_basic(iter, result);
        return true;
    }

-    if(argType != DBUS_TYPE_VARIANT)
+    if (argType != DBUS_TYPE_VARIANT) {
        return false;
+    }

    DBusMessageIter subIter;
    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
    return ffDBusGetUint(dbus, &subIter, result);
 }

-bool ffDBusGetInt(FFDBusData* dbus, DBusMessageIter* iter, int32_t* result)
-{
+bool ffDBusGetInt(FFDBusData* dbus, DBusMessageIter* iter, int64_t* result) {
    int argType = dbus->lib->ffdbus_message_iter_get_arg_type(iter);

-    if(argType == DBUS_TYPE_INT16)
-    {
+    if (argType == DBUS_TYPE_INT16) {
        int16_t value = 0;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
        *result = value;
        return true;
    }

-    if(argType == DBUS_TYPE_INT32)
-    {
+    if (argType == DBUS_TYPE_INT32) {
+        int32_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
+        return true;
+    }
+
+    if (argType == DBUS_TYPE_INT64) {
        dbus->lib->ffdbus_message_iter_get_basic(iter, result);
        return true;
    }

-    if(argType == DBUS_TYPE_BYTE)
-    {
+    if (argType == DBUS_TYPE_BYTE) {
        uint8_t value = 0;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
        *result = value;
        return true;
    }

-    if(argType == DBUS_TYPE_UINT16)
-    {
+    if (argType == DBUS_TYPE_UINT16) {
        uint16_t value = 0;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
-        *result = (int16_t) value;
+        *result = (int32_t) value;
        return true;
    }

-    if(argType == DBUS_TYPE_UINT32)
-    {
-        dbus->lib->ffdbus_message_iter_get_basic(iter, result);
+    if (argType == DBUS_TYPE_UINT32) {
+        uint32_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = (int32_t) value;
        return true;
    }

-    if(argType != DBUS_TYPE_VARIANT)
+    if (argType == DBUS_TYPE_UINT64) {
+        uint64_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        if (value > INT64_MAX) {
+            return false;
+        }
+        *result = (int64_t) value;
+        return true;
+    }
+
+    if (argType != DBUS_TYPE_VARIANT) {
        return false;
+    }

    DBusMessageIter subIter;
    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);
    return ffDBusGetInt(dbus, &subIter, result);
 }

-DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg1, const char* arg2)
-{
+DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg1, const char* arg2) {
    DBusMessage* message = dbus->lib->ffdbus_message_new_method_call(busName, objectPath, interface, method);
-    if(message == NULL)
+    if (message == NULL) {
        return NULL;
+    }

-    if (arg1)
-    {
-        if (arg2)
+    if (arg1) {
+        if (arg2) {
            dbus->lib->ffdbus_message_append_args(message, DBUS_TYPE_STRING, &arg1, DBUS_TYPE_STRING, &arg2, DBUS_TYPE_INVALID);
-        else
+        } else {
            dbus->lib->ffdbus_message_append_args(message, DBUS_TYPE_STRING, &arg1, DBUS_TYPE_INVALID);
+        }
    }

    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, instance.config.general.processingTimeout, NULL);
@@ -231,15 +273,17 @@ DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const c
    return reply;
 }

-DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property)
-{
+DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property) {
    DBusMessage* message = dbus->lib->ffdbus_message_new_method_call(busName, objectPath, "org.freedesktop.DBus.Properties", "Get");
-    if(message == NULL)
+    if (message == NULL) {
        return NULL;
+    }

    dbus->lib->ffdbus_message_append_args(message,
-        DBUS_TYPE_STRING, &interface,
-        DBUS_TYPE_STRING, &property,
+        DBUS_TYPE_STRING,
+        &interface,
+        DBUS_TYPE_STRING,
+        &property,
        DBUS_TYPE_INVALID);

    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, instance.config.general.processingTimeout, NULL);
@@ -249,15 +293,14 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
    return reply;
 }

-bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result)
-{
+bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result) {
    DBusMessage* reply = ffDBusGetProperty(dbus, busName, objectPath, interface, property);
-    if(reply == NULL)
+    if (reply == NULL) {
        return false;
+    }

    DBusMessageIter rootIterator;
-    if(!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator))
-    {
+    if (!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator)) {
        dbus->lib->ffdbus_message_unref(reply);
        return false;
    }
@@ -269,15 +312,14 @@ bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char*
    return ret;
 }

-bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result)
-{
+bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint64_t* result) {
    DBusMessage* reply = ffDBusGetProperty(dbus, busName, objectPath, interface, property);
-    if(reply == NULL)
+    if (reply == NULL) {
        return false;
+    }

    DBusMessageIter rootIterator;
-    if(!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator))
-    {
+    if (!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator)) {
        dbus->lib->ffdbus_message_unref(reply);
        return false;
    }
@@ -289,4 +331,4 @@ bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* ob
    return ret;
 }

-#endif //FF_HAVE_DBUS
+#endif // FF_HAVE_DBUS
@@ -0,0 +1,55 @@
+#include "common/debug.h"
+#include "common/windows/nt.h"
+
+#include <windows.h>
+
+const char* ffDebugWin32Error(DWORD errorCode) {
+    static char buffer[512];
+
+    wchar_t bufferW[256];
+    ULONG len = FormatMessageW(
+        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+        NULL,
+        (DWORD) errorCode,
+        0,
+        bufferW,
+        ARRAY_SIZE(bufferW),
+        NULL);
+
+    if (len == 0) {
+        snprintf(buffer, sizeof(buffer), "Unknown error code (%lu)", errorCode);
+    } else {
+        // Remove trailing newline
+        while (len > 0 && (bufferW[len - 1] == '\r' || bufferW[len - 1] == '\n')) {
+            --len;
+        }
+
+        if (NT_SUCCESS(RtlUnicodeToUTF8N(buffer, sizeof(buffer), &len, bufferW, len * sizeof(wchar_t)))) {
+            snprintf(buffer + len, sizeof(buffer) - len, " (%lu)", errorCode);
+        } else {
+            snprintf(buffer, sizeof(buffer), "Unknown error (%lu)", errorCode);
+        }
+    }
+
+    return buffer;
+}
+
+const char* ffDebugNtStatus(NTSTATUS status) {
+    return ffDebugWin32Error(RtlNtStatusToDosError(status));
+}
+
+static inline DWORD HRESULTToWin32Error(HRESULT hr) {
+    if (SUCCEEDED(hr)) {
+        return ERROR_SUCCESS;
+    }
+
+    if (HRESULT_FACILITY(hr) == FACILITY_WIN32) {
+        return HRESULT_CODE(hr);
+    }
+
+    return ERROR_INTERNAL_ERROR;
+}
+
+const char* ffDebugHResult(HRESULT hr) {
+    return ffDebugWin32Error(HRESULTToWin32Error(hr));
+}
@@ -1,25 +1,27 @@
-#include "duration.h"
+#include "common/duration.h"

-void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result)
-{
+void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result) {
    const FFOptionsDisplay* options = &instance.config.display;

    bool spaceBeforeUnit = options->durationSpaceBeforeUnit != FF_SPACE_BEFORE_UNIT_NEVER;

-    if (totalSeconds < 60)
-    {
+    if (totalSeconds < 60) {
        ffStrbufAppendUInt(result, totalSeconds);
-        if (spaceBeforeUnit) ffStrbufAppendC(result, ' ');
+        if (spaceBeforeUnit) {
+            ffStrbufAppendC(result, ' ');
+        }
        ffStrbufAppendS(result, options->durationAbbreviation ? "sec" : "second");
-        if (totalSeconds != 1)
+        if (totalSeconds != 1) {
            ffStrbufAppendC(result, 's');
+        }
        return;
    }

    uint32_t seconds = (uint32_t) (totalSeconds % 60);
    totalSeconds /= 60;
-    if (seconds >= 30)
+    if (seconds >= 30) {
        totalSeconds++;
+    }

    uint32_t minutes = (uint32_t) (totalSeconds % 60);
    totalSeconds /= 60;
@@ -27,56 +29,59 @@ void ffDurationAppendNum(uint64_t totalSeconds, FFstrbuf* result)
    totalSeconds /= 24;
    uint32_t days = (uint32_t) totalSeconds;

-    if (days > 0)
-    {
+    if (days > 0) {
        ffStrbufAppendUInt(result, days);
-        if (spaceBeforeUnit) ffStrbufAppendC(result, ' ');
-        if (options->durationAbbreviation)
-        {
+        if (spaceBeforeUnit) {
+            ffStrbufAppendC(result, ' ');
+        }
+        if (options->durationAbbreviation) {
            ffStrbufAppendC(result, 'd');

-            if (hours > 0 || minutes > 0)
+            if (hours > 0 || minutes > 0) {
                ffStrbufAppendC(result, ' ');
-        }
-        else
-        {
+            }
+        } else {
            ffStrbufAppendS(result, days == 1 ? "day" : "days");

-            if (days >= 100)
+            if (days >= 100) {
                ffStrbufAppendS(result, "(!)");
+            }

-            if (hours > 0 || minutes > 0)
+            if (hours > 0 || minutes > 0) {
                ffStrbufAppendS(result, ", ");
+            }
        }
    }

-    if (hours > 0)
-    {
+    if (hours > 0) {
        ffStrbufAppendUInt(result, hours);
-        if (spaceBeforeUnit) ffStrbufAppendC(result, ' ');
-        if (options->durationAbbreviation)
-        {
+        if (spaceBeforeUnit) {
+            ffStrbufAppendC(result, ' ');
+        }
+        if (options->durationAbbreviation) {
            ffStrbufAppendC(result, 'h');

-            if (minutes > 0)
+            if (minutes > 0) {
                ffStrbufAppendC(result, ' ');
-        }
-        else
-        {
+            }
+        } else {
            ffStrbufAppendS(result, hours == 1 ? "hour" : "hours");

-            if (minutes > 0)
+            if (minutes > 0) {
                ffStrbufAppendS(result, ", ");
+            }
        }
    }

-    if (minutes > 0)
-    {
+    if (minutes > 0) {
        ffStrbufAppendUInt(result, minutes);
-        if (spaceBeforeUnit) ffStrbufAppendC(result, ' ');
-        if (options->durationAbbreviation)
+        if (spaceBeforeUnit) {
+            ffStrbufAppendC(result, ' ');
+        }
+        if (options->durationAbbreviation) {
            ffStrbufAppendC(result, 'm');
-        else
+        } else {
            ffStrbufAppendS(result, minutes == 1 ? "min" : "mins");
+        }
    }
 }
@@ -0,0 +1,132 @@
+#include "common/edidHelper.h"
+
+void ffEdidGetPhysicalResolution(const uint8_t edid[128], uint32_t* width, uint32_t* height) {
+    const int dtd = 54;
+    *width = (((uint32_t) edid[dtd + 4] >> 4) << 8) | edid[dtd + 2];
+    *height = (((uint32_t) edid[dtd + 7] >> 4) << 8) | edid[dtd + 5];
+}
+
+void ffEdidGetPreferredResolutionAndRefreshRate(const uint8_t edid[128], uint32_t* width, uint32_t* height, double* refreshRate) {
+    for (uint32_t i = 0x36; i < 0x7E; i += 0x12) {    // read through descriptor blocks...
+        if (edid[i] != 0x00 && edid[i + 1] != 0x00) { // a dtd
+            uint32_t hactive = edid[i + 2] + (uint32_t) ((edid[i + 4] & 0xf0) << 4);
+            uint32_t hblank = edid[i + 3] + (uint32_t) ((edid[i + 4] & 0x0f) << 8);
+            uint32_t vactive = edid[i + 5] + (uint32_t) ((edid[i + 7] & 0xf0) << 4);
+            uint32_t vblank = edid[i + 6] + (uint32_t) ((edid[i + 7] & 0x0f) << 8);
+            uint32_t pixclk = ((uint32_t) edid[i + 1] << 8) | (edid[i]);
+            *width = hactive;
+            *height = vactive;
+            *refreshRate = (double) pixclk * 10000 / (double) (hactive + hblank) / (double) (vactive + vblank);
+            return;
+        }
+    }
+}
+
+void ffEdidGetVendorAndModel(const uint8_t edid[128], FFstrbuf* result) {
+    // https://github.com/jinksong/read_edid/blob/master/parse-edid/parse-edid.c
+    ffStrbufAppendF(result, "%c%c%c%04X", (char) (((uint32_t) edid[8] >> 2 & 0x1f) + 'A' - 1), (char) (((((uint32_t) edid[8] & 0x3) << 3) | (((uint32_t) edid[9] & 0xe0) >> 5)) + 'A' - 1), (char) (((uint32_t) edid[9] & 0x1f) + 'A' - 1), (uint32_t) (edid[10] + (uint32_t) (edid[11] << 8)));
+}
+
+bool ffEdidGetName(const uint8_t edid[128], FFstrbuf* name) {
+    // https://github.com/jinksong/read_edid/blob/master/parse-edid/parse-edid.c
+    for (uint32_t i = 0x36; i < 0x7E; i += 0x12) { // read through descriptor blocks...
+        if (edid[i] == 0x00) {                     // not a timing descriptor
+            if (edid[i + 3] == 0xfc) {             // Model Name tag
+                for (uint32_t j = 0; j < 13; j++) {
+                    if (edid[i + 5 + j] == 0x0a) {
+                        ffStrbufAppendNS(name, j, (const char*) &edid[i + 5]);
+                        return true;
+                    }
+                }
+            }
+        }
+    }
+
+    // use manufacturer + model number as monitor name
+    ffEdidGetVendorAndModel(edid, name);
+    return false;
+}
+
+void ffEdidGetPhysicalSize(const uint8_t edid[128], uint32_t* width, uint32_t* height) {
+    // Detailed Timing Descriptors
+    uint32_t dw = (((uint32_t) edid[68] & 0xF0) << 4) + edid[66];
+    uint32_t dh = (((uint32_t) edid[68] & 0x0F) << 8) + edid[67];
+
+    // Basic Display Parameters
+    uint32_t bw = edid[21] * 10;
+    uint32_t bh = edid[22] * 10;
+
+    // Some monitors report invalid data in DTD. See #1406
+    if (abs((int) dw - (int) bw) < 10 && abs((int) dh - (int) bh) < 10) {
+        *width = dw;
+        *height = dh;
+    } else {
+        *width = bw;
+        *height = bh;
+    }
+}
+
+void ffEdidGetSerialAndManufactureDate(const uint8_t edid[128], uint32_t* serial, uint16_t* year, uint16_t* week) {
+    if (edid[17] > 0 && edid[17] < 0xFF) {
+        *year = (uint16_t) (edid[17] + 1990);
+        *week = (uint16_t) edid[16];
+        if (*week == 0xFF) {
+            *week = 0;
+        }
+    } else {
+        *year = *week = 0;
+    }
+
+    *serial = *(uint32_t*) &edid[12];
+}
+
+bool ffEdidGetHdrCompatible(const uint8_t* edid, uint32_t length) {
+    if (length <= 128) {
+        return false;
+    }
+    for (const uint8_t* cta = &edid[128]; cta < &edid[length]; cta += 128) {
+        // https://en.wikipedia.org/wiki/Extended_Display_Identification_Data#CTA_EDID_Timing_Extension_Block
+        if (cta[0] != 0x02 /* CTA EDID */) {
+            continue;
+        }
+        if (cta[1] < 0x03 /* Version 3 */) {
+            continue;
+        }
+        const uint8_t offset = cta[2];
+        if (offset <= 4) {
+            continue;
+        }
+        for (uint8_t i = 4; i < offset;) {
+            uint8_t blkLen = cta[i] & 0x1f;
+            if (blkLen > 0) {
+                uint8_t blkTag = (cta[i] & 0xe0) >> 5;
+                if (blkTag == 0x07 /* Extended Block Type Tag */) {
+                    uint8_t extendedTag = cta[i + 1];
+                    if (extendedTag == 6 /* HDR SMDB */ || extendedTag == 7 /* HDR DMDB */) {
+                        return true;
+                    }
+                }
+            }
+            i += (uint8_t) (blkLen + 1);
+        }
+    }
+    return false;
+}
+
+bool ffEdidIsValid(const uint8_t edid[128], uint32_t length) {
+    if (length < 128 || length % 128 != 0) {
+        return false;
+    }
+
+    static const uint8_t edidHeader[] = { 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00 };
+    if (memcmp(edid, edidHeader, sizeof(edidHeader)) != 0) {
+        return false;
+    }
+
+    uint8_t sum = 0;
+    for (uint32_t i = 0; i < 128; i++) {
+        sum += edid[i];
+    }
+
+    return sum == 0;
+}
@@ -0,0 +1,513 @@
+#include "fastfetch.h"
+#include "common/FFlist.h"
+#include "common/FFstrbuf.h"
+#include "common/strutil.h"
+#include "common/font.h"
+
+#include <string.h>
+#include <ctype.h>
+
+void ffFontInit(FFfont* font) {
+    // Ensure no memory allocates
+    ffStrbufInit(&font->pretty);
+    ffStrbufInit(&font->name);
+    ffStrbufInit(&font->size);
+    ffListInit(&font->styles);
+}
+
+static void strbufAppendNSExcludingC(FFstrbuf* strbuf, uint32_t length, const char* value, char exclude) {
+    if (value == NULL || length == 0) {
+        return;
+    }
+
+    ffStrbufEnsureFree(strbuf, length);
+
+    for (uint32_t i = 0; i < length; i++) {
+        if (value[i] != exclude) {
+            strbuf->chars[strbuf->length++] = value[i];
+        }
+    }
+
+    strbuf->chars[strbuf->length] = '\0';
+}
+
+static void fontInitPretty(FFfont* font) {
+    ffStrbufAppend(&font->pretty, &font->name);
+
+    if (font->size.length == 0 && font->styles.length == 0) {
+        return;
+    } else if (font->pretty.length == 0) {
+        ffStrbufAppendS(&font->pretty, "default");
+    }
+
+    ffStrbufAppendS(&font->pretty, " (");
+
+    if (font->size.length > 0) {
+        ffStrbufAppend(&font->pretty, &font->size);
+        if (!ffStrbufEndsWithS(&font->size, "pt") && !ffStrbufEndsWithS(&font->size, "px")) {
+            ffStrbufAppendS(&font->pretty, "pt");
+        }
+
+        if (font->styles.length > 0) {
+            ffStrbufAppendS(&font->pretty, ", ");
+        }
+    }
+
+    for (uint32_t i = 0; i < font->styles.length; i++) {
+        ffStrbufAppend(&font->pretty, FF_LIST_GET(FFstrbuf, font->styles, i));
+
+        if (i < font->styles.length - 1) {
+            ffStrbufAppendS(&font->pretty, ", ");
+        }
+    }
+
+    ffStrbufAppendC(&font->pretty, ')');
+}
+
+void ffFontInitQt(FFfont* font, const char* data) {
+    ffFontInit(font);
+
+    // See https://doc.qt.io/qt-5/qfont.html#toString
+
+    // Family
+    data = ffStrbufAppendSUntilC(&font->name, 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)) {
+        do {
+            FFstrbuf* style = FF_LIST_ADD(FFstrbuf, font->styles);
+            ffStrbufInit(style);
+            data = ffStrbufAppendSUntilC(style, data, ' ');
+            if (data) {
+                data++;
+            }
+        } while (data);
+    }
+
+exit:
+    fontInitPretty(font);
+}
+
+static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* alternativeBuffer) {
+    while (**data == ' ' || **data == '\t' || **data == ',') {
+        ++(*data);
+    }
+
+    const char* wordStart = *data;
+
+    while (**data != ' ' && **data != '\t' && **data != ',' && **data != '\0' && **data != '`' && **data != '\\') {
+        ++(*data);
+    }
+
+    uint32_t wordLength = (uint32_t) (*data - wordStart);
+    if (wordLength == 0) {
+        return;
+    }
+
+    if (**data == '\0' || **data == '`' || **data == '\\') {
+        ffStrbufAppendNS(&font->size, wordLength, wordStart);
+        if (ffStrbufEndsWithS(&font->size, "px")) {
+            ffStrbufSubstrBefore(&font->size, font->size.length - 2);
+        }
+
+        double dummy;
+        if (sscanf(font->size.chars, "%lf", &dummy) == 1) {
+            return;
+        }
+
+        ffStrbufClear(&font->size);
+    }
+
+    if (
+        ffStrStartsWithIgnCase(wordStart, "Ultra") ||
+        ffStrStartsWithIgnCase(wordStart, "Extra") ||
+        ffStrStartsWithIgnCase(wordStart, "Semi") ||
+        ffStrStartsWithIgnCase(wordStart, "Demi") ||
+        ffStrStartsWithIgnCase(wordStart, "Normal") ||
+        ffStrStartsWithIgnCase(wordStart, "Roman") ||
+        ffStrStartsWithIgnCase(wordStart, "Oblique") ||
+        ffStrStartsWithIgnCase(wordStart, "Italic") ||
+        ffStrStartsWithIgnCase(wordStart, "Thin") ||
+        ffStrStartsWithIgnCase(wordStart, "Light") ||
+        ffStrStartsWithIgnCase(wordStart, "Bold") ||
+        ffStrStartsWithIgnCase(wordStart, "Black") ||
+        ffStrStartsWithIgnCase(wordStart, "Condensed") ||
+        ffStrStartsWithIgnCase(wordStart, "Expanded")) {
+        if (alternativeBuffer == NULL) {
+            alternativeBuffer = FF_LIST_ADD(FFstrbuf, font->styles);
+            ffStrbufInit(alternativeBuffer);
+        }
+
+        strbufAppendNSExcludingC(alternativeBuffer, wordLength, wordStart, '-');
+
+        if (
+            ffStrStartsWithIgnCase(wordStart, "Ultra ") ||
+            ffStrStartsWithIgnCase(wordStart, "Extra ") ||
+            ffStrStartsWithIgnCase(wordStart, "Semi ") ||
+            ffStrStartsWithIgnCase(wordStart, "Demi ")) {
+            fontPangoParseWord(data, font, alternativeBuffer);
+        }
+
+        return;
+    }
+
+    if (alternativeBuffer != NULL) {
+        strbufAppendNSExcludingC(alternativeBuffer, wordLength, wordStart, '-');
+        return;
+    }
+
+    if (font->name.length > 0) {
+        ffStrbufAppendC(&font->name, ' ');
+    }
+    ffStrbufAppendNS(&font->name, wordLength, wordStart);
+}
+
+void ffFontInitPango(FFfont* font, const char* data) {
+    ffFontInit(font);
+
+    while (*data != '\0' && *data != '`' && *data != '\\') {
+        fontPangoParseWord(&data, font, NULL);
+    }
+
+    fontInitPretty(font);
+}
+
+void ffFontInitValues(FFfont* font, const char* name, const char* size) {
+    ffFontInit(font);
+
+    ffStrbufAppendS(&font->name, name);
+    ffStrbufTrim(&font->name, '"');
+    ffStrbufAppendS(&font->size, size);
+
+    fontInitPretty(font);
+}
+
+void ffFontInitXlfd(FFfont* font, const char* xlfd) {
+    assert(xlfd && *xlfd);
+
+    // https://en.wikipedia.org/wiki/X_logical_font_description
+    ffFontInit(font);
+
+    // XLFD: -foundry-family-weight-slant-setwidth-addstyle-pixelsize-pointsize-xres-yres-spacing-averagewidth-charsetregistry-charsetencoding
+    // It often starts with '-', which would create an empty first field. Skip it to align indexes.
+    if (*xlfd == '-') {
+        xlfd++;
+    }
+
+    const char* pstart = xlfd;
+
+    for (int field = 0; field < 14; field++) {
+        const char* pend = strchr(pstart, '-');
+        uint32_t length = pend ? (uint32_t) (pend - pstart) : (uint32_t) strlen(pstart);
+
+        if (length > 0) {
+            if (field == 1) // family
+            {
+                ffStrbufAppendNS(&font->name, length, pstart);
+            } else if (field == 7) // pointsize (decipoints, preferred)
+            {
+                // parse positive integer from substring
+                long deciPt = 0;
+                bool ok = true;
+                for (uint32_t i = 0; i < length; i++) {
+                    char c = pstart[i];
+                    if (c < '0' || c > '9') {
+                        ok = false;
+                        break;
+                    }
+                    deciPt = deciPt * 10 + (c - '0');
+                }
+
+                if (ok && deciPt > 0) {
+                    ffStrbufClear(&font->size);
+
+                    char tmp[32];
+                    if (deciPt % 10 == 0) {
+                        snprintf(tmp, sizeof(tmp), "%ldpt", deciPt / 10);
+                    } else {
+                        snprintf(tmp, sizeof(tmp), "%ld.%ldpt", deciPt / 10, deciPt % 10);
+                    }
+
+                    ffStrbufAppendS(&font->size, tmp);
+                }
+            } else if (field == 6) // pixelsize (fallback if pointsize missing/invalid)
+            {
+                if (font->size.length == 0) {
+                    long px = 0;
+                    bool ok = true;
+                    for (uint32_t i = 0; i < length; i++) {
+                        char c = pstart[i];
+                        if (c < '0' || c > '9') {
+                            ok = false;
+                            break;
+                        }
+                        px = px * 10 + (c - '0');
+                    }
+
+                    if (ok && px > 0) {
+                        ffStrbufAppendNS(&font->size, length, pstart);
+                        ffStrbufAppendS(&font->size, "px");
+                    }
+                }
+            } else if (field >= 2 && field <= 5) // weight/slant/setwidth/addstyle
+            {
+                // ignore "normal" (case-insensitive)
+                if (!(length == 6 && ffStrStartsWithIgnCase(pstart, "normal"))) {
+                    FFstrbuf* style = FF_LIST_ADD(FFstrbuf, font->styles);
+                    ffStrbufInitNS(style, length, pstart);
+                }
+            }
+        }
+
+        if (!pend) {
+            break;
+        }
+
+        pstart = pend + 1;
+    }
+
+    fontInitPretty(font);
+}
+
+void ffFontInitXft(FFfont* font, const char* xft) {
+    assert(xft);
+
+    // https://en.wikipedia.org/wiki/Xft
+    // Xft/Fontconfig pattern examples:
+    //   "DejaVu Sans Mono-10"
+    //   "monospace:size=10:weight=bold:slant=italic"
+    //   "Fira Code-12:style=Regular"
+    // Goal: extract family(name), size, and some common styles.
+
+    ffFontInit(font);
+
+    // 1) Parse "head" part before first ':' => usually "family[-size]" (may include commas)
+    const char* p = xft;
+
+    while (*p == ' ' || *p == '\t') {
+        ++p;
+    }
+
+    const char* headStart = p;
+    while (*p != '\0' && *p != ':') {
+        ++p;
+    }
+    const char* headEnd = p;
+
+    // trim tail spaces
+    while (headEnd > headStart && (headEnd[-1] == ' ' || headEnd[-1] == '\t')) {
+        --headEnd;
+    }
+
+    // If multiple families are listed, take the first one (up to comma)
+    for (const char* q = headStart; q < headEnd; ++q) {
+        if (*q == ',') {
+            headEnd = q;
+            while (headEnd > headStart && (headEnd[-1] == ' ' || headEnd[-1] == '\t')) {
+                --headEnd;
+            }
+            break;
+        }
+    }
+
+    // Try parse trailing "-<number>" as size, otherwise entire head is name
+    const char* dashPos = NULL;
+    const char* sizeStart = NULL;
+
+    for (const char* q = headEnd; q > headStart;) {
+        --q;
+        if (*q == '-' && (q + 1) < headEnd && ffCharIsDigit(q[1])) {
+            dashPos = q;
+            sizeStart = q + 1;
+            break;
+        }
+    }
+
+    if (dashPos) {
+        bool ok = true;
+        bool seenDigit = false;
+        for (const char* q = sizeStart; q < headEnd; ++q) {
+            if (ffCharIsDigit(*q)) {
+                seenDigit = true;
+            } else if (*q == '.') {
+                continue;
+            } else {
+                ok = false;
+                break;
+            }
+        }
+
+        if (ok && seenDigit) {
+            const char* nameEnd = dashPos;
+            while (nameEnd > headStart && (nameEnd[-1] == ' ' || nameEnd[-1] == '\t')) {
+                --nameEnd;
+            }
+
+            if (nameEnd > headStart) {
+                ffStrbufAppendNS(&font->name, (uint32_t) (nameEnd - headStart), headStart);
+            }
+
+            if (headEnd > sizeStart) {
+                ffStrbufAppendNS(&font->size, (uint32_t) (headEnd - sizeStart), sizeStart);
+            }
+        } else {
+            if (headEnd > headStart) {
+                ffStrbufAppendNS(&font->name, (uint32_t) (headEnd - headStart), headStart);
+            }
+        }
+    } else {
+        if (headEnd > headStart) {
+            ffStrbufAppendNS(&font->name, (uint32_t) (headEnd - headStart), headStart);
+        }
+    }
+
+    ffStrbufTrim(&font->name, ' ');
+    ffStrbufTrim(&font->name, '"');
+
+    // 2) Parse key=value fields after ':' (Fontconfig-like). Fields separated by ':'.
+    // Common keys: size, pixelsize, pointsize, style, weight, slant, width
+    while (*p == ':') {
+        ++p;
+
+        // key
+        const char* keyStart = p;
+        while (*p != '\0' && *p != '=' && *p != ':') {
+            ++p;
+        }
+        const char* keyEnd = p;
+
+        if (*p != '=') {
+            continue; // skip tokens without '='
+        }
+
+        ++p; // skip '='
+
+        // value (until next ':', allow backslash-escaping)
+        FF_STRBUF_AUTO_DESTROY value = ffStrbufCreate();
+
+        while (*p != '\0' && *p != ':') {
+            if (*p == '\\' && p[1] != '\0') {
+                ++p;
+                ffStrbufAppendC(&value, *p);
+                ++p;
+                continue;
+            }
+
+            ffStrbufAppendC(&value, *p);
+            ++p;
+        }
+
+        ffStrbufTrim(&value, ' ');
+        ffStrbufTrim(&value, '"');
+
+        uint32_t keyLen = (uint32_t) (keyEnd - keyStart);
+
+        // helper: set numeric size if not set yet
+        const bool sizeEmpty = (font->size.length == 0);
+        if (value.length > 0) {
+            if (
+                (keyLen == 4 && ffStrStartsWithIgnCase(keyStart, "size")) ||
+                (keyLen == 9 && (ffStrStartsWithIgnCase(keyStart, "pixelsize") || ffStrStartsWithIgnCase(keyStart, "pointsize")))) {
+                if (sizeEmpty && ffCharIsDigit(value.chars[0])) {
+                    ffStrbufAppend(&font->size, &value);
+                    ffStrbufAppendS(&font->size,
+                        (keyLen == 9 && ffStrStartsWithIgnCase(keyStart, "pixelsize")) ? "px" : "pt");
+                }
+            } else if (keyLen == 5 && ffStrStartsWithIgnCase(keyStart, "style")) {
+                // style may contain multiple words: "Bold Italic"
+                const char* s = value.chars;
+                while (*s != '\0') {
+                    while (*s == ' ' || *s == '\t' || *s == ',') {
+                        ++s;
+                    }
+
+                    const char* w = s;
+                    while (*s != '\0' && *s != ' ' && *s != '\t' && *s != ',') {
+                        ++s;
+                    }
+
+                    if (s > w) {
+                        FFstrbuf* style = FF_LIST_ADD(FFstrbuf, font->styles);
+                        ffStrbufInitNS(style, (uint32_t) (s - w), w);
+                    }
+                }
+            } else if (
+                (keyLen == 6 && ffStrStartsWithIgnCase(keyStart, "weight")) ||
+                (keyLen == 5 && ffStrStartsWithIgnCase(keyStart, "slant")) ||
+                (keyLen == 5 && ffStrStartsWithIgnCase(keyStart, "width"))) {
+                // normalize: remove '-' to align with other parsers ("Semi-Bold" -> "SemiBold")
+                FFstrbuf* style = FF_LIST_ADD(FFstrbuf, font->styles);
+                ffStrbufInit(style);
+                strbufAppendNSExcludingC(style, value.length, value.chars, '-');
+                ffStrbufTrim(style, ' ');
+                if (style->length == 0) {
+                    ffStrbufDestroy(style);
+                    --font->styles.length;
+                }
+            }
+        }
+    }
+
+    fontInitPretty(font);
+}
+
+void ffFontInitMoveValues(FFfont* font, FFstrbuf* name, FFstrbuf* size, FFstrbuf* style) {
+    ffFontInit(font);
+
+    if (name) {
+        ffStrbufInitMove(&font->name, name);
+    }
+    if (size) {
+        ffStrbufInitMove(&font->size, size);
+    }
+    if (style) {
+        FFstrbuf* styleBuf = FF_LIST_ADD(FFstrbuf, font->styles);
+        ffStrbufInitMove(styleBuf, style);
+    }
+
+    fontInitPretty(font);
+}
+
+void ffFontInitWithSpace(FFfont* font, const char* rawName) {
+    const char* pspace = strrchr(rawName, ' ');
+    if (pspace == NULL) {
+        ffFontInitCopy(font, rawName);
+        return;
+    }
+
+    ffFontInit(font);
+
+    ffStrbufAppendNS(&font->name, (uint32_t) (pspace - rawName), rawName);
+    ffStrbufAppendS(&font->size, pspace + 1);
+
+    fontInitPretty(font);
+}
+
+void ffFontDestroy(FFfont* font) {
+    ffStrbufDestroy(&font->pretty);
+    ffStrbufDestroy(&font->name);
+    ffStrbufDestroy(&font->size);
+
+    FF_LIST_FOR_EACH (FFstrbuf, str, font->styles) {
+        ffStrbufDestroy(str);
+    }
+    ffListDestroy(&font->styles);
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`fastfetch_2.53.0_source.buildinfo universe/utils optional`