diff --git a/02_build_image.sh b/02_build_image.sh
index 1f8a66a..af36d94 100755
--- a/02_build_image.sh
+++ b/02_build_image.sh
@@ -37,7 +37,7 @@ done
 
 echo >&2 "===]> Info: Create diskdefines... "
 cat <<EOF >"${IMAGE_PATH}"/README.diskdefines
-#define DISKNAME  Ubuntu MBP 22.04 LTS "Jammy Jellyfish" - Beta amd64
+#define DISKNAME  Kubuntu MBP 22.04 LTS "Jammy Jellyfish" - amd64
 #define TYPE  binary
 #define TYPEbinary  1
 #define ARCH  amd64
diff --git a/04_create_iso.sh b/04_create_iso.sh
index 0abbe28..60e04ae 100755
--- a/04_create_iso.sh
+++ b/04_create_iso.sh
@@ -10,7 +10,7 @@ echo >&2 "===]> Info: Create Isolinux... "
 xorriso -as mkisofs \
   -iso-level 3 \
   -full-iso9660-filenames \
-  -volid "UBUNTU_MBP" \
+  -volid "KUBUNTU_MBP" \
   -b boot/grub/bios.img \
   -no-emul-boot \
   -boot-load-size 4 \
@@ -23,7 +23,7 @@ xorriso -as mkisofs \
   -no-emul-boot \
   -isohybrid-mbr "${ROOT_PATH}/files/isohdpfx.bin" \
   -isohybrid-gpt-basdat -isohybrid-apm-hfsplus \
-  -output "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}.iso" \
+  -output "${ROOT_PATH}/kubuntu-22.04-${KERNEL_VERSION}.iso" \
   -graft-points \
   "." \
   /boot/grub/bios.img=isolinux/bios.img \
diff --git a/build.sh b/build.sh
index 913e57a..86ce614 100755
--- a/build.sh
+++ b/build.sh
@@ -40,7 +40,7 @@ for ALTERNATIVE in t2-jammy
 do
   echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
 
-  echo >&2 "===]> Info: Build Ubuntu Jammy... "
+  echo >&2 "===]> Info: Build Kubuntu Jammy... "
   /bin/bash -c "
     ROOT_PATH=${ROOT_PATH} \\
     WORKING_PATH=${WORKING_PATH} \\
@@ -85,10 +85,10 @@ do
   fi
   ## Zip iso and split it into multiple parts - github max size of release attachment is 2GB, where ISO is sometimes bigger than that
   cd "${ROOT_PATH}"
-  zip -s 1500m "${ROOT_PATH}/output/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso"
+  zip -s 1500m "${ROOT_PATH}/output/kubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/kubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso"
 done
 ## Calculate sha256 sums of built ISO
-sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-ubuntu-22.04"
+sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-kubuntu-22.04"
 
 find ./ | grep ".iso"
 find ./ | grep ".zip"
diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 7264218..7d26d53 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -11,7 +11,7 @@ mount none -t devpts /dev/pts
 export HOME=/root
 export LC_ALL=C
 
-echo "ubuntu-jammy-live" >/etc/hostname
+echo "kubuntu-jammy-live" >/etc/hostname
 
 echo >&2 "===]> Info: Configure and update apt... "
 
@@ -45,7 +45,7 @@ echo >&2 "===]> Info: Install packages needed for Live System... "
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
-  ubuntu-standard \
+  kde-standard \
   sudo \
   casper \
   discover \
@@ -64,7 +64,8 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   intel-microcode \
   thermald \
   grub2 \
-  nautilus-admin
+  nautilus-admin \
+  software-properties-common
 
 curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-headers-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/headers.deb
 curl -L https://github.com/t2linux/T2-Ubuntu-Kernel/releases/download/vKVER-PREL/linux-image-KVER-${ALTERNATIVE}_KVER-PREL_amd64.deb > /tmp/image.deb
@@ -74,10 +75,17 @@ apt install /tmp/headers.deb /tmp/image.deb
 echo >&2 "===]> Info: Install window manager... "
 
 apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \
-  plymouth-theme-ubuntu-logo \
-  ubuntu-desktop-minimal \
-  ubuntu-gnome-wallpapers \
-  snapd
+  plymouth-theme-spinner \
+  plymouth-theme-kubuntu-logo \
+  plymouth-theme-kubuntu-text \
+  plymouth-theme-ubuntu-text \
+  kde-plasma-desktop \
+  kubuntu-settings-desktop \
+  plasma-discover \
+  kubuntu-wallpapers \
+  sddm-theme-breeze \
+  snapd \
+  firefox
 
 echo >&2 "===]> Info: Install Graphical installer... "
 
@@ -85,7 +93,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   ubiquity \
   ubiquity-casper \
   ubiquity-frontend-gtk \
-  ubiquity-slideshow-ubuntu \
+  ubiquity-slideshow-kubuntu \
   ubiquity-ubuntu-artwork
 
 echo >&2 "===]> Info: Install useful applications and sound configuration... "
@@ -142,6 +150,8 @@ apt-get purge -y -qq \
   linux-image-generic \
   linux-modules-5.15.0-72-generic \
   linux-modules-extra-5.15.0-72-generic
+  sddm-theme-debian-maui \
+  gedit
 
 apt-get autoremove -y
 
diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg
index fcfe3d9..3afa2cc 100644
--- a/files/grub/grub.cfg
+++ b/files/grub/grub.cfg
@@ -6,27 +6,27 @@ insmod all_video
 set default="0"
 set timeout=30
 
-menuentry "Try Ubuntu Jammy Jellyfish without installing" {
+menuentry "Try Kubuntu Jammy Jellyfish without installing" {
    linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Try Ubuntu Jammy Jellyfish without installing (Safe Graphics)" {
+menuentry "Try Kubuntu Jammy Jellyfish without installing (Safe Graphics)" {
    linux /casper/vmlinuz file=/cdrom/preseed/mbp164.seed boot=casper ro nomodeset pcie_ports=compat intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Try Ubuntu Jammy Jellyfish without installing (NVMe blacklisted)" {
+menuentry "Try Kubuntu Jammy Jellyfish without installing (NVMe blacklisted)" {
    linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat intel_iommu=on iommu=pt modprobe.blacklist=nvme ---
    initrd /casper/initrd
 }
-menuentry "Install Ubuntu Jammy Jellyfish" {
+menuentry "Install Kubuntu Jammy Jellyfish" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Install Ubuntu Jammy Jellyfish (Safe Graphics)" {
+menuentry "Install Kubuntu Jammy Jellyfish (Safe Graphics)" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp164.seed boot=casper only-ubiquity nomodeset pcie_ports=compat intel_iommu=on iommu=pt ---
    initrd /casper/initrd
 }
-menuentry "Install Ubuntu Jammy Jellyfish (NVMe blacklisted)" {
+menuentry "Install Kubuntu Jammy Jellyfish (NVMe blacklisted)" {
    linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt modprobe.blacklist=nvme ---
    initrd /casper/initrd
 }