diff --git a/linux-tkg/PKGBUILD b/linux-tkg/PKGBUILD
index ca44d14..f56fcde 100644
--- a/linux-tkg/PKGBUILD
+++ b/linux-tkg/PKGBUILD
@@ -285,9 +285,8 @@ case $_basever in
 	;;
 	510)
 	opt_ver="5.8%2B"
-    source=("https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz"
-        #"https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.xz"
-        #"https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+    source=("$kernel_site"
+        #"$patch_site"
         "https://raw.githubusercontent.com/graysky2/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v10.1%2B_kernel_v5.8%2B.patch"
         'config.x86_64' # stock Arch config
         #'config_hardened.x86_64' # hardened Arch config
diff --git a/linux-tkg/linux-tkg-config/prepare b/linux-tkg/linux-tkg-config/prepare
index 8bdfe6d..6e8bace 100644
--- a/linux-tkg/linux-tkg-config/prepare
+++ b/linux-tkg/linux-tkg-config/prepare
@@ -119,36 +119,36 @@ _tkg_initscript() {
   # CPU SCHED selector
   if [ -z "$_cpusched" ] && [ ! -e "${_path}"/cpuschedset ]; then
     plain "What CPU sched variant do you want to build/install?"
-    if [ "$_basever" = "58" ]; then
+    if [ "$_basever" = "54" ] || [ "$_basever" = "57" ]; then
+      prompt="`echo $'  > 1.PDS\n    2.MuQSS\n    3.BMQ\n    4.CFS\nchoice[1-4?]: '`"
+    elif [ "$_basever" = "58" ]; then
       prompt="`echo $'  > 1.Undead PDS (TkG)\n    2.Project C / PDS\n    3.Project C / BMQ\n    4.CFS\nchoice[1-4?]: '`"
-    elif [ "$_basever" = "59" ]; then
-      prompt="`echo $'  > 1.Project C / PDS\n    2.Project C / BMQ\n    3.MuQSS\n    4.CFS\nchoice[1-3?]: '`"
     else
-	prompt="`echo $'  > 1.PDS\n    2.MuQSS\n    3.BMQ\n    4.CFS\nchoice[1-4?]: '`"
+      prompt="`echo $'  > 1.Project C / PDS\n    2.Project C / BMQ\n    3.MuQSS\n    4.CFS\nchoice[1-4?]: '`"
     fi
     read -rp "$prompt"  CONDITION;
     if [ "$CONDITION" = "2" ];then
-	if [ "$_basever" = "58" ]; then
+      if [ "$_basever" = "54" ] || [ "$_basever" = "57" ]; then
+        echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset
+      elif [ "$_basever" = "58" ]; then
         echo "_cpusched=\"pds\"" > "${_path}"/cpuschedset
-	elif [ "$_basever" = "59" ]; then
-	  echo "_cpusched=\"bmq\"" > "${_path}"/cpuschedset
-      else
-	  echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset
+      else [ "$_basever" = "59" ]; then
+        echo "_cpusched=\"bmq\"" > "${_path}"/cpuschedset
       fi
     elif [ "$CONDITION" = "3" ]; then
-	if [ "$_basever" != "59" ]; then
+      if [ "$_basever" = "54" ] || [ "$_basever" = "57" ] || [ "$_basever" = "58" ]; then
         echo "_cpusched=\"bmq\"" > "${_path}"/cpuschedset
-	else
-	  echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset
-	fi
+      else
+        echo "_cpusched=\"MuQSS\"" > "${_path}"/cpuschedset
+      fi
     elif [ "$CONDITION" = "4" ]; then
       echo "_cpusched=\"cfs\"" > "${_path}"/cpuschedset
     else
-	if [ "$_basever" = "58" ]; then
+      if [ "$_basever" = "58" ]; then
         echo "_cpusched=\"upds\"" > "${_path}"/cpuschedset
-	else
-	  echo "_cpusched=\"pds\"" > "${_path}"/cpuschedset
-	fi
+      else
+        echo "_cpusched=\"pds\"" > "${_path}"/cpuschedset
+      fi
     fi
     if [ -n "$_custom_pkgbase" ]; then
       echo "_custom_pkgbase=\"${_custom_pkgbase}\"" >> "${_path}"/cpuschedset