Merge pull request #1374 from fastfetch-cli/dev

Release: v2.29.0
CMake (OpenBSD): enable bluetooth detection
2026-09-12 10:22:12 +02:00 · 2024-11-04 15:02:18 +08:00 · 2024-11-04 14:47:38 +08:00 · 2024-11-04 14:28:16 +08:00 · 2024-11-04 21:59:41 +08:00 · 2024-11-04 13:30:50 +08:00
835 changed files with 19642 additions and 7325 deletions
@@ -2,4 +2,4 @@
 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,sur,doas
+ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,slave,sur,doas,conexant,ags
@@ -7,10 +7,10 @@ tab_width = 4
 insert_final_newline = true
 trim_trailing_whitespace = true

-[*.{md,fflogo}]
+[*.md]
 trim_trailing_whitespace = false

-[*.{fflogo}]
+[*.txt]
 insert_final_newline = false

 [*.yml]
@@ -1 +0,0 @@
-github: [LinusDierheimer, CarterLi]
@@ -15,6 +15,9 @@ Paste content of /etc/os-release and /etc/lsb-release here. If none of these fil
 ```

 # 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,21 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - keepalive
+
+# Label to use when marking an issue as stale
+staleLabel: stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
@@ -35,7 +35,7 @@ jobs:
        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_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_LIBNM=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=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_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

      - name: build project
        run: cmake --build . --target package --verbose -j4
@@ -44,7 +44,7 @@ jobs:
        run: ./fastfetch --list-features

      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false

      - name: run fastfetch --format json
        run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -74,7 +74,7 @@ jobs:
        run: uname -a

      - 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 libnm-dev libpulse-dev libdrm-dev directx-headers-dev
+        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

      - name: install linuxbrew packages
        run: |
@@ -87,7 +87,7 @@ jobs:
          languages: c

      - name: configure project
-        run: PKG_CONFIG_PATH=/home/linuxbrew/.linuxbrew/lib/pkgconfig:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
+        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 .

      - name: build project
        run: cmake --build . --target package --verbose -j4
@@ -99,7 +99,7 @@ jobs:
        run: ./fastfetch --list-features

      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false

      - name: run fastfetch --format json
        run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -138,15 +138,15 @@ jobs:
        id: runcmd
        with:
          arch: aarch64
-          distro: ubuntu22.04
+          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 libnm-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev directx-headers-dev rpm
+            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
+            time ./fastfetch -c presets/ci.jsonc --stat false
            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
@@ -181,11 +181,11 @@ jobs:
            # 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 libnm-dev libpulse-dev libdrm-dev directx-headers-dev rpm
+            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 .
            cmake --build . --target package --verbose -j4
            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
@@ -216,11 +216,11 @@ jobs:
          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 libnm-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev directx-headers-dev rpm
+            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 .
            cmake --build . --target package --verbose -j4
            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
@@ -247,19 +247,19 @@ jobs:
        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 gcc g++
+          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++
        shell: alpine.sh --root {0}

      - name: build
        run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -GNinja .
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -DENABLE_EMBEDDED_PCIIDS=On -GNinja .
            cmake --build . --target package --verbose -j4
        shell: alpine.sh {0}

      - name: run
        run: |
            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
+            time ./fastfetch -c presets/ci.jsonc --stat false
            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
@@ -272,47 +272,6 @@ jobs:
          name: fastfetch-musl-amd64
          path: ./fastfetch-*.*

-  musl-aarch64:
-    name: Musl-aarch64
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: setup alpine linux
-        uses: jirutka/setup-alpine@master
-        with:
-          branch: v3.19
-          arch: aarch64
-
-      - 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 gcc g++
-        shell: alpine.sh --root {0}
-
-      - name: build
-        run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -GNinja .
-            cmake --build . --target package --verbose -j4
-        shell: alpine.sh {0}
-
-      - name: run
-        run: |
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest
-        shell: alpine.sh {0}
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-musl-aarch64
-          path: ./fastfetch-*.*
-
  macos-universal:
    name: macOS-universal
    runs-on: macos-12
@@ -348,7 +307,7 @@ jobs:
        run: ./fastfetch --list-features

      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false

      - name: run fastfetch --format json
        run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -375,7 +334,6 @@ jobs:
      - name: checkout repository
        uses: actions/checkout@v4

-      - uses: actions/checkout@v4
      - name: run VM
        uses: vmactions/omnios-vm@v1
        with:
@@ -389,8 +347,8 @@ jobs:
            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
            cmake --build . --target package --verbose -j4
            ./fastfetch --list-features
-            time ./fastfetch
-            time ./fastfetch --format json
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
            ctest
@@ -417,18 +375,18 @@ jobs:
        with:
          operating_system: freebsd
          architecture: x86-64
-          cpu_count: 3
+          cpu_count: 4
          shell: bash
-          version: '13.2'
+          version: '14.1'
          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 ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd v4l_compat
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+            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 .
            cmake --build . --target package --verbose -j4
            ./fastfetch --list-features
-            time ./fastfetch
-            time ./fastfetch --format json
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
            ctest
@@ -439,8 +397,43 @@ jobs:
          name: fastfetch-freebsd-amd64
          path: ./fastfetch-*.*

-  freebsd-aarch64:
-    name: FreeBSD-aarch64
+  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
    permissions:
      security-events: write
@@ -452,20 +445,19 @@ jobs:
      - name: run VM
        uses: cross-platform-actions/action@master
        with:
-          operating_system: freebsd
-          architecture: arm64
-          cpu_count: 3
+          operating_system: openbsd
+          architecture: x86-64
+          cpu_count: 4
          shell: bash
-          version: '13.2'
+          version: '7.5'
          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 ImageMagick6 ImageMagick7 chafa egl libosmesa opencl ocl-icd v4l_compat
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+            sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa pulseaudio py3-requests
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=ON .
            cmake --build . --target package --verbose -j4
            ./fastfetch --list-features
-            time ./fastfetch
-            time ./fastfetch --format json
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
            time ./flashfetch
            ldd fastfetch
            ctest
@@ -473,7 +465,43 @@ jobs:
      - name: upload artifacts
        uses: actions/upload-artifact@v4
        with:
-          name: fastfetch-freebsd-aarch64
+          name: fastfetch-openbsd-amd64
+          path: ./fastfetch-*.*
+
+  netbsd-amd64:
+    name: NetBSD-amd64
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      contents: read
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - name: run VM
+        uses: cross-platform-actions/action@master
+        with:
+          operating_system: netbsd
+          architecture: x86-64
+          cpu_count: 4
+          shell: bash
+          version: '10.0'
+          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 .
+            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-netbsd-amd64
          path: ./fastfetch-*.*

  windows-amd64:
@@ -494,7 +522,7 @@ jobs:
        with:
          msystem: CLANG64
          update: true
-          install: git mingw-w64-clang-x86_64-7zip mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-vulkan-headers mingw-w64-clang-x86_64-opencl-icd mingw-w64-clang-x86_64-opencl-headers mingw-w64-clang-x86_64-cppwinrt
+          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

      - name: print msys version
        run: uname -a
@@ -515,7 +543,7 @@ jobs:
        run: ./fastfetch --list-features

      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
+        run: time ./fastfetch -c presets/ci.jsonc --stat false

      - name: run fastfetch --format json
        run: time ./fastfetch -c presets/ci.jsonc --format json
@@ -541,76 +569,6 @@ jobs:
          name: fastfetch-windows-amd64
          path: ./fastfetch-windows-amd64.*

-  windows-i686:
-    name: Windows-i686
-    runs-on: windows-latest
-    permissions:
-      security-events: write
-      contents: read
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v4
-
-      - name: setup-msys2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: CLANG32
-          update: true
-          install: git p7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-vulkan-headers mingw-w64-clang-i686-opencl-icd mingw-w64-clang-i686-opencl-headers
-
-      - name: print msys version
-        run: uname -a
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: c, cpp
-
-      - name: configure project
-        run: env PKG_CONFIG_PATH=/clang32/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-
-      - name: build project
-        run: cmake --build . --verbose -j4
-
-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v3
-
-      - name: copy necessary dlls
-        run: cp /clang32/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_x86.dll
-
-      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc
-
-      - 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
-
-      - name: create zip archive
-        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-i686.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
-
-      - name: create 7z archive
-        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-i686.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-windows-i686
-          path: ./fastfetch-windows-i686.*
-
  release:
    if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'fastfetch-cli/fastfetch'
    name: Release
@@ -621,13 +579,13 @@ jobs:
      - linux-armv7
      - linux-riscv64
      - musl-amd64
-      - musl-aarch64
      - macos-universal
      - freebsd-amd64
-      - freebsd-aarch64
+      - openbsd-amd64
+      - netbsd-amd64
+      - dragonfly-amd64
      - sunos-amd64
      - windows-amd64
-      - windows-i686
    permissions:
      contents: write
    steps:
@@ -9,3 +9,4 @@ tags
 fastfetch.kdev4
 *.user
 *.user.*
+*.swp
@@ -1,3 +1,493 @@
+# 2.29.0
+
+Changes:
+* Due to [the upstream removal of MSYS2 CLANG32 environment](https://www.msys2.org/news/#2024-09-23-starting-to-drop-the-clang32-environment), we dropped fastfetch-windows-i686 support. v2.27.1 was the last version supporting it.
+    * Note: fastfetch built with MSVCRT has known bug that DateTime module doesn't work because of its bad support of [strftime](https://en.cppreference.com/w/c/chrono/strftime). Don't use it.
+
+Features:
+* Port to NetBSD and DragonFly BSD
+    * Fastfetch now supports all major BSD variants
+* Support DiskIO, NetIO, GPU and Users module on OpenBSD
+* Report SD8E SOC name (CPU, Android)
+* On Windows, try loading dlls from current exe path (Windows)
+    * Fix Media module when installed with winget
+
+Bugfixes:
+* Fix the VIM version detection on Ubuntu (Editor, Linux)
+* Improve performance of OS version detection on Proxmox (#1370, OS, Linux)
+
+Logo:
+* Update OpenSuse Tumbleweed
+* Add XCP-ng
+* Add SummitOS
+* Add Lilidog
+* Update PikaOS
+* Update OpenSUSE Leap
+* Update aperture
+
+# 2.28.0
+
+Features:
+* Add new module `Mouse` and `Keyboard` which display connected mice and keyboards
+* Support remaining time detection (Battery)
+* Report if AC is connected (Battery, Linux)
+* Report platform API used for display detection for debugging (Display)
+* Report Wine version when running in Wine (Kernel, Windows)
+* Add option `waitTime` in modules `CPUUsage`, `DiskIO` and `NetIO`
+
+Bugfixes:
+* Fix used memory size detection (Memory, OpenBSD)
+* Don't report invalid fragmentation percentage when fails to detect it (Zpool)
+* Fix unexpected errors when running fastfetch in parallel (#1346, Windows)
+* Don't report obviously invalid temperature values (PhysicalDisk, Linux)
+
+Logos:
+* Add eweOS
+* Add MidOS
+* Update XeroArch
+
+# 2.27.1
+
+Bugfixes:
+* Fix invalid display name detection on GNOME, wayland (Display, Linux)
+
+# 2.27.0
+
+Changes:
+* We now print `"` instead of `″` when displaying diagonal length in inches, so that the character can be correctly displayed in Linux console (Display)
+* All detection code of `monitor` module is merged into `display` module. Now `monitor` just prints the same information as `display` with different format. Notably:
+    * The resolution reported by `monitor` module is now current resolution instead of native / maximum resolution. PPI is calculated based on current resolution too.
+    * The refresh rate reported by `monitor` module is the current refresh rate.
+
+Features:
+* Add basic, highly experimental support of OpenBSD (OpenBSD)
+* Improve support for Raspberry pi (CPU / GPU, Linux)
+* Detect SOC name, instead of displaying components used in the SOC, if available (CPU, Linux)
+* Add option `--brightness-compact` to display multiple brightness values in one line (Brightness)
+* Add `day-pretty` (#1305, DateTime)
+* Support network interface adapter flag detection (#1315, LocalIP)
+    * Enable it with `--localip-show-flags`
+
+Bugfixes:
+* Remove trailing newline in GPU name for Raspberry pi (#1303, GPU, Linux)
+* Fix a possible buffer overflow (GPU, Linux)
+* Fix CPU temp incorrectly reported as 0 celsius (#1308, CPU, Linux)
+* Correctly report `TPM device is not found` error (#1314, TPM, Windows)
+* Fix errors when triggering shell completion with python3 uninstalled (#1310)
+    * To package managers: as shell completion scripts of fastfetch use python3, it should be added as an optional dependency of fastfetch
+* Fix possible crashes when detecting term font of kitty (#1321, TerminalFont, Linux)
+
+Logos:
+* Add XeroArch
+* Add ValhallaOS
+
+# 2.26.1
+
+Features:
+* Allow to disable pacstall packager detection in CMake
+
+Bugfixes:
+* Fix uninitialized variables (GPU, Windows)
+
+# 2.26.0
+
+Changes:
+* To be consistent to other platforms, CPU frequency detection on Linux no longer checks `bios_limit`
+
+Features:
+* Detect GPU index (#1267, GPU)
+* Count Flatpak runtime packages (#1085, Packages, Linux)
+* Support pacstall package manager (Packages, Linux)
+* Support CU core count, max frequency, VMEM usage detection for AMD cards on Linux (GPU, Linux)
+    * Requires `--gpu-driver-specific`
+* Support EU core count, VMEM size detection Intel cards on Linux (GPU, Linux)
+    * Requires `--gpu-driver-specific`. VMEM usage detection requires root permissions.
+* Add new module `TPM` to print TPM (Trusted Platform Module) version if available (TPM)
+* Support GPU driver version detection (GPU, macOS)
+* Add new CMake option `-DENABLE_EMBEDDED_PCIIDS=ON`.
+    * If enabled, fastfetch will download the newest [`pci.ids`](https://pci-ids.ucw.cz/) file, [transform it into C code](https://github.com/fastfetch-cli/fastfetch/blob/dev/scripts/gen-pciids.py) and compile it into fastfetch binaries.
+
+Bugfixes:
+* Fix font size detecton of foot terminal (#1276, TerminalFont, Linux)
+* Ignore `su` and `sudo` when detecting terminal (#1283, Terminal, Linux)
+* Always print inches in integer (Display)
+* Fix Wifi connection protocol detection on macOS Sequoia (Wifi, macOS)
+* Fix hanging when font name is long when detecting kitty term font (#1289, TerminalFont)
+* Detect all enabled or connected connectors (#1301, Display, Linux)
+
+Logos:
+* Add FoxOS
+* Add GXDE OS
+
+# 2.25.0
+
+Features:
+* Moore Threads GPU add support to query number of cores (#1259, GPU)
+* Cache detection result based on last modification time (Packages)
+* Add cmake options to disable certain package managers at compile time
+    * Package managers are encouraged to disable some package managers by passing `-DPACKAGES_DISABLE_` when running `cmake`. For example, when building for Arch Linux, `-DPACKAGES_DISABLE_APK=ON -DPACKAGES_DISABLE_DPKG=ON -DPACKAGES_DISABLE_RPM=ON ...` should be specified.
+    * See all available options by [running `cmake -L | grep PACKAGES_DISABLE_`](https://github.com/fastfetch-cli/fastfetch/blob/dev/CMakeLists.txt#L91)
+    * This option does NOT remove the detection code. It just disables the detection at runtime. One can still use `--packages-disabled ""` to enable all package managers.
+* Add new option `--show-localip-{speed,mtu}` (LocalIP)
+* Add new module `Btrfs`, which prints all mounted Btrfs volumes, like `Zpool` module (#1262, Linux)
+* Improve Wifi module support for macOS Sequoia (Wifi, macOS)
+    * Currently it uses `system_profiler` which costs about 2 seconds on my MBP. I suggest disabling it for now until a better solution is found.
+
+Bugfixes:
+* Fix invalid CPU temperature detection on FreeBSD (#1260, CPU, FreeBSD)
+* Remove `showPeCoreCount` support on FreeBSD (#1260, CPU, FreeBSD)
+* Don't use Wifi speed as Ethernet speed (LocalIP, FreeBSD)
+* Fix compiling with old linux headers (Camera, Linux)
+* Fix detecting public ipv6 address (PublicIP, Windows)
+
+Logo:
+* Fix parrot logo detection
+* Rename TorizonCore to Torizon OS
+
+# 2.24.0
+
+Changes:
+* Support of `--lib-XXX` is removed
+    * If fastfetch fails to load some `.so` `.dylib` libraries, `LD_LIBRARY_PATH` should be used.
+
+Features:
+* Support sixel image protocol on Windows (Logo, Windows)
+    * Requires imagemagick7 to be installed. MSYS2 is recommended.
+* Improve terminal query on Windows (Windows)
+    * TerminalSize, TerminalTheme
+* Detect more ARM microarchitectures and SOC names (CPU, Linux)
+* Detect the number of online cores (CPU, FreeBSD)
+* Support board name detection for Asahi Linux (Board, Linux)
+* Add new option `--command-param` to customize the parameters when running shell
+* Support syntax of sub string in `--<module>-format`: `{variable~startIndex,endIndex}`
+    * See `fastfetch -h format` for detail
+
+Bugfixes:
+* Fix tests building when system yyjson is used (#1244)
+* Fix dinit detection; support dinit version detection (#1245, InitSystem, Linux)
+* Fix signal quality, refresh rate and maybe others in custom format (#1241)
+* Fix boot time calculation (#1249, Uptime, Linux)
+* Fix custom format for boolean values
+    * `{?false-value}This should not print{?}{?true-value}This should print{?}` will print `This should print`
+* Fix possible hanging when running fastfetch in screen 5.0 (TerminalTheme, macOS)
+
+Logos:
+* Add Lliurex
+
+# 2.23.0
+
+Features:
+* Support unity version detection (DE, Linux)
+* Print model name in Battery keys if available (Battery)
+* Add module `Zpool`
+* Improve performance (Shell / Terminal, Linux)
+* Support syntax of padded strings in `--<module>-format`. `{variable<padlength}` and `{variable>padlength}` are supported.
+    * If pad length is greater than the length of the variable, the variable will be padded with spaces.
+        * `fastfetch -l none -s command --command-text 'echo 12345' --command-format 'output({1<20})'` prints `Command: output(12345               )`
+        * `fastfetch -l none -s command --command-text 'echo 12345' --command-format 'output({1>20})'` prints `Command: output(               12345)`
+    * If pad length is less than the length of the variable, the variable will be truncated.
+
+Bugfixes:
+* Fix broken `--list-presets`
+* Update zsh completion script
+* Don't print `*` if `defaultRouteOnly` is set (NetIO)
+* Fix Camera module incorrectly disabled on FreeBSD (Camera, FreeBSD)
+* Fix hanging on screen 5.0 (Terminal)
+* Improve image logo support on Windows (Logo, Windows)
+
+Logos:
+* Update AmogOS
+* Add Magix
+* Make ubuntu logo colorable
+* Add Steam Deck Logo
+* add Huawei Cloud EulerOS
+
+# 2.22.0
+
+Features:
+* Small performance improvements (Terminal, Editor)
+* Improve arm32 and loongarch support (CPU, Linux)
+* Ignore the parent process if env `$FFTS_IGNORE_PARENT` is set to `1` (Shell)
+* Add code name of Apple M4 (CPU, Linux)
+* Add ethernet speed rate detection support (LocalIP)
+* Add zsh completion script
+* Add Linglong package manager detection support (Packages, Linux)
+
+Bugfixes:
+* Fix building on macOS 10.14
+* Fix tmux in linux TTY (Colors)
+* Fix hang in WSL when custom format is used (Disk, Linux)
+* Fix `/proc/loadavg` parsing (Loadavg, Linux)
+* Disable use of `LC_NUMERIC` locale settings to fix parsing of decimal numbers
+* Fix possible segfault (DiskIO, Linux)
+* Honor `preciseRefreshRate` in custom format (Display)
+
+Logos:
+* Add Lingmo OS
+* Add Sleeper OS
+
+# 2.21.3
+
+Bugfixes:
+* Fix bad Intel Arc GPU name detection, which was supposed to be fixed in the last version but the change was reverted accidentally (#1177, GPU, Linux)
+* Fix arm32 CPU name detection no longer work. Regression of 2.21.2 (CPU, Linux)
+
+# 2.21.2
+
+Features:
+* Support `--stat <num_in_ms>` to display long running modules in yellow or red
+
+Bugfixes:
+* Fix bad Intel Arc GPU name and type detection (GPU, Linux)
+* Fix uninited struct fields (GPU, Linux)
+* Skip cpu model smbios detection on ARM platforms (CPU, Linux)
+* Always use `CurrentControlSet` instead of `ControlSet001` when querying registry (Windows)
+* Fix NVIDIA GPUs are missing in GPU detection sometimes (GPU, Windows)
+* Fixing detection of `pthread_timedjoin_np` (Linux)
+
+Logos:
+* Add HyprOS
+* Add GoldenDog Linux
+
+# 2.21.1
+
+Hotfix for a regression that breaks WM detection when running `startx` from TTY (Regression from 2.21.0, #1172 / #1162)
+
+Changes:
+* On Linux, FreeBSD and SunOS, a new recommended dependency `libelf` is introduced to extract strings in ELF binary, used for
+    * st term font detection when the term font is compiled directly into the binary
+    * fast path of systemd version detection
+
+Features:
+* Improve performance of
+    * kitty version detection (Terminal, Linux)
+    * st term font detection (TerminalFont, Linux)
+    * systemd version detection (InitSystem, Linux)
+
+Bugfixes:
+* Fix building error without `linux/wireless.h` (Wifi, Linux)
+* Fix wrong GPU max frequency on Asahi Linux (GPU, Linux)
+* Don't rely `$XDG_SESSION_TYPE` for detecting wm protocol (#1172 / #1162, WM, Linux)
+* Fix light color doesn't work on Linux console (Colors, Linux)
+* `LC_ALL`, if set, overrides every other locale-related environment variable (Locale)
+* Increase timeout of DBus calls (Linux)
+
+Logos:
+* Add vanilla_small and vanilla2
+* Add LFS (Linux From Scratch)
+
+# 2.21.0
+
+Changes:
+* We no longer use `libnm` for Wifi detection on Linux. Instead, we use `libdbus` to communicate with NetworkManager directly
+    * To package managers: libnm dependency should be removed
+
+Features:
+* Add module `BluetoothRadio` that prints bluetooth radios installed on the system
+    * Don't confuse with module `Bluetooth` which lists connected bluetooth devices
+* Detect more information when `--gpu-driver-specific` is used (GPU)
+* Detect which type of nvidia driver (open source or proprietary) is used (GPU, Linux)
+* `--gpu-driver-specific` adds supports for Moore Threads GPU (#1142, GPU, Linux / Windows)
+* Use SetupAPI for detecting GPUs to support GPU detection when running fastfetch as a Windows Service (GPU, Windows)
+    * See https://github.com/gpustack/gpustack/pull/97#issuecomment-2264699787 for detail
+* Detect playback status (Media, Linux)
+
+Bugfixes:
+* Don't try to connect display server in tty mode (Linux, #1110)
+* Improve ssh detection
+* Fix max frequency printing in custom format (CPU)
+* Fix displaying random characters when detecting kitty term font (#1136 / #1145, TerminalFont, Linux)
+* Make sure to detect all physical memory devices (#1137)
+* Don't detect `wl-restart` as WM (#1135, WM, Linux)
+* Use PCI bus ID to match Nvidia cards; fix multi-GPU detection (GPU)
+* Ignore invalid GPU (#1066, GPU, macOS)
+* Print error when invalid color code is found (#1138)
+* Fix invalid refresh rate detection on old macOS versions (Display, macOS)
+* Fix disk size detection on 32-bit systems (Disk, BSD)
+* Don't ignore disabled GPUs (#1140, GPU, Linux)
+* Fix GPU type detection on FreeBSD (GPU, FreeBSD)
+* Remove shell version detection for unknown shells (#1144, Shell)
+* Don't detect hyfetch as shell on NixOS (Shell, NixOS)
+
+Logos:
+* Update EndeavourOS_small
+* Add QTS
+
+# 2.20.0
+
+This release fixes regression of `2.19.0` on M1 MacBook Air. It also introduces a new option `--key-type icon` to display predefined icons in keys (requires newest nerd font). See `fastfetch -h key-type` for detail.
+
+Changes:
+* JSON option `display.keyWidth` has been renamed to `display.key.width`
+    * Previously: `{ "display": { "keyWidth": 3 } }`
+    * Now: `{ "display": { "key": { "width": 3 } } }`
+* Windows Terminal font detection **in WSL** has been removed due to [issue #1113](https://github.com/fastfetch-cli/fastfetch/issues/1113)
+
+Features:
+* Add option `display.key.type: <enum>` to print icons in keys
+    * Supported value `string`, `icon` and `both`. Default to `string` (don't display icons)
+    * Example: `{ "display": { "key": { "type": "icon" } } }`
+* Add option `display.key.paddingLeft: <num>` to print left padding (whitespaces) in keys
+    * Example: `{ "display": { "key": { "paddingLeft": 2 } } }`
+* Add option `modules.keyIcon` to set icon for specified module
+    * Example: `{ "modules": { "type": "command", "keyIcon": "🔑" } }`
+* Report system mono font name for Terminator if used (TerminalFont, Linux)
+* Don't require logo height to be set when using `--logo-position right`
+* Report Snapdragon SOC marketing name for newer Android phones (CPU, Android)
+* Detect MTK SOC part name (CPU, Android)
+
+Bugfixes:
+* Don't wake up suspended GPUs when using `--ds-force-drm` (Display, Linux)
+* Fix printing editor type in JSON result (Editor)
+* Fix `--logo-padding-*` not working correctly (#1121, Logo)
+* Fix possible segfault when detecting GPU frequency (#1121, macOS, GPU)
+
+# 2.19.1
+
+Bugfixes
+* Fix frequency value printing when using custom format (#1111, CPU / GPU)
+* Fix display detection for XiaoMi Android phone (Display, Android)
+
+Features:
+* Display if HDR mode is enabled for screens (Display)
+    * Supported in Windows and Linux (KDE) correctly
+
+# 2.19.0
+
+Changes:
+* JSON option `modules.cpu.freqNdigits` has been renamed and moved to `display.freq.ndigits`
+    * Previously: `{ "modules": { "type": "cpu", "freqNdigits": 2 } }`
+    * Now: `{ "display": { "freq": { "ndigits": 2 } } }`
+    * This option now affects GPU frequency too
+    * By default, frequencies are displayed in *GHz*. Set `display.freq.ndigits` to `-1` to display them in *MHz*
+* JSON option `display.binaryPrefix` has been moved to `display.size.binaryPrefix`
+    * Previously: `{ "display": { "binaryPrefix": "IEC" } }`
+    * Now: `{ "display": { "size": { "binaryPrefix": "IEC" } } }`
+
+Features:
+* Print physical diagonal length if supported (Display)
+* Detect display type in X11 mode (Display)
+* Assume displays connected via DisplayPort are external monitors (Display, Linux)
+* Support GPU frequency detection for Intel XE driver (GPU, Linux)
+* Detect init system on Android (InitSystem, Android)
+* Use background to display color blocks (Colors)
+    * To fix weird vertical black lines in some terminals and match the behavior of neofetch (#1094)
+    * Can be reverted to old behavior with `--colors-symbol block`
+* Support Zed terminal version detection (Terminal)
+* Improve wezterm font detection (TerminalFont)
+* Add option `--separator-length`
+* Support GPU frequency detection for Apple Silicon (GPU, macOS)
+* Detect maximum refresh rate (#1101, Monitor)
+* Detect if HDR mode is supported and enabled (Windows, Display / Monitor)
+* Support physical monitor info detection for FreeBSD and SunOS (Monitor)
+* Support defining constant strings in JSON config file, which can be used to dedupe formattion strings
+```jsonc
+{
+    "display": {
+        "constants": [
+            "Hello", // {$1}
+            "world"  // {$2}
+        ]
+    },
+    "modules": [
+        {
+            "type": "custom",
+            "format": "{$1} {$2}!" // print "Hello world!"
+        },
+        {
+            "type": "custom",
+            "format": "{$2} {$1}" // print "world Hello"
+        }
+    ]
+}
+```
+
+Bugfixes:
+* Fix some presets
+* Better detection for XTerm terminal fonts (#1095, TerminalFont, Linux)
+* Remove debug output (#1097, Windows)
+* Fix command line option `--gpu-hide-type` doesn't work (#1098, GPU)
+* Fix wrong date on Raspbian 10 (#1108, DateTime, Linux)
+* Use `brightness` instead of `actuall_brightness` when detecting current brightness level (Brightness, Linux)
+    * Ref: https://bugzilla.kernel.org/show_bug.cgi?id=203905
+* Fix buffer overflow with long font family names when detecting kitty term font (TerminalFont)
+* Fix some typos
+
+Logos:
+* Update void_small
+* Add ALT Linux
+
+# 2.18.1
+
+Fix a regression introduced in v2.18.0
+
+Changes:
+* `--ts-version` has been renamed to `--detect-version`
+    * `general.detectVersion` in JSON config file
+
+Bugfixes:
+* Fix and improve GPU driver detection (#1084, GPU, Linux)
+
+# 2.18.0
+
+Changes:
+* `yyjson 0.10.0` is required
+* Fastfetch no longer prints `*` (which means it's the default route) if `defaultRouteOnly` is set (LocalIP)
+
+Bugfixes:
+* Fix some memory leaks
+* Fix compatibility with old Python versions
+* Don't detect frequency for AMD cards (GPU, Linux)
+    * Fix possible hang with discrete AMD cards (#1077)
+* Don't print colors in `--pipe` mode (Separator)
+* Don't print `(null)` in property `locator` (PhysicalMemory)
+* Ignore disabled PCI devices (GPU)
+* Fix flag `--opengl-library` doesn't work (OpenGL)
+
+Features:
+* Detect revision of USB drives (#1048, Disk)
+* Support fractional scale factor detection (Display, Linux)
+* Support primary display detection for KDE and GNOME (Display, Linux)
+* Support percent bar in custom formatting
+* Print signal quality by default (Wifi)
+* Detect used OpenGL library version (OpenGL)
+* Support detecting OpenGL version by `EGL` (ANGLE) on Windows (OpenGL)
+
+Logos:
+* Add Arkane Linux
+* Add Opak
+
+# 2.17.2
+
+Changes:
+* Flatpak package count no longer takes runtime packages into account (Packages, Linux)
+
+Bugfixes:
+* Fix formattion with multiple batteries (Battery)
+* Fix incorrect size value for large memory sticks (PhysicalMemory)
+* Fix spelling of `Qt` and `LXQt`
+* Fix building on SunOS if imagemagick support is enabled (Logo, SunOS)
+* Fix typos
+
+Features:
+* Support Ptyxis terminal version and font detection (Terminal / TerminalFont, Linux)
+* Improve Cinnamon version detection (DE)
+* Support `cinnamon-wayland` (WMTheme)
+* `--ts-version false` will disable editor version detection (Editor)
+
+# 2.17.1
+
+Hotfix for a regression that breaks Qt font detection
+
+Bugfixes:
+* Don't generate and install `libffwinrt.dll.a` on MinGW (Windows)
+* Fix building on Windows when imagemagick support is enabled (Logo, Windows)
+* Don't print GPU frequency with `--gpu-temp` for Nvidia cards (#1052, GPU)
+    * `--gpu-driver-specific` needs to be specified
+* Print formatted size when `--gpu-format` is used (#1052, GPU)
+* Ignore QVariant format; fix unreadable Qt font (#1053, Theme, Linux)
+* Fix segfaults with `--show-errors` and an invalid module (#1055)
+
 # 2.17.0

 Changes:
@@ -1048,7 +1538,7 @@ Bugfixes:
 This release backports some changes from dev branch, and fixes 2 crashing issues

 Features:
-* Support KDE / LXQT / MATE / Cinnamon wallpaper detection (Wallpaper, Linux)
+* Support KDE / LXQt / MATE / Cinnamon wallpaper detection (Wallpaper, Linux)
 * Support QTerminal version & terminal font detection
 * Support MATE Terminal version & terminal font detection
 * Set `--pipe true` automatically if stdout is not a tty
@@ -1094,7 +1584,7 @@ Bugfixes:
 * Fix Windows drives detection in WSL (Disk)

 Changes:
-* In order to make Icons module consistent between different platforms, `--icons-format` no longer supports individual GTK / QT icon params.
+* In order to make Icons module consistent between different platforms, `--icons-format` no longer supports individual GTK / Qt icon params.
 * `--theme-format` no longer supports individual GTK / plasma theme params.
 * `--local-ip-*` and `--public-ip-*` have been changed to `--localip-*` and `--publicip-*`
 * `--localip-compact-type` is no longer supported. Fastfetch now display IPs as `--localip-compat-type multiline` by default, with `--local-compact true` can be set as an alias of `--localip-compact-type oneline`
@@ -1468,7 +1958,7 @@ Fixes build on android (#205)
 # 1.6.0

 Features:
-* Detect QT on more DEs than just KDE Plasma. The [Plasma] category was therefore renamed to [QT]
+* Detect Qt on more DEs than just KDE Plasma. The [Plasma] category was therefore renamed to [Qt]
 * Alacritty font detection
 * Load `/etc/fastfetch/config.conf` before user config
 * Disk: print one decimal point if size < 100GB
@@ -1,6 +1,7 @@
 MIT License

-Copyright (c) 2021 Linus Dierheimer
+Copyright (c) 2021-2023 Linus Dierheimer
+Copyright (c) 2022-2024 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
@@ -11,7 +11,7 @@
 [![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)

-Fastfetch is a [neofetch](https://github.com/dylanaraps/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, SunOS and Windows 7+ are supported.
+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.

 <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,26 +21,32 @@ 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" />

-There are [screenshots on different platforms](https://github.com/fastfetch-cli/fastfetch/wiki)
+There are [screenshots on different platforms](https://github.com/fastfetch-cli/fastfetch/wiki).

 ## Installation

 ### Linux

-Some distros packaged an outdated fastfetch version. Older version is not supported, please always ensure that the latest version is used.
+Some distros package an outdated fastfetch version. Older versions receive no support, so please try always to use the latest version.

 * Ubuntu: [`ppa:zhangsongcui3371/fastfetch`](https://launchpad.net/~zhangsongcui3371/+archive/ubuntu/fastfetch) (for Ubuntu 22.04 or newer)
-* Debian: `sudo apt install fastfetch` (for Debian 13 or newer)
+* Debian: `apt install fastfetch` (for Debian 13 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: `sudo pacman -S fastfetch`
-* Fedora: `sudo dnf install fastfetch`
-* Gentoo: `sudo emerge --ask app-misc/fastfetch`
+* Arch Linux: `pacman -S fastfetch`
+* Fedora: `dnf install fastfetch`
+* Gentoo: `emerge --ask app-misc/fastfetch`
 * Alpine: `apk add --upgrade fastfetch`
 * NixOS: `nix-shell -p fastfetch`
-* openSUSE: `sudo zypper install fastfetch`
-* ALT Linux: `sudo apt-get install fastfetch`
+* openSUSE: `zypper install fastfetch`
+* ALT Linux: `apt-get install fastfetch`
+* Exherbo: `cave resolve --execute app-misc/fastfetch`
+* GNU Guix: `guix install fastfetch`
+* Solus: `eopkg install fastfetch`
+* Slackware: `sbopkg -i fastfetch`
+* Void Linux: `xbps-install fastfetch`
+* Venom Linux: `scratch install fastfetch`

-Replace sudo with doas depending on what you use.
+You may need `sudo`, `doas` or `sup` to run these commands.

 [See also if fastfetch has been packaged for your favorite Linux distro](#Packaging).

@@ -54,10 +60,11 @@ If fastfetch is not packaged for your distro or an outdated version is packaged,
 ### Windows

 * [scoop](https://scoop.sh/#/apps?q=fastfetch): `scoop install fastfetch`
+* [Chocolatey](https://community.chocolatey.org/packages/fastfetch): `choco install fastfetch`
 * [winget](https://github.com/microsoft/winget-pkgs/tree/master/manifests/f/Fastfetch-cli/Fastfetch): `winget install fastfetch`
-* [MSYS2 MinGW](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-fastfetch): `pacman -S mingw-w64-<subsystem>-<arch>-fastfetch`
+* [MSYS2 MinGW](https://packages.msys2.org/base/mingw-w64-fastfetch): `pacman -S mingw-w64-<subsystem>-<arch>-fastfetch`

-You may also download it directly from [GitHub releases page](https://github.com/fastfetch-cli/fastfetch/releases/latest) and extract the archive.
+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

@@ -74,16 +81,16 @@ See 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 you interest: `fastfetch -c all.jsonc`
+* 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`
 * Display help messages: `fastfetch --help`
 * Generate config file based on command line arguments: `fastfetch --arg1 --arg2 --gen-config`

 ## 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>`. They may also serve as a good example for format arguments.
+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.

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


 ## Packaging
@@ -103,10 +110,10 @@ Logos can be heavily customized too; see the [logo documentation](https://github

 1. Fastfetch is actively maintained.
 2. Fastfetch is faster. As the name suggests.
-3. Fastfetch is more feature-rich. By default fastfetch only has a few modules enabled. Use `fastfetch -c all` to find 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 `555MiB` in `Memory` module and `23G` in `Disk` module (notibily the difference of `MiB` and `G`), while fastfetch prints `555.00 MiB` and `22.97 GiB` respectively.
-6. Fastfetch is more accurate. For example, [neofetch never actually supports Wayland protocol](https://github.com/dylanaraps/neofetch/pull/2395).
+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.
+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!

@@ -118,7 +125,7 @@ If you really don't like it, you can disable the `Local IP` module in `config.js

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

-`Fastfetch` don't 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 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).

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

@@ -126,34 +133,40 @@ Fastfetch uses JSON (with comments) for configuration. I suggest you use an IDE

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

+The **correct** way to edit the configuration:
+
+This is an example that [changes size prefix from MiB / GiB to MB / GB](https://github.com/fastfetch-cli/fastfetch/discussions/1014). Editor used: [helix](https://github.com/helix-editor/helix)
+
+[![asciicast](https://asciinema.org/a/1uF6sTPGKrHKI1MVaFcikINSQ.svg)](https://asciinema.org/a/1uF6sTPGKrHKI1MVaFcikINSQ)
+
 ### 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.

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

-Fastfetch uses `format` to generate output. For example to make `GPU` module show GPU name only and ignore other information, 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": "{2}" // See `fastfetch -h gpu-format` for detail
+            "format": "{name}" // See `fastfetch -h gpu-format` for detail
        }
    ]
 }
 ```

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

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

 ### 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.

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

 ```bash
 # install pyfiglet and jq first
@@ -162,6 +175,10 @@ 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?
+
+See troubleshooting section: <https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options#troubleshooting>
+
 ### Q: Fastfetch runs in white and black on shell startup. Why?

 This issue usually happens when using fastfetch with `p10k`. There are known incompatibility between fastfetch and p10k instant prompt.
@@ -169,6 +186,24 @@ The p10k doc clearly states that you should NOT print anything to stdout after `

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

+### Q: Why do fastfetch and neofetch show different memory usage result?
+
+See [#1096](https://github.com/fastfetch-cli/fastfetch/issues/1096).
+
+### Q: Fastfetch shows less 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
+
+### Q: I use Debian / Ubuntu / Debian deserved distro. My GPU is detected as `XXXX Device XXXX (VGA compatible)`. Is it 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`
+
+Alternatively, you may try to use `fastfetch --gpu-driver-specific`, so that `fastfetch` will try to ask the driver for GPU name if supported.
+
+### Q: Fastfetch cannot detect my awesome 3rd-party macOS window manager!
+
+Try `fastfetch --wm-detect-plugin`. See also [#984](https://github.com/fastfetch-cli/fastfetch/issues/984)
+
 ### 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:
@@ -193,6 +228,13 @@ Otherwise, open a feature request in [GitHub Issues](https://github.com/fastfetc
 * 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.

+## Donate
+
+If you find Fastfetch to be useful, please consider donating.
+
+* Current maintainer: [@CarterLi](https://paypal.me/zhangsongcui)
+* Original author: [@LinusDierheimer](https://github.com/sponsors/LinusDierheimer)
+
 ## Star History

 Give it a star to support us!
@@ -83,12 +83,12 @@ __fastfetch_complete_logo_type()

 __fastfetch_complete_binary_prefix()
 {
-    local __ff_binary_prefixes=(
+    local __ff_size_binary_prefixes=(
        "iec"
        "si"
        "jedec"
    )
-    COMPREPLY=($(compgen -W "${__ff_binary_prefixes[*]}" -- "$CURRENT_WORD"))
+    COMPREPLY=($(compgen -W "${__ff_size_binary_prefixes[*]}" -- "$CURRENT_WORD"))
 }

 __fastfetch_complete_gl()
@@ -183,7 +183,10 @@ __fastfetch_completion()
        "--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"
@@ -356,7 +359,6 @@ __fastfetch_completion()
    local FF_OPTIONS_PATH=(
        "-c"
        "--config"
-        "--lib-pci"
        "--lib-vulkan"
        "--lib-wayland"
        "--lib-xcb-randr"
@@ -2,6 +2,11 @@ if not type -q fastfetch
    exit
 end

+command -q python3
+if test $status -ne 0
+    exit
+end
+
 complete -c fastfetch -f

 function __fastfetch_complete_bool
@@ -54,51 +59,48 @@ function __fastfetch_complete_structure
    end
 end

-string match -r -a -g "^###> ?(.*)" < (status -f) | string collect | python3 | source
+echo '
+import json, subprocess, sys

-###> #!/usr/bin/env python3
-###>
-###> 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.get('pseudo', False):
-###>                 continue
-###>
-###>             command_prefix: str = f'complete -c fastfetch -d "{flag["desc"]}" -l "{flag["long"]}"';
-###>             if 'short' in flag:
-###>                 command_prefix += f' -o "{flag["short"]}"'
-###>
-###>             if 'arg' in flag:
-###>                 type: str = flag['arg']['type'];
-###>                 if type == 'bool':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_bool)"')
-###>                 elif type == 'color':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_color)"')
-###>                 elif type == 'command':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_command)"')
-###>                 elif type == 'config':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_config)"')
-###>                 elif type == 'enum':
-###>                     temp: str = ' '.join(flag["arg"]["enum"])
-###>                     print(f'{command_prefix} -x -a "{temp}"')
-###>                 elif type == 'logo':
-###>                     print(f'{command_prefix} -x -a "(__fastfetch_complete_logo)"')
-###>                 elif type == 'structure':
-###>                     print(f'{command_prefix} -x -a "(__fish_complete_list : __fastfetch_complete_structure)"')
-###>                 elif type == 'path':
-###>                     print(f'{command_prefix} -r -F')
-###>                 else:
-###>                     print(f'{command_prefix} -x')
-###>             else:
-###>                 print(f'{command_prefix} -f')
-###>
-###> if __name__ == "__main__":
-###>     try:
-###>         main()
-###>     except:
-###>         sys.exit(1)
-###>
+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.get("pseudo", False):
+                continue
+
+            command_prefix = f"""complete -c fastfetch -d "{flag["desc"]}" -l "{flag["long"]}\""""
+            if "short" in flag:
+                command_prefix += f""" -o {flag["short"]}"""
+
+            if "arg" in flag:
+                type: str = flag["arg"]["type"];
+                if type == "bool":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_bool)\"")
+                elif type == "color":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_color)\"")
+                elif type == "command":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_command)\"")
+                elif type == "config":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_config)\"")
+                elif type == "enum":
+                    temp: str = " ".join(flag["arg"]["enum"])
+                    print(f"{command_prefix} -x -a \"{temp}\"")
+                elif type == "logo":
+                    print(f"{command_prefix} -x -a \"(__fastfetch_complete_logo)\"")
+                elif type == "structure":
+                    print(f"{command_prefix} -x -a \"(__fish_complete_list : __fastfetch_complete_structure)\"")
+                elif type == "path":
+                    print(f"{command_prefix} -r -F")
+                else:
+                    print(f"{command_prefix} -x")
+            else:
+                print(f"{command_prefix} -f")
+
+if __name__ == "__main__":
+    try:
+        main()
+    except:
+        sys.exit(1)
+' | python3 | source
@@ -0,0 +1,113 @@
+#compdef fastfetch
+
+function _fastfetch() {
+
+  whence python3 &> /dev/null
+  if [ $? -ne 0 ]
+  then
+    return
+  fi
+
+  local state
+
+  local -a opts=("${(f)$(
+        python3 <<EOF
+import json
+import subprocess
+import 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):
+                    command_prefix = f"--logo-color-{i}[{flag["desc"]} ({i})]"
+                    print_command(command_prefix, flag)
+                continue
+
+            if flag.get("pseudo", False):
+                continue
+
+            if "short" in flag:
+                command_prefix = f"-{flag["short"]}[{flag["desc"]}]"
+                print_command(command_prefix, flag)
+
+            if "long" in flag:
+                command_prefix = f"--{flag["long"]}[{flag["desc"]}]"
+                print_command(command_prefix, flag)
+
+
+def print_command(command_prefix: str, flag: dict):
+    if "arg" in flag:
+        type: str = flag["arg"]["type"]
+        if type == "bool":
+            print(f"{command_prefix}::bool:(true false)")
+        elif type == "color":
+            print(f"{command_prefix}:color:->colors")
+        elif type == "command":
+            print(f"{command_prefix}::module:->modules")
+        elif type == "config":
+            print(f"{command_prefix}:preset:->presets")
+        elif type == "enum":
+            temp: str = " ".join(flag["arg"]["enum"])
+            print(f'{command_prefix}:type:({temp})')
+        elif type == "logo":
+            print(f"{command_prefix}:logo:->logos")
+        elif type == "structure":
+            print(f"{command_prefix}:structure:->structures")
+        elif type == "path":
+            print(f"{command_prefix}::path:_files")
+        else:
+            print(f"{command_prefix}:")
+    else:
+        print(f"{command_prefix}")
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except Exception:
+        sys.exit(1)
+EOF
+  )}")
+
+  _arguments "$opts[@]"
+
+  case $state in
+    colors)
+      local -a colors=(black red green yellow blue magenta cyan white default)
+      _describe 'color' colors
+      ;;
+    modules)
+      local -a modules=("${(f)$(fastfetch --list-modules autocompletion)}")
+      modules=(${(L)^modules[@]%%:*}-format format color)
+      _describe 'module' modules
+      ;;
+    presets)
+      local -a presets=(
+        "${(f)$(fastfetch --list-presets autocompletion)}"
+        "none:Disable loading config file"
+      )
+      _describe 'preset' presets || _files
+      ;;
+    structures)
+      local -a structures=("${(f)$(fastfetch --list-modules autocompletion)}")
+      _describe 'structure' structures
+      ;;
+    logos)
+      local -a logos=(
+        "${(f)$(fastfetch --list-logos autocompletion)}"
+        "none:Don't print logo"
+        "small:Print small ascii logo if available"
+      )
+      _describe 'logo' logos
+      ;;
+  esac
+}
+
+_fastfetch "$@"
@@ -1,3 +1,129 @@
+fastfetch (2.28.0) jammy; urgency=medium
+
+  * Update to 2.28.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 23 Oct 2024 10:18:59 +0800
+
+fastfetch (2.27.1) jammy; urgency=medium
+
+  * Update to 2.27.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Sun, 06 Oct 2024 12:55:18 +0800
+
+fastfetch (2.26.1ubuntu1) jammy; urgency=medium
+
+  * Update correct code
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 30 Sep 2024 00:21:20 +0800
+
+fastfetch (2.26.1) jammy; urgency=medium
+
+  * Update to 2.26.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Sun, 29 Sep 2024 16:15:31 +0800
+
+fastfetch (2.26.0) jammy; urgency=medium
+
+  * Update to 2.26.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Sun, 29 Sep 2024 13:31:25 +0800
+
+fastfetch (2.25.0) jammy; urgency=medium
+
+  * Update to 2.25.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 19 Sep 2024 10:28:38 +0800
+
+fastfetch (2.24.0) jammy; urgency=medium
+
+  * Update to 2.24.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 11 Sep 2024 13:50:02 +0800
+
+fastfetch (2.23.0) jammy; urgency=medium
+
+  * Update to 2.23.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 03 Sep 2024 18:44:11 +0800
+
+fastfetch (2.22.0) jammy; urgency=medium
+
+  * Update to 2.22.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 26 Aug 2024 18:53:35 +0800
+
+fastfetch (2.21.3) jammy; urgency=medium
+
+  * Update to 2.21.3
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 15 Aug 2024 16:14:52 +0800
+
+fastfetch (2.21.2) jammy; urgency=medium
+
+  * Update to 2.21.2
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 14 Aug 2024 14:42:07 +0800
+
+fastfetch (2.21.1) jammy; urgency=medium
+
+  * Update to 2.21.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 09 Aug 2024 14:27:10 +0800
+
+fastfetch (2.21.0) jammy; urgency=medium
+
+  * Update to 2.21.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 05 Aug 2024 14:35:43 +0800
+
+fastfetch (2.20.0) jammy; urgency=medium
+
+  * Update to 2.20.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 26 Jul 2024 14:02:50 +0800
+
+fastfetch (2.19.1) jammy; urgency=medium
+
+  * Update to 2.19.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Tue, 23 Jul 2024 10:25:14 +0800
+
+fastfetch (2.19.0) jammy; urgency=medium
+
+  * Update to 2.19.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 22 Jul 2024 14:17:55 +0800
+
+fastfetch (2.18.1) jammy; urgency=medium
+
+  * Update to 2.18.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 11 Jul 2024 14:32:15 +0800
+
+fastfetch (2.18.0) jammy; urgency=medium
+
+  * Update to 2.18.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 10 Jul 2024 16:46:32 +0800
+
+fastfetch (2.17.2) jammy; urgency=medium
+
+  * Update to 2.17.2
+
+ -- Carter Li <zhangsongcui@live.cn>  Thu, 04 Jul 2024 10:22:44 +0800
+
+fastfetch (2.17.1) jammy; urgency=medium
+
+  * Update to 2.17.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 01 Jul 2024 08:56:29 +0800
+
+fastfetch (2.17.0) jammy; urgency=medium
+
+  * Update to 2.17.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Fri, 28 Jun 2024 13:43:18 +0800
+
 fastfetch (2.16.0) jammy; urgency=medium

  * Update to 2.16.0
@@ -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, libnm-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: 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
 Standards-Version: 4.0.0
 Homepage: https://github.com/fastfetch-cli/fastfetch

@@ -1 +1 @@
-fastfetch_2.16.0_source.buildinfo universe/utils optional
+fastfetch_2.28.0_source.buildinfo universe/utils optional
@@ -98,7 +98,7 @@ config files, see the CONFIGURATION section

 .B \-\-gen\-config \fI[file]
 Generate a config file with options specified on the command line.
-If \fIfile\fR is specified, the configuration will written to the
+If \fIfile\fR is specified, the configuration will be written to the
 file, otherwise it will be written to stdout.
 .TP

@@ -47,22 +47,37 @@
        "cpuusage",
        {
            "type": "gpu",
+            "driverSpecific": true,
            "temp": true
        },
        "memory",
        "physicalmemory",
        "swap",
        "disk",
-        "battery",
+        "btrfs",
+        "zpool",
+        {
+            "type": "battery",
+            "temp": true
+        },
        "poweradapter",
        "player",
        "media",
-        "publicip",
+        {
+            "type": "publicip",
+            "timeout": 1000
+        },
        {
            "type": "localip",
            "showIpv6": true,
-            "showMac": true
+            "showMac": true,
+            "showSpeed": true,
+            "showMtu": true,
+            "showLoop": true,
+            "showFlags": true,
+            "showAllIps": true
        },
+        "dns",
        "wifi",
        "datetime",
        "locale",
@@ -71,6 +86,7 @@
        "opencl",
        "users",
        "bluetooth",
+        "bluetoothradio",
        "sound",
        "camera",
        "gamepad",
@@ -84,6 +100,7 @@
            "type": "physicaldisk",
            "temp": true
        },
+        "tpm",
        "version",
        "break",
        "colors"
@@ -4,12 +4,12 @@
        {
            "type": "title",
            "key": "User",
-            "format": "{1}"
+            "format": "{user-name}"
        },
        {
            "type": "title",
            "key": "Hostname",
-            "format": "{2}"
+            "format": "{host-name}"
        },
        {
            "type": "host",
@@ -17,7 +17,7 @@
        },
        {
            "type": "os",
-            "format": "{3} {9} {12}"
+            "format": "{pretty-name} {version-id} {arch}"
        },
        "kernel",
        "uptime",
@@ -34,32 +34,29 @@
            "type": "de",
            "key": "Desktop Environment"
        },
-        {
-            "type": "shell",
-            "format": "{7}"
-        },
+        "shell",
        {
            "type": "terminal",
-            "format": "{5} {6} {#37}█{#97}█ {#36}█{#96}█ {#35}█{#95}█ {#34}█{#94}█ {#33}█{#93}█ {#32}█{#92}█ {#31}█{#91}█ {#30}█{#90}█"
+            "format": "{pretty-name} {version} {#37}█{#97}█ {#36}█{#96}█ {#35}█{#95}█ {#34}█{#94}█ {#33}█{#93}█ {#32}█{#92}█ {#31}█{#91}█ {#30}█{#90}█"
        },
        {
            "type": "packages",
-            "format": "{1}"
+            "format": "{all}"
        },
        {
            "type": "cpu",
            "key": "Temperature",
            "temp": true,
-            "format": "{8}"
+            "format": "{temperature}"
        },
        {
            "type": "cpu",
            "key": "CPU",
-            "format": "{4} x {1}"
+            "format": "{cores-logical} x {name}"
        },
        {
            "type": "gpu",
-            "format": "{2}"
+            "format": "{name}"
        },
        {
            "type": "memory",
@@ -78,7 +75,8 @@
        },
        {
            "type": "publicip",
-            "key": "WAN IP"
+            "key": "WAN IP",
+            "timeout": 1000
        }
    ]
 }
@@ -1,42 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": {
-        "type": "builtin",
-        "source": "arch"
-    },
-    "modules": [
-        "title",
-        "separator",
-        {
-            "type": "os",
-            "format": "Arch Linux ({12})"
-        },
-        "host",
-        "kernel",
-        "uptime",
-        {
-            "type": "packages",
-            "format": "{} (pacman)"
-        },
-        "shell",
-        "display",
-        "de",
-        "wm",
-        "wmtheme",
-        "theme",
-        "icons",
-        "font",
-        "cursor",
-        "terminal",
-        "terminalfont",
-        "cpu",
-        "gpu",
-        "memory",
-        "disk",
-        "battery",
-        "poweradapter",
-        "locale",
-        "break",
-        "colors"
-    ]
-}
@@ -1,93 +1,110 @@
 {
-  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "display": {
-    "stat": true,
-    "pipe": true,
-    "showErrors": true,
-    "noBuffer": true
-  },
-  "logo": null,
-  "modules": [
-    "title",
-    "separator",
-    "os",
-    "host",
-    "bios",
-    "bootmgr",
-    "board",
-    "chassis",
-    "kernel",
-    "initsystem",
-    "uptime",
-    "loadavg",
-    "processes",
-    "packages",
-    "shell",
-    "editor",
-    "display",
-    "brightness",
-    "monitor",
-    "lm",
-    "de",
-    "wm",
-    "wmtheme",
-    "theme",
-    "icons",
-    "font",
-    "cursor",
-    "wallpaper",
-    "terminal",
-    "terminalfont",
-    "terminalsize",
-    "terminaltheme",
-    {
-        "type": "cpu",
-        "showPeCoreCount": true,
-        "temp": true
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "display": {
+        "stat": true,
+        "pipe": true,
+        "showErrors": true,
+        "noBuffer": true
    },
-    "cpucache",
-    "cpuusage",
-    {
-        "type": "gpu",
-        "temp": true
-    },
-    "memory",
-    "physicalmemory",
-    "swap",
-    "disk",
-    "battery",
-    "poweradapter",
-    "player",
-    "media",
-    "publicip",
-    {
-        "type": "localip",
-        "showIpv6": true,
-        "showMac": true
-    },
-    "wifi",
-    "datetime",
-    "locale",
-    "vulkan",
-    "opengl",
-    "opencl",
-    "users",
-    "bluetooth",
-    "sound",
-    "camera",
-    "gamepad",
-    {
-      "type": "weather",
-      "timeout": 1000
-    },
-    "netio",
-    "diskio",
-    {
-        "type": "physicaldisk",
-        "temp": true
-    },
-    "version",
-    "break",
-    "colors"
-  ]
+    "logo": null,
+    "modules": [
+        "title",
+        "separator",
+        "os",
+        "host",
+        "bios",
+        "bootmgr",
+        "board",
+        "chassis",
+        "kernel",
+        "initsystem",
+        "uptime",
+        "loadavg",
+        "processes",
+        "packages",
+        "shell",
+        "editor",
+        "display",
+        "brightness",
+        "monitor",
+        "lm",
+        "de",
+        "wm",
+        "wmtheme",
+        "theme",
+        "icons",
+        "font",
+        "cursor",
+        "wallpaper",
+        "terminal",
+        "terminalfont",
+        "terminalsize",
+        "terminaltheme",
+        {
+            "type": "cpu",
+            "showPeCoreCount": true,
+            "temp": true
+        },
+        "cpucache",
+        "cpuusage",
+        {
+            "type": "gpu",
+            "driverSpecific": true,
+            "temp": true
+        },
+        "memory",
+        "physicalmemory",
+        "swap",
+        "disk",
+        "btrfs",
+        "zpool",
+        {
+            "type": "battery",
+            "temp": true
+        },
+        "poweradapter",
+        "player",
+        "media",
+        {
+            "type": "publicip",
+            "timeout": 1000
+        },
+        {
+            "type": "localip",
+            "showIpv6": true,
+            "showMac": true,
+            "showSpeed": true,
+            "showMtu": true,
+            "showLoop": true,
+            "showFlags": true,
+            "showAllIps": true
+        },
+        "dns",
+        "wifi",
+        "datetime",
+        "locale",
+        "vulkan",
+        "opengl",
+        "opencl",
+        "users",
+        "bluetooth",
+        "bluetoothradio",
+        "sound",
+        "camera",
+        "gamepad",
+        {
+            "type": "weather",
+            "timeout": 1000
+        },
+        "netio",
+        "diskio",
+        {
+            "type": "physicaldisk",
+            "temp": true
+        },
+        "tpm",
+        "version",
+        "break",
+        "colors"
+    ]
 }
@@ -9,12 +9,15 @@
        }
    },
    "display": {
-        "separator": " -> "
+        "separator": " -> ",
+        "constants": [
+            "──────────────────────────────"
+        ]
    },
    "modules": [
        {
            "type": "custom",
-            "format": "┌────────────────────────────────────────────────────────────┐",
+            "format": "┌{$1}{$1}┐",
            "outputColor": "90"
        },
        {
@@ -23,7 +26,7 @@
        },
        {
            "type": "custom",
-            "format": "└────────────────────────────────────────────────────────────┘",
+            "format": "└{$1}{$1}┘",
            "outputColor": "90"
        },
        {
@@ -32,12 +35,12 @@
        },
        {
            "type": "custom",
-            "format": "┌────────────────────────────────────────────────────────────┐",
+            "format": "┌{$1}{$1}┐",
            "outputColor": "90"
        },
        {
            "type": "os",
-            "key": " OS",
+            "key": "{icon} OS",
            "keyColor": "yellow"
        },
        {
@@ -142,7 +145,7 @@
        },
        {
            "type": "custom",
-            "format": "└────────────────────────────────────────────────────────────┘",
+            "format": "└{$1}{$1}┘",
            "outputColor": "90"
        },
        "break",
@@ -6,96 +6,104 @@
    "display": {
        "separator": "->   ",
        "color": {
-            "separator": "1"
+            "separator": "1" // Bold
+        },
+        "constants": [
+            "───────────────────────────"
+        ],
+        "key": {
+            "type": "both",
+            "paddingLeft": 4
        }
    },
    "modules": [
        {
            "type": "title",
-            "format": "                                {6}{7}{8}"
+            "format": "                             {user-name-colored}{at-symbol-colored}{host-name-colored}"
        },
        "break",
        {
            "type": "custom",
-            "format": "┌───────────────────────────── {#1}System Information{#} ─────────────────────────────┐"
+            "format": "┌{$1} {#1}System Information{#} {$1}┐"
        },
        "break",
        {
-            "key": "     OS           ",
+            "key": "OS           ",
            "keyColor": "red",
            "type": "os"
        },
        {
-            "key": "    󰌢 Machine      ",
+            "key": "Machine      ",
            "keyColor": "green",
            "type": "host"
        },
        {
-            "key": "     Kernel       ",
+            "key": "Kernel       ",
            "keyColor": "magenta",
            "type": "kernel"
        },
        {
-            "key": "    󰅐 Uptime       ",
+            "key": "Uptime       ",
            "keyColor": "red",
            "type": "uptime"
        },
        {
-            "key": "    󰍹 Resolution   ",
+            "key": "Resolution   ",
            "keyColor": "yellow",
            "type": "display",
            "compactType": "original-with-refresh-rate"
        },
        {
-            "key": "     WM           ",
+            "key": "WM           ",
            "keyColor": "blue",
            "type": "wm"
        },
        {
-            "key": "     DE           ",
+            "key": "DE           ",
            "keyColor": "green",
            "type": "de"
        },
        {
-            "key": "     Shell        ",
+            "key": "Shell        ",
            "keyColor": "cyan",
            "type": "shell"
        },
        {
-            "key": "     Terminal     ",
+            "key": "Terminal     ",
            "keyColor": "red",
            "type": "terminal"
        },
        {
-            "key": "    󰻠 CPU          ",
+            "key": "CPU          ",
            "keyColor": "yellow",
            "type": "cpu"
        },
        {
-            "key": "    󰍛 GPU          ",
+            "key": "GPU          ",
            "keyColor": "blue",
            "type": "gpu"
        },
        {
-            "key": "    󰑭 Memory       ",
+            "key": "Memory       ",
            "keyColor": "magenta",
            "type": "memory"
        },
        {
-            "key": "    󰩟 Local IP     ",
+            "key": "Local IP     ",
            "keyColor": "red",
            "type": "localip",
            "compact": true
        },
        {
-            "key": "    󰩠 Public IP    ",
+            "key": "Public IP    ",
            "keyColor": "cyan",
-            "type": "publicip"
+            "type": "publicip",
+            "timeout": 1000
        },
        "break",
        {
            "type": "custom",
-            "format": "└──────────────────────────────────────────────────────────────────────────────┘"
+            "format": "└{$1}────────────────────{$1}┘"
        },
        "break",
        {
@@ -8,8 +8,7 @@
        }
    },
    "display": {
-        "separator": "",
-        "keyWidth": 15
+        "separator": " "
    },
    "modules": [
        {
@@ -17,65 +16,64 @@
            "type": "custom"
        },
        {
-            // draw borders first to make colors of left and right border consistant
-            "key": "│           │\u001b[11D{#31} user",
+            "key": "│ {#31} user    {#keys}│",
            "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
        },
        {
-            "key": "│           │\u001b[11D{#32}󰇅 hname",
+            "key": "│ {#32}󰇅 hname   {#keys}│",
            "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
        },
        {
-            "key": "│           │\u001b[11D{#33}󰅐 uptime",
+            "key": "│ {#33}󰅐 uptime  {#keys}│",
            "type": "uptime"
        },
        {
-            "key": "│           │\u001b[11D{#34}󰟾 distro",
+            "key": "│ {#34}{icon} distro  {#keys}│",
            "type": "os"
        },
        {
-            "key": "│           │\u001b[11D{#35} kernel",
+            "key": "│ {#35} kernel  {#keys}│",
            "type": "kernel"
        },
        {
-            "key": "│           │\u001b[11D{#36}󰇄 desktop",
+            "key": "│ {#36}󰇄 desktop {#keys}│",
            "type": "de"
        },
        {
-            "key": "│           │\u001b[11D{#31} term",
+            "key": "│ {#31} term    {#keys}│",
            "type": "terminal"
        },
        {
-            "key": "│           │\u001b[11D{#32} shell",
+            "key": "│ {#32} shell   {#keys}│",
            "type": "shell"
        },
        {
-            "key": "│           │\u001b[11D{#33}󰍛 cpu",
+            "key": "│ {#33}󰍛 cpu     {#keys}│",
            "type": "cpu",
            "showPeCoreCount": true
        },
        {
-            "key": "│           │\u001b[11D{#34}󰉉 disk",
+            "key": "│ {#34}󰉉 disk    {#keys}│",
            "type": "disk",
            "folders": "/"
        },
        {
-            "key": "│           │\u001b[11D{#35} memory",
+            "key": "│ {#35} memory  {#keys}│",
            "type": "memory"
        },
        {
-            "key": "│           │\u001b[11D{#36}󰩟 network",
+            "key": "│ {#36}󰩟 network {#keys}│",
            "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
        },
        {
            "key": "├───────────┤",
            "type": "custom"
        },
        {
-            "key": "│           │\u001b[11D{#39} colors",
+            "key": "│ {#39} colors  {#keys}│",
            "type": "colors",
            "symbol": "circle"
        },
@@ -6,20 +6,22 @@
    },
    "display": {
        "separator": "",
-        "keyWidth": 12
+        "key": {
+            "width": 15
+        }
    },
    "modules": [
        {
            // draw borders first to make colors of left and right border consistant
            "key": " user",
            "type": "title",
-            "format": "{1}",
+            "format": "{user-name}",
            "keyColor": "31"
        },
        {
            "key": "󰇅 hname",
            "type": "title",
-            "format": "{2}",
+            "format": "{host-name}",
            "keyColor": "32"

        },
@@ -29,7 +31,7 @@
            "keyColor": "33"
        },
        {
-            "key": "󰟾 distro",
+            "key": "{icon} distro",
            "type": "os",
            "keyColor": "34"
        },
@@ -73,7 +75,7 @@
        {
            "key": "󰩟 network",
            "type": "localip",
-            "format": "{1} ({4})",
+            "format": "{ipv4} ({ifname})",
            "keyColor": "36"
        },
        {
@@ -8,8 +8,7 @@
        }
    },
    "display": {
-        "separator": "",
-        "keyWidth": 15
+        "separator": " "
    },
    "modules": [
        {
@@ -17,65 +16,64 @@
            "type": "custom"
        },
        {
-            // draw borders first to make colors of left and right border consistant
-            "key": "•           •\u001b[11D{#31} user",
+            "key": "• {#31} user    {#keys}•",
            "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
        },
        {
-            "key": "•           •\u001b[11D{#32}󰇅 hname",
+            "key": "• {#32}󰇅 hname   {#keys}•",
            "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
        },
        {
-            "key": "•           •\u001b[11D{#33}󰅐 uptime",
+            "key": "• {#33}󰅐 uptime  {#keys}•",
            "type": "uptime"
        },
        {
-            "key": "•           •\u001b[11D{#34}󰟾 distro",
+            "key": "• {#34}{icon} distro  {#keys}•",
            "type": "os"
        },
        {
-            "key": "•           •\u001b[11D{#35} kernel",
+            "key": "• {#35} kernel  {#keys}•",
            "type": "kernel"
        },
        {
-            "key": "•           •\u001b[11D{#36}󰇄 desktop",
+            "key": "• {#36}󰇄 desktop {#keys}•",
            "type": "de"
        },
        {
-            "key": "•           •\u001b[11D{#31} term",
+            "key": "• {#31} term    {#keys}•",
            "type": "terminal"
        },
        {
-            "key": "•           •\u001b[11D{#32} shell",
+            "key": "• {#32} shell   {#keys}•",
            "type": "shell"
        },
        {
-            "key": "•           •\u001b[11D{#33}󰍛 cpu",
+            "key": "• {#33}󰍛 cpu     {#keys}•",
            "type": "cpu",
            "showPeCoreCount": true
        },
        {
-            "key": "•           •\u001b[11D{#34}󰉉 disk",
+            "key": "• {#34}󰉉 disk    {#keys}•",
            "type": "disk",
            "folders": "/"
        },
        {
-            "key": "•           •\u001b[11D{#35} memory",
+            "key": "• {#35} memory  {#keys}•",
            "type": "memory"
        },
        {
-            "key": "•           •\u001b[11D{#36}󰩟 network",
+            "key": "• {#36}󰩟 network {#keys}•",
            "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
        },
        {
            "key": "•••••••••••••",
            "type": "custom"
        },
        {
-            "key": "•           •\u001b[11D{#39} colors",
+            "key": "• {#39} colors  {#keys}•",
            "type": "colors",
            "symbol": "circle"
        },
@@ -18,19 +18,19 @@
        {
            "key": "║ {#31} user    {#keys}║",
            "type": "title",
-            "format": "{1}"
+            "format": "{user-name}"
        },
        {
            "key": "║ {#32}󰇅 hname   {#keys}║",
            "type": "title",
-            "format": "{2}"
+            "format": "{host-name}"
        },
        {
            "key": "║ {#33}󰅐 uptime  {#keys}║",
            "type": "uptime"
        },
        {
-            "key": "║ {#34}󰟾 distro  {#keys}║",
+            "key": "║ {#34}{icon} distro  {#keys}║",
            "type": "os"
        },
        {
@@ -66,7 +66,7 @@
        {
            "key": "║ {#36}󰩟 network {#keys}║",
            "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
        },
        {
            "key": "╠═══════════╣",
@@ -11,72 +11,76 @@
        "separator": ">  ",
        "color": {
            "separator": "red"
-        }
+        },
+        "constants": [
+            "───────────────────────────────────────────────────────────────────────────",
+            "│\u001b[75C│\u001b[75D"
+        ]
    },
    "modules": [
        {
-            "format": "{#1}{#keys}╭───────────────────────────────────────────────────────────────────────────╮\u001b[76D {6}{7}{8} 🖥  ",
+            "format": "{#1}{#keys}╭{$1}╮\u001b[76D {user-name-colored}{at-symbol-colored}{host-name-colored} 🖥  ",
            "type": "title"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#31} kernel   ",
+            "key": "{$2}{#31} kernel   ",
            "type": "kernel"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#32}󰅐 uptime   ",
+            "key": "{$2}{#32}󰅐 uptime   ",
            "type": "uptime"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#33}󰟾 distro   ",
+            "key": "{$2}{#33}{icon} distro   ",
            "type": "os"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#34}󰇄 desktop  ",
+            "key": "{$2}{#34}󰇄 desktop  ",
            "type": "de"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#35} term     ",
+            "key": "{$2}{#35} term     ",
            "type": "terminal"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#36} shell    ",
+            "key": "{$2}{#36} shell    ",
            "type": "shell"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#35}󰍛 cpu      ",
+            "key": "{$2}{#35}󰍛 cpu      ",
            "type": "cpu",
            "showPeCoreCount": true,
            "temp": true
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#34}󰍛 gpu      ",
+            "key": "{$2}{#34}󰍛 gpu      ",
            "type": "gpu"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#33}󰉉 disk     ",
+            "key": "{$2}{#33}󰉉 disk     ",
            "type": "disk",
            "folders": "/"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#32} memory   ",
+            "key": "{$2}{#32} memory   ",
            "type": "memory"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#31}󰩟 network  ",
+            "key": "{$2}{#31}󰩟 network  ",
            "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
        },
        {
-            "format": "{#1}{#keys}├───────────────────────────────────────────────────────────────────────────┤",
+            "format": "{#1}{#keys}├{$1}┤",
            "type": "custom"
        },
        {
-            "key": "│\u001b[75C│\u001b[75D{#39} colors   ",
+            "key": "{$2}{#39} colors   ",
            "type": "colors",
            "symbol": "circle"
        },
        {
-            "format": "{#1}{#keys}╰───────────────────────────────────────────────────────────────────────────╯",
+            "format": "{#1}{#keys}╰{$1}╯",
            "type": "custom"
        }
    ]
@@ -11,72 +11,76 @@
        "separator": ">  ",
        "color": {
            "separator": "red"
-        }
+        },
+        "constants": [
+            "═══════════════════════════════════════════════════════════════════════════",
+            "║\u001b[75C║\u001b[75D"
+        ]
    },
    "modules": [
        {
-            "format": "{#1}{#keys}╔═══════════════════════════════════════════════════════════════════════════╗\u001b[76D {6}{7}{8} 💻 ",
+            "format": "{#1}{#keys}╔{$1}╗\u001b[76D {user-name-colored}{at-symbol-colored}{host-name-colored} 💻 ",
            "type": "title"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#31} kernel   ",
+            "key": "{$2}{#31} kernel   ",
            "type": "kernel"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#32}󰅐 uptime   ",
+            "key": "{$2}{#32}󰅐 uptime   ",
            "type": "uptime"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#33}󰟾 distro   ",
+            "key": "{$2}{#33}{icon} distro   ",
            "type": "os"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#34}󰇄 desktop  ",
+            "key": "{$2}{#34}󰇄 desktop  ",
            "type": "de"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#35} term     ",
+            "key": "{$2}{#35} term     ",
            "type": "terminal"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#36} shell    ",
+            "key": "{$2}{#36} shell    ",
            "type": "shell"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#35}󰍛 cpu      ",
+            "key": "{$2}{#35}󰍛 cpu      ",
            "type": "cpu",
            "showPeCoreCount": true,
            "temp": true
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#34}󰍛 gpu      ",
+            "key": "{$2}{#34}󰍛 gpu      ",
            "type": "gpu"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#33}󰉉 disk     ",
+            "key": "{$2}{#33}󰉉 disk     ",
            "type": "disk",
            "folders": "/"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#32} memory   ",
+            "key": "{$2}{#32} memory   ",
            "type": "memory"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#31}󰩟 network  ",
+            "key": "{$2}{#31}󰩟 network  ",
            "type": "localip",
-            "format": "{1} ({4})"
+            "format": "{ipv4} ({ifname})"
        },
        {
-            "format": "{#1}{#keys}╠═══════════════════════════════════════════════════════════════════════════╣",
+            "format": "{#1}{#keys}╠{$1}╣",
            "type": "custom"
        },
        {
-            "key": "║\u001b[75C║\u001b[75D{#39} colors   ",
+            "key": "{$2}{#39} colors   ",
            "type": "colors",
            "symbol": "circle"
        },
        {
-            "format": "{#1}{#keys}╚═══════════════════════════════════════════════════════════════════════════╝",
+            "format": "{#1}{#keys}╚{$1}╝",
            "type": "custom"
        }
    ]
@@ -12,7 +12,7 @@
    "logo": {
        "source": " _____ _____ _____ _____ _____ _____ _____ _____ _____\n|   __|  _  |   __|_   _|   __|   __|_   _|     |  |  |\n|   __|     |__   | | | |   __|   __| | | |   --|     |\n|__|  |__|__|_____| |_| |__|  |_____| |_| |_____|__|__|",
        "type": "data",
-        "separate": true,
+        "position": "top",
        "padding": {
            "right": 2
        }
@@ -119,9 +119,10 @@
            "keyColor": "blue"
        },
        {
-            "type": "monitor",
+            "type": "display",
            "key": "MONITOR ({name})",
-            "keyColor": "blue"
+            "keyColor": "blue",
+            "format": "{width}x{height} @ {refresh-rate} Hz - {physical-width}x{physical-height} mm ({inch} inches, {ppi} ppi)"
        },
        {
            "type": "custom", // DesignInfo
@@ -147,7 +148,7 @@
        {
            "type": "font",
            "key": "FONT",
-            "format": "{?1}{1} [QT]{?}{/1}Unknown", // Remove "[QT]" if not using Qt
+            "format": "{?1}{1} [Qt]{?}{/1}Unknown", // Remove "[Qt]" if not using Qt
            "keyColor": "yellow"
        },
        {
@@ -10,153 +10,74 @@
    //     "height": 12
    // },
    "display": {
-        "separator": "  "
+        "separator": "  ",
+        "constants": [
+            "─────────────────" // {$1}, used in Custom module
+        ],
+        "key": {
+            "type": "icon",
+            "paddingLeft": 2
+        }
    },
    "modules": [
        {
            "type": "custom", // HardwareStart
            // {#1} is equivalent to `\u001b[1m`. {#} is equivalent to `\u001b[m`
-            "format": "┌─────────── {#1}Hardware Information{#} ───────────┐"
-        },
-        {
-            "type": "host",
-            "key": "  󰌢"
-        },
-        {
-            "type": "cpu",
-            "key": "  󰻠"
-        },
-        {
-            "type": "gpu",
-            "key": "  󰍛"
-        },
-        {
-            "type": "disk",
-            "key": "  "
-        },
-        {
-            "type": "memory",
-            "key": "  󰑭"
-        },
-        {
-            "type": "swap",
-            "key": "  󰓡"
-        },
-        {
-            "type": "display",
-            "key": "  󰍹"
-        },
-        {
-            "type": "brightness",
-            "key": "  󰃞"
-        },
-        {
-            "type": "battery",
-            "key": "  "
-        },
-        {
-            "type": "poweradapter",
-            "key": "  "
-        },
-        {
-            "type": "bluetooth",
-            "key": "  "
-        },
-        {
-            "type": "sound",
-            "key": "  "
-        },
-        {
-            "type": "gamepad",
-            "key": "  "
+            "format": "┌{$1} {#1}Hardware Information{#} {$1}┐"
        },
+        "host",
+        "cpu",
+        "gpu",
+        "disk",
+        "memory",
+        "swap",
+        "display",
+        "brightness",
+        "battery",
+        "poweradapter",
+        "bluetooth",
+        "sound",
+        "gamepad",
        {
            "type": "custom", // SoftwareStart
-            "format": "├─────────── {#1}Software Information{#} ───────────┤"
+            "format": "├{$1} {#1}Software Information{#} {$1}┤"
        },
        {
            "type": "title",
-            "key": "  ",
-            "format": "{1}@{2}"
-        },
-        {
-            "type": "os",
-            "key": "  " // Just get your distro's logo off nerdfonts.com
-        },
-        {
-            "type": "kernel",
-            "key": "  ",
-            "format": "{1} {2}"
-        },
-        {
-            "type": "lm",
-            "key": "  󰧨"
-        },
-        {
-            "type": "de",
-            "key": "  "
-        },
-        {
-            "type": "wm",
-            "key": "  "
-        },
-        {
-            "type": "shell",
-            "key": "  "
-        },
-        {
-            "type": "terminal",
-            "key": "  "
-        },
-        {
-            "type": "terminalfont",
-            "key": "  "
-        },
-        {
-            "type": "theme",
-            "key": "  󰉼"
-        },
-        {
-            "type": "icons",
-            "key": "  󰀻"
-        },
-        {
-            "type": "wallpaper",
-            "key": "  󰸉"
-        },
-        {
-            "type": "packages",
-            "key": "  󰏖"
-        },
-        {
-            "type": "uptime",
-            "key": "  󰅐"
-        },
-        {
-            "type": "media",
-            "key": "  󰝚"
+            "keyIcon": "",
+            "key": "Title", // Title module has no key by default, so that icon is not displayed
+            "format": "{user-name}@{host-name}"
        },
+        "os",
+        "kernel",
+        "lm",
+        "de",
+        "wm",
+        "shell",
+        "terminal",
+        "terminalfont",
+        "theme",
+        "icons",
+        "wallpaper",
+        "packages",
+        "uptime",
+        "media",
        {
            "type": "localip",
-            "key": "  󰩟",
            "compact": true
        },
        {
            "type": "publicip",
-            "key": "  󰩠"
+            "timeout": 1000
        },
        {
            "type": "wifi",
-            "key": "  ",
-            "format": "{4}" // ssid
-        },
-        {
-            "type": "locale",
-            "key": "  "
+            "format": "{ssid}"
        },
+        "locale",
        {
            "type": "custom", // InformationEnd
-            "format": "└────────────────────────────────────────────┘"
+            "format": "└{$1}──────────────────────{$1}┘"
        },
        {
            "type": "colors",
@@ -4,7 +4,9 @@
    "logo": null,
    "display": {
        "pipe": true,
-        "keyWidth": 16,
+        "key": {
+            "width": 16
+        },
        "separator": "│ ",
        "percent": {
            "type": 6
@@ -15,7 +17,10 @@
            "charElapsed": "█",
            "charTotal": "░",
            "width": 40
-        }
+        },
+        "constants": [
+            "\u001b[42C"
+        ]
    },
    "modules": [
        {
@@ -41,11 +46,11 @@
        },
        {
            "type": "os",
-            "key": "│ OS         │\u001b[42C"
+            "key": "│ OS         │{$1}"
        },
        {
            "type": "kernel",
-            "key": "│ KERNEL     │\u001b[42C"
+            "key": "│ KERNEL     │{$1}"
        },
        {
            "type": "custom",
@@ -53,34 +58,34 @@
        },
        {
            "type": "title",
-            "key": "│ HOSTNAME   │\u001b[42C",
+            "key": "│ HOSTNAME   │{$1}",
            "format": "{host-name}"
        },
        {
            "type": "localip",
-            "key": "│ CLIENT IP  │\u001b[42C",
+            "key": "│ CLIENT IP  │{$1}",
            "format": "{ipv4}"
        },
        {
            "type": "localip",
-            "key": "│ MAC ADDR   │\u001b[42C",
+            "key": "│ MAC ADDR   │{$1}",
            "format": "{mac} ({ifname})",
            "showIPv4": false,
            "showMac": true
        },
        {
            "type": "dns",
-            "key": "│ DNS        │\u001b[42C",
+            "key": "│ DNS        │{$1}",
            "showType": "ipv4"
        },
        {
            "type": "title",
-            "key": "│ USER       │\u001b[42C",
+            "key": "│ USER       │{$1}",
            "format": "{user-name}"
        },
        {
            "type": "host",
-            "key": "│ MACHINE    │\u001b[42C",
+            "key": "│ MACHINE    │{$1}",
            "format": "{name}"
        },
        {
@@ -89,25 +94,24 @@
        },
        {
            "type": "cpu",
-            "key": "│ PROCESSOR  │\u001b[42C",
+            "key": "│ PROCESSOR  │{$1}",
            "format": "{name}"
        },
        {
            "type": "cpu",
-            "key": "│ CORES      │\u001b[42C",
+            "key": "│ CORES      │{$1}",
            "format": "{cores-physical} PHYSICAL CORES / {cores-logical} THREADS",
            "showPeCoreCount": false
        },
        {
            "type": "cpu",
-            "key": "│ CPU FREQ   │\u001b[42C",
-            "format": "{freq-max}{/freq-max}{freq-base}{/} GHz"
+            "key": "│ CPU FREQ   │{$1}",
+            "format": "{freq-max}{/freq-max}{freq-base}{/}"
        },
        {
            "type": "loadavg",
            "compact": false,
-            // {duration} is not fixed length, hack it
-            "key": "│ LOAD \u001b[s{duration}m\u001b[u\u001b[6C│\u001b[42C"
+            "key": "│ LOAD  {duration>2}m  │{$1}" // pad duration to 2 chars
        },
        {
            "type": "custom",
@@ -115,12 +119,12 @@
        },
        {
            "type": "memory",
-            "key": "│ MEMORY     │\u001b[42C",
+            "key": "│ MEMORY     │{$1}",
            "format": "{used} / {total} [{percentage}]"
        },
        {
            "type": "memory",
-            "key": "│ USAGE      │\u001b[42C",
+            "key": "│ USAGE      │{$1}",
            "format": ""
        },
        {
@@ -129,13 +133,13 @@
        },
        {
            "type": "disk",
-            "key": "│ VOLUME     │\u001b[42C",
+            "key": "│ VOLUME     │{$1}",
            "format": "{size-used} / {size-total} [{size-percentage}]",
            "folders": "/"
        },
        {
            "type": "disk",
-            "key": "│ DISK USAGE │\u001b[42C",
+            "key": "│ DISK USAGE │{$1}",
            "format": ""
        },
        {
@@ -144,13 +148,13 @@
        },
        {
            "type": "users",
-            "key": "│ LAST LOGIN │\u001b[42C",
+            "key": "│ LAST LOGIN │{$1}",
            "format": "{login-time}{?client-ip} ({client-ip})",
            "myselfOnly": true
        },
        {
            "type": "uptime",
-            "key": "│ UPTIME     │\u001b[42C"
+            "key": "│ UPTIME     │{$1}"
        },
        {
            "type": "custom",
@@ -3,39 +3,44 @@
    "logo": {
        "type": "small"
    },
+    "display": {
+        "constants": [
+            "██ "
+        ]
+    },
    "modules": [
        {
-            "key": "██ Distro",
+            "key": "{$1}Distro",
            "keyColor": "38;5;210",
            "type": "os"
        },
        {
-            "key": "██ Kernel",
+            "key": "{$1}Kernel",
            "keyColor": "38;5;84",
            "type": "kernel"
        },
        {
-            "key": "██ Shell",
+            "key": "{$1}Shell",
            "keyColor": "38;5;147",
            "type": "shell"
        },
        {
-            "key": "██ Packages",
+            "key": "{$1}Packages",
            "keyColor": "38;5;200",
            "type": "packages"
        },
        {
-            "key": "██ WM",
+            "key": "{$1}WM",
            "keyColor": "38;5;44",
            "type": "wm"
        },
        {
-            "key": "██ CPU",
+            "key": "{$1}CPU",
            "keyColor": "38;5;75",
            "type": "cpu"
        },
        {
-            "key": "██ Memory",
+            "key": "{$1}Memory",
            "keyColor": "38;5;123",
            "type": "memory"
        }
@@ -1,3 +1,4 @@
+// Designed for Arch Linux
 // Modified from: https://github.com/fastfetch-cli/fastfetch/pull/1025#issuecomment-2177566138
 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
@@ -12,7 +13,10 @@
        "color": {
            "separator": "blue"
        },
-        "separator": " | "
+        "separator": " | ",
+        "constants": [
+            ">-----------<+>---------------------------------------------<"
+        ]
    },
    "modules": [
        {
@@ -22,7 +26,7 @@
        },
        {
            "type": "custom",
-            "format": ">-----------<+>------------------------------------------<",
+            "format": "{$1}",
            "outputColor": "separator"
        },
        {
@@ -57,7 +61,7 @@
        },
        {
            "type": "custom",
-            "format": ">-----------<+>------------------------------------------<",
+            "format": "{$1}",
            "outputColor": "separator"
        },
        {
@@ -97,7 +101,7 @@
        },
        {
            "type": "custom",
-            "format": ">-----------<+>------------------------------------------<",
+            "format": "{$1}",
            "outputColor": "separator"
        },
        "break",
@@ -0,0 +1,63 @@
+// designed for presenting Vanilla Linux
+// inspired from imstilllearnin's Vanilla Logo Ultra
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+        "type": "small"
+    },
+    "display": {
+        "color": {
+            "output": "cyan"
+        },
+        "separator": ""
+    },
+    "modules": [
+        {
+            "type": "kernel",
+            "key": "[_Kernel___> ",
+            "keyColor": "blue"
+        },
+        {
+            "type": "packages",
+            "outputColor": "white",
+            "key": " [_Packages_> ",
+            "keyColor": "green"
+        },
+        {
+            "type": "localip",
+            "outputColor": "white",
+            "key": " [_Local_IP_> ",
+            "keyColor": "green"
+        },
+        {
+            "type": "memory",
+            "format": "[{3}] {1} / {2}",
+            "key": " [_RAM______> ",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "swap",
+            "format": "[{3}] {1} / {2}",
+            "key": " [_SWAP_____> ",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "disk",
+            "format": "[{3}] {1} / {2} {9}",
+            "key": " [_Disk_____> ",
+            "keyColor": "magenta"
+        },
+        {
+            "type": "battery",
+            "format": "[{4}] {5}",
+            "key": " [_Battery__> ",
+            "keyColor": "magenta"
+        },
+        "break",
+        {
+            "type": "colors",
+            "paddingLeft": 9,
+            "symbol": "circle"
+        }
+    ]
+}
@@ -0,0 +1,152 @@
+// By jan-rex
+// Modified from: https://github.com/fastfetch-cli/fastfetch/discussions/1269
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "logo": {
+      "padding": {
+        "top": 2
+      }
+    },
+    "display": {
+      "separator": "",
+      "constants": [
+        // CONSTANT {$1} - COLOR BACKGROUND FOR KEY
+        "\u001b[48;2;43;43;69m",
+        // CONSTANT {$2} - COLOR BACKGROUND FOR OUTPUT
+        "\u001b[48;2;56;59;78m",
+        // CONSTANT {$3} - 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}{$1}╭─────────────╮",
+        "format": "{#90}{$2}╭────────────────────────────────────────────────────────────╮",
+      },
+      {
+        "type": "title",
+        "key": "{#90}{$1}│ {#92}User        {#90}│",
+        "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}]",
+      },
+      {
+        "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}]"
+      },
+      {
+        "type": "title",
+        "key": "{#90}{$1}│ {#93}Host:       {#90}│",
+        "format": "{$2}{$3}{#1}{#36}{host-name}"
+      },
+      {
+        "type": "host",
+        "key": "{#90}{$1}│ {#93}Machine     {#90}│",
+        "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}]"
+      },
+      {
+        "type": "kernel",
+        "key": "{#90}{$1}│ {#93}Kernel      {#90}│",
+        "format": "{$2}{$3}{sysname} {#2}[v{release}]"
+      },
+      {
+        "type": "uptime",
+        "key": "{#90}{$1}│ {#93}Uptime      {#90}│",
+        "format": "{$2}{$3}{?days}{days} Days + {?}{hours}:{minutes}:{seconds}"
+      },
+      {
+        "type": "cpu",
+        "key": "{#90}{$1}│ {#91}CPU         {#90}│",
+        "showPeCoreCount": true,
+        "temp": true,
+        "format": "{$2}{$3}{name} {#2}[C:{core-types}] {#2}[{freq-max}]"
+      },
+      {
+        "type": "gpu",
+        "key": "{#90}{$1}│ {#91}GPU         {#90}│",
+        "detectionMethod": "auto",
+        "driverSpecific": true,
+        "format": "{$2}{$3}{name} {#2}[C:{core-count}] {#2}[{type}]"
+      },
+      {
+        "type": "memory",
+        "key": "{#90}{$1}│ {#91}Memory      {#90}│",
+        "format": "{$2}{$3}{used} / {total} ({percentage}{$2})"
+      },
+      {
+        "type": "disk",
+        "key": "{#90}{$1}│ {#91}Disk        {#90}│",
+        "format": "{$2}{$3}{size-used} / {size-total} ({size-percentage}{$2})"
+      },
+      {
+        "type": "poweradapter",
+        "key": "{#90}{$1}│ {#91}Power       {#90}│",
+        "format": "{$2}{$3}{name}"
+      },
+      {
+        "type": "terminal",
+        "key": "{#90}{$1}│ {#95}Terminal    {#90}│",
+        "format": "{$2}{$3}{pretty-name} {#2}[{version}] [PID:{pid}]"
+      },
+      {
+        "type": "terminalfont",
+        "key": "{#90}{$1}│ {#95}Font        {#90}│",
+        "format": "{$2}{$3}{name}  {#2}[{size}]"
+      },
+      {
+        "type": "shell",
+        "key": "{#90}{$1}│ {#95}Shell       {#90}│",
+        "format": "{$2}{$3}{pretty-name}  {#2}[v{version}] [PID:{pid}]"
+      },
+      {
+        // localip IPv4
+        "type": "localip",
+        "key": "{#90}{$1}│ {#94}Local IPv4  {#90}│",
+        "showPrefixLen": true,
+        "showIpv4": true,
+        "showIpv6": false,
+        "showMtu": true,
+        "format": "{$2}{$3}{ifname}: {ipv4}  {#2}[MTU:{mtu}]"
+      },
+      {
+        // localip IPv6
+        "type": "localip",
+        "key": "{#90}{$1}│ {#94}Local IPv6  {#90}│",
+        "showPrefixLen": true,
+        "showIpv4": false,
+        "showIpv6": true,
+        "showMtu": true,
+        "format": "{$2}{$3}{ifname}: {ipv6}  {#2}[MTU:{mtu}]"
+      },
+      {
+        "type": "publicip",
+        "key": "{#90}{$1}│ {#94}Public IPv4 {#90}│",
+        "ipv6": false,
+        "format": "{$2}{$3}{ip}  {#2}[{location}]"
+      },
+      {
+        "type": "publicip",
+        "key": "{#90}{$1}│ {#94}Public IPv6 {#90}│",
+        "ipv6": true,
+        "format": "{$2}{$3}{ip}  {#2}[{location}]"
+      },
+      // CUSTOM - Button UI bar
+      {
+        "type": "custom",
+        "key": "{#90}{$1}╰─────────────╯",
+        "format": "{#90}{$2}╰────────────────────────────────────────────────────────────╯",
+      }
+    ]
+  }
@@ -2,9 +2,13 @@

 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "logo": "debian_small",
+    "logo": {
+        "type": "small"
+    },
    "display": {
-        "binaryPrefix": "si"
+        "size": {
+            "binaryPrefix": "si"
+        }
    },
    "modules": [
        "vulkan",
@@ -3,13 +3,15 @@
 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
    "logo": {
-        "source": "arch_small",
+        "type": "small",
        "padding": {
            "right": 1
        }
    },
    "display": {
-        "binaryPrefix": "si",
+        "size": {
+            "binaryPrefix": "si"
+        },
        "color": "blue",
        "separator": "  "
    },
@@ -4,7 +4,7 @@
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
    "logo": null,
    "display": {
-        "color": "reset_magenta"
+        "color": "magenta"
    },
    "modules": [
        {
@@ -3,12 +3,6 @@

 {
    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    // "logo": {
-    //     "type": "iterm",
-    //     "source": "/Users/carter/Desktop/apple1.png",
-    //     "width": 28,
-    //     "height": 12
-    // },
    "display": {
        "separator": " "
    },
@@ -125,23 +119,22 @@
            "key": "╰─󰸉",
            "keyColor": "yellow"
        },
-
        "break",
+
        {
            "type": "title",
            "key": "╭─",
-            "format": "{1}@{2}",
+            "format": "{user-name}@{host-name}",
            "keyColor": "blue"
        },
        {
            "type": "os",
-            "key": "├─", // Just get your distro's logo off nerdfonts.com
+            "key": "├─{icon}", // Just get your distro's logo off nerdfonts.com
            "keyColor": "blue"
        },
        {
            "type": "kernel",
            "key": "├─",
-            "format": "{1} {2}",
            "keyColor": "blue"
        },
        {
@@ -168,12 +161,13 @@
        {
            "type": "publicip",
            "key": "├─󰩠",
-            "keyColor": "blue"
+            "keyColor": "blue",
+            "timeout": 1000
        },
        {
            "type": "wifi",
            "key": "├─",
-            "format": "{4}", // ssid
+            "format": "{ssid}",
            "keyColor": "blue"
        },
        {
@@ -22,9 +22,8 @@
        },
        {
            "type": "os",
-            "key": "├", // Just get your distro's logo off nerdfonts.com
-            "keyColor": "yellow",
-            "format": "{6}{?6} {?}{10}{?10} {?}{8}{?8} {?}{11}"
+            "key": "├{icon}", // Just get your distro's logo off nerdfonts.com
+            "keyColor": "yellow"
        },
        {
            "type": "kernel",
@@ -106,13 +105,13 @@
            "keyColor": "green"
        },
        {
-            "type": "uptime",
-            "key": "├󰅐",
+            "type": "display",
+            "key": "├󰍹",
            "keyColor": "green"
        },
        {
-            "type": "display",
-            "key": "└󰍹",
+            "type": "uptime",
+            "key": "└󰅐",
            "keyColor": "green"
        },

@@ -11,6 +11,9 @@
        "size": {
            "ndigits": 0,
            "maxPrefix": "MB"
+        },
+        "key": {
+            "type": "icon"
        }
    },
    "modules": [
@@ -22,31 +25,17 @@
                "host": "blue"
            }
        },
+        "os",
+        "kernel",
+        "memory",
+        "packages",
+        "uptime",
        {
-            "type": "os",
-            "key": "",
-            "format": "{2} {8}"
-        },
-        {
-            "type": "kernel",
-            "key": ""
-        },
-        {
-            "type": "memory",
-            "key": ""
-        },
-        {
-            "type": "packages",
-            "key": "󰏖"
-        },
-        {
-            "type": "uptime",
-            "key": "󰅐"
-        },
-        {
-            "type": "custom",
-            "key": "",
-            "format": "{#31}███{#32}███{#33}███{#34}███{#35}███{#36}███"
+            "type": "colors",
+            "key": "Colors", // For printing icon
+            "block": {
+                "range": [1, 6]
+            }
        }
    ]
 }
@@ -4,7 +4,9 @@
        "type": "small"
    },
    "display": {
-        "keyWidth": 11,
+        "key": {
+            "width": 11
+        },
        "bar": {
            "charElapsed": "=",
            "charTotal": "-",
@@ -23,7 +25,10 @@
            "type": "disk",
            "folders": "/"
        },
-        "battery",
+        {
+            "type": "battery",
+            "key": "Battery"
+        },
        {
            "type": "colors",
            "paddingLeft": 10,
@@ -1,37 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "modules": [
-	    {
-		    "type": "host",
-			"format": "{?2}{2}{?}{?5} ({5}){?}"
-		},
-		"chassis",
-		{
-		    "type": "board",
-			"format": "{?1}{1}{?}{?2} ({2}){?}"
-		},
-        "cpu",
-        {
-            "type": "memory",
-            "format": "{?2}{2}{?}"
-        },
-		"physicaldisk",
-		"gpu",
-	    "display",
-		"monitor",
-		{
-		    "type": "wifi",
-			"format": "{?1}{1}{?}{?6} - {6}{?}"
-		},
-	    {
-		    "type": "sound",
-			"format": "{?2}{2}{?}"
-		},
-		"camera",
-        {
-            "type": "battery",
-            "format": "{?1}{1}{?}{?2} {2}{?}{?3} ({3}){?}"
-        },
-		"poweradapter"
-    ]
-}
@@ -11,7 +11,10 @@
        "separator",
        "os",
        "host",
-        "kernel",
+        {
+            "type": "kernel",
+            "format": "{release}"
+        },
        "uptime",
        "packages",
        "shell",
@@ -28,7 +31,7 @@
        "terminal",
        {
            "type": "terminalfont",
-            "format": "{/2}{-}{/}{2}{?3} {3}{?}"
+            "format": "{/name}{-}{/}{name}{?size} {size}{?}"
        },
        "cpu",
        {
@@ -37,7 +40,7 @@
        },
        {
            "type": "memory",
-            "format": "{/1}{-}{/}{/2}{-}{/}{} / {}"
+            "format": "{} / {}"
        },
        "break",
        "colors"
@@ -1,17 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "modules": [
-        "os",
-        "kernel",
-        "shell",
-        "de",
-        "wm",
-        "wmtheme",
-        "theme",
-        "icons",
-        "font",
-        "cursor",
-        "terminal",
-        "terminalfont"
-    ]
-}
@@ -5,18 +5,22 @@ set -e
 mkdir -p build/
 cd build/

-if [ -z "${CMAKE_BUILD_TYPE}" ]; then
-    CMAKE_BUILD_TYPE=Release
-fi
-cmake "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" ..
+cmake ..

-if [ -z "$OSTYPE" ] || [ "$OSTYPE" = "linux-gnu" ]; then
-    cmake_build_args="-j$(nproc)"
-elif [ "$OSTYPE" = "darwin" ]; then
-    cmake_build_args="-j$(sysctl -n hw.ncpu)"
-else
-    cmake_build_args=""
-fi
-cmake --build . --target fastfetch ${cmake_build_args}
+kernel_name="$(uname -s)"
+
+case "${kernel_name}" in
+    "Linux" | "MINGW"*)
+        cmake_build_args="-j$(nproc)"
+        ;;
+    "Darwin" | *"BSD" | "DragonFly")
+        cmake_build_args="-j$(sysctl -n hw.ncpu)"
+        ;;
+    *)
+        cmake_build_args=""
+        ;;
+esac
+
+cmake --build . --target fastfetch "${cmake_build_args}"

 ./fastfetch "$@"
@@ -0,0 +1,95 @@
+from requests import get as http_get
+
+class PciDeviceModel:
+    def __init__(self, id: int, name: str):
+        self.id = id
+        self.name = name
+
+class PciVendorModel:
+    def __init__(self, id: int, name: str):
+        self.id = id
+        self.name = name
+        self.devices = []
+
+def main(keep_vendor_list: set):
+    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
+
+    dev_list_text = full_text[:full_text.rfind('\n\n\n')]  # remove known classes
+    for line in dev_list_text.split('\n'):
+        if not line or line[0] == '#':
+            continue
+        if line[0] != '\t':
+            id, name = line.split('  ', maxsplit=1)
+            vendors.append(PciVendorModel(int(id, 16), name))
+        elif line[1] != '\t':
+            id, name = line[1:].split('  ', maxsplit=1)
+            vendors[-1].devices.append(PciDeviceModel(int(id, 16), name))
+
+    code = """\
+// SPDX-License-Identifier: BSD-3-Clause
+// https://opensource.org/license/BSD-3-Clause
+// Generated from https://pci-ids.ucw.cz/v2.2/pci.ids
+
+#include <stdint.h>
+#include <stddef.h>
+
+typedef struct FFPciDevice
+{
+    const uint32_t id;
+    const char* name;
+} FFPciDevice;
+
+typedef struct FFPciVendor
+{
+    const uint32_t id;
+    const char* name;
+    const FFPciDevice* devices;
+    const uint32_t nDevices;
+} FFPciVendor;
+"""
+
+    if keep_vendor_list:
+        vendors = [vendor for vendor in vendors if vendor.id in keep_vendor_list]
+
+    for vendor in vendors:
+        if vendor.devices:
+            piece = ',\n    '.join('{{ 0x{:04X}, "{}" }}'.format(device.id, device.name.replace('"', '\\"')) for device in vendor.devices)
+            code += f"""
+// {vendor.name}
+static const FFPciDevice pciDevices_{vendor.id:04X}[] = {{
+    {piece},
+    {{}},
+}};
+"""
+
+    piece = ',\n    '.join('{{ 0x{:04X}, "{}", {}, {} }}'.format(vendor.id, vendor.name.replace('"', '\\"'), vendor.devices and f"pciDevices_{vendor.id:04X}" or "NULL", len(vendor.devices)) for vendor in vendors)
+    code += f"""
+const FFPciVendor ffPciVendors[] = {{
+    {piece},
+    {{}},
+}};"""
+
+    print(code)
+
+if __name__ == '__main__':
+    # From <src/detection/gpu/gpu.c>
+    main({
+        0x106b, # Apple
+        0x1002, 0x1022, # AMD
+        0x8086, 0x8087, 0x03e7, # Intel
+        0x0955, 0x10de, 0x12d2, # Nvidia
+        0x1ed5, # MThreads
+        0x5143, # Qualcomm
+        0x14c3, # MTK
+        0x15ad, # VMware
+        0x1af4, # RedHat
+        0x1ab8, # Parallel
+        0x1414, # Microsoft
+        0x108e, # Oracle
+    })
@@ -1,6 +1,6 @@
 {
    "home": "https://github.com/ibireme/yyjson",
    "license": "MIT ( embed in source )",
-    "version": "0.9.0",
+    "version": "0.10.0",
    "author": "ibireme"
 }
@@ -1831,6 +1831,42 @@ bool unsafe_yyjson_mut_equals(yyjson_mut_val *lhs, yyjson_mut_val *rhs) {
    }
 }

+bool yyjson_locate_pos(const char *str, size_t len, size_t pos,
+                       size_t *line, size_t *col, size_t *chr) {
+    usize line_sum = 0, line_pos = 0, chr_sum = 0;
+    const u8 *cur = (const u8 *)str;
+    const u8 *end = cur + pos;
+    
+    if (!str || pos > len) {
+        if (line) *line = 0;
+        if (col) *col = 0;
+        if (chr) *chr = 0;
+        return false;
+    }
+    
+    while (cur < end) {
+        u8 c = *cur;
+        chr_sum += 1;
+        if (likely(c < 0x80)) {         /* 0xxxxxxx (0x00-0x7F) ASCII */
+            if (c == '\n') {
+                line_sum += 1;
+                line_pos = chr_sum;
+            }
+            cur += 1;
+        }
+        else if (c < 0xC0) cur += 1;    /* 10xxxxxx (0x80-0xBF) Invalid */
+        else if (c < 0xE0) cur += 2;    /* 110xxxxx (0xC0-0xDF) 2-byte UTF-8 */
+        else if (c < 0xF0) cur += 3;    /* 1110xxxx (0xE0-0xEF) 3-byte UTF-8 */
+        else if (c < 0xF8) cur += 4;    /* 11110xxx (0xF0-0xF7) 4-byte UTF-8 */
+        else               cur += 1;    /* 11111xxx (0xF8-0xFF) Invalid */
+    }
+    
+    if (line) *line = line_sum + 1;
+    if (col) *col = chr_sum - line_pos + 1;
+    if (chr) *chr = chr_sum;
+    return true;
+}
+


 #if !YYJSON_DISABLE_UTILS
@@ -4434,7 +4470,7 @@ static_inline bool read_number(u8 **ptr,
    bool sign;
    
    /* read number as raw string if has `YYJSON_READ_NUMBER_AS_RAW` flag */
-    if (unlikely(pre && !has_read_flag(BIGNUM_AS_RAW))) {
+    if (has_read_flag(NUMBER_AS_RAW)) {
        return read_number_raw(ptr, pre, flg, val, msg);
    }
    
@@ -5036,7 +5072,7 @@ static_inline bool read_number(u8 **ptr,
    bool sign;
    
    /* read number as raw string if has `YYJSON_READ_NUMBER_AS_RAW` flag */
-    if (unlikely(pre && !has_read_flag(BIGNUM_AS_RAW))) {
+    if (has_read_flag(NUMBER_AS_RAW)) {
        return read_number_raw(ptr, pre, flg, val, msg);
    }
    
@@ -5744,18 +5780,18 @@ static_noinline yyjson_doc *read_root_single(u8 *hdr,
    }
    if (*cur == 't') {
        if (likely(read_true(&cur, val))) goto doc_end;
-        goto fail_literal;
+        goto fail_literal_true;
    }
    if (*cur == 'f') {
        if (likely(read_false(&cur, val))) goto doc_end;
-        goto fail_literal;
+        goto fail_literal_false;
    }
    if (*cur == 'n') {
        if (likely(read_null(&cur, val))) goto doc_end;
        if (has_read_flag(ALLOW_INF_AND_NAN)) {
            if (read_nan(false, &cur, pre, val)) goto doc_end;
        }
-        goto fail_literal;
+        goto fail_literal_null;
    }
    if (has_read_flag(ALLOW_INF_AND_NAN)) {
        if (read_inf_or_nan(false, &cur, pre, val)) goto doc_end;
@@ -5789,15 +5825,26 @@ fail_string:
 fail_number:
    return_err(cur, INVALID_NUMBER, msg);
 fail_alloc:
-    return_err(cur, MEMORY_ALLOCATION, "memory allocation failed");
-fail_literal:
-    return_err(cur, LITERAL, "invalid literal");
-fail_comment:
-    return_err(cur, INVALID_COMMENT, "unclosed multiline comment");
+    return_err(cur, MEMORY_ALLOCATION, 
+               "memory allocation failed");
+fail_literal_true:
+    return_err(cur, LITERAL, 
+               "invalid literal, expected a valid literal such as 'true'");
+fail_literal_false:
+    return_err(cur, LITERAL, 
+               "invalid literal, expected a valid literal such as 'false'");
+fail_literal_null:
+    return_err(cur, LITERAL, 
+               "invalid literal, expected a valid literal such as 'null'");
 fail_character:
-    return_err(cur, UNEXPECTED_CHARACTER, "unexpected character");
+    return_err(cur, UNEXPECTED_CHARACTER, 
+               "unexpected character, expected a valid root value");
+fail_comment:
+    return_err(cur, INVALID_COMMENT,
+               "unclosed multiline comment");
 fail_garbage:
-    return_err(cur, UNEXPECTED_CONTENT, "unexpected content after document");
+    return_err(cur, UNEXPECTED_CONTENT, 
+               "unexpected content after document");
    
 #undef return_err
 }
@@ -5927,13 +5974,13 @@ arr_val_begin:
        val_incr();
        ctn_len++;
        if (likely(read_true(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
    }
    if (*cur == 'f') {
        val_incr();
        ctn_len++;
        if (likely(read_false(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
    }
    if (*cur == 'n') {
        val_incr();
@@ -5942,7 +5989,7 @@ arr_val_begin:
        if (has_read_flag(ALLOW_INF_AND_NAN)) {
            if (read_nan(false, &cur, pre, val)) goto arr_val_end;
        }
-        goto fail_literal;
+        goto fail_literal_null;
    }
    if (*cur == ']') {
        cur++;
@@ -5960,13 +6007,13 @@ arr_val_begin:
        val_incr();
        ctn_len++;
        if (read_inf_or_nan(false, &cur, pre, val)) goto arr_val_end;
-        goto fail_character;
+        goto fail_character_val;
    }
    if (has_read_flag(ALLOW_COMMENTS)) {
        if (skip_spaces_and_comments(&cur)) goto arr_val_begin;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_val;
    
 arr_val_end:
    if (*cur == ',') {
@@ -5985,7 +6032,7 @@ arr_val_end:
        if (skip_spaces_and_comments(&cur)) goto arr_val_end;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_arr_end;
    
 arr_end:
    /* get parent container */
@@ -6038,7 +6085,7 @@ obj_key_begin:
        if (skip_spaces_and_comments(&cur)) goto obj_key_begin;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_obj_key;
    
 obj_key_end:
    if (*cur == ':') {
@@ -6053,7 +6100,7 @@ obj_key_end:
        if (skip_spaces_and_comments(&cur)) goto obj_key_end;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_obj_sep;
    
 obj_val_begin:
    if (*cur == '"') {
@@ -6080,13 +6127,13 @@ obj_val_begin:
        val++;
        ctn_len++;
        if (likely(read_true(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
    }
    if (*cur == 'f') {
        val++;
        ctn_len++;
        if (likely(read_false(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
    }
    if (*cur == 'n') {
        val++;
@@ -6095,7 +6142,7 @@ obj_val_begin:
        if (has_read_flag(ALLOW_INF_AND_NAN)) {
            if (read_nan(false, &cur, pre, val)) goto obj_val_end;
        }
-        goto fail_literal;
+        goto fail_literal_null;
    }
    if (char_is_space(*cur)) {
        while (char_is_space(*++cur));
@@ -6106,13 +6153,13 @@ obj_val_begin:
        val++;
        ctn_len++;
        if (read_inf_or_nan(false, &cur, pre, val)) goto obj_val_end;
-        goto fail_character;
+        goto fail_character_val;
    }
    if (has_read_flag(ALLOW_COMMENTS)) {
        if (skip_spaces_and_comments(&cur)) goto obj_val_begin;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_val;
    
 obj_val_end:
    if (likely(*cur == ',')) {
@@ -6131,7 +6178,7 @@ obj_val_end:
        if (skip_spaces_and_comments(&cur)) goto obj_val_end;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_obj_end;
    
 obj_end:
    /* pop container */
@@ -6174,17 +6221,41 @@ fail_string:
 fail_number:
    return_err(cur, INVALID_NUMBER, msg);
 fail_alloc:
-    return_err(cur, MEMORY_ALLOCATION, "memory allocation failed");
+    return_err(cur, MEMORY_ALLOCATION, 
+               "memory allocation failed");
 fail_trailing_comma:
-    return_err(cur, JSON_STRUCTURE, "trailing comma is not allowed");
-fail_literal:
-    return_err(cur, LITERAL, "invalid literal");
+    return_err(cur, JSON_STRUCTURE, 
+               "trailing comma is not allowed");
+fail_literal_true:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'true'");
+fail_literal_false:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'false'");
+fail_literal_null:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'null'");
+fail_character_val:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a valid JSON value");
+fail_character_arr_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing bracket");
+fail_character_obj_key:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a string for object key");
+fail_character_obj_sep:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a colon after object key");
+fail_character_obj_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing brace");
 fail_comment:
-    return_err(cur, INVALID_COMMENT, "unclosed multiline comment");
-fail_character:
-    return_err(cur, UNEXPECTED_CHARACTER, "unexpected character");
+    return_err(cur, INVALID_COMMENT,
+               "unclosed multiline comment");
 fail_garbage:
-    return_err(cur, UNEXPECTED_CONTENT, "unexpected content after document");
+    return_err(cur, UNEXPECTED_CONTENT, 
+               "unexpected content after document");
    
 #undef val_incr
 #undef return_err
@@ -6330,13 +6401,13 @@ arr_val_begin:
        val_incr();
        ctn_len++;
        if (likely(read_true(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
    }
    if (*cur == 'f') {
        val_incr();
        ctn_len++;
        if (likely(read_false(&cur, val))) goto arr_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
    }
    if (*cur == 'n') {
        val_incr();
@@ -6345,7 +6416,7 @@ arr_val_begin:
        if (has_read_flag(ALLOW_INF_AND_NAN)) {
            if (read_nan(false, &cur, pre, val)) goto arr_val_end;
        }
-        goto fail_literal;
+        goto fail_literal_null;
    }
    if (*cur == ']') {
        cur++;
@@ -6363,13 +6434,13 @@ arr_val_begin:
        val_incr();
        ctn_len++;
        if (read_inf_or_nan(false, &cur, pre, val)) goto arr_val_end;
-        goto fail_character;
+        goto fail_character_val;
    }
    if (has_read_flag(ALLOW_COMMENTS)) {
        if (skip_spaces_and_comments(&cur)) goto arr_val_begin;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_val;
    
 arr_val_end:
    if (byte_match_2(cur, ",\n")) {
@@ -6392,7 +6463,7 @@ arr_val_end:
        if (skip_spaces_and_comments(&cur)) goto arr_val_end;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_arr_end;
    
 arr_end:
    /* get parent container */
@@ -6458,7 +6529,7 @@ obj_key_begin:
        if (skip_spaces_and_comments(&cur)) goto obj_key_begin;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_obj_key;
    
 obj_key_end:
    if (byte_match_2(cur, ": ")) {
@@ -6477,7 +6548,7 @@ obj_key_end:
        if (skip_spaces_and_comments(&cur)) goto obj_key_end;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_obj_sep;
    
 obj_val_begin:
    if (*cur == '"') {
@@ -6504,13 +6575,13 @@ obj_val_begin:
        val++;
        ctn_len++;
        if (likely(read_true(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_true;
    }
    if (*cur == 'f') {
        val++;
        ctn_len++;
        if (likely(read_false(&cur, val))) goto obj_val_end;
-        goto fail_literal;
+        goto fail_literal_false;
    }
    if (*cur == 'n') {
        val++;
@@ -6519,7 +6590,7 @@ obj_val_begin:
        if (has_read_flag(ALLOW_INF_AND_NAN)) {
            if (read_nan(false, &cur, pre, val)) goto obj_val_end;
        }
-        goto fail_literal;
+        goto fail_literal_null;
    }
    if (char_is_space(*cur)) {
        while (char_is_space(*++cur));
@@ -6530,13 +6601,13 @@ obj_val_begin:
        val++;
        ctn_len++;
        if (read_inf_or_nan(false, &cur, pre, val)) goto obj_val_end;
-        goto fail_character;
+        goto fail_character_val;
    }
    if (has_read_flag(ALLOW_COMMENTS)) {
        if (skip_spaces_and_comments(&cur)) goto obj_val_begin;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_val;
    
 obj_val_end:
    if (byte_match_2(cur, ",\n")) {
@@ -6559,7 +6630,7 @@ obj_val_end:
        if (skip_spaces_and_comments(&cur)) goto obj_val_end;
        if (byte_match_2(cur, "/*")) goto fail_comment;
    }
-    goto fail_character;
+    goto fail_character_obj_end;
    
 obj_end:
    /* pop container */
@@ -6603,17 +6674,41 @@ fail_string:
 fail_number:
    return_err(cur, INVALID_NUMBER, msg);
 fail_alloc:
-    return_err(cur, MEMORY_ALLOCATION, "memory allocation failed");
+    return_err(cur, MEMORY_ALLOCATION,
+               "memory allocation failed");
 fail_trailing_comma:
-    return_err(cur, JSON_STRUCTURE, "trailing comma is not allowed");
-fail_literal:
-    return_err(cur, LITERAL, "invalid literal");
+    return_err(cur, JSON_STRUCTURE,
+               "trailing comma is not allowed");
+fail_literal_true:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'true'");
+fail_literal_false:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'false'");
+fail_literal_null:
+    return_err(cur, LITERAL,
+               "invalid literal, expected a valid literal such as 'null'");
+fail_character_val:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a valid JSON value");
+fail_character_arr_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing bracket");
+fail_character_obj_key:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a string for object key");
+fail_character_obj_sep:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a colon after object key");
+fail_character_obj_end:
+    return_err(cur, UNEXPECTED_CHARACTER,
+               "unexpected character, expected a comma or a closing brace");
 fail_comment:
-    return_err(cur, INVALID_COMMENT, "unclosed multiline comment");
-fail_character:
-    return_err(cur, UNEXPECTED_CHARACTER, "unexpected character");
+    return_err(cur, INVALID_COMMENT,
+               "unclosed multiline comment");
 fail_garbage:
-    return_err(cur, UNEXPECTED_CONTENT, "unexpected content after document");
+    return_err(cur, UNEXPECTED_CONTENT,
+               "unexpected content after document");
    
 #undef val_incr
 #undef return_err
@@ -7835,7 +7930,7 @@ static const u8 esc_single_char_table[512] = {

 /** Returns the encode table with options. */
 static_inline const char_enc_type *get_enc_table_with_flag(
-    yyjson_read_flag flg) {
+    yyjson_write_flag flg) {
    if (has_write_flag(ESCAPE_UNICODE)) {
        if (has_write_flag(ESCAPE_SLASHES)) {
            return enc_table_esc_slash;
@@ -527,16 +527,16 @@ extern "C" {
 #define YYJSON_VERSION_MAJOR  0

 /** The minor version of yyjson. */
-#define YYJSON_VERSION_MINOR  9
+#define YYJSON_VERSION_MINOR  10

 /** The patch version of yyjson. */
 #define YYJSON_VERSION_PATCH  0

 /** The version of yyjson in hex: `(major << 16) | (minor << 8) | (patch)`. */
-#define YYJSON_VERSION_HEX    0x000900
+#define YYJSON_VERSION_HEX    0x000A00

 /** The version string of yyjson. */
-#define YYJSON_VERSION_STRING "0.9.0"
+#define YYJSON_VERSION_STRING "0.10.0"

 /** The version of yyjson in hex, same as `YYJSON_VERSION_HEX`. */
 yyjson_api uint32_t yyjson_version(void);
@@ -841,6 +841,24 @@ typedef struct yyjson_read_err {
    size_t pos;
 } yyjson_read_err;

+/**
+ Locate the line and column number for a byte position in a string.
+ This can be used to get better description for error position.
+ 
+ @param str The input string.
+ @param len The byte length of the input string.
+ @param pos The byte position within the input string.
+ @param line A pointer to receive the line number, starting from 1.
+ @param col  A pointer to receive the column number, starting from 1.
+ @param chr  A pointer to receive the character index, starting from 0.
+ @return true on success, false if `str` is NULL or `pos` is out of bounds.
+ @note Line/column/character are calculated based on Unicode characters for
+    compatibility with text editors. For multi-byte UTF-8 characters,
+    the returned value may not directly correspond to the byte position.
+ */
+yyjson_api bool yyjson_locate_pos(const char *str, size_t len, size_t pos,
+                                  size_t *line, size_t *col, size_t *chr);
+


 /**
@@ -1,4 +1,5 @@
 #include "commandoption.h"
+#include "common/color.h"
 #include "common/printing.h"
 #include "common/time.h"
 #include "common/jsonconfig.h"
@@ -105,35 +106,35 @@ static void parseStructureCommand(
 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';

-        uint64_t ms = 0;
-        if(instance.config.display.stat)
+        double ms = 0;
+        if(thres >= 0)
            ms = ffTimeGetTick();

        parseStructureCommand(data->structure.chars + startIndex, genJsonResult, jsonDoc);

-        if(instance.config.display.stat)
+        if(thres >= 0)
        {
            ms = ffTimeGetTick() - ms;

            if (jsonDoc)
            {
                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_uint(jsonDoc, moduleJson, "stat", ms);
+                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
            }
            else
            {
-                char str[32];
-                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                if(instance.config.display.pipe)
-                    puts(str);
-                else
-                    printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                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
            }
        }

@@ -7,12 +7,11 @@

 static bool loadLibSymbols(FFDBusLibrary* lib)
 {
-    FF_LIBRARY_LOAD(dbus, &instance.config.library.libDBus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
+    FF_LIBRARY_LOAD(dbus, false, "libdbus-1" FF_LIBRARY_EXTENSION, 4);
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_bus_get, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_new_method_call, false)
+    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_append_args, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_init_append, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_append_basic, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_arg_type, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_get_basic, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_recurse, false)
@@ -20,10 +19,6 @@ static bool loadLibSymbols(FFDBusLibrary* lib)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_iter_next, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_message_unref, false)
    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_send_with_reply_and_block, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_connection_flush, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_block, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_steal_reply, false)
-    FF_LIBRARY_LOAD_SYMBOL_PTR(dbus, lib, dbus_pending_call_unref, false)
    dbus = NULL; // don't auto dlclose
    return true;
 }
@@ -56,11 +51,11 @@ const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data)
    return NULL;
 }

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

-    if(argType == DBUS_TYPE_STRING)
+    if(argType == DBUS_TYPE_STRING || argType == DBUS_TYPE_OBJECT_PATH)
    {
        const char* value = NULL;
        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
@@ -72,6 +67,14 @@ bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
        return true;
    }

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

@@ -79,7 +82,7 @@ bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)
    dbus->lib->ffdbus_message_iter_recurse(iter, &subIter);

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

    //At this point we have an array

@@ -87,13 +90,16 @@ bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result)

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

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

    if(foundAValue)
@@ -122,11 +128,27 @@ bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result)
    return ffDBusGetBool(dbus, &subIter, result);
 }

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

    if(argType == DBUS_TYPE_BYTE)
+    {
+        uint8_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
+        return true;
+    }
+
+    if(argType == DBUS_TYPE_UINT16)
+    {
+        uint16_t value = 0;
+        dbus->lib->ffdbus_message_iter_get_basic(iter, &value);
+        *result = value;
+        return true;
+    }
+
+    if(argType == DBUS_TYPE_UINT32)
    {
        dbus->lib->ffdbus_message_iter_get_basic(iter, result);
        return true;
@@ -137,15 +159,18 @@ bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result)

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

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

+    if (arg)
+        dbus->lib->ffdbus_message_append_args(message, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
+
    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);

    dbus->lib->ffdbus_message_unref(message);
@@ -159,20 +184,10 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
    if(message == NULL)
        return NULL;

-    DBusMessageIter requestIterator;
-    dbus->lib->ffdbus_message_iter_init_append(message, &requestIterator);
-
-    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &interface))
-    {
-        dbus->lib->ffdbus_message_unref(message);
-        return NULL;
-    }
-
-    if(!dbus->lib->ffdbus_message_iter_append_basic(&requestIterator, DBUS_TYPE_STRING, &property))
-    {
-        dbus->lib->ffdbus_message_unref(message);
-        return NULL;
-    }
+    dbus->lib->ffdbus_message_append_args(message,
+        DBUS_TYPE_STRING, &interface,
+        DBUS_TYPE_STRING, &property,
+        DBUS_TYPE_INVALID);

    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);

@@ -194,7 +209,27 @@ bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char*
        return false;
    }

-    bool ret = ffDBusGetValue(dbus, &rootIterator, result);
+    bool ret = ffDBusGetString(dbus, &rootIterator, result);
+
+    dbus->lib->ffdbus_message_unref(reply);
+
+    return ret;
+}
+
+bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result)
+{
+    DBusMessage* reply = ffDBusGetProperty(dbus, busName, objectPath, interface, property);
+    if(reply == NULL)
+        return false;
+
+    DBusMessageIter rootIterator;
+    if(!dbus->lib->ffdbus_message_iter_init(reply, &rootIterator))
+    {
+        dbus->lib->ffdbus_message_unref(reply);
+        return false;
+    }
+
+    bool ret = ffDBusGetUint(dbus, &rootIterator, result);

    dbus->lib->ffdbus_message_unref(reply);

@@ -6,23 +6,14 @@
 #include "util/FFstrbuf.h"
 #include "common/library.h"

-#define FF_DBUS_TIMEOUT_MILLISECONDS 35
-
-#define FF_DBUS_ITER_CONTINUE(dbus, iterator) \
-    { \
-        if(!(dbus)->lib->ffdbus_message_iter_has_next(iterator)) \
-            break; \
-        (dbus)->lib->ffdbus_message_iter_next(iterator); \
-        continue; \
-    }
+#define FF_DBUS_TIMEOUT_MILLISECONDS 100

 typedef struct FFDBusLibrary
 {
    FF_LIBRARY_SYMBOL(dbus_bus_get)
    FF_LIBRARY_SYMBOL(dbus_message_new_method_call)
+    FF_LIBRARY_SYMBOL(dbus_message_append_args)
    FF_LIBRARY_SYMBOL(dbus_message_iter_init)
-    FF_LIBRARY_SYMBOL(dbus_message_iter_init_append)
-    FF_LIBRARY_SYMBOL(dbus_message_iter_append_basic)
    FF_LIBRARY_SYMBOL(dbus_message_iter_get_arg_type)
    FF_LIBRARY_SYMBOL(dbus_message_iter_get_basic)
    FF_LIBRARY_SYMBOL(dbus_message_iter_recurse)
@@ -30,10 +21,6 @@ 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_flush)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_block)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_steal_reply)
-    FF_LIBRARY_SYMBOL(dbus_pending_call_unref)
 } FFDBusLibrary;

 typedef struct FFDBusData
@@ -43,11 +30,12 @@ typedef struct FFDBusData
 } FFDBusData;

 const char* ffDBusLoadData(DBusBusType busType, FFDBusData* data); //Returns an error message or NULL on success
-bool ffDBusGetValue(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result);
+bool ffDBusGetString(FFDBusData* dbus, DBusMessageIter* iter, FFstrbuf* result);
 bool ffDBusGetBool(FFDBusData* dbus, DBusMessageIter* iter, bool* result);
-bool ffDBusGetByte(FFDBusData* dbus, DBusMessageIter* iter, uint8_t* result);
-DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* method);
+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* 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 ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result);

 #endif // FF_HAVE_DBUS
@@ -51,7 +51,7 @@ static void fontInitPretty(FFfont* font)

    for(uint32_t i = 0; i < font->styles.length; i++)
    {
-        ffStrbufAppend(&font->pretty, ffListGet(&font->styles, i));
+        ffStrbufAppend(&font->pretty, FF_LIST_GET(FFstrbuf, font->styles, i));

        if(i < font->styles.length - 1)
            ffStrbufAppendS(&font->pretty, ", ");
@@ -86,7 +86,7 @@ void ffFontInitQt(FFfont* font, const char* data)
    {
        do
        {
-            FFstrbuf* style = ffListAdd(&font->styles);
+            FFstrbuf* style = (FFstrbuf*) ffListAdd(&font->styles);
            ffStrbufInit(style);
            data = ffStrbufAppendSUntilC(style, data, ' ');
            if (data) data++;
@@ -142,7 +142,7 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern
    ) {
        if(alternativeBuffer == NULL)
        {
-            alternativeBuffer = ffListAdd(&font->styles);
+            alternativeBuffer = (FFstrbuf*) ffListAdd(&font->styles);
            ffStrbufInit(alternativeBuffer);
        }

@@ -215,7 +215,7 @@ void ffFontDestroy(FFfont* font)
    ffStrbufDestroy(&font->name);
    ffStrbufDestroy(&font->size);

-    for(uint32_t i = 0; i < font->styles.length; i++)
-        ffStrbufDestroy(ffListGet(&font->styles, i));
+    FF_LIST_FOR_EACH(FFstrbuf, str, font->styles)
+        ffStrbufDestroy(str);
    ffListDestroy(&font->styles);
 }
@@ -8,39 +8,53 @@

 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
 {
-    if(formatarg->type == FF_FORMAT_ARG_TYPE_INT)
-        ffStrbufAppendF(buffer, "%i", *(int*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT)
-        ffStrbufAppendF(buffer, "%" PRIu32, *(uint32_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT64)
-        ffStrbufAppendF(buffer, "%" PRIu64, *(uint64_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT16)
-        ffStrbufAppendF(buffer, "%" PRIu16, *(uint16_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_UINT8)
-        ffStrbufAppendF(buffer, "%" PRIu8, *(uint8_t*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_STRING)
-        ffStrbufAppendS(buffer, (const char*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_STRBUF)
-        ffStrbufAppend(buffer, (FFstrbuf*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_FLOAT)
-        ffStrbufAppendF(buffer, "%f", *(float*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_DOUBLE)
-        ffStrbufAppendF(buffer, "%g", *(double*)formatarg->value);
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_BOOL)
-        ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false");
-    else if(formatarg->type == FF_FORMAT_ARG_TYPE_LIST)
+    switch(formatarg->type)
    {
-        const FFlist* list = formatarg->value;
-        for(uint32_t i = 0; i < list->length; i++)
+        case FF_FORMAT_ARG_TYPE_INT:
+            ffStrbufAppendF(buffer, "%" PRIi32, *(int32_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT:
+            ffStrbufAppendF(buffer, "%" PRIu32, *(uint32_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT64:
+            ffStrbufAppendF(buffer, "%" PRIu64, *(uint64_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT16:
+            ffStrbufAppendF(buffer, "%" PRIu16, *(uint16_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_UINT8:
+            ffStrbufAppendF(buffer, "%" PRIu8, *(uint8_t*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_STRING:
+            ffStrbufAppendS(buffer, (const char*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_STRBUF:
+            ffStrbufAppend(buffer, (FFstrbuf*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_FLOAT:
+            ffStrbufAppendF(buffer, "%f", *(float*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_DOUBLE:
+            ffStrbufAppendF(buffer, "%g", *(double*)formatarg->value);
+            break;
+        case FF_FORMAT_ARG_TYPE_BOOL:
+            ffStrbufAppendS(buffer, *(bool*)formatarg->value ? "true" : "false");
+            break;
+        case FF_FORMAT_ARG_TYPE_LIST:
        {
-            ffStrbufAppend(buffer, ffListGet(list, i));
-            if(i < list->length - 1)
-                ffStrbufAppendS(buffer, ", ");
+            const FFlist* list = (const FFlist*) formatarg->value;
+            for(uint32_t i = 0; i < list->length; i++)
+            {
+                ffStrbufAppend(buffer, FF_LIST_GET(FFstrbuf, *list, i));
+                if(i < list->length - 1)
+                    ffStrbufAppendS(buffer, ", ");
+            }
+            break;
        }
-    }
-    else if(formatarg->type != FF_FORMAT_ARG_TYPE_NULL)
-    {
-        fprintf(stderr, "Error: format string \"%s\": argument is not implemented: %i\n", buffer->chars, formatarg->type);
+        default:
+            if(formatarg->type != FF_FORMAT_ARG_TYPE_NULL)
+                fprintf(stderr, "Error: format string \"%s\": argument is not implemented: %i\n", buffer->chars, formatarg->type);
+            break;
    }
 }

@@ -96,11 +110,12 @@ static inline bool formatArgSet(const FFformatarg* arg)
        (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0.0) || //Also is false for NaN
        (arg->type == FF_FORMAT_ARG_TYPE_INT && *(int*)arg->value > 0) ||
        (arg->type == FF_FORMAT_ARG_TYPE_STRBUF && ((FFstrbuf*)arg->value)->length > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet(arg->value)) ||
+        (arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet((char*)arg->value)) ||
        (arg->type == FF_FORMAT_ARG_TYPE_UINT8 && *(uint8_t*)arg->value > 0) ||
        (arg->type == FF_FORMAT_ARG_TYPE_UINT16 && *(uint16_t*)arg->value > 0) ||
        (arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_BOOL && arg->value != NULL)
+        (arg->type == FF_FORMAT_ARG_TYPE_BOOL && *(bool*)arg->value) ||
+        (arg->type == FF_FORMAT_ARG_TYPE_LIST && ((FFlist*)arg->value)->length > 0)
    );
 }

@@ -244,18 +259,39 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n
            continue;
        }

-        int32_t truncLength = INT32_MAX;
-        char* pColon = memchr(placeholderValue.chars, ':', placeholderValue.length);
-        if (pColon != NULL)
+        //test for constant, if so evaluate it
+        if (firstChar == '$')
        {
-            char* pEnd = NULL;
-            truncLength = (int32_t) strtol(pColon + 1, &pEnd, 10);
-            if (*pEnd != '\0')
+            char* pend = NULL;
+            int32_t indexSigned = (int32_t) strtol(placeholderValue.chars + 1, &pend, 10);
+            uint32_t index = (uint32_t) indexSigned;
+            bool backward = indexSigned < 0;
+
+            if (indexSigned == 0 || *pend != '\0' || instance.config.display.constants.length < index)
            {
                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
                continue;
            }
-            *pColon = '\0';
+
+            FFstrbuf* item = FF_LIST_GET(FFstrbuf, instance.config.display.constants, backward
+                ? instance.config.display.constants.length - index
+                : index - 1);
+            ffStrbufAppend(buffer, item);
+            continue;
+        }
+
+        char* pSep = placeholderValue.chars;
+        char cSep = '\0';
+        while (*pSep && *pSep != ':' && *pSep != '<' && *pSep != '>' && *pSep != '~')
+            ++pSep;
+        if (*pSep)
+        {
+            cSep = *pSep;
+            *pSep = '\0';
+        }
+        else
+        {
+            pSep = NULL;
        }

        uint32_t index = getArgumentIndex(placeholderValue.chars, numArgs, arguments);
@@ -266,26 +302,99 @@ void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t n

        if (index > numArgs)
        {
-            if (pColon) *pColon = ':';
+            if (pSep) *pSep = cSep;
            appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
            continue;
        }

-        bool ellipsis = false;
-        if (truncLength < 0)
+        if (!cSep)
+            ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
+        else if (cSep == '~')
        {
-            ellipsis = true;
-            truncLength = -truncLength;
-        }
+            FF_STRBUF_AUTO_DESTROY tempString = ffStrbufCreate();
+            ffFormatAppendFormatArg(&tempString, &arguments[index - 1]);

-        uint32_t oldLength = buffer->length;
-        ffFormatAppendFormatArg(buffer, &arguments[index - 1]);
-        if (buffer->length - oldLength > (uint32_t) truncLength)
+            char* pEnd = NULL;
+            int32_t start = (int32_t) strtol(pSep + 1, &pEnd, 10);
+            if (start < 0)
+                start = (int32_t) tempString.length + start;
+            if (start >= 0 && (uint32_t) start < tempString.length)
+            {
+                if (*pEnd == '\0')
+                    ffStrbufAppendNS(buffer, tempString.length - (uint32_t) start, &tempString.chars[start]);
+                else if (*pEnd == ',')
+                {
+                    int32_t end = (int32_t) strtol(pEnd + 1, &pEnd, 10);
+                    if (!*pEnd)
+                    {
+                        if (end < 0)
+                            end = (int32_t) tempString.length + end;
+                        if ((uint32_t) end > tempString.length)
+                            end = (int32_t) tempString.length;
+                        if (end > start)
+                            ffStrbufAppendNS(buffer, (uint32_t) (end - start), &tempString.chars[start]);
+                    }
+                }
+            }
+
+            if (*pEnd)
+            {
+                *pSep = cSep;
+                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                continue;
+            }
+        }
+        else
        {
-            ffStrbufSubstrBefore(buffer, oldLength + (uint32_t) truncLength);
-            ffStrbufTrimRightSpace(buffer);
-            if (ellipsis)
-                ffStrbufAppendS(buffer, "…");
+            char* pEnd = NULL;
+            int32_t truncLength = (int32_t) strtol(pSep + 1, &pEnd, 10);
+            if (*pEnd != '\0')
+            {
+                *pSep = cSep;
+                appendInvalidPlaceholder(buffer, "{", &placeholderValue, i, formatstr->length);
+                continue;
+            }
+
+            bool ellipsis = false;
+            if (truncLength < 0)
+            {
+                ellipsis = true;
+                truncLength = -truncLength;
+            }
+
+            FF_STRBUF_AUTO_DESTROY tempString = ffStrbufCreate();
+            ffFormatAppendFormatArg(&tempString, &arguments[index - 1]);
+            if (tempString.length == (uint32_t) truncLength)
+                ffStrbufAppend(buffer, &tempString);
+            else if (tempString.length > (uint32_t) truncLength)
+            {
+                if (cSep == ':')
+                {
+                    ffStrbufSubstrBefore(&tempString, (uint32_t) truncLength);
+                    ffStrbufTrimRightSpace(&tempString);
+                }
+                else
+                    ffStrbufSubstrBefore(&tempString, (uint32_t) (!ellipsis? truncLength : truncLength - 1));
+                ffStrbufAppend(buffer, &tempString);
+
+                if (ellipsis)
+                    ffStrbufAppendS(buffer, "…");
+            }
+            else if (cSep == ':')
+                ffStrbufAppend(buffer, &tempString);
+            else
+            {
+                if (cSep == '<')
+                {
+                    ffStrbufAppend(buffer, &tempString);
+                    ffStrbufAppendNC(buffer, (uint32_t) truncLength - tempString.length, ' ');
+                }
+                else
+                {
+                    ffStrbufAppendNC(buffer, (uint32_t) truncLength - tempString.length, ' ');
+                    ffStrbufAppend(buffer, &tempString);
+                }
+            }
        }
    }

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

-typedef enum FFformatargtype
+#include "util/FFstrbuf.h"
+
+typedef enum FFformatArgType
 {
    FF_FORMAT_ARG_TYPE_NULL = 0,
    FF_FORMAT_ARG_TYPE_UINT,
@@ -14,11 +16,26 @@ typedef enum FFformatargtype
    FF_FORMAT_ARG_TYPE_DOUBLE,
    FF_FORMAT_ARG_TYPE_LIST,
    FF_FORMAT_ARG_TYPE_BOOL
-} FFformatargtype;
+} FFformatArgType;
+
+#define FF_FORMAT_ARG(variable, var_name) { _Generic((variable), \
+        uint32_t: FF_FORMAT_ARG_TYPE_UINT, \
+        uint64_t: FF_FORMAT_ARG_TYPE_UINT64, \
+        uint16_t: FF_FORMAT_ARG_TYPE_UINT16, \
+        uint8_t: FF_FORMAT_ARG_TYPE_UINT8, \
+        int32_t: FF_FORMAT_ARG_TYPE_INT, \
+        char*: FF_FORMAT_ARG_TYPE_STRING, \
+        const char*: FF_FORMAT_ARG_TYPE_STRING, \
+        FFstrbuf: FF_FORMAT_ARG_TYPE_STRBUF, \
+        float: FF_FORMAT_ARG_TYPE_FLOAT, \
+        double: FF_FORMAT_ARG_TYPE_DOUBLE, \
+        FFlist: FF_FORMAT_ARG_TYPE_LIST, \
+        bool: FF_FORMAT_ARG_TYPE_BOOL \
+    ), _Generic((variable), char*: (variable), const char*: (variable), default: &(variable) ), (var_name) }

 typedef struct FFformatarg
 {
-    FFformatargtype type;
+    FFformatArgType type;
    const void* value;
    const char* name; // argument name, must start with an alphabet
 } FFformatarg;
@@ -26,6 +43,6 @@ typedef struct FFformatarg
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
 void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
 #define FF_PARSE_FORMAT_STRING_CHECKED(buffer, formatstr, numArgs, arguments) do {\
-    static_assert(sizeof(arguments) / sizeof(*(arguments)) == (numArgs), "Invalid number of format arguments");\
+    static_assert(sizeof(arguments) / sizeof(*arguments) == (numArgs), "Invalid number of format arguments");\
    ffParseFormatString((buffer), (formatstr), (numArgs), (arguments));\
 } while (0)
@@ -43,7 +43,6 @@ static void defaultConfig(void)
    ffOptionsInitGeneral(&instance.config.general);
    ffOptionsInitModules(&instance.config.modules);
    ffOptionsInitDisplay(&instance.config.display);
-    ffOptionsInitLibrary(&instance.config.library);
 }

 void ffInitInstance(void)
@@ -54,10 +53,6 @@ void ffInitInstance(void)
    #else
        // Never use `setlocale(LC_ALL, "")`
        setlocale(LC_TIME, "");
-        setlocale(LC_NUMERIC, "");
-        #ifdef LC_MESSAGES
-            setlocale(LC_MESSAGES, "");
-        #endif
    #endif

    initState(&instance.state);
@@ -152,7 +147,6 @@ static void destroyConfig(void)
    ffOptionsDestroyGeneral(&instance.config.general);
    ffOptionsDestroyModules(&instance.config.modules);
    ffOptionsDestroyDisplay(&instance.config.display);
-    ffOptionsDestroyLibrary(&instance.config.library);
 }

 static void destroyState(void)
@@ -173,96 +167,105 @@ void ffDestroyInstance(void)
 void ffListFeatures(void)
 {
    fputs(
-        #ifdef FF_HAVE_THREADS
+        #if FF_HAVE_THREADS
            "threads\n"
        #endif
-        #ifdef FF_HAVE_VULKAN
+        #if FF_HAVE_VULKAN
            "vulkan\n"
        #endif
-        #ifdef FF_HAVE_WAYLAND
+        #if FF_HAVE_WAYLAND
            "wayland\n"
        #endif
-        #ifdef FF_HAVE_XCB_RANDR
+        #if FF_HAVE_XCB_RANDR
            "xcb-randr\n"
        #endif
-        #ifdef FF_HAVE_XCB
+        #if FF_HAVE_XCB
            "xcb\n"
        #endif
-        #ifdef FF_HAVE_XRANDR
+        #if FF_HAVE_XRANDR
            "xrandr\n"
        #endif
-        #ifdef FF_HAVE_X11
+        #if FF_HAVE_X11
            "x11\n"
        #endif
-        #ifdef FF_HAVE_DRM
+        #if FF_HAVE_DRM
            "drm\n"
        #endif
-        #ifdef FF_HAVE_GIO
+        #if FF_HAVE_DRM_AMDGPU
+            "drm_amdgpu\n"
+        #endif
+        #if FF_HAVE_GIO
            "gio\n"
        #endif
-        #ifdef FF_HAVE_DCONF
+        #if FF_HAVE_DCONF
            "dconf\n"
        #endif
-        #ifdef FF_HAVE_DBUS
+        #if FF_HAVE_DBUS
            "dbus\n"
        #endif
-        #ifdef FF_HAVE_IMAGEMAGICK7
+        #if FF_HAVE_IMAGEMAGICK7
            "imagemagick7\n"
        #endif
-        #ifdef FF_HAVE_IMAGEMAGICK6
+        #if FF_HAVE_IMAGEMAGICK6
            "imagemagick6\n"
        #endif
-        #ifdef FF_HAVE_CHAFA
+        #if FF_HAVE_CHAFA
            "chafa\n"
        #endif
-        #ifdef FF_HAVE_ZLIB
+        #if FF_HAVE_ZLIB
            "zlib\n"
        #endif
-        #ifdef FF_HAVE_XFCONF
+        #if FF_HAVE_XFCONF
            "xfconf\n"
        #endif
-        #ifdef FF_HAVE_SQLITE3
+        #if FF_HAVE_SQLITE3
            "sqlite3\n"
        #endif
-        #ifdef FF_HAVE_RPM
+        #if FF_HAVE_RPM
            "rpm\n"
        #endif
-        #ifdef FF_HAVE_EGL
+        #if FF_HAVE_EGL
            "egl\n"
        #endif
-        #ifdef FF_HAVE_GLX
+        #if FF_HAVE_GLX
            "glx\n"
        #endif
-        #ifdef FF_HAVE_OSMESA
+        #if FF_HAVE_OSMESA
            "osmesa\n"
        #endif
-        #ifdef FF_HAVE_OPENCL
+        #if FF_HAVE_OPENCL
            "opencl\n"
        #endif
-        #ifdef FF_HAVE_FREETYPE
+        #if FF_HAVE_FREETYPE
            "freetype\n"
        #endif
-        #ifdef FF_HAVE_PULSE
+        #if FF_HAVE_PULSE
            "libpulse\n"
        #endif
-        #ifdef FF_HAVE_LIBNM
-            "libnm\n"
-        #endif
-        #ifdef FF_HAVE_DDCUTIL
+        #if FF_HAVE_DDCUTIL
            "libddcutil\n"
        #endif
-        #ifdef FF_HAVE_DIRECTX_HEADERS
+        #if FF_HAVE_ELF || __sun || (__FreeBSD__ && !__DragonFly__) || __OpenBSD__ || __NetBSD__
+            "libelf\n"
+        #endif
+        #if FF_HAVE_LIBZFS
+            "libzfs\n"
+        #endif
+        #if FF_HAVE_DIRECTX_HEADERS
            "Directx Headers\n"
        #endif
-        #ifdef FF_USE_SYSTEM_YYJSON
+        #if FF_USE_SYSTEM_YYJSON
            "System yyjson\n"
        #endif
-        #if __has_include(<linux/videodev2.h>)
+        #if FF_HAVE_LINUX_VIDEODEV2
            "linux/videodev2\n"
        #endif
-        #if __has_include(<linux/wireless.h>)
+        #if FF_HAVE_LINUX_WIRELESS
            "linux/wireless\n"
        #endif
+        #if FF_HAVE_EMBEDDED_PCIIDS
+            "Embedded pciids\n"
+        #endif
        ""
    , stdout);
 }
@@ -8,11 +8,15 @@
    #include <handleapi.h>
    #include <io.h>
    typedef HANDLE FFNativeFD;
+    #define FF_INVALID_FD INVALID_HANDLE_VALUE
 #else
    #include <unistd.h>
    #include <dirent.h>
    #include <sys/stat.h>
+    #include <errno.h>
+    #include <limits.h>
    typedef int FFNativeFD;
+    #define FF_INVALID_FD (-1)
    // procfs's file can be changed between read calls such as /proc/meminfo and /proc/uptime.
    // one safe way to read correct data is reading the whole file in a single read syscall
    // 8192 comes from procps-ng: https://gitlab.com/procps-ng/procps/-/blob/master/library/meminfo.c?ref_type=heads#L39
@@ -64,9 +68,11 @@ static inline ssize_t ffReadFDData(FFNativeFD fd, size_t dataSize, void* data)
 }

 ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data);
+ssize_t ffReadFileDataRelative(FFNativeFD dfd, const char* fileName, size_t dataSize, void* data);

 bool ffAppendFDBuffer(FFNativeFD fd, FFstrbuf* buffer);
 bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer);
+bool ffAppendFileBufferRelative(FFNativeFD dfd, const char* fileName, FFstrbuf* buffer);

 static inline bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer)
 {
@@ -74,6 +80,12 @@ static inline bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer)
    return ffAppendFileBuffer(fileName, buffer);
 }

+static inline bool ffReadFileBufferRelative(FFNativeFD dfd, const char* fileName, FFstrbuf* buffer)
+{
+    ffStrbufClear(buffer);
+    return ffAppendFileBufferRelative(dfd, fileName, buffer);
+}
+
 //Bit flags, combine with |
 typedef enum FFPathType
 {
@@ -99,17 +111,30 @@ static inline bool ffPathExists(const char* path, FFPathType pathType)

    #else

-    struct stat fileStat;
-    if(stat(path, &fileStat) != 0)
-        return false;
+    if (pathType == FF_PATHTYPE_ANY)
+    {
+        // Zero overhead
+        return access(path, F_OK) == 0;
+    }
+    else
+    {
+        size_t len = strlen(path);
+        assert(len < PATH_MAX);
+        if (len == 0) return false;

-    unsigned int mode = fileStat.st_mode & S_IFMT;
-
-    if(pathType & FF_PATHTYPE_FILE && mode != S_IFDIR)
-        return true;
-
-    if(pathType & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
-        return true;
+        int ret;
+        if (path[len - 1] != '/')
+        {
+            char buf[PATH_MAX + 1];
+            memcpy(buf, path, len);
+            buf[len] = '/';
+            buf[len + 1] = 0;
+            ret = access(buf, F_OK);
+        }
+        else
+            ret = access(path, F_OK);
+        return pathType == FF_PATHTYPE_DIRECTORY ? ret == 0 : ret == -1 && errno == ENOTDIR;
+    }

    #endif

@@ -120,8 +145,8 @@ bool ffPathExpandEnv(const char* in, FFstrbuf* out);

 #define FF_IO_TERM_RESP_WAIT_MS 100 // #554

-FF_C_SCANF(2, 3)
-const char* ffGetTerminalResponse(const char* request, const char* format, ...);
+FF_C_SCANF(3, 4)
+const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...);

 // Not thread safe!
 bool ffSuppressIO(bool suppress);
@@ -201,3 +226,8 @@ static inline bool ffSearchUserConfigFile(const FFlist* configDirs, const char*

    return false;
 }
+
+#ifdef _WIN32
+// Only O_RDONLY is supported
+HANDLE openat(HANDLE dfd, const char* fileName, bool directory);
+#endif
@@ -4,12 +4,21 @@

 #include <fcntl.h>
 #include <termios.h>
-#include <poll.h>
 #include <dirent.h>
 #include <errno.h>
+#ifndef __APPLE__
+#include <poll.h>
+#else
+#include <sys/select.h>
+#endif

-#if __has_include(<wordexp.h>)
-#include <wordexp.h>
+#if FF_HAVE_WORDEXP
+    #include <wordexp.h>
+#elif FF_HAVE_GLOB
+    #warning "<wordexp.h> is not available, use <glob.h> instead"
+    #include <glob.h>
+#else
+    #warning "Neither <wordexp.h> nor <glob.h> is available"
 #endif

 static void createSubfolders(const char* fileName)
@@ -28,7 +37,7 @@ static void createSubfolders(const char* fileName)
 bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
 {
    int openFlagsModes = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC;
-    int openFlagsRights = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+    mode_t openFlagsRights = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;

    int FF_AUTO_CLOSE_FD fd = open(fileName, openFlagsModes, openFlagsRights);
    if(fd == -1)
@@ -99,6 +108,15 @@ ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
    return ffReadFDData(fd, dataSize, data);
 }

+ssize_t ffReadFileDataRelative(int dfd, const char* fileName, size_t dataSize, void* data)
+{
+    int FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, O_RDONLY | O_CLOEXEC);
+    if(fd == -1)
+        return -1;
+
+    return ffReadFDData(fd, dataSize, data);
+}
+
 bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
 {
    int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY | O_CLOEXEC);
@@ -108,14 +126,23 @@ bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
    return ffAppendFDBuffer(fd, buffer);
 }

+bool ffAppendFileBufferRelative(int dfd, const char* fileName, FFstrbuf* buffer)
+{
+    int FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, O_RDONLY | O_CLOEXEC);
+    if(fd == -1)
+        return false;
+
+    return ffAppendFDBuffer(fd, buffer);
+}
+
 bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* out)
 {
    bool result = false;

-    #if __has_include(<wordexp.h>) // https://github.com/termux/termux-packages/pull/7056
+    #if FF_HAVE_WORDEXP // https://github.com/termux/termux-packages/pull/7056

    wordexp_t exp;
-    if(wordexp(in, &exp, 0) != 0)
+    if (wordexp(in, &exp, 0) != 0)
        return false;

    if (exp.we_wordc == 1)
@@ -126,60 +153,101 @@ bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* o

    wordfree(&exp);

+    #elif FF_HAVE_GLOB
+
+    glob_t gb;
+    if (glob(in, GLOB_NOSORT | GLOB_TILDE, NULL, &gb) != 0)
+        return false;
+
+    if (gb.gl_matchc == 1)
+    {
+        result = true;
+        ffStrbufSetS(out, gb.gl_pathv[0]);
+    }
+
+    globfree(&gb);
+
    #endif

    return result;
 }

-const char* ffGetTerminalResponse(const char* request, const char* format, ...)
+static int ftty = -1;
+static struct termios oldTerm;
+void restoreTerm(void)
 {
-    int fin = STDIN_FILENO, fout = STDOUT_FILENO;
-    FF_AUTO_CLOSE_FD int ftty = -1;
+    tcsetattr(ftty, TCSAFLUSH, &oldTerm);
+}

-    if (!isatty(STDIN_FILENO))
+const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...)
+{
+    if (ftty < 0)
    {
+        ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
        if (ftty < 0)
-            ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
-        fin = ftty;
-    }
-    if (!isatty(STDOUT_FILENO))
-    {
-        if (ftty < 0)
-            ftty = open("/dev/tty", O_RDWR | O_NOCTTY | O_CLOEXEC);
-        fout = ftty;
+            return "open(\"/dev/tty\", O_RDWR | O_NOCTTY | O_CLOEXEC) failed";
+
+        if(tcgetattr(ftty, &oldTerm) == -1)
+            return "tcgetattr(STDIN_FILENO, &oldTerm) failed";
+
+        struct termios newTerm = oldTerm;
+        newTerm.c_lflag &= (tcflag_t) ~(ICANON | ECHO);
+        if(tcsetattr(ftty, TCSAFLUSH, &newTerm) == -1)
+            return "tcsetattr(STDIN_FILENO, TCSAFLUSH, &newTerm)";
+        atexit(restoreTerm);
    }

-    struct termios oldTerm;
-    if(tcgetattr(fin, &oldTerm) == -1)
-        return "tcgetattr(STDIN_FILENO, &oldTerm) failed";
-
-    struct termios newTerm = oldTerm;
-    newTerm.c_lflag &= (tcflag_t) ~(ICANON | ECHO);
-    if(tcsetattr(fin, TCSAFLUSH, &newTerm) == -1)
-        return "tcsetattr(STDIN_FILENO, TCSAFLUSH, &newTerm)";
-
-    ffWriteFDData(fout, strlen(request), request);
+    ffWriteFDData(ftty, strlen(request), request);

    //Give the terminal some time to respond
-    if(poll(&(struct pollfd) { .fd = fin, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
+    #ifndef __APPLE__
+    if(poll(&(struct pollfd) { .fd = ftty, .events = POLLIN }, 1, FF_IO_TERM_RESP_WAIT_MS) <= 0)
+        return "poll(/dev/tty) timeout or failed";
+    #else
    {
-        tcsetattr(fin, TCSANOW, &oldTerm);
-        return "poll() timeout or failed";
+        // On macOS, poll(/dev/tty) always returns immediately
+        // See also https://nathancraddock.com/blog/macos-dev-tty-polling/
+        fd_set rd;
+        FD_ZERO(&rd);
+        FD_SET(ftty, &rd);
+        if(select(ftty + 1, &rd, NULL, NULL, &(struct timeval) { .tv_sec = FF_IO_TERM_RESP_WAIT_MS / 1000, .tv_usec = (FF_IO_TERM_RESP_WAIT_MS % 1000) * 1000 }) <= 0)
+            return "select(/dev/tty) timeout or failed";
    }
+    #endif

-    char buffer[512];
-    ssize_t bytesRead = read(fin, buffer, sizeof(buffer) - 1);
-
-    tcsetattr(fin, TCSANOW, &oldTerm);
-
-    if(bytesRead <= 0)
-        return "read(STDIN_FILENO, buffer, sizeof(buffer) - 1) failed";
-
-    buffer[bytesRead] = '\0';
+    char buffer[1024];
+    size_t bytesRead = 0;

    va_list args;
    va_start(args, format);
-    vsscanf(buffer, format, args);
+
+    while (true)
+    {
+        ssize_t nRead = read(ftty, buffer + bytesRead, sizeof(buffer) - bytesRead - 1);
+
+        if (nRead <= 0)
+        {
+            va_end(args);
+            return "read(STDIN_FILENO, buffer, sizeof(buffer) - 1) failed";
+        }
+
+        bytesRead += (size_t) nRead;
+        buffer[bytesRead] = '\0';
+
+        va_list cargs;
+        va_copy(cargs, args);
+        int ret = vsscanf(buffer, format, cargs);
+        va_end(cargs);
+
+        if (ret <= 0)
+        {
+            va_end(args);
+            return "vsscanf(buffer, format, args) failed";
+        }
+        if (ret >= nParams)
+            break;
+    }
+
    va_end(args);

    return NULL;
@@ -237,12 +305,15 @@ void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indenta

    while((entry = readdir(dir)) != NULL)
    {
+        if(entry->d_name[0] == '.') // skip hidden files
+            continue;
+
        bool isDir = false;
-#ifdef _DIRENT_HAVE_D_TYPE
+#ifndef __sun
        if(entry->d_type != DT_UNKNOWN && entry->d_type != DT_LNK)
            isDir = entry->d_type == DT_DIR;
        else
-#else
+#endif
        {
            struct stat stbuf;
            if (fstatat(dfd, entry->d_name, &stbuf, 0) < 0)
@@ -250,12 +321,8 @@ void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indenta
            else
                isDir = S_ISDIR(stbuf.st_mode);
        }
-#endif
        if (isDir)
        {
-            if(ffStrEquals(entry->d_name, ".") || ffStrEquals(entry->d_name, ".."))
-                continue;
-
            ffStrbufAppendS(folder, entry->d_name);
            ffStrbufAppendC(folder, '/');
            listFilesRecursively(baseLength, folder, (uint8_t) (indentation + 1), entry->d_name, pretty);
@@ -3,6 +3,8 @@
 #include "util/stringUtils.h"

 #include <windows.h>
+#include <ntstatus.h>
+#include <winternl.h>

 static void createSubfolders(const char* fileName)
 {
@@ -38,7 +40,7 @@ bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)

 static inline void readWithLength(HANDLE handle, FFstrbuf* buffer, uint32_t length)
 {
-    ffStrbufEnsureFixedLengthFree(buffer, length);
+    ffStrbufEnsureFree(buffer, length);
    DWORD bytesRead = 0;
    while(
        length > 0 &&
@@ -100,6 +102,49 @@ bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
    return ffAppendFDBuffer(handle, buffer);
 }

+HANDLE openat(HANDLE dfd, const char* fileName, bool directory)
+{
+    NTSTATUS ret;
+    UNICODE_STRING fileNameW;
+    ret = RtlAnsiStringToUnicodeString(&fileNameW, &(ANSI_STRING) {
+        .Length = (USHORT) strlen(fileName),
+        .Buffer = (PCHAR) fileName
+    }, TRUE);
+    if (!NT_SUCCESS(ret)) return INVALID_HANDLE_VALUE;
+
+    FF_AUTO_CLOSE_FD HANDLE hFile;
+    IO_STATUS_BLOCK iosb = {};
+    ret = NtOpenFile(&hFile, FILE_READ_DATA | SYNCHRONIZE, &(OBJECT_ATTRIBUTES) {
+        .Length = sizeof(OBJECT_ATTRIBUTES),
+        .RootDirectory = dfd,
+        .ObjectName = &fileNameW,
+    }, &iosb, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | (directory ? FILE_DIRECTORY_FILE : FILE_NON_DIRECTORY_FILE));
+    RtlFreeUnicodeString(&fileNameW);
+
+    if(!NT_SUCCESS(ret) || iosb.Information != FILE_OPENED)
+        return INVALID_HANDLE_VALUE;
+
+    return hFile;
+}
+
+bool ffAppendFileBufferRelative(HANDLE dfd, const char* fileName, FFstrbuf* buffer)
+{
+    HANDLE FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, false);
+    if(fd == INVALID_HANDLE_VALUE)
+        return false;
+
+    return ffAppendFDBuffer(fd, buffer);
+}
+
+ssize_t ffReadFileDataRelative(HANDLE dfd, const char* fileName, size_t dataSize, void* data)
+{
+    HANDLE FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, false);
+    if(fd == INVALID_HANDLE_VALUE)
+        return -1;
+
+    return ffReadFDData(fd, dataSize, data);
+}
+
 bool ffPathExpandEnv(const char* in, FFstrbuf* out)
 {
    DWORD length = ExpandEnvironmentStringsA(in, NULL, 0);
@@ -205,7 +250,7 @@ void ffListFilesRecursively(const char* path, bool pretty)
    listFilesRecursively(folder.length, &folder, 0, NULL, pretty);
 }

-const char* ffGetTerminalResponse(const char* request, const char* format, ...)
+const char* ffGetTerminalResponse(const char* request, int nParams, const char* format, ...)
 {
    HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE);
    FF_AUTO_CLOSE_FD HANDLE hConin = INVALID_HANDLE_VALUE;
@@ -229,7 +274,6 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
            hConout = CreateFileW(L"CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, NULL);
            hOutput = hConout;
        }
-        WriteFile(hOutput, "TEST\n", 5, &bytes, NULL);
        WriteFile(hOutput, request, (DWORD) strlen(request), &bytes, NULL);
    }

@@ -257,20 +301,40 @@ const char* ffGetTerminalResponse(const char* request, const char* format, ...)
            ReadConsoleInputW(hInput, &record, 1, &len);
    }

-    char buffer[512];
-    DWORD bytes = 0;
-    ReadFile(hInput, buffer, sizeof(buffer) - 1, &bytes, NULL);
+    va_list args;
+    va_start(args, format);
+
+    char buffer[1024];
+    uint32_t bytesRead = 0;
+
+    while (true)
+    {
+        DWORD bytes = 0;
+        if (!ReadFile(hInput, buffer, sizeof(buffer) - 1, &bytes, NULL) || bytes == 0)
+        {
+            va_end(args);
+            return "ReadFile() failed";
+        }
+
+        bytesRead += bytes;
+        buffer[bytesRead] = '\0';
+
+        va_list cargs;
+        va_copy(cargs, args);
+        int ret = vsscanf(buffer, format, args);
+        va_end(cargs);
+
+        if (ret <= 0)
+        {
+            va_end(args);
+            return "vsscanf(buffer, format, args) failed";
+        }
+        if (ret >= nParams)
+            break;
+    }

    SetConsoleMode(hInput, inputMode);

-    if(bytes <= 0)
-        return "ReadFile() failed";
-
-    buffer[bytes] = '\0';
-
-    va_list args;
-    va_start(args, format);
-    vsscanf(buffer, format, args);
    va_end(args);

    return NULL;
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "common/color.h"
 #include "common/jsonconfig.h"
 #include "common/printing.h"
 #include "common/io/io.h"
@@ -37,6 +38,11 @@ bool ffJsonConfigParseModuleArgs(const char* key, yyjson_val* val, FFModuleArgs*
        moduleArgs->keyWidth = (uint32_t) yyjson_get_uint(val);
        return true;
    }
+    else if(ffStrEqualsIgnCase(key, "keyIcon"))
+    {
+        ffStrbufSetS(&moduleArgs->keyIcon, yyjson_get_str(val));
+        return true;
+    }
    return false;
 }

@@ -50,6 +56,8 @@ void ffJsonConfigGenerateModuleArgsConfig(yyjson_mut_doc* doc, yyjson_mut_val* m
        yyjson_mut_obj_add_strbuf(doc, module, "keyColor", &moduleArgs->keyColor);
    if (moduleArgs->keyWidth != defaultModuleArgs->keyWidth)
        yyjson_mut_obj_add_uint(doc, module, "keyWidth", moduleArgs->keyWidth);
+    if (!ffStrbufEqual(&defaultModuleArgs->keyIcon, &moduleArgs->keyIcon))
+        yyjson_mut_obj_add_strbuf(doc, module, "keyIcon", &moduleArgs->keyIcon);
 }

 const char* ffJsonConfigParseEnum(yyjson_val* val, int* result, FFKeyValuePair pairs[])
@@ -174,12 +182,13 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
    if (!modules) return NULL;
    if (!yyjson_is_arr(modules)) return "Property 'modules' must be an array of strings or objects";

+    int32_t thres = instance.config.display.stat;
    yyjson_val* item;
    size_t idx, max;
    yyjson_arr_foreach(modules, idx, max, item)
    {
-        uint64_t ms = 0;
-        if(!prepare && instance.config.display.stat)
+        double ms = 0;
+        if(!prepare && thres >= 0)
            ms = ffTimeGetTick();

        yyjson_val* module = item;
@@ -201,22 +210,21 @@ static const char* printJsonConfig(bool prepare, yyjson_mut_doc* jsonDoc)
        else if(!parseModuleJsonObject(type, module, jsonDoc))
            return "Unknown module type";

-        if(!prepare && instance.config.display.stat)
+        if(!prepare && thres >= 0)
        {
            ms = ffTimeGetTick() - ms;
            if (jsonDoc)
            {
                yyjson_mut_val* moduleJson = yyjson_mut_arr_get_last(jsonDoc->root);
-                yyjson_mut_obj_add_uint(jsonDoc, moduleJson, "stat", ms);
+                yyjson_mut_obj_add_real(jsonDoc, moduleJson, "stat", ms);
            }
            else
            {
-                char str[32];
-                int len = snprintf(str, sizeof str, "%" PRIu64 "ms", ms);
-                if(instance.config.display.pipe)
-                    puts(str);
-                else
-                    printf("\033[s\033[1A\033[9999999C\033[%dD%s\033[u", len, str); // Save; Up 1; Right 9999999; Left <len>; Print <str>; Load
+                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
            }
        }

@@ -29,6 +29,17 @@ static void* libraryLoad(const char* path, int maxVersion)
    // libX.dll.1 never exists on Windows, while libX-1.dll may exist
    FF_UNUSED(maxVersion)

+    if(result != NULL)
+        return result;
+
+    uint32_t pathLen = ffStrbufLastIndexC(&instance.state.platform.exePath, '/');
+    if (pathLen == instance.state.platform.exePath.length)
+        return result;
+
+    char absPath[MAX_PATH + 1];
+    strcpy(mempcpy(absPath, instance.state.platform.exePath.chars, pathLen + 1), path);
+    return dlopen(absPath, FF_DLOPEN_FLAGS);
+
    #else

    if(result != NULL || maxVersion < 0)
@@ -55,28 +66,28 @@ static void* libraryLoad(const char* path, int maxVersion)
    return result;
 }

-void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...)
+void* ffLibraryLoad(const char* path, int maxVersion, ...)
 {
-    if(userProvidedName != NULL && userProvidedName->length > 0)
-        return dlopen(userProvidedName->chars, FF_DLOPEN_FLAGS);
+    void* result = libraryLoad(path, maxVersion);

-    va_list defaultNames;
-    va_start(defaultNames, userProvidedName);
-
-    void* result = NULL;
-
-    while(result == NULL)
+    if (!result)
    {
-        const char* path = va_arg(defaultNames, const char*);
-        if(path == NULL)
-            break;
+        va_list defaultNames;
+        va_start(defaultNames, maxVersion);

-        int maxVersion = va_arg(defaultNames, int);
-        result = libraryLoad(path, maxVersion);
+        do
+        {
+            const char* pathRest = va_arg(defaultNames, const char*);
+            if(pathRest == NULL)
+                break;
+
+            int maxVersionRest = va_arg(defaultNames, int);
+            result = libraryLoad(pathRest, maxVersionRest);
+        } while (!result);
+
+        va_end(defaultNames);
    }

-    va_end(defaultNames);
-
    return result;
 }

@@ -33,8 +33,8 @@ static inline void ffLibraryUnload(void** handle)
 #define FF_LIBRARY_SYMBOL(symbolName) \
    __typeof__(&symbolName) ff ## symbolName;

-#define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \
-    void* __attribute__((__cleanup__(ffLibraryUnload))) libraryObjectName = ffLibraryLoad(userLibraryName, __VA_ARGS__, NULL);\
+#define FF_LIBRARY_LOAD(libraryObjectName, returnValue, ...) \
+    void* __attribute__((__cleanup__(ffLibraryUnload))) libraryObjectName = ffLibraryLoad(__VA_ARGS__, NULL);\
    if(libraryObjectName == NULL) \
        return returnValue;

@@ -43,11 +43,6 @@ static inline void ffLibraryUnload(void** handle)
    if(symbolMapping == NULL) \
        return returnValue;

-#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, symbolMapping, symbolName, alternateName, returnValue) \
-    symbolMapping = dlsym(library, #symbolName); \
-    if(symbolMapping == NULL && !(symbolMapping = (__typeof__(&symbolName)) dlsym(library, #alternateName))) \
-        return returnValue;
-
 #define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);

@@ -57,22 +52,16 @@ static inline void ffLibraryUnload(void** handle)
 #define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");

-#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE2(library, symbolName, alternateName) \
-    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);

 #define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(library, varName, symbolName) \
    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, "dlsym " #symbolName " failed");

-#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE2(library, varName, symbolName, alternateName) \
-    FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, (varName).ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_PTR(library, varName, symbolName, returnValue) \
    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);

-void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
+void* ffLibraryLoad(const char* path, int maxVersion, ...);

 #else

@@ -81,15 +70,12 @@ void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
 #define FF_LIBRARY_SYMBOL(symbolName) \
    __typeof__(&symbolName) ff ## symbolName;

-#define FF_LIBRARY_LOAD(libraryObjectName, userLibraryName, returnValue, ...) \
+#define FF_LIBRARY_LOAD(libraryObjectName, returnValue, ...) \
    FF_MAYBE_UNUSED void* libraryObjectName = NULL; // Placeholder

 #define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \
    symbolMapping = (__typeof__(&symbolName)) &symbolName

-#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, symbolMapping, symbolName, alternateName, returnValue) \
-    symbolMapping = (__typeof__(&symbolName)) &symbolName
-
 #define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
    FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);

@@ -99,18 +85,12 @@ void* ffLibraryLoad(const FFstrbuf* userProvidedName, ...);
 #define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
    FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");

-#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE2(library, symbolName, alternateName) \
-    FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);

 #define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(library, varName, symbolName) \
    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, "dlsym " #symbolName " failed");

-#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE2(library, varName, symbolName, alternateName) \
-    FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, (varName).ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_PTR(library, varName, symbolName, returnValue) \
    FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);

@@ -5,63 +5,65 @@ static FFModuleBaseInfo* A[] = {
 };

 static FFModuleBaseInfo* B[] = {
-    (void*) &instance.config.modules.battery,
-    (void*) &instance.config.modules.bios,
-    (void*) &instance.config.modules.bluetooth,
-    (void*) &instance.config.modules.board,
-    (void*) &instance.config.modules.bootmgr,
-    (void*) &instance.config.modules.break_,
-    (void*) &instance.config.modules.brightness,
+    (FFModuleBaseInfo*) &instance.config.modules.battery,
+    (FFModuleBaseInfo*) &instance.config.modules.bios,
+    (FFModuleBaseInfo*) &instance.config.modules.bluetooth,
+    (FFModuleBaseInfo*) &instance.config.modules.bluetoothRadio,
+    (FFModuleBaseInfo*) &instance.config.modules.board,
+    (FFModuleBaseInfo*) &instance.config.modules.bootmgr,
+    (FFModuleBaseInfo*) &instance.config.modules.break_,
+    (FFModuleBaseInfo*) &instance.config.modules.brightness,
+    (FFModuleBaseInfo*) &instance.config.modules.btrfs,
    NULL,
 };

 static FFModuleBaseInfo* C[] = {
-    (void*) &instance.config.modules.camera,
-    (void*) &instance.config.modules.chassis,
-    (void*) &instance.config.modules.command,
-    (void*) &instance.config.modules.colors,
-    (void*) &instance.config.modules.cpu,
-    (void*) &instance.config.modules.cpuCache,
-    (void*) &instance.config.modules.cpuUsage,
-    (void*) &instance.config.modules.cursor,
-    (void*) &instance.config.modules.custom,
+    (FFModuleBaseInfo*) &instance.config.modules.camera,
+    (FFModuleBaseInfo*) &instance.config.modules.chassis,
+    (FFModuleBaseInfo*) &instance.config.modules.command,
+    (FFModuleBaseInfo*) &instance.config.modules.colors,
+    (FFModuleBaseInfo*) &instance.config.modules.cpu,
+    (FFModuleBaseInfo*) &instance.config.modules.cpuCache,
+    (FFModuleBaseInfo*) &instance.config.modules.cpuUsage,
+    (FFModuleBaseInfo*) &instance.config.modules.cursor,
+    (FFModuleBaseInfo*) &instance.config.modules.custom,
    NULL,
 };

 static FFModuleBaseInfo* D[] = {
-    (void*) &instance.config.modules.dateTime,
-    (void*) &instance.config.modules.de,
-    (void*) &instance.config.modules.display,
-    (void*) &instance.config.modules.disk,
-    (void*) &instance.config.modules.diskIo,
-    (void*) &instance.config.modules.dns,
+    (FFModuleBaseInfo*) &instance.config.modules.dateTime,
+    (FFModuleBaseInfo*) &instance.config.modules.de,
+    (FFModuleBaseInfo*) &instance.config.modules.display,
+    (FFModuleBaseInfo*) &instance.config.modules.disk,
+    (FFModuleBaseInfo*) &instance.config.modules.diskIo,
+    (FFModuleBaseInfo*) &instance.config.modules.dns,
    NULL,
 };

 static FFModuleBaseInfo* E[] = {
-    (void*) &instance.config.modules.editor,
+    (FFModuleBaseInfo*) &instance.config.modules.editor,
    NULL,
 };

 static FFModuleBaseInfo* F[] = {
-    (void*) &instance.config.modules.font,
+    (FFModuleBaseInfo*) &instance.config.modules.font,
    NULL,
 };

 static FFModuleBaseInfo* G[] = {
-    (void*) &instance.config.modules.gamepad,
-    (void*) &instance.config.modules.gpu,
+    (FFModuleBaseInfo*) &instance.config.modules.gamepad,
+    (FFModuleBaseInfo*) &instance.config.modules.gpu,
    NULL,
 };

 static FFModuleBaseInfo* H[] = {
-    (void*) &instance.config.modules.host,
+    (FFModuleBaseInfo*) &instance.config.modules.host,
    NULL,
 };

 static FFModuleBaseInfo* I[] = {
-    (void*) &instance.config.modules.icons,
-    (void*) &instance.config.modules.initSystem,
+    (FFModuleBaseInfo*) &instance.config.modules.icons,
+    (FFModuleBaseInfo*) &instance.config.modules.initSystem,
    NULL,
 };

@@ -70,45 +72,47 @@ static FFModuleBaseInfo* J[] = {
 };

 static FFModuleBaseInfo* K[] = {
-    (void*) &instance.config.modules.kernel,
+    (FFModuleBaseInfo*) &instance.config.modules.kernel,
+    (FFModuleBaseInfo*) &instance.config.modules.keyboard,
    NULL,
 };

 static FFModuleBaseInfo* L[] = {
-    (void*) &instance.config.modules.lm,
-    (void*) &instance.config.modules.loadavg,
-    (void*) &instance.config.modules.locale,
-    (void*) &instance.config.modules.localIP,
+    (FFModuleBaseInfo*) &instance.config.modules.lm,
+    (FFModuleBaseInfo*) &instance.config.modules.loadavg,
+    (FFModuleBaseInfo*) &instance.config.modules.locale,
+    (FFModuleBaseInfo*) &instance.config.modules.localIP,
    NULL,
 };

 static FFModuleBaseInfo* M[] = {
-    (void*) &instance.config.modules.media,
-    (void*) &instance.config.modules.memory,
-    (void*) &instance.config.modules.monitor,
+    (FFModuleBaseInfo*) &instance.config.modules.media,
+    (FFModuleBaseInfo*) &instance.config.modules.memory,
+    (FFModuleBaseInfo*) &instance.config.modules.monitor,
+    (FFModuleBaseInfo*) &instance.config.modules.mouse,
    NULL,
 };

 static FFModuleBaseInfo* N[] = {
-    (void*) &instance.config.modules.netIo,
+    (FFModuleBaseInfo*) &instance.config.modules.netIo,
    NULL,
 };

 static FFModuleBaseInfo* O[] = {
-    (void*) &instance.config.modules.openCL,
-    (void*) &instance.config.modules.openGL,
-    (void*) &instance.config.modules.os,
+    (FFModuleBaseInfo*) &instance.config.modules.openCL,
+    (FFModuleBaseInfo*) &instance.config.modules.openGL,
+    (FFModuleBaseInfo*) &instance.config.modules.os,
    NULL,
 };

 static FFModuleBaseInfo* P[] = {
-    (void*) &instance.config.modules.packages,
-    (void*) &instance.config.modules.physicalDisk,
-    (void*) &instance.config.modules.physicalMemory,
-    (void*) &instance.config.modules.player,
-    (void*) &instance.config.modules.powerAdapter,
-    (void*) &instance.config.modules.processes,
-    (void*) &instance.config.modules.publicIP,
+    (FFModuleBaseInfo*) &instance.config.modules.packages,
+    (FFModuleBaseInfo*) &instance.config.modules.physicalDisk,
+    (FFModuleBaseInfo*) &instance.config.modules.physicalMemory,
+    (FFModuleBaseInfo*) &instance.config.modules.player,
+    (FFModuleBaseInfo*) &instance.config.modules.powerAdapter,
+    (FFModuleBaseInfo*) &instance.config.modules.processes,
+    (FFModuleBaseInfo*) &instance.config.modules.publicIP,
    NULL,
 };

@@ -121,41 +125,42 @@ static FFModuleBaseInfo* R[] = {
 };

 static FFModuleBaseInfo* S[] = {
-    (void*) &instance.config.modules.separator,
-    (void*) &instance.config.modules.shell,
-    (void*) &instance.config.modules.sound,
-    (void*) &instance.config.modules.swap,
+    (FFModuleBaseInfo*) &instance.config.modules.separator,
+    (FFModuleBaseInfo*) &instance.config.modules.shell,
+    (FFModuleBaseInfo*) &instance.config.modules.sound,
+    (FFModuleBaseInfo*) &instance.config.modules.swap,
    NULL,
 };

 static FFModuleBaseInfo* T[] = {
-    (void*) &instance.config.modules.terminal,
-    (void*) &instance.config.modules.terminalFont,
-    (void*) &instance.config.modules.terminalSize,
-    (void*) &instance.config.modules.terminalTheme,
-    (void*) &instance.config.modules.title,
-    (void*) &instance.config.modules.theme,
+    (FFModuleBaseInfo*) &instance.config.modules.terminal,
+    (FFModuleBaseInfo*) &instance.config.modules.terminalFont,
+    (FFModuleBaseInfo*) &instance.config.modules.terminalSize,
+    (FFModuleBaseInfo*) &instance.config.modules.terminalTheme,
+    (FFModuleBaseInfo*) &instance.config.modules.title,
+    (FFModuleBaseInfo*) &instance.config.modules.theme,
+    (FFModuleBaseInfo*) &instance.config.modules.tpm,
    NULL,
 };

 static FFModuleBaseInfo* U[] = {
-    (void*) &instance.config.modules.uptime,
-    (void*) &instance.config.modules.users,
+    (FFModuleBaseInfo*) &instance.config.modules.uptime,
+    (FFModuleBaseInfo*) &instance.config.modules.users,
    NULL,
 };

 static FFModuleBaseInfo* V[] = {
-    (void*) &instance.config.modules.version,
-    (void*) &instance.config.modules.vulkan,
+    (FFModuleBaseInfo*) &instance.config.modules.version,
+    (FFModuleBaseInfo*) &instance.config.modules.vulkan,
    NULL,
 };

 static FFModuleBaseInfo* W[] = {
-    (void*) &instance.config.modules.wallpaper,
-    (void*) &instance.config.modules.weather,
-    (void*) &instance.config.modules.wm,
-    (void*) &instance.config.modules.wifi,
-    (void*) &instance.config.modules.wmTheme,
+    (FFModuleBaseInfo*) &instance.config.modules.wallpaper,
+    (FFModuleBaseInfo*) &instance.config.modules.weather,
+    (FFModuleBaseInfo*) &instance.config.modules.wm,
+    (FFModuleBaseInfo*) &instance.config.modules.wifi,
+    (FFModuleBaseInfo*) &instance.config.modules.wmTheme,
    NULL,
 };

@@ -168,6 +173,7 @@ static FFModuleBaseInfo* Y[] = {
 };

 static FFModuleBaseInfo* Z[] = {
+    (FFModuleBaseInfo*) &instance.config.modules.zpool,
    NULL,
 };

@@ -91,7 +91,11 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
        if (rtmsg.hdr.rtm_seq == 1 && rtmsg.hdr.rtm_pid == pid)
        {
            struct sockaddr_dl* sdl = (struct sockaddr_dl *)get_rt_address(&rtmsg.hdr, RTA_IFP);
-            if (sdl)
+            if (sdl
+                #ifndef __sun
+                && sdl->sdl_len
+                #endif
+            )
            {
                assert(sdl->sdl_nlen <= IF_NAMESIZE);
                memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);
@@ -13,11 +13,9 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
    if (!netRoute) return false;

    // skip first line
-    flockfile(netRoute);
-    while (getc_unlocked(netRoute) != '\n');
-    funlockfile(netRoute);
-    unsigned long long destination; //, gateway, flags, refCount, use, metric, mask, mtu,
+    FF_UNUSED(fscanf(netRoute, "%*[^\n]\n"));

+    unsigned long long destination; //, gateway, flags, refCount, use, metric, mask, mtu,
    while (fscanf(netRoute, "%" FF_STR(IF_NAMESIZE) "s%llx%*[^\n]", iface, &destination) == 2)
    {
        if (destination != 0) continue;
@@ -132,5 +132,6 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf
    } while (ffStrbufGetFree(buffer) > 0 && strstr(buffer->chars + recvStart, "\r\n\r\n") == NULL);

    close(state->sockfd);
+    if (buffer->length == 0) return "Empty server response received";
    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n") ? NULL : "Invalid response";
 }
@@ -63,19 +63,21 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
        return "socket() failed";
    }

-    {
-        //ConnectEx requires the socket to be initially bound
-        if(bind(state->sockfd, (SOCKADDR *) &(struct sockaddr_in) {
+    //ConnectEx requires the socket to be initially bound
+    if((state->ipv6
+        ? bind(state->sockfd, (SOCKADDR *) &(struct sockaddr_in6) {
+            .sin6_family = AF_INET6,
+            .sin6_addr = in6addr_any,
+        }, sizeof(struct sockaddr_in6))
+        : bind(state->sockfd, (SOCKADDR *) &(struct sockaddr_in) {
            .sin_family = AF_INET,
            .sin_addr.s_addr = INADDR_ANY,
-            .sin_port = 0,
-        }, sizeof(struct sockaddr_in)) != 0)
-        {
-            closesocket(state->sockfd);
-            freeaddrinfo(addr);
-            state->sockfd = INVALID_SOCKET;
-            return "bind() failed";
-        }
+        }, sizeof(struct sockaddr_in))) != 0)
+    {
+        closesocket(state->sockfd);
+        freeaddrinfo(addr);
+        state->sockfd = INVALID_SOCKET;
+        return "bind() failed";
    }

    FF_STRBUF_AUTO_DESTROY command = ffStrbufCreateA(64);
@@ -93,7 +95,6 @@ const char* ffNetworkingSendHttpRequest(FFNetworkingState* state, const char* ho
    if(!result && WSAGetLastError() != WSA_IO_PENDING)
    {
        closesocket(state->sockfd);
-        freeaddrinfo(addr);
        state->sockfd = INVALID_SOCKET;
        return "ConnectEx() failed";
    }
@@ -140,5 +141,6 @@ const char* ffNetworkingRecvHttpResponse(FFNetworkingState* state, FFstrbuf* buf
    } while (ffStrbufGetFree(buffer) > 0 && strstr(buffer->chars + recvStart, "\r\n\r\n") == NULL);

    closesocket(state->sockfd);
+    if (buffer->length == 0) return "Empty server response received";
    return ffStrbufStartsWithS(buffer, "HTTP/1.1 200 OK\r\n") ? NULL : "Invalid response";
 }
@@ -50,20 +50,29 @@ bool ffOptionParseModuleArgs(const char* argumentKey, const char* subKey, const
        ffOptionParseColor(value, &result->outputColor);
        return true;
    }
-    else if(ffStrEqualsIgnCase(subKey, "key-color"))
+    else if(ffStrStartsWithIgnCase(subKey, "key-"))
    {
-        if(value == NULL)
+        const char* subKey2 = subKey + strlen("key-");
+        if(ffStrEqualsIgnCase(subKey2, "color"))
        {
-            fprintf(stderr, "Error: usage: %s <str>\n", argumentKey);
-            exit(477);
+            if(value == NULL)
+            {
+                fprintf(stderr, "Error: usage: %s <str>\n", argumentKey);
+                exit(477);
+            }
+            ffOptionParseColor(value, &result->keyColor);
+            return true;
+        }
+        else if(ffStrEqualsIgnCase(subKey2, "width"))
+        {
+            result->keyWidth = ffOptionParseUInt32(argumentKey, value);
+            return true;
+        }
+        else if(ffStrEqualsIgnCase(subKey2, "icon"))
+        {
+            ffOptionParseString(argumentKey, value, &result->keyIcon);
+            return true;
        }
-        ffOptionParseColor(value, &result->keyColor);
-        return true;
-    }
-    else if(ffStrEqualsIgnCase(subKey, "key-width"))
-    {
-        result->keyWidth = ffOptionParseUInt32(argumentKey, value);
-        return true;
    }
    return false;
 }
@@ -148,6 +157,14 @@ bool ffOptionParseBoolean(const char* str)

 void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
 {
+    // If value is already an ANSI escape code, use it
+    if (value[0] == '\e' && value[1] == '[')
+    {
+        ffStrbufAppendS(buffer, value + 2);
+        ffStrbufTrimRight(buffer, 'm');
+        return;
+    }
+
    ffStrbufEnsureFree(buffer, 63);

    while(*value != '\0')
@@ -189,6 +206,11 @@ void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
            else FF_APPEND_COLOR_PROP_COND(title, colorTitle)
            else FF_APPEND_COLOR_PROP_COND(output, colorOutput)
            else FF_APPEND_COLOR_PROP_COND(separator, colorSeparator)
+            else
+            {
+                fprintf(stderr, "Error: invalid color code found: %s\n", value);
+                exit(479);
+            }
        }
        ffStrbufAppendC(buffer, *value);
        ++value;
@@ -197,20 +219,3 @@ void ffOptionParseColorNoClear(const char* value, FFstrbuf* buffer)
        #undef FF_APPEND_COLOR_PROP_COND
    }
 }
-
-void ffOptionInitModuleArg(FFModuleArgs* args)
-{
-    ffStrbufInit(&args->key);
-    ffStrbufInit(&args->keyColor);
-    ffStrbufInit(&args->outputFormat);
-    ffStrbufInit(&args->outputColor);
-    args->keyWidth = 0;
-}
-
-void ffOptionDestroyModuleArg(FFModuleArgs* args)
-{
-    ffStrbufDestroy(&args->key);
-    ffStrbufDestroy(&args->keyColor);
-    ffStrbufDestroy(&args->outputFormat);
-    ffStrbufDestroy(&args->outputColor);
-}
@@ -45,10 +45,19 @@ static inline void ffOptionInitModuleBaseInfo(
    baseInfo->generateJsonConfig = (__typeof__(baseInfo->generateJsonConfig)) generateJsonConfig;
 }

+typedef enum FFModuleKeyType
+{
+    FF_MODULE_KEY_TYPE_NONE = 0,
+    FF_MODULE_KEY_TYPE_STRING = 1 << 0,
+    FF_MODULE_KEY_TYPE_ICON = 1 << 1,
+    FF_MODULE_KEY_TYPE_BOTH = FF_MODULE_KEY_TYPE_STRING | FF_MODULE_KEY_TYPE_ICON,
+} FFModuleKeyType;
+
 typedef struct FFModuleArgs
 {
    FFstrbuf key;
    FFstrbuf keyColor;
+    FFstrbuf keyIcon;
    FFstrbuf outputFormat;
    FFstrbuf outputColor;
    uint32_t keyWidth;
@@ -73,5 +82,22 @@ static inline void ffOptionParseColor(const char* value, FFstrbuf* buffer)
    ffStrbufClear(buffer);
    ffOptionParseColorNoClear(value, buffer);
 }
-void ffOptionInitModuleArg(FFModuleArgs* args);
-void ffOptionDestroyModuleArg(FFModuleArgs* args);
+
+static inline void ffOptionInitModuleArg(FFModuleArgs* args, const char* icon)
+{
+    ffStrbufInit(&args->key);
+    ffStrbufInit(&args->keyColor);
+    ffStrbufInitStatic(&args->keyIcon, icon);
+    ffStrbufInit(&args->outputFormat);
+    ffStrbufInit(&args->outputColor);
+    args->keyWidth = 0;
+}
+
+static inline void ffOptionDestroyModuleArg(FFModuleArgs* args)
+{
+    ffStrbufDestroy(&args->key);
+    ffStrbufDestroy(&args->keyColor);
+    ffStrbufDestroy(&args->keyIcon);
+    ffStrbufDestroy(&args->outputFormat);
+    ffStrbufDestroy(&args->outputColor);
+}
@@ -72,22 +72,22 @@ static void parseSize(FFstrbuf* result, uint64_t bytes, uint32_t base, const cha
    }

    if(counter == 0)
-        ffStrbufAppendF(result, "%"PRIu64" %s", bytes, prefixes[0]);
+        ffStrbufAppendF(result, "%" PRIu64 " %s", bytes, prefixes[0]);
    else
        ffStrbufAppendF(result, "%.*f %s", instance.config.display.sizeNdigits, size, prefixes[counter]);
 }

 void ffParseSize(uint64_t bytes, FFstrbuf* result)
 {
-    switch (instance.config.display.binaryPrefixType)
+    switch (instance.config.display.sizeBinaryPrefix)
    {
-        case FF_BINARY_PREFIX_TYPE_IEC:
+        case FF_SIZE_BINARY_PREFIX_TYPE_IEC:
            parseSize(result, bytes, 1024, (const char*[]) {"B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", NULL});
            break;
-        case FF_BINARY_PREFIX_TYPE_SI:
+        case FF_SIZE_BINARY_PREFIX_TYPE_SI:
            parseSize(result, bytes, 1000, (const char*[]) {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB", NULL});
            break;
-        case FF_BINARY_PREFIX_TYPE_JEDEC:
+        case FF_SIZE_BINARY_PREFIX_TYPE_JEDEC:
            parseSize(result, bytes, 1024, (const char*[]) {"B", "KB", "MB", "GB", "TB", NULL});
            break;
        default:
@@ -96,6 +96,20 @@ void ffParseSize(uint64_t bytes, FFstrbuf* result)
    }
 }

+bool ffParseFrequency(uint32_t mhz, FFstrbuf* result)
+{
+    if (mhz == 0)
+        return false;
+
+    int8_t ndigits = instance.config.display.freqNdigits;
+
+    if (ndigits >= 0)
+        ffStrbufAppendF(result, "%.*f GHz", ndigits, mhz / 1000.);
+    else
+        ffStrbufAppendF(result, "%u MHz", (unsigned) mhz);
+    return true;
+}
+
 void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, const FFstrbuf* gtk4)
 {
    if(gtk2->length > 0 && gtk3->length > 0 && gtk4->length > 0)
@@ -176,6 +190,48 @@ void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, co
    }
 }

+void ffParseDuration(uint32_t days, uint32_t hours, uint32_t minutes, uint32_t seconds, FFstrbuf* result)
+{
+    if(days == 0 && hours == 0 && minutes == 0)
+    {
+        ffStrbufAppendF(result, "%u seconds", seconds);
+        return;
+    }
+
+    if(days > 0)
+    {
+        ffStrbufAppendF(result, "%u day", days);
+
+        if(days > 1)
+            ffStrbufAppendC(result, 's');
+
+        if(days >= 100)
+            ffStrbufAppendS(result, "(!)");
+
+        if(hours > 0 || minutes > 0)
+            ffStrbufAppendS(result, ", ");
+    }
+
+    if(hours > 0)
+    {
+        ffStrbufAppendF(result, "%u hour", hours);
+
+        if(hours > 1)
+            ffStrbufAppendC(result, 's');
+
+        if(minutes > 0)
+            ffStrbufAppendS(result, ", ");
+    }
+
+    if(minutes > 0)
+    {
+        ffStrbufAppendF(result, "%u min", minutes);
+
+        if(minutes > 1)
+            ffStrbufAppendC(result, 's');
+    }
+}
+
 #ifdef _WIN32
    #pragma GCC diagnostic pop
 #endif
@@ -26,3 +26,5 @@ void ffVersionToPretty(const FFVersion* version, FFstrbuf* pretty);
 int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2);

 void ffParseSize(uint64_t bytes, FFstrbuf* result);
+bool ffParseFrequency(uint32_t mhz, FFstrbuf* result);
+void ffParseDuration(uint32_t days, uint32_t hours, uint32_t minutes, uint32_t seconds, FFstrbuf* result);
@@ -11,8 +11,10 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
        return;

    //This is used as a magic value for hiding keys
-    if (!(moduleArgs && ffStrbufEqualS(&moduleArgs->key, " ")))
+    if (!(moduleArgs && ffStrbufEqualS(&moduleArgs->key, " ")) && instance.config.display.keyType != FF_MODULE_KEY_TYPE_NONE)
    {
+        ffPrintCharTimes(' ', instance.config.display.keyPaddingLeft);
+
        if(!instance.config.display.pipe)
        {
            fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
@@ -25,21 +27,35 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
                ffPrintColor(&instance.config.display.colorKeys);
        }

-        //NULL check is required for modules with custom keys, e.g. disk with the folder path
-        if((printType & FF_PRINT_TYPE_NO_CUSTOM_KEY) || !moduleArgs || moduleArgs->key.length == 0)
+        bool hasIcon = false;
+        if (instance.config.display.keyType & FF_MODULE_KEY_TYPE_ICON && moduleArgs && moduleArgs->keyIcon.length > 0)
        {
-            fputs(moduleName, stdout);
-
-            if(moduleIndex > 0)
-                printf(" %hhu", moduleIndex);
+            ffStrbufWriteTo(&moduleArgs->keyIcon, stdout);
+            hasIcon = true;
        }
-        else
+
+        if (instance.config.display.keyType & FF_MODULE_KEY_TYPE_STRING)
        {
-            FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
-            FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 1, ((FFformatarg[]){
-                {FF_FORMAT_ARG_TYPE_UINT8, &moduleIndex, "index"},
-            }));
-            ffStrbufWriteTo(&key, stdout);
+            if(hasIcon)
+                putchar(' ');
+
+            //NULL check is required for modules with custom keys, e.g. disk with the folder path
+            if((printType & FF_PRINT_TYPE_NO_CUSTOM_KEY) || !moduleArgs || moduleArgs->key.length == 0)
+            {
+                fputs(moduleName, stdout);
+
+                if(moduleIndex > 0)
+                    printf(" %hhu", moduleIndex);
+            }
+            else
+            {
+                FF_STRBUF_AUTO_DESTROY key = ffStrbufCreate();
+                FF_PARSE_FORMAT_STRING_CHECKED(&key, &moduleArgs->key, 2, ((FFformatarg[]){
+                    FF_FORMAT_ARG(moduleIndex, "index"),
+                    FF_FORMAT_ARG(moduleArgs->keyIcon, "icon"),
+                }));
+                ffStrbufWriteTo(&key, stdout);
+            }
        }

        if(!instance.config.display.pipe)
@@ -64,7 +80,7 @@ void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModu
    if(!instance.config.display.pipe)
    {
        fputs(FASTFETCH_TEXT_MODIFIER_RESET, stdout);
-        if (moduleArgs->outputColor.length)
+        if (moduleArgs && moduleArgs->outputColor.length)
            ffPrintColor(&moduleArgs->outputColor);
        else if (instance.config.display.colorOutput.length)
            ffPrintColor(&instance.config.display.colorOutput);
@@ -14,7 +14,7 @@ typedef enum FFPrintType {
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType);
 void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments);
 #define FF_PRINT_FORMAT_CHECKED(moduleName, moduleIndex, moduleArgs, printType, numArgs, arguments) do {\
-    static_assert(sizeof(arguments) / sizeof(*(arguments)) == (numArgs), "Invalid number of format arguments");\
+    static_assert(sizeof(arguments) / sizeof(*arguments) == (numArgs), "Invalid number of format arguments");\
    ffPrintFormat((moduleName), (moduleIndex), (moduleArgs), (printType), (numArgs), (arguments));\
 } while (0)
 FF_C_PRINTF(5, 6) void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...);
@@ -23,6 +23,6 @@ void ffPrintCharTimes(char c, uint32_t times);

 void ffPrintModuleFormatHelp(const char* name, const char* def, uint32_t numArgs, const char* args[]);
 #define FF_PRINT_MODULE_FORMAT_HELP_CHECKED(moduleName, def, numArgs, args) do {\
-    static_assert(sizeof(args) / sizeof(*(args)) == (numArgs), "Invalid number of format arguments");\
+    static_assert(sizeof(args) / sizeof(*args) == (numArgs), "Invalid number of format arguments");\
    ffPrintModuleFormatHelp((moduleName), (def), (numArgs), (args));\
 } while (0)
@@ -22,6 +22,13 @@
    #include <libproc.h>
 #elif defined(__sun)
    #include <procfs.h>
+#elif defined(__OpenBSD__)
+    #include <sys/param.h>
+    #include <sys/sysctl.h>
+    #include <kvm.h>
+#elif defined(__NetBSD__)
+    #include <sys/types.h>
+    #include <sys/sysctl.h>
 #endif

 enum { FF_PIPE_BUFSIZ = 8192 };
@@ -135,12 +142,13 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
    if (exePath)
    {
        snprintf(filePath, sizeof(filePath), "/proc/%d/exe", (int)pid);
-        ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
-        ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
+        char buf[PATH_MAX];
+        ssize_t length = readlink(filePath, buf, PATH_MAX - 1);
        if (length > 0) // doesn't contain trailing NUL
        {
-            exePath->chars[length] = '\0';
-            exePath->length = (uint32_t) length;
+            buf[length] = '\0';
+            ffStrbufEnsureFixedLengthFree(exePath, (uint32_t)length + 1); // +1 for the NUL
+            ffStrbufAppendNS(exePath, (uint32_t)length, buf);
        }
    }

@@ -148,14 +156,14 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons

    size_t len = 0;
    int mibs[] = { CTL_KERN, KERN_PROCARGS2, pid };
-    if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), NULL, &len, NULL, 0) == 0)
+    if (sysctl(mibs, ARRAY_SIZE(mibs), NULL, &len, NULL, 0) == 0)
    {// try get arg0
        #ifndef MAC_OS_X_VERSION_10_15
        //don't know why if don't let len longer, proArgs2 and len will change during the following sysctl() in old MacOS version.
        len++;
        #endif
        FF_AUTO_FREE char* const procArgs2 = malloc(len);
-        if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), procArgs2, &len, NULL, 0) == 0)
+        if (sysctl(mibs, ARRAY_SIZE(mibs), procArgs2, &len, NULL, 0) == 0)
        {
            // https://gist.github.com/nonowarn/770696#file-getargv-c-L46
            uint32_t argc = *(uint32_t*) procArgs2;
@@ -197,7 +205,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
        }
    }

-    #elif defined(__FreeBSD__)
+    #elif defined(__FreeBSD__) || defined(__NetBSD__)

    size_t size = ARG_MAX;
    FF_AUTO_FREE char* args = malloc(size);
@@ -205,7 +213,13 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
    static_assert(ARG_MAX > PATH_MAX, "");

    if(exePath && sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid}, 4,
+        (int[]){CTL_KERN,
+        #if __FreeBSD__
+            KERN_PROC, KERN_PROC_PATHNAME, pid
+        #else
+            KERN_PROC_ARGS, pid, KERN_PROC_PATHNAME
+        #endif
+        }, 4,
        args, &size,
        NULL, 0
    ) == 0)
@@ -213,7 +227,13 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons

    size = ARG_MAX;
    if(sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_ARGS, pid}, 4,
+        (int[]){CTL_KERN,
+            #if __FreeBSD__
+                KERN_PROC, KERN_PROC_ARGS, pid
+            #else
+                KERN_PROC_ARGS, pid, KERN_PROC_ARGV,
+            #endif
+        }, 4,
        args, &size,
        NULL, 0
    ) == 0)
@@ -238,7 +258,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons

    #elif defined(__sun)

-    char filePath[PATH_MAX];
+    char filePath[128];
    snprintf(filePath, sizeof(filePath), "/proc/%d/psinfo", (int) pid);
    psinfo_t proc;
    if (ffReadFileData(filePath, sizeof(proc), &proc) == sizeof(proc))
@@ -250,15 +270,28 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
    if (exePath)
    {
        snprintf(filePath, sizeof(filePath), "/proc/%d/path/a.out", (int) pid);
-        ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
-        ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
+        char buf[PATH_MAX];
+        ssize_t length = readlink(filePath, buf, PATH_MAX - 1);
        if (length > 0) // doesn't contain trailing NUL
        {
-            exePath->chars[length] = '\0';
-            exePath->length = (uint32_t) length;
+            buf[length] = '\0';
+            ffStrbufEnsureFixedLengthFree(exePath, (uint32_t)length + 1); // +1 for the NUL
+            ffStrbufAppendNS(exePath, (uint32_t)length, buf);
        }
    }

+    #elif defined(__OpenBSD__)
+
+    kvm_t* kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
+    int count = 0;
+    const struct kinfo_proc* proc = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(struct kinfo_proc), &count);
+    if (proc)
+    {
+        char** argv = kvm_getargv(kd, proc, 0);
+        if (argv) ffStrbufSetS(exe, argv[0]);
+    }
+    kvm_close(kd);
+
    #endif

    if(exe->length == 0)
@@ -334,6 +367,13 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, i

    #elif defined(__FreeBSD__)

+    #ifdef __DragonFly__
+        #define ki_comm kp_comm
+        #define ki_ppid kp_ppid
+        #define ki_tdev kp_tdev
+        #define ki_flag kp_flags
+    #endif
+
    struct kinfo_proc proc;
    size_t size = sizeof(proc);
    if(sysctl(
@@ -360,6 +400,34 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, i
            *tty = -1;
    }

+    #elif defined(__NetBSD__)
+
+    struct kinfo_proc2 proc;
+    size_t size = sizeof(proc);
+    if(sysctl(
+        (int[]){CTL_KERN, KERN_PROC2, KERN_PROC_PID, pid, sizeof(proc), 1}, 6,
+        &proc, &size,
+        NULL, 0
+    ) != 0)
+        return "sysctl(KERN_PROC_PID) failed";
+
+    ffStrbufSetS(name, proc.p_comm);
+    if (ppid)
+        *ppid = (pid_t)proc.p_ppid;
+    if (tty)
+    {
+        if (proc.p_flag & P_CONTROLT)
+        {
+            const char* ttyName = devname(proc.p_tdev, S_IFCHR);
+            if (ffStrStartsWith(ttyName, "pts/"))
+                *tty = (int32_t) strtol(ttyName + strlen("pts/"), NULL, 10);
+            else
+                *tty = -1;
+        }
+        else
+            *tty = -1;
+    }
+
    #elif defined(__sun)
    char path[128];
    snprintf(path, sizeof(path), "/proc/%d/psinfo", (int) pid);
@@ -373,6 +441,23 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, i
    if (tty)
        *tty = (int) proc.pr_ttydev;

+    #elif defined(__OpenBSD__)
+
+    kvm_t* kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, NULL);
+    int count = 0;
+    const struct kinfo_proc* proc = kvm_getprocs(kd, KERN_PROC_PID, pid, sizeof(struct kinfo_proc), &count);
+    if (proc)
+    {
+        ffStrbufSetS(name, proc->p_comm);
+        if (ppid)
+            *ppid = proc->p_ppid;
+        if (tty)
+            *tty = (int) proc->p_tdev;
+    }
+    kvm_close(kd);
+    if (!proc)
+        return "kvm_getprocs() failed";
+
    #else

    return "Unsupported platform";
@@ -8,12 +8,52 @@

 enum { FF_PIPE_BUFSIZ = 8192 };

+static void argvToCmdline(char* const argv[], FFstrbuf* result)
+{
+    // From https://gist.github.com/jin-x/cdd641d98887524b091fb1f82a68717d
+
+    FF_STRBUF_AUTO_DESTROY temp = ffStrbufCreate();
+    for (int i = 0; argv[i] != NULL; i++)
+    {
+        ffStrbufSetS(&temp, argv[i]);
+        // Add slash (\) before double quotes (") and duplicate slashes before it
+        for (
+            uint32_t pos = ffStrbufFirstIndexC(&temp, '"'), cnt;
+            pos != temp.length;
+            pos = ffStrbufNextIndexC(&temp, pos + cnt * 2, '"')
+        ) {
+            cnt = 1;
+            while (pos > 0 && temp.chars[pos - 1] == '\\') { ++cnt, --pos; }
+            ffStrbufInsertNC(&temp, pos, cnt, '\\');
+        }
+
+        // Add quotes around string if whitespace chars are present (with slash duplicating at the end of string)
+        if (ffStrbufFirstIndexS(&temp, " \t") != temp.length)
+        {
+            uint32_t pos = temp.length;
+            uint32_t cnt = 0;
+            while (pos > 0 && temp.chars[pos - 1] == '\\') { ++cnt, --pos; }
+            if (cnt > 0) ffStrbufAppendNC(&temp, cnt, '\\');
+            ffStrbufPrependC(&temp, '"');
+            ffStrbufAppendC(&temp, '"');
+        }
+
+        // Add space delimiter
+        if (i > 0) ffStrbufAppendC(result, ' ');
+        ffStrbufAppend(result, &temp);
+        ffStrbufClear(&temp);
+    }
+}
+
 const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr)
 {
    int timeout = instance.config.general.processingTimeout;

+    wchar_t pipeName[32];
+    swprintf(pipeName, ARRAY_SIZE(pipeName), L"\\\\.\\pipe\\FASTFETCH-%u", GetCurrentProcessId());
+
    FF_AUTO_CLOSE_FD HANDLE hChildPipeRead = CreateNamedPipeW(
-        L"\\\\.\\pipe\\LOCAL\\",
+        pipeName,
        PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE | (timeout < 0 ? 0 : FILE_FLAG_OVERLAPPED),
        0,
        1,
@@ -23,10 +63,10 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
        NULL
    );
    if (hChildPipeRead == INVALID_HANDLE_VALUE)
-        return "CreateNamedPipeW(L\"\\\\.\\pipe\\LOCAL\\\") failed";
+        return "CreateNamedPipeW(L\"\\\\.\\pipe\\FASTFETCH-$(PID)\") failed";

    HANDLE hChildPipeWrite = CreateFileW(
-        L"\\\\.\\pipe\\LOCAL\\",
+        pipeName,
        GENERIC_WRITE,
        0,
        &(SECURITY_ATTRIBUTES){
@@ -39,7 +79,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
        NULL
    );
    if (hChildPipeWrite == INVALID_HANDLE_VALUE)
-        return "CreateFileW(L\"\\\\.\\pipe\\LOCAL\\\") failed";
+        return "CreateFileW(L\"\\\\.\\pipe\\FASTFETCH-$(PID)\") failed";

    PROCESS_INFORMATION piProcInfo = {0};

@@ -55,12 +95,8 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
        else
            siStartInfo.hStdOutput = hChildPipeWrite;

-        FF_STRBUF_AUTO_DESTROY cmdline = ffStrbufCreateF("\"%s\"", argv[0]);
-        for(char* const* parg = &argv[1]; *parg; ++parg)
-        {
-            ffStrbufAppendC(&cmdline, ' ');
-            ffStrbufAppendS(&cmdline, *parg);
-        }
+        FF_STRBUF_AUTO_DESTROY cmdline = ffStrbufCreate();
+        argvToCmdline(argv, &cmdline);

        success = CreateProcessA(
            NULL,          // application name
@@ -4,11 +4,12 @@
 #include "util/mallocHelper.h"

 #include <stdlib.h>
+#include <ctype.h>
 #ifdef _WIN32
    #include "util/windows/getline.h"
 #endif

-static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)
+bool ffParsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer)
 {
    if(**line == '\0')
        return false;
@@ -32,7 +33,7 @@ static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf*
        }

        //Line doesn't match start, skip it
-        if(**line != *start || **line == '\0')
+        if(tolower(**line) != tolower(*start) || **line == '\0')
            return false;

        //Line and start match, continue testing
@@ -69,14 +70,9 @@ static bool parsePropLinePointer(const char** line, const char* start, FFstrbuf*
    return true;
 }

-bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer)
-{
-    return parsePropLinePointer(&line, start, buffer);
-}
-
 bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer)
 {
-    while(!parsePropLinePointer(&lines, start, buffer))
+    while(!ffParsePropLinePointer(&lines, start, buffer))
    {
        while(*lines != '\0' && *lines != '\n')
            ++lines;
@@ -104,7 +100,7 @@ bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquer
    bool valueStorage[32];
    bool* unsetValues = valueStorage;

-    if (numQueries > sizeof(valueStorage) / sizeof(valueStorage[0]))
+    if (numQueries > ARRAY_SIZE(valueStorage))
        unsetValues = malloc(sizeof(bool) * numQueries);

    bool allSet = true;
@@ -8,12 +8,18 @@ typedef struct FFpropquery
    FFstrbuf* buffer;
 } FFpropquery;

-bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer);
 bool ffParsePropLines(const char* lines, const char* start, FFstrbuf* buffer);
 bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquery* queries);
 bool ffParsePropFileHomeValues(const char* relativeFile, uint32_t numQueries, FFpropquery* queries);
 bool ffParsePropFileListValues(const FFlist* list, const char* relativeFile, uint32_t numQueries, FFpropquery* queries);

+bool ffParsePropLinePointer(const char** line, const char* start, FFstrbuf* buffer);
+
+static inline bool ffParsePropLine(const char* line, const char* start, FFstrbuf* buffer)
+{
+    return ffParsePropLinePointer(&line, start, buffer);
+}
+
 static inline bool ffParsePropFile(const char* filename, const char* start, FFstrbuf* buffer)
 {
    return ffParsePropFileValues(filename, 1, (FFpropquery[]){{start, buffer}});
@@ -60,7 +60,7 @@ static const GSettingsData* getGSettingsData(void)
    if (!data.inited)
    {
        data.inited = true;
-        FF_LIBRARY_LOAD(libgsettings, &instance.config.library.libGIO, NULL, "libgio-2.0" FF_LIBRARY_EXTENSION, 1);
+        FF_LIBRARY_LOAD(libgsettings, NULL, "libgio-2.0" FF_LIBRARY_EXTENSION, 1);
        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_schema_source_lookup, NULL)
        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_schema_has_key, NULL)
        FF_LIBRARY_LOAD_SYMBOL_VAR(libgsettings, data, g_settings_new_full, NULL)
@@ -141,7 +141,7 @@ static const DConfData* getDConfData(void)
    {
        data.inited = true;

-        FF_LIBRARY_LOAD(libdconf, &instance.config.library.libDConf, NULL, "libdconf" FF_LIBRARY_EXTENSION, 2);
+        FF_LIBRARY_LOAD(libdconf, NULL, "libdconf" FF_LIBRARY_EXTENSION, 2);
        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data, dconf_client_read_full, NULL)
        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data, dconf_client_new, NULL)
        FF_LIBRARY_LOAD_SYMBOL_VAR(libdconf, data.variantGetters, g_variant_dup_string, NULL)
@@ -218,7 +218,7 @@ static const XFConfData* getXFConfData(void)
    if (!data.inited)
    {
        data.inited = true;
-        FF_LIBRARY_LOAD(libxfconf, &instance.config.library.libXFConf, NULL, "libxfconf-0" FF_LIBRARY_EXTENSION, 4);
+        FF_LIBRARY_LOAD(libxfconf, NULL, "libxfconf-0" FF_LIBRARY_EXTENSION, 4);

        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_get, NULL)
        FF_LIBRARY_LOAD_SYMBOL_VAR(libxfconf, data, xfconf_channel_has_property, NULL)
@@ -292,7 +292,7 @@ static const SQLiteData* getSQLiteData(void)
    if (!data.inited)
    {
        data.inited = true;
-        FF_LIBRARY_LOAD(libsqlite, &instance.config.library.libSQLite3, NULL, "libsqlite3" FF_LIBRARY_EXTENSION, 1);
+        FF_LIBRARY_LOAD(libsqlite, NULL, "libsqlite3" FF_LIBRARY_EXTENSION, 1);
        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_open_v2, NULL)
        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_prepare_v2, NULL)
        FF_LIBRARY_LOAD_SYMBOL_VAR(libsqlite, data, sqlite3_step, NULL)
@@ -2,6 +2,41 @@

 #include <stdlib.h>

+#ifdef __OpenBSD__
+const char* ffSysctlGetString(int mib1, int mib2, FFstrbuf* result)
+{
+    size_t neededLength;
+    if (sysctl((int[]) {mib1, mib2}, 2, NULL, &neededLength, NULL, 0) != 0 || neededLength == 1) //neededLength is 1 for empty strings, because of the null terminator
+        return "sysctlbyname() failed";
+
+    ffStrbufEnsureFree(result, (uint32_t) neededLength - 1);
+
+    if (sysctl((int[]) {mib1, mib2}, 2, result->chars + result->length, &neededLength, NULL, 0) == 0)
+        result->length += (uint32_t) neededLength - 1;
+
+    result->chars[result->length] = '\0';
+
+    return NULL;
+}
+
+int ffSysctlGetInt(int mib1, int mib2, int defaultValue)
+{
+    int result;
+    size_t neededLength = sizeof(result);
+    if (sysctl((int[]) {mib1, mib2}, 2, &result, &neededLength, NULL, 0) != 0)
+        return defaultValue;
+    return result;
+}
+
+int64_t ffSysctlGetInt64(int mib1, int mib2, int64_t defaultValue)
+{
+    int64_t result;
+    size_t neededLength = sizeof(result);
+    if(sysctl((int[]) {mib1, mib2}, 2, &result, &neededLength, NULL, 0) != 0)
+        return defaultValue;
+    return result;
+}
+#else
 const char* ffSysctlGetString(const char* propName, FFstrbuf* result)
 {
    size_t neededLength;
@@ -35,6 +70,7 @@ int64_t ffSysctlGetInt64(const char* propName, int64_t defaultValue)
        return defaultValue;
    return result;
 }
+#endif // OpenBSD

 void* ffSysctlGetData(int* request, u_int requestLength, size_t* resultLength)
 {
@@ -6,7 +6,13 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>

+#ifdef __OpenBSD__
+const char* ffSysctlGetString(int mib1, int mib2, FFstrbuf* result);
+FF_C_NODISCARD int ffSysctlGetInt(int mib1, int mib2, int defaultValue);
+FF_C_NODISCARD int64_t ffSysctlGetInt64(int mib1, int mib2, int64_t defaultValue);
+#else
 const char* ffSysctlGetString(const char* propName, FFstrbuf* result);
 FF_C_NODISCARD int ffSysctlGetInt(const char* propName, int defaultValue);
 FF_C_NODISCARD int64_t ffSysctlGetInt64(const char* propName, int64_t defaultValue);
+#endif
 FF_C_NODISCARD void* ffSysctlGetData(int* request, u_int requestLength, size_t* resultLength);
@@ -33,7 +33,7 @@
    #else
        #include <pthread.h>
        #include <signal.h>
-        #if __has_include(<pthread_np.h>)
+        #if FF_HAVE_PTHREAD_NP
            #include <pthread_np.h>
        #endif
        #define FF_THREAD_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
@@ -51,7 +51,7 @@
        static inline void ffThreadDetach(FFThreadType thread) { pthread_detach(thread); }
        static inline bool ffThreadJoin(FFThreadType thread, FF_MAYBE_UNUSED uint32_t timeout)
        {
-            #if (defined(__linux__) && !defined(__ANDROID__)) || __has_include(<pthread_np.h>)
+            #if HAVE_TIMEDJOIN_NP
                if (timeout > 0)
                {
                    struct timespec ts;
@@ -9,22 +9,22 @@
    #include <sysinfoapi.h>
 #endif

-static inline uint64_t ffTimeGetTick() //In msec
+static inline double ffTimeGetTick(void) //In msec
 {
    #ifdef _WIN32
        LARGE_INTEGER frequency;
        QueryPerformanceFrequency(&frequency);
        LARGE_INTEGER start;
        QueryPerformanceCounter(&start);
-        return (uint64_t)(start.QuadPart * 1000 / frequency.QuadPart);
+        return (double) start.QuadPart * 1000 / (double) frequency.QuadPart;
    #else
        struct timespec timeNow;
        clock_gettime(CLOCK_MONOTONIC, &timeNow);
-        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+        return (double) timeNow.tv_sec * 1000. + (double) timeNow.tv_nsec / 1000000.;
    #endif
 }

-static inline uint64_t ffTimeGetNow()
+static inline uint64_t ffTimeGetNow(void)
 {
    #ifdef _WIN32
        uint64_t timeNow;
@@ -33,7 +33,7 @@ static inline uint64_t ffTimeGetNow()
    #else
        struct timespec timeNow;
        clock_gettime(CLOCK_REALTIME, &timeNow);
-        return (uint64_t)((timeNow.tv_sec * 1000) + (timeNow.tv_nsec / 1000000));
+        return (uint64_t)(((uint64_t) timeNow.tv_sec * 1000u) + ((uint64_t) timeNow.tv_nsec / 1000000u));
    #endif
 }

@@ -128,7 +128,7 @@
            "desc": "Set the timeout (ms) when waiting for child processes",
            "arg": {
                "type": "num",
-                "default": 1000
+                "default": 5000
            }
        },
        {
@@ -148,13 +148,23 @@
                    "false": "Try `wayland`, then `x11`, then `drm`"
                }
            }
+        },
+        {
+            "long": "detect-version",
+            "desc": "Whether to detect and display the version of terminal, shell and editor",
+            "remark": "Mainly for benchmarking",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": true
+            }
        }
    ],
    "Logo": [
        {
            "short": "l",
            "long": "logo",
-            "desc": "Set the logo source",
+            "desc": "Set the logo source. Use \"none\" to disable the logo",
            "remark": "Should be the name of a builtin logo, or a path to an image file. See also https://github.com/fastfetch-cli/fastfetch/wiki/Logo-options",
            "arg": {
                "type": "logo"
@@ -441,7 +451,7 @@
        },
        {
            "long": "pipe",
-            "desc": "Disable logo and all escape sequences",
+            "desc": "Disable colors",
            "remark": "Auto detection based on isatty(1)",
            "arg": {
                "type": "bool",
@@ -495,6 +505,27 @@
                "type": "num"
            }
        },
+        {
+            "long": "key-padding-left",
+            "desc": "Set the left padding of keys to <num> characters",
+            "arg": {
+                "type": "num"
+            }
+        },
+        {
+            "long": "key-type",
+            "desc": "Set whether to show icon before string keys",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "none": "Disable keys",
+                    "string": "Show string",
+                    "icon": "Show icon (requires newest nerd font)",
+                    "both": "Show both icon and string"
+                },
+                "default": "string"
+            }
+        },
        {
            "long": "bright-color",
            "desc": "Set if the keys, title and ASCII logo should be printed in bright color",
@@ -539,19 +570,6 @@
                "default": false
            }
        },
-        {
-            "long": "binary-prefix",
-            "desc": "Set the binary prefix to used",
-            "arg": {
-                "type": "enum",
-                "enum": {
-                    "IEC": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ...",
-                    "SI": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ...",
-                    "JEDEC": "1024 Bytes = 1 kB, 1024 kB = 1 MB, ..."
-                },
-                "default": "IEC"
-            }
-        },
        {
            "long": "percent-type",
            "desc": "Set the percentage output type",
@@ -659,6 +677,19 @@
                "type": "num"
            }
        },
+        {
+            "long": "size-binary-prefix",
+            "desc": "Set the binary prefix to used when formatting sizes",
+            "arg": {
+                "type": "enum",
+                "enum": {
+                    "IEC": "1024 Bytes = 1 KiB, 1024 KiB = 1 MiB, ...",
+                    "SI": "1000 Bytes = 1 KB, 1000 KB = 1 MB, ...",
+                    "JEDEC": "1024 Bytes = 1 kB, 1024 kB = 1 MB, ..."
+                },
+                "default": "IEC"
+            }
+        },
        {
            "long": "size-max-prefix",
            "desc": "Set the largest binary prefix to use when formatting sizes",
@@ -678,6 +709,14 @@
                "default": "YB"
            }
        },
+        {
+            "long": "freq-ndigits",
+            "desc": "Set the number of digits to keep after the decimal point when printing CPU / GPU frequency in GHz",
+            "arg": {
+                "type": "num",
+                "default": 2
+            }
+        },
        {
            "long": "temp-unit",
            "desc": "Set the unit of the temperature",
@@ -725,194 +764,6 @@
                "type": "color",
                "default": "light_red"
            }
-        },
-        {
-            "long": "ts-version",
-            "desc": "Whether to detect and display the version of terminal and shell",
-            "remark": "Mainly for benchmarking",
-            "arg": {
-                "type": "bool",
-                "optional": true,
-                "default": true
-            }
-        }
-    ],
-    "Library path": [
-        {
-            "long": "lib-pci",
-            "desc": "Pciutils. Used for GPU output",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-vulkan",
-            "desc": "Vulkan module & fallback for GPU output",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-wayland",
-            "desc": "Better display performance and output in wayland sessions",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xcb-randr",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xcb",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xrandr",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-x11",
-            "desc": "X11 sessions for better display detection and faster WM detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-drm",
-            "desc": "Used for fast resolution and refresh rate detection",
-            "remark": "Linux only",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-gio",
-            "desc": "Needed for values that are only stored GSettings",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-dconf",
-            "desc": "Needed for values that are only stored in DConf + Fallback for GSettings",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-dbus",
-            "desc": "Bluetooth, Player & Media detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-xfconf",
-            "desc": "Needed for XFWM theme and XFCE Terminal font",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-sqlite3",
-            "desc": "Needed for pkg & rpm package count",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-rpm",
-            "desc": "Slower fallback for rpm package count",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-imagemagick",
-            "desc": "Images in terminal using sixel or kitty graphics protocol",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-z",
-            "desc": "Libz. Faster image output when using kitty graphics protocol",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-chafa",
-            "desc": "Image output as ascii art",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-egl",
-            "desc": "Needed by the OpenGL module for gl context creation",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-glx",
-            "desc": "Needed by the OpenGL module for gl context creation",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-osmesa",
-            "desc": "Needed by the OpenGL module for gl context creation",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-opencl",
-            "desc": "OpenCL module",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-pulse",
-            "desc": "Pulseaudio. Used for Sound detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-nm",
-            "desc": "NetworkManager. Used for Wifi detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-freetype",
-            "desc": "Used for Termux font detection",
-            "arg": {
-                "type": "path"
-            }
-        },
-        {
-            "long": "lib-ddcutil",
-            "desc": "Used for brightness detection of external displays",
-            "arg": {
-                "type": "path"
-            }
        }
    ],
    "Module specific": [
@@ -954,7 +805,7 @@
        },
        {
            "long": "separator-string",
-            "desc": "Set the string printed by the separator module",
+            "desc": "Set the string to be printed by the separator line",
            "arg": {
                "type": "str",
                "default": "-"
@@ -962,12 +813,21 @@
        },
        {
            "long": "separator-output-color",
-            "desc": "Set the color of the separator module",
+            "desc": "Set the color of the separator line",
            "arg": {
                "type": "color",
                "default": "default"
            }
        },
+        {
+            "long": "separator-length",
+            "desc": "Set the length of the separator line",
+            "remark": "Set to 0 to automatically calculate it with the title length",
+            "arg": {
+                "type": "num",
+                "default": "0"
+            }
+        },
        {
            "long": "disk-folders",
            "desc": "A colon (semicolon on Windows) separated list of folder paths to be detected",
@@ -1056,6 +916,14 @@
                "type": "str"
            }
        },
+        {
+            "long": "diskio-wait-time",
+            "desc": "Set the wait time (in ms) when detecting disk usage",
+            "arg": {
+                "type": "num",
+                "default": 1000
+            }
+        },
        {
            "long": "physicaldisk-name-prefix",
            "desc": "Show disks with given name prefix only",
@@ -1140,6 +1008,14 @@
                "default": 10
            }
        },
+        {
+            "long": "brightness-compact",
+            "desc": "Set if multiple results should be printed in one line",
+            "arg": {
+                "type": "bool",
+                "default": false
+            }
+        },
        {
            "long": "sound-type",
            "desc": "Set what type of sound devices should be printed",
@@ -1175,14 +1051,6 @@
                "default": false
            }
        },
-        {
-            "long": "cpu-freq-ndigits",
-            "desc": "Set the number of digits to keep after the decimal point when printing CPU frequency",
-            "arg": {
-                "type": "num",
-                "default": 2
-            }
-        },
        {
            "long": "cpu-show-pe-core-count",
            "desc": "Detect and display CPU frequency of different core types (eg. Pcore and Ecore) if supported",
@@ -1210,6 +1078,14 @@
                "default": false
            }
        },
+        {
+            "long": "cpuusage-wait-time",
+            "desc": "Set the wait time (in ms) when detecting CPU usage",
+            "arg": {
+                "type": "num",
+                "default": 200
+            }
+        },
        {
            "long": "de-slow-version-detection",
            "desc": "Set if DE version should be detected with slow operations",
@@ -1336,6 +1212,24 @@
                "default": false
            }
        },
+        {
+            "long": "localip-show-mtu",
+            "desc": "Show net interface's MTU (Maximum Transmission Unit) size in bytes",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
+        {
+            "long": "localip-show-speed",
+            "desc": "Show net interface's link speed with human-readable format (or an 1Mb units integer in JSON format)",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
        {
            "long": "localip-show-prefix-len",
            "desc": "Show network prefix length (/N) in local ip module",
@@ -1371,6 +1265,15 @@
                "default": false
            }
        },
+        {
+            "long": "localip-show-flags",
+            "desc": "Show net interface flags in local ip module",
+            "arg": {
+                "type": "bool",
+                "optional": true,
+                "default": false
+            }
+        },
        {
            "long": "localip-compact",
            "desc": "Show all IPs in one line",
@@ -1418,6 +1321,14 @@
                "default": false
            }
        },
+        {
+            "long": "netio-wait-time",
+            "desc": "Set the wait time (in ms) when detecting network usage",
+            "arg": {
+                "type": "num",
+                "default": 1000
+            }
+        },
        {
            "long": "publicip-timeout",
            "desc": "Time in milliseconds to wait for the public ip server to respond",
@@ -1524,6 +1435,15 @@
                "default": "\"cmd\" for Windows; \"/bin/sh\" for *nix"
            }
        },
+        {
+            "long": "command-param",
+            "desc": "Set the parameter used when starting the shell",
+            "remark": "If set to empty string, it will be ignored",
+            "arg": {
+                "type": "str",
+                "default": "\"/c\" for Windows; \"-c\" for *nix"
+            }
+        },
        {
            "long": "command-key",
            "desc": "Set the module key to display",
@@ -1545,13 +1465,14 @@
                "type": "enum",
                "enum": {
                    "block": "\u2588\u2588\u2588",
+                    "background": "(whitespaces with background)",
                    "circle": "\u25cf",
                    "diamond": "\u25c6",
                    "triangle": "\u25b2",
                    "square": "\u25a0",
                    "star": "\u2605"
                },
-                "default": "block"
+                "default": "background"
            }
        },
        {
@@ -1634,6 +1555,14 @@
            },
            "pseudo": true
        },
+        {
+            "long": "<module>-key-icon",
+            "desc": "Set the icon to be displayed by \"--key-type icon\"",
+            "arg": {
+                "type": "string"
+            },
+            "pseudo": true
+        },
        {
            "long": "<module>-output-color",
            "desc": "Override the global \"--color-output\" option for each specific module",
@@ -13,6 +13,14 @@ For example: "--title-format '{user-name:5}'" will truncate user name into 5-len
 If '<trunc-length>' is negative, an ellipsis … will be appended at the end when the original string is truncated.
 Note: The string length is counted in raw bytes. Multi-byte unicode characters and ANSI escape codes are not taken into account.

+In 2.23.0 or newer, `<` or `>` can be specified instead of `:` to set a left or right padding.
+For example: "--title-format '{user-name<20}'" will generate `<user-name>         `;
+"--title-format '{user-name>20}'" will generate `         <user-name>`
+
+In 2.24.0 or newer, `{~startIndex,endIndex}` can be specified to slice a string. Negative index counts back from the end of the string.
+If an index is omitted, 0 is used. For example, both `{~,0}` `{~0,}` and `{~,}` are same as `{~0,0}` and will always generate a empty string.
+If `,endIndex` is omitted or greater than the length of the string, the length of string is used.
+
 If the value index is missing, meaning the placeholder is "{}", an internal counter sets the value index.
 This means that the format string "Values: {1} ({2})" is equivalent to "Values: {} ({})".
 Note that this counter only counts empty placeholders, so the format string "{2} {} {}" will contain the second value, then the first, and then the second again.
@@ -15,6 +15,7 @@ typedef struct FFBatteryResult
    double capacity;
    double temperature;
    uint32_t cycleCount;
+    int32_t timeRemaining;
 } FFBatteryResult;

 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results);
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "battery.h"
-
+#include "util/stringUtils.h"
 #include "common/processing.h"
 #include "common/properties.h"

@@ -36,6 +36,7 @@ static const char* parseTermuxApi(FFBatteryOptions* options, FFlist* results)
    FFBatteryResult* battery = ffListAdd(results);
    battery->temperature = FF_BATTERY_TEMP_UNSET;
    battery->cycleCount = 0;
+    battery->timeRemaining = -1;
    ffStrbufInit(&battery->manufacturer);
    ffStrbufInit(&battery->modelName);
    ffStrbufInit(&battery->status);
@@ -44,7 +45,27 @@ static const char* parseTermuxApi(FFBatteryOptions* options, FFlist* results)
    ffStrbufInit(&battery->manufactureDate);

    battery->capacity = yyjson_get_num(yyjson_obj_get(root, "percentage"));
-    ffStrbufAppendS(&battery->status, yyjson_get_str(yyjson_obj_get(root, "status")));
+    const char* acStatus = yyjson_get_str(yyjson_obj_get(root, "plugged"));
+    if (acStatus)
+    {
+        if (ffStrEquals(acStatus, "PLUGGED_AC"))
+            ffStrbufAppendS(&battery->status, "AC Connected, ");
+        else if (ffStrEquals(acStatus, "PLUGGED_USB"))
+            ffStrbufAppendS(&battery->status, "USB Connected, ");
+        else if (ffStrEquals(acStatus, "PLUGGED_WIRELESS"))
+            ffStrbufAppendS(&battery->status, "Wireless Connected, ");
+    }
+    const char* status = yyjson_get_str(yyjson_obj_get(root, "status"));
+    if (status)
+    {
+        if (ffStrEquals(status, "CHARGING"))
+            ffStrbufAppendS(&battery->status, "Charging");
+        else if (ffStrEquals(status, "DISCHARGING"))
+            ffStrbufAppendS(&battery->status, "Discharging");
+    }
+    ffStrbufTrimRight(&battery->status, ' ');
+    ffStrbufTrimRight(&battery->status, ',');
+
    if(options->temp)
        battery->temperature = yyjson_get_num(yyjson_obj_get(root, "temperature"));

@@ -74,6 +95,7 @@ static const char* parseDumpsys(FFBatteryOptions* options, FFlist* results)
    FFBatteryResult* battery = ffListAdd(results);
    battery->temperature = FF_BATTERY_TEMP_UNSET;
    battery->cycleCount = 0;
+    battery->timeRemaining = -1;
    ffStrbufInit(&battery->manufacturer);
    ffStrbufInit(&battery->modelName);
    ffStrbufInit(&battery->status);
@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "battery.h"
 #include "util/apple/cf_helpers.h"
-#include "detection/temps/temps_apple.h"
+#include "util/apple/smc_temps.h"

 #include <IOKit/IOKitLib.h>
 #include <IOKit/pwr_mgt/IOPM.h>
@@ -57,13 +57,24 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
        ffCfDictGetInt(properties, CFSTR(kIOPMPSCycleCountKey), &cycleCount);
        battery->cycleCount = cycleCount < 0 ? 0 : (uint32_t) cycleCount;

-        if (!ffCfDictGetBool(properties, CFSTR(kIOPMPSExternalConnectedKey), &boolValue) && boolValue)
-            ffStrbufAppendS(&battery->status, "AC connected, ");
-        else
-            ffStrbufAppendS(&battery->status, "Discharging, ");
-        if (!ffCfDictGetBool(properties, CFSTR(kIOPMPSIsChargingKey), &boolValue) && boolValue)
+        battery->timeRemaining = -1;
+        if (ffCfDictGetBool(properties, CFSTR(kIOPMPSExternalConnectedKey), &boolValue) == NULL)
+        {
+            if (boolValue)
+                ffStrbufAppendS(&battery->status, "AC connected, ");
+            else
+            {
+                ffStrbufAppendS(&battery->status, "Discharging, ");
+                ffCfDictGetInt(properties, CFSTR("AvgTimeToEmpty"), &battery->timeRemaining); // in minutes
+                if (battery->timeRemaining < 0 || battery->timeRemaining >= 0xFFFF)
+                    battery->timeRemaining = -1;
+                else
+                    battery->timeRemaining *= 60;
+            }
+        }
+        if (ffCfDictGetBool(properties, CFSTR(kIOPMPSIsChargingKey), &boolValue) == NULL && boolValue)
            ffStrbufAppendS(&battery->status, "Charging, ");
-        if (!ffCfDictGetBool(properties, CFSTR(kIOPMPSAtCriticalLevelKey), &boolValue) && boolValue)
+        if (ffCfDictGetBool(properties, CFSTR(kIOPMPSAtCriticalLevelKey), &boolValue) == NULL && boolValue)
            ffStrbufAppendS(&battery->status, "Critical, ");
        ffStrbufTrimRight(&battery->status, ' ');
        ffStrbufTrimRight(&battery->status, ',');
@@ -41,7 +41,9 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
        ffStrbufInit(&battery->technology);
        ffStrbufInit(&battery->serial);
        ffStrbufInit(&battery->manufactureDate);
-
+        battery->timeRemaining = -1;
+        if (battio.battinfo.min > 0)
+            battery->timeRemaining = battio.battinfo.min * 60;
        battery->capacity = battio.battinfo.cap;
        if(battio.battinfo.state == ACPI_BATT_STAT_INVALID)
        {
@@ -68,13 +70,26 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
            ffStrbufTrimRight(&battery->status, ',');
        }

+        #ifdef ACPIIO_BATT_GET_BIX
        battio.unit = i;
        if (ioctl(acpifd, ACPIIO_BATT_GET_BIX, &battio) >= 0)
        {
            ffStrbufAppendS(&battery->manufacturer, battio.bix.oeminfo);
            ffStrbufAppendS(&battery->modelName, battio.bix.model);
            ffStrbufAppendS(&battery->technology, battio.bix.type);
+            ffStrbufAppendS(&battery->serial, battio.bix.serial);
+            battery->cycleCount = battio.bix.cycles;
        }
+        #elif defined(ACPIIO_BATT_GET_BIF)
+        battio.unit = i;
+        if (ioctl(acpifd, ACPIIO_BATT_GET_BIF, &battio) >= 0)
+        {
+            ffStrbufAppendS(&battery->manufacturer, battio.bif.oeminfo);
+            ffStrbufAppendS(&battery->modelName, battio.bif.model);
+            ffStrbufAppendS(&battery->technology, battio.bif.type);
+            ffStrbufAppendS(&battery->serial, battio.bif.serial);
+        }
+        #endif
    }
    return NULL;
 }
@@ -1,42 +1,47 @@
 #include "battery.h"
 #include "common/io/io.h"
-#include "detection/temps/temps_linux.h"
 #include "util/stringUtils.h"

 #include <dirent.h>
+#include <unistd.h>
+#include <fcntl.h>

 // https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-class-power

-static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* options, FFlist* results)
+static bool checkAc(const char* id, FFstrbuf* tmpBuffer)
 {
-    uint32_t dirLength = dir->length;
+    if (ffStrStartsWith(id, "BAT"))
+        ffStrbufSetS(tmpBuffer, "/sys/class/power_supply/ADP1/online");
+    else if (ffStrStartsWith(id, "macsmc-battery"))
+        ffStrbufSetS(tmpBuffer, "/sys/class/power_supply/macsmc-ac/online");
+    else
+        ffStrbufClear(tmpBuffer);

+    char online = '\0';
+    return ffReadFileData(tmpBuffer->chars, 1, &online) == 1 && online == '1';
+}
+
+static void parseBattery(int dfd, const char* id, FFBatteryOptions* options, FFlist* results)
+{
    FF_STRBUF_AUTO_DESTROY tmpBuffer = ffStrbufCreate();

-    //type must exist and be "Battery"
-    ffStrbufAppendS(dir, "/type");
-    if (ffReadFileBuffer(dir->chars, &tmpBuffer))
-        ffStrbufTrimRightSpace(&tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-
+    // type must exist and be "Battery"
+    if (!ffReadFileBufferRelative(dfd, "type", &tmpBuffer))
+        return;
+    ffStrbufTrimRightSpace(&tmpBuffer);
    if(!ffStrbufIgnCaseEqualS(&tmpBuffer, "Battery"))
        return;

-    //scope may not exist or must not be "Device"
-    ffStrbufAppendS(dir, "/scope");
-    if (ffReadFileBuffer(dir->chars, &tmpBuffer))
+    // scope may not exist or must not be "Device"
+    if (ffReadFileBufferRelative(dfd, "scope", &tmpBuffer))
        ffStrbufTrimRightSpace(&tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);

    if(ffStrbufIgnCaseEqualS(&tmpBuffer, "Device"))
        return;

-    //capacity must exist and be not empty
-    ffStrbufAppendS(dir, "/capacity");
-    bool available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-
-    if (!available)
+    // capacity must exist and be not empty
+    // This is expensive in my laptop
+    if (!ffReadFileBufferRelative(dfd, "capacity", &tmpBuffer))
        return;

    FFBatteryResult* result = ffListAdd(results);
@@ -45,39 +50,63 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
    //At this point, we have a battery. Try to get as much values as possible.

    ffStrbufInit(&result->manufacturer);
-    ffStrbufAppendS(dir, "/manufacturer");
-    if (ffReadFileBuffer(dir->chars, &result->manufacturer))
+    if (ffReadFileBufferRelative(dfd, "manufacturer", &result->manufacturer))
        ffStrbufTrimRightSpace(&result->manufacturer);
    else if (ffStrEquals(id, "macsmc-battery")) // asahi
        ffStrbufSetStatic(&result->manufacturer, "Apple Inc.");
-    ffStrbufSubstrBefore(dir, dirLength);

    ffStrbufInit(&result->modelName);
-    ffStrbufAppendS(dir, "/model_name");
-    if (ffReadFileBuffer(dir->chars, &result->modelName))
+    if (ffReadFileBufferRelative(dfd, "model_name", &result->modelName))
        ffStrbufTrimRightSpace(&result->modelName);
-    ffStrbufSubstrBefore(dir, dirLength);

    ffStrbufInit(&result->technology);
-    ffStrbufAppendS(dir, "/technology");
-    if (ffReadFileBuffer(dir->chars, &result->technology))
+    if (ffReadFileBufferRelative(dfd, "technology", &result->technology))
        ffStrbufTrimRightSpace(&result->technology);
-    ffStrbufSubstrBefore(dir, dirLength);

    ffStrbufInit(&result->status);
-    ffStrbufAppendS(dir, "/status");
-    if (ffReadFileBuffer(dir->chars, &result->status))
+    if (ffReadFileBufferRelative(dfd, "status", &result->status))
        ffStrbufTrimRightSpace(&result->status);
-    ffStrbufSubstrBefore(dir, dirLength);

    // Unknown, Charging, Discharging, Not charging, Full
-    if (ffStrbufEqualS(&result->status, "Not charging") || ffStrbufEqualS(&result->status, "Full"))
-        ffStrbufSetStatic(&result->status, "AC Connected");
-    else if (ffStrbufEqualS(&result->status, "Unknown"))
-        ffStrbufClear(&result->status);

-    ffStrbufAppendS(dir, "/capacity_level");
-    if (ffReadFileBuffer(dir->chars, &tmpBuffer))
+    result->timeRemaining = -1;
+    if (ffStrbufEqualS(&result->status, "Discharging"))
+    {
+        if (ffReadFileBufferRelative(dfd, "time_to_empty_now", &tmpBuffer))
+            result->timeRemaining = (int32_t) ffStrbufToSInt(&tmpBuffer, 0);
+        else
+        {
+            if (ffReadFileBufferRelative(dfd, "charge_now", &tmpBuffer))
+            {
+                int64_t chargeNow = ffStrbufToSInt(&tmpBuffer, 0);
+                if (chargeNow > 0)
+                {
+                    if (ffReadFileBufferRelative(dfd, "current_now", &tmpBuffer))
+                    {
+                        int64_t currentNow = ffStrbufToSInt(&tmpBuffer, INT64_MIN);
+                        if (currentNow < 0) currentNow = -currentNow;
+                        if (currentNow > 0)
+                            result->timeRemaining = (int32_t) ((chargeNow * 3600) / currentNow);
+                    }
+                }
+            }
+        }
+
+        if (checkAc(id, &tmpBuffer))
+            ffStrbufAppendS(&result->status, ", AC Connected");
+    }
+    else if (ffStrbufEqualS(&result->status, "Not charging") || ffStrbufEqualS(&result->status, "Full"))
+        ffStrbufSetStatic(&result->status, "AC Connected");
+    else if (ffStrbufEqualS(&result->status, "Charging"))
+        ffStrbufAppendS(&result->status, ", AC Connected");
+    else if (ffStrbufEqualS(&result->status, "Unknown"))
+    {
+        ffStrbufClear(&result->status);
+        if (checkAc(id, &tmpBuffer))
+            ffStrbufAppendS(&result->status, "AC Connected");
+    }
+
+    if (ffReadFileBufferRelative(dfd, "capacity_level", &tmpBuffer))
    {
        ffStrbufTrimRightSpace(&result->manufacturer);
        if (ffStrbufEqualS(&tmpBuffer, "Critical"))
@@ -88,50 +117,33 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
                ffStrbufSetStatic(&result->status, "Critical");
        }
    }
-    ffStrbufSubstrBefore(dir, dirLength);

    ffStrbufInit(&result->serial);
-    ffStrbufAppendS(dir, "/serial_number");
-    if (ffReadFileBuffer(dir->chars, &result->serial))
+    if (ffReadFileBufferRelative(dfd, "serial_number", &result->serial))
        ffStrbufTrimRightSpace(&result->serial);
-    ffStrbufSubstrBefore(dir, dirLength);

-    ffStrbufAppendS(dir, "/cycle_count");
-    available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-    if (available)
+    if (ffReadFileBufferRelative(dfd, "cycle_count", &tmpBuffer))
    {
        int64_t cycleCount = ffStrbufToSInt(&tmpBuffer, 0);
        result->cycleCount = cycleCount < 0 || cycleCount > UINT32_MAX ? 0 : (uint32_t) cycleCount;
    }

    ffStrbufInit(&result->manufactureDate);
-    ffStrbufAppendS(dir, "/manufacture_year");
-    available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-    if (available)
+    if (ffReadFileBufferRelative(dfd, "manufacture_year", &tmpBuffer))
    {
        int year = (int) ffStrbufToSInt(&tmpBuffer, 0);
        if (year > 0)
        {
-            ffStrbufAppendS(dir, "/manufacture_month");
-            available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-            ffStrbufSubstrBefore(dir, dirLength);
-            if (available)
+            if (ffReadFileBufferRelative(dfd, "manufacture_month", &tmpBuffer))
            {
                int month = (int) ffStrbufToSInt(&tmpBuffer, 0);
                if (month > 0)
                {
-                    ffStrbufAppendS(dir, "/manufacture_day");
-                    available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-                    ffStrbufSubstrBefore(dir, dirLength);
-                    if (available)
+                    if (ffReadFileBufferRelative(dfd, "manufacture_day", &tmpBuffer))
                    {
                        int day = (int) ffStrbufToSInt(&tmpBuffer, 0);
                        if (day > 0)
-                        {
                            ffStrbufSetF(&result->manufactureDate, "%.4d-%.2d-%.2d", year, month, day);
-                        }
                    }
                }
            }
@@ -141,33 +153,25 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
    result->temperature = FF_BATTERY_TEMP_UNSET;
    if (options->temp)
    {
-        ffStrbufAppendS(dir, "/temp");
-        if (ffReadFileBuffer(dir->chars, &tmpBuffer))
+        if (ffReadFileBufferRelative(dfd, "temp", &tmpBuffer))
            result->temperature = ffStrbufToDouble(&tmpBuffer) / 10;
-        ffStrbufSubstrBefore(dir, dirLength);
    }
 }

 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
 {
-    FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
-    ffStrbufAppendS(&baseDir, "/sys/class/power_supply/");
-
-    uint32_t baseDirLength = baseDir.length;
-
-    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir.chars);
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/power_supply/");
    if(dirp == NULL)
        return "opendir(\"/sys/class/power_supply/\") == NULL";

    struct dirent* entry;
    while((entry = readdir(dirp)) != NULL)
    {
-        if(ffStrEquals(entry->d_name, ".") || ffStrEquals(entry->d_name, ".."))
+        if(entry->d_name[0] == '.')
            continue;

-        ffStrbufAppendS(&baseDir, entry->d_name);
-        parseBattery(&baseDir, entry->d_name, options, results);
-        ffStrbufSubstrBefore(&baseDir, baseDirLength);
+        FF_AUTO_CLOSE_FD int dfd = openat(dirfd(dirp), entry->d_name, O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
+        if (dfd > 0) parseBattery(dfd, entry->d_name, options, results);
    }

    return NULL;
@@ -121,6 +121,13 @@ static const char* detectWithSetupApi(FFBatteryOptions* options, FFlist* results
                battery->temperature = temp / 10.0 - 273.15;
        }

+        {
+            bqi.InformationLevel = BatteryEstimatedTime;
+            ULONG time;
+            if(DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_INFORMATION, &bqi, sizeof(bqi), &time, sizeof(time), &dwOut, NULL))
+                battery->timeRemaining = time == BATTERY_UNKNOWN_TIME ? -1 : (int32_t) time;
+        }
+
        {
            BATTERY_STATUS bs;
            BATTERY_WAIT_STATUS bws = { .BatteryTag = bqi.BatteryTag };
@@ -241,6 +248,7 @@ static const char* detectWithNtApi(FF_MAYBE_UNUSED FFBatteryOptions* options, FF
        ffStrbufInit(&battery->serial);
        battery->temperature = FF_BATTERY_TEMP_UNSET;
        battery->cycleCount = 0;
+        battery->timeRemaining = info.EstimatedTime == BATTERY_UNKNOWN_TIME ? -1 : (int32_t) info.EstimatedTime;

        battery->capacity = info.RemainingCapacity * 100.0 / info.MaxCapacity;
        if(info.AcOnLine)
@@ -252,6 +260,7 @@ static const char* detectWithNtApi(FF_MAYBE_UNUSED FFBatteryOptions* options, FF
        else if(info.Discharging)
            ffStrbufAppendS(&battery->status, "Discharging");

+
        detectBySmbios(battery);

        return NULL;
@@ -25,7 +25,7 @@ const char* ffDetectBios(FFBiosResult* result)
        {
            ffStrbufSetStatic(&result->type,
                ffPathExists("/dev/efi" /*efidev*/, FF_PATHTYPE_FILE) ||
-                ffPathExists("/boot/efi/efi" /*efi partition*/, FF_PATHTYPE_DIRECTORY)
+                ffPathExists("/boot/efi/efi/" /*efi partition*/, FF_PATHTYPE_DIRECTORY)
                    ? "UEFI" : "BIOS");
        }
    }
@@ -10,7 +10,7 @@ const char *ffDetectBios(FFBiosResult *bios)
    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->release);
    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_vendor", "/sys/class/dmi/id/bios_vendor", &bios->vendor);
    ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_version", "/sys/class/dmi/id/bios_version", &bios->version);
-    if (ffPathExists("/sys/firmware/efi", FF_PATHTYPE_DIRECTORY) || ffPathExists("/sys/firmware/acpi/tables/UEFI", FF_PATHTYPE_FILE))
+    if (ffPathExists("/sys/firmware/efi/", FF_PATHTYPE_DIRECTORY) || ffPathExists("/sys/firmware/acpi/tables/UEFI", FF_PATHTYPE_FILE))
        ffStrbufSetStatic(&bios->type, "UEFI");
    else
        ffStrbufSetStatic(&bios->type, "BIOS");
@@ -0,0 +1,15 @@
+#include "bios.h"
+#include "common/sysctl.h"
+#include "util/smbiosHelper.h"
+
+const char* ffDetectBios(FFBiosResult* bios)
+{
+    if (ffSysctlGetString("machdep.dmi.bios-date", &bios->date) == NULL)
+        ffCleanUpSmbiosValue(&bios->date);
+    if (ffSysctlGetString("machdep.dmi.bios-version", &bios->version) == NULL)
+        ffCleanUpSmbiosValue(&bios->version);
+    if (ffSysctlGetString("machdep.dmi.bios-vendor", &bios->vendor) == NULL)
+        ffCleanUpSmbiosValue(&bios->vendor);
+    ffSysctlGetString("machdep.bootmethod", &bios->type);
+    return NULL;
+}
@@ -1,6 +1,6 @@
 #include "bios.h"

-const char* ffDetectBios(FFBiosResult* bios)
+const char* ffDetectBios(FF_MAYBE_UNUSED FFBiosResult* bios)
 {
    return "Not supported on this platform";
 }
@@ -61,13 +61,17 @@ static void detectBluetoothValue(FFDBusData* dbus, DBusMessageIter* iter, FFBlue
    dbus->lib->ffdbus_message_iter_next(&dictIter);

    if(ffStrEquals(deviceProperty, "Address"))
-        ffDBusGetValue(dbus, &dictIter, &device->address);
+        ffDBusGetString(dbus, &dictIter, &device->address);
    else if(ffStrEquals(deviceProperty, "Name"))
-        ffDBusGetValue(dbus, &dictIter, &device->name);
+        ffDBusGetString(dbus, &dictIter, &device->name);
    else if(ffStrEquals(deviceProperty, "Icon"))
-        ffDBusGetValue(dbus, &dictIter, &device->type);
+        ffDBusGetString(dbus, &dictIter, &device->type);
    else if(ffStrEquals(deviceProperty, "Percentage"))
-        ffDBusGetByte(dbus, &dictIter, &device->battery);
+    {
+        uint32_t percentage;
+        if (ffDBusGetUint(dbus, &dictIter, &percentage))
+            device->battery = (uint8_t) percentage;
+    }
    else if(ffStrEquals(deviceProperty, "Connected"))
        ffDBusGetBool(dbus, &dictIter, &device->connected);
 }
@@ -86,8 +90,8 @@ static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFB
    const char* propertyType;
    dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &propertyType);

-    if(strstr(propertyType, "Device") == NULL && strstr(propertyType, "Battery") == NULL)
-        return; //We don't care about other properties
+    if(!ffStrContains(propertyType, ".Device") && !ffStrContains(propertyType, ".Battery"))
+        return; // We don't care about other properties

    dbus->lib->ffdbus_message_iter_next(&dictIter);

@@ -97,11 +101,10 @@ static void detectBluetoothProperty(FFDBusData* dbus, DBusMessageIter* iter, FFB
    DBusMessageIter arrayIter;
    dbus->lib->ffdbus_message_iter_recurse(&dictIter, &arrayIter);

-    while(true)
+    do
    {
        detectBluetoothValue(dbus, &arrayIter, device);
-        FF_DBUS_ITER_CONTINUE(dbus, &arrayIter);
-    }
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 }

 static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessageIter* iter)
@@ -118,8 +121,8 @@ static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessage
    const char* objectPath;
    dbus->lib->ffdbus_message_iter_get_basic(&dictIter, &objectPath);

-    //We don't want adapter objects
-    if(strstr(objectPath, "dev_") == NULL)
+    // We don't want adapter objects
+    if(!ffStrContains(objectPath, "/dev_"))
        return;

    dbus->lib->ffdbus_message_iter_next(&dictIter);
@@ -137,11 +140,10 @@ static void detectBluetoothObject(FFlist* devices, FFDBusData* dbus, DBusMessage
    device->battery = 0;
    device->connected = false;

-    while(true)
+    do
    {
        detectBluetoothProperty(dbus, &arrayIter, device);
-        FF_DBUS_ITER_CONTINUE(dbus, &arrayIter);
-    }
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));

    if(device->name.length == 0)
    {
@@ -160,11 +162,10 @@ static void detectBluetoothRoot(FFlist* devices, FFDBusData* dbus, DBusMessageIt
    DBusMessageIter arrayIter;
    dbus->lib->ffdbus_message_iter_recurse(iter, &arrayIter);

-    while(true)
+    do
    {
        detectBluetoothObject(devices, dbus, &arrayIter);
-        FF_DBUS_ITER_CONTINUE(dbus, &arrayIter);
-    }
+    } while (dbus->lib->ffdbus_message_iter_next(&arrayIter));
 }

 static const char* detectBluetooth(FFlist* devices)
@@ -174,7 +175,7 @@ static const char* detectBluetooth(FFlist* devices)
    if(error)
        return error;

-    DBusMessage* managedObjects = ffDBusGetMethodReply(&dbus, "org.bluez", "/", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
+    DBusMessage* managedObjects = ffDBusGetMethodReply(&dbus, "org.bluez", "/", "org.freedesktop.DBus.ObjectManager", "GetManagedObjects", NULL);
    if(!managedObjects)
        return "Failed to call GetManagedObjects";

@@ -10,48 +10,40 @@
 const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
 {
    // Actually bluetoothapis.dll, but it's missing on Windows 7
-    FF_LIBRARY_LOAD(bluetoothapis, NULL, "dlopen bthprops.cpl failed", "bthprops.cpl", 1)
+    FF_LIBRARY_LOAD(bluetoothapis, "dlopen bthprops.cpl failed", "bthprops.cpl", 1)
    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindFirstDevice)
    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindNextDevice)
    FF_LIBRARY_LOAD_SYMBOL_MESSAGE(bluetoothapis, BluetoothFindDeviceClose)

-    BLUETOOTH_DEVICE_SEARCH_PARAMS btsp = {
+    BLUETOOTH_DEVICE_INFO btdi = {
+        .dwSize = sizeof(btdi)
+    };
+    HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstDevice(&(BLUETOOTH_DEVICE_SEARCH_PARAMS) {
        .fReturnConnected = TRUE,
        .fReturnRemembered = TRUE,
        .fReturnAuthenticated = TRUE,
        .fReturnUnknown = TRUE,
-        .dwSize = sizeof(btsp)
-    };
-
-    BLUETOOTH_DEVICE_INFO btdi = {
-        .dwSize = sizeof(btdi)
-    };
-    HBLUETOOTH_DEVICE_FIND hFind = ffBluetoothFindFirstDevice(&btsp, &btdi);
+        .dwSize = sizeof(BLUETOOTH_DEVICE_SEARCH_PARAMS)
+    }, &btdi);
    if(!hFind)
    {
-        if (GetLastError() == ERROR_NO_MORE_ITEMS)
-            return "No Bluetooth devices found";
-        else
-            return "BluetoothFindFirstDevice() failed";
+        return "BluetoothFindFirstDevice() failed";
    }

    do {
        FFBluetoothResult* device = ffListAdd(devices);
-        ffStrbufInit(&device->name);
-        ffStrbufInit(&device->address);
-        ffStrbufInit(&device->type);
-        device->battery = 0;
-        device->connected = !!btdi.fConnected;
-
-        ffStrbufSetWS(&device->name, btdi.szName);
-
-        ffStrbufAppendF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
+        ffStrbufInitWS(&device->name, btdi.szName);
+        ffStrbufInitF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
            btdi.Address.rgBytes[0],
            btdi.Address.rgBytes[1],
            btdi.Address.rgBytes[2],
            btdi.Address.rgBytes[3],
            btdi.Address.rgBytes[4],
            btdi.Address.rgBytes[5]);
+        ffStrbufInit(&device->type);
+        device->battery = 0;
+        device->connected = !!btdi.fConnected;
+
        //https://btprodspecificationrefs.blob.core.windows.net/assigned-numbers/Assigned%20Number%20Types/Assigned%20Numbers.pdf

        if(BitTest(&btdi.ulClassofDevice, 13))
--- a/Show More
+++ b/Show More