diff --git a/linux58-tkg/PKGBUILD b/linux58-tkg/PKGBUILD
index 9e8f6d0..abb66ea 100644
--- a/linux58-tkg/PKGBUILD
+++ b/linux58-tkg/PKGBUILD
@@ -54,8 +54,10 @@ fi
 # CPU SCHED selector
 if [ -z "$_cpusched" ] && [ ! -e "$_where"/cpuschedset ]; then
   plain "What CPU sched variant do you want to build/install?"
-  read -rp "`echo $'  > 1.PDS\n    2.CFS\nchoice[1-2?]: '`" CONDITION;
+  read -rp "`echo $'  > 1.PDS\n    2.Project C / BMQ\n    3.CFS\nchoice[1-3?]: '`" CONDITION;
   if [ "$CONDITION" == "2" ]; then
+    echo "_cpusched=\"bmq\"" > "$_where"/cpuschedset
+  elif [ "$CONDITION" == "3" ]; then
     echo "_cpusched=\"cfs\"" > "$_where"/cpuschedset
   else
     echo "_cpusched=\"pds\"" > "$_where"/cpuschedset
@@ -117,7 +119,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
         #0008-5.8-bcachefs.patch
         0009-glitched-ondemand-bmq.patch
         0009-glitched-bmq.patch
-        0009-bmq_v5.8-r0.patch
+        0009-prjc_v5.8-r0.patch
         0011-ZFS-fix.patch
         #0012-linux-hardened.patch
         0012-misc-additions.patch
@@ -410,8 +412,9 @@ function exit_cleanup {
     rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/pds_sched.h
 
     rm -f "$srcdir"/linux-${_basekernel}/Documentation/scheduler/sched-BMQ.txt
-    rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/bmq.c
-    rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/bmq_sched.h
+    rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/alt_core.c
+    rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/sched/alt_debug.c
+    rm -f "$srcdir"/linux-${_basekernel}/kernel/sched/alt_sched.h
 
     rm -f "$srcdir"/linux-${_basekernel}/Documentation/scheduler/sched-BFS.txt
     rm -f "$srcdir"/linux-${_basekernel}/Documentation/scheduler/sched-MuQSS.txt
diff --git a/linux58-tkg/linux58-tkg-config/prepare b/linux58-tkg/linux58-tkg-config/prepare
index 6ad4a7d..1917341 100644
--- a/linux58-tkg/linux58-tkg-config/prepare
+++ b/linux58-tkg/linux58-tkg-config/prepare
@@ -48,8 +48,8 @@ _tkg_srcprep() {
     fi
     patch -Np1 -i ../0005-glitched-pds.patch
   elif [ "${_cpusched}" == "bmq" ]; then
-    # BMQ
-    patch -Np1 -i ../0009-bmq_v5.8-r0.patch
+    # Project C / BMQ
+    patch -Np1 -i ../0009-prjc_v5.8-r0.patch
     if [ "${_aggressive_ondemand}" == "true" ]; then
       patch -Np1 -i ../0009-glitched-ondemand-bmq.patch
     fi
@@ -139,7 +139,7 @@ _tkg_srcprep() {
     echo "CONFIG_SCHED_PDS=y" >> ./.config
   elif [ "${_cpusched}" == "bmq" ]; then
     # BMQ default config
-    echo "CONFIG_SCHED_BMQ=y" >> ./.config
+    echo "CONFIG_SCHED_ALT=y" >> ./.config
   fi
 
   if [ "${_cpusched}" == "MuQSS" ] || [ "${_cpusched}" == "pds" ] || [ "${_cpusched}" == "bmq" ]; then
@@ -162,14 +162,34 @@ _tkg_srcprep() {
       plain "0: No yield."
       plain "1: Deboost and requeue task. (default)"
       plain "2: Set rq skip task."
-      read -rp "`echo $'\n    > 0. Recommended option for gaming on PDS and MuQSS - "tkg" default\n      1. Default, but can lead to stability issues on some platforms\n      2. Can be a good option with low rr_interval on MuQSS\n    [0-2?]: '`" CONDITION0;
+      if [ "${_cpusched}" == "MuQSS" ]; then
+        read -rp "`echo $'\n      0. Supposedly best option for gaming performance - could lead to stability issues on some (AMD) platforms when combined with MuQSS\n    > 1. Default and recommended option for MuQSS - could lead to stability issues on some (Intel) platforms\n      2. Can be a good option with low rr_interval on MuQSS\n    [0-2?]: '`" CONDITION0;
+      else
+        read -rp "`echo $'\n    > 0. Recommended option for gaming on PDS - "tkg" default\n      1. Default, but can lead to stability issues on some platforms\n      2. Can be a good option with low rr_interval on MuQSS\n    [0-2?]: '`" CONDITION0;
+      fi
     fi
-    if [ "$CONDITION0" == "1" ]; then
+    if [ "$CONDITION0" == "0" ]; then
+      if [ "${_cpusched}" == "bmq" ]; then
+        sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 0;/' ./kernel/sched/alt_core.c
+      else
+        sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 0;/' ./kernel/sched/"${_cpusched}".c
+      fi
+    elif [ "$CONDITION0" == "1" ]; then
       msg2 "Using default CPU sched yield type (1)"
     elif [ "$CONDITION0" == "2" ]; then
-      sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 2;/' ./kernel/sched/"${_cpusched}".c
+      if [ "${_cpusched}" == "bmq" ]; then
+        sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 2;/' ./kernel/sched/alt_core.c
+      else
+        sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 2;/' ./kernel/sched/"${_cpusched}".c
+      fi
     else
-      sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 0;/' ./kernel/sched/"${_cpusched}".c
+      if [ "${_cpusched}" == "MuQSS" ]; then
+        msg2 "Using default CPU sched yield type (1)"
+      elif [ "${_cpusched}" == "bmq" ]; then
+        sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 0;/' ./kernel/sched/alt_core.c
+      else
+        sed -i -e 's/int sched_yield_type __read_mostly = 1;/int sched_yield_type __read_mostly = 0;/' ./kernel/sched/"${_cpusched}".c
+      fi
     fi
   fi
 
diff --git a/linux58-tkg/linux58-tkg-patches/0009-bmq_v5.8-r0.patch b/linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r0.patch
similarity index 100%
rename from linux58-tkg/linux58-tkg-patches/0009-bmq_v5.8-r0.patch
rename to linux58-tkg/linux58-tkg-patches/0009-prjc_v5.8-r0.patch