diff --git a/.github/workflows/compile-configs.yml b/.github/workflows/compile-configs.yml
index 767b87f7a63a..b5de0859c222 100644
--- a/.github/workflows/compile-configs.yml
+++ b/.github/workflows/compile-configs.yml
@@ -8,15 +8,16 @@ on:
     types: [released]
 
 jobs:
-  Build-Default-A:            # Default NoPro for Aquila
-    name: Build Default Files A
+  Build-UBL-ProUI-A1:            # UBL Pro for Aquila
+    name: Build UBL Pro Files A1
     runs-on: ubuntu-latest
     strategy:
       matrix:
         chip: [GD32,N32]
         temp: [true,false]
-        inshape: [true,false]
         tjc: [true,false]
+        pwr: [true,false]
+        t13: [true,false]
     steps:
     - uses: actions/checkout@v3
     - name: Setup node
@@ -48,36 +49,47 @@ jobs:
     - name: Run PlatformIO
       id: build_configs
       run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}_Default-NoPro${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
+        if ($PWR); then PLTMP=-PWRLOSS; else PLTMP=; fi;
+        if ($T13); then TTMP=-SpriteT13; else TTMP=; fi;
+        if [ "$PWR" = true ] && [ "$TP" = true ]; then exit 0; fi;
+        echo "filename=${DTMP}Aquila${TTMP}_${AVTMP}_UBL-ProUI${TPTMP}${PLTMP}.bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila/Default-NP/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila/Default-NP/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila/Default-NP/Version.h Marlin/Version.h
+        cp configurations/Voxelab\ Aquila/UBL/ConfigurationPro.h Marlin/Configuration.h
+        cp configurations/Voxelab\ Aquila/UBL/Configuration_advPro.h Marlin/Configuration_adv.h
+        cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
         if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
         sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
+        sed -i "s/.*#define PREHEAT_2_LABEL/${PTEMP}#define PREHEAT_2_LABEL/" Marlin/Configuration.h
+        sed -i "s/.*#define USE_GRID_MESHVIEWER 1/${PTEMP}#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PTEMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
         if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
         sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
+        if ($PWR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        sed -i "s/.*#define SHOW_SPEED_IND/${PLMP}#define SHOW_SPEED_IND/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PLMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
+        if ($T13); then THMP="13"; else THMP="1"; fi;
+        sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
         pio run
         mkdir temp
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
         TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
         TJC: ${{ matrix.tjc }}
+        PWR: ${{ matrix.pwr }}
+        T13: ${{ matrix.t13 }}
     - name: Get release
       id: get_release
       uses: bruceadams/get-release@v1.3.2
@@ -92,15 +104,16 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  Build-Manual-Mesh-A:        # MM Pro for Aquila
-    name: Build Manual-Mesh Files A
+  Build-UBL-ProUI-A2:            # UBL Pro for Aquila
+    name: Build UBL Pro Pyscript A2
     runs-on: ubuntu-latest
     strategy:
       matrix:
         chip: [GD32,N32]
         temp: [true,false]
-        inshape: [true,false]
         tjc: [true,false]
+        pwr: [true,false]
+        t13: [true,false]
     steps:
     - uses: actions/checkout@v3
     - name: Setup node
@@ -132,36 +145,50 @@ jobs:
     - name: Run PlatformIO
       id: build_configs
       run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}_MM-ProUI${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
+        if ($PWR); then PLTMP=-PWRLOSS; else PLTMP=; fi;
+        if ($T13); then TTMP=-SpriteT13; else TTMP=; fi;
+        if [ "$PWR" = true ] && [ "$TP" = true ]; then
+        chmod +x exitcode.py
+        ./exitcode.py
+        fi;
+        echo "filename=${DTMP}Aquila${TTMP}_${AVTMP}_UBL-ProUI${TPTMP}${PLTMP}.bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila/MM/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila/MM/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila/MM/Version.h Marlin/Version.h
+        cp configurations/Voxelab\ Aquila/UBL/ConfigurationPro.h Marlin/Configuration.h
+        cp configurations/Voxelab\ Aquila/UBL/Configuration_advPro.h Marlin/Configuration_adv.h
+        cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
         if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
         sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
+        sed -i "s/.*#define PREHEAT_2_LABEL/${PTEMP}#define PREHEAT_2_LABEL/" Marlin/Configuration.h
+        sed -i "s/.*#define USE_GRID_MESHVIEWER 1/${PTEMP}#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PTEMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
         if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
         sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
+        if ($PWR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        sed -i "s/.*#define SHOW_SPEED_IND/${PLMP}#define SHOW_SPEED_IND/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PLMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
+        if ($T13); then THMP="13"; else THMP="1"; fi;
+        sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
         pio run
         mkdir temp
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
         TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
         TJC: ${{ matrix.tjc }}
+        PWR: ${{ matrix.pwr }}
+        T13: ${{ matrix.t13 }}
     - name: Get release
       id: get_release
       uses: bruceadams/get-release@v1.3.2
@@ -176,8 +203,8 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  Build-UBL-ProUI-A:            # UBL Pro for Aquila
-    name: Build UBL Pro Files A
+  Build-UBL-ProUI-A3:            # UBL Pro for Aquila
+    name: Build UBL Pro AllIf A3
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -217,12 +244,13 @@ jobs:
     - name: Run PlatformIO
       id: build_configs
       run: |
+        if [ "$PWR" = true ] && [ "$TP" = true ]; then A=
+        else
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
         if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         if ($PWR); then PLTMP=-PWRLOSS; else PLTMP=; fi;
         if ($T13); then TTMP=-SpriteT13; else TTMP=; fi;
-        if [ "$PWR" = true ] && [ "$TP" = true ]; then exit 0; fi;
         echo "filename=${DTMP}Aquila${TTMP}_${AVTMP}_UBL-ProUI${TPTMP}${PLTMP}.bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
@@ -252,6 +280,7 @@ jobs:
         pio run
         mkdir temp
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
+        fi;
       env:
         AQUILA_VER: ${{ matrix.chip }}
         TP: ${{ matrix.temp }}
@@ -272,12 +301,15 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  Build-UBL-ProUI-A-X3:            # UBL Pro for Aquila X3
-    name: Build UBL Pro Files A X3
+  Build-UBL-ProUI-A4:            # UBL Pro for Aquila
+    name: Build UBL Pro NoTP A4
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        chip: [GD32,N32]
+        tjc: [true,false]
         pwr: [true,false]
+        t13: [true,false]
     steps:
     - uses: actions/checkout@v3
     - name: Setup node
@@ -309,110 +341,37 @@ jobs:
     - name: Run PlatformIO
       id: build_configs
       run: |
+        if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
         if ($PWR); then PLTMP=-PWRLOSS; else PLTMP=; fi;
-        echo "filename=Aquila_X3_N32_UBL-ProUI${PLTMP}.bin" >> $GITHUB_OUTPUT
+        if ($T13); then TTMP=-SpriteT13; else TTMP=; fi;
+        if [ "$PWR" = true ] && [ "$TP" = true ]; then exit 0; fi;
+        echo "filename=${DTMP}Aquila${TTMP}_${AVTMP}_UBL-ProUI${PLTMP}.bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila/X3/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila/X3/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila/X3/Version.h Marlin/Version.h
-        sed -i "s/default_envs =.*/default_envs = N32G455RE_voxelab_maple/" platformio.ini
+        cp configurations/Voxelab\ Aquila/UBL/ConfigurationPro.h Marlin/Configuration.h
+        cp configurations/Voxelab\ Aquila/UBL/Configuration_advPro.h Marlin/Configuration_adv.h
+        cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
+        sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
+        if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
+        sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
+        sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
         if ($PWR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        sed -i "s/.*#define SHOW_SPEED_IND/${PLMP}#define SHOW_SPEED_IND/" Marlin/Configuration.h
         sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
         sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
         sed -i "s/.*#define CAPABILITIES_REPORT/${PLMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
-        pio run
-        mkdir temp
-        mv .pio/build/N32G455RE_voxelab_maple/*.bin temp/build.bin
-      env:
-        PWR: ${{ matrix.pwr }}
-    - name: Get release
-      id: get_release
-      uses: bruceadams/get-release@v1.3.2
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-    - name: Upload Release Asset
-      uses: tanyagray/action-upload-release-asset@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: temp/build.bin
-        asset_name: ${{ steps.build_configs.outputs.filename }}
-        asset_content_type: application/x-binary
-  Build-UBL-NoPro-A:          # UBL NoPro for Aquila
-    name: Build UBL NoPro Files A
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        chip: [GD32,N32]
-        grid: [3,5,7]
-        temp: [true,false]
-        inshape: [true,false]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Cache pip
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install PlatformIO
-      run: |
-        python3 -m pip install --upgrade pip
-        pip install --upgrade pip
-        pip install --upgrade wheel
-        pip install --upgrade platformio
-    - name: Run PlatformIO
-      id: build_configs
-      run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
-        if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
-        echo "filename=Aquila_${AVTMP}_UBL-${GRID}x${GRID}-NoPro${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
-        > Marlin/Configuration.h
-        > Marlin/Configuration_adv.h
-        > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila/UBL/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila/UBL/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
-        sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
-        sed -i "s/.*#define GRID_MAX_POINTS_X.*/#define GRID_MAX_POINTS_X ${GRID}/g" Marlin/Configuration.h
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
-        if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
-        sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
-        if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
-        sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
-        if [ "$IS" = true ] && [ "$TP" = true ]; then
-        sed -i "s/.*#define USE_GRID_MESHVIEWER 1/\/\/#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h;
-        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/\/\/#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h;
-        sed -i "s/.*#define CAPABILITIES_REPORT/\/\/#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h;
-        fi;
+        if ($T13); then THMP="13"; else THMP="1"; fi;
+        sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
         pio run
         mkdir temp
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
         AQUILA_VER: ${{ matrix.chip }}
-        GRID: ${{ matrix.grid }}
-        TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
+        TJC: ${{ matrix.tjc }}
+        PWR: ${{ matrix.pwr }}
+        T13: ${{ matrix.t13 }}
     - name: Get release
       id: get_release
       uses: bruceadams/get-release@v1.3.2
@@ -427,14 +386,16 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  Build-BLTouch-A:            # BLTouch Pro for Aquila
-    name: Build BLT Pro Files A
+  Build-UBL-ProUI-A5:            # UBL Pro for Aquila
+    name: Build UBL Pro TP=f A5
     runs-on: ubuntu-latest
     strategy:
       matrix:
         chip: [GD32,N32]
-        temp: [true,false]
+        temp: [false]
         tjc: [true,false]
+        pwr: [true,false]
+        t13: [true,false]
     steps:
     - uses: actions/checkout@v3
     - name: Setup node
@@ -466,25 +427,38 @@ jobs:
     - name: Run PlatformIO
       id: build_configs
       run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
         if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}_BLT-ProUI${TPTMP}.bin" >> $GITHUB_OUTPUT
+        if ($PWR); then PLTMP=-PWRLOSS; else PLTMP=; fi;
+        if ($T13); then TTMP=-SpriteT13; else TTMP=; fi;
+        if [ "$PWR" = true ] && [ "$TP" = true ]; then exit 0; fi;
+        echo "filename=${DTMP}Aquila${TTMP}_${AVTMP}_UBL-ProUI${TPTMP}${PLTMP}.bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila/BLT/ConfigurationPro.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila/BLT/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila/BLT/Version.h Marlin/Version.h
+        cp configurations/Voxelab\ Aquila/UBL/ConfigurationPro.h Marlin/Configuration.h
+        cp configurations/Voxelab\ Aquila/UBL/Configuration_advPro.h Marlin/Configuration_adv.h
+        cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
         if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
-        if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
         sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
+        sed -i "s/.*#define PREHEAT_2_LABEL/${PTEMP}#define PREHEAT_2_LABEL/" Marlin/Configuration.h
+        sed -i "s/.*#define USE_GRID_MESHVIEWER 1/${PTEMP}#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PTEMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
+        if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
         sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
-        sed -i "s/.*#define NOZZLE_CLEAN_FEATURE/${PTEMP}#define NOZZLE_CLEAN_FEATURE/" Marlin/Configuration.h
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
+        if ($PWR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        sed -i "s/.*#define SHOW_SPEED_IND/${PLMP}#define SHOW_SPEED_IND/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PLMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
+        if ($T13); then THMP="13"; else THMP="1"; fi;
+        sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
         pio run
         mkdir temp
         mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
@@ -492,6 +466,8 @@ jobs:
         AQUILA_VER: ${{ matrix.chip }}
         TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
+        PWR: ${{ matrix.pwr }}
+        T13: ${{ matrix.t13 }}
     - name: Get release
       id: get_release
       uses: bruceadams/get-release@v1.3.2
@@ -506,15 +482,16 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  Build-BLTouch-NP-A:         # BLTouch NoPro for Aquila
-    name: Build BLT NoPro Files A
+  Build-UBL-ProUI-A6:            # UBL Pro for Aquila
+    name: Build UBL Pro PWR=f A6
     runs-on: ubuntu-latest
     strategy:
       matrix:
         chip: [GD32,N32]
-        grid: [3,4,5]
         temp: [true,false]
-        inshape: [true,false]
+        tjc: [true,false]
+        pwr: [false]
+        t13: [true,false]
     steps:
     - uses: actions/checkout@v3
     - name: Setup node
@@ -546,457 +523,46 @@ jobs:
     - name: Run PlatformIO
       id: build_configs
       run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
         if [ "$AQUILA_VER" = GD32 ]; then AVTMP="GD32"; else AVTMP="N32"; fi;
-        echo "filename=Aquila_${AVTMP}_BLT-${GRID}x${GRID}-NoPro${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
+        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
+        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
+        if ($PWR); then PLTMP=-PWRLOSS; else PLTMP=; fi;
+        if ($T13); then TTMP=-SpriteT13; else TTMP=; fi;
+        if [ "$PWR" = true ] && [ "$TP" = true ]; then exit 0; fi;
+        echo "filename=${DTMP}Aquila${TTMP}_${AVTMP}_UBL-ProUI${TPTMP}${PLTMP}.bin" >> $GITHUB_OUTPUT
         > Marlin/Configuration.h
         > Marlin/Configuration_adv.h
         > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila/BLT/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila/BLT/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila/BLT/Version.h Marlin/Version.h
+        cp configurations/Voxelab\ Aquila/UBL/ConfigurationPro.h Marlin/Configuration.h
+        cp configurations/Voxelab\ Aquila/UBL/Configuration_advPro.h Marlin/Configuration_adv.h
+        cp configurations/Voxelab\ Aquila/UBL/Version.h Marlin/Version.h
         sed -i "s/default_envs =.*/default_envs = ${AQUILA_VER}F103RC_voxelab_maple/" platformio.ini
-        sed -i "s/.*#define GRID_MAX_POINTS_X.*/#define GRID_MAX_POINTS_X ${GRID}/g" Marlin/Configuration.h
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
         if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
         sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
+        sed -i "s/.*#define PREHEAT_2_LABEL/${PTEMP}#define PREHEAT_2_LABEL/" Marlin/Configuration.h
+        sed -i "s/.*#define USE_GRID_MESHVIEWER 1/${PTEMP}#define USE_GRID_MESHVIEWER 1/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PTEMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PTEMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
         if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
         sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
-        pio run
-        mkdir temp
-        mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
-      env:
-        AQUILA_VER: ${{ matrix.chip }}
-        GRID: ${{ matrix.grid }}
-        TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
-    - name: Get release
-      id: get_release
-      uses: bruceadams/get-release@v1.3.2
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-    - name: Upload Release Asset
-      uses: tanyagray/action-upload-release-asset@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: temp/build.bin
-        asset_name: ${{ steps.build_configs.outputs.filename }}
-        asset_content_type: application/x-binary
-  Build-UBL-ProUI-A-SKR:            # UBL Pro for Aquila, SKR Mini
-    name: Build UBL Pro Files A SKR
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        chip: [V3_0,V2_0,V3_0_1]
-        tjc: [true,false]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Cache pip
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install PlatformIO
-      run: |
-        python3 -m pip install --upgrade pip
-        pip install --upgrade pip
-        pip install --upgrade wheel
-        pip install --upgrade platformio
-    - name: Run PlatformIO
-      id: build_configs
-      run: |
-        if [ "$SKR" = V3_0 ]; then AVTMP="V3"; STMP="STM32G0B1RE"
-        elif [ "$SKR" = V2_0 ]; then AVTMP="V2"; STMP="STM32F103RC"
-        elif [ "$SKR" = V3_0_1 ]; then AVTMP="V3-0-1"; STMP="STM32F401RC"
-        fi;
-        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        echo "filename=${DTMP}Aquila_SKR-Mini-E3-${AVTMP}_UBL-ProUI.bin" >> $GITHUB_OUTPUT
-        > Marlin/Configuration.h
-        > Marlin/Configuration_adv.h
-        > Marlin/Version.h
-        if [ "$SKR" = V3_0 ]; then
-        cp configurations/BTT-SKR_Mini_E3_V3/ConfigurationUBL.h Marlin/Configuration.h
-        cp configurations/BTT-SKR_Mini_E3_V3/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/BTT-SKR_Mini_E3_V3/Version.h Marlin/Version.h
-        else
-        cp configurations/BTT-SKR_Mini_E3_V2/ConfigurationUBL.h Marlin/Configuration.h
-        cp configurations/BTT-SKR_Mini_E3_V2/Configuration_advUBL.h Marlin/Configuration_adv.h
-        cp configurations/BTT-SKR_Mini_E3_V2/Version.h Marlin/Version.h
-        fi;
-        sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_${SKR}/" Marlin/Configuration.h
         if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
         sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
         sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
-        sed -i "s/default_envs =.*/default_envs = ${STMP}_btt/" platformio.ini
+        if ($PWR); then PLMP='\/\/'; PRMP=; else PLMP=; PRMP='\/\/'; fi;
+        sed -i "s/.*#define SHOW_SPEED_IND/${PLMP}#define SHOW_SPEED_IND/" Marlin/Configuration.h
+        sed -i "s/.*#define HAS_CUSTOM_COLORS 1/${PLMP}#define HAS_CUSTOM_COLORS 1/" Marlin/Configuration.h
+        sed -i "s/.*#define POWER_LOSS_RECOVERY/${PRMP}#define POWER_LOSS_RECOVERY/" Marlin/Configuration_adv.h
+        sed -i "s/.*#define CAPABILITIES_REPORT/${PLMP}#define CAPABILITIES_REPORT/" Marlin/Configuration_adv.h
+        if ($T13); then THMP="13"; else THMP="1"; fi;
+        sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
         pio run
         mkdir temp
-        mv .pio/build/${STMP}_btt/*.bin temp/build.bin
+        mv .pio/build/${AQUILA_VER}F103RC_voxelab_maple/*.bin temp/build.bin
       env:
-        SKR: ${{ matrix.chip }}
-        TJC: ${{ matrix.tjc }}
-    - name: Get release
-      id: get_release
-      uses: bruceadams/get-release@v1.3.2
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-    - name: Upload Release Asset
-      uses: tanyagray/action-upload-release-asset@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: temp/build.bin
-        asset_name: ${{ steps.build_configs.outputs.filename }}
-        asset_content_type: application/x-binary
-  Build-MM-ProUI-A-SKR:            # MM Pro for Aquila, SKR Mini
-    name: Build MM Pro Files A SKR
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        chip: [V3_0,V2_0,V3_0_1]
-        tjc: [true,false]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Cache pip
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install PlatformIO
-      run: |
-        python3 -m pip install --upgrade pip
-        pip install --upgrade pip
-        pip install --upgrade wheel
-        pip install --upgrade platformio
-    - name: Run PlatformIO
-      id: build_configs
-      run: |
-        if [ "$SKR" = V3_0 ]; then AVTMP="V3"; STMP="STM32G0B1RE"
-        elif [ "$SKR" = V2_0 ]; then AVTMP="V2"; STMP="STM32F103RC"
-        elif [ "$SKR" = V3_0_1 ]; then AVTMP="V3-0-1"; STMP="STM32F401RC"
-        fi;
-        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        echo "filename=${DTMP}Aquila_SKR-Mini-E3-${AVTMP}_MM-ProUI.bin" >> $GITHUB_OUTPUT
-        > Marlin/Configuration.h
-        > Marlin/Configuration_adv.h
-        > Marlin/Version.h
-        if [ "$SKR" = V3_0 ]; then
-        cp configurations/BTT-SKR_Mini_E3_V3/ConfigurationMM.h Marlin/Configuration.h
-        cp configurations/BTT-SKR_Mini_E3_V3/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/BTT-SKR_Mini_E3_V3/Version.h Marlin/Version.h
-        else
-        cp configurations/BTT-SKR_Mini_E3_V2/ConfigurationMM.h Marlin/Configuration.h
-        cp configurations/BTT-SKR_Mini_E3_V2/Configuration_advMM.h Marlin/Configuration_adv.h
-        cp configurations/BTT-SKR_Mini_E3_V2/Version.h Marlin/Version.h
-        fi;
-        sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_BTT_SKR_MINI_E3_${SKR}/" Marlin/Configuration.h
-        if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
-        sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
-        sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
-        sed -i "s/default_envs =.*/default_envs = ${STMP}_btt/" platformio.ini
-        pio run
-        mkdir temp
-        mv .pio/build/${STMP}_btt/*.bin temp/build.bin
-      env:
-        SKR: ${{ matrix.chip }}
-        TJC: ${{ matrix.tjc }}
-    - name: Get release
-      id: get_release
-      uses: bruceadams/get-release@v1.3.2
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-    - name: Upload Release Asset
-      uses: tanyagray/action-upload-release-asset@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: temp/build.bin
-        asset_name: ${{ steps.build_configs.outputs.filename }}
-        asset_content_type: application/x-binary
-  Build-Default-A4:            # Default NoPro for Aquila 427
-    name: Build Default Files A4
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        chip: [427,422]
-        temp: [true,false]
-        inshape: [true,false]
-        tjc: [true,false]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Cache pip
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install PlatformIO
-      run: |
-        python3 -m pip install --upgrade pip
-        pip install --upgrade pip
-        pip install --upgrade wheel
-        pip install --upgrade platformio
-    - name: Run PlatformIO
-      id: build_configs
-      run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
-        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; else AVTMP="422"; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}_Default-NoPro${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
-        > Marlin/Configuration.h
-        > Marlin/Configuration_adv.h
-        > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila\ 427/Default-NP/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila\ 427/Default-NP/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila\ 427/Default-NP/Version.h Marlin/Version.h
-        sed -i "s/default_envs =.*/default_envs = STM32F103RE_creality/" platformio.ini
-        if [ "$AQUILA_VER" = 427 ]; then DBORD='CREALITY_V427'; else DBORD='CREALITY_V422'; fi;
-        sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_${DBORD}/" Marlin/Configuration.h
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
-        if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
-        sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
-        if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
-        sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
-        if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
-        sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
-        sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
-        pio run
-        mkdir temp
-        mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
-      env:
-        AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
-        TJC: ${{ matrix.tjc }}
-    - name: Get release
-      id: get_release
-      uses: bruceadams/get-release@v1.3.2
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-    - name: Upload Release Asset
-      uses: tanyagray/action-upload-release-asset@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: temp/build.bin
-        asset_name: ${{ steps.build_configs.outputs.filename }}
-        asset_content_type: application/x-binary
-  Build-Manual-Mesh-A4:        # MM Pro for Aquila 427
-    name: Build Manual-Mesh Files A4
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        chip: [427,422]
-        temp: [true,false]
-        inshape: [true,false]
-        tjc: [true,false]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Cache pip
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install PlatformIO
-      run: |
-        python3 -m pip install --upgrade pip
-        pip install --upgrade pip
-        pip install --upgrade wheel
-        pip install --upgrade platformio
-    - name: Run PlatformIO
-      id: build_configs
-      run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
-        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; else AVTMP="422"; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}_MM-ProUI${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
-        > Marlin/Configuration.h
-        > Marlin/Configuration_adv.h
-        > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila\ 427/MM/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila\ 427/MM/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila\ 427/MM/Version.h Marlin/Version.h
-        sed -i "s/default_envs =.*/default_envs = STM32F103RE_creality/" platformio.ini
-        if [ "$AQUILA_VER" = 427 ]; then DBORD='CREALITY_V427'; else DBORD='CREALITY_V422'; fi;
-        sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_${DBORD}/" Marlin/Configuration.h
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
-        if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
-        sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
-        if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
-        sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
-        if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
-        sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
-        sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
-        pio run
-        mkdir temp
-        mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
-      env:
-        AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
-        TJC: ${{ matrix.tjc }}
-    - name: Get release
-      id: get_release
-      uses: bruceadams/get-release@v1.3.2
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-    - name: Upload Release Asset
-      uses: tanyagray/action-upload-release-asset@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: temp/build.bin
-        asset_name: ${{ steps.build_configs.outputs.filename }}
-        asset_content_type: application/x-binary
-  Build-UBL-ProUI-A4:            # UBL Pro for Aquila 427
-    name: Build UBL Pro Files A4
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        chip: [427,422]
-        temp: [true,false]
-        inshape: [true,false]
-        tjc: [true,false]
-        t13: [true,false]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Cache pip
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install PlatformIO
-      run: |
-        python3 -m pip install --upgrade pip
-        pip install --upgrade pip
-        pip install --upgrade wheel
-        pip install --upgrade platformio
-    - name: Run PlatformIO
-      id: build_configs
-      run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
-        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        if ($T13); then TTMP=-SpriteT13; else TTMP=; fi;
-        if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; else AVTMP="422"; fi;
-        echo "filename=${DTMP}Aquila${TTMP}_${AVTMP}_UBL-ProUI${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
-        > Marlin/Configuration.h
-        > Marlin/Configuration_adv.h
-        > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila\ 427/UBL/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila\ 427/UBL/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila\ 427/UBL/Version.h Marlin/Version.h
-        sed -i "s/default_envs =.*/default_envs = STM32F103RE_creality/" platformio.ini
-        if [ "$AQUILA_VER" = 427 ]; then DBORD='CREALITY_V427'; else DBORD='CREALITY_V422'; fi;
-        sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_${DBORD}/" Marlin/Configuration.h
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
-        if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
-        sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
-        if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
-        sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
-        if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
-        sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
-        sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
-        if ($T13); then THMP="13"; else THMP="1"; fi;
-        sed -i "s/.*#define TEMP_SENSOR_0 1/#define TEMP_SENSOR_0 ${THMP}/" Marlin/Configuration.h
-        pio run
-        mkdir temp
-        mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
-      env:
-        AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
+        AQUILA_VER: ${{ matrix.chip }}
+        TP: ${{ matrix.temp }}
         TJC: ${{ matrix.tjc }}
+        PWR: ${{ matrix.pwr }}
         T13: ${{ matrix.t13 }}
     - name: Get release
       id: get_release
@@ -1012,89 +578,3 @@ jobs:
         asset_path: temp/build.bin
         asset_name: ${{ steps.build_configs.outputs.filename }}
         asset_content_type: application/x-binary
-  Build-BLTouch-A4:            # BLTouch Pro for Aquila 427
-    name: Build BLT Pro Files A4
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        chip: [427,422]
-        temp: [true,false]
-        inshape: [true,false]
-        tjc: [true,false]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Setup node
-      uses: actions/setup-node@v3
-      with:
-        node-version: 16
-    - name: Cache pip
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-    - name: Cache PlatformIO
-      uses: actions/cache@v3.3.2
-      with:
-        path: ~/.platformio
-        key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-    - name: Install PlatformIO
-      run: |
-        python3 -m pip install --upgrade pip
-        pip install --upgrade pip
-        pip install --upgrade wheel
-        pip install --upgrade platformio
-    - name: Run PlatformIO
-      id: build_configs
-      run: |
-        if ($TP); then TPTMP=-MPC; else TPTMP=; fi;
-        if ($IS); then ISTMP=-IS; else ISTMP=; fi;
-        if ($TJC); then DTMP=TJC-; else DTMP=; fi;
-        if [ "$AQUILA_VER" = 427 ]; then AVTMP="427"; else AVTMP="422"; fi;
-        echo "filename=${DTMP}Aquila_${AVTMP}_BLT-ProUI${ISTMP}${TPTMP}.bin" >> $GITHUB_OUTPUT
-        > Marlin/Configuration.h
-        > Marlin/Configuration_adv.h
-        > Marlin/Version.h
-        cp configurations/Voxelab\ Aquila\ 427/BLT/Configuration.h Marlin/Configuration.h
-        cp configurations/Voxelab\ Aquila\ 427/BLT/Configuration_adv.h Marlin/Configuration_adv.h
-        cp configurations/Voxelab\ Aquila\ 427/BLT/Version.h Marlin/Version.h
-        sed -i "s/default_envs =.*/default_envs = STM32F103RE_creality/" platformio.ini
-        if [ "$AQUILA_VER" = 427 ]; then DBORD='CREALITY_V427'; else DBORD='CREALITY_V422'; fi;
-        sed -i "s/.*#define MOTHERBOARD BOARD_.*/#define MOTHERBOARD BOARD_${DBORD}/" Marlin/Configuration.h
-        if ($IS); then TEMP=; else TEMP='\/\/'; fi;
-        sed -i "s/.*#define INPUT_SHAPING_X/${TEMP}#define INPUT_SHAPING_X/" Marlin/Configuration_adv.h
-        sed -i "s/.*#define INPUT_SHAPING_Y/${TEMP}#define INPUT_SHAPING_Y/" Marlin/Configuration_adv.h
-        if ($TP); then PTEMP='\/\/'; else PTEMP=; fi;
-        sed -i "0,/^#define PIDTEMP/ s/.*#define PIDTEMP/${PTEMP}#define PIDTEMP/" Marlin/Configuration.h
-        if ($TP); then MTEMP=; else MTEMP='\/\/'; fi;
-        sed -i "s/.*#define MPCTEMP/${MTEMP}#define MPCTEMP/" Marlin/Configuration.h
-        if ($TJC); then TJEMP=; REMP='\/\/'; else TJEMP='\/\/'; REMP=; fi;
-        sed -i "s/.*#define TJC_DISPLAY/${TJEMP}#define TJC_DISPLAY/" Marlin/Configuration.h
-        sed -i "s/.*#define REVERSE_ENCODER_DIRECTION/${REMP}#define REVERSE_ENCODER_DIRECTION/" Marlin/Configuration.h
-        pio run
-        mkdir temp
-        mv .pio/build/STM32F103RE_creality/*.bin temp/build.bin
-      env:
-        AQUILA_VER: ${{ matrix.chip }}
-        TP: ${{ matrix.temp }}
-        IS: ${{ matrix.inshape }}
-        TJC: ${{ matrix.tjc }}
-    - name: Get release
-      id: get_release
-      uses: bruceadams/get-release@v1.3.2
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-    - name: Upload Release Asset
-      uses: tanyagray/action-upload-release-asset@main
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.get_release.outputs.upload_url }}
-        asset_path: temp/build.bin
-        asset_name: ${{ steps.build_configs.outputs.filename }}
-        asset_content_type: application/x-binary
diff --git a/buildroot/share/PlatformIO/scripts/proui.py b/buildroot/share/PlatformIO/scripts/proui.py
index 46ad22e33fc0..f15a59aceced 100644
--- a/buildroot/share/PlatformIO/scripts/proui.py
+++ b/buildroot/share/PlatformIO/scripts/proui.py
@@ -23,6 +23,8 @@ def _GetMarlinEnv(marlinEnv, feature):
 # Get Marlin evironment vars
 if "MARLIN_FEATURES" in env:
     print("Processing Professional Firmware requirements")
+    if os.environ.get('PWR') == 'true' and os.environ.get('TP') == 'true':
+      exit(0)
     MarlinEnv = env['MARLIN_FEATURES']
     prouiex = _GetMarlinEnv(MarlinEnv, 'PROUI_EX')
     marlin_manualmesh = _GetMarlinEnv(MarlinEnv, 'MESH_BED_LEVELING')
diff --git a/exitcode.py b/exitcode.py
new file mode 100644
index 000000000000..2c838d3b02e4
--- /dev/null
+++ b/exitcode.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+import os
+import sys
+import shutil
+
+exit(0)
+# try:
+    # raise KeyError("Error: can't detect the correct architecture")
+# except KeyError as e:
+    # print(e)
+    # sys.exit(1)