diff --git a/meta-leda-components/recipes-sdv/leda-tools/kibi.inc b/meta-leda-components/recipes-sdv/leda-tools/kibi.inc
new file mode 100644
index 00000000..98b52eca
--- /dev/null
+++ b/meta-leda-components/recipes-sdv/leda-tools/kibi.inc
@@ -0,0 +1,67 @@
+# /********************************************************************************
+# * Copyright (c) 2023 Contributors to the Eclipse Foundation
+# *
+# * See the NOTICE file(s) distributed with this work for additional
+# * information regarding copyright ownership.
+# *
+# * This program and the accompanying materials are made available under the
+# * terms of the Apache License 2.0 which is available at
+# * https://www.apache.org/licenses/LICENSE-2.0
+# *
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+
+
+PACKAGES = "${PN} ${PN}-dbg"
+FILES:${PN} += "${bindir}/kibi"
+FILES:${PN}-dbg += "${bindir}/.debug"
+
+do_install:append() {
+	cargo_do_install
+	install_syntax_highlighting_confs
+	alias_nano
+}
+
+cargo_do_install () {
+	install_syntax_highlighting_confs
+	local have_installed=false
+	for tgt in "${B}/target/${CARGO_TARGET_SUBDIR}/"*; do
+		case $tgt in
+		*examples)
+			if [ -d "$tgt" ]; then
+				for example in "$tgt/"*; do
+					if [ -f "$example" ] && [ -x "$example" ]; then
+						install -d "${D}${bindir}"
+						install -m755 "$example" "${D}${bindir}"
+						have_installed=true
+					fi
+				done
+			fi
+			;;
+		*)
+			if [ -f "$tgt" ] && [ -x "$tgt" ]; then
+				install -d "${D}${bindir}"
+				install -m755 "$tgt" "${D}${bindir}"
+				have_installed=true
+			fi
+			;;
+		esac
+	done
+	if ! $have_installed; then
+		die "Did not find anything to install"
+	fi
+
+}
+
+install_syntax_highlighting_confs() {
+	if [ ${KIBI_SYNTAX_HIGHLIGHTING} -ne 0 ]; then
+		install -d ${D}${datadir}/kibi
+		cp -r ${S_SYNTAX}/syntax.d ${D}${datadir}/kibi
+	fi
+}	
+
+alias_nano() {
+	if [ ${KIBI_ALIAS_NANO} -ne 0 ]; then
+		ln --relative --symbolic ${D}${bindir}/kibi ${D}${bindir}/nano
+	fi
+}
\ No newline at end of file
diff --git a/meta-leda-components/recipes-sdv/leda-tools/kibi_0.2.2.bb b/meta-leda-components/recipes-sdv/leda-tools/kibi_0.2.2.bb
new file mode 100644
index 00000000..c462e152
--- /dev/null
+++ b/meta-leda-components/recipes-sdv/leda-tools/kibi_0.2.2.bb
@@ -0,0 +1,96 @@
+# /********************************************************************************
+# * Copyright (c) 2023 Contributors to the Eclipse Foundation
+# *
+# * See the NOTICE file(s) distributed with this work for additional
+# * information regarding copyright ownership.
+# *
+# * This program and the accompanying materials are made available under the
+# * terms of the Apache License 2.0 which is available at
+# * https://www.apache.org/licenses/LICENSE-2.0
+# *
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+
+SUMMARY = "A text editor in less than 1024 lines of code with syntax higlighting, search and more."
+DESCRIPTION = "Kibi is a small text editor with syntax highlighting and a permissive FOSS license. Can be used as a nano-replacement"
+HOMEPAGE = "https://github.com/ilai-deutel/kibi"
+
+inherit cargo
+
+SRC_URI += "git://github.com/ilai-deutel/kibi.git;protocol=https;nobranch=1"
+SRCREV = "2cc6bead72e2b48203d6ddf28f189c51868a9a79"
+
+# Get a commit with syntax highlighting for a lot of languages but no support for rust version 1.59.0
+SRC_URI += "git://github.com/ilai-deutel/kibi.git;protocol=https;nobranch=1;name=moresyntax;destsuffix=moresyntax/"
+SRCREV_moresyntax = "ed5244ee9837862610307036d8daa1a1e4afa884"
+
+S = "${WORKDIR}/git"
+S_SYNTAX = "${WORKDIR}/moresyntax"
+
+CARGO_SRC_DIR = ""
+PV:append = ".AUTOINC+2cc6bead72"
+
+KIBI_SYNTAX_HIGHLIGHTING ??= "1"
+KIBI_SYNTAX_HIGHLIGHTING[doc] = "Set to 0 to skip installing kibi syntax highlighting confs. Default 1."
+
+KIBI_ALIAS_NANO ??= "1"
+KIBI_ALIAS_NANO[doc] = "Set to 0 to skip aliasing nano to kibi. Default 1 (kibi is supposed to be a nano replacement)."
+
+SRC_URI += " \
+    crate://crates.io/bitflags/1.3.2 \
+    crate://crates.io/cfg-if/1.0.0 \
+    crate://crates.io/dashmap/5.2.0 \
+    crate://crates.io/fastrand/1.7.0 \
+    crate://crates.io/futures-channel/0.3.21 \
+    crate://crates.io/futures-core/0.3.21 \
+    crate://crates.io/futures-executor/0.3.21 \
+    crate://crates.io/futures-io/0.3.21 \
+    crate://crates.io/futures-sink/0.3.21 \
+    crate://crates.io/futures-task/0.3.21 \
+    crate://crates.io/futures-util/0.3.21 \
+    crate://crates.io/futures/0.3.21 \
+    crate://crates.io/hermit-abi/0.1.19 \
+    crate://crates.io/instant/0.1.12 \
+    crate://crates.io/lazy_static/1.4.0 \
+    crate://crates.io/libc/0.2.132 \
+    crate://crates.io/lock_api/0.4.6 \
+    crate://crates.io/log/0.4.17 \
+    crate://crates.io/memchr/2.5.0 \
+    crate://crates.io/num_cpus/1.13.1 \
+    crate://crates.io/parking_lot/0.12.1 \
+    crate://crates.io/parking_lot_core/0.9.3 \
+    crate://crates.io/pin-project-lite/0.2.9 \
+    crate://crates.io/pin-utils/0.1.0 \
+    crate://crates.io/proc-macro-error-attr/1.0.4 \
+    crate://crates.io/proc-macro-error/1.0.4 \
+    crate://crates.io/proc-macro2/1.0.36 \
+    crate://crates.io/quote/1.0.15 \
+    crate://crates.io/redox_syscall/0.2.10 \
+    crate://crates.io/remove_dir_all/0.5.3 \
+    crate://crates.io/scopeguard/1.1.0 \
+    crate://crates.io/serial_test/0.9.0 \
+    crate://crates.io/serial_test_derive/0.9.0 \
+    crate://crates.io/slab/0.4.6 \
+    crate://crates.io/smallvec/1.8.0 \
+    crate://crates.io/syn/1.0.86 \
+    crate://crates.io/tempfile/3.3.0 \
+    crate://crates.io/unicode-width/0.1.9 \
+    crate://crates.io/unicode-xid/0.2.2 \
+    crate://crates.io/version_check/0.9.4 \
+    crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi-util/0.1.5 \
+    crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+    crate://crates.io/winapi/0.3.9 \
+    crate://crates.io/windows-sys/0.36.1 \
+    crate://crates.io/windows_aarch64_msvc/0.36.1 \
+    crate://crates.io/windows_i686_gnu/0.36.1 \
+    crate://crates.io/windows_i686_msvc/0.36.1 \
+    crate://crates.io/windows_x86_64_gnu/0.36.1 \
+    crate://crates.io/windows_x86_64_msvc/0.36.1 \
+"
+
+# We choose the Apache-2.0 license
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE-APACHE;md5=2f53897b0b4f171c36c885dafd675e66"
+
+include kibi.inc
diff --git a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-tools.bb b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-tools.bb
index 5d3890cc..8125b09a 100644
--- a/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-tools.bb
+++ b/meta-leda-components/recipes-sdv/packagegroups/packagegroup-sdv-tools.bb
@@ -19,6 +19,7 @@ inherit packagegroup
 RDEPENDS:${PN} = "\
     htop \
     jq \
+    kibi \
     mosquitto-clients \
     leda-utils \
     skopeo \