Merge pull request #2217 from fastfetch-cli/dev

Release: v2.60.0
Doc: updates changelog [ci skip]
2026-09-12 09:58:03 +02:00 · 2026-03-06 21:08:19 -06:00 · 2026-03-07 10:43:16 +08:00 · 2026-03-07 10:43:01 +08:00 · 2026-03-07 10:34:21 +08:00 · 2026-03-07 09:31:26 +08:00
1038 changed files with 54685 additions and 23619 deletions
@@ -1,5 +1,5 @@
 [codespell]
 check-filenames =
 builtin = clear,rare,usage,informal
-skip = */.git,*/cmake-build-*,*/.idea,*/completions,*/presets,*/screenshots,*/tests,*/3rdparty,*/logo/ascii
-ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,slave,sur,doas,conexant,ags
+skip = */.git,*/cmake-build-*,*/.idea,*/completions,*/presets,*/screenshots,*/tests,*/3rdparty,*/logo/ascii,./src/detection/gpu/asahi_drm.h
+ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,slave,sur,doas,conexant,ags,bu
@@ -0,0 +1,3 @@
+github: LinusDierheimer
+ko_fi: carterli
+custom: https://paypal.me/zhangsongcui
@@ -1,80 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: '[BUG] '
-labels: bug
-assignees: ''
-
---
-
-Be sure to read the [FAQ](https://github.com/fastfetch-cli/fastfetch?tab=readme-ov-file#faq) before submitting a new issue.
-
-<!-- We will try hard to solve the issue. However since platforms and hardwares vary greatly, it can be hard to find the root cause of an issue. Providing the following information may help us greatly. Thanks in advance! -->
-
-# General description of bug:
-
-* What happened:
-* What should happen:
-* Fastfetch version used: <!-- please use the latest version, if possible -->
-* Did it work in an older version: <!-- if yes, which version -->
-* Where did you get the binary: <!-- GitHub release / GitHub Actions / installed with a package manager (please tell us which package manager you used!) / built from source yourself -->
-* Does this issue still occur in [the latest dev build](https://github.com/fastfetch-cli/fastfetch/actions/)?
-
-# Often helpful information:
-
-Screenshot:
-<!-- Paste the screenshot here -->
-
-The content of the configuration file you use (if any):
-```
-// Paste here
-```
-
-Output of `fastfetch -c ci.jsonc --format json`:
-<!--
-Note that this output will contain you public IP. If it is not relevant for the issue, feel free to remove it before uploading.
-->
-
-```
-// Paste here
-```
-
-Output of `fastfetch --list-features`:
-```
-// Paste here
-```
-
-## If fastfatch crashed or froze
-
-Paste the stacktrace here. You may get it with:
-
-```shell
-# You may need Ctrl+C to stop the process if it freezes
-gdb -q -ex 'set confirm off' -ex run -ex 'bt full' -ex quit --args /path/to/fastfetch
-```
-
-If you are able to identify which module crashed, the strace can be helpful too
-
-```shell
-strace /path/to/fastfetch --multithreading false -s {MODULE} --pipe
-```
-
-If you cannot do the instructions above, please upload the core dump file:
-
-## If fastfetch is slow
-
-Use `time fastfetch --stat` to show time usage for each module.
-
-## If an image or logo didn't show 
-
-<!-- Please make sure your terminal supports the image protocol you used. Note that GNOME Terminal doesn't support any image protocols. -->
-
-* The image protocol you used: 
-* The terminal you used: 
-* Upload the image file here, or paste the image URL: 
-* Does it work with `--logo-width {WIDTH} --logo-height {HEIGHT}`? 
-
-## If fastfetch behaves incorrectly on shell startup
-
-* The bug is reproducible with a clean shell configuration (i.e. `fastfetch` is the only line in `.zshrc` or `~/.config/fish/config.fish`): 
-* Does `sleep 1` before running `fastfetch` work? 
@@ -0,0 +1,122 @@
+name: Crash Bug Report
+description: If fastfetch crashes or freezes
+title: "[BUG] "
+labels: ["bug", "crash", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! We will try hard to solve the issue.
+        However since platforms and hardwares vary greatly, it can be hard to find the root cause of an issue.
+        Providing the following information may help us greatly. Thanks in advance!
+  - type: checkboxes
+    attributes:
+      label: Read the FAQ first
+      description: Please check if the issue is already covered in the FAQ.
+      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"
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+      placeholder: I was trying to [...] but [...]
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Version used
+      description: Fastfetch version used. Please use the latest version (found in the [releases](https://github.com/fastfetch-cli/fastfetch/releases)) if possible.
+      placeholder: Result of `fastfetch --version`
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Bug prevalence
+      description: How often does the bug occur?
+      options:
+        -
+        - Always
+        - Sometimes
+        - Rarely
+        - Once
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Regression
+      description: Did it work in an older version?
+      options:
+        -
+        - Not sure
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Installation
+      description: Where did you install fastfetch from?
+      options:
+        -
+        - GitHub Releases
+        - GitHub Actions (nightly)
+        - Built from source
+        - Package manager
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Package manager
+      description: Which package manager did you use if applicable?
+      placeholder: e.g. `apt`, `pacman`, `brew`, `scoop`
+  - type: markdown
+    attributes:
+      value: '### Often helpful information'
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+  - type: textarea
+    attributes:
+      label: Configuration
+      description: If applicable, paste your configuration file here.
+      placeholder: cat ~/.config/fastfetch/config.jsonc
+      render: jsonc
+  - type: markdown
+    attributes:
+      value: |
+        Paste the stacktrace here. You may get it with:
+
+        ```shell
+        # You may need Ctrl+C to stop the process if it freezes
+        gdb -q -ex 'set confirm off' -ex run -ex 'bt full' -ex quit --args /path/to/fastfetch
+        ```
+
+        If you are able to identify which module crashed, the strace can be helpful too
+
+        ```shell
+        strace /path/to/fastfetch --multithreading false -s {MODULE} --pipe
+        ```
+
+        If you cannot do the instructions above, please upload the core dump file if available.
+  - type: textarea
+    attributes:
+      label: Stacktrace
+      description: Paste the stacktrace or core dump file here.
+      render: text
+    validations:
+      required: true
@@ -0,0 +1,106 @@
+name: General Bug Report
+description: If something is not working as expected (wrong output, missing info, etc)
+title: "[BUG] "
+labels: ["bug", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! We will try hard to solve the issue.
+        However since platforms and hardwares vary greatly, it can be hard to find the root cause of an issue.
+        Providing the following information may help us greatly. Thanks in advance!
+  - type: checkboxes
+    attributes:
+      label: Read the FAQ first
+      description: Please check if the issue is already covered in the FAQ.
+      options:
+        - label: I have checked the FAQ but the issue is not covered
+          required: true
+  - type: markdown
+    attributes:
+      value: "### General description of the bug"
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+      placeholder: I was trying to [...] but [...]
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Version used
+      description: Fastfetch version used. Please use the latest version (found in the [releases](https://github.com/fastfetch-cli/fastfetch/releases)) if possible.
+      placeholder: Result of `fastfetch --version`
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Bug prevalence
+      description: How often does the bug occur?
+      options:
+        -
+        - Always
+        - Sometimes
+        - Rarely
+        - Once
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Regression
+      description: Did it work in an older version?
+      options:
+        -
+        - Not sure
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Installation
+      description: Where did you install fastfetch from?
+      options:
+        -
+        - GitHub Releases
+        - GitHub Actions (nightly)
+        - Built from source
+        - Package manager
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Package manager
+      description: Which package manager did you use if applicable?
+      placeholder: e.g. `apt`, `pacman`, `brew`, `scoop`
+  - type: markdown
+    attributes:
+      value: '### Often helpful information'
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+  - type: textarea
+    attributes:
+      label: Configuration
+      description: If applicable, paste your configuration file here.
+      placeholder: cat ~/.config/fastfetch/config.jsonc
+      render: jsonc
+  - type: textarea
+    attributes:
+      label: System information
+      description: Output of `fastfetch -c all.jsonc --stat --format json`
+      placeholder: |
+        Note that this output will contain you public IP.
+        If it is not relevant for the issue, feel free to remove it before uploading.
+      render: jsonc
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Features built-in
+      description: Output of `fastfetch --list-features`
+      render: text
+    validations:
+      required: true
@@ -0,0 +1,129 @@
+name: Logo Bug Report
+description: If my image logo is not displayed correctly
+title: "[BUG] "
+labels: ["bug", "logo", "triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! We will try hard to solve the issue.
+        However since platforms and hardwares vary greatly, it can be hard to find the root cause of an issue.
+        Providing the following information may help us greatly. Thanks in advance!
+  - type: checkboxes
+    attributes:
+      label: Read the FAQ first
+      description: Please check if the issue is already covered in the FAQ.
+      options:
+        - label: I have checked the FAQ but the issue is not covered
+          required: true
+  - type: markdown
+    attributes:
+      value: "### General description of the bug"
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the bug is.
+      placeholder: I was trying to [...] but [...]
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Version used
+      description: Fastfetch version used. Please use the latest version (found in the [releases](https://github.com/fastfetch-cli/fastfetch/releases)) if possible.
+      placeholder: Result of `fastfetch --version`
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Bug prevalence
+      description: How often does the bug occur?
+      options:
+        -
+        - Always
+        - Sometimes
+        - Rarely
+        - Once
+        - Other
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Regression
+      description: Did it work in an older version?
+      options:
+        -
+        - Not sure
+        - 'Yes'
+        - 'No'
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Installation
+      description: Where did you install fastfetch from?
+      options:
+        -
+        - GitHub Releases
+        - GitHub Actions (nightly)
+        - Built from source
+        - Package manager
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Package manager
+      description: Which package manager did you use if applicable?
+      placeholder: e.g. `apt`, `pacman`, `brew`, `scoop`
+  - type: markdown
+    attributes:
+      value: '### Often helpful information'
+  - type: textarea
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+  - type: textarea
+    attributes:
+      label: Configuration
+      description: If applicable, paste your configuration file here.
+      placeholder: cat ~/.config/fastfetch/config.jsonc
+      render: jsonc
+  - type: markdown
+    attributes:
+      value: |
+        #### If an image or logo didn't show
+
+        Please make sure your terminal supports the image protocol you used.
+        Note that GNOME Terminal doesn't support any image protocols as of now
+
+        Some tips:
+        1. Try `fastfetch --show-errors` to see if there are any errors.
+        2. Try `fastfetch --logo-width {WIDTH} --logo-height {HEIGHT}`. Some protocols may require a image size being set.
+  - type: input
+    attributes:
+      label: Image protocol
+      description: The image protocol you used
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Terminal
+      description: The terminal you used
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Image tried
+      description: Upload the image file, or paste the image URL here
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Error message
+      description: Error message printed by `fastfetch -s none --show-errors`, if any
+  - type: textarea
+    attributes:
+      label: Features built-in
+      description: Output of `fastfetch --list-features`
+      render: text
+    validations:
+      required: true
@@ -1,18 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: '[FEAT] '
-labels: enhancement
-assignees: ''
-
---
-
-Be sure to read [FAQ](https://github.com/fastfetch-cli/fastfetch?tab=readme-ov-file#faq) before submitting a new issue.
-
-## Wanted features:
-
-<!-- Your features here -->
-
-## Motivation:
-
-<!-- Your motivation here -->
@@ -0,0 +1,40 @@
+name: Feature Request
+description: Suggest an idea for this project
+title: "[FEAT] "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Fastfetch is a system information tool. We only accept hardware or system level software feature requests.
+        For most personal uses, I recommend using `Command` module to detect it yourself, which can be used to grab output from a custom shell script:
+
+        ```jsonc
+        // This module shows the git version
+        {
+          "modules": [
+            {
+              "type": "command",
+              "key": "Git",
+              "text": "git version",
+              "format": "{~12}" // cut the first 12 characters
+            }
+          ]
+        }
+        ```
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of what the feature is.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Motivation
+      description: Why do you want this feature? Why doesn't `Command` module suffice for you?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
@@ -1,23 +0,0 @@
---
-name: Logo request
-about: Request a new logo
-title: '[LOGO] '
-labels: logo request
-assignees: ''
-
---
-
-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. Please refer to https://github.com/fastfetch-cli/fastfetch/wiki/Migrate-Neofetch-Logo-To-Fastfetch
-
-# OS
-```
-Paste content of /etc/os-release and /etc/lsb-release here. If none of these files exist, describe a way to identify the distro
-```
-
-# Ascii
-
-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` 
-
-```
-Paste ascii art here.
-```
@@ -0,0 +1,47 @@
+name: Logo Request
+description: Request a new ASCII logo for your favorite distro
+title: "[LOGO] "
+labels: ["logo request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        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 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: 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 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 (W x H).
+          required: true
+        - label: The ASCII art includes color codes, or the color codes are available in `os-release`.
+          required: true
+        - label: The ASCII art has no internal padding (spaces at the start and/or end of lines).
+          required: true
@@ -0,0 +1,26 @@
+## 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
+
+- 
+
+## Checklist
+
+- [ ] I have tested my changes locally.
@@ -4,13 +4,16 @@ 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@v4
+        uses: actions/checkout@v6

      - name: Install codespell
        shell: bash
@@ -29,13 +32,13 @@ jobs:
      contents: read
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        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_XFCONF=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_OSMESA=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
+        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
@@ -56,44 +59,62 @@ jobs:
        run: ldd fastfetch

      - name: run tests
-        run: ctest
+        run: ctest --output-on-failure

-  linux-amd64:
-    name: Linux-amd64
-    runs-on: ubuntu-20.04
+  linux-hosts:
+    name: Linux-${{ matrix.arch }}
+    runs-on: ${{ matrix.runs-on }}
    permissions:
      security-events: write
      contents: read
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            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@v4
+        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 libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev python3-requests
+        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 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 chafa ddcutil --ignore-dependencies
+          /home/linuxbrew/.linuxbrew/bin/brew install imagemagick chafa --ignore-dependencies

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        if: matrix.arch == 'amd64'
+        uses: github/codeql-action/init@v4
        with:
          languages: c

      - name: configure project
-        run: PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
+        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
-        uses: github/codeql-action/analyze@v3
+        if: matrix.arch == 'amd64'
+        uses: github/codeql-action/analyze@v4

      - name: list features
        run: ./fastfetch --list-features
@@ -111,65 +132,108 @@ jobs:
        run: ldd fastfetch

      - name: run tests
-        run: ctest
+        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
+        uses: actions/upload-artifact@v7
        with:
-          name: fastfetch-linux-amd64
+          name: fastfetch-linux-${{ matrix.arch }}
          path: ./fastfetch-*.*

-  linux-aarch64:
-    name: Linux-aarch64
+  linux-i686:
+    name: Linux-i686
    runs-on: ubuntu-22.04
    permissions:
      security-events: write
      contents: read
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

-      - name: run VM
-        uses: uraimo/run-on-arch-action@v2
-        id: runcmd
-        with:
-          arch: aarch64
-          distro: ubuntu20.04
-          githubToken: ${{ github.token }}
-          run: |
-            uname -a
-            apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-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
+      - 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 -DCPACK_DEBIAN_PACKAGE_ARCHITECTURE=i386 -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: 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@v4
+        uses: actions/upload-artifact@v7
        with:
-          name: fastfetch-linux-aarch64
+          name: fastfetch-linux-i686
          path: ./fastfetch-*.*

-  linux-armv7:
-    name: Linux-armv7
-    runs-on: ubuntu-22.04
+  linux-armv7l:
+    name: Linux-armv7l
+    runs-on: ubuntu-24.04
    permissions:
      security-events: write
      contents: read
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: run VM
-        uses: uraimo/run-on-arch-action@v2
+        uses: uraimo/run-on-arch-action@v3
        id: runcmd
        with:
          arch: armv7
@@ -177,117 +241,125 @@ jobs:
          githubToken: ${{ github.token }}
          run: |
            uname -a
-            apt-get update && apt-get install -y wget
-            # CMake installed by apt has bug `list sub-command REMOVE_ITEM requires two or more arguments`
-            wget --no-check-certificate https://apt.kitware.com/ubuntu/pool/main/c/cmake/{cmake_3.29.2-0kitware1ubuntu20.04.1_armhf.deb,cmake-data_3.29.2-0kitware1ubuntu20.04.1_all.deb}
-            dpkg -i *.deb
-            apt-get install -y make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+            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
+            ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
-          name: fastfetch-linux-armv7
+          name: fastfetch-linux-armv7l
          path: ./fastfetch-*.*

-  linux-riscv64:
-    name: Linux-riscv64
-    runs-on: ubuntu-22.04
+  linux-armv6l:
+    name: Linux-armv6l
+    runs-on: ubuntu-24.04
    permissions:
      security-events: write
      contents: read
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: run VM
-        uses: uraimo/run-on-arch-action@v2
+        uses: uraimo/run-on-arch-action@v3
        id: runcmd
        with:
-          arch: riscv64
+          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@v7
+        with:
+          name: fastfetch-linux-armv6l
+          path: ./fastfetch-*.*
+
+  linux-vms:
+    name: Linux-${{ matrix.arch }}
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      contents: read
+    strategy:
+      matrix:
+        include:
+          - arch: riscv64
+          - arch: ppc64le
+          - arch: s390x
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v6
+
+      - 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 cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev libelf-dev directx-headers-dev rpm
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+            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
+            ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
-          name: fastfetch-linux-riscv64
-          path: ./fastfetch-*.*
-
-  linux-ppc64le:
-    name: Linux-ppc64le
-    runs-on: ubuntu-22.04
-    permissions:
-      security-events: write
-      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v4
-
-      - name: run VM
-        uses: uraimo/run-on-arch-action@v2
-        id: runcmd
-        with:
-          arch: ppc64le
-          distro: ubuntu20.04
-          githubToken: ${{ github.token }}
-          run: |
-            uname -a
-            apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-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
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-linux-ppc64le
+          name: fastfetch-linux-${{ matrix.arch }}
          path: ./fastfetch-*.*

  musl-amd64:
    name: Musl-amd64
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6

      - name: setup alpine linux
        uses: jirutka/setup-alpine@master
-        with:
-          branch: v3.19

      - name: install dependencies
        run: |
          cat /etc/alpine-release
          uname -a
-          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev py3-requests gcc g++
+          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 -GNinja .
+            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}

@@ -298,24 +370,31 @@ jobs:
            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
-            ctest
+            ctest --output-on-failure
        shell: alpine.sh {0}

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: fastfetch-musl-amd64
          path: ./fastfetch-*.*

-  macos-universal:
-    name: macOS-universal
-    runs-on: macos-latest
+  macos-hosts:
+    name: macOS-${{ matrix.arch }}
+    runs-on: ${{ matrix.runs-on }}
    permissions:
      security-events: write
      contents: read
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runs-on: macos-15-intel
+          - arch: aarch64
+            runs-on: macos-latest
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: uname -a
        run: uname -a
@@ -324,20 +403,12 @@ jobs:
        run: |
          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite vulkan-loader vulkan-headers molten-vk imagemagick chafa

-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: c
-
      - name: configure project
-        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' .
+        run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .

      - name: build project
        run: cmake --build . --target package --verbose -j4

-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v3
-
      - name: list features
        run: ./fastfetch --list-features

@@ -354,45 +425,83 @@ jobs:
        run: otool -L fastfetch

      - name: run tests
-        run: ctest
+        run: ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
-          name: fastfetch-macos-universal
+          name: fastfetch-macos-${{ matrix.arch }}
          path: ./fastfetch-*.*

-  sunos-amd64:
+  omnios-amd64:
    runs-on: ubuntu-latest
-    name: SunOS-amd64
+    name: OmniOS-amd64
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        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
-            pkg install gcc13 cmake git pkg-config glib2 dbus sqlite-3 imagemagick
+            pkg install gcc14 cmake git pkg-config glib2 dbus sqlite-3 imagemagick ninja

          run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-            cmake --build . --target package --verbose -j4
+            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
-            cpack
+            ctest --output-on-failure
+            echo 'set(CPACK_PACKAGE_FILE_NAME "fastfetch-omnios-amd64")' >> CPackConfig.cmake
+            cpack -V

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
-          name: fastfetch-sunos-amd64
+          name: fastfetch-omnios-amd64
+          path: ./fastfetch-*.*
+
+  solaris-amd64:
+    runs-on: ubuntu-latest
+    name: Solaris-amd64
+    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
+
+          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-*.*

  freebsd-amd64:
@@ -403,7 +512,7 @@ jobs:
      contents: read
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: run VM
        uses: cross-platform-actions/action@master
@@ -412,61 +521,27 @@ jobs:
          architecture: x86-64
          cpu_count: 4
          shell: bash
-          version: '14.2'
+          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 xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py311-requests chafa
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On .
+            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
+            ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: fastfetch-freebsd-amd64
          path: ./fastfetch-*.*

-  dragonfly-amd64:
-    name: DragonFly-amd64
-    runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-      contents: read
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v4
-
-      - name: run VM
-        uses: vmactions/dragonflybsd-vm@v1
-        with:
-          usesh: yes
-          prepare: |
-            uname -a
-            pkg update
-            pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py39-requests chafa libelf
-
-          run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=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
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-dragonfly-amd64
-          path: ./fastfetch-*.*
-
  openbsd-amd64:
    name: OpenBSD-amd64
    runs-on: ubuntu-latest
@@ -475,7 +550,7 @@ jobs:
      contents: read
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: run VM
        uses: cross-platform-actions/action@master
@@ -484,21 +559,23 @@ jobs:
          architecture: x86-64
          cpu_count: 4
          shell: bash
-          version: '7.6'
+          version: '7.8'
+          environment_variables: 'CMAKE_BUILD_TYPE'
          run: |
            uname -a
-            sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa pulseaudio hwdata py3-requests
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=ON .
+            sudo pkg_add -u
+            sudo pkg_add -r llvm-21.1.2p0 cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 imagemagick chafa
+            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
+            ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: fastfetch-openbsd-amd64
          path: ./fastfetch-*.*
@@ -511,7 +588,7 @@ jobs:
      contents: read
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: run VM
        uses: cross-platform-actions/action@master
@@ -520,59 +597,153 @@ jobs:
          architecture: x86-64
          cpu_count: 4
          shell: bash
-          version: '10.0'
+          version: '10.1'
+          environment_variables: 'CMAKE_BUILD_TYPE'
          run: |
            uname -a
-            sudo pkgin -y install cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick pulseaudio opencl-headers ocl-icd py312-requests
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=ON .
+            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
+            ctest --output-on-failure

      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
        with:
          name: fastfetch-netbsd-amd64
          path: ./fastfetch-*.*

-  windows-amd64:
-    name: Windows-amd64
-    runs-on: windows-latest
+  dragonfly-amd64:
+    name: DragonFly-amd64
+    runs-on: ubuntu-latest
    permissions:
      security-events: write
      contents: read
+    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
+
+          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-*.*
+
+  haiku-amd64:
+    name: Haiku-amd64
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      contents: read
+    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
+            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-*.*
+
+  windows-hosts:
+    name: Windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
+    runs-on: ${{ matrix.runs-on }}
+    permissions:
+      security-events: write
+      contents: read
+    strategy:
+      matrix:
+        include:
+          - arch: amd64
+            runs-on: windows-latest
+            msystem: CLANG64
+            msystem-lower: clang64
+            msys-arch: x86_64
+            win7-compat-flag: OFF
+            win7-compat-postfix: ""
+          - arch: amd64
+            runs-on: windows-latest
+            msystem: CLANG64
+            msystem-lower: clang64
+            msys-arch: x86_64
+            win7-compat-flag: ON
+            win7-compat-postfix: "-win7"
+          - arch: aarch64
+            runs-on: windows-11-arm
+            msystem: CLANGARM64
+            msystem-lower: clangarm64
+            msys-arch: aarch64
+            win7-compat-flag: OFF
+            win7-compat-postfix: ""
    defaults:
      run:
        shell: msys2 {0}
    steps:
      - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6

      - name: setup-msys2
        uses: msys2/setup-msys2@v2
        with:
-          msystem: CLANG64
+          msystem: ${{ matrix.msystem }}
          update: true
-          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-vulkan-headers mingw-w64-clang-x86_64-opencl-icd mingw-w64-clang-x86_64-opencl-headers mingw-w64-clang-x86_64-cppwinrt mingw-w64-clang-x86_64-imagemagick
+          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=/clang64/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+        run: env PKG_CONFIG_PATH=/${{ matrix.msystem-lower }}/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_WIN7_COMPAT=${{ matrix.win7-compat-flag }} .

      - name: build project
        run: cmake --build . --verbose -j4

      - name: copy necessary dlls
-        run: cp /clang64/bin/{OpenCL,vulkan-1}.dll .
-
-      - name: download amd_ags
-        run: curl -LO https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/raw/master/ags_lib/lib/amd_ags_x64.dll
+        run: cp /${{ matrix.msystem-lower }}/bin/{OpenCL,vulkan-1}.dll .

      - name: list features
        run: ./fastfetch --list-features
@@ -590,38 +761,64 @@ jobs:
        run: ldd fastfetch

      - name: run tests
-        run: ctest
+        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-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
+          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-amd64.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
+        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets

      - name: create 7z archive
-        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-amd64.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
+        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets

-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
+      - name: upload true artifacts
+        uses: actions/upload-artifact@v7
        with:
-          name: fastfetch-windows-amd64
-          path: ./fastfetch-windows-amd64.*
+          name: fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}
+          path: ./fastfetch-windows-${{ matrix.arch }}${{ matrix.win7-compat-postfix }}.*
+          overwrite: true

  release:
    if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'fastfetch-cli/fastfetch'
    name: Release
    runs-on: ubuntu-latest
    needs:
-      - linux-amd64
-      - linux-aarch64
-      - linux-armv7
-      - linux-riscv64
-      - linux-ppc64le
+      - linux-hosts
+      - linux-i686
+      - linux-armv7l
+      - linux-armv6l
+      - linux-vms
      - musl-amd64
-      - macos-universal
+      - macos-hosts
      - freebsd-amd64
      - openbsd-amd64
      - netbsd-amd64
      - dragonfly-amd64
-      - sunos-amd64
-      - windows-amd64
+      - solaris-amd64
+      - omnios-amd64
+      - haiku-amd64
+      - windows-hosts
    permissions:
      contents: write
    steps:
@@ -632,29 +829,29 @@ jobs:
          repository: ${{ github.repository }}

      - name: download artifacts
-        if: needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
-        uses: actions/download-artifact@v4
+        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
+        uses: actions/download-artifact@v8

      - name: create release
-        if: needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
+        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
        uses: ncipollo/release-action@v1
        with:
-          tag: ${{ needs.linux-amd64.outputs.ffversion }}
+          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-amd64.outputs.ffversion }}/CHANGELOG.md) for details."
+          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-amd64.outputs.ffversion != steps.get_version_release.outputs.release
+        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-amd64.outputs.ffversion }}.{tar.gz,zip} && break || sleep 5; done
+          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-amd64.outputs.ffversion != steps.get_version_release.outputs.release
+        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-amd64.outputs.ffversion }}/CHANGELOG.md) for details." > fastfetch-release-notes.md
+          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
@@ -663,10 +860,10 @@ jobs:
          echo -e "\`\`\`\n</details>" >> fastfetch-release-notes.md

      - name: update release body
-        if: needs.linux-amd64.outputs.ffversion != steps.get_version_release.outputs.release
+        if: needs.linux-hosts.outputs.ffversion != steps.get_version_release.outputs.release
        uses: ncipollo/release-action@v1
        with:
-          tag: ${{ needs.linux-amd64.outputs.ffversion }}
+          tag: ${{ needs.linux-hosts.outputs.ffversion }}
          commit: ${{ github.sha }}
          bodyFile: fastfetch-release-notes.md
          allowUpdates: true
@@ -1,7 +1,7 @@
 MIT License

 Copyright (c) 2021-2023 Linus Dierheimer
-Copyright (c) 2022-2024 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
@@ -0,0 +1,75 @@
+# Fastfetch
+
+Fastfetch 是一款类似 neofetch 的系统信息展示工具，主要用 C 编写，强调性能和可定制性。支持 Linux、macOS、Windows 7+、Android、FreeBSD、OpenBSD、NetBSD、DragonFly、Haiku、SunOS。
+
+示例配置见 presets/examples，更多截图与平台说明见 Wiki。
+
+## 安装
+
+Linux（部分）：
+- Debian 13+ / Ubuntu: apt install fastfetch
+- Arch: pacman -S fastfetch
+- Fedora: dnf install fastfetch
+- openSUSE: zypper install fastfetch
+- Linuxbrew：brew install fastfetch
+- 各发行版打包状态：https://repology.org/project/fastfetch/versions
+
+macOS：
+- Homebrew：brew install fastfetch
+- MacPorts：sudo port install fastfetch
+
+Windows：
+- scoop install fastfetch
+- choco install fastfetch
+- winget install fastfetch
+- MSYS2：pacman -S mingw-w64-<subsystem>-<arch>-fastfetch
+
+BSD：
+- FreeBSD：pkg install fastfetch
+- NetBSD：pkgin in fastfetch
+- OpenBSD：pkg_add fastfetch
+
+Android（Termux）：
+- pkg install fastfetch
+
+Nightly 构建：
+- https://nightly.link/fastfetch-cli/fastfetch/workflows/ci/dev?preview
+
+## 源码构建
+
+基本上是 `cmake . && make`。详见 Wiki：https://github.com/fastfetch-cli/fastfetch/wiki/Building
+
+## 使用
+
+- 默认运行：`fastfetch`
+- 查看所有可用模块示例：`fastfetch -c all.jsonc`
+- 以 JSON 输出指定模块：`fastfetch -s <module1>[:<module2>] --format json`
+- 完整命令行帮助：`fastfetch --help`
+- 生成最小配置：`fastfetch --gen-config [</path/to/config.jsonc>]`
+  - 生成完整配置：`fastfetch --gen-config-full`
+  - 请使用支持 JSON schema 的编辑器（如 VSCode）编辑配置文件！
+  - 如果你连接 Github 有网络困难（智能提示不生效），可将配置文件中的 `$schema` 的值替换为 `https://gitee.com/carterl/fastfetch/raw/dev/doc/json_schema.json`
+
+## 定制
+
+- 配置使用 JSONC，语法与选项见 Wiki：https://github.com/fastfetch-cli/fastfetch/wiki/Configuration
+- 预设示例位于 presets，可用 `-c <filename>` 加载
+- Logo 选项与图像显示见文档：https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options
+- 模块格式化（示例，仅显示 GPU 名称）：
+```jsonc
+{
+  "modules": [
+    { "type": "gpu", "format": "{name}" }
+  ]
+}
+```
+详见：https://github.com/fastfetch-cli/fastfetch/wiki/Format-String-Guide
+
+## 反馈与支持
+
+- 使用问题：Discussions https://github.com/fastfetch-cli/fastfetch/discussions
+- 疑似缺陷：Issues https://github.com/fastfetch-cli/fastfetch/issues（请填写模版）
+
+## 赞助
+
+<img src="https://github.com/user-attachments/assets/a36a6501-e8b0-4a10-9061-b9206d12ffba" width="220">
@@ -10,8 +10,10 @@
 [![GitHub release (with filter)](https://img.shields.io/github/v/release/fastfetch-cli/fastfetch?logo=github)](https://github.com/fastfetch-cli/fastfetch/releases)
 [![latest packaged version(s)](https://repology.org/badge/latest-versions/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
 [![Packaging status](https://repology.org/badge/tiny-repos/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
+[![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 prettily. It is written mainly in C, with performance and customizability in mind. Currently, Linux, Android, FreeBSD, macOS, SunOS and Windows 7+ are supported.
+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 (illumos, Solaris).

 <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" />
@@ -21,16 +23,22 @@ Fastfetch is a [neofetch](https://github.com/dylanaraps/neofetch)-like tool for
 <img src="screenshots/example3.png" width="48%" align="top" />
 <img src="screenshots/example5.png" height="15%" align="top" />

+According configuration files for examples are located [here](https://github.com/fastfetch-cli/fastfetch/tree/dev/presets/examples).
+
 There are [screenshots on different platforms](https://github.com/fastfetch-cli/fastfetch/wiki).

 ## Installation

 ### Linux

-Some distros package an outdated fastfetch version. Older versions receive no support, so please try always to use the latest version.
+Some distributions package outdated versions of fastfetch. Older versions receive no support, so please always try to use the latest version.

-* Ubuntu: [`ppa:zhangsongcui3371/fastfetch`](https://launchpad.net/~zhangsongcui3371/+archive/ubuntu/fastfetch) (for Ubuntu 22.04 or newer)
-* Debian: `apt install fastfetch` (for Debian 13 or newer)
+<a href="https://repology.org/project/fastfetch/versions">
+    <img src="https://repology.org/badge/vertical-allrepos/fastfetch.svg?columns=2" alt="Packaging status" align="right">
+</a>
+
+* 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`
@@ -45,15 +53,13 @@ Some distros package an outdated fastfetch version. Older versions receive no su
 * Void Linux: `xbps-install fastfetch`
 * Venom Linux: `scratch install fastfetch`

-You may need `sudo`, `doas` or `sup` to run these commands.
+You may need `sudo`, `doas`, or `sup` to run these commands.

-[See also if fastfetch has been packaged for your favorite Linux distro](#Packaging).
-
-If fastfetch is not packaged for your distro or an outdated version is packaged, [linuxbrew](https://brew.sh/) is a good alternative: `brew install fastfetch`
+If fastfetch is not packaged for your distribution or an outdated version is packaged, [linuxbrew](https://brew.sh/) is a good alternative: `brew install fastfetch`

 ### macOS

-* [HomeBrew](https://formulae.brew.sh/formula/fastfetch#default): `brew install fastfetch`
+* [Homebrew](https://formulae.brew.sh/formula/fastfetch#default): `brew install fastfetch`
 * [MacPorts](https://ports.macports.org/port/fastfetch/): `sudo port install fastfetch`

 ### Windows
@@ -65,72 +71,72 @@ If fastfetch is not packaged for your distro or an outdated version is packaged,

 You may also download the program directly from [the GitHub releases page](https://github.com/fastfetch-cli/fastfetch/releases/latest) in the form of an archive file.

-### FreeBSD
+### BSD systems

-* `pkg install fastfetch`
+* FreeBSD: `pkg install fastfetch`
+* NetBSD: `pkgin in fastfetch`
+* OpenBSD: `pkg_add fastfetch` (Snapshots only)
+* DragonFly BSD: `pkg install fastfetch` (Snapshots only)

 ### Android (Termux)

 * `pkg install fastfetch`

+### Nightly
+
+<https://nightly.link/fastfetch-cli/fastfetch/workflows/ci/dev?preview>
+
 ## Build from source

-See Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building
+See the Wiki: https://github.com/fastfetch-cli/fastfetch/wiki/Building

 ## Usage

-* Run it with default configuration: `fastfetch`
-* Run it with [all supported modules](https://github.com/fastfetch-cli/fastfetch/wiki/Support+Status#available-modules) and find what interests you: `fastfetch -c all.jsonc`
-* Find all data that fastfetch detects: `fastfetch -s <module> --format json`
+* Run with default configuration: `fastfetch`
+* Run with [all supported modules](https://github.com/fastfetch-cli/fastfetch/wiki/Support+Status#available-modules) to find what interests you: `fastfetch -c all.jsonc`
+* View all data that fastfetch detects: `fastfetch -s <module1>[:<module2>][:<module3>] --format json`
 * Display help messages: `fastfetch --help`
-* Generate config file based on command line arguments: `fastfetch --arg1 --arg2 --gen-config`
+* Generate a minimal config file: `fastfetch [-s <module1>[:<module2>]] --gen-config [</path/to/config.jsonc>]`
+    * Use: `--gen-config-full` to generate a full config file with all optional options

 ## Customization

-Fastfetch uses the JSONC (or JSON with comments) for configuration. [See Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration). There are some premade config files in [`presets`](presets), including the ones used for the screenshots above. You can load them using `-c <filename>`. Those files can serve as examples of the configuration syntax.
+Fastfetch uses JSONC (JSON with comments) for configuration. [See the Wiki for details](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration). There are some premade config files in the [`presets`](presets) directory, including those used for the screenshots above. You can load them using `-c <filename>`. These files can serve as examples of the configuration syntax.

 Logos can also be heavily customized; see the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for more information.

+### WARNING

-## Packaging
-
-### Repositories
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/fastfetch.svg?header=)](https://repology.org/project/fastfetch/versions)
-
-### Manual
-
-* DEB / RPM package: `cmake --build . --target package`
-* Install directly: `cmake --install . --prefix /usr/local`
+Fastfetch supports a `Command` module that can run arbitrary shell commands. If you copy-paste a config file from an untrusted source, it may contain malicious commands that can harm your system or compromise your privacy. Please always review the config file before using it.

 ## FAQ

 ### Q: Neofetch is good enough. Why do I need fastfetch?

 1. Fastfetch is actively maintained.
-2. Fastfetch is faster. As the name suggests.
-3. Fastfetch has a greater number of features, though by default fastfetch only has a few modules enabled; use `fastfetch -c all` to find what you want.
+2. Fastfetch is faster, as the name suggests.
+3. Fastfetch has a greater number of features, though by default it only has a few modules enabled; use `fastfetch -c all` to discover what you want.
 4. Fastfetch is more configurable. You can find more information in the Wiki: <https://github.com/fastfetch-cli/fastfetch/wiki/Configuration>.
 5. Fastfetch is more polished. For example, neofetch prints `555 MiB` in the Memory module and `23 G` in the Disk module, whereas fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
 6. Fastfetch is more accurate. For example, [neofetch never actually supports the Wayland protocol](https://github.com/dylanaraps/neofetch/pull/2395).

-### Q: Fastfetch shows my local IP address. It leaks my privacy!
+### Q: Fastfetch shows my local IP address. Does it leak my privacy?

-A local IP (10.x.x.x, 172.x.x.x, 192.168.x.x) has nothing to do with privacy. It only makes sense if you are on the same network, for example, if you connect to the same Wi-Fi network.
+A local IP address (10.x.x.x, 172.x.x.x, 192.168.x.x) has nothing to do with privacy. It only has meaning if you are on the same network, for example, if you connect to the same Wi-Fi network.

-Actually the `Local IP` module is the most useful module for me personally. I (@CarterLi) have several VMs installed to test fastfetch and often need to SSH into them. I have fastfetch running on shell startup and I never need to type `ip addr` manually.
+Actually, the `Local IP` module is the most useful module for me personally. I (@CarterLi) have several VMs installed to test fastfetch and often need to SSH into them. With fastfetch running on shell startup, I never need to type `ip addr` manually.

 If you really don't like it, you can disable the `Local IP` module in `config.jsonc`.

 ### Q: Where is the config file? I can't find it.

-`Fastfetch` does not generate config file automatically. You can use `fastfetch --gen-config` to generate one. The config file will be saved in `~/.config/fastfetch/config.jsonc` by default. See [Wiki for detail](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration).
+Fastfetch does not generate a config file automatically. You can use `fastfetch --gen-config` to generate one. The config file will be saved in `~/.config/fastfetch/config.jsonc` by default. See the [Wiki for details](https://github.com/fastfetch-cli/fastfetch/wiki/Configuration).

 ### Q: The configuration is so complex. Where is the documentation?

-Fastfetch uses JSON (with comments) for configuration. I suggest you use an IDE with JSON schema support (like VSCode) to edit it.
+Fastfetch uses JSON (with comments) for configuration. I suggest using an IDE with JSON schema support (like VSCode) to edit it.

-Alternatively, you can refer to the presets in [`presets` directory](https://github.com/fastfetch-cli/fastfetch/tree/dev/presets).
+Alternatively, you can refer to the presets in the [`presets` directory](https://github.com/fastfetch-cli/fastfetch/tree/dev/presets).

 The **correct** way to edit the configuration:

@@ -140,32 +146,32 @@ This is an example that [changes size prefix from MiB / GiB to MB / GB](https://

 ### Q: I WANT THE DOCUMENTATION!

-[Here is the documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Json-Schema). It is generated from [JSON schema](https://github.com/fastfetch-cli/fastfetch/blob/dev/doc/json_schema.json) but you won't like it.
+[Here is the documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Json-Schema). It is generated from the [JSON schema](https://github.com/fastfetch-cli/fastfetch/blob/dev/doc/json_schema.json), but you might not find it very user-friendly.

 ### Q: How can I customize the module output?

-Fastfetch uses `format` to generate output. For example, to make the `GPU` module show only the GPU name (leaving other information undisplayed), you can use
+Fastfetch uses `format` to generate output. For example, to make the `GPU` module show only the GPU name (leaving other information undisplayed), you can use:

 ```jsonc
 {
    "modules": [
        {
            "type": "gpu",
-            "format": "{name}" // See `fastfetch -h gpu-format` for detail
+            "format": "{name}" // See `fastfetch -h gpu-format` for details
        }
    ]
 }
 ```

-. . which is equivalent to `fastfetch -s gpu --gpu-format '{name}'`
+...which is equivalent to `fastfetch -s gpu --gpu-format '{name}'`

-See `fastfetch -h format` for information on basic usage. For module specific formattion, see `fastfetch -h <module>-format`
+See `fastfetch -h format` for information on basic usage. For module-specific formatting, see `fastfetch -h <module>-format`

-### Q: I have my own ascii-art / image file. How can I show it with fastfetch?
+### Q: I have my own ASCII art / image file. How can I show it with fastfetch?

-Try `fastfetch -l /path/to/logo`. See [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for detail.
+Try `fastfetch -l /path/to/logo`. See the [logo documentation](https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options) for details.

-If you just want to display distro name in [FIGlet text](https://github.com/pwaller/pyfiglet):
+If you just want to display the distro name in [FIGlet text](https://github.com/pwaller/pyfiglet):

 ```bash
 # install pyfiglet and jq first
@@ -174,32 +180,32 @@ pyfiglet -s -f small_slant $(fastfetch -s os --format json | jq -r '.[0].result.

 ![image](https://github.com/fastfetch-cli/fastfetch/assets/6134068/6466524e-ab8c-484f-848d-eec7ddeb7df2)

-### Q: My image logo behaves weird. How can I fix it?
+### Q: My image logo behaves strangely. How can I fix it?

-See troubleshooting section: <https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options#troubleshooting>
+See the troubleshooting section: <https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options#troubleshooting>

-### Q: Fastfetch runs in white and black on shell startup. Why?
+### Q: Fastfetch runs in black and white on shell startup. Why?

-This issue usually happens when using fastfetch with `p10k`. There are known incompatibility between fastfetch and p10k instant prompt.
-The p10k doc clearly states that you should NOT print anything to stdout after `p10k-instant-prompt` is initialized. You should either put `fastfetch` before initialization of `p10k-instant-prompt` (recommended)
+This issue usually occurs when using fastfetch with `p10k`. There are known incompatibilities between fastfetch and p10k instant prompt.
+The p10k documentation clearly states that you should NOT print anything to stdout after `p10k-instant-prompt` is initialized. You should put `fastfetch` before the initialization of `p10k-instant-prompt` (recommended).

-You can always use `fastfetch --pipe false` to force fastfetch running in colorful mode.
+You can always use `fastfetch --pipe false` to force fastfetch to run in colorful mode.

-### Q: Why do fastfetch and neofetch show different memory usage result?
+### Q: Why do fastfetch and neofetch show different memory usage results?

 See [#1096](https://github.com/fastfetch-cli/fastfetch/issues/1096).

-### Q: Fastfetch shows less dpkg packages than neofetch, is it a bug?
+### Q: Fastfetch shows fewer dpkg packages than neofetch. Is it a bug?

-Neofetch incorrectly counts `rc` packages ( the package has been removed, but that the configuration files remain ). Bug https://github.com/dylanaraps/neofetch/issues/2278
+Neofetch incorrectly counts `rc` packages (packages that have been removed but still have configuration files remaining). See bug: https://github.com/dylanaraps/neofetch/issues/2278

-### Q: I use Debian / Ubuntu / Debian derived distro. My GPU is detected as `XXXX Device XXXX (VGA compatible)`. Is it a bug?
+### Q: I use Debian / Ubuntu / Debian-derived distro. My GPU is detected as `XXXX Device XXXX (VGA compatible)`. Is this a bug?

-Try upgrading `pci.ids`: Download <https://pci-ids.ucw.cz/v2.2/pci.ids> and overwrite file `/usr/share/hwdata/pci.ids`. For AMD GPUs, you should also upgrade `amdgpu.ids`: Download <https://gitlab.freedesktop.org/mesa/drm/-/raw/main/data/amdgpu.ids> and overwrite file `/usr/share/libdrm/amdgpu.ids`
+Try upgrading `pci.ids`: Download <https://pci-ids.ucw.cz/v2.2/pci.ids> and overwrite the file `/usr/share/hwdata/pci.ids`. For AMD GPUs, you should also upgrade `amdgpu.ids`: Download <https://gitlab.freedesktop.org/mesa/drm/-/raw/main/data/amdgpu.ids> and overwrite the file `/usr/share/libdrm/amdgpu.ids`

-Alternatively, you may try to use `fastfetch --gpu-driver-specific`, so that `fastfetch` will try to ask the driver for GPU name if supported.
+Alternatively, you may try using `fastfetch --gpu-driver-specific`, which will make fastfetch attempt to ask the driver for the GPU name if supported.

-### Q: I get error `Authorization required, but no authorization protocol specified` when running fastfetch in root
+### Q: I get the error `Authorization required, but no authorization protocol specified` when running fastfetch as root

 Try `export XAUTHORITY=$HOME/.Xauthority`

@@ -209,7 +215,7 @@ Try `fastfetch --wm-detect-plugin`. See also [#984](https://github.com/fastfetch

 ### Q: How can I change the colors of my ASCII logo?

-Try `fastfetch --logo-color-[1-9] <color>`. `[1-9]` is the index of color placeholders.
+Try `fastfetch --logo-color-[1-9] <color>`, where `[1-9]` is the index of color placeholders.

 For example: `fastfetch --logo-color-1 red --logo-color-2 green`.

@@ -226,7 +232,7 @@ In JSONC, you can use:
 }
 ```

-### Q: How to hide a key?
+### Q: How do I hide a key?

 Set the key to a white space.

@@ -236,9 +242,59 @@ Set the key to a white space.
 }
 ```

+### Q: How can I display images on Windows?
+
+As of April 2025:
+
+#### mintty and Wezterm
+
+mintty (used by Bash on Windows and MSYS2) and Wezterm (nightly build only) support the iTerm image protocol on Windows.
+
+In `config.jsonc`:  
+```json
+{
+  "logo": {
+    "type": "iterm",
+    "source": "C:/path/to/image.png",
+    "width": <num-in-chars>
+  }
+}
+```
+
+#### Windows Terminal
+
+Windows Terminal supports the sixel image protocol only.
+
+* If you installed fastfetch through MSYS2:
+    1. Install imagemagick: `pacman -S mingw-w64-<subsystem>-x86_64-imagemagick`
+    2. In `config.jsonc`:  
+```jsonc
+{
+  "logo": {
+    "type": "sixel", // DO NOT USE "auto"
+    "source": "C:/path/to/image.png", // Do NOT use `~` as fastfetch is a native Windows program and doesn't apply cygwin path conversion
+    "width": <image-width-in-chars>, // Optional
+    "height": <image-height-in-chars> // Optional
+  }
+}
+```
+* If you installed fastfetch via scoop or downloaded the binary directly from the GitHub Releases page:
+    1. Convert your image manually to sixel format using [any online image conversion service](https://www.google.com/search?q=convert+image+to+sixel)
+    2. In `config.jsonc`:  
+```jsonc
+{
+  "logo": {
+    "type": "raw", // DO NOT USE "auto"
+    "source": "C:/path/to/image.sixel",
+    "width": <image-width-in-chars>, // Required
+    "height": <image-height-in-chars> // Required
+  }
+}
+```
+
 ### Q: I want feature A / B / C. Will fastfetch support it?

-Fastfetch is a system information tool. We only accept hardware or system level software feature requests. For most personal uses, I recommend using `Command` module to detect it yourself, which can be used to grab output from a custom shell script:
+Fastfetch is a system information tool. We only accept hardware or system-level software feature requests. For most personal uses, I recommend using the `Command` module to implement custom functionality, which can be used to grab output from a custom shell script:

 ```jsonc
 // This module shows the default editor
@@ -253,23 +309,28 @@ Fastfetch is a system information tool. We only accept hardware or system level
 }
 ```

-Otherwise, open a feature request in [GitHub Issues](https://github.com/fastfetch-cli/fastfetch/issues).
+Otherwise, please open a feature request in [GitHub Issues](https://github.com/fastfetch-cli/fastfetch/issues).

 ### Q: I have questions. Where can I get help?

 * For usage questions, please start a discussion in [GitHub Discussions](https://github.com/fastfetch-cli/fastfetch/discussions).
-* For possible bugs, please open an issue in [GitHub Issues](https://github.com/fastfetch-cli/fastfetch/issues). Be sure to fill the bug-report template carefully for developers to investigate.
+* For possible bugs, please open an issue in [GitHub Issues](https://github.com/fastfetch-cli/fastfetch/issues). Be sure to fill out the bug report template carefully to help developers investigate.

 ## Donate

-If you find Fastfetch to be useful, please consider donating.
+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 it a star to support us!
+Give us a star to show your support!

 <a href="https://star-history.com/#fastfetch-cli/fastfetch&Date">
  <picture>
@@ -1,430 +1,121 @@
-__fastfetch_complete_help()
-{
-    local __ff_helps=(
-        "color"
-        "format"
-        "config"
-        "os-format"
-        "host-format"
-        "kernel-format"
-        "uptime-format"
-        "processes-format"
-        "packages-format"
-        "shell-format"
-        "display-format"
-        "de-format"
-        "wm-format"
-        "wmtheme-format"
-        "theme-format"
-        "icons-format"
-        "font-format"
-        "cursor-format"
-        "terminal-format"
-        "terminalfont-format"
-        "cpu-format"
-        "cpuusage-format"
-        "gpu-format"
-        "memory-format"
-        "swap-format"
-        "disk-format"
-        "battery-format"
-        "poweradapter-format"
-        "locale-format"
-        "localip-format"
-        "publicip-format"
-        "player-format"
-        "media-format"
-        "datetime-format"
-        "date-format"
-        "time-format"
-        "vulkan-format"
-        "opengl-format"
-        "opencl-format"
-        "bluetooth-format"
-    )
-    COMPREPLY=($(compgen -W "${__ff_helps[*]}" -- "$CURRENT_WORD"))
+#!/usr/bin/env bash
+
+_fastfetch() {
+  # Use Bash built-in variables directly
+  local cur="${COMP_WORDS[COMP_CWORD]}"
+  local prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+  # Check if Python is available
+  if ! command -v python3 &>/dev/null; then
+    return
+  fi
+
+  # Handle standard completion cases
+  case "$prev" in
+    --color|--color-keys|--color-title|--color-output|--color-separator|--*-color|--*-key-color|--*-output-color|--logo-color-[1-9]|--percent-color-*|--temp-color-*)
+      local -a colors=("black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" "default")
+      COMPREPLY=($(compgen -W "${colors[*]}" -- "$cur"))
+      return
+      ;;
+    --logo|-l)
+      local -a logos
+      readarray -t logos < <(fastfetch --list-logos autocompletion 2>/dev/null)
+      logos+=("none" "small")
+      COMPREPLY=($(compgen -W "${logos[*]}" -- "$cur"))
+      return
+      ;;
+    --config|-c)
+      local -a presets
+      readarray -t presets < <(fastfetch --list-presets autocompletion 2>/dev/null)
+      presets+=("none")
+      COMPREPLY=($(compgen -W "${presets[*]}" -- "$cur"))
+      # Also allow file path completion
+      if type _filedir &>/dev/null; then
+        _filedir
+      elif type compgen &>/dev/null; then
+        COMPREPLY+=($(compgen -f -- "$cur"))
+      fi
+      return
+      ;;
+    --structure|-s)
+      # Get all module names in lowercase only
+      local -a structures
+      readarray -t structures < <(fastfetch --list-modules autocompletion 2>/dev/null | cut -d':' -f1 | tr '[:upper:]' '[:lower:]')
+      COMPREPLY=($(compgen -W "${structures[*]}" -- "$cur"))
+      return
+      ;;
+    --help|-h)
+      local -a modules
+      readarray -t modules < <(fastfetch --list-modules autocompletion 2>/dev/null)
+      # Convert to lowercase and keep only module names
+      local -a module_names=()
+      for module in "${modules[@]}"; do
+        module_names+=($(echo "$module" | cut -d':' -f1 | tr '[:upper:]' '[:lower:]')-format)
+      done
+      module_names+=("format" "color")
+      COMPREPLY=($(compgen -W "${module_names[*]}" -- "$cur"))
+      return
+      ;;
+    --format)
+      COMPREPLY=($(compgen -W "json default" -- "$cur"))
+      return
+      ;;
+    --*-format)
+      # Format string completion, handle spaces
+      return
+      ;;
+    --*path*|--*file*|--gen-config*|--*data*)
+      # File path completion
+      if type _filedir &>/dev/null; then
+        _filedir
+      elif type compgen &>/dev/null; then
+        COMPREPLY=($(compgen -f -- "$cur"))
+      fi
+      return
+      ;;
+  esac
+
+  # If not a special option, generate all possible options
+  if [[ "$cur" == -* ]]; then
+    local -a opts
+    readarray -t opts < <(python3 - "$cur" <<'EOF'
+import json
+import sys
+import subprocess
+
+def main(current):
+    try:
+        # Use fastfetch --help-raw to get option data
+        output = subprocess.check_output(['fastfetch', '--help-raw'], stderr=subprocess.DEVNULL)
+        data = json.loads(output)
+
+        for category in data.values():
+            for flag in category:
+                if flag.get("pseudo", False):
+                    continue
+
+                if "short" in flag:
+                    print(f"-{flag['short']}")
+
+                if "long" in flag:
+                    if flag["long"] == "logo-color-[1-9]":
+                        for i in range(1, 10):
+                            print(f"--logo-color-{i}")
+                    else:
+                        print(f"--{flag['long']}")
+    except Exception:
+        # If error occurs, return no options
+        pass
+
+if __name__ == "__main__":
+    main(sys.argv[1])
+EOF
+)
+    COMPREPLY=($(compgen -W "${opts[*]}" -- "$cur"))
+  fi
+
+  return 0
 }

-__fastfetch_complete_bool()
-{
-    COMPREPLY=($(compgen -W "true false" -- "$CURRENT_WORD"))
-}
-
-__fastfetch_complete_string()
-{
-    if [[ $CURRENT_WORD != "" ]]; then
-        COMPREPLY=("$CURRENT_WORD")
-    fi
-}
-
-__fastfetch_complete_path()
-{
-    COMPREPLY=($(compgen -A file -- "$CURRENT_WORD"))
-}
-
-__fastfetch_complete_logo()
-{
-    COMPREPLY=($(compgen -W "$(fastfetch --list-logos autocompletion)" -- "$CURRENT_WORD"))
-}
-
-__fastfetch_complete_logo_type()
-{
-    local __ff_logo_types=(
-        "auto"
-        "builtin"
-        "file"
-        "raw"
-        "sixel"
-        "kitty"
-        "chafa"
-    )
-    COMPREPLY=($(compgen -W "${__ff_logo_types[*]}" -- "$CURRENT_WORD"))
-}
-
-__fastfetch_complete_binary_prefix()
-{
-    local __ff_size_binary_prefixes=(
-        "iec"
-        "si"
-        "jedec"
-    )
-    COMPREPLY=($(compgen -W "${__ff_size_binary_prefixes[*]}" -- "$CURRENT_WORD"))
-}
-
-__fastfetch_complete_gl()
-{
-    local __ff_gl_types=(
-        "auto"
-        "egl"
-        "glx"
-        "osmesa"
-    )
-    COMPREPLY=($(compgen -W "${__ff_gl_types[*]}" -- "$CURRENT_WORD"))
-}
-
-__fastfetch_complete_option()
-{
-    local FF_OPTIONS_ALL=(
-        "${FF_OPTIONS_BOOL[@]}"
-        "${FF_OPTIONS_STRING[@]}"
-        "${FF_OPTIONS_PATH[@]}"
-        "${FF_OPTIONS_LOGO[@]}"
-        "${FF_OPTIONS_LOGO_TYPE[@]}"
-        "${FF_OPTIONS_BINARY_PREFIX[@]}"
-        "${FF_OPTIONS_OPENGL[@]}"
-    )
-
-    if [[ $WORD_COUND -lt 3 ]]; then
-        FF_OPTIONS_ALL+=(
-            "${FF_OPTIONS_SINGLE[@]}"
-            "${FF_OPTIONS_HELP[@]}"
-        )
-    fi
-
-    for ff_word in ${COMP_WORDS[@]}; do
-        if [[ $ff_word == $CURRENT_WORD ]]; then
-            break
-        fi
-
-        FF_OPTIONS_ALL=("${FF_OPTIONS_ALL[@]/$ff_word}")
-    done
-
-    COMPREPLY=($(compgen -W "${FF_OPTIONS_ALL[*]}" -- "$CURRENT_WORD"))
-}
-
-__fastfetch_previous_matches()
-{
-    for ff_option in "$@"; do
-        if [[ $ff_option == "$PREVIOUS_WORD" ]]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
-__fastfetch_completion()
-{
-    local CURRENT_WORD="${COMP_WORDS[$COMP_CWORD]}"
-    local PREVIOUS_WORD="${COMP_WORDS[$COMP_CWORD - 1]}"
-    local WORD_COUND="${#COMP_WORDS[@]}"
-
-    local FF_OPTIONS_SINGLE=(
-        "-v"
-        "--version"
-        "--list-logos"
-        "--list-modules"
-        "--list-presets"
-        "--list-features"
-        "--print-logos"
-        "--print-config-system"
-        "--print-config-user"
-        "--print-structure"
-        "--gen-config"
-        "--gen-config-force"
-    )
-
-    local FF_OPTIONS_HELP=(
-        "-h"
-        "--help"
-    )
-
-    local FF_OPTIONS_BOOL=(
-        "-r"
-        "--show-errors"
-        "--logo-print-remaining"
-        "--multithreading"
-        "--stat"
-        "--allow-slow-operations"
-        "--disable-linewrap"
-        "--hide-cursor"
-        "--cpu-temp"
-        "--gpu-temp"
-        "--battery-temp"
-        "--display-precise-refresh-rate"
-        "--localip-show-ipv4"
-        "--localip-show-ipv6"
-        "--localip-show-flags"
-        "--localip-show-loop"
-        "--localip-show-mtu"
-        "--localip-show-speed"
-        "--localip-name-prefix"
-        "--localip-compact-type"
-        "--escape-bedrock"
-        "--pipe"
-        "--title-fqdn"
-        "--disk-folders"
-        "--disk-show-external"
-        "--disk-show-hidden"
-        "--disk-show-subvolumes"
-        "--gpu-hide-integrated"
-        "--gpu-hide-discrete"
-        "--gpu-force-method"
-        "--disk-show-unknown"
-        "--bluetooth-show-disconnected"
-    )
-
-    local FF_OPTIONS_STRING=(
-        "--logo-type"
-        "--logo-padding"
-        "--logo-padding-left"
-        "--logo-padding-right"
-        "--logo-padding-top"
-        "--logo-color-1"
-        "--logo-color-2"
-        "--logo-color-3"
-        "--logo-color-4"
-        "--logo-color-5"
-        "--logo-color-6"
-        "--logo-color-7"
-        "--logo-color-8"
-        "--logo-color-9"
-        "--logo-width"
-        "--logo-height"
-        "--color"
-        "--color-keys"
-        "--color-title"
-        "--display-compact-type"
-        "--separator"
-        "-s"
-        "--structure"
-        "--player-name"
-        "--percent-type"
-        "--publicip-url"
-        "--publicip-timeout"
-        "--weather-output-format"
-        "--weather-timeout"
-        "--os-key"
-        "--os-format"
-        "--os-key-color"
-        "--host-key"
-        "--host-format"
-        "--host-key-color"
-        "--kernel-key"
-        "--kernel-format"
-        "--kernel-key-color"
-        "--uptime-key"
-        "--uptime-format"
-        "--uptime-key-color"
-        "--processes-key"
-        "--processes-format"
-        "--processes-key-color"
-        "--packages-key"
-        "--packages-format"
-        "--packages-key-color"
-        "--shell-key"
-        "--shell-format"
-        "--shell-key-color"
-        "--display-key"
-        "--display-format"
-        "--display-key-color"
-        "--de-key"
-        "--de-format"
-        "--de-key-color"
-        "--wm-key"
-        "--wm-format"
-        "--wm-key-color"
-        "--wmtheme-key"
-        "--wmtheme-format"
-        "--wmtheme-key-color"
-        "--theme-key"
-        "--theme-format"
-        "--theme-key-color"
-        "--icons-key"
-        "--icons-format"
-        "--icons-key-color"
-        "--font-key"
-        "--font-format"
-        "--font-key-color"
-        "--cursor-key"
-        "--cursor-format"
-        "--cursor-key-color"
-        "--terminal-key"
-        "--terminal-format"
-        "--terminal-key-color"
-        "--terminalfont-key"
-        "--terminalfont-format"
-        "--terminalfont-key-color"
-        "--cpu-key"
-        "--cpu-format"
-        "--cpu-key-color"
-        "--cpu-useage-key"
-        "--cpu-useage-format"
-        "--cpu-useage-key-color"
-        "--gpu-key"
-        "--gpu-format"
-        "--gpu-key-color"
-        "--memory-key"
-        "--memory-format"
-        "--memory-key-color"
-        "--swap-key"
-        "--swap-format"
-        "--swap-key-color"
-        "--disk-key"
-        "--disk-format"
-        "--disk-key-color"
-        "--battery-key"
-        "--battery-format"
-        "--battery-key-color"
-        "--poweradapter-key"
-        "--poweradapter-format"
-        "--poweradapter-key-color"
-        "--locale-key"
-        "--locale-format"
-        "--locale-key-color"
-        "--localip-key"
-        "--localip-format"
-        "--localip-key-color"
-        "--publicip-key"
-        "--publicip-format"
-        "--publicip-key-color"
-        "--wifi-key"
-        "--wifi-format"
-        "--wifi-key-color"
-        "--weather-key"
-        "--weather-format"
-        "--weather-key-color"
-        "--player-key"
-        "--player-format"
-        "--player-key-color"
-        "--media-key"
-        "--media-format"
-        "--media-key-color"
-        "--datetime-key"
-        "--datetime-format"
-        "--datetime-key-color"
-        "--date-key"
-        "--date-format"
-        "--date-key-color"
-        "--time-key"
-        "--time-format"
-        "--time-key-color"
-        "--vulkan-key"
-        "--vulkan-format"
-        "--vulkan-key-color"
-        "--opengl-key"
-        "--opengl-format"
-        "--opengl-key-color"
-        "--opencl-key"
-        "--opencl-format"
-        "--opencl-key-color"
-        "--users-key"
-        "--users-format"
-        "--users-key-color"
-        "--users-myself-only"
-        "--bluetooth-key"
-        "--bluetooth-format"
-        "--bluetooth-key-color"
-    )
-
-    local FF_OPTIONS_PATH=(
-        "-c"
-        "--config"
-        "--lib-vulkan"
-        "--lib-wayland"
-        "--lib-xcb-randr"
-        "--lib-xcb"
-        "--lib-xrandr"
-        "--lib-X11"
-        "--lib-gio"
-        "--lib-dconf"
-        "--lib-dbus"
-        "--lib-xfconf"
-        "--lib-sqlite3"
-        "--lib-rpm"
-        "--lib-imagemagick"
-        "--lib-z"
-        "--lib-chafa"
-        "--lib-egl"
-        "--lib-glx"
-        "--lib-osmesa"
-        "--lib-opencl"
-        "--lib-pulse"
-        "--lib-ddcutil"
-        "--lib-nm"
-    )
-
-    local FF_OPTIONS_LOGO=(
-        "-l"
-        "--logo"
-    )
-
-    local FF_OPTIONS_LOGO_TYPE=(
-        "--logo-type"
-    )
-
-    local FF_OPTIONS_BINARY_PREFIX=(
-        "--binary-prefix"
-    )
-
-    local FF_OPTIONS_OPENGL=(
-        "--opengl-type"
-    )
-
-    if __fastfetch_previous_matches "${FF_OPTIONS_SINGLE[@]}"; then
-        return
-    elif [[ $WORD_COUND -gt 3 && ( ${COMP_WORDS[$COMP_CWORD - 2]} == "--help" || ${COMP_WORDS[$COMP_CWORD - 2]} == "-h" ) ]]; then
-        return
-    elif [[ $CURRENT_WORD == "-"* ]]; then
-        __fastfetch_complete_option
-    elif __fastfetch_previous_matches "${FF_OPTIONS_HELP[@]}"; then
-        __fastfetch_complete_help
-    elif __fastfetch_previous_matches "${FF_OPTIONS_BOOL[@]}"; then
-        __fastfetch_complete_bool
-    elif __fastfetch_previous_matches "${FF_OPTIONS_STRING[@]}"; then
-        __fastfetch_complete_string
-    elif __fastfetch_previous_matches "${FF_OPTIONS_PATH[@]}"; then
-        __fastfetch_complete_path
-    elif __fastfetch_previous_matches "${FF_OPTIONS_LOGO[@]}"; then
-        __fastfetch_complete_logo
-    elif __fastfetch_previous_matches "${FF_OPTIONS_LOGO_TYPE[@]}"; then
-        __fastfetch_complete_logo_type
-    elif __fastfetch_previous_matches "${FF_OPTIONS_BINARY_PREFIX[@]}"; then
-        __fastfetch_complete_binary_prefix
-    elif __fastfetch_previous_matches "${FF_OPTIONS_OPENGL[@]}"; then
-        __fastfetch_complete_gl
-    else
-        __fastfetch_complete_option
-    fi
-}
-
-complete -F __fastfetch_completion fastfetch
+# Register completion
+complete -F _fastfetch fastfetch
@@ -62,11 +62,17 @@ end
 echo '
 import json, subprocess, sys

+
 def main():
    data: dict[str, list[dict]] = json.loads(subprocess.check_output(["fastfetch", "--help-raw"]))

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

@@ -75,7 +81,7 @@ def main():
                command_prefix += f""" -o {flag["short"]}"""

            if "arg" in flag:
-                type: str = flag["arg"]["type"];
+                type: str = flag["arg"]["type"]
                if type == "bool":
                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_bool)\"")
                elif type == "color":
@@ -98,6 +104,7 @@ def main():
            else:
                print(f"{command_prefix} -f")

+
 if __name__ == "__main__":
    try:
        main()
@@ -1,3 +1,214 @@
+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
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 23 Sep 2025 09:58:48 +0800
+
+fastfetch (2.52.0) jammy; urgency=medium
+
+  * Update to 2.52.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 05 Sep 2025 14:59:44 +0800
+
+fastfetch (2.51.0) jammy; urgency=medium
+
+  * Update to 2.51.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 29 Aug 2025 08:55:03 +0800
+
+fastfetch (2.50.2) jammy; urgency=medium
+
+  * Update to 2.50.2
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 21 Aug 2025 10:33:07 +0800
+
+fastfetch (2.49.0) jammy; urgency=medium
+
+  * Update to 2.49.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 31 Jul 2025 14:32:59 +0800
+
+fastfetch (2.48.0) jammy; urgency=medium
+
+  * Update to 2.48.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 17 Jul 2025 16:16:52 +0800
+
+fastfetch (2.47.0) jammy; urgency=medium
+
+  * Update to 2.47.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 03 Jul 2025 14:51:45 +0800
+
+fastfetch (2.46.0) jammy; urgency=medium
+
+  * Update to 2.46.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 20 Jun 2025 15:01:21 +0800
+
+fastfetch (2.45.0) jammy; urgency=medium
+
+  * Update to 2.45.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 05 Jun 2025 10:56:38 +0800
+
+fastfetch (2.44.0) jammy; urgency=medium
+
+  * Update to 2.44.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 26 May 2025 14:59:01 +0800
+
+fastfetch (2.43.0) jammy; urgency=medium
+
+  * Update to 2.43.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 14 May 2025 09:49:50 +0800
+
+fastfetch (2.42.0) jammy; urgency=medium
+
+  * Update to 2.42.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 30 Apr 2025 14:08:57 +0800
+
+fastfetch (2.41.0) jammy; urgency=medium
+
+  * Update to 2.41.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 16 Apr 2025 13:42:58 +0800
+
+fastfetch (2.40.4) jammy; urgency=medium
+
+  * Update to 2.40.4
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 10 Apr 2025 15:38:21 +0800
+
+fastfetch (2.40.3) jammy; urgency=medium
+
+  * Update to 2.40.3
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 07 Apr 2025 09:29:27 +0800
+
+fastfetch (2.40.0) jammy; urgency=medium
+
+  * Update to 2.40.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 03 Apr 2025 08:46:54 +0800
+
+fastfetch (2.39.1) jammy; urgency=medium
+
+  * Update to 2.39.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 21 Mar 2025 11:02:19 +0800
+
+fastfetch (2.39.0ubuntu1) jammy; urgency=medium
+
+  * Remove unwanted debugging code
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 20 Mar 2025 10:39:22 +0800
+
+fastfetch (2.39.0) jammy; urgency=medium
+
+  * Update to 2.39.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 20 Mar 2025 10:35:18 +0800
+
+fastfetch (2.38.0) jammy; urgency=medium
+
+  * Update to 2.38.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 05 Mar 2025 14:56:24 +0800
+
+fastfetch (2.37.0) jammy; urgency=medium
+
+  * Update to 2.37.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 19 Feb 2025 15:43:42 +0800
+
+fastfetch (2.36.1) jammy; urgency=medium
+
+  * Update to 2.36.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 11 Feb 2025 13:39:55 +0800
+
+fastfetch (2.36.0) jammy; urgency=medium
+
+  * Update to 2.36.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 10 Feb 2025 10:13:53 +0800
+
+fastfetch (2.35.0) jammy; urgency=medium
+
+  * Update to 2.35.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Sun, 26 Jan 2025 10:15:22 +0800
+
+fastfetch (2.34.1) jammy; urgency=medium
+
+  * Update to 2.34.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 13 Jan 2025 16:06:22 +0800
+
+fastfetch (2.34.0) jammy; urgency=medium
+
+  * Update to 2.34.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 09 Jan 2025 09:03:17 +0800
+
 fastfetch (2.33.0) jammy; urgency=medium

  * Update to 2.33.0
@@ -279,4 +490,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: libvulkan-dev, libwayland-dev, libxrandr-dev, libxcb-randr0-dev, libdconf-dev, libdbus-1-dev, libmagickcore-dev, libxfconf-0-dev, libsqlite3-dev, librpm-dev, libegl-dev, libglx-dev, libosmesa6-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, directx-headers-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.33.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
@@ -1,8 +1,7 @@
 .TH FASTFETCH 1 "@FASTFETCH_BUILD_DATE@" "@CMAKE_PROJECT_NAME@ @CMAKE_PROJECT_VERSION@"

 .SH NAME
-fastfetch \- a neofetch\-like tool for fetching system information and
-displaying them in a pretty way
+fastfetch \- a fast and customizable system information tool similar to neofetch

 .SH SYNOPSIS

@@ -11,15 +10,12 @@ displaying them in a pretty way

 .SH DESCRIPTION

-Fastfetch is a neofetch\-like tool for fetching system information and
-displaying them in a pretty way. It is written mainly in C, with performance
-and customizability in mind.
-Currently, Linux, Android, FreeBSD, MacOS and Windows 7+ are supported.
+Fastfetch is a tool for displaying system information in a visually appealing way. Written primarily in C, it focuses on performance and customizability while providing functionality similar to neofetch.
+It supports Linux, Android, *BSD, macOS, Haiku, and Windows 7 or newer.

 .SH "EXIT STATUS"

-On successful execution, fastfetch returns zero. If any error happened,
-the exit code will be non\-zero.
+Fastfetch returns zero on successful execution. Any errors result in a non-zero exit code.

 .SH OPTIONS

@@ -27,115 +23,200 @@ the exit code will be non\-zero.
 .TP

 .B \-h, \-\-help \fI[command]
-Show help output, displaying all available options or help for given command
+Display help information for all available options or for a specific command
 .TP

 .B \-v, \-\-version
-Show version of fastfetch
+Display the version of fastfetch
+.TP
+
+.B \-\-version\-raw
+Display the raw version string (major.minor.patch)
 .TP

 .B \-\-list\-config\-paths
-List search paths of config files
+List search paths for configuration files
 .TP

 .B \-\-list\-data\-paths
-List search paths of presets and logos
+List search paths for presets and logos
 .TP

 .B \-\-list\-logos
-List available logos, they can be loaded with \fI\-\-logo
+List available logos that can be loaded with \fI\-\-logo
 .TP

 .B \-\-list\-modules
-List available modules
+List all available modules
 .TP

 .B \-\-list\-presets
-List available presets, they can be loaded with \fI\-\-config
+List available presets that can be loaded with \fI\-\-config
 .TP

 .B \-\-list\-features
-List the supported features fastfetch was compiled with
+List the features that fastfetch was compiled with (mainly for development)
 .TP

 .B \-\-print\-logos
-Print available logos
+Display all available logos
 .TP

 .B \-\-print\-structure
-Print the default structure
+Display the default structure
 .TP

 .B \-\-format \fI<type>
-Set the output format. Besides the
-.I default
-format, only
-.I json
-is supported currently.
-
-
-.SS "Display Options"
-.TP
-
-.B \-l, \-\-logo \fI<logo>
-Set the logo to display
-.TP
-
-.B \-s, \-\-structure \fI<structure>
-Set the structure of the fetch. For details about the structure,
-see the CONFIGURATION section.
-
+Set the output format. Available options are:
+.RS
+.IP \(bu 2
+\fIdefault\fR: Default human-readable format
+.IP \(bu 2
+\fIjson\fR: JSON format for machine processing
+.RE

 .SS "Config Options"
 .TP

 .B \-c, \-\-config \fI<config>
-Use the specified config file or preset. If
-.I none
-is specified, disable further config loading. For details about
-config files, see the CONFIGURATION section
+Use the specified config file or preset. Specify \fInone\fR to disable further config loading. See the CONFIGURATION section for details on config files.
 .TP

-.B \-\-gen\-config \fI[file]
-Generate a config file with options specified on the command line.
-If \fIfile\fR is specified, the configuration will be written to the
-file, otherwise it will be written to stdout.
+.B \-\-gen\-config \fI[path]
+Generate a config file with options specified on the command line. If \fIpath\fR is not specified, it defaults to \fB~/.config/fastfetch/config.jsonc\fR. If \fIpath\fR is "\-", the configuration will be written to stdout.
 .TP

-.B \-\-gen\-config\-force \fI[file]
-Same as \fB\-\-gen\-config\fR, but overwrites existing config
+.B \-\-gen\-config\-force \fI[path]
+Same as \fB\-\-gen\-config\fR, but overwrites any existing file at the destination path.
 .TP

+.SS "Logo Options"
+.TP

-To list all options, use \fB\-\-help\fR. It will also print all available module options.
+.B \-l, \-\-logo \fI<logo>
+Set the logo to display. Can be the name of a built-in logo or a path to an image file. Use \fInone\fR to disable the logo.
+.TP
+
+.B \-\-logo\-type \fI<type>
+Set the type of the logo specified with \fI\-\-logo\fR. Available types include \fIauto\fR, \fIbuiltin\fR, \fIfile\fR, \fIsixel\fR, \fIkitty\fR, and others. See \fB\-\-help logo\-type\fR for details.
+.TP
+
+.B \-\-logo\-width \fI<width>
+Set the width of the logo in characters (for image logos)
+.TP
+
+.B \-\-logo\-height \fI<height>
+Set the height of the logo in characters (for image logos)
+.TP
+
+.B \-\-logo\-color\-[1\-9] \fI<color>
+Override specific colors in the logo
+
+.SS "Display Options"
+.TP
+
+.B \-s, \-\-structure \fI<structure>
+Set the structure of the fetch (a colon-separated list of module names)
+.TP
+
+.B \-\-color \fI<color>
+Set the color of keys and title. See \fB\-\-help color\fR for available colors.
+.TP
+
+.B \-\-color\-keys \fI<color>
+Set the color of keys only
+.TP
+
+.B \-\-color\-title \fI<color>
+Set the color of the title only
+.TP
+
+.B \-\-separator \fI<string>
+Set the separator between key and value (default: ": ")
+.TP
+
+.B \-\-key\-width \fI<num>
+Align the width of keys to \fI<num>\fR characters
+.TP
+
+.B \-\-show\-errors
+Display errors when they occur (default: false)
+.TP
+
+.B \-\-pipe
+Disable colors (automatically detected based on whether stdout is a terminal)
+
+To list all available options including module-specific options, use \fB\-\-help\fR.

 .SH CONFIGURATION
 .SS "Fetch Structure"
-The structure of a fetch describes the modules that should be included in
-the output. It consists of a string of modules, separated by a colon (:).
+The structure defines which modules to display and in what order. It consists of module names separated by colons (:).
+For example: \fBtitle:separator:os:kernel:uptime\fR
+
 To list all available modules, use \fB\-\-list\-modules\fR

 .SS "Config Files"

-Fastfetch uses JSONC based format for configuration. Fastfetch doesn't generate
-config file automatically; it should be generated manually by \fB\-\-gen\-config\fR.
-The config file will be saved in \fB~/.config/fastfetch/config.jsonc\fR by default.
+Fastfetch uses JSONC for configuration files. JSONC is JSON with support for comments (// and /* */). Configuration files must have the .jsonc extension.

-A JSONC config file is a JSON file that also supports comments with (// and /* */).
-Those files must have the extension '.jsonc'.
+You can generate a default config file using \fB\-\-gen\-config\fR. By default, the config file is saved at \fB~/.config/fastfetch/config.jsonc\fR.

-The specified configuration/preset files are searched in the following order:
+The configuration/preset files are searched in the following locations (in order):

-1. relative to the current working directory
+.RS
+.IP 1. 4
+Relative to the current working directory
+.IP 2. 4
+Relative to ~/.local/share/fastfetch/presets/
+.IP 3. 4
+Relative to /usr/share/fastfetch/presets/
+.RE

-2. relative to ~/.local/share/fastfetch/presets/
+For detailed information on logo options, module configuration, and formatting, visit:
+.RS
+\fIhttps://github.com/fastfetch-cli/fastfetch/wiki/Configuration\fR
+.RE

-3. relative to /usr/share/fastfetch/presets/
+Fastfetch provides several built-in presets. List them with \fB\-\-list\-presets\fR.

-Fastfetch provides some default presets. List them with \fB\-\-list\-presets\fR.
+.SS "JSON Schema"
+A JSON schema is available for editor intelligence when editing the configuration file. Add the following line at the beginning of your config file:
+.PP
+\fB"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json"\fR
+
+.SH EXAMPLES
+.TP
+Basic usage:
+.RS
+\fBfastfetch\fR
+.RE
+.TP
+Use a specific logo:
+.RS
+\fBfastfetch \-\-logo arch\fR
+.RE
+.TP
+Custom structure:
+.RS
+\fBfastfetch \-\-structure title:os:kernel:uptime:memory\fR
+.RE
+.TP
+Generate a config file:
+.RS
+\fBfastfetch \-\-gen\-config\fR
+.RE
+.TP
+Use a preset:
+.RS
+\fBfastfetch \-\-config neofetch\fR
+.RE

 .SH "SEE ALSO"
 .BR neofetch (1)

 .SH BUGS
 Please report bugs to: \fIhttps://github.com/fastfetch\-cli/fastfetch/issues\fR
+
+.SH AUTHORS
+Fastfetch is developed by a team of contributors on GitHub.
+Visit \fIhttps://github.com/fastfetch-cli/fastfetch\fR for more information.
@@ -52,7 +52,10 @@
        },
        "memory",
        "physicalmemory",
-        "swap",
+        {
+            "type": "swap",
+            "separate": true
+        },
        "disk",
        "btrfs",
        "zpool",
@@ -90,6 +93,8 @@
        "sound",
        "camera",
        "gamepad",
+        "mouse",
+        "keyboard",
        {
          "type": "weather",
          "timeout": 1000
@@ -54,7 +54,10 @@
        },
        "memory",
        "physicalmemory",
-        "swap",
+        {
+            "type": "swap",
+            "separate": true
+        },
        "disk",
        "btrfs",
        "zpool",
@@ -92,6 +95,8 @@
        "sound",
        "camera",
        "gamepad",
+        "mouse",
+        "keyboard",
        {
            "type": "weather",
            "timeout": 1000
@@ -104,6 +109,7 @@
        },
        "tpm",
        "version",
+        "logo",
        "break",
        "colors"
    ]
@@ -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.

 {
@@ -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,13 +9,14 @@
        },
        "separator": "│ ",
        "percent": {
-            "type": 6
+            "type": ["bar", "hide-others"]
        },
        "bar": {
-            "borderLeft": "",
-            "borderRight": "",
-            "charElapsed": "█",
-            "charTotal": "░",
+            "border": null,
+            "char": {
+                "elapsed": "█",
+                "total": "░"
+            },
            "width": 40
        },
        "constants": [
@@ -70,7 +71,7 @@
            "type": "localip",
            "key": "│ MAC ADDR   │{$1}",
            "format": "{mac} ({ifname})",
-            "showIPv4": false,
+            "showIpv4": false,
            "showMac": true
        },
        {
@@ -120,12 +121,18 @@
        {
            "type": "memory",
            "key": "│ MEMORY     │{$1}",
-            "format": "{used} / {total} [{percentage}]"
+            "format": "{used} / {total} [{percentage}]",
+            "percent": {
+                "type": ["num"]
+            }
        },
        {
            "type": "memory",
            "key": "│ USAGE      │{$1}",
-            "format": ""
+            "format": "",
+            "percent": {
+                "type": ["bar", "hide-others"]
+            }
        },
        {
            "type": "custom",
@@ -135,12 +142,18 @@
            "type": "disk",
            "key": "│ VOLUME     │{$1}",
            "format": "{size-used} / {size-total} [{size-percentage}]",
-            "folders": "/"
+            "folders": "/",
+            "percent": {
+                "type": ["num"]
+            }
        },
        {
            "type": "disk",
            "key": "│ DISK USAGE │{$1}",
-            "format": ""
+            "format": "",
+            "percent": {
+                "type": ["bar", "hide-others"]
+            }
        },
        {
            "type": "custom",
@@ -28,38 +28,38 @@
      {
        "type": "title",
        "key": "{#90}{$1}│ {#92}User        {#90}│",
-        "format": "{$2}{$3}{user-name} {#2}[{home-dir}]"
+        "format": "{$2}{$3}{user-name}  {#2}[{home-dir}]"
      },
      {
        "type": "users",
        "key": "{#90}{$1}│ {#92}Users       {#90}│",
        "myselfOnly": false,
-        "format": "{$2}{$3}{1}@{host-name}{/host-name}localhost{/}{?client-ip}  {#2}[IP:{client-ip}]{?}  {#2}[Login time: {login-time}]",
+        "format": "{$2}{$3}{1}@{host-name}{/host-name}localhost{/}{?client-ip}  {#2}[IP:{client-ip}]{?}  [Login time: {login-time}]"
      },
      {
        "type": "datetime",
        "key": "{#90}{$1}│ {#92}Datetime    {#90}│",
-        "format": "{$2}{$3}{year}-{month-pretty}-{day-in-month}  {hour-pretty}:{minute-pretty}:{second-pretty}  {#2}{weekday}  {#2}[W{week}] {#2}[UTC{offset-from-utc}]"
+        "format": "{$2}{$3}{year}-{month-pretty}-{day-in-month} {hour-pretty}:{minute-pretty}:{second-pretty}  [{weekday}] [W{week}] [UTC{offset-from-utc}]"
      },
      {
        "type": "title",
-        "key": "{#90}{$1}│ {#93}Host:       {#90}│",
-        "format": "{$2}{$3}{#1}{#36}{host-name}"
+        "key": "{#90}{$1}│ {#93}Host        {#90}│",
+        "format": "{$2}{$3}{host-name}"
      },
      {
        "type": "host",
        "key": "{#90}{$1}│ {#93}Machine     {#90}│",
-        "format": "{$2}{$3}{name} {#2}{version}"
+        "format": "{$2}{$3}{name}  {#2}{version}"
      },
      {
        "type": "os",
        "key": "{#90}{$1}│ {#93}OS          {#90}│",
-        "format": "{$2}{$3}{pretty-name} {codename} {#2}[v{version}] {#2}[{arch}]"
+        "format": "{$2}{$3}{?pretty-name}{pretty-name}{?}{/pretty-name}{name}{/} {codename}  {#2}[v{version}] [{arch}]"
      },
      {
        "type": "kernel",
        "key": "{#90}{$1}│ {#93}Kernel      {#90}│",
-        "format": "{$2}{$3}{sysname} {#2}[v{release}]"
+        "format": "{$2}{$3}{sysname}  {#2}[v{release}]"
      },
      {
        "type": "uptime",
@@ -71,14 +71,14 @@
        "key": "{#90}{$1}│ {#91}CPU         {#90}│",
        "showPeCoreCount": true,
        "temp": true,
-        "format": "{$2}{$3}{name} {#2}[C:{core-types}] {#2}[{freq-max}]"
+        "format": "{$2}{$3}{name}  {#2}[C:{core-types}] [{freq-max}]"
      },
      {
        "type": "gpu",
        "key": "{#90}{$1}│ {#91}GPU         {#90}│",
        "detectionMethod": "auto",
        "driverSpecific": true,
-        "format": "{$2}{$3}{name} {#2}[C:{core-count}] {#2}[{type}]"
+        "format": "{$2}{$3}{name}  {#2}[C:{core-count}]{?frequency} [{frequency}]{?} [{type}]"
      },
      {
        "type": "memory",
@@ -98,7 +98,7 @@
      {
        "type": "terminal",
        "key": "{#90}{$1}│ {#95}Terminal    {#90}│",
-        "format": "{$2}{$3}{pretty-name} {#2}[{version}] [PID:{pid}]"
+        "format": "{$2}{$3}{pretty-name}  {#2}[{version}] [PID:{pid}]"
      },
      {
        "type": "terminalfont",
@@ -0,0 +1,316 @@
+// Based on #1576
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "display": {
+        "color": {
+            "keys": "blue"
+        },
+        "separator": "",
+        // Constants are reusable strings referenced by {$1}, {$2}, etc.
+        // These contain ANSI escape codes for cursor positioning
+        "constants": [
+            "──────────────────────────────────────────────", // {$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
+            "══════════════════════════════════════════════"  // {$5} - horizontal line for outer borders
+        ],
+        "brightColor": false
+    },
+    "modules": [
+        {
+            "type": "version",
+            "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}"
+            //
+            // ║                    - 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")
+            // \u001b[u             - ANSI escape: restore cursor to saved position (ESC[u)
+            //                        Necessary because the length of `{sysname}` differs between different platforms
+            // \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
+            // {$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}"
+        },
+        {
+            "type": "datetime",
+            "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}"
+        },
+
+        // Hardware section with cyan color theme
+        {
+            "type": "custom",
+            "key": "║{#cyan}┌──────────────┬{$1}┐{#keys}║\u001b[37D",
+            "format": "{#bright_cyan} Hardware "
+        },
+        {
+            "type": "chassis",
+            // Similar structure but with cyan color formatting:
+            // │{#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}"
+        },
+        {
+            "type": "memory",
+            "key": "║{#cyan}│ {icon}  RAM       │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "swap",
+            "key": "║{#cyan}│ {icon}  SWAP      │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "cpu",
+            "key": "║{#cyan}│ {icon}  CPU       │{$4}│{#keys}║{$2}",
+            "showPeCoreCount": true
+        },
+        {
+            "type": "gpu",
+            "key": "║{#cyan}│ {icon}  GPU       │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "disk",
+            "key": "║{#cyan}│ {icon}  Disk      │{$4}│{#keys}║{$2}",
+            "format": "{size-used} \/ {size-total} ({size-percentage}) - {filesystem}",
+        },
+        {
+            "type": "battery",
+            "key": "║{#cyan}│ {icon}  Battery   │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "custom",
+            "key": "║{#cyan}└──────────────┴{$1}┘{#keys}║",
+            "format": ""
+        },
+
+        // Desktop section with green color theme
+        {
+            "type": "custom",
+            "key": "║{#green}┌──────────────┬{$1}┐{#keys}║\u001b[37D",
+            "format": "{#bright_green} Desktop "
+        },
+        {
+            "type": "de",
+            "key": "║{#green}│ {icon}  Desktop   │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "wm",
+            "key": "║{#green}│ {icon}  Session   │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "display",
+            "key": "║{#green}│ {icon}  Display   │{$4}│{#keys}║{$2}",
+            "compactType": "original-with-refresh-rate"
+        },
+        {
+            "type": "gpu",
+            "key": "║{#green}│ {icon}  G-Driver  │{$4}│{#keys}║{$2}",
+            "format": "{driver}"
+        },
+        {
+            "type": "custom",
+            "key": "║{#green}└──────────────┴{$1}┘{#keys}║",
+            "format": ""
+        },
+
+        // Terminal section with yellow color theme
+        {
+            "type": "custom",
+            "key": "║{#yellow}┌──────────────┬{$1}┐{#keys}║\u001b[37D",
+            "format": "{#bright_yellow} Terminal "
+        },
+        {
+            "type": "shell",
+            "key": "║{#yellow}│ {icon}  Shell     │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "terminal",
+            "key": "║{#yellow}│ {icon}  Terminal  │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "terminalfont",
+            "key": "║{#yellow}│ {icon}  Term Font │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "terminaltheme",
+            "key": "║{#yellow}│ {icon}  Colors    │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "packages",
+            "key": "║{#yellow}│ {icon}  Packages  │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "custom",
+            "key": "║{#yellow}└──────────────┴{$1}┘{#keys}║",
+            "format": ""
+        },
+
+        // Development section with red color theme
+        {
+            "type": "custom",
+            "key": "║{#red}┌──────────────┬{$1}┐{#keys}║\u001b[39D",
+            "format": "{#bright_red} Development "
+        },
+        {
+            "type": "command",
+            "keyIcon": "",                                   // Custom icon override
+            "key": "║{#red}│ {icon}  Rust      │{$4}│{#keys}║{$2}",
+            "text": "rustc --version",
+            "format": "rustc {~6,13}"                         // Print 6th to 13th characters (version number)
+        },
+        {
+            "type": "command",
+            "condition": {
+                "!system": "Windows"                          // Posix version
+            },
+            "keyIcon": "",
+            "key": "║{#red}│ {icon}  Clang     │{$4}│{#keys}║{$2}",
+            "text": "clang --version | sed -n 's/.*version \\([0-9][0-9.]*\\).*/\\1/p'",
+            "format": "clang {}"
+        },
+        {
+            "type": "command",
+            "condition": {
+                "system": "Windows"                           // Windows version
+            },
+            "keyIcon": "",
+            "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}",
+            "text": "node --version",
+            "format": "node {~1}"                             // {~1} removes first character (v)
+        },
+        {
+            "type": "command",
+            "keyIcon": "",
+            "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}",
+            "text": "zig version",
+            "format": "zig {}"
+        },
+        {
+            "type": "editor",
+            "key": "║{#red}│ {icon}  Editor    │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "command",
+            "keyIcon": "󰊢",
+            "key": "║{#red}│ {icon}  Git       │{$4}│{#keys}║{$2}",
+            "text": "git version",
+            "format": "git {~12}"
+        },
+        {
+            "type": "font",
+            "key": "║{#red}│ {icon}  Interface │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "custom",
+            "key": "║{#red}└──────────────┴{$1}┘{#keys}║",
+            "format": ""
+        },
+
+        // Uptime section with magenta color theme
+        {
+            "type": "custom",
+            "key": "║{#magenta}┌──────────────┬{$1}┐{#keys}║\u001b[36D",
+            "format": "{#bright_magenta} Uptime "
+        },
+        {
+            "type": "uptime",
+            "key": "║{#magenta}│ {icon}  Uptime    │{$4}│{#keys}║{$2}"
+        },
+        {
+            "type": "users",
+            "myselfOnly": true,                               // Only show current user
+            "keyIcon": "",
+            "key": "║{#magenta}│ {icon}  Login     │{$4}│{#keys}║{$2}"
+        },
+        {
+            "condition": {                                    // Conditional module: only show on non-macOS
+                "!system": "macOS"
+            },
+            "type": "disk",
+            "keyIcon": "",
+            "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
+        },
+        {
+            "condition": {                                    // Conditional module: only show on macOS
+                "system": "macOS"
+            },
+            "type": "disk",
+            "keyIcon": "",
+            "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}║",
+            "format": ""
+        },
+        {
+            "type": "custom",
+            "key": "╚═════════════════{$5}╝",                // Bottom border of the entire layout
+            "format": ""
+        },
+
+        // End with color palette and line break
+        "break",                                             // Add a blank line
+        "colors"                                             // Display color palette
+    ]
+}
+
+/*
+Key Format Structure Explanation:
+
+The key format uses a combination of:
+1. Unicode box drawing characters (│ ┌ ┐ └ ┘ ┬ ┴) for borders
+2. ANSI escape codes for cursor positioning (\u001b[...)
+3. Format variables ({icon}, {sysname}, etc.)
+4. Constant references ({$1}, {$2}, etc.)
+5. Color formatting ({#color})
+
+ANSI Escape Codes Used:
+- \u001b[s      - Save cursor position (ESC[s)
+- \u001b[u      - Restore cursor position (ESC[u)
+- \u001b[nC     - Move cursor right n columns (ESC[nC)
+- \u001b[nD     - Move cursor left n columns (ESC[nD)
+
+This creates a table-like layout with fixed column widths and proper alignment,
+regardless of the actual content length in each field.
+
+For more ANSI escape code reference, see:
+https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797#cursor-controls
+*/
@@ -0,0 +1,165 @@
+// Modified from: 24.jsonc
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+      "padding": {
+        "top": 2
+      }
+    },
+    "display": {
+      "separator": "",
+      "constants": [
+        // CONSTANT {$1} - VERTICAL BARS AT START AND 75th CHARACTERS FORWARD AND BACKWARD
+        "\u001b[90m│                                                            │\u001b[60D\u001b[39m"
+      ]
+    },
+    "modules": [
+      // CUSTOM - Top UI bar
+      {
+        "type": "custom",
+        "key": "{#90}╭ Keys ───────╮",
+        "format": "{#90}╭ Values ────────────────────────────────────────────────────╮",
+      },
+      {
+        "type": "title",
+        "key": "{#90}│ {#92}User        {#90}│",
+        "format": "{$1}{user-name}  {#2}[{home-dir}]"
+      },
+      {
+        "type": "users",
+        "key": "{#90}│ {#92}Users       {#90}│",
+        "myselfOnly": false,
+        "format": "{$1}{1}@{host-name}{/host-name}localhost{/}{?client-ip}  {#2}[IP:{client-ip}]{?}  [Login time: {login-time}]"
+      },
+      {
+        "type": "datetime",
+        "key": "{#90}│ {#92}Datetime    {#90}│",
+        "format": "{$1}{year}-{month-pretty}-{day-in-month} {hour-pretty}:{minute-pretty}:{second-pretty}  {#2}[{weekday}] [W{week}] [UTC{offset-from-utc}]"
+      },
+      {
+        "type": "title",
+        "key": "{#90}│ {#93}Host        {#90}│",
+        "format": "{$1}{host-name}"
+      },
+      {
+        "type": "host",
+        "key": "{#90}│ {#93}Machine     {#90}│",
+        "format": "{$1}{name}  {#2}{version}"
+      },
+      {
+        "type": "os",
+        "key": "{#90}│ {#93}OS          {#90}│",
+        "format": "{$1}{?pretty-name}{pretty-name}{?}{/pretty-name}{name}{/} {codename}  {#2}[v{version}] [{arch}]"
+      },
+      {
+        "type": "kernel",
+        "key": "{#90}│ {#93}Kernel      {#90}│",
+        "format": "{$1}{sysname}  {#2}[v{release}]"
+      },
+      {
+        "type": "uptime",
+        "key": "{#90}│ {#93}Uptime      {#90}│",
+        "format": "{$1}{?days}{days} Days + {?}{hours}:{minutes}:{seconds}"
+      },
+      {
+        "type": "cpu",
+        "key": "{#90}│ {#91}CPU         {#90}│",
+        "showPeCoreCount": true,
+        "temp": true,
+        "format": "{$1}{name}  {#2}[C:{core-types}] [{freq-max}]"
+      },
+      {
+        "type": "gpu",
+        "key": "{#90}│ {#91}GPU         {#90}│",
+        "detectionMethod": "auto",
+        "driverSpecific": true,
+        "format": "{$1}{name}  {#2}[C:{core-count}]{?frequency} [{frequency}]{?} {#2}[{type}]"
+      },
+      {
+        "type": "memory",
+        "key": "{#90}│ {#91}Memory      {#90}│",
+        "format": "{$1}{used} / {total} ({percentage})"
+      },
+      {
+        "type": "disk",
+        "key": "{#90}│ {#91}Disk        {#90}│",
+        "format": "{$1}{size-used} / {size-total} ({size-percentage})"
+      },
+      {
+        "type": "poweradapter",
+        "key": "{#90}│ {#91}Power       {#90}│",
+        "format": "{$1}{name}"
+      },
+      {
+        "type": "terminal",
+        "key": "{#90}│ {#95}Terminal    {#90}│",
+        "format": "{$1}{pretty-name}  {#2}[{version}] [PID:{pid}]"
+      },
+      {
+        "type": "terminalfont",
+        "key": "{#90}│ {#95}Font        {#90}│",
+        "format": "{$1}{name}  {#2}[{size}]"
+      },
+      {
+        "type": "shell",
+        "key": "{#90}│ {#95}Shell       {#90}│",
+        "format": "{$1}{pretty-name}  {#2}[v{version}] [PID:{pid}]"
+      },
+      {
+        // localip IPv4
+        "type": "localip",
+        "key": "{#90}│ {#94}Local IPv4  {#90}│",
+        "showPrefixLen": true,
+        "showIpv4": true,
+        "showIpv6": false,
+        "showMtu": true,
+        "format": "{$1}{ifname}: {ipv4}  {#2}[MTU:{mtu}]"
+      },
+      {
+        // localip IPv6
+        "type": "localip",
+        "key": "{#90}│ {#94}Local IPv6  {#90}│",
+        "showPrefixLen": true,
+        "showIpv4": false,
+        "showIpv6": true,
+        "showMtu": true,
+        "format": "{$1}{ifname}: {ipv6}  {#2}[MTU:{mtu}]"
+      },
+      {
+        "type": "publicip",
+        "key": "{#90}│ {#94}Public IPv4 {#90}│",
+        "ipv6": false,
+        "format": "{$1}{ip}  {#2}[{location}]"
+      },
+      {
+        "type": "publicip",
+        "key": "{#90}│ {#94}Public IPv6 {#90}│",
+        "ipv6": true,
+        "format": "{$1}{ip}  {#2}[{location}]"
+      },
+      // CUSTOM - Button UI bar
+      {
+        "type": "custom",
+        "key": "{#90}╰─────────────╯",
+        "format": "{#90}╰────────────────────────────────────────────────────────────╯",
+      },
+      "break",
+      {
+        "type": "custom",
+        "key": " ",
+        "format": "{#90}╭ Colors ───────────────────────────────────────────────────────────────────╮",
+      },
+      {
+        "type": "custom",
+        "format": "{#90}│ {#40}    {#41}    {#42}    {#43}    {#44}    {#45}    {#46}    {#47}    {#}                                          {#90}│",
+      },
+      {
+        "type": "custom",
+        "format": "{#90}│ {#100}    {#101}    {#102}    {#103}    {#104}    {#105}    {#106}    {#107}    {#}                                          {#90}│",
+      },
+      {
+        "type": "custom",
+        "format": "{#90}╰───────────────────────────────────────────────────────────────────────────╯",
+      },
+    ]
+  }
@@ -0,0 +1,49 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small",
+        "padding": {
+            "top": 1
+        }
+    },
+    "display": {
+        "separator": "  "
+    },
+    "modules": [
+        "break",
+        "title",
+        {
+            "type": "os",
+            "key": "os    ",
+            "keyColor": "red"
+        },
+        {
+            "type": "kernel",
+            "key": "kernel",
+            "keyColor": "green"
+        },
+        {
+            "type": "host",
+            "format": "{vendor} {family}",
+            "key": "host  ",
+            "keyColor": "yellow"
+        },
+        {
+            "type": "packages",
+            "key": "pkgs  ",
+            "keyColor": "blue"
+        },
+        {
+            "type": "uptime",
+            "format": "{?days}{days}d {?}{hours}h {minutes}m",
+            "key": "uptime",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "memory",
+            "key": "memory",
+            "keyColor": "cyan"
+        },
+        "break"
+    ]
+}
@@ -0,0 +1,63 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "separator": " ",
+        "key": {
+            "type": "both"
+        },
+        "bar": {
+            "border": {
+                "left": "\uee00",
+                "leftElapsed": "\uee03",
+                "right": "\uee02",
+                "rightElapsed": "\uee05"
+            },
+            "char": {
+                "total": "\uee01",
+                "elapsed": "\uee04"
+            },
+            "color": {
+                "total": null
+            }
+        },
+        "percent": {
+            "type": [
+                "bar",
+                "bar-monochrome"
+            ]
+        }
+    },
+    "modules": [
+        "title",
+        "separator",
+        {
+            "type": "memory",
+            "key": "MEM"
+        },
+        {
+            "type": "swap",
+            "key": "SWP"
+        },
+        {
+            "type": "disk",
+            "folders": "/",
+            "key": "DSK"
+        },
+        {
+            "type": "battery",
+            "key": "BAT"
+        },
+        {
+            "type": "brightness",
+            "key": "BGT"
+        },
+        {
+            "type": "colors",
+            "paddingLeft": 6,
+            "symbol": "circle"
+        }
+    ]
+}
@@ -0,0 +1,136 @@
+// #1887
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": null,
+    "display": {
+        "constants": [
+            "\u001b[s\u001b[33C│\u001b[u",
+            "  »  "
+        ],
+        "separator": "",
+        "percent": {
+            "type": ["num", "bar"]
+        },
+        "brightColor": false,
+        "bar": {
+            "border": {
+                "left": "[",
+                "leftElapsed": "[",
+                "right": "]",
+                "rightElapsed": "]"
+            },
+            "char": {
+                "elapsed": "─",
+                "total": "─"
+            },
+            "color": {
+                "elapsed": "default",
+                "total": "light_black"
+            },
+            "width": 16
+        },
+        "color": {
+            "separator": "default",
+            "keys": "default",
+            "output": "default"
+        }
+    },
+    "modules": [
+        "title",
+        {
+            "type": "custom",
+            "format": "┌────「 {#1}OS{#} 」────────────────────────────┐"
+        },
+        {
+            "type": "os",
+            "key": "│ {icon}{$2}{$1}"
+        },
+        {
+            "type": "disk",
+            "folders": "/",
+            "key": "│       {$1}",
+            "format": "{size-percentage-bar} {size-percentage}"
+        },
+        {
+            "type": "disk",
+            "folders": "/",
+            "key": "│       {$1}",
+            "format": "{size-used} / {size-total}"
+        },
+        {
+            "type": "custom",
+            "format": "└────────────────────────────────────────┘"
+        },
+        "break",
+        {
+            "type": "custom",
+            "format": "┌────「 {#1}UI{#} 」────────────────────────────┐"
+        },
+        {
+            "type": "wm",
+            "key": "│ {icon}{$2}{$1}"
+        },
+        {
+            "type": "wmtheme",
+            "key": "│ {icon}{$2}{$1}"
+        },
+        {
+            "type": "custom",
+            "key": "│       {$1}"
+        },
+        {
+            "type": "display",
+            "key": "│ {icon}{$2}{$1}",
+            "format": "{width}x{height} @ {refresh-rate} Hz"
+        },
+        {
+            "type": "custom",
+            "key": "│       {$1}"
+        },
+        {
+            "type": "terminal",
+            "key": "│ {icon}{$2}{$1}"
+        },
+        {
+            "type": "terminalfont",
+            "key": "│ {icon}{$2}{$1}"
+        },
+        {
+            "type": "custom",
+            "format": "└────────────────────────────────────────┘"
+        },
+        "break",
+        {
+            "type": "custom",
+            "format": "┌────「 {#1}HW{#} 」────────────────────────────┐"
+        },
+        {
+            "type": "cpu",
+            "key": "│ {icon}{$2}{$1}",
+            "format": "{name}"
+        },
+        {
+            "type": "gpu",
+            "key": "│ {icon}{$2}{$1}",
+            "format": "{name}"
+        },
+        {
+            "type": "custom",
+            "key": "│       {$1}"
+        },
+        {
+            "type": "memory",
+            "key": "│ {icon}{$2}{$1}",
+            "format": "{percentage-bar} {percentage}"
+        },
+        {
+            "type": "memory",
+            "key": "│       {$1}",
+            "format": "{used} / {total}"
+        },
+        {
+            "type": "custom",
+            "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,87 @@
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": null,
+    "display": {
+        "key": {
+            "type": "both",
+            "paddingLeft": 6,
+            "width": 17
+        }
+    },
+    "modules": [
+        {
+            "type": "custom",
+            "format": "|---------------------: {#1}Hardware{#} : ---------------------|"
+        },
+        "break",
+        {
+            "keyColor": "green",
+            "type": "host"
+        },
+        {
+            "keyColor": "green",
+            "type": "cpu"
+        },
+        {
+            "keyColor": "yellow",
+            "type": "memory"
+        },
+        {
+            "keyColor": "yellow",
+            "type": "swap"
+        },
+        {
+            "type": "custom",
+            "keyIcon": "",
+            "key": "Disks"
+        },
+        {
+            "type": "disk",
+            "key": " ",
+            "format": "        [{mountpoint}] - {size-used} / {size-total} ({size-percentage})"
+        },
+        "break",
+        {
+            "type": "title",
+            "format": "|-------------------------------------------------------|\u001b[40D: {#1}{user-name} @ {host-name}{#} :"
+        },
+        "break",
+        {
+            "type": "os",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "kernel",
+            "keyColor": "cyan"
+        },
+        {
+            "type": "packages",
+            "keyColor": "red",
+            "key": "Pkgs"
+        },
+        {
+            "type": "shell",
+            "keyColor": "red"
+        },
+        {
+            "type": "terminal",
+            "key": "Term",
+            "keyColor": "red"
+        },
+        {
+            "type": "locale",
+            "keyColor": "magenta"
+        },
+        "break",
+        {
+            "type": "custom",
+            "format": "|---------------------: {#1}Software{#} : ---------------------|"
+        },
+        "break",
+        {
+            "type": "colors",
+            "symbol": "circle",
+            "paddingLeft": 8
+        }
+    ]
+}
@@ -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,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.

 {
@@ -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.

 {
@@ -8,8 +8,10 @@
            "width": 11
        },
        "bar": {
-            "charElapsed": "=",
-            "charTotal": "-",
+            "char": {
+                "elapsed": "=",
+                "total": "-"
+            },
            "width": 13
        },
        "percent": {
@@ -3,7 +3,12 @@
    "display": {
        "size": {
            "maxPrefix": "MB",
-            "ndigits": 0
+            "ndigits": 0,
+            "spaceBeforeUnit": "never"
+        },
+        "freq": {
+            "ndigits": 3,
+            "spaceBeforeUnit": "never"
        }
    },
    "modules": [
@@ -16,7 +21,10 @@
            "format": "{release}"
        },
        "uptime",
-        "packages",
+        {
+            "type": "packages",
+            "combined": true
+        },
        "shell",
        {
            "type": "display",
@@ -36,11 +44,12 @@
        "cpu",
        {
            "type": "gpu",
-            "key": "GPU"
+            "key": "GPU",
+            "format": "{name}"
        },
        {
            "type": "memory",
-            "format": "{} / {}"
+            "format": "{used} / {total}"
        },
        "break",
        "colors"
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+import sys
+
+def main(amdgpu_ids_path: str):
+    with open(amdgpu_ids_path, 'r') as f:
+        full_text = f.read()
+
+    products = []
+    for line in full_text.split('\n'):
+        if not line or line[0] == '#' or not ',\t' in line:
+            continue
+        device, revision, name = line.split(',\t', maxsplit=2)
+        products.append((device, revision, name))
+
+    code = """\
+// SPDX-License-Identifier: MIT
+// https://opensource.org/license/mit
+// Generated from https://gitlab.freedesktop.org/mesa/drm/-/raw/main/data/amdgpu.ids
+
+#include <stdint.h>
+#include <stddef.h>
+
+typedef struct FFArmGpuProduct
+{
+    const uint32_t id; // device << 8 | revision
+    const char* name;
+} FFArmGpuProduct;
+
+const FFArmGpuProduct ffAmdGpuProducts[] = {
+"""
+
+    for device, revision, name in products:
+        code += f"    {{ 0x{device} << 8 | 0x{revision}, \"{name}\" }},\n"
+
+    code += "};\n"
+
+    print(code)
+
+if __name__ == '__main__':
+    len(sys.argv) == 2 or sys.exit('Usage: gen-amdgpuids.py </path/to/amdgpu.ids>')
+
+    main(sys.argv[1])
@@ -1,11 +1,15 @@
 #!/usr/bin/env python3

 """
-Python script to generate a man page for the command `fastfetch`.
-The man content will be printed to stdout so you will need to
-pipe it to a file if you want to save it.
-The command options will be generated using a JSON file.
-For the format of the JSON file, see https://github.com/fastfetch-cli/fastfetch/blob/dev/src/data/help.json
+Python script to generate a comprehensive man page for the command `fastfetch`.
+
+The generated man page content will be printed to stdout,
+so you will need to pipe it to a file if you want to save it.
+Example: python3 gen-man.py > fastfetch.1
+
+The command options are generated using a JSON file.
+For the JSON file format, see:
+https://github.com/fastfetch-cli/fastfetch/blob/dev/src/data/help.json
 """

 from json import load
@@ -33,7 +37,7 @@ pathToHelpFile = path.join(pathToCurrentDir, "../src/data/help.json")
 # man page section
 manSection = 1
 # title (center header)
-titlePage = "Fastfetch man page"
+titlePage = "FASTFETCH"
 # date (center footer)
 # format : "Month (abbreviation) Day Year"
 todayDate = datetime.fromtimestamp(
@@ -47,81 +51,118 @@ pathToVersionFile = path.join(pathToCurrentDir, "../CMakeLists.txt")
 ###### Sections Text ######

 # text displayed in the "NAME" section
-nameSection = r"fastfetch \- A maintained, feature\-rich and performance oriented, neofetch like system information tool"
+nameSection = r"fastfetch \- A fast and feature-rich system information tool similar to neofetch"
+
+# text displayed in the "DESCRIPTION" section
+descriptionSection = r"""
+Fastfetch is a tool for displaying system information in a visually appealing way. Written primarily in C, it focuses on performance and customizability while providing functionality similar to neofetch.
+It supports Linux, Android, FreeBSD, macOS, and Windows 7 or newer.
+"""

 # text displayed at the beginning of the "OPTIONS" section
 optionSection = r"""
-Parsing is not case sensitive. E.g. \fB--logo-type\fR is
-equal to \fB--LOGO-TYPE\fR.
+Options are parsed in a case-insensitive manner. For example, \fB--logo-type\fR and \fB--LOGO-TYPE\fR are treated identically.

-If a value is between square brackets, it is optional.
-An optional boolean value defaults to true if not specified.
+Arguments in square brackets are optional. Optional boolean arguments default to 'true' when specified without a value.

-More detailed help messages for each options can be printed
-with \fB-h <option_without_dash_prefix>\fR.
+For more detailed information about a specific option, use:
+\fBfastfetch -h <option_name_without_dashes>\fR

-All options can be made permanent with command
-\fBfastfetch <options> --gen-config\fR.
+Any combination of options can be made permanent by generating a configuration file:
+\fBfastfetch <options> --gen-config\fR
 """

 # text displayed in the "CONFIGURATION"
 configurationSection = f"""
 .SS Fetch Structure

-The structure of a fetch describes the modules that should
-be included in the output. It consists of a string of modules,
-separated by a colon (:). To list all available modules,
-use --list-modules.
+The structure defines which modules to display and in what order. It consists of module names separated by colons (:).
+For example: {startBold}title:separator:os:kernel:uptime{endBold}
+
+To list all available modules, use {startBold}--list-modules{endBold}


 .SS Config Files

-Fastfetch uses JSONC based format for configuration.
-Fastfetch doesn't generate config file automatically;
-it should be generated manually by {startBold}--gen-config{endBold}.
-The config file will be saved in
-{startBold}~/.config/fastfetch/config.jsonc{endBold} by default.
+Fastfetch uses JSONC (JSON with Comments) for configuration files. These files must have the .jsonc extension.

-A JSONC config file is a JSON file that also supports comments
-with (// and /* */). Those files must have the extension '.jsonc'.
+You can generate a default config file using {startBold}--gen-config{endBold}. By default, the config file is saved at {startBold}~/.config/fastfetch/config.jsonc{endBold}.

-The specified configuration/preset files are searched in the following order:
+The configuration/preset files are searched in the following locations (in order):

-{startBold}1.{endBold} relative to the current working directory
+{startBold}1.{endBold} Relative to the current working directory

-{startBold}2.{endBold} relative to ~/.local/share/fastfetch/presets/
+{startBold}2.{endBold} Relative to ~/.local/share/fastfetch/presets/

-{startBold}3.{endBold} relative to /usr/share/fastfetch/presets/
+{startBold}3.{endBold} Relative to /usr/share/fastfetch/presets/

-Fastfetch provides some default presets. List them with --list-presets.
+For detailed information on logo options, module configuration, and formatting, visit:
+{startBold}https://github.com/fastfetch-cli/fastfetch/wiki/Configuration{endBold}
+
+Fastfetch provides several built-in presets. List them with {startBold}--list-presets{endBold}.
+
+.SS JSON Schema
+A JSON schema is available for editor intelligence when editing the configuration file. Add the following line at the beginning of your config file:
+
+{startBold}"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json"{endBold}
 """

 # text displayed in the "EXAMPLE" section
-exampleSection = """
-.SS Config files:
+exampleSection = f"""
+.SS Basic Usage
+{startBold}fastfetch{endBold}
+
+.SS Use a specific logo
+{startBold}fastfetch --logo arch{endBold}
+
+.SS Custom structure
+{startBold}fastfetch --structure title:os:kernel:uptime:memory{endBold}
+
+.SS Generate a config file
+{startBold}fastfetch --gen-config{endBold}
+
+.SS Use a preset
+{startBold}fastfetch --config neofetch{endBold}
+
+.SS Config File Example
 .nf
 // ~/.config/fastfetch/config.jsonc
-{
+{{
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {{
+        "type": "auto",
+        "source": "arch"
+    }},
+    "display": {{
+        "separator": ": ",
+        "color": {{
+            "keys": "blue",
+            "title": "red"
+        }},
+        "key": {{
+            "width": 12
+        }}
+    }},
    "modules": [
        "title",
        "separator",
-        "module1",
-        {
-            "type": "module2",
-            "module2-option": "value"
-        }
+        "os",
+        "kernel",
+        "uptime",
+        {{
+            "type": "memory",
+            "format": "{{used}}/{{total}} ({{used_percent}}%)"
+        }}
    ]
-}
+}}
 .fi
 """

 # text displayed in the "BUGS" section
-bugSection = "Please report bugs to : \
-https://github.com/fastfetch-cli/fastfetch/issues"
+bugSection = "Please report bugs to: https://github.com/fastfetch-cli/fastfetch/issues"

-# text displayed in the "WIKI" section
-wikiSection = "Fastfetch github wiki : https://github.com/fastfetch-cli/fastfetch/wiki/Configuration"
+# text displayed in the "AUTHORS" section
+authorsSection = "Fastfetch is developed by a team of contributors on GitHub.\nVisit https://github.com/fastfetch-cli/fastfetch for more information."


 ###### Argument decoration ######
@@ -130,7 +171,7 @@ wikiSection = "Fastfetch github wiki : https://github.com/fastfetch-cli/fastfetc

 # if an optional argument is displayed as [?optArg] (with "optArg" underlined)
 # this value should be f"[?{startUnderline}"
-startOptionalArgument = f"[{startUnderline}?"
+startOptionalArgument = f"[{startUnderline}"
 # if an optional argument is displayed as [?optArg] (with "optArg underlined")
 # this value should be f"{endUnderline}]"
 endOptionalArgument = f"{endUnderline}]"
@@ -161,7 +202,7 @@ def main():
        for line in versionFile:
            researchVersion = search(r"^\s*VERSION (\d+\.\d+\.\d+)$", line)
            if (researchVersion):
-                print(f"\"{researchVersion.group(1)}\"", end=" ")
+                print(f"\"Fastfetch {researchVersion.group(1)}\"", end=" ")
                break

    print(f"\"{titlePage}\"")
@@ -177,13 +218,13 @@ def main():

    print(".SH SYNOPSIS")
    print(".B fastfetch")
-    print(f"[{startUnderline}OPTIONS{endUnderline}]")\
+    print(f"[{startUnderline}OPTIONS{endUnderline}...]")


-    ###### Wiki ######
+    ###### Description ######

-    print(".SH WIKI")
-    print(wikiSection)
+    print(".SH DESCRIPTION")
+    print(descriptionSection)


    ###### Configuration ######
@@ -202,7 +243,7 @@ def main():
    for key, value in helpFileData.items():

        # print new subsection
-        print(f".SS {key}:")
+        print(f".SS {key}")

        # loop through every option in a section
        for option in value:
@@ -237,7 +278,25 @@ def main():
                    print(startMandatoryArgument + option['arg']['type'] + endMandatoryArgument, end="")

            # description
-            print(f"\n {option['desc']} \n")
+            print()
+
+            # If desc is a list, join with newlines and proper spacing
+            if isinstance(option['desc'], list):
+                desc_text = "\n ".join(option['desc'])
+                print(f" {desc_text}")
+            else:
+                print(f" {option['desc']}")
+
+            # Add remarks if available
+            if "remark" in keyList:
+                print()
+                if isinstance(option['remark'], list):
+                    for remark in option['remark']:
+                        print(f" {remark}")
+                else:
+                    print(f" {option['remark']}")
+
+            print()


    ###### Examples ######
@@ -246,12 +305,22 @@ def main():
    print(exampleSection)


+    ###### See Also ######
+
+    print(".SH \"SEE ALSO\"")
+    print(".BR neofetch (1)")
+
+
    ###### Bugs ######

    print(".SH BUGS")
    print(bugSection)


+    ###### Authors ######
+
+    print(".SH AUTHORS")
+    print(authorsSection)


 if __name__ == "__main__":
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3

-from requests import get as http_get
+import sys

 class PciDeviceModel:
    def __init__(self, id: int, name: str):
@@ -13,14 +13,10 @@ class PciVendorModel:
        self.name = name
        self.devices = []

-def main(keep_vendor_list: set):
+def main(keep_vendor_list: set, pci_ids_path: str):
    vendors = []
-    try:
-        with open('pci.ids', 'r') as f:
-            full_text = f.read()
-    except FileNotFoundError:
-        response = http_get('https://pci-ids.ucw.cz/v2.2/pci.ids')
-        full_text = response.text
+    with open(pci_ids_path, 'r') as f:
+        full_text = f.read()

    dev_list_text = full_text[:full_text.rfind('\n\n\n')]  # remove known classes
    for line in dev_list_text.split('\n'):
@@ -80,6 +76,8 @@ const FFPciVendor ffPciVendors[] = {{
    print(code)

 if __name__ == '__main__':
+    len(sys.argv) == 2 or sys.exit('Usage: gen-pciids.py </path/to/pci.ids>')
+
    # From <src/detection/gpu/gpu.c>
    main({
        0x106b, # Apple
@@ -94,4 +92,4 @@ if __name__ == '__main__':
        0x1ab8, # Parallel
        0x1414, # Microsoft
        0x108e, # Oracle
-    })
+    }, sys.argv[1])
@@ -1,383 +0,0 @@
-//
-// Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-/// \file
-/// \mainpage
-/// AGS Library Overview
-/// --------------------
-/// This document provides an overview of the AGS (AMD GPU Services) library. The AGS library provides software developers with the ability to query
-/// AMD GPU software and hardware state information that is not normally available through standard operating systems or graphic APIs.
-///
-/// The latest version of the API is publicly hosted here: https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/.
-/// It is also worth checking http://gpuopen.com/gaming-product/amd-gpu-services-ags-library/ for any updates and articles on AGS.
-/// \internal
-/// Online documentation is publicly hosted here: http://gpuopen-librariesandsdks.github.io/ags/
-/// \endinternal
-///
-/// ---------------------------------------
-/// What's new in AGS 6.2 since version 6.1
-/// ---------------------------------------
-/// AGS 6.2 includes the following updates:
-/// * Shader clock intrinsics
-/// * Minor improvements and fixes
-///
-/// ---------------------------------------
-/// What's new in AGS 6.1 since version 6.0
-/// ---------------------------------------
-/// AGS 6.1 includes the following updates:
-/// * RDNA3 detection
-///
-/// ---------------------------------------
-/// What's new in AGS 6.0 since version 5.4.2
-/// ---------------------------------------
-/// AGS 6.0 includes the following updates:
-/// * DX12 ray tracing hit token for RDNA2 hardware.
-/// * Shader intrinsic that exposes ReadLaneAt in DX12.
-/// * Shader intrinsics that expose explicit float conversions in DX12.
-/// * Refactored and revised API to minimize user error.
-/// * Added agsGetVersionNumber.
-/// * Detection for external GPUs.
-/// * Detection of RDNA2 architecture.
-/// * Grouped the more established intrinsics together into per year support.
-/// * Function pointer typedefs for the API
-///
-/// ---------------------------------------
-/// What's new in AGS 5.4.2 since version 5.4.1
-/// ---------------------------------------
-/// AGS 5.4.2 includes the following updates:
-/// * sharedMemoryInBytes has been reinstated.
-/// * Clock speed returned for APUs.
-///
-/// ---------------------------------------
-/// What's new in AGS 5.4.1 since version 5.4.0
-/// ---------------------------------------
-/// AGS 5.4.1 includes the following updates:
-/// * AsicFamily_Count to help with code maintenance.
-/// * Visual Studio 2019 support.
-/// * x86 support
-/// * BaseInstance and BaseVertex intrinsics along with corresponding caps bits.
-/// * GetWaveSize intrinsic along with corresponding caps bits.
-///
-/// ---------------------------------------
-/// What's new in AGS 5.4 since version 5.3
-/// ---------------------------------------
-/// AGS 5.4 includes the following updates:
-/// * A more detailed description of the GPU architecture, now including RDNA GPUs.
-/// * Radeon 7 core and memory speeds returned.
-/// * Draw index and Atomic U64 intrinsics for both DX11 and DX12.
-///
-/// ---------------------------------------
-/// What's new in AGS 5.3 since version 5.2
-/// ---------------------------------------
-/// AGS 5.3 includes the following updates:
-/// * DX11 deferred context support for Multi Draw Indirect and UAV Overlap extensions.
-/// * A Radeon Software Version helper to determine whether the installed driver meets your game's minimum driver version requirements.
-/// * Freesync HDR Gamma 2.2 mode which uses a 1010102 swapchain and can be considered as an alternative to using the 64 bit swapchain required for Freesync HDR scRGB.
-///
-/// Using the AGS library
-/// ---------------------
-/// It is recommended to take a look at the source code for the samples that come with the AGS SDK:
-/// * AGSSample
-/// * CrossfireSample
-/// * EyefinitySample
-/// The AGSSample application is the simplest of the three examples and demonstrates the code required to initialize AGS and use it to query the GPU and Eyefinity state.
-/// The CrossfireSample application demonstrates the use of the new API to transfer resources on GPUs in Crossfire mode. Lastly, the EyefinitySample application provides a more
-/// extensive example of Eyefinity setup than the basic example provided in AGSSample.
-/// There are other samples on Github that demonstrate the DirectX shader extensions, such as the Barycentrics11 and Barycentrics12 samples.
-///
-/// To add AGS support to an existing project, follow these steps:
-/// * Link your project against the correct import library. Choose from either the 32 bit or 64 bit version.
-/// * Copy the AGS dll into the same directory as your game executable.
-/// * Include the amd_ags.h header file from your source code.
-/// * Include the AGS hlsl files if you are using the shader intrinsics.
-/// * Declare a pointer to an AGSContext and make this available for all subsequent calls to AGS.
-/// * On game initialization, call \ref agsInitialize passing in the address of the context. On success, this function will return a valid context pointer.
-///
-/// Don't forget to cleanup AGS by calling \ref agsDeInitialize when the app exits, after the device has been destroyed.
-
-#ifndef AMD_AGS_H
-#define AMD_AGS_H
-
-#define AMD_AGS_VERSION_MAJOR 6             ///< AGS major version
-#define AMD_AGS_VERSION_MINOR 2             ///< AGS minor version
-#define AMD_AGS_VERSION_PATCH 0             ///< AGS patch version
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/// \defgroup Defines AGS defines
-/// @{
-#if defined (AGS_GCC)
-#define AMD_AGS_API
-#else
-#define AMD_AGS_API __declspec(dllexport)   ///< AGS exported functions
-#endif
-
-#define AGS_MAKE_VERSION( major, minor, patch ) ( ( major << 22 ) | ( minor << 12 ) | patch ) ///< Macro to create the app and engine versions for the fields in \ref AGSDX12ExtensionParams and \ref AGSDX11ExtensionParams and the Radeon Software Version
-#define AGS_UNSPECIFIED_VERSION 0xFFFFAD00                                                    ///< Use this to specify no version
-#define AGS_CURRENT_VERSION AGS_MAKE_VERSION( AMD_AGS_VERSION_MAJOR, AMD_AGS_VERSION_MINOR, AMD_AGS_VERSION_PATCH ) ///< Macro to return the current AGS version as defined by the AGS header file
-/// @}
-
-/// \defgroup enums General enumerations
-/// @{
-
-/// The return codes
-typedef enum AGSReturnCode
-{
-    AGS_SUCCESS,                    ///< Successful function call
-    AGS_FAILURE,                    ///< Failed to complete call for some unspecified reason
-    AGS_INVALID_ARGS,               ///< Invalid arguments into the function
-    AGS_OUT_OF_MEMORY,              ///< Out of memory when allocating space internally
-    AGS_MISSING_D3D_DLL,            ///< Returned when a D3D dll fails to load
-    AGS_LEGACY_DRIVER,              ///< Returned if a feature is not present in the installed driver
-    AGS_NO_AMD_DRIVER_INSTALLED,    ///< Returned if the AMD GPU driver does not appear to be installed
-    AGS_EXTENSION_NOT_SUPPORTED,    ///< Returned if the driver does not support the requested driver extension
-    AGS_ADL_FAILURE,                ///< Failure in ADL (the AMD Display Library)
-    AGS_DX_FAILURE,                 ///< Failure from DirectX runtime
-    AGS_D3DDEVICE_NOT_CREATED       ///< Failure due to not creating the D3D device successfully via AGS.
-} AGSReturnCode;
-
-/// @}
-
-typedef struct AGSContext AGSContext;  ///< All function calls in AGS require a pointer to a context. This is generated via \ref agsInitialize
-
-/// The rectangle struct used by AGS.
-typedef struct AGSRect
-{
-    int offsetX;    ///< Offset on X axis
-    int offsetY;    ///< Offset on Y axis
-    int width;      ///< Width of rectangle
-    int height;     ///< Height of rectangle
-} AGSRect;
-
-/// The display info struct used to describe a display enumerated by AGS
-typedef struct AGSDisplayInfo
-{
-    char                    name[ 256 ];                    ///< The name of the display
-    char                    displayDeviceName[ 32 ];        ///< The display device name, i.e. DISPLAY_DEVICE::DeviceName
-
-    unsigned int            isPrimaryDisplay : 1;           ///< Whether this display is marked as the primary display
-    unsigned int            HDR10 : 1;                      ///< HDR10 is supported on this display
-    unsigned int            dolbyVision : 1;                ///< Dolby Vision is supported on this display
-    unsigned int            freesync : 1;                   ///< Freesync is supported on this display
-    unsigned int            freesyncHDR : 1;                ///< Freesync HDR is supported on this display
-    unsigned int            eyefinityInGroup : 1;           ///< The display is part of the Eyefinity group
-    unsigned int            eyefinityPreferredDisplay : 1;  ///< The display is the preferred display in the Eyefinity group for displaying the UI
-    unsigned int            eyefinityInPortraitMode : 1;    ///< The display is in the Eyefinity group but in portrait mode
-    unsigned int            reservedPadding : 24;           ///< Reserved for future use
-
-    int                     maxResolutionX;                 ///< The maximum supported resolution of the unrotated display
-    int                     maxResolutionY;                 ///< The maximum supported resolution of the unrotated display
-    float                   maxRefreshRate;                 ///< The maximum supported refresh rate of the display
-
-    AGSRect                 currentResolution;              ///< The current resolution and position in the desktop, ignoring Eyefinity bezel compensation
-    AGSRect                 visibleResolution;              ///< The visible resolution and position. When Eyefinity bezel compensation is enabled this will
-                                                            ///< be the sub region in the Eyefinity single large surface (SLS)
-    float                   currentRefreshRate;             ///< The current refresh rate
-
-    int                     eyefinityGridCoordX;            ///< The X coordinate in the Eyefinity grid. -1 if not in an Eyefinity group
-    int                     eyefinityGridCoordY;            ///< The Y coordinate in the Eyefinity grid. -1 if not in an Eyefinity group
-
-    double                  chromaticityRedX;               ///< Red display primary X coord
-    double                  chromaticityRedY;               ///< Red display primary Y coord
-
-    double                  chromaticityGreenX;             ///< Green display primary X coord
-    double                  chromaticityGreenY;             ///< Green display primary Y coord
-
-    double                  chromaticityBlueX;              ///< Blue display primary X coord
-    double                  chromaticityBlueY;              ///< Blue display primary Y coord
-
-    double                  chromaticityWhitePointX;        ///< White point X coord
-    double                  chromaticityWhitePointY;        ///< White point Y coord
-
-    double                  screenDiffuseReflectance;       ///< Percentage expressed between 0 - 1
-    double                  screenSpecularReflectance;      ///< Percentage expressed between 0 - 1
-
-    double                  minLuminance;                   ///< The minimum luminance of the display in nits
-    double                  maxLuminance;                   ///< The maximum luminance of the display in nits
-    double                  avgLuminance;                   ///< The average luminance of the display in nits
-
-    int                     logicalDisplayIndex;            ///< The internally used index of this display
-    int                     adlAdapterIndex;                ///< The internally used ADL adapter index
-    int                     reserved;                       ///< reserved field
-} AGSDisplayInfo;
-
-/// The ASIC family
-typedef enum AsicFamily
-{
-    AsicFamily_Unknown,                                         ///< Unknown architecture, potentially from another IHV. Check \ref AGSDeviceInfo::vendorId
-    AsicFamily_PreGCN,                                          ///< Pre GCN architecture.
-    AsicFamily_GCN1,                                            ///< AMD GCN 1 architecture: Oland, Cape Verde, Pitcairn & Tahiti.
-    AsicFamily_GCN2,                                            ///< AMD GCN 2 architecture: Hawaii & Bonaire.  This also includes APUs Kaveri and Carrizo.
-    AsicFamily_GCN3,                                            ///< AMD GCN 3 architecture: Tonga & Fiji.
-    AsicFamily_GCN4,                                            ///< AMD GCN 4 architecture: Polaris.
-    AsicFamily_Vega,                                            ///< AMD Vega architecture, including Raven Ridge (ie AMD Ryzen CPU + AMD Vega GPU).
-    AsicFamily_RDNA,                                            ///< AMD RDNA architecture
-    AsicFamily_RDNA2,                                           ///< AMD RDNA2 architecture
-    AsicFamily_RDNA3,                                           ///< AMD RDNA3 architecture
-
-    AsicFamily_Count                                            ///< Number of enumerated ASIC families
-} AsicFamily;
-
-/// The device info struct used to describe a physical GPU enumerated by AGS
-typedef struct AGSDeviceInfo
-{
-    const char*                     adapterString;                  ///< The adapter name string
-    AsicFamily                      asicFamily;                     ///< Set to Unknown if not AMD hardware
-    unsigned int                    isAPU : 1;                      ///< Whether this device is an APU
-    unsigned int                    isPrimaryDevice : 1;            ///< Whether this device is marked as the primary device
-    unsigned int                    isExternal :1;                  ///< Whether this device is a detachable, external device
-    unsigned int                    reservedPadding : 29;           ///< Reserved for future use
-
-    int                             vendorId;                       ///< The vendor id
-    int                             deviceId;                       ///< The device id
-    int                             revisionId;                     ///< The revision id
-
-    int                             numCUs;                         ///< Number of compute units
-    int                             numWGPs;                        ///< Number of RDNA Work Group Processors.  Only valid if ASIC is RDNA onwards.
-
-    int                             numROPs;                        ///< Number of ROPs
-    int                             coreClock;                      ///< Core clock speed at 100% power in MHz
-    int                             memoryClock;                    ///< Memory clock speed at 100% power in MHz
-    int                             memoryBandwidth;                ///< Memory bandwidth in MB/s
-    float                           teraFlops;                      ///< Teraflops of GPU. Zero if not GCN onwards. Calculated from iCoreClock * iNumCUs * 64 Pixels/clk * 2 instructions/MAD
-
-    unsigned long long              localMemoryInBytes;             ///< The size of local memory in bytes. 0 for non AMD hardware.
-    unsigned long long              sharedMemoryInBytes;            ///< The size of system memory available to the GPU in bytes.  It is important to factor this into your VRAM budget for APUs
-                                                                    ///< as the reported local memory will only be a small fraction of the total memory available to the GPU.
-
-    int                             numDisplays;                    ///< The number of active displays found to be attached to this adapter.
-    AGSDisplayInfo*                 displays;                       ///< List of displays allocated by AGS to be numDisplays in length.
-
-    int                             eyefinityEnabled;               ///< Indicates if Eyefinity is active
-    int                             eyefinityGridWidth;             ///< Contains width of the multi-monitor grid that makes up the Eyefinity Single Large Surface.
-    int                             eyefinityGridHeight;            ///< Contains height of the multi-monitor grid that makes up the Eyefinity Single Large Surface.
-    int                             eyefinityResolutionX;           ///< Contains width in pixels of the multi-monitor Single Large Surface.
-    int                             eyefinityResolutionY;           ///< Contains height in pixels of the multi-monitor Single Large Surface.
-    int                             eyefinityBezelCompensated;      ///< Indicates if bezel compensation is used for the current SLS display area. 1 if enabled, and 0 if disabled.
-
-    int                             adlAdapterIndex;                ///< Internally used index into the ADL list of adapters
-    int                             reserved;                       ///< reserved field
-} AGSDeviceInfo;
-
-/// \defgroup general General API functions
-/// API for initialization, cleanup, HDR display modes and Crossfire GPU count
-/// @{
-
-typedef void* (__stdcall *AGS_ALLOC_CALLBACK)( size_t allocationSize );     ///< AGS user defined allocation prototype
-typedef void (__stdcall *AGS_FREE_CALLBACK)( void* allocationPtr );         ///< AGS user defined free prototype
-
-/// The configuration options that can be passed in to \ref agsInitialize
-typedef struct AGSConfiguration
-{
-    AGS_ALLOC_CALLBACK      allocCallback;                  ///< Optional memory allocation callback. If not supplied, malloc() is used
-    AGS_FREE_CALLBACK       freeCallback;                   ///< Optional memory freeing callback. If not supplied, free() is used
-} AGSConfiguration;
-
-/// The top level GPU information returned from \ref agsInitialize
-typedef struct AGSGPUInfo
-{
-    const char*             driverVersion;                  ///< The AMD driver package version
-    const char*             radeonSoftwareVersion;          ///< The Radeon Software Version
-
-    int                     numDevices;                     ///< Number of GPUs in the system
-    AGSDeviceInfo*          devices;                        ///< List of GPUs in the system
-} AGSGPUInfo;
-
-/// The struct to specify the display settings to the driver.
-typedef struct AGSDisplaySettings AGSDisplaySettings;
-
-
-/// The result returned from \ref agsCheckDriverVersion
-typedef enum AGSDriverVersionResult
-{
-    AGS_SOFTWAREVERSIONCHECK_OK,                              ///< The reported Radeon Software Version is newer or the same as the required version
-    AGS_SOFTWAREVERSIONCHECK_OLDER,                           ///< The reported Radeon Software Version is older than the required version
-    AGS_SOFTWAREVERSIONCHECK_UNDEFINED                        ///< The check could not determine as result.  This could be because it is a private or custom driver or just invalid arguments.
-} AGSDriverVersionResult;
-
-///
-/// Helper function to check the installed software version against the required software version.
-///
-/// \param [in] radeonSoftwareVersionReported       The Radeon Software Version returned from \ref AGSGPUInfo::radeonSoftwareVersion.
-/// \param [in] radeonSoftwareVersionRequired       The Radeon Software Version to check against.  This is specificed using \ref AGS_MAKE_VERSION.
-/// \return                                         The result of the check.
-///
-AMD_AGS_API AGSDriverVersionResult agsCheckDriverVersion( const char* radeonSoftwareVersionReported, unsigned int radeonSoftwareVersionRequired );
-
-///
-/// Function to return the AGS version number.
-///
-/// \return                                         The version number made using AGS_MAKE_VERSION( AMD_AGS_VERSION_MAJOR, AMD_AGS_VERSION_MINOR, AMD_AGS_VERSION_PATCH ).
-///
-AMD_AGS_API int agsGetVersionNumber();
-
-///
-/// Function used to initialize the AGS library.
-/// agsVersion must be specified as AGS_CURRENT_VERSION or the call will return \ref AGS_INVALID_ARGS.
-/// Must be called prior to any of the subsequent AGS API calls.
-/// Must be called prior to ID3D11Device or ID3D12Device creation.
-/// \note The caller of this function should handle the possibility of the call failing in the cases below. One option is to do a vendor id check and only call \ref agsInitialize if there is an AMD GPU present.
-/// \note This function will fail with \ref AGS_NO_AMD_DRIVER_INSTALLED if there is no AMD driver found on the system.
-/// \note This function will fail with \ref AGS_LEGACY_DRIVER in Catalyst versions before 12.20.
-///
-/// \param [in] agsVersion                          The API version specified using the \ref AGS_CURRENT_VERSION macro. If this does not match the version in the binary this initialization call will fail.
-/// \param [in] config                              Optional pointer to a AGSConfiguration struct to override the default library configuration.
-/// \param [out] context                            Address of a pointer to a context. This function allocates a context on the heap which is then required for all subsequent API calls.
-/// \param [out] gpuInfo                            Optional pointer to a AGSGPUInfo struct which will get filled in for all the GPUs in the system.
-///
-AMD_AGS_API AGSReturnCode agsInitialize( int agsVersion, const AGSConfiguration* config, AGSContext** context, AGSGPUInfo* gpuInfo );
-
-///
-///   Function used to clean up the AGS library.
-///
-/// \param [in] context                             Pointer to a context. This function will deallocate the context from the heap.
-///
-AMD_AGS_API AGSReturnCode agsDeInitialize( AGSContext* context );
-
-///
-/// Function used to set a specific display into HDR mode
-/// \note Setting all of the values apart from color space and transfer function to zero will cause the display to use defaults.
-/// \note Call this function after each mode change (switch to fullscreen, any change in swapchain etc).
-/// \note HDR10 PQ mode requires a 1010102 swapchain.
-/// \note HDR10 scRGB mode requires an FP16 swapchain.
-/// \note Freesync HDR scRGB mode requires an FP16 swapchain.
-/// \note Freesync HDR Gamma 2.2 mode requires a 1010102 swapchain.
-/// \note Dolby Vision requires a 8888 UNORM swapchain.
-///
-/// \param [in] context                             Pointer to a context. This is generated by \ref agsInitialize
-/// \param [in] deviceIndex                         The index of the device listed in \ref AGSGPUInfo::devices.
-/// \param [in] displayIndex                        The index of the display listed in \ref AGSDeviceInfo::displays.
-/// \param [in] settings                            Pointer to the display settings to use.
-///
-AMD_AGS_API AGSReturnCode agsSetDisplayMode( AGSContext* context, int deviceIndex, int displayIndex, const AGSDisplaySettings* settings );
-
-/// @}
-
-/// @}
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif // AMD_AGS_H
@@ -1,7 +0,0 @@
-{
-    "home": "https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK",
-    "license": "MIT (embeded in source)",
-    "version": "AGS v6.2.0",
-    "author": "Advanced Micro Devices, Inc",
-    "modified": "CarterLi"
-}
@@ -0,0 +1,46 @@
+//
+// Copyright (c) 2016 - 2022 Advanced Micro Devices, Inc. All rights reserved.
+//
+// MIT LICENSE:
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+/// \file adl_sdk.h
+/// \brief Contains the definition of the Memory Allocation Callback.\n <b>Included in ADL SDK</b>
+///
+/// \n\n
+/// This file contains the definition of the Memory Allocation Callback.\n
+/// It also includes definitions of the respective structures and constants.\n
+/// <b> This is the only header file to be included in a C/C++ project using ADL </b>
+
+#ifndef ADL_SDK_H_
+#define ADL_SDK_H_
+
+#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
+
+#endif /* ADL_SDK_H_ */
@@ -0,0 +1,6 @@
+{
+    "home": "https://github.com/GPUOpen-LibrariesAndSDKs/display-library",
+    "license": "MIT (embeded in source)",
+    "version": "ADL SDK 17.1",
+    "author": "Advanced Micro Devices, Inc"
+}
@@ -1,7 +0,0 @@
-{
-    "home": "https://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c",
-    "license": "MIT compatible (embed in source)",
-    "version": "2007-05-26 (Unicode 5.0)",
-    "author": "Markus Kuhn",
-    "modified": "CarterLi"
-}
@@ -1,314 +0,0 @@
-/*
- * This is an implementation of wcwidth() and wcswidth() (defined in
- * IEEE Std 1002.1-2001) for Unicode.
- *
- * http://www.opengroup.org/onlinepubs/007904975/functions/wcwidth.html
- * http://www.opengroup.org/onlinepubs/007904975/functions/wcswidth.html
- *
- * In fixed-width output devices, Latin characters all occupy a single
- * "cell" position of equal width, whereas ideographic CJK characters
- * occupy two such cells. Interoperability between terminal-line
- * applications and (teletype-style) character terminals using the
- * UTF-8 encoding requires agreement on which character should advance
- * the cursor by how many cell positions. No established formal
- * standards exist at present on which Unicode character shall occupy
- * how many cell positions on character terminals. These routines are
- * a first attempt of defining such behavior based on simple rules
- * applied to data provided by the Unicode Consortium.
- *
- * For some graphical characters, the Unicode standard explicitly
- * defines a character-cell width via the definition of the East Asian
- * FullWidth (F), Wide (W), Half-width (H), and Narrow (Na) classes.
- * In all these cases, there is no ambiguity about which width a
- * terminal shall use. For characters in the East Asian Ambiguous (A)
- * class, the width choice depends purely on a preference of backward
- * compatibility with either historic CJK or Western practice.
- * Choosing single-width for these characters is easy to justify as
- * the appropriate long-term solution, as the CJK practice of
- * displaying these characters as double-width comes from historic
- * implementation simplicity (8-bit encoded characters were displayed
- * single-width and 16-bit ones double-width, even for Greek,
- * Cyrillic, etc.) and not any typographic considerations.
- *
- * Much less clear is the choice of width for the Not East Asian
- * (Neutral) class. Existing practice does not dictate a width for any
- * of these characters. It would nevertheless make sense
- * typographically to allocate two character cells to characters such
- * as for instance EM SPACE or VOLUME INTEGRAL, which cannot be
- * represented adequately with a single-width glyph. The following
- * routines at present merely assign a single-cell width to all
- * neutral characters, in the interest of simplicity. This is not
- * entirely satisfactory and should be reconsidered before
- * establishing a formal standard in this area. At the moment, the
- * decision which Not East Asian (Neutral) characters should be
- * represented by double-width glyphs cannot yet be answered by
- * applying a simple rule from the Unicode database content. Setting
- * up a proper standard for the behavior of UTF-8 character terminals
- * will require a careful analysis not only of each Unicode character,
- * but also of each presentation form, something the author of these
- * routines has avoided to do so far.
- *
- * http://www.unicode.org/unicode/reports/tr11/
- *
- * Markus Kuhn -- 2007-05-26 (Unicode 5.0)
- *
- * Permission to use, copy, modify, and distribute this software
- * for any purpose and without fee is hereby granted. The author
- * disclaims all warranties with regard to this software.
- *
- * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
- */
-
-#include <wchar.h>
-
-struct interval {
-  int first;
-  int last;
-};
-
-/* auxiliary function for binary search in interval table */
-static int bisearch(wchar_t ucs, const struct interval *table, int max) {
-  int min = 0;
-  int mid;
-
-  if (ucs < table[0].first || ucs > table[max].last)
-    return 0;
-  while (max >= min) {
-    mid = (min + max) / 2;
-    if (ucs > table[mid].last)
-      min = mid + 1;
-    else if (ucs < table[mid].first)
-      max = mid - 1;
-    else
-      return 1;
-  }
-
-  return 0;
-}
-
-
-/* The following two functions define the column width of an ISO 10646
- * character as follows:
- *
- *    - The null character (U+0000) has a column width of 0.
- *
- *    - Other C0/C1 control characters and DEL will lead to a return
- *      value of -1.
- *
- *    - Non-spacing and enclosing combining characters (general
- *      category code Mn or Me in the Unicode database) have a
- *      column width of 0.
- *
- *    - SOFT HYPHEN (U+00AD) has a column width of 1.
- *
- *    - Other format characters (general category code Cf in the Unicode
- *      database) and ZERO WIDTH SPACE (U+200B) have a column width of 0.
- *
- *    - Hangul Jamo medial vowels and final consonants (U+1160-U+11FF)
- *      have a column width of 0.
- *
- *    - Spacing characters in the East Asian Wide (W) or East Asian
- *      Full-width (F) category as defined in Unicode Technical
- *      Report #11 have a column width of 2.
- *
- *    - All remaining characters (including all printable
- *      ISO 8859-1 and WGL4 characters, Unicode control characters,
- *      etc.) have a column width of 1.
- *
- * This implementation assumes that wchar_t characters are encoded
- * in ISO 10646.
- */
-
-int mk_wcwidth(wchar_t ucs)
-{
-  /* sorted list of non-overlapping intervals of non-spacing characters */
-  /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
-  static const struct interval combining[] = {
-    { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
-    { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
-    { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
-    { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
-    { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
-    { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
-    { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
-    { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
-    { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
-    { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
-    { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
-    { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
-    { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
-    { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
-    { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
-    { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
-    { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
-    { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
-    { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
-    { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
-    { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
-    { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
-    { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
-    { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
-    { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
-    { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
-    { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
-    { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
-    { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
-    { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
-    { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
-    { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
-    { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
-    { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
-    { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
-    { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
-    { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
-    { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
-    { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
-    { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
-    { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
-    { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
-    { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
-    { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
-    { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
-    { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
-    { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
-    { 0xE0100, 0xE01EF }
-  };
-
-  /* test for 8-bit control characters */
-  if (ucs == 0)
-    return 0;
-  if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
-    return -1;
-
-  /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, combining,
-	       sizeof(combining) / sizeof(struct interval) - 1))
-    return 0;
-
-  /* if we arrive here, ucs is not a combining or C0/C1 control character */
-
-  return 1 +
-    (ucs >= 0x1100 &&
-     (ucs <= 0x115f ||                    /* Hangul Jamo init. consonants */
-      ucs == 0x2329 || ucs == 0x232a ||
-      (ucs >= 0x2e80 && ucs <= 0xa4cf &&
-       ucs != 0x303f) ||                  /* CJK ... Yi */
-      (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
-      (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
-      (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
-      (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
-      (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
-      (ucs >= 0xffe0 && ucs <= 0xffe6) ||
-
-#ifndef _WIN32 // sizeof(wchar_t) == 2
-      (ucs >= 0x20000 && ucs <= 0x2fffd) ||
-      (ucs >= 0x30000 && ucs <= 0x3fffd) ||
-#endif
-      0
-    ));
-}
-
-
-int mk_wcswidth(const wchar_t *pwcs, size_t n)
-{
-  int w, width = 0;
-
-  for (;*pwcs && n-- > 0; pwcs++)
-    if ((w = mk_wcwidth(*pwcs)) < 0)
-      return -1;
-    else
-      width += w;
-
-  return width;
-}
-
-
-/*
- * The following functions are the same as mk_wcwidth() and
- * mk_wcswidth(), except that spacing characters in the East Asian
- * Ambiguous (A) category as defined in Unicode Technical Report #11
- * have a column width of 2. This variant might be useful for users of
- * CJK legacy encodings who want to migrate to UCS without changing
- * the traditional terminal character-width behaviour. It is not
- * otherwise recommended for general use.
- */
-int mk_wcwidth_cjk(wchar_t ucs)
-{
-  /* sorted list of non-overlapping intervals of East Asian Ambiguous
-   * characters, generated by "uniset +WIDTH-A -cat=Me -cat=Mn -cat=Cf c" */
-  static const struct interval ambiguous[] = {
-    { 0x00A1, 0x00A1 }, { 0x00A4, 0x00A4 }, { 0x00A7, 0x00A8 },
-    { 0x00AA, 0x00AA }, { 0x00AE, 0x00AE }, { 0x00B0, 0x00B4 },
-    { 0x00B6, 0x00BA }, { 0x00BC, 0x00BF }, { 0x00C6, 0x00C6 },
-    { 0x00D0, 0x00D0 }, { 0x00D7, 0x00D8 }, { 0x00DE, 0x00E1 },
-    { 0x00E6, 0x00E6 }, { 0x00E8, 0x00EA }, { 0x00EC, 0x00ED },
-    { 0x00F0, 0x00F0 }, { 0x00F2, 0x00F3 }, { 0x00F7, 0x00FA },
-    { 0x00FC, 0x00FC }, { 0x00FE, 0x00FE }, { 0x0101, 0x0101 },
-    { 0x0111, 0x0111 }, { 0x0113, 0x0113 }, { 0x011B, 0x011B },
-    { 0x0126, 0x0127 }, { 0x012B, 0x012B }, { 0x0131, 0x0133 },
-    { 0x0138, 0x0138 }, { 0x013F, 0x0142 }, { 0x0144, 0x0144 },
-    { 0x0148, 0x014B }, { 0x014D, 0x014D }, { 0x0152, 0x0153 },
-    { 0x0166, 0x0167 }, { 0x016B, 0x016B }, { 0x01CE, 0x01CE },
-    { 0x01D0, 0x01D0 }, { 0x01D2, 0x01D2 }, { 0x01D4, 0x01D4 },
-    { 0x01D6, 0x01D6 }, { 0x01D8, 0x01D8 }, { 0x01DA, 0x01DA },
-    { 0x01DC, 0x01DC }, { 0x0251, 0x0251 }, { 0x0261, 0x0261 },
-    { 0x02C4, 0x02C4 }, { 0x02C7, 0x02C7 }, { 0x02C9, 0x02CB },
-    { 0x02CD, 0x02CD }, { 0x02D0, 0x02D0 }, { 0x02D8, 0x02DB },
-    { 0x02DD, 0x02DD }, { 0x02DF, 0x02DF }, { 0x0391, 0x03A1 },
-    { 0x03A3, 0x03A9 }, { 0x03B1, 0x03C1 }, { 0x03C3, 0x03C9 },
-    { 0x0401, 0x0401 }, { 0x0410, 0x044F }, { 0x0451, 0x0451 },
-    { 0x2010, 0x2010 }, { 0x2013, 0x2016 }, { 0x2018, 0x2019 },
-    { 0x201C, 0x201D }, { 0x2020, 0x2022 }, { 0x2024, 0x2027 },
-    { 0x2030, 0x2030 }, { 0x2032, 0x2033 }, { 0x2035, 0x2035 },
-    { 0x203B, 0x203B }, { 0x203E, 0x203E }, { 0x2074, 0x2074 },
-    { 0x207F, 0x207F }, { 0x2081, 0x2084 }, { 0x20AC, 0x20AC },
-    { 0x2103, 0x2103 }, { 0x2105, 0x2105 }, { 0x2109, 0x2109 },
-    { 0x2113, 0x2113 }, { 0x2116, 0x2116 }, { 0x2121, 0x2122 },
-    { 0x2126, 0x2126 }, { 0x212B, 0x212B }, { 0x2153, 0x2154 },
-    { 0x215B, 0x215E }, { 0x2160, 0x216B }, { 0x2170, 0x2179 },
-    { 0x2190, 0x2199 }, { 0x21B8, 0x21B9 }, { 0x21D2, 0x21D2 },
-    { 0x21D4, 0x21D4 }, { 0x21E7, 0x21E7 }, { 0x2200, 0x2200 },
-    { 0x2202, 0x2203 }, { 0x2207, 0x2208 }, { 0x220B, 0x220B },
-    { 0x220F, 0x220F }, { 0x2211, 0x2211 }, { 0x2215, 0x2215 },
-    { 0x221A, 0x221A }, { 0x221D, 0x2220 }, { 0x2223, 0x2223 },
-    { 0x2225, 0x2225 }, { 0x2227, 0x222C }, { 0x222E, 0x222E },
-    { 0x2234, 0x2237 }, { 0x223C, 0x223D }, { 0x2248, 0x2248 },
-    { 0x224C, 0x224C }, { 0x2252, 0x2252 }, { 0x2260, 0x2261 },
-    { 0x2264, 0x2267 }, { 0x226A, 0x226B }, { 0x226E, 0x226F },
-    { 0x2282, 0x2283 }, { 0x2286, 0x2287 }, { 0x2295, 0x2295 },
-    { 0x2299, 0x2299 }, { 0x22A5, 0x22A5 }, { 0x22BF, 0x22BF },
-    { 0x2312, 0x2312 }, { 0x2460, 0x24E9 }, { 0x24EB, 0x254B },
-    { 0x2550, 0x2573 }, { 0x2580, 0x258F }, { 0x2592, 0x2595 },
-    { 0x25A0, 0x25A1 }, { 0x25A3, 0x25A9 }, { 0x25B2, 0x25B3 },
-    { 0x25B6, 0x25B7 }, { 0x25BC, 0x25BD }, { 0x25C0, 0x25C1 },
-    { 0x25C6, 0x25C8 }, { 0x25CB, 0x25CB }, { 0x25CE, 0x25D1 },
-    { 0x25E2, 0x25E5 }, { 0x25EF, 0x25EF }, { 0x2605, 0x2606 },
-    { 0x2609, 0x2609 }, { 0x260E, 0x260F }, { 0x2614, 0x2615 },
-    { 0x261C, 0x261C }, { 0x261E, 0x261E }, { 0x2640, 0x2640 },
-    { 0x2642, 0x2642 }, { 0x2660, 0x2661 }, { 0x2663, 0x2665 },
-    { 0x2667, 0x266A }, { 0x266C, 0x266D }, { 0x266F, 0x266F },
-    { 0x273D, 0x273D }, { 0x2776, 0x277F }, { 0xE000, 0xF8FF },
-    { 0xFFFD, 0xFFFD }, { 0xF0000, 0xFFFFD }, { 0x100000, 0x10FFFD }
-  };
-
-  /* binary search in table of non-spacing characters */
-  if (bisearch(ucs, ambiguous,
-	       sizeof(ambiguous) / sizeof(struct interval) - 1))
-    return 2;
-
-  return mk_wcwidth(ucs);
-}
-
-
-int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n)
-{
-  int w, width = 0;
-
-  for (;*pwcs && n-- > 0; pwcs++)
-    if ((w = mk_wcwidth_cjk(*pwcs)) < 0)
-      return -1;
-    else
-      width += w;
-
-  return width;
-}
@@ -0,0 +1,6 @@
+{
+    "home": "https://github.com/ridiculousfish/widecharwidth",
+    "license": "Public domain",
+    "version": "Unicode 17",
+    "author": "ridiculousfish"
+}
@@ -1,6 +1,6 @@
 {
    "home": "https://github.com/ibireme/yyjson",
    "license": "MIT ( embed in source )",
-    "version": "0.10.0",
+    "version": "0.12.0",
    "author": "ibireme"
 }
@@ -1,7 +1,7 @@
 #pragma once

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

 typedef struct FFPlatformSysinfo
 {
@@ -9,7 +9,6 @@ typedef struct FFPlatformSysinfo
    FFstrbuf release;
    FFstrbuf version;
    FFstrbuf architecture;
-    FFstrbuf displayVersion;
    uint32_t pageSize;
 } FFPlatformSysinfo;

@@ -19,9 +18,17 @@ typedef struct FFPlatform
    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;
    FFstrbuf userShell;

@@ -0,0 +1,37 @@
+#pragma once
+
+#ifdef _MSC_VER
+    #include <sal.h>
+#endif
+
+#if defined(__has_attribute) && __has_attribute(__warn_unused_result__)
+    #define FF_C_NODISCARD __attribute__((__warn_unused_result__))
+#elif defined(_MSC_VER)
+    #define FF_C_NODISCARD _Check_return_
+#else
+    #define FF_C_NODISCARD
+#endif
+
+#if defined(__has_attribute) && __has_attribute(__format__)
+    #define FF_C_PRINTF(formatStrIndex, argsStartIndex) __attribute__((__format__ (printf, formatStrIndex, argsStartIndex)))
+#else
+    #define FF_C_PRINTF(formatStrIndex, argsStartIndex)
+#endif
+
+#if defined(__has_attribute) && __has_attribute(__format__)
+    #define FF_C_SCANF(formatStrIndex, argsStartIndex) __attribute__((__format__ (scanf, formatStrIndex, argsStartIndex)))
+#else
+    #define FF_C_SCANF(formatStrIndex, argsStartIndex)
+#endif
+
+#if defined(__has_attribute) && __has_attribute(__nonnull__)
+    #define FF_C_NONNULL(argIndex, ...) __attribute__((__nonnull__(argIndex, ##__VA_ARGS__)))
+#else
+    #define FF_C_NONNULL(argIndex, ...)
+#endif
+
+#if defined(__has_attribute) && __has_attribute(__returns_nonnull__)
+    #define FF_C_RETURNS_NONNULL __attribute__((__returns_nonnull__))
+#else
+    #define FF_C_RETURNS_NONNULL
+#endif
@@ -11,7 +11,7 @@

 typedef struct FFlist
 {
-    char* data;
+    uint8_t* data;
    uint32_t elementSize;
    uint32_t length;
    uint32_t capacity;
@@ -37,7 +37,7 @@ static inline void ffListInitA(FFlist* list, uint32_t elementSize, uint32_t capa
 {
    ffListInit(list, elementSize);
    list->capacity = capacity;
-    list->data = __builtin_expect(capacity == 0, 0) ? NULL : (char*) malloc((size_t)list->capacity * list->elementSize);
+    list->data = __builtin_expect(capacity == 0, 0) ? NULL : (uint8_t*) malloc((size_t)list->capacity * list->elementSize);
 }

 static inline FFlist ffListCreate(uint32_t elementSize)
@@ -120,3 +120,16 @@ static inline void ffListClear(FFlist* list)
        assert((listVar).capacity > (index)); \
        (itemType*)(listVar).data + (index); \
    })
+
+#define FF_LIST_ADD(itemType, listVar) \
+    ({ \
+        assert(sizeof(itemType) == (listVar).elementSize); \
+        (itemType*) ffListAdd(&(listVar)); \
+    })
+
+#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)); \
+    })
@@ -10,6 +10,12 @@
 #include <stdlib.h>
 #include <assert.h>

+#ifdef FF_USE_SYSTEM_YYJSON
+    #include <yyjson.h>
+#else
+    #include "3rdparty/yyjson/yyjson.h"
+#endif
+
 #ifdef _WIN32
    // #include <shlwapi.h>
    __stdcall char* StrStrIA(const char* lpFirst, const char* lpSrch);
@@ -18,6 +24,8 @@

 #define FASTFETCH_STRBUF_DEFAULT_ALLOC 32

+// 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;
@@ -28,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);
@@ -48,11 +57,15 @@ void ffStrbufPrependC(FFstrbuf* strbuf, char c);

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

+// 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_C_PRINTF(2, 3) void ffStrbufSetF(FFstrbuf* strbuf, const char* format, ...);

 void ffStrbufTrimLeft(FFstrbuf* strbuf, char c);
 void ffStrbufTrimRight(FFstrbuf* strbuf, char c);
+void ffStrbufTrimLeftSpace(FFstrbuf* strbuf);
 void ffStrbufTrimRightSpace(FFstrbuf* strbuf);

 bool ffStrbufRemoveSubstr(FFstrbuf* strbuf, uint32_t startIndex, uint32_t endIndex);
@@ -72,6 +85,7 @@ bool ffStrbufSubstrAfter(FFstrbuf* strbuf, uint32_t index); // Not including the
 bool ffStrbufSubstrAfterFirstC(FFstrbuf* strbuf, char c);
 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);

@@ -82,16 +96,61 @@ 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);
+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);

 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);
+bool ffStrbufSeparatedContainNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator);
+bool ffStrbufSeparatedContainIgnCaseNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator);
+
+int ffStrbufAppendUtf32CodePoint(FFstrbuf* strbuf, uint32_t codepoint);
+
+void ffStrbufAppendSInt(FFstrbuf* strbuf, int64_t value);
+void ffStrbufAppendUInt(FFstrbuf* strbuf, uint64_t value);
+// Appends a double value to the string buffer with the specified precision (0~15).
+// 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)
 {
@@ -103,7 +162,7 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateA(uint32_t allocate)
 static inline void ffStrbufInitCopy(FFstrbuf* __restrict strbuf, const FFstrbuf* __restrict src)
 {
    if (src->allocated == 0) // static string
-        memcpy(strbuf, src, sizeof(FFstrbuf));
+        *strbuf = *src;
    else
    {
        ffStrbufInitA(strbuf, src->allocated);
@@ -123,9 +182,7 @@ static inline void ffStrbufInitMove(FFstrbuf* strbuf, FFstrbuf* src)
 {
    if (src)
    {
-        strbuf->allocated = src->allocated;
-        strbuf->chars = src->chars;
-        strbuf->length = src->length;
+        *strbuf = *src;
        ffStrbufInit(src);
    }
    else
@@ -168,21 +225,17 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateF(const char* format, ...)
    return strbuf;
 }

+static inline void ffStrbufInitMoveS(FFstrbuf* strbuf, char* heapStr)
+{
+    ffStrbufInitMoveNS(strbuf, (uint32_t) strlen(heapStr), heapStr);
+}
+
 static inline void ffStrbufDestroy(FFstrbuf* strbuf)
 {
-    extern char* CHAR_NULL_PTR;
+    if(strbuf->allocated > 0)
+        free(strbuf->chars);

-    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;
+    ffStrbufInit(strbuf);
 }

 FF_C_NODISCARD static inline uint32_t ffStrbufGetFree(const FFstrbuf* strbuf)
@@ -199,6 +252,30 @@ static inline void ffStrbufRecalculateLength(FFstrbuf* strbuf)
    strbuf->length = (uint32_t) strlen(strbuf->chars);
 }

+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)
@@ -206,34 +283,24 @@ static inline void ffStrbufAppendS(FFstrbuf* strbuf, const char* value)
    ffStrbufAppendNS(strbuf, (uint32_t) strlen(value), value);
 }

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

 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()
+FF_C_NODISCARD static inline FFstrbuf ffStrbufCreate(void)
 {
    FFstrbuf strbuf;
    ffStrbufInit(&strbuf);
@@ -260,10 +327,12 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateStatic(const char* str)
 static inline void ffStrbufSetStatic(FFstrbuf* strbuf, const char* value)
 {
    if(strbuf->allocated > 0)
-        ffStrbufDestroy(strbuf);
+        free(strbuf->chars);

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

 static inline void ffStrbufInitNS(FFstrbuf* strbuf, uint32_t length, const char* str)
@@ -279,6 +348,12 @@ FF_C_NODISCARD static inline FFstrbuf ffStrbufCreateNS(uint32_t length, const ch
    return strbuf;
 }

+static inline bool ffStrbufInitJsonVal(FFstrbuf* strbuf, yyjson_val* jsonVal)
+{
+    ffStrbufInit(strbuf);
+    return ffStrbufAppendJsonVal(strbuf, jsonVal);
+}
+
 static inline void ffStrbufInitS(FFstrbuf* strbuf, const char* str)
 {
    ffStrbufInit(strbuf);
@@ -314,7 +389,7 @@ static inline void ffStrbufPrependS(FFstrbuf* strbuf, const char* value)
    ffStrbufPrependNS(strbuf, (uint32_t) strlen(value), value);
 }

-static inline int ffStrbufComp(const FFstrbuf* strbuf, const FFstrbuf* comp)
+static inline FF_C_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);
@@ -472,7 +547,7 @@ static inline FF_C_NODISCARD bool ffStrbufEndsWithS(const FFstrbuf* strbuf, cons
    return ffStrbufEndsWithNS(strbuf, (uint32_t) strlen(end), end);
 }

-static inline FF_C_NODISCARD bool ffStrbufEndsWithFn(const FFstrbuf* strbuf, int (*fn)(int))
+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]);
@@ -506,4 +581,50 @@ static inline void ffStrbufTrim(FFstrbuf* strbuf, char c)
    ffStrbufTrimLeft(strbuf, c);
 }

+static inline void ffStrbufTrimSpace(FFstrbuf* strbuf)
+{
+    ffStrbufTrimRightSpace(strbuf);
+    ffStrbufTrimLeftSpace(strbuf);
+}
+
+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)
+{
+    return ffStrbufMatchSeparatedNS(strbuf, comp->length, comp->chars, 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)
+{
+    return ffStrbufMatchSeparatedIgnCaseNS(strbuf, comp->length, comp->chars, 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)
+{
+    return ffStrbufSeparatedContainNS(strbuf, comp->length, comp->chars, 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)
+{
+    return ffStrbufSeparatedContainIgnCaseNS(strbuf, comp->length, comp->chars, separator);
+}
+
 #define FF_STRBUF_AUTO_DESTROY FFstrbuf __attribute__((__cleanup__(ffStrbufDestroy)))
@@ -6,8 +6,8 @@
    <string>fastfetch</string>
    <key>CFBundleName</key>
    <string>@PROJECT_NAME@</string>
-	<key>CFBundleShortVersionString</key>
-	<string>@PROJECT_VERSION@</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@PROJECT_VERSION@</string>
    <key>CFBundleDevelopmentRegion</key>
    <string>English</string>
    <key>NSBluetoothAlwaysUsageDescription</key>
@@ -40,11 +40,9 @@ const char* ffCfNumGetInt(CFTypeRef cf, int32_t* result)

 const char* ffCfStrGetString(CFTypeRef cf, FFstrbuf* result)
 {
+    ffStrbufClear(result);
    if (!cf)
-    {
-        ffStrbufClear(result);
        return NULL;
-    }

    if (CFGetTypeID(cf) == CFStringGetTypeID())
    {
@@ -56,6 +54,8 @@ const char* ffCfStrGetString(CFTypeRef cf, FFstrbuf* result)
        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";
@@ -68,7 +68,9 @@ const char* ffCfStrGetString(CFTypeRef cf, FFstrbuf* result)
    {
        CFDataRef cfData = (CFDataRef)cf;
        uint32_t length = (uint32_t)CFDataGetLength(cfData);
-        ffStrbufEnsureFree(result, length + 1);
+        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';
@@ -79,6 +81,29 @@ const char* ffCfStrGetString(CFTypeRef cf, FFstrbuf* result)
    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);
@@ -88,6 +113,15 @@ const char* ffCfDictGetString(CFDictionaryRef dict, CFStringRef key, FFstrbuf* r
    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);
@@ -8,11 +8,13 @@
 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* 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* 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);

 static inline CFNumberRef ffCfCreateInt(int value)
@@ -22,13 +24,14 @@ static inline CFNumberRef ffCfCreateInt(int value)

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

 #define FF_CFTYPE_AUTO_RELEASE __attribute__((__cleanup__(cfReleaseWrapper)))

-static inline void wrapIoObjectRelease(io_service_t* service)
+static inline void wrapIoObjectRelease(io_object_t* service)
 {
    assert(service);
    if (*service)
@@ -1,6 +1,6 @@
-#include "fastfetch.h"
 #include "smc_temps.h"
-#include "util/stringUtils.h"
+#include "common/apple/cf_helpers.h"
+#include "common/stringUtils.h"

 #include <stdint.h>
 #include <math.h>
@@ -137,14 +137,11 @@ static const char *smcReadSmcVal(io_connect_t conn, const UInt32Char_t key, SmcV

 static const char *smcOpen(io_connect_t *conn)
 {
-    io_object_t device = IOServiceGetMatchingService(MACH_PORT_NULL, IOServiceMatching("AppleSMC"));
+    FF_IOOBJECT_AUTO_RELEASE io_object_t device = IOServiceGetMatchingService(MACH_PORT_NULL, IOServiceMatching("AppleSMC"));
    if (!device)
        return "No SMC device found";

-    kern_return_t result = IOServiceOpen(device, mach_task_self(), 0, conn);
-    IOObjectRelease(device);
-
-    if (result != kIOReturnSuccess)
+    if (IOServiceOpen(device, mach_task_self(), 0, conn) != kIOReturnSuccess)
        return "IOServiceOpen() failed";

    return NULL;
@@ -159,117 +156,112 @@ static const char *smcReadValue(io_connect_t conn, const UInt32Char_t key, doubl
    if (val.dataSize == 0)
        return "Empty SMC result";

-    if (ffStrEquals(val.dataType, "ui8 ") ||
-        ffStrEquals(val.dataType, "ui16") ||
-        ffStrEquals(val.dataType, "ui32") ||
-        ffStrEquals(val.dataType, "ui64"))
+    switch (val.dataType[0])
    {
-        uint64_t tmp = 0;
-        for (uint32_t i = 0; i < val.dataSize; i++)
-            tmp += (uint64_t)((uint8_t)(val.bytes[i]) * pow(256, val.dataSize - 1 - i));
-        *value = (double)tmp;
+        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";
    }
-    else if (ffStrEquals(val.dataType, "flt "))
-    {
-        *value = *(float *)(val.bytes);
-    }
-    else if (ffStrEquals(val.dataType, "fp1f") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 32768.0;
-    }
-    else if (ffStrEquals(val.dataType, "fp4c") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 4096.0;
-    }
-    else if (ffStrEquals(val.dataType, "fp5b") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 2048.0;
-    }
-    else if (ffStrEquals(val.dataType, "fp6a") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 1024.0;
-    }
-    else if (ffStrEquals(val.dataType, "fp79") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 512.0;
-    }
-    else if (ffStrEquals(val.dataType, "fp88") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 256.0;
-    }
-    else if (ffStrEquals(val.dataType, "fpa6") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 64.0;
-    }
-    else if (ffStrEquals(val.dataType, "fpc4") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 16.0;
-    }
-    else if (ffStrEquals(val.dataType, "fpe2") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 4.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp1e") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 16384.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp3c") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 4096.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp4b") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 2048.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp5a") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 1024.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp69") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 512.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp78") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 256.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp87") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 128.0;
-    }
-    else if (ffStrEquals(val.dataType, "sp96") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 64.0;
-    }
-    else if (ffStrEquals(val.dataType, "spb4") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 16.0;
-    }
-    else if (ffStrEquals(val.dataType, "spf0") && val.dataSize == 2)
-    {
-        *value = ntohs(*(uint16_t *)(val.bytes)) / 1.0;
-    }
-    else if (ffStrEquals(val.dataType, "si8 ") && val.dataSize == 1)
-    {
-        signed char *bytes = (signed char *)val.bytes;
-        int16_t temp = 0;
-        temp += (int8_t)(bytes[0]);
-        *value = temp;
-    }
-    else if (ffStrEquals(val.dataType, "si16") && val.dataSize == 2)
-    {
-        *value = ntohs(*(int16_t *)(val.bytes));
-    }
-    else if (ffStrEquals(val.dataType, "{pwm") && val.dataSize == 2)
-    {
-        *value = (double)ntohs(*(uint16_t *)(val.bytes)) * 100 / 65536.0;
-    }
-    else
-        return "Unknown SMC data type";
    return NULL;
 }

-static bool detectTemp(io_connect_t conn, const char *sensor, double* sum)
+static bool detectTemp(io_connect_t conn, const char* sensor, double* sum)
 {
    double temp = 0;
    const char* error = smcReadValue(conn, sensor, &temp);
@@ -280,15 +272,32 @@ static bool detectTemp(io_connect_t conn, const char *sensor, double* sum)
    return true;
 }

-const char *ffDetectSmcTemps(enum FFTempType type, double *result)
+static io_connect_t conn;
+
+const char* ffDetectSmcSpecificTemp(const char* sensor, double* result)
 {
-    static io_connect_t conn;
    if (!conn)
    {
        if (smcOpen(&conn) != NULL)
            conn = (io_connect_t) -1;
    }
-    else if (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;
@@ -353,6 +362,21 @@ const char *ffDetectSmcTemps(enum FFTempType type, double *result)
        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;
@@ -390,6 +414,19 @@ const char *ffDetectSmcTemps(enum FFTempType type, double *result)
        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
@@ -15,6 +15,7 @@ enum FFTempType
    FF_TEMP_CPU_M1X,
    FF_TEMP_CPU_M2X,
    FF_TEMP_CPU_M3X,
+    FF_TEMP_CPU_M4X,

    FF_TEMP_GPU_INTEL,
    FF_TEMP_GPU_AMD,
@@ -22,10 +23,12 @@ enum FFTempType
    FF_TEMP_GPU_M1X,
    FF_TEMP_GPU_M2X,
    FF_TEMP_GPU_M3X,
+    FF_TEMP_GPU_M4X,

    FF_TEMP_BATTERY,

    FF_TEMP_MEMORY,
 };

-const char *ffDetectSmcTemps(enum FFTempType type, double* result);
+const char* ffDetectSmcSpecificTemp(const char* sensor, double* result);
+const char* ffDetectSmcTemps(enum FFTempType type, double* result);
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <assert.h>
+
+#ifdef __has_builtin
+    #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))); })
+    #endif
+#endif
+#ifndef ARRAY_SIZE
+    #define ARRAY_SIZE(x) ((uint32_t) (sizeof(x) / sizeof(*(x))))
+#endif
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "fastfetch.h"
+
+/**
+ * Extracts string literals from a binary file
+ *
+ * @param file Path to the binary file to extract strings from
+ * @param cb Callback function that will be called for each string found
+ *           Return false from callback to stop extraction
+ * @param userdata User-provided data passed to the callback function
+ * @param minLength Minimum length of strings to extract
+ *
+ * @return NULL on success, error message on failure.
+ * @note This function won't return an error if no strings are found.
+ *       Always check if strings are correctly extracted after this function all.
+ */
+const char* ffBinaryExtractStrings(const char* file, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata, uint32_t minLength);
@@ -1,166 +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;
-
-    for (FFModuleBaseInfo** modules = ffModuleInfos[toupper(key[2]) - 'A']; *modules; ++modules)
-    {
-        FFModuleBaseInfo* baseInfo = *modules;
-        if (baseInfo->parseCommandOptions(baseInfo, key, value)) return true;
-    }
-    return false;
-}
-
-void ffPrepareCommandOption(FFdata* data)
-{
-    FFOptionsModules* const options = &instance.config.modules;
-    //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
-
-    if(ffStrbufContainIgnCaseS(&data->structure, FF_CPUUSAGE_MODULE_NAME))
-        ffPrepareCPUUsage();
-
-    if(ffStrbufContainIgnCaseS(&data->structure, FF_DISKIO_MODULE_NAME))
-        ffPrepareDiskIO(&options->diskIo);
-
-    if(ffStrbufContainIgnCaseS(&data->structure, FF_NETIO_MODULE_NAME))
-        ffPrepareNetIO(&options->netIo);
-
-    if(instance.config.general.multithreading)
-    {
-        if(ffStrbufContainIgnCaseS(&data->structure, FF_PUBLICIP_MODULE_NAME))
-            ffPreparePublicIp(&options->publicIP);
-
-        if(ffStrbufContainIgnCaseS(&data->structure, FF_WEATHER_MODULE_NAME))
-            ffPrepareWeather(&options->weather);
-    }
-}
-
-static void genJsonConfig(FFModuleBaseInfo* baseInfo, 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");
-
-    yyjson_mut_val* module = yyjson_mut_obj(doc);
-    FF_STRBUF_AUTO_DESTROY type = ffStrbufCreateS(baseInfo->name);
-    ffStrbufLowerCase(&type);
-    yyjson_mut_obj_add_strbuf(doc, module, "type", &type);
-
-    if (baseInfo->generateJsonConfig)
-        baseInfo->generateJsonConfig(baseInfo, 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);
-}
-
-static void genJsonResult(FFModuleBaseInfo* baseInfo, 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(baseInfo, 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, 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))
-            {
-                if (__builtin_expect(jsonDoc != NULL, false))
-                    fn(baseInfo, jsonDoc);
-                else
-                    baseInfo->printModule(baseInfo);
-                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("\e[s\e[1A\e[9999999C\e[%dD%s\e[u", 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"
+#include "common/ffdata.h"

-// Things only needed by fastfetch
-typedef struct FFdata
-{
-    FFstrbuf structure;
-    bool configLoaded;
-} FFdata;
-
-bool ffParseModuleOptions(const char* key, const char* value);
 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);
@@ -3,7 +3,7 @@
 #ifdef FF_HAVE_DBUS
 #include <dbus/dbus.h>

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

 typedef struct FFDBusLibrary
@@ -19,6 +19,7 @@ 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
@@ -31,14 +32,18 @@ const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data); //Returns an
 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);
-DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method, const char* arg);
+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);
+void ffDBusDestroyData(FFDBusData* data);

 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);
+    return ffDBusGetMethodReply(dbus, busName, objectPath, "org.freedesktop.DBus.Properties", "GetAll", interface, NULL);
 }

+#define FF_DBUS_AUTO_DESTROY_DATA __attribute__((__cleanup__(ffDBusDestroyData)))
+
 #endif // FF_HAVE_DBUS
@@ -0,0 +1,33 @@
+#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(unsigned long errorCode);
+#endif
@@ -0,0 +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);
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "common/FFstrbuf.h"
+
+typedef enum __attribute__((__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,7 +1,7 @@
 #pragma once

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

 typedef struct FFfont
 {
@@ -15,6 +15,9 @@ 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);

@@ -1,6 +1,6 @@
 #pragma once

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

 typedef enum __attribute__((__packed__)) FFformatArgType
 {
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "fastfetch.h"
+
+bool ffFreqAppendNum(uint32_t mhz, FFstrbuf* result);
@@ -0,0 +1,24 @@
+extern "C" {
+#include "version.h"
+}
+
+#include <File.h>
+#include <AppFileInfo.h>
+
+bool ffGetFileVersion(const char* filePath, FFstrbuf* version)
+{
+    BFile f(filePath, B_READ_ONLY);
+    if (f.InitCheck() != B_OK)
+        return false;
+
+    BAppFileInfo fileInfo(&f);
+    if (f.InitCheck() != B_OK)
+        return false;
+
+    version_info info;
+    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);
+    return true;
+}
@@ -0,0 +1,3 @@
+#include "common/FFstrbuf.h"
+
+bool ffGetFileVersion(const char* filePath, FFstrbuf* version);
@@ -1,6 +1,6 @@
 #include "FFPlatform_private.h"
-#include "util/stringUtils.h"
-#include "common/io/io.h"
+#include "common/stringUtils.h"
+#include "common/io.h"
 #include "detection/version/version.h"

 void ffPlatformInit(FFPlatform* platform)
@@ -10,11 +10,17 @@ void ffPlatformInit(FFPlatform* platform)
    ffListInit(&platform->configDirs, sizeof(FFstrbuf));
    ffListInit(&platform->dataDirs, sizeof(FFstrbuf));
    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);
@@ -44,17 +50,22 @@ void ffPlatformDestroy(FFPlatform* platform)
        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);
    ffStrbufDestroy(&info->release);
    ffStrbufDestroy(&info->version);
-    ffStrbufDestroy(&info->displayVersion);
 }

 void ffPlatformPathAddAbsolute(FFlist* dirs, const char* path)
@@ -1,6 +1,6 @@
 #pragma once

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

 void ffPlatformInitImpl(FFPlatform* platform);

@@ -1,7 +1,9 @@
 #include "FFPlatform_private.h"
-#include "util/stringUtils.h"
+#include "common/FFstrbuf.h"
+#include "common/arrayUtils.h"
+#include "common/stringUtils.h"
+#include "common/io.h"
 #include "fastfetch_config.h"
-#include "common/io/io.h"

 #include <unistd.h>
 #include <pwd.h>
@@ -10,29 +12,40 @@
 #include <paths.h>

 #ifdef __APPLE__
-    #include <libproc.h>
+    #include <mach-o/dyld.h>
    #include <sys/sysctl.h>
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
    #include <sys/sysctl.h>
+#elif defined(__OpenBSD__)
+    #include <sys/sysctl.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 + 1];
-    #ifdef __linux__
+    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__)
-        int exePathLen = proc_pidpath((int) getpid(), exePath, sizeof(exePath));
+        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, (int) getpid()
+                KERN_PROC, KERN_PROC_PATHNAME, (pid_t) platform->pid
            #else
-                KERN_PROC_ARGS, (int) getpid(), KERN_PROC_PATHNAME
+                KERN_PROC_ARGS, platform->pid, KERN_PROC_PATHNAME
            #endif
            }, 4,
            exePath, &exePathLen,
@@ -42,11 +55,96 @@ static void getExePath(FFPlatform* platform)
        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, 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)
    {
@@ -117,6 +215,9 @@ static void getConfigDirs(FFPlatform* platform)
        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");
@@ -159,11 +260,16 @@ static void getDataDirs(FFPlatform* platform)

 static void getUserName(FFPlatform* platform, const struct passwd* pwd)
 {
-    const char* user = getenv("USER");
-    if(!ffStrSet(user) && pwd)
-        user = pwd->pw_name;
-
-    ffStrbufAppendS(&platform->userName, user);
+    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)
@@ -185,8 +291,13 @@ 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);
-    ffStrbufInit(&info->displayVersion);

    #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__NetBSD__)
    size_t length = sizeof(info->pageSize);
@@ -196,15 +307,28 @@ static void getSysinfo(FFPlatformSysinfo* info, const struct utsname* uts)
    #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)
 {
-    struct passwd* pwd = getpwuid(getuid());
+    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);
@@ -1,19 +1,24 @@
 #include "FFPlatform_private.h"
-#include "common/io/io.h"
+#include "common/io.h"
 #include "common/library.h"
-#include "util/stringUtils.h"
-#include "util/windows/unicode.h"
-#include "util/windows/registry.h"
-#include "util/windows/nt.h"
+#include "common/mallocHelper.h"
+#include "common/stringUtils.h"
+#include "common/windows/unicode.h"
+#include "common/windows/registry.h"
+#include "common/windows/nt.h"

-#include <Windows.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];
    DWORD exePathWLen = GetModuleFileNameW(NULL, exePathW, MAX_PATH);
-    if (exePathWLen == 0 && exePathWLen >= MAX_PATH) return;
+    if (exePathWLen == 0 || exePathWLen >= MAX_PATH) return;

    FF_AUTO_CLOSE_FD HANDLE hPath = CreateFileW(exePathW, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
    if (hPath != INVALID_HANDLE_VALUE)
@@ -67,15 +72,15 @@ static void getCacheDir(FFPlatform* platform)
 static void platformPathAddKnownFolder(FFlist* dirs, REFKNOWNFOLDERID folderId)
 {
    PWSTR pPath = NULL;
-    if(SUCCEEDED(SHGetKnownFolderPath(folderId, 0, NULL, &pPath)))
+    if (SUCCEEDED(SHGetKnownFolderPath(folderId, KF_FLAG_DEFAULT, NULL, &pPath)))
    {
        FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreateWS(pPath);
+        CoTaskMemFree(pPath);
        ffStrbufReplaceAllC(&buffer, '\\', '/');
        ffStrbufEnsureEndsWithC(&buffer, '/');
        if (!ffListContains(dirs, &buffer, (void*) ffStrbufEqual))
            ffStrbufInitMove((FFstrbuf*) ffListAdd(dirs), &buffer);
    }
-    CoTaskMemFree(pPath);
 }

 static void platformPathAddEnvSuffix(FFlist* dirs, const char* env, const char* suffix)
@@ -133,50 +138,76 @@ static void getDataDirs(FFPlatform* platform)

 static void getUserName(FFPlatform* platform)
 {
-    const char* userName = getenv("USERNAME");
-    if (ffStrSet(userName))
-        ffStrbufSetS(&platform->userName, userName);
-    else
+    wchar_t buffer[256];
+    DWORD size = ARRAY_SIZE(buffer);
+    if (GetUserNameExW(NameDisplay, buffer, &size))
+        ffStrbufSetWS(&platform->fullUserName, buffer);
+
+    size = ARRAY_SIZE(buffer);
+    if (GetUserNameW(buffer, &size)) // GetUserNameExW(10002)?
    {
-        wchar_t buffer[128];
-        DWORD len = ARRAY_SIZE(buffer);
-        if(GetUserNameW(buffer, &len))
-            ffStrbufSetWS(&platform->userName, buffer);
+        ffStrbufSetWS(&platform->userName, buffer);
+
+        size = 0;
+        DWORD refDomainSize = 0;
+        SID_NAME_USE sidNameUse = SidTypeUnknown;
+        LookupAccountNameW(NULL, buffer, NULL, &size, NULL, &refDomainSize, &sidNameUse);
+        if (size > 0)
+        {
+            FF_AUTO_FREE PSID sid = (PSID) malloc(size);
+            FF_AUTO_FREE LPWSTR refDomain = (LPWSTR) malloc(refDomainSize * sizeof(wchar_t));
+            if (LookupAccountNameW(NULL, buffer, sid, &size, refDomain, &refDomainSize, &sidNameUse))
+            {
+                LPWSTR sidString;
+                if (ConvertSidToStringSidW(sid, &sidString))
+                {
+                    ffStrbufSetWS(&platform->sid, sidString);
+                    LocalFree(sidString);
+                }
+            }
+        }
    }
+    else
+        ffStrbufSetS(&platform->userName, getenv("USERNAME"));
 }

 static void getHostName(FFPlatform* platform)
 {
-    wchar_t buffer[128];
+    wchar_t buffer[256];
    DWORD len = ARRAY_SIZE(buffer);
-    if(GetComputerNameExW(ComputerNameDnsHostname, buffer, &len))
-        ffStrbufSetWS(&platform->hostName, 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
-    ffStrbufAppendS(&platform->userShell, getenv("SHELL"));
-    ffStrbufReplaceAllC(&platform->userShell, '\\', '/');
+    const char* userShell = getenv("SHELL");
+    if (userShell)
+    {
+        ffStrbufAppendS(&platform->userShell, userShell);
+        ffStrbufReplaceAllC(&platform->userShell, '\\', '/');
+    }
 }

-static void detectWine(FFstrbuf* buf)
+static const char* detectWine(void)
 {
-    static const char *(__cdecl *pwine_get_version)(void);
+    const char * __cdecl wine_get_version(void);
    HMODULE hntdll = GetModuleHandleW(L"ntdll.dll");
-    if (!hntdll) return;
-    pwine_get_version = (void *)GetProcAddress(hntdll, "wine_get_version");
-    if (!pwine_get_version) return;
-    ffStrbufAppendS(buf, buf->length ? " - wine " : "wine ");
-    ffStrbufAppendS(buf, pwine_get_version());
+    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)
 {
-    RTL_OSVERSIONINFOW osVersion = { .dwOSVersionInfoSize = sizeof(osVersion) };
-    if (!NT_SUCCESS(RtlGetVersion(&osVersion)))
-        return;
-
    FF_HKEY_AUTO_DESTROY hKey = NULL;
    if(!ffRegOpenKeyForRead(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", &hKey, NULL))
        return;
@@ -186,44 +217,41 @@ static void getSystemReleaseAndVersion(FFPlatformSysinfo* info)

    ffStrbufAppendF(&info->release,
        "%u.%u.%u.%u",
-        (unsigned) osVersion.dwMajorVersion,
-        (unsigned) osVersion.dwMinorVersion,
-        (unsigned) osVersion.dwBuildNumber,
+        (unsigned) SharedUserData->NtMajorVersion,
+        (unsigned) SharedUserData->NtMinorVersion,
+        (unsigned) SharedUserData->NtBuildNumber,
        (unsigned) ubr);

-    ffStrbufInit(&info->displayVersion);
-    if(!ffRegReadStrbuf(hKey, L"DisplayVersion", &info->displayVersion, NULL))
-    {
-        if (osVersion.szCSDVersion[0])
-            ffStrbufSetWS(&info->displayVersion, osVersion.szCSDVersion);
-        else
-            ffRegReadStrbuf(hKey, L"ReleaseId", &info->displayVersion, NULL); // For old Windows 10
-    }
-    detectWine(&info->displayVersion);
-
    ffRegReadStrbuf(hKey, L"BuildLabEx", &info->version, NULL);

-    switch (osVersion.dwPlatformId)
+    const char* wineVersion = detectWine();
+    if (wineVersion)
    {
-    case VER_PLATFORM_WIN32s:
-        ffStrbufSetStatic(&info->name, "WIN32s");
-        break;
-    case VER_PLATFORM_WIN32_WINDOWS:
-        ffStrbufSetStatic(&info->name, "WIN32_WINDOWS");
-        break;
-    case VER_PLATFORM_WIN32_NT:
-        ffStrbufSetStatic(&info->name, "WIN32_NT");
-        break;
+        if (instance.config.general.detectVersion)
+            ffStrbufSetF(&info->name, "Wine_%s", wineVersion);
+        else
+            ffStrbufSetStatic(&info->name, "Wine");
    }
+    else
+        ffStrbufSetStatic(&info->name, "WIN32_NT");
 }

-static void getSystemArchitectureAndPageSize(FFPlatformSysinfo* info)
+static void getSystemPageSize(FFPlatformSysinfo* info)
 {
-    SYSTEM_INFO sysInfo;
-    GetNativeSystemInfo(&sysInfo);
+    SYSTEM_BASIC_INFORMATION sbi;
+    if (NT_SUCCESS(NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL)))
+        info->pageSize = sbi.PhysicalPageSize;
+    else
+        info->pageSize = 4096;
+}

-    switch(sysInfo.wProcessorArchitecture)
+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;
@@ -231,7 +259,7 @@ static void getSystemArchitectureAndPageSize(FFPlatformSysinfo* info)
            ffStrbufSetStatic(&info->architecture, "ia64");
            break;
        case PROCESSOR_ARCHITECTURE_INTEL:
-            switch (sysInfo.wProcessorLevel)
+            switch (spi.ProcessorLevel)
            {
                case 4:
                    ffStrbufSetStatic(&info->architecture, "i486");
@@ -269,14 +297,28 @@ static void getSystemArchitectureAndPageSize(FFPlatformSysinfo* info)
        default:
            ffStrbufSetStatic(&info->architecture, "unknown");
            break;
+        }
    }
+}

-    info->pageSize = sysInfo.dwPageSize;
+static void getCwd(FFPlatform* platform)
+{
+    #if _WIN64
+    static_assert(
+        offsetof(RTL_USER_PROCESS_PARAMETERS, Reserved2[5]) == 0x38,
+        "CurrentDirectory should be at offset 0x38 in RTL_USER_PROCESS_PARAMETERS. Structure layout mismatch detected.");
+    #endif
+    PCURDIR cwd = (PCURDIR) &NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->Reserved2[5];
+    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) GetCurrentProcessId();
    getExePath(platform);
+    getCwd(platform);
    getHomeDir(platform);
    getCacheDir(platform);
    getConfigDirs(platform);
@@ -287,5 +329,6 @@ void ffPlatformInitImpl(FFPlatform* platform)
    getUserShell(platform);

    getSystemReleaseAndVersion(&platform->sysinfo);
-    getSystemArchitectureAndPageSize(&platform->sysinfo);
+    getSystemArchitecture(&platform->sysinfo);
+    getSystemPageSize(&platform->sysinfo);
 }
@@ -1,4 +1,4 @@
-#include "FFlist.h"
+#include "common/FFlist.h"

 #include <stdlib.h>
 #include <string.h>
@@ -1,7 +1,9 @@
-#include "FFstrbuf.h"
+#include "common/FFstrbuf.h"
+#include "common/mallocHelper.h"

 #include <ctype.h>
 #include <inttypes.h>
+#include <math.h>

 char* CHAR_NULL_PTR = "";

@@ -20,11 +22,27 @@ void ffStrbufInitVF(FFstrbuf* strbuf, const char* format, va_list arguments)
 {
    assert(format != NULL);

-    int len = vasprintf(&strbuf->chars, format, arguments);
+    char* buffer = NULL;
+    int len = vasprintf(&buffer, format, arguments);
    assert(len >= 0);

-    strbuf->allocated = (uint32_t)(len + 1);
-    strbuf->length = (uint32_t)len;
+    ffStrbufInitMoveNS(strbuf, (uint32_t)len, buffer);
+}
+
+// Takes ownership of `heapStr`. The caller must not free `heapStr` after calling this
+// function; the memory will be managed and freed via the associated FFstrbuf.
+void ffStrbufInitMoveNS(FFstrbuf* strbuf, uint32_t length, char* heapStr)
+{
+    assert(heapStr != NULL);
+
+    strbuf->length = length;
+    size_t allocSize = ffMallocUsableSize(heapStr);
+    if (allocSize == 0)
+        allocSize = length + 1;
+    else if (allocSize > UINT32_MAX)
+        allocSize = UINT32_MAX;
+    strbuf->allocated = (uint32_t) allocSize;
+    strbuf->chars = heapStr;
 }

 void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free)
@@ -54,6 +72,7 @@ void ffStrbufEnsureFree(FFstrbuf* strbuf, uint32_t free)
    strbuf->allocated = allocate;
 }

+// Ensure that at least `free` bytes are available in the buffer besides the current length
 // for an empty buffer, free + 1 length memory will be allocated(+1 for the NUL)
 void ffStrbufEnsureFixedLengthFree(FFstrbuf* strbuf, uint32_t free)
 {
@@ -147,7 +166,7 @@ void ffStrbufAppendVF(FFstrbuf* strbuf, const char* format, va_list arguments)
    uint32_t free = ffStrbufGetFree(strbuf);
    int written = vsnprintf(strbuf->chars + strbuf->length, strbuf->allocated > 0 ? free + 1 : 0, format, arguments);

-    if(written > 0 && strbuf->length + (uint32_t) written > free)
+    if(written > 0 && (uint32_t) written > free)
    {
        ffStrbufEnsureFree(strbuf, (uint32_t) written);
        written = vsnprintf(strbuf->chars + strbuf->length, (uint32_t) written + 1, format, copy);
@@ -164,7 +183,7 @@ const char* ffStrbufAppendSUntilC(FFstrbuf* strbuf, const char* value, char unti
    if(value == NULL)
        return NULL;

-    char* end = strchr(value, until);
+    const char* end = strchr(value, until);
    if(end == NULL)
        ffStrbufAppendS(strbuf, value);
    else
@@ -221,8 +240,51 @@ void ffStrbufPrependC(FFstrbuf* strbuf, char c)

 void ffStrbufSetNS(FFstrbuf* strbuf, uint32_t length, const char* value)
 {
-    ffStrbufClear(strbuf);
-    ffStrbufAppendNS(strbuf, length, value);
+    assert(strbuf != NULL);
+
+    if (length == 0)
+    {
+        ffStrbufClear(strbuf);
+        return;
+    }
+
+    assert(value != NULL);
+
+    if (strbuf->allocated < length + 1)
+    {
+        if (strbuf->allocated > 0)
+            free(strbuf->chars);
+        strbuf->allocated = length + 1;
+        strbuf->chars = malloc(sizeof(char) * strbuf->allocated);
+    }
+
+    memcpy(strbuf->chars, value, length);
+    strbuf->length = length;
+    strbuf->chars[length] = '\0';
+}
+
+void ffStrbufSet(FFstrbuf* strbuf, const FFstrbuf* value)
+{
+    assert(value && value != strbuf);
+
+    if (value->length == 0)
+    {
+        ffStrbufClear(strbuf);
+        return;
+    }
+
+    if (value->allocated == 0) // static string
+    {
+        if (strbuf->allocated != 0)
+        {
+            free(strbuf->chars);
+            strbuf->allocated = 0;
+        }
+        strbuf->chars = value->chars;
+        strbuf->length = value->length;
+        return;
+    }
+    ffStrbufSetNS(strbuf, value->length, value->chars);
 }

 void ffStrbufTrimLeft(FFstrbuf* strbuf, char c)
@@ -272,6 +334,31 @@ void ffStrbufTrimRight(FFstrbuf* strbuf, char c)
    strbuf->chars[strbuf->length] = '\0';
 }

+void ffStrbufTrimLeftSpace(FFstrbuf* strbuf)
+{
+    if(strbuf->length == 0)
+        return;
+
+    uint32_t index = 0;
+    while(index < strbuf->length && isspace(strbuf->chars[index]))
+        ++index;
+
+    if(index == 0)
+        return;
+
+    if(strbuf->allocated == 0)
+    {
+        //static string
+        strbuf->length -= index;
+        strbuf->chars += index;
+        return;
+    }
+
+    memmove(strbuf->chars, strbuf->chars + index, strbuf->length - index);
+    strbuf->length -= index;
+    strbuf->chars[strbuf->length] = '\0';
+}
+
 void ffStrbufTrimRightSpace(FFstrbuf* strbuf)
 {
    if (strbuf->length == 0)
@@ -361,7 +448,15 @@ void ffStrbufReplaceAllC(FFstrbuf* strbuf, char find, char replace)
        return;

    ffStrbufEnsureFree(strbuf, 0);
-    for (char *current_pos = strchr(strbuf->chars, find); current_pos; current_pos = strchr(current_pos + 1, find))
+    for (
+        char *current_pos = memchr(strbuf->chars, find, strbuf->length);
+        current_pos;
+        current_pos = memchr(
+            current_pos + 1,
+            find,
+            strbuf->length - (uint32_t)(current_pos + 1 - strbuf->chars)
+        )
+    )
        *current_pos = replace;
 }

@@ -373,7 +468,8 @@ bool ffStrbufSubstrBefore(FFstrbuf* strbuf, uint32_t index)
    if(strbuf->allocated == 0)
    {
        //static string
-        ffStrbufInitNS(strbuf, strbuf->length, strbuf->chars);
+        if (index < strbuf->length)
+            ffStrbufInitNS(strbuf, index, strbuf->chars);
        return true;
    }

@@ -436,6 +532,26 @@ bool ffStrbufSubstrAfterLastC(FFstrbuf* strbuf, char c)
    return true;
 }

+bool ffStrbufSubstr(FFstrbuf* strbuf, uint32_t start, uint32_t end)
+{
+    if (__builtin_expect(start >= end, false))
+    {
+        ffStrbufClear(strbuf);
+        return false;
+    }
+
+    if (__builtin_expect(start == 0, false)) return ffStrbufSubstrBefore(strbuf, end);
+    if (__builtin_expect(end >= strbuf->length, false)) return ffStrbufSubstrAfter(strbuf, start - 1);
+
+    uint32_t len = end - start;
+    ffStrbufEnsureFixedLengthFree(strbuf, len); // In case of static string
+    memmove(strbuf->chars, strbuf->chars + start, len);
+
+    strbuf->length = len;
+    strbuf->chars[len] = '\0';
+    return true;
+}
+
 uint32_t ffStrbufCountC(const FFstrbuf* strbuf, char c)
 {
    uint32_t result = 0;
@@ -481,11 +597,11 @@ void ffStrbufPutTo(const FFstrbuf* strbuf, FILE* file)
    fputc('\n', file);
 }

-double ffStrbufToDouble(const FFstrbuf* strbuf)
+double ffStrbufToDouble(const FFstrbuf* strbuf, double defaultValue)
 {
    char* str_end;
    double result = strtod(strbuf->chars, &str_end);
-    return str_end == strbuf->chars ? 0.0/0.0 : result;
+    return str_end == strbuf->chars ? defaultValue : result;
 }

 uint64_t ffStrbufToUInt(const FFstrbuf* strbuf, uint64_t defaultValue)
@@ -502,6 +618,87 @@ int64_t ffStrbufToSInt(const FFstrbuf* strbuf, int64_t defaultValue)
    return str_end == strbuf->chars ? defaultValue : (int64_t)result;
 }

+void ffStrbufAppendSInt(FFstrbuf* strbuf, int64_t value)
+{
+    ffStrbufEnsureFree(strbuf, 21); // Required by yyjson_write_number
+    char* start = strbuf->chars + strbuf->length;
+
+    yyjson_val val = {};
+    unsafe_yyjson_set_sint(&val, value);
+    char* end = yyjson_write_number(&val, start);
+
+    assert(end != NULL);
+
+    strbuf->length += (uint32_t)(end - start);
+}
+
+void ffStrbufAppendUInt(FFstrbuf* strbuf, uint64_t value)
+{
+    ffStrbufEnsureFree(strbuf, 21); // Required by yyjson_write_number
+    char* start = strbuf->chars + strbuf->length;
+
+    yyjson_val val = {};
+    unsafe_yyjson_set_uint(&val, value);
+    char* end = yyjson_write_number(&val, start);
+
+    assert(end != NULL);
+
+    strbuf->length += (uint32_t)(end - start);
+}
+
+void ffStrbufAppendDouble(FFstrbuf* strbuf, double value, int8_t precision, bool trailingZeros)
+{
+    assert(precision <= 15); // yyjson_write_number supports up to 15 digits after the decimal point
+
+    ffStrbufEnsureFree(strbuf, 40); // Required by yyjson_write_number
+    char* start = strbuf->chars + strbuf->length;
+
+    if (precision == 0)
+        value = round(value);
+    yyjson_val val = {};
+    unsafe_yyjson_set_double(&val, value);
+    if (precision > 0)
+        unsafe_yyjson_set_fp_to_fixed(&val, precision);
+
+    // Write at most <precision> digits after the decimal point; doesn't append trailing zeros
+    char* end = yyjson_write_number(&val, start);
+
+    assert(end > start);
+
+    strbuf->length += (uint32_t)(end - start);
+
+    if (__builtin_expect(value > 1e21 || value < -1e21, false))
+    {
+        // If the value is too large, yyjson_write_number will write it in scientific notation
+        return;
+    }
+
+    if (trailingZeros)
+    {
+        if (precision > 1)
+        {
+            for (char* p = end - 1; *p != '.' && p > start; --p)
+                --precision;
+            if (precision > 0)
+                ffStrbufAppendNC(strbuf, (uint32_t) precision, '0');
+        }
+        else if (precision == 0 || (precision < 0 && end[-1] == '0'))
+        {
+            goto removeDecimalPoint;
+        }
+    }
+    else
+    {
+        if (end[-1] == '0')
+        {
+        removeDecimalPoint:
+            // yyjson always appends ".0" to make it a float point number. We need to remove it
+            strbuf->length -= 2;
+            strbuf->chars[strbuf->length] = '\0';
+        }
+    }
+}
+
 void ffStrbufUpperCase(FFstrbuf* strbuf)
 {
    for (uint32_t i = 0; i < strbuf->length; ++i)
@@ -526,19 +723,7 @@ void ffStrbufInsertNC(FFstrbuf* strbuf, uint32_t index, uint32_t num, char c)
    strbuf->length += num;
 }

-/**
- * @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.
- *                         Can be NULL for the first call.
- * @param[in,out] n The pointer to the size of the buffer of lineptr.
- * @param[in] buffer The buffer to read from. The buffer must not be a string literal.
- *
- * @return true if a line has been read, false if the end of the buffer has been reached.
- */
-bool ffStrbufGetline(char** lineptr, size_t* n, FFstrbuf* buffer)
+bool ffStrbufGetdelim(char** lineptr, size_t* n, char delimiter, FFstrbuf* buffer)
 {
    assert(lineptr && n && buffer);
    assert(buffer->allocated > 0 || (buffer->allocated == 0 && buffer->length == 0));
@@ -552,14 +737,14 @@ bool ffStrbufGetline(char** lineptr, size_t* n, FFstrbuf* buffer)
        *lineptr += *n;
        if (*lineptr >= pBufferEnd) // non-empty last line
            return false;
-        **lineptr = '\n';
+        **lineptr = delimiter;
        ++*lineptr;
    }
    if (*lineptr >= pBufferEnd) // empty last line
        return false;

    size_t remaining = (size_t) (pBufferEnd - *lineptr);
-    char* ending = memchr(*lineptr, '\n', remaining);
+    char* ending = memchr(*lineptr, delimiter, remaining);
    if (ending)
    {
        *n = (size_t) (ending - *lineptr);
@@ -570,9 +755,7 @@ bool ffStrbufGetline(char** lineptr, size_t* n, FFstrbuf* buffer)
    return true;
 }

-/// @brief Restore the end of a line that was modified by ffStrbufGetline.
-/// @warning This function should be called before breaking an ffStrbufGetline loop.
-void ffStrbufGetlineRestore(char** lineptr, size_t* n, FFstrbuf* buffer)
+void ffStrbufGetdelimRestore(char** lineptr, size_t* n, char delimiter, FFstrbuf* buffer)
 {
    assert(buffer && lineptr && n);
    assert(buffer->allocated > 0 || (buffer->allocated == 0 && buffer->length == 0));
@@ -583,7 +766,7 @@ void ffStrbufGetlineRestore(char** lineptr, size_t* n, FFstrbuf* buffer)

    *lineptr += *n;
    if (*lineptr < buffer->chars + buffer->length)
-        **lineptr = '\n';
+        **lineptr = delimiter;
 }

 bool ffStrbufRemoveDupWhitespaces(FFstrbuf* strbuf)
@@ -607,3 +790,128 @@ bool ffStrbufRemoveDupWhitespaces(FFstrbuf* strbuf)

    return changed;
 }
+
+/// @brief Check if a separated string (comp) contains a substring (strbuf).
+/// @param strbuf The substring to check.
+/// @param compLength The length of the separated string to check.
+/// @param comp The separated string to check.
+/// @param separator The separator character.
+bool ffStrbufMatchSeparatedNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator)
+{
+    if (strbuf->length == 0)
+        return true;
+
+    if (compLength == 0)
+        return false;
+
+    for (const char* p = comp; p < comp + compLength;)
+    {
+        const char* colon = memchr(p, separator, compLength);
+        if (colon == NULL)
+            return strcmp(strbuf->chars, p) == 0;
+
+        uint32_t substrLength = (uint32_t) (colon - p);
+        if (strbuf->length == substrLength && memcmp(strbuf->chars, p, substrLength) == 0)
+            return true;
+
+        p = colon + 1;
+    }
+
+    return false;
+}
+
+/// @brief Case insensitive version of ffStrbufMatchSeparatedNS.
+bool ffStrbufMatchSeparatedIgnCaseNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator)
+{
+    if (strbuf->length == 0)
+        return true;
+
+    if (compLength == 0)
+        return false;
+
+    for (const char* p = comp; p < comp + compLength;)
+    {
+        const char* colon = memchr(p, separator, compLength);
+        if (colon == NULL)
+            return strcasecmp(strbuf->chars, p) == 0;
+
+        uint32_t substrLength = (uint32_t) (colon - p);
+        if (strbuf->length == substrLength && strncasecmp(strbuf->chars, p, substrLength) == 0)
+            return true;
+
+        p = colon + 1;
+    }
+
+    return false;
+}
+
+int ffStrbufAppendUtf32CodePoint(FFstrbuf* strbuf, uint32_t codepoint)
+{
+    if (codepoint <= 0x7F) {
+        ffStrbufAppendC(strbuf, (char)codepoint);
+        return 1;
+    } else if (codepoint <= 0x7FF) {
+        ffStrbufAppendNS(strbuf, 2, (char[]){
+            (char) (0xC0 | (codepoint >> 6)),
+            (char) (0x80 | (codepoint & 0x3F))
+        });
+        return 2;
+    } else if (codepoint <= 0xFFFF) {
+        ffStrbufAppendNS(strbuf, 3, (char[]){
+            (char) (0xE0 | (codepoint >> 12)),
+            (char) (0x80 | ((codepoint >> 6) & 0x3F)),
+            (char) (0x80 | (codepoint & 0x3F))
+        });
+        return 3;
+    } else if (codepoint <= 0x10FFFF) {
+        ffStrbufAppendNS(strbuf, 4, (char[]){
+            (char) (0xF0 | (codepoint >> 18)),
+            (char) (0x80 | ((codepoint >> 12) & 0x3F)),
+            (char) (0x80 | ((codepoint >> 6) & 0x3F)),
+            (char) (0x80 | (codepoint & 0x3F))
+        });
+        return 4;
+    }
+
+    ffStrbufAppendS(strbuf, "�"); // U+FFFD REPLACEMENT CHARACTER
+    return 1;
+}
+
+/// @brief Check if a separated string (strbuf) contains a substring (comp).
+/// @param strbuf The separated to check.
+/// @param compLength The length of the separated string to check.
+/// @param comp The substring to check.
+/// @param separator The separator character.
+bool ffStrbufSeparatedContainNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator)
+{
+    uint32_t startIndex = 0;
+    while(startIndex < strbuf->length)
+    {
+        uint32_t colonIndex = ffStrbufNextIndexC(strbuf, startIndex, separator);
+
+        uint32_t folderLength = colonIndex - startIndex;
+        if (folderLength == compLength && memcmp(strbuf->chars + startIndex, comp, compLength) == 0)
+            return true;
+
+        startIndex = colonIndex + 1;
+    }
+
+    return false;
+}
+
+bool ffStrbufSeparatedContainIgnCaseNS(const FFstrbuf* strbuf, uint32_t compLength, const char* comp, char separator)
+{
+    uint32_t startIndex = 0;
+    while(startIndex < strbuf->length)
+    {
+        uint32_t colonIndex = ffStrbufNextIndexC(strbuf, startIndex, separator);
+
+        uint32_t folderLength = colonIndex - startIndex;
+        if (folderLength == compLength && strncasecmp(strbuf->chars + startIndex, comp, compLength) == 0)
+            return true;
+
+        startIndex = colonIndex + 1;
+    }
+
+    return false;
+}
@@ -1,4 +1,4 @@
-#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)
@@ -1,7 +1,7 @@
-#include "binary.h"
-#include "common/io/io.h"
-#include "util/stringUtils.h"
-#include "util/mallocHelper.h"
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/stringUtils.h"
+#include "common/mallocHelper.h"

 #include <stdlib.h>
 #include <string.h>
@@ -14,12 +14,28 @@

 // Ref: https://github.com/AlexDenisov/segment_dumper/blob/master/main.c

+/**
+ * Helper function to read data from a file at a specific offset
+ */
 static inline bool readData(FILE *objFile, void *buf, size_t size, off_t offset)
 {
    fseek(objFile, offset, SEEK_SET);
    return fread(buf, 1, size, objFile) == size;
 }

+/**
+ * Handles a Mach-O section by extracting strings from the __cstring section
+ *
+ * @param objFile File handle to 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(FILE *objFile, 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;
@@ -43,6 +59,22 @@ static bool handleMachSection(FILE *objFile, const char *name, off_t offset, siz
    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 objFile File handle to 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(FILE *objFile, off_t offset, bool is_64, bool (*cb)(const char *str, uint32_t len, void *userdata), void *userdata, uint32_t minLength)
 {
    uint32_t ncmds;
@@ -117,6 +149,20 @@ static const char* dumpMachHeader(FILE *objFile, off_t offset, bool is_64, bool
    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 objFile File handle to 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(FILE *objFile, bool (*cb)(const char *str, uint32_t len, void *userdata), void *userdata, uint32_t minLength)
 {
    struct fat_header header;
@@ -165,21 +211,32 @@ static const char* dumpFatHeader(FILE *objFile, bool (*cb)(const char *str, uint
    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_FILE FILE *objFile = fopen(machoFile, "rb");
    if (objFile == NULL)
        return "File could not be opened";

+    // Read the magic number to determine the type of binary
    uint32_t magic;
    if (!readData(objFile, &magic, sizeof(magic), 0))
        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(objFile, cb, userdata, minLength);
    else
@@ -1,14 +1,17 @@
-#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/io.h"
 #include "common/library.h"
-#include "util/stringUtils.h"
+#include "common/stringUtils.h"

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

+/**
+ * Structure to hold dynamically loaded libelf function pointers
+ */
 struct FFElfData {
    FF_LIBRARY_SYMBOL(elf_version)
    FF_LIBRARY_SYMBOL(elf_begin)
@@ -23,15 +26,27 @@ struct FFElfData {
    bool inited;
 } elfData;

+/**
+ * Extracts string literals from an ELF (Linux/Unix) binary file
+ *
+ * This function loads the libelf library dynamically, opens the ELF file,
+ * locates the .rodata section (which contains string literals), and
+ * scans it for valid strings. Each string found is passed to the
+ * callback function for processing.
+ *
+ * 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)
 {
+    // Initialize libelf if not already done
    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";

+        // Load all required libelf functions
        FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libelf, elfData, elf_begin)
        FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libelf, elfData, elf_getshdrstrndx)
        FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(libelf, elfData, elf_nextscn)
@@ -47,12 +62,14 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s
    if (elfData.ffelf_end == NULL)
        return "load libelf failed";

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

    Elf* elf = elfData.ffelf_begin(fd, ELF_C_READ, NULL);
    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)
    {
@@ -60,9 +77,11 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s
        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)
    {
+        // 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)
@@ -71,18 +90,22 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s
            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;

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

+        // Scan the section for string literals
        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;
+            // Only process printable ASCII characters
            if (*p >= ' ' && *p <= '~') // Ignore control characters
            {
                if (!cb(p, len, userdata)) break;
@@ -99,6 +122,9 @@ const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* s

 #else

+/**
+ * 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)
 {
    FF_UNUSED(file, cb, userdata, minLength);
@@ -0,0 +1,66 @@
+#include "common/binary.h"
+#include "common/io.h"
+#include "common/stringUtils.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 hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL);
+    if (!hMap)
+        return "CreateFileMappingW() failed";
+
+    void* base = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0);
+    if (!base)
+        return "MapViewOfFile() failed";
+
+    PIMAGE_NT_HEADERS ntHeaders = RtlImageNtHeader(base);
+    if (!ntHeaders)
+    {
+        UnmapViewOfFile(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) strlen(p);
+                if (len < minLength) continue;
+                // Only process printable ASCII characters
+                if (*p >= ' ' && *p <= '~') // Ignore control characters
+                {
+                    if (!cb(p, len, userdata)) break;
+                }
+                off += len;
+            }
+        }
+    }
+
+    UnmapViewOfFile(base);
+    return NULL;
+}
@@ -0,0 +1,257 @@
+#include "common/commandoption.h"
+#include "common/color.h"
+#include "common/printing.h"
+#include "common/time.h"
+#include "common/jsonconfig.h"
+#include "common/stringUtils.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])
+        {
+            case 'C': case 'c':
+                FF_IF_MODULE_MATCH(FF_CPUUSAGE_MODULE_NAME)
+                    ffPrepareCPUUsage();
+                break;
+
+            case 'D': case 'd':
+                FF_IF_MODULE_MATCH(FF_DISKIO_MODULE_NAME)
+                {
+                    __attribute__((__cleanup__(ffDestroyDiskIOOptions))) FFDiskIOOptions options;
+                    ffInitDiskIOOptions(&options);
+                    ffPrepareDiskIO(&options);
+                }
+                break;
+
+            case 'N': case 'n':
+                FF_IF_MODULE_MATCH(FF_NETIO_MODULE_NAME)
+                {
+                    __attribute__((__cleanup__(ffDestroyNetIOOptions))) FFNetIOOptions options;
+                    ffInitNetIOOptions(&options);
+                    ffPrepareNetIO(&options);
+                }
+                break;
+
+            case 'P': case 'p':
+                FF_IF_MODULE_MATCH(FF_PUBLICIP_MODULE_NAME)
+                {
+                    __attribute__((__cleanup__(ffDestroyPublicIpOptions))) FFPublicIPOptions options;
+                    ffInitPublicIpOptions(&options);
+                    ffPreparePublicIp(&options);
+                }
+                break;
+
+            case 'W': case 'w':
+                FF_IF_MODULE_MATCH(FF_WEATHER_MODULE_NAME)
+                {
+                    __attribute__((__cleanup__(ffDestroyWeatherOptions))) FFWeatherOptions options;
+                    ffInitWeatherOptions(&options);
+                    ffPrepareWeather(&options);
+                }
+                break;
+        }
+
+        #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 void 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 (__builtin_expect(data->resultDoc != NULL, false))
+                    fn(data, baseInfo, optionBuf);
+                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)
+{
+    //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, str); // Save; Up 1; Right 9999999; Left <len>; 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);
+    }
+}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`fastfetch_2.33.0_source.buildinfo universe/utils optional`