diff --git a/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh b/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh
index 6ac9a998e80..b816a6410ce 100644
--- a/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh
+++ b/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh
@@ -1,3 +1,4 @@
 #!/usr/bin/sh
 
-alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91  --logo-color-4 97"
+alias fastfetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91  --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc"
+alias neofetch="/usr/bin/fastfetch --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91  --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc"
diff --git a/system_files/shared/usr/etc/xdg/fastfetch/config.jsonc b/system_files/shared/usr/etc/xdg/fastfetch/config.jsonc
deleted file mode 100644
index c24d4d85464..00000000000
--- a/system_files/shared/usr/etc/xdg/fastfetch/config.jsonc
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-    "modules": [
-      "title",
-      "separator",
-      {
-        "type": "command",
-        "key": "OCI",
-        "text": "jq -r '.\"image-name\"' < /usr/share/ublue-os/image-info.json",
-      },
-      {
-        "type": "command",
-        "key": "Flavor",
-        "text": "jq -r '.\"image-flavor\"' < /usr/share/ublue-os/image-info.json",
-      },
-      {
-        "type": "command",
-        "key": "Image Tag",
-        "text": "jq -r '.\"image-tag\"' < /usr/share/ublue-os/image-info.json",
-      }, 
-      {
-        "type": "command",
-        "key": "Signed",
-        "text": "/usr/libexec/get-image-sign.sh"
-      },
-      "break",
-      "host",
-      "kernel",
-      "uptime",
-      "break",
-      "packages",
-      "shell",
-      "display",
-      "terminal",
-      "break",
-      "cpu",
-      "gpu",
-      "memory",
-      "break",
-      "colors"
-    ]
-  }
\ No newline at end of file
diff --git a/system_files/shared/usr/libexec/get-image-sign.sh b/system_files/shared/usr/libexec/get-image-sign.sh
deleted file mode 100755
index 99b5ec792a6..00000000000
--- a/system_files/shared/usr/libexec/get-image-sign.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/bash
-
-IMAGE=$(rpm-ostree status --booted | head -3 | tail -1)
-if grep -qv signed <<< "${IMAGE}"; then
-	echo "🔒 No"
-else
-	echo "🔐 Yes"
-fi
diff --git a/system_files/shared/usr/libexec/ublue-image-info.sh b/system_files/shared/usr/libexec/ublue-image-info.sh
new file mode 100755
index 00000000000..956bb836e9d
--- /dev/null
+++ b/system_files/shared/usr/libexec/ublue-image-info.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/bash
+
+echo -n $(jq -r '"\(.["image-name"]):\(.["image-tag"])"' < /usr/share/ublue-os/image-info.json)
+
+if [[ $(rpm-ostree status --booted) =~ "signed" ]]; then
+	echo -n " 🔐"
+else
+	echo -n -e " \033[5m🔓\033[0m"
+fi
\ No newline at end of file
diff --git a/system_files/shared/usr/share/ublue-os/ublue-os.jsonc b/system_files/shared/usr/share/ublue-os/ublue-os.jsonc
new file mode 100644
index 00000000000..189f5ccb773
--- /dev/null
+++ b/system_files/shared/usr/share/ublue-os/ublue-os.jsonc
@@ -0,0 +1,101 @@
+{
+  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+  "display": {
+    "separator": "  ",
+    "color": {
+      "keys": "bright_cyan"
+    },
+  },
+  "modules": [
+    {
+      "type": "title",
+      "key": " ",
+      "color": {
+        "user": "cyan",
+        "at": "white",
+        "host": "bright_white"
+      }
+    },
+    "break",
+    {
+      "type": "command",
+      "key": "󱋩",
+      "text": "/usr/libexec/ublue-image-info.sh"
+    },
+    {
+      "type": "os",
+      "key": " 󰣛"
+    },
+    {
+      "type": "kernel",
+      "key": " ",
+      "format": "{1} {2}"
+    },
+    {
+      "type": "uptime",
+      "key": " 󰅐"
+    },
+    "break",
+    {
+      "type": "command",
+      "key": " 󰾰",
+      "text": "cat /sys/devices/virtual/dmi/id/product_name",
+      "shell": "/bin/bash"
+    },
+    {
+      "type": "cpu",
+      "key": " 󰻠"
+    },
+    {
+      "type": "gpu",
+      "key": " 󰍛"
+    },
+    {
+      "type": "memory",
+      "key": " 󰧑"
+    },
+    {
+      "type": "disk",
+      "key": " "
+    },
+    {
+      "type": "display",
+      "key": " 󰍹"
+    },
+    {
+      "type": "battery",
+      "key": " "
+    },
+    {
+      "type": "gamepad",
+      "key": " 󰖺"
+    },
+    "break",
+    {
+      "type": "de",
+      "key": " 󰕮"
+    },
+    {
+      "type": "wm",
+      "key": " "
+    },
+    {
+      "type": "shell",
+      "key": " "
+    },
+    {
+      "type": "terminal",
+      "key": " "
+    },
+    {
+      "type": "packages",
+      "key": " 󰏖"
+    },
+    "break",
+    {
+      "type": "colors",
+      "paddingLeft": 2,
+      "symbol": "circle"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh b/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh
index df21e4279d2..ca5fa15690e 100644
--- a/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh
+++ b/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-alias fastfetch="/usr/bin/fastfetch --logo /usr/share/ublue-os/bluefin-logo"
\ No newline at end of file
+alias fastfetch="/usr/bin/fastfetch --logo /usr/share/ublue-os/bluefin-logo -c /usr/share/ublue-os/ublue-os.jsonc"
+alias neofetch="/usr/bin/fastfetch --logo /usr/share/ublue-os/bluefin-logo -c /usr/share/ublue-os/ublue-os.jsonc"
\ No newline at end of file