diff --git a/.github/IWYU.yml b/.github/IWYU.yml
index a00bf528..64e7560e 100644
--- a/.github/IWYU.yml
+++ b/.github/IWYU.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -29,7 +29,7 @@ jobs:
         submodules: true
 
     - name: Checkout ${{ github.event.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -37,7 +37,7 @@ jobs:
         submodules: true
 
     - name: Cache packages
-      uses: actions/cache@v1.0.3
+      uses: actions/cache@v3.0.11
       id: cache-pkgs
       with:
           path: "packages"
@@ -48,7 +48,7 @@ jobs:
 
     - name: Install packages
       run: |
-        sudo apt-get update 
+        sudo apt-get update
         sudo apt-get purge clang-*
         sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install clang-5.0
         sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr libglew-dev freeglut3-dev libsdl-sound1.2-dev iwyu
@@ -63,9 +63,9 @@ jobs:
       run: |
           cd ${{ runner.workspace }}/MK404/build && make |& tee IWYU.txt
           ! grep -q "include-what-you-use reported diagnostics" IWYU.txt
-          
+
     - name: Upload IWYU log
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: IWYU
         path: ${{ runner.workspace }}/MK404/build/IWYU.txt
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4dedf48a..72842205 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -31,7 +31,7 @@ jobs:
         submodules: true
 
     - name: Checkout ${{ github.event.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -39,7 +39,7 @@ jobs:
         submodules: true
 
     - name: Cache packages
-      uses: actions/cache@v1.0.3
+      uses: actions/cache@v3.0.11
       id: cache-pkgs
       with:
           path: "packages"
@@ -64,7 +64,7 @@ jobs:
       run: cd ${{ runner.workspace }}/MK404/build && make -j2
 
     - name: Checkout Wiki
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.wiki.git
@@ -89,7 +89,7 @@ jobs:
 
     - name: Upload artifact
       if: ${{ !github.event.pull_request }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: Binaries
         path: ${{ runner.workspace }}/MK404/build/MK404-development-build.tar.bz2
@@ -102,7 +102,7 @@ jobs:
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -110,7 +110,7 @@ jobs:
         submodules: true
 
     - name: Checkout ${{ github.event.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -133,7 +133,7 @@ jobs:
 
     - name: Upload OSX artifact
       if: ${{ !github.event.pull_request }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: Binaries
         path: ${{ runner.workspace }}/MK404/build/MK404_OSX
@@ -143,14 +143,14 @@ jobs:
     runs-on: windows-latest
     if: "!contains(github.event.head_commit.message, 'NO_BUILD')"
     steps:
-      - uses: actions/cache@v1
+      - uses: actions/cache@v3.0.11
         with:
           path: C:\tools\chococache
           key: ${{ runner.os }}-cygwin-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-cygwin-
       - name: Cygwin package cache
-        uses: actions/cache@v1
+        uses: actions/cache@v3.0.11
         with:
           path: C:\tools\cygcache
           key: ${{ runner.os }}-cygwinpkgs-1_1
@@ -166,7 +166,7 @@ jobs:
         shell: cmd
 
       - name: Checkout ${{ github.event.pull_request.head.ref }}
-        uses: actions/checkout@v2.2.0
+        uses: actions/checkout@v3
         if: ${{ github.event.pull_request }}
         with:
           repository: vintagepc/MK404.git
@@ -174,7 +174,7 @@ jobs:
           submodules: true
 
       - name: Checkout ${{ github.event.ref }}
-        uses: actions/checkout@v2.2.0
+        uses: actions/checkout@v3
         if: ${{ !github.event.pull_request }}
         with:
           repository: vintagepc/MK404.git
@@ -201,7 +201,7 @@ jobs:
 
       - name: Upload Cygwin artifact
         if: ${{ !github.event.pull_request }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3.1.1
         with:
           name: Binaries
           path: ${{ runner.workspace }}/MK404/build/MK404.exe
@@ -212,7 +212,7 @@ jobs:
     needs: [build, build_osx, build_cygwin]
     steps:
       - name: Retrieve platform binaries
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3.1.1
         with:
           name: Binaries
 
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index 99223b26..a8d9950b 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -15,13 +15,13 @@ jobs:
   # This workflow contains a single job called "build"
   cppcheck:
     # The type of runner that the job will run on
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -29,7 +29,7 @@ jobs:
         submodules: true
 
     - name: Checkout ${{ github.event.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -37,7 +37,7 @@ jobs:
         submodules: true
 
     - name: Cache packages
-      uses: actions/cache@v1.0.3
+      uses: actions/cache@v3.0.11
       id: cache-pkgs
       with:
           path: "packages"
@@ -50,7 +50,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get purge clang-*
-        sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install clang-5.0 clang-tidy-5.0
+        sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install clang-6.0 clang-tidy-6.0
         sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr libglew-dev freeglut3-dev libsdl-sound1.2-dev iwyu cppcheck
 
     - name: Cache permissions
@@ -70,7 +70,7 @@ jobs:
         make -j2 |& tee tidy.txt
 
     - name: Upload clang-tidy log
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: warnings
         path: ${{ runner.workspace }}/MK404/build/tidy.txt
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5b302ee2..5c29d3db 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,13 +17,13 @@ jobs:
   # This workflow contains a single job called "build"
   part_tests:
     # The type of runner that the job will run on
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -31,7 +31,7 @@ jobs:
         submodules: true
 
     - name: Checkout ${{ github.event.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -39,7 +39,7 @@ jobs:
         submodules: true
 
     - name: Cache packages
-      uses: actions/cache@v1.0.3
+      uses: actions/cache@v3.0.11
       id: cache-pkgs
       with:
           path: "packages"
@@ -53,15 +53,14 @@ jobs:
     - name: Install packages
       run: |
           sudo apt-get update
-          sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr avr-libc libglew-dev freeglut3-dev libsdl-sound1.2-dev lcov xvfb
+          sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr avr-libc libglew-dev freeglut3-dev libsdl-sound1.2-dev lcov xvfb mesa-utils
 
     - name: Cache permissions
       run: sudo chmod -R 744 packages
 
-    - uses: openrndr/setup-opengl@v1.1
-    - run: |
+    - name: Check OpenGL
+      run: |
         xvfb-run glxinfo
-        ls -l
         echo "LD is $LD_LIBRARY_PATH and GD is $GALLIUM_DRIVER"
 
     - name: Prepare CMake build
@@ -80,7 +79,7 @@ jobs:
     - run: cd ${{ runner.workspace }}/MK404/build && tar -zcvf snaps_core.tar.gz tests/snaps/
 
     - name: Upload report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: Report
         path: |
@@ -88,7 +87,7 @@ jobs:
 #          ${{ runner.workspace }}/MK404/build/Coverage.tar.gz
 
     - name: Upload coverage artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: Coverage
         path: |
@@ -107,13 +106,13 @@ jobs:
 
   ext1_tests:
     # The type of runner that the job will run on
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - name: Checkout ${{ github.event.pull_request.head.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -121,7 +120,7 @@ jobs:
         submodules: true
 
     - name: Checkout ${{ github.event.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -129,7 +128,7 @@ jobs:
         submodules: true
 
     - name: Cache packages
-      uses: actions/cache@v1.0.3
+      uses: actions/cache@v3.0.11
       id: cache-pkgs
       with:
           path: "packages"
@@ -143,15 +142,14 @@ jobs:
     - name: Install packages
       run: |
           sudo apt-get update
-          sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr avr-libc libglew-dev freeglut3-dev libsdl-sound1.2-dev lcov xvfb
+          sudo apt-get -o Dir::Cache::Archives=`pwd`/packages install libelf-dev gcc-avr avr-libc libglew-dev freeglut3-dev libsdl-sound1.2-dev lcov xvfb mesa-utils
 
     - name: Cache permissions
       run: sudo chmod -R 744 packages
 
-    - uses: openrndr/setup-opengl@v1.1
-    - run: |
+    - name: Check OpenGL
+      run: |
         xvfb-run glxinfo
-        ls -l
         echo "LD is $LD_LIBRARY_PATH and GD is $GALLIUM_DRIVER"
 
     - name: Prepare CMake build
@@ -170,14 +168,14 @@ jobs:
     - run: cd ${{ runner.workspace }}/MK404/build && tar -zcvf snaps_ext1.tar.gz tests/snaps/
 
     - name: Upload report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: Report
         path: |
           ${{ runner.workspace }}/MK404/build/snaps_ext1.tar.gz
 
     - name: Upload coverage artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.1
       with:
         name: Coverage2
         path: |
@@ -190,12 +188,12 @@ jobs:
 
   Upload_Coverage:
     # The type of runner that the job will run on
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     needs: [ext1_tests, part_tests]
     steps:
 
     - name: Checkout ${{ github.event.pull_request.head.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -203,7 +201,7 @@ jobs:
         submodules: true
 
     - name: Checkout ${{ github.event.ref }}
-      uses: actions/checkout@v2.2.0
+      uses: actions/checkout@v3
       if: ${{ !github.event.pull_request }}
       with:
         repository: vintagepc/MK404.git
@@ -211,13 +209,13 @@ jobs:
         submodules: true
 
     - name: Retrieve coverage reports
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3.0.2
       with:
         name: Coverage
         path: parts
 
     - name: Retrieve coverage reports
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3.0.2
       with:
         name: Coverage2
         path: ext1
@@ -225,7 +223,7 @@ jobs:
 
     - name: Upload to codecov.io
       uses: codecov/codecov-action@v2.1.0
-      with: 
+      with:
         # Comma-separated list of files to upload
         files: ./parts/parts.info,./ext1/ext1.info
         # Specify whether or not CI build should fail if Codecov runs into an error during upload
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b257a2c..a0284fc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ option(ENABLE_SHMQ "Enables Shared memory queue code for IPC pritner")
 
 
 if (ENABLE_GCOV)
-	SET(GCOV_BINARY /usr/bin/gcov-7)
+	SET(GCOV_BINARY /usr/bin/gcov)
 	message(STATUS "Using gcov ${GCOV_BINARY}")
 endif()
 
@@ -418,7 +418,7 @@ add_custom_target(Test_Parts
 	DEPENDS Test_Common Test_firmwares
 )
 add_custom_target(Test_ext1
-	COMMAND cd ${PROJECT_BINARY_DIR} && env CTEST_OUTPUT_ON_FAILURE=1 ctest -R 'core|ext1|Internal' --timeout 180 -j 1
+	COMMAND cd ${PROJECT_BINARY_DIR} && env CTEST_OUTPUT_ON_FAILURE=1 ctest -R 'core|ext1|Internal' --timeout 240 -j 1
 	COMMAND lcov --capture --gcov-tool="${GCOV_BINARY}" --directory ${PROJECT_BINARY_DIR} --output-file ${PROJECT_BINARY_DIR}/ext1.info
 	COMMAND lcov --remove ext1.info '/usr/*' -o ext1.info
 	COMMAND lcov --remove ext1.info '*/3rdParty/*' -o ext1.info
@@ -486,11 +486,14 @@ message(STATUS "Checking for tests...")
 
 if(RUNNER_ENV)
 	set(TEST_LIB_PATH ${PROJECT_SOURCE_DIR}/$ENV{LD_LIBRARY_PATH})
-	set(TEST_EXPORT_PREFIX LD_LIBRARY_PATH=${TEST_LIB_PATH} GALLIUM_DRIVER=swr DISPLAY=:99)
+	set(TEST_EXPORT_PREFIX)
 	set(TEST_XVFB_PREFIX "xvfb-run")
+	set(TEST_XVFB_ARGS "-a" "-e" "/dev/stdout")
+	target_compile_definitions(MK404 PRIVATE)
 else()
 	unset(TEST_EXPORT_PREFIX)
 	unset(TEST_XVFB_PREFIX)
+	unset(TEST_XVFB_ARGS)
 	unset(TEST_LIB_PATH)
 endif()
 
@@ -517,45 +520,45 @@ foreach (TEST_SRC IN LISTS TESTS_SOURCES)
 	message(STATUS "Adding test: ${TEST_BASE}" )
 	add_test(NAME parts_${TEST_BASE}
 		WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-		COMMAND env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 -f tests/${TEST_BASE}.afx --script tests/${TEST_BASE}.txt Test_Printer
+		COMMAND env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 -f tests/${TEST_BASE}.afx --script tests/${TEST_BASE}.txt Test_Printer
 	)
 endforeach()
 
-add_test(ext1_MK1_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK1_mR13 -f ../assets/Firmware/MK1-mR13a.hex --script ../scripts/tests/test_boot_MK1.txt --lcd-scheme 2 )
-add_test(ext1_MK2_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK2_mR13 -f ../assets/Firmware/MK2-mR13a.hex --script ../scripts/tests/test_boot_MK2.txt --lcd-scheme 2 )
-add_test(ext1_MK2MMU_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK2MMU_mR13 -f ../assets/Firmware/MK2MMU-mR13a.hex --script ../scripts/tests/test_boot_MK2MMU.txt --lcd-scheme 2 )
-add_test(ext1_MK25_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK25_mR13 -f ../assets/Firmware/MK25-mR13a.hex --script ../scripts/tests/test_boot_MK25.txt --lcd-scheme 2 )
-add_test(ext1_MK25S_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK25S_mR13 -f ../assets/Firmware/MK25S-mR13a.hex --script ../scripts/tests/test_boot_MK25S.txt --lcd-scheme 2 )
-add_test(ext1_MK3S_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3S -f MK3S.afx --script ../scripts/tests/test_boot_MK3S.txt --lcd-scheme 2 )
-add_test(ext1_MK3_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3 -f MK3S.afx --script ../scripts/tests/test_boot_MK3.txt --lcd-scheme 2 )
-add_test(ext1_MK3SMMU2_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3SMMU2 -f MK3S.afx --script ../scripts/tests/test_boot_MK3SMMU2.txt --lcd-scheme 2 )
-add_test(ext1_MK3MMU2_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3MMU2 -f MK3S.afx --script ../scripts/tests/test_boot_MK3MMU2.txt --lcd-scheme 2 )
-add_test(ext1_Lite_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 -g lite -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_lite_gfx.txt --lcd-scheme 2 )
-add_test(ext1_Bear_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 -g bear -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_bear_gfx.txt --lcd-scheme 2 )
-add_test(ext1_Fancy_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 -g fancy -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_fancy_gfx.txt --lcd-scheme 2 )
-add_test(ext1_Lite_MMU_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404  Prusa_MK3SMMU2 -g lite -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_litemmu_gfx.txt --lcd-scheme 2 )
-add_test(ext1_Fancy_MMU_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3SMMU2 -g fancy -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_fancymmu_gfx.txt --lcd-scheme 2 )
-add_test(ext1_Mouse env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3S -f tests/extra_EinsyRambo.afx -g lite --script ../scripts/tests/test_lite_gfx_mouse.txt --lcd-scheme 2 )
-add_test(ext1_Keys env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3 -f tests/extra_EinsyRambo.afx -g lite --script ../scripts/tests/test_lite_gfx_keys.txt --lcd-scheme 2 )
-add_test(ext1_MK2_Fancy env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK2_mR13 -f tests/extra_MiniRambo.afx -g fancy --script ../scripts/tests/test_MK2_fancy.txt --lcd-scheme 2 )
-add_test(ext1_MK2MMU_Fancy env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK2MMU_mR13 -f tests/extra_MiniRambo.afx -g fancy --script ../scripts/tests/test_MK2MMU_fancy.txt --lcd-scheme 2 )
-add_test(ext1_MK25_Fancy env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK25_mR13 -f tests/extra_MiniRambo.afx -g fancy --script ../scripts/tests/test_MK25_fancy.txt --lcd-scheme 2 )
-add_test(ext1_MK2_Lite env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK25_mR13 -f tests/extra_MiniRambo.afx -g lite --script ../scripts/tests/test_MK2_lite.txt --lcd-scheme 2 )
-add_test(ext1_IPC env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 IPCPrinter --script ../scripts/tests/test_boot_ipc.txt)
-add_test(ext1_IPCMMU2 env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 IPCPrinter_MMU2 -g lite --script ../scripts/tests/test_boot_ipcmmu2.txt )
-add_test(ext1_MMU2 env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MMU2 -f MM-control-01.hex --script ../scripts/tests/test_boot_mmu2.txt )
-add_test(ext1_CW1 env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_CW1 -f Prusa-CW1-Firmware.hex --script ../scripts/tests/test_boot_cw1.txt )
-add_test(ext1_CW1S env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_CW1S -f Prusa-CW1S-Firmware.hex --script ../scripts/tests/test_boot_cw1s.txt )
-add_test(ext1_CW1S_lite env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_CW1 -f Prusa-CW1-Firmware.hex -g lite --script ../scripts/tests/test_cw1_lite_gfx.txt )
-add_test(ext1_CW1S_full env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_CW1 -f Prusa-CW1-Firmware.hex -g fancy --script ../scripts/tests/test_cw1_full_gfx.txt )
-add_test(Internal_Scripting_stdio env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ../scripts/tests/extra_Scripting_stdio.py)
+add_test(ext1_MK1_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK1_mR13 -f ../assets/Firmware/MK1-mR13a.hex --script ../scripts/tests/test_boot_MK1.txt --lcd-scheme 2 )
+add_test(ext1_MK2_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK2_mR13 -f ../assets/Firmware/MK2-mR13a.hex --script ../scripts/tests/test_boot_MK2.txt --lcd-scheme 2 )
+add_test(ext1_MK2MMU_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK2MMU_mR13 -f ../assets/Firmware/MK2MMU-mR13a.hex --script ../scripts/tests/test_boot_MK2MMU.txt --lcd-scheme 2 )
+add_test(ext1_MK25_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK25_mR13 -f ../assets/Firmware/MK25-mR13a.hex --script ../scripts/tests/test_boot_MK25.txt --lcd-scheme 2 )
+add_test(ext1_MK25S_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK25S_mR13 -f ../assets/Firmware/MK25S-mR13a.hex --script ../scripts/tests/test_boot_MK25S.txt --lcd-scheme 2 )
+add_test(ext1_MK3S_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3S -f MK3S.afx --script ../scripts/tests/test_boot_MK3S.txt --lcd-scheme 2 )
+add_test(ext1_MK3_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3 -f MK3S.afx --script ../scripts/tests/test_boot_MK3.txt --lcd-scheme 2 )
+add_test(ext1_MK3SMMU2_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3SMMU2 -f MK3S.afx --script ../scripts/tests/test_boot_MK3SMMU2.txt --lcd-scheme 2 )
+add_test(ext1_MK3MMU2_Boot env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3MMU2 -f MK3S.afx --script ../scripts/tests/test_boot_MK3MMU2.txt --lcd-scheme 2 )
+add_test(ext1_Lite_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 -g lite -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_lite_gfx.txt --lcd-scheme 2 )
+add_test(ext1_Bear_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 -g bear -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_bear_gfx.txt --lcd-scheme 2 )
+add_test(ext1_Fancy_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 -g fancy -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_fancy_gfx.txt --lcd-scheme 2 )
+add_test(ext1_Lite_MMU_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404  Prusa_MK3SMMU2 -g lite -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_litemmu_gfx.txt --lcd-scheme 2 )
+add_test(ext1_Fancy_MMU_Gfx env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3SMMU2 -g fancy -f tests/extra_EinsyRambo.afx --script ../scripts/tests/test_fancymmu_gfx.txt --lcd-scheme 2 )
+add_test(ext1_Mouse env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3S -f tests/extra_EinsyRambo.afx -g lite --script ../scripts/tests/test_lite_gfx_mouse.txt --lcd-scheme 2 )
+add_test(ext1_Keys env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3 -f tests/extra_EinsyRambo.afx -g lite --script ../scripts/tests/test_lite_gfx_keys.txt --lcd-scheme 2 )
+add_test(ext1_MK2_Fancy env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK2_mR13 -f tests/extra_MiniRambo.afx -g fancy --script ../scripts/tests/test_MK2_fancy.txt --lcd-scheme 2 )
+add_test(ext1_MK2MMU_Fancy env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK2MMU_mR13 -f tests/extra_MiniRambo.afx -g fancy --script ../scripts/tests/test_MK2MMU_fancy.txt --lcd-scheme 2 )
+add_test(ext1_MK25_Fancy env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK25_mR13 -f tests/extra_MiniRambo.afx -g fancy --script ../scripts/tests/test_MK25_fancy.txt --lcd-scheme 2 )
+add_test(ext1_MK2_Lite env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK25_mR13 -f tests/extra_MiniRambo.afx -g lite --script ../scripts/tests/test_MK2_lite.txt --lcd-scheme 2 )
+add_test(ext1_IPC env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 IPCPrinter --script ../scripts/tests/test_boot_ipc.txt)
+add_test(ext1_IPCMMU2 env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 IPCPrinter_MMU2 -g lite --script ../scripts/tests/test_boot_ipcmmu2.txt )
+add_test(ext1_MMU2 env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MMU2 -f MM-control-01.hex --script ../scripts/tests/test_boot_mmu2.txt )
+add_test(ext1_CW1 env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_CW1 -f Prusa-CW1-Firmware.hex --script ../scripts/tests/test_boot_cw1.txt )
+add_test(ext1_CW1S env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_CW1S -f Prusa-CW1S-Firmware.hex --script ../scripts/tests/test_boot_cw1s.txt )
+add_test(ext1_CW1S_lite env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_CW1 -f Prusa-CW1-Firmware.hex -g lite --script ../scripts/tests/test_cw1_lite_gfx.txt )
+add_test(ext1_CW1S_full env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_CW1 -f Prusa-CW1-Firmware.hex -g fancy --script ../scripts/tests/test_cw1_full_gfx.txt )
+add_test(Internal_Scripting_stdio env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ../scripts/tests/extra_Scripting_stdio.py)
 
 
 # TODO- move these images out of parts and to their own ext2 dir...
 add_test(ext2_Print_prep cp ../scripts/tests/Prusa_MK3S_eeprom.bin_test ${PROJECT_BINARY_DIR})
-add_test(ext2_Print env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3S -f MK3S.afx -g lite --sdimage Test.img --script ../scripts/tests/test_GLPrint.txt --lcd-scheme 2 )
-add_test(ext2_Print_HRQ env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3S -f MK3S.afx -g lite --sdimage Test.img --script ../scripts/tests/test_GLPrint_HRQ.txt --extrusion Quad_HR --colour-extrusion --lcd-scheme 2 )
-add_test(ext2_Print_TAvg env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ./MK404 Prusa_MK3S -f MK3S.afx -g lite --sdimage Test.img --script ../scripts/tests/test_GLPrint_AvgT.txt --extrusion Tube_Avg --lcd-scheme 2 )
+add_test(ext2_Print env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3S -f MK3S.afx -g lite --sdimage Test.img --script ../scripts/tests/test_GLPrint.txt --lcd-scheme 2 )
+add_test(ext2_Print_HRQ env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3S -f MK3S.afx -g lite --sdimage Test.img --script ../scripts/tests/test_GLPrint_HRQ.txt --extrusion Quad_HR --colour-extrusion --lcd-scheme 2 )
+add_test(ext2_Print_TAvg env ${TEST_EXPORT_PREFIX} ${TEST_XVFB_PREFIX} ${TEST_XVFB_ARGS} ./MK404 Prusa_MK3S -f MK3S.afx -g lite --sdimage Test.img --script ../scripts/tests/test_GLPrint_AvgT.txt --extrusion Tube_Avg --lcd-scheme 2 )
 
 # This is a bit meaningless if your system doesn't generate the same renderings as the BR.
 if(RUNNER_ENV)
diff --git a/MK404.cpp b/MK404.cpp
index 1592fbb7..5a117e4f 100644
--- a/MK404.cpp
+++ b/MK404.cpp
@@ -606,6 +606,8 @@ int main(int argc, char *argv[])
 
 	if (!bNoGraphics)
 	{
+		glutSetWindow(window);
+		glutPopWindow();
 		glutMainLoop();
 	}
 
diff --git a/scripts/tests/snaps/ext1/CW1S_mousedn.png b/scripts/tests/snaps/ext1/CW1S_mousedn.png
index 87a76e69..02a0499b 100644
Binary files a/scripts/tests/snaps/ext1/CW1S_mousedn.png and b/scripts/tests/snaps/ext1/CW1S_mousedn.png differ
diff --git a/scripts/tests/snaps/ext1/CW1S_mouseleft.png b/scripts/tests/snaps/ext1/CW1S_mouseleft.png
index 5f19103e..431c4c4a 100644
Binary files a/scripts/tests/snaps/ext1/CW1S_mouseleft.png and b/scripts/tests/snaps/ext1/CW1S_mouseleft.png differ
diff --git a/scripts/tests/snaps/ext1/CW1S_mouseup.png b/scripts/tests/snaps/ext1/CW1S_mouseup.png
index 42e45bf1..a875306a 100644
Binary files a/scripts/tests/snaps/ext1/CW1S_mouseup.png and b/scripts/tests/snaps/ext1/CW1S_mouseup.png differ
diff --git a/scripts/tests/snaps/ext1/CW1S_start.png b/scripts/tests/snaps/ext1/CW1S_start.png
index 5fc69505..5582cf95 100644
Binary files a/scripts/tests/snaps/ext1/CW1S_start.png and b/scripts/tests/snaps/ext1/CW1S_start.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_cure.png b/scripts/tests/snaps/ext1/CW1_cure.png
index 54c3f61b..180064ad 100644
Binary files a/scripts/tests/snaps/ext1/CW1_cure.png and b/scripts/tests/snaps/ext1/CW1_cure.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_down.png b/scripts/tests/snaps/ext1/CW1_down.png
index 124351ed..d5b83987 100644
Binary files a/scripts/tests/snaps/ext1/CW1_down.png and b/scripts/tests/snaps/ext1/CW1_down.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_full_led.png b/scripts/tests/snaps/ext1/CW1_full_led.png
index 23ac1408..2040f786 100644
Binary files a/scripts/tests/snaps/ext1/CW1_full_led.png and b/scripts/tests/snaps/ext1/CW1_full_led.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_full_lid.png b/scripts/tests/snaps/ext1/CW1_full_lid.png
index fba3c7e9..c96a055e 100644
Binary files a/scripts/tests/snaps/ext1/CW1_full_lid.png and b/scripts/tests/snaps/ext1/CW1_full_lid.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_full_start.png b/scripts/tests/snaps/ext1/CW1_full_start.png
index c2efc9ac..65977dc4 100644
Binary files a/scripts/tests/snaps/ext1/CW1_full_start.png and b/scripts/tests/snaps/ext1/CW1_full_start.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_full_tank.png b/scripts/tests/snaps/ext1/CW1_full_tank.png
index dd51371a..c712bf60 100644
Binary files a/scripts/tests/snaps/ext1/CW1_full_tank.png and b/scripts/tests/snaps/ext1/CW1_full_tank.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lid.png b/scripts/tests/snaps/ext1/CW1_lid.png
index ebffb538..2947c010 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lid.png and b/scripts/tests/snaps/ext1/CW1_lid.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_knob1.png b/scripts/tests/snaps/ext1/CW1_lite_knob1.png
index 934e1fc4..9ffe2ffc 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_knob1.png and b/scripts/tests/snaps/ext1/CW1_lite_knob1.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_knob2.png b/scripts/tests/snaps/ext1/CW1_lite_knob2.png
index 6c988a36..558ea2fe 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_knob2.png and b/scripts/tests/snaps/ext1/CW1_lite_knob2.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_lid.png b/scripts/tests/snaps/ext1/CW1_lite_lid.png
index 8b463292..a0ee2aa0 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_lid.png and b/scripts/tests/snaps/ext1/CW1_lite_lid.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_press.png b/scripts/tests/snaps/ext1/CW1_lite_press.png
index ce256557..dc8c58cd 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_press.png and b/scripts/tests/snaps/ext1/CW1_lite_press.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_release.png b/scripts/tests/snaps/ext1/CW1_lite_release.png
index d2ebf89c..2f9fe9ec 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_release.png and b/scripts/tests/snaps/ext1/CW1_lite_release.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_start.png b/scripts/tests/snaps/ext1/CW1_lite_start.png
index c1b7c5eb..36b3cc31 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_start.png and b/scripts/tests/snaps/ext1/CW1_lite_start.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_tank.png b/scripts/tests/snaps/ext1/CW1_lite_tank.png
index c4fa16db..ef9fb0aa 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_tank.png and b/scripts/tests/snaps/ext1/CW1_lite_tank.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_lite_tank2.png b/scripts/tests/snaps/ext1/CW1_lite_tank2.png
index 53aa28b0..eab891e7 100644
Binary files a/scripts/tests/snaps/ext1/CW1_lite_tank2.png and b/scripts/tests/snaps/ext1/CW1_lite_tank2.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_press.png b/scripts/tests/snaps/ext1/CW1_press.png
index 8358fd97..55e9ff6f 100644
Binary files a/scripts/tests/snaps/ext1/CW1_press.png and b/scripts/tests/snaps/ext1/CW1_press.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_run.png b/scripts/tests/snaps/ext1/CW1_run.png
index 78162adf..c6d17fda 100644
Binary files a/scripts/tests/snaps/ext1/CW1_run.png and b/scripts/tests/snaps/ext1/CW1_run.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_start.png b/scripts/tests/snaps/ext1/CW1_start.png
index 3c16918e..33279ee0 100644
Binary files a/scripts/tests/snaps/ext1/CW1_start.png and b/scripts/tests/snaps/ext1/CW1_start.png differ
diff --git a/scripts/tests/snaps/ext1/CW1_up.png b/scripts/tests/snaps/ext1/CW1_up.png
index 8543b2bf..88ec6134 100644
Binary files a/scripts/tests/snaps/ext1/CW1_up.png and b/scripts/tests/snaps/ext1/CW1_up.png differ
diff --git a/scripts/tests/snaps/ext1/GFXBear01.png b/scripts/tests/snaps/ext1/GFXBear01.png
index 7b0a15b4..059fb88f 100644
Binary files a/scripts/tests/snaps/ext1/GFXBear01.png and b/scripts/tests/snaps/ext1/GFXBear01.png differ
diff --git a/scripts/tests/snaps/ext1/GFXBear02.png b/scripts/tests/snaps/ext1/GFXBear02.png
index 16865b42..6b4421e7 100644
Binary files a/scripts/tests/snaps/ext1/GFXBear02.png and b/scripts/tests/snaps/ext1/GFXBear02.png differ
diff --git a/scripts/tests/snaps/ext1/GFXBear03.png b/scripts/tests/snaps/ext1/GFXBear03.png
index 1aed904e..d3eafb36 100644
Binary files a/scripts/tests/snaps/ext1/GFXBear03.png and b/scripts/tests/snaps/ext1/GFXBear03.png differ
diff --git a/scripts/tests/snaps/ext1/GFXFancy01.png b/scripts/tests/snaps/ext1/GFXFancy01.png
index 62495dd7..6b2940b4 100644
Binary files a/scripts/tests/snaps/ext1/GFXFancy01.png and b/scripts/tests/snaps/ext1/GFXFancy01.png differ
diff --git a/scripts/tests/snaps/ext1/GFXFancy02.png b/scripts/tests/snaps/ext1/GFXFancy02.png
index 87bfe1c4..ecc8f4b8 100644
Binary files a/scripts/tests/snaps/ext1/GFXFancy02.png and b/scripts/tests/snaps/ext1/GFXFancy02.png differ
diff --git a/scripts/tests/snaps/ext1/GFXFancy03.png b/scripts/tests/snaps/ext1/GFXFancy03.png
index 8a231e2e..ef4e6655 100644
Binary files a/scripts/tests/snaps/ext1/GFXFancy03.png and b/scripts/tests/snaps/ext1/GFXFancy03.png differ
diff --git a/scripts/tests/snaps/ext1/GFXFancyMM01.png b/scripts/tests/snaps/ext1/GFXFancyMM01.png
index 46ad6284..022ccca3 100644
Binary files a/scripts/tests/snaps/ext1/GFXFancyMM01.png and b/scripts/tests/snaps/ext1/GFXFancyMM01.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLite01.png b/scripts/tests/snaps/ext1/GFXLite01.png
index 4e118d60..71272b86 100644
Binary files a/scripts/tests/snaps/ext1/GFXLite01.png and b/scripts/tests/snaps/ext1/GFXLite01.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLite02.png b/scripts/tests/snaps/ext1/GFXLite02.png
index a7026438..e1636c9b 100644
Binary files a/scripts/tests/snaps/ext1/GFXLite02.png and b/scripts/tests/snaps/ext1/GFXLite02.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLite03.png b/scripts/tests/snaps/ext1/GFXLite03.png
index cce83cda..28a78d44 100644
Binary files a/scripts/tests/snaps/ext1/GFXLite03.png and b/scripts/tests/snaps/ext1/GFXLite03.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLite04.png b/scripts/tests/snaps/ext1/GFXLite04.png
index 0ae97b54..f079d2f4 100644
Binary files a/scripts/tests/snaps/ext1/GFXLite04.png and b/scripts/tests/snaps/ext1/GFXLite04.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey01.png b/scripts/tests/snaps/ext1/GFXLiteKey01.png
index 4e118d60..71272b86 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey01.png and b/scripts/tests/snaps/ext1/GFXLiteKey01.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey02.png b/scripts/tests/snaps/ext1/GFXLiteKey02.png
index ad9550e7..d7d70229 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey02.png and b/scripts/tests/snaps/ext1/GFXLiteKey02.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey03.png b/scripts/tests/snaps/ext1/GFXLiteKey03.png
index 60eb62e5..c46e8d8c 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey03.png and b/scripts/tests/snaps/ext1/GFXLiteKey03.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey04.png b/scripts/tests/snaps/ext1/GFXLiteKey04.png
index 074deaa8..a4453dbb 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey04.png and b/scripts/tests/snaps/ext1/GFXLiteKey04.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey05a.png b/scripts/tests/snaps/ext1/GFXLiteKey05a.png
index 0a3abbef..ba311fad 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey05a.png and b/scripts/tests/snaps/ext1/GFXLiteKey05a.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey05b.png b/scripts/tests/snaps/ext1/GFXLiteKey05b.png
index be9a4545..b1839280 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey05b.png and b/scripts/tests/snaps/ext1/GFXLiteKey05b.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey05c.png b/scripts/tests/snaps/ext1/GFXLiteKey05c.png
index d51ba616..4452c3a2 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey05c.png and b/scripts/tests/snaps/ext1/GFXLiteKey05c.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey08a.png b/scripts/tests/snaps/ext1/GFXLiteKey08a.png
index f6b2a948..0be953dc 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey08a.png and b/scripts/tests/snaps/ext1/GFXLiteKey08a.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey09.png b/scripts/tests/snaps/ext1/GFXLiteKey09.png
index 2a218ad7..fc6b899c 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey09.png and b/scripts/tests/snaps/ext1/GFXLiteKey09.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey10.png b/scripts/tests/snaps/ext1/GFXLiteKey10.png
index 7c359e94..48f8b22c 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey10.png and b/scripts/tests/snaps/ext1/GFXLiteKey10.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey11.png b/scripts/tests/snaps/ext1/GFXLiteKey11.png
index 5ae0e61b..5fe0cb8d 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey11.png and b/scripts/tests/snaps/ext1/GFXLiteKey11.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey11a.png b/scripts/tests/snaps/ext1/GFXLiteKey11a.png
index 5ae0e61b..5fe0cb8d 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey11a.png and b/scripts/tests/snaps/ext1/GFXLiteKey11a.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey12.png b/scripts/tests/snaps/ext1/GFXLiteKey12.png
index 1c649961..2c6608e1 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey12.png and b/scripts/tests/snaps/ext1/GFXLiteKey12.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteKey13.png b/scripts/tests/snaps/ext1/GFXLiteKey13.png
index 016c2738..74600a7a 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteKey13.png and b/scripts/tests/snaps/ext1/GFXLiteKey13.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMM01.png b/scripts/tests/snaps/ext1/GFXLiteMM01.png
index 38f6260d..0135ed78 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMM01.png and b/scripts/tests/snaps/ext1/GFXLiteMM01.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouse01.png b/scripts/tests/snaps/ext1/GFXLiteMouse01.png
index 016c2738..74600a7a 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouse01.png and b/scripts/tests/snaps/ext1/GFXLiteMouse01.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouse02.png b/scripts/tests/snaps/ext1/GFXLiteMouse02.png
index 4d72a60d..646046c0 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouse02.png and b/scripts/tests/snaps/ext1/GFXLiteMouse02.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouse03.png b/scripts/tests/snaps/ext1/GFXLiteMouse03.png
index 0ab90d7d..3f76154d 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouse03.png and b/scripts/tests/snaps/ext1/GFXLiteMouse03.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouseCamOrb.png b/scripts/tests/snaps/ext1/GFXLiteMouseCamOrb.png
index 71141b23..08b161ae 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouseCamOrb.png and b/scripts/tests/snaps/ext1/GFXLiteMouseCamOrb.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouseCamPan.png b/scripts/tests/snaps/ext1/GFXLiteMouseCamPan.png
index 99b734b3..dbcd26b3 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouseCamPan.png and b/scripts/tests/snaps/ext1/GFXLiteMouseCamPan.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouseCamRst.png b/scripts/tests/snaps/ext1/GFXLiteMouseCamRst.png
index ff445d5d..2832f1c1 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouseCamRst.png and b/scripts/tests/snaps/ext1/GFXLiteMouseCamRst.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouseCamRst2.png b/scripts/tests/snaps/ext1/GFXLiteMouseCamRst2.png
index ff445d5d..2832f1c1 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouseCamRst2.png and b/scripts/tests/snaps/ext1/GFXLiteMouseCamRst2.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom.png b/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom.png
index a2b6793e..e4a1166f 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom.png and b/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom1.png b/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom1.png
index 1fa3950a..183b9630 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom1.png and b/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom1.png differ
diff --git a/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom2.png b/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom2.png
index e148f803..910cd1ff 100644
Binary files a/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom2.png and b/scripts/tests/snaps/ext1/GFXLiteMouseCamZoom2.png differ
diff --git a/scripts/tests/snaps/ext1/IPCMMU2_lite.png b/scripts/tests/snaps/ext1/IPCMMU2_lite.png
index c853cb7b..cc911fdc 100644
Binary files a/scripts/tests/snaps/ext1/IPCMMU2_lite.png and b/scripts/tests/snaps/ext1/IPCMMU2_lite.png differ
diff --git a/scripts/tests/snaps/ext1/IPCMMU2_start.png b/scripts/tests/snaps/ext1/IPCMMU2_start.png
index ed1d51aa..d02e03e6 100644
Binary files a/scripts/tests/snaps/ext1/IPCMMU2_start.png and b/scripts/tests/snaps/ext1/IPCMMU2_start.png differ
diff --git a/scripts/tests/snaps/ext1/IPC_start.png b/scripts/tests/snaps/ext1/IPC_start.png
index 8dd0afca..188f98bb 100644
Binary files a/scripts/tests/snaps/ext1/IPC_start.png and b/scripts/tests/snaps/ext1/IPC_start.png differ
diff --git a/scripts/tests/snaps/ext1/MK101.png b/scripts/tests/snaps/ext1/MK101.png
index 898256f2..575031d6 100644
Binary files a/scripts/tests/snaps/ext1/MK101.png and b/scripts/tests/snaps/ext1/MK101.png differ
diff --git a/scripts/tests/snaps/ext1/MK102.png b/scripts/tests/snaps/ext1/MK102.png
index 1f5c7db9..b6f7a692 100644
Binary files a/scripts/tests/snaps/ext1/MK102.png and b/scripts/tests/snaps/ext1/MK102.png differ
diff --git a/scripts/tests/snaps/ext1/MK103.png b/scripts/tests/snaps/ext1/MK103.png
index bed1de1a..9231f9e4 100644
Binary files a/scripts/tests/snaps/ext1/MK103.png and b/scripts/tests/snaps/ext1/MK103.png differ
diff --git a/scripts/tests/snaps/ext1/MK201.png b/scripts/tests/snaps/ext1/MK201.png
index 842366de..fdcab913 100644
Binary files a/scripts/tests/snaps/ext1/MK201.png and b/scripts/tests/snaps/ext1/MK201.png differ
diff --git a/scripts/tests/snaps/ext1/MK202.png b/scripts/tests/snaps/ext1/MK202.png
index 50e8c56d..efc2b2cf 100644
Binary files a/scripts/tests/snaps/ext1/MK202.png and b/scripts/tests/snaps/ext1/MK202.png differ
diff --git a/scripts/tests/snaps/ext1/MK2501.png b/scripts/tests/snaps/ext1/MK2501.png
index 47eba54a..e4ead428 100644
Binary files a/scripts/tests/snaps/ext1/MK2501.png and b/scripts/tests/snaps/ext1/MK2501.png differ
diff --git a/scripts/tests/snaps/ext1/MK2502.png b/scripts/tests/snaps/ext1/MK2502.png
index 96eb845d..2bf46899 100644
Binary files a/scripts/tests/snaps/ext1/MK2502.png and b/scripts/tests/snaps/ext1/MK2502.png differ
diff --git a/scripts/tests/snaps/ext1/MK25Fancy01.png b/scripts/tests/snaps/ext1/MK25Fancy01.png
index 0266c872..b199867e 100644
Binary files a/scripts/tests/snaps/ext1/MK25Fancy01.png and b/scripts/tests/snaps/ext1/MK25Fancy01.png differ
diff --git a/scripts/tests/snaps/ext1/MK25Fancy02.png b/scripts/tests/snaps/ext1/MK25Fancy02.png
index 39b5a89b..53f98e73 100644
Binary files a/scripts/tests/snaps/ext1/MK25Fancy02.png and b/scripts/tests/snaps/ext1/MK25Fancy02.png differ
diff --git a/scripts/tests/snaps/ext1/MK25S01.png b/scripts/tests/snaps/ext1/MK25S01.png
index d1f79b85..120a47ff 100644
Binary files a/scripts/tests/snaps/ext1/MK25S01.png and b/scripts/tests/snaps/ext1/MK25S01.png differ
diff --git a/scripts/tests/snaps/ext1/MK25S02.png b/scripts/tests/snaps/ext1/MK25S02.png
index 6b625e63..68a940d9 100644
Binary files a/scripts/tests/snaps/ext1/MK25S02.png and b/scripts/tests/snaps/ext1/MK25S02.png differ
diff --git a/scripts/tests/snaps/ext1/MK2Fancy01.png b/scripts/tests/snaps/ext1/MK2Fancy01.png
index f7029b97..109437cd 100644
Binary files a/scripts/tests/snaps/ext1/MK2Fancy01.png and b/scripts/tests/snaps/ext1/MK2Fancy01.png differ
diff --git a/scripts/tests/snaps/ext1/MK2Fancy02.png b/scripts/tests/snaps/ext1/MK2Fancy02.png
index f5e9348e..15aa57bf 100644
Binary files a/scripts/tests/snaps/ext1/MK2Fancy02.png and b/scripts/tests/snaps/ext1/MK2Fancy02.png differ
diff --git a/scripts/tests/snaps/ext1/MK2Fancy03.png b/scripts/tests/snaps/ext1/MK2Fancy03.png
index 14055424..3d97992f 100644
Binary files a/scripts/tests/snaps/ext1/MK2Fancy03.png and b/scripts/tests/snaps/ext1/MK2Fancy03.png differ
diff --git a/scripts/tests/snaps/ext1/MK2Lite01.png b/scripts/tests/snaps/ext1/MK2Lite01.png
index 4e118d60..71272b86 100644
Binary files a/scripts/tests/snaps/ext1/MK2Lite01.png and b/scripts/tests/snaps/ext1/MK2Lite01.png differ
diff --git a/scripts/tests/snaps/ext1/MK2LiteKeyT.png b/scripts/tests/snaps/ext1/MK2LiteKeyT.png
index a2ec1aac..bd15e30c 100644
Binary files a/scripts/tests/snaps/ext1/MK2LiteKeyT.png and b/scripts/tests/snaps/ext1/MK2LiteKeyT.png differ
diff --git a/scripts/tests/snaps/ext1/MK2LiteMouse02.png b/scripts/tests/snaps/ext1/MK2LiteMouse02.png
index 4d72a60d..646046c0 100644
Binary files a/scripts/tests/snaps/ext1/MK2LiteMouse02.png and b/scripts/tests/snaps/ext1/MK2LiteMouse02.png differ
diff --git a/scripts/tests/snaps/ext1/MK2LiteMouse03.png b/scripts/tests/snaps/ext1/MK2LiteMouse03.png
index 0ab90d7d..3f76154d 100644
Binary files a/scripts/tests/snaps/ext1/MK2LiteMouse03.png and b/scripts/tests/snaps/ext1/MK2LiteMouse03.png differ
diff --git a/scripts/tests/snaps/ext1/MK2MM01.png b/scripts/tests/snaps/ext1/MK2MM01.png
index 486c4829..9e363f7b 100644
Binary files a/scripts/tests/snaps/ext1/MK2MM01.png and b/scripts/tests/snaps/ext1/MK2MM01.png differ
diff --git a/scripts/tests/snaps/ext1/MK2MM02.png b/scripts/tests/snaps/ext1/MK2MM02.png
index e2e4ffab..32046233 100644
Binary files a/scripts/tests/snaps/ext1/MK2MM02.png and b/scripts/tests/snaps/ext1/MK2MM02.png differ
diff --git a/scripts/tests/snaps/ext1/MK2MMFancy01.png b/scripts/tests/snaps/ext1/MK2MMFancy01.png
index ec1426bb..e0efb20e 100644
Binary files a/scripts/tests/snaps/ext1/MK2MMFancy01.png and b/scripts/tests/snaps/ext1/MK2MMFancy01.png differ
diff --git a/scripts/tests/snaps/ext1/MK2MMFancy02.png b/scripts/tests/snaps/ext1/MK2MMFancy02.png
index f5e9348e..15aa57bf 100644
Binary files a/scripts/tests/snaps/ext1/MK2MMFancy02.png and b/scripts/tests/snaps/ext1/MK2MMFancy02.png differ
diff --git a/scripts/tests/snaps/ext1/MK301.png b/scripts/tests/snaps/ext1/MK301.png
index ede81501..f32d056e 100644
Binary files a/scripts/tests/snaps/ext1/MK301.png and b/scripts/tests/snaps/ext1/MK301.png differ
diff --git a/scripts/tests/snaps/ext1/MK302.png b/scripts/tests/snaps/ext1/MK302.png
index ef28245f..78f5c502 100644
Binary files a/scripts/tests/snaps/ext1/MK302.png and b/scripts/tests/snaps/ext1/MK302.png differ
diff --git a/scripts/tests/snaps/ext1/MK3MMU202.png b/scripts/tests/snaps/ext1/MK3MMU202.png
index 337d9b41..cd3da98d 100644
Binary files a/scripts/tests/snaps/ext1/MK3MMU202.png and b/scripts/tests/snaps/ext1/MK3MMU202.png differ
diff --git a/scripts/tests/snaps/ext1/MK3S01.png b/scripts/tests/snaps/ext1/MK3S01.png
index ede81501..f32d056e 100644
Binary files a/scripts/tests/snaps/ext1/MK3S01.png and b/scripts/tests/snaps/ext1/MK3S01.png differ
diff --git a/scripts/tests/snaps/ext1/MK3S02.png b/scripts/tests/snaps/ext1/MK3S02.png
index f106b5f8..c6bb46cc 100644
Binary files a/scripts/tests/snaps/ext1/MK3S02.png and b/scripts/tests/snaps/ext1/MK3S02.png differ
diff --git a/scripts/tests/snaps/ext1/MK3SMMU202.png b/scripts/tests/snaps/ext1/MK3SMMU202.png
index a82bac7f..a88c634e 100644
Binary files a/scripts/tests/snaps/ext1/MK3SMMU202.png and b/scripts/tests/snaps/ext1/MK3SMMU202.png differ
diff --git a/scripts/tests/snaps/ext1/MK3SMMU203.png b/scripts/tests/snaps/ext1/MK3SMMU203.png
index 4e2d6fa9..e0af3eba 100644
Binary files a/scripts/tests/snaps/ext1/MK3SMMU203.png and b/scripts/tests/snaps/ext1/MK3SMMU203.png differ
diff --git a/scripts/tests/snaps/ext1/MK3SMMU204.png b/scripts/tests/snaps/ext1/MK3SMMU204.png
index a9c50972..e5af4184 100644
Binary files a/scripts/tests/snaps/ext1/MK3SMMU204.png and b/scripts/tests/snaps/ext1/MK3SMMU204.png differ
diff --git a/scripts/tests/snaps/ext1/MK3SMMU2F1.png b/scripts/tests/snaps/ext1/MK3SMMU2F1.png
index 78d034f0..3c30a6bb 100644
Binary files a/scripts/tests/snaps/ext1/MK3SMMU2F1.png and b/scripts/tests/snaps/ext1/MK3SMMU2F1.png differ
diff --git a/scripts/tests/snaps/ext1/MK3SMMU2F2.png b/scripts/tests/snaps/ext1/MK3SMMU2F2.png
index 78d034f0..3c30a6bb 100644
Binary files a/scripts/tests/snaps/ext1/MK3SMMU2F2.png and b/scripts/tests/snaps/ext1/MK3SMMU2F2.png differ
diff --git a/scripts/tests/snaps/ext1/MK3SMMU2F3.png b/scripts/tests/snaps/ext1/MK3SMMU2F3.png
index 2ad1c3d5..3e62d31f 100644
Binary files a/scripts/tests/snaps/ext1/MK3SMMU2F3.png and b/scripts/tests/snaps/ext1/MK3SMMU2F3.png differ
diff --git a/scripts/tests/snaps/ext1/MMU2F1.png b/scripts/tests/snaps/ext1/MMU2F1.png
index f038f9f1..da7108dd 100644
Binary files a/scripts/tests/snaps/ext1/MMU2F1.png and b/scripts/tests/snaps/ext1/MMU2F1.png differ
diff --git a/scripts/tests/snaps/ext1/MMU2F2.png b/scripts/tests/snaps/ext1/MMU2F2.png
index cb6a0edd..f7ce942a 100644
Binary files a/scripts/tests/snaps/ext1/MMU2F2.png and b/scripts/tests/snaps/ext1/MMU2F2.png differ
diff --git a/scripts/tests/snaps/ext1/MMU2F3.png b/scripts/tests/snaps/ext1/MMU2F3.png
index f038f9f1..da7108dd 100644
Binary files a/scripts/tests/snaps/ext1/MMU2F3.png and b/scripts/tests/snaps/ext1/MMU2F3.png differ
diff --git a/scripts/tests/snaps/ext1/MMU2F4.png b/scripts/tests/snaps/ext1/MMU2F4.png
index cb6a0edd..f7ce942a 100644
Binary files a/scripts/tests/snaps/ext1/MMU2F4.png and b/scripts/tests/snaps/ext1/MMU2F4.png differ
diff --git a/scripts/tests/snaps/ext1/MMU2_start.png b/scripts/tests/snaps/ext1/MMU2_start.png
index d2d7c846..e3f5c913 100644
Binary files a/scripts/tests/snaps/ext1/MMU2_start.png and b/scripts/tests/snaps/ext1/MMU2_start.png differ
diff --git a/scripts/tests/snaps/parts/A498201.png b/scripts/tests/snaps/parts/A498201.png
index 0797a290..80f2fecc 100644
Binary files a/scripts/tests/snaps/parts/A498201.png and b/scripts/tests/snaps/parts/A498201.png differ
diff --git a/scripts/tests/snaps/parts/A498201a.png b/scripts/tests/snaps/parts/A498201a.png
index 0797a290..80f2fecc 100644
Binary files a/scripts/tests/snaps/parts/A498201a.png and b/scripts/tests/snaps/parts/A498201a.png differ
diff --git a/scripts/tests/snaps/parts/A498201b.png b/scripts/tests/snaps/parts/A498201b.png
index 0797a290..80f2fecc 100644
Binary files a/scripts/tests/snaps/parts/A498201b.png and b/scripts/tests/snaps/parts/A498201b.png differ
diff --git a/scripts/tests/snaps/parts/A498201c.png b/scripts/tests/snaps/parts/A498201c.png
index b8f00864..a3a36c01 100644
Binary files a/scripts/tests/snaps/parts/A498201c.png and b/scripts/tests/snaps/parts/A498201c.png differ
diff --git a/scripts/tests/snaps/parts/A498202.png b/scripts/tests/snaps/parts/A498202.png
index b467eb47..6c43686f 100644
Binary files a/scripts/tests/snaps/parts/A498202.png and b/scripts/tests/snaps/parts/A498202.png differ
diff --git a/scripts/tests/snaps/parts/A498203.png b/scripts/tests/snaps/parts/A498203.png
index a7cdde17..64ddc381 100644
Binary files a/scripts/tests/snaps/parts/A498203.png and b/scripts/tests/snaps/parts/A498203.png differ
diff --git a/scripts/tests/snaps/parts/A498204.png b/scripts/tests/snaps/parts/A498204.png
index 9ffdee39..955dd3db 100644
Binary files a/scripts/tests/snaps/parts/A498204.png and b/scripts/tests/snaps/parts/A498204.png differ
diff --git a/scripts/tests/snaps/parts/A498205.png b/scripts/tests/snaps/parts/A498205.png
index 0e48d0a0..0da310fc 100644
Binary files a/scripts/tests/snaps/parts/A498205.png and b/scripts/tests/snaps/parts/A498205.png differ
diff --git a/scripts/tests/snaps/parts/A498206.png b/scripts/tests/snaps/parts/A498206.png
index e2668a10..30b74abe 100644
Binary files a/scripts/tests/snaps/parts/A498206.png and b/scripts/tests/snaps/parts/A498206.png differ
diff --git a/scripts/tests/snaps/parts/BEEPER01.png b/scripts/tests/snaps/parts/BEEPER01.png
index 87d7744e..e7c8be9e 100644
Binary files a/scripts/tests/snaps/parts/BEEPER01.png and b/scripts/tests/snaps/parts/BEEPER01.png differ
diff --git a/scripts/tests/snaps/parts/BEEPER02.png b/scripts/tests/snaps/parts/BEEPER02.png
index b0d79f44..10ceac20 100644
Binary files a/scripts/tests/snaps/parts/BEEPER02.png and b/scripts/tests/snaps/parts/BEEPER02.png differ
diff --git a/scripts/tests/snaps/parts/BEEPER03.png b/scripts/tests/snaps/parts/BEEPER03.png
index 87d7744e..e7c8be9e 100644
Binary files a/scripts/tests/snaps/parts/BEEPER03.png and b/scripts/tests/snaps/parts/BEEPER03.png differ
diff --git a/scripts/tests/snaps/parts/BEEPER04.png b/scripts/tests/snaps/parts/BEEPER04.png
index 663ab5e2..d4f585e3 100644
Binary files a/scripts/tests/snaps/parts/BEEPER04.png and b/scripts/tests/snaps/parts/BEEPER04.png differ
diff --git a/scripts/tests/snaps/parts/BEEPER05.png b/scripts/tests/snaps/parts/BEEPER05.png
index 4c70961b..400e8aad 100644
Binary files a/scripts/tests/snaps/parts/BEEPER05.png and b/scripts/tests/snaps/parts/BEEPER05.png differ
diff --git a/scripts/tests/snaps/parts/FAN01.png b/scripts/tests/snaps/parts/FAN01.png
index fbede127..26cbd32d 100644
Binary files a/scripts/tests/snaps/parts/FAN01.png and b/scripts/tests/snaps/parts/FAN01.png differ
diff --git a/scripts/tests/snaps/parts/FAN02.png b/scripts/tests/snaps/parts/FAN02.png
index f33b41fb..5ca5df91 100644
Binary files a/scripts/tests/snaps/parts/FAN02.png and b/scripts/tests/snaps/parts/FAN02.png differ
diff --git a/scripts/tests/snaps/parts/FAN03.png b/scripts/tests/snaps/parts/FAN03.png
index e09bb5c5..18fc2f83 100644
Binary files a/scripts/tests/snaps/parts/FAN03.png and b/scripts/tests/snaps/parts/FAN03.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVis01.png b/scripts/tests/snaps/parts/GFX3DVis01.png
index dad11c7c..9d2780d9 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVis01.png and b/scripts/tests/snaps/parts/GFX3DVis01.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVis04.png b/scripts/tests/snaps/parts/GFX3DVis04.png
index 6a355b25..1578e2d6 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVis04.png and b/scripts/tests/snaps/parts/GFX3DVis04.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVis05.png b/scripts/tests/snaps/parts/GFX3DVis05.png
index 7e21419e..10ee22a0 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVis05.png and b/scripts/tests/snaps/parts/GFX3DVis05.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVisAvgT01.png b/scripts/tests/snaps/parts/GFX3DVisAvgT01.png
index caec98e4..ab537094 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVisAvgT01.png and b/scripts/tests/snaps/parts/GFX3DVisAvgT01.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVisAvgT04.png b/scripts/tests/snaps/parts/GFX3DVisAvgT04.png
index cd1d3d31..0d870d14 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVisAvgT04.png and b/scripts/tests/snaps/parts/GFX3DVisAvgT04.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVisAvgT05.png b/scripts/tests/snaps/parts/GFX3DVisAvgT05.png
index 7e21419e..10ee22a0 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVisAvgT05.png and b/scripts/tests/snaps/parts/GFX3DVisAvgT05.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVisHRQ01.png b/scripts/tests/snaps/parts/GFX3DVisHRQ01.png
index 16e58b52..c6a5af8b 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVisHRQ01.png and b/scripts/tests/snaps/parts/GFX3DVisHRQ01.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVisHRQ04.png b/scripts/tests/snaps/parts/GFX3DVisHRQ04.png
index a0622823..8cb63295 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVisHRQ04.png and b/scripts/tests/snaps/parts/GFX3DVisHRQ04.png differ
diff --git a/scripts/tests/snaps/parts/GFX3DVisHRQ05.png b/scripts/tests/snaps/parts/GFX3DVisHRQ05.png
index 7e21419e..10ee22a0 100644
Binary files a/scripts/tests/snaps/parts/GFX3DVisHRQ05.png and b/scripts/tests/snaps/parts/GFX3DVisHRQ05.png differ
diff --git a/scripts/tests/snaps/parts/Heater01.png b/scripts/tests/snaps/parts/Heater01.png
index 4e799e33..097e07ad 100644
Binary files a/scripts/tests/snaps/parts/Heater01.png and b/scripts/tests/snaps/parts/Heater01.png differ
diff --git a/scripts/tests/snaps/parts/Heater02.png b/scripts/tests/snaps/parts/Heater02.png
index 5cc0ee19..104ac34b 100644
Binary files a/scripts/tests/snaps/parts/Heater02.png and b/scripts/tests/snaps/parts/Heater02.png differ
diff --git a/scripts/tests/snaps/parts/Heater03.png b/scripts/tests/snaps/parts/Heater03.png
index f01eb0dd..4c165966 100644
Binary files a/scripts/tests/snaps/parts/Heater03.png and b/scripts/tests/snaps/parts/Heater03.png differ
diff --git a/scripts/tests/snaps/parts/Heater04.png b/scripts/tests/snaps/parts/Heater04.png
index 214d0ebd..bc324385 100644
Binary files a/scripts/tests/snaps/parts/Heater04.png and b/scripts/tests/snaps/parts/Heater04.png differ
diff --git a/scripts/tests/snaps/parts/LED00.png b/scripts/tests/snaps/parts/LED00.png
index 1c3a1392..74dfd9db 100644
Binary files a/scripts/tests/snaps/parts/LED00.png and b/scripts/tests/snaps/parts/LED00.png differ
diff --git a/scripts/tests/snaps/parts/LED01.png b/scripts/tests/snaps/parts/LED01.png
index 6938bf50..452eaeff 100644
Binary files a/scripts/tests/snaps/parts/LED01.png and b/scripts/tests/snaps/parts/LED01.png differ
diff --git a/scripts/tests/snaps/parts/LED010.png b/scripts/tests/snaps/parts/LED010.png
index bdd93c5c..392c51cb 100644
Binary files a/scripts/tests/snaps/parts/LED010.png and b/scripts/tests/snaps/parts/LED010.png differ
diff --git a/scripts/tests/snaps/parts/LED011.png b/scripts/tests/snaps/parts/LED011.png
index cd146c19..a07196d8 100644
Binary files a/scripts/tests/snaps/parts/LED011.png and b/scripts/tests/snaps/parts/LED011.png differ
diff --git a/scripts/tests/snaps/parts/LED012.png b/scripts/tests/snaps/parts/LED012.png
index 2d284a56..fedde0cd 100644
Binary files a/scripts/tests/snaps/parts/LED012.png and b/scripts/tests/snaps/parts/LED012.png differ
diff --git a/scripts/tests/snaps/parts/LED013.png b/scripts/tests/snaps/parts/LED013.png
index f155b155..a00e110d 100644
Binary files a/scripts/tests/snaps/parts/LED013.png and b/scripts/tests/snaps/parts/LED013.png differ
diff --git a/scripts/tests/snaps/parts/LED02.png b/scripts/tests/snaps/parts/LED02.png
index 794851f1..fea64834 100644
Binary files a/scripts/tests/snaps/parts/LED02.png and b/scripts/tests/snaps/parts/LED02.png differ
diff --git a/scripts/tests/snaps/parts/LED03.png b/scripts/tests/snaps/parts/LED03.png
index 38e451d9..deee57ef 100644
Binary files a/scripts/tests/snaps/parts/LED03.png and b/scripts/tests/snaps/parts/LED03.png differ
diff --git a/scripts/tests/snaps/parts/LED04.png b/scripts/tests/snaps/parts/LED04.png
index e424f398..a0772274 100644
Binary files a/scripts/tests/snaps/parts/LED04.png and b/scripts/tests/snaps/parts/LED04.png differ
diff --git a/scripts/tests/snaps/parts/LED05.png b/scripts/tests/snaps/parts/LED05.png
index e027d02a..2b5b6013 100644
Binary files a/scripts/tests/snaps/parts/LED05.png and b/scripts/tests/snaps/parts/LED05.png differ
diff --git a/scripts/tests/snaps/parts/LED06.png b/scripts/tests/snaps/parts/LED06.png
index 472ef3de..cb5c8f7a 100644
Binary files a/scripts/tests/snaps/parts/LED06.png and b/scripts/tests/snaps/parts/LED06.png differ
diff --git a/scripts/tests/snaps/parts/LED07.png b/scripts/tests/snaps/parts/LED07.png
index 77dcc80a..46dc9717 100644
Binary files a/scripts/tests/snaps/parts/LED07.png and b/scripts/tests/snaps/parts/LED07.png differ
diff --git a/scripts/tests/snaps/parts/LED08.png b/scripts/tests/snaps/parts/LED08.png
index b3c2e2ed..5c0bd126 100644
Binary files a/scripts/tests/snaps/parts/LED08.png and b/scripts/tests/snaps/parts/LED08.png differ
diff --git a/scripts/tests/snaps/parts/LED09.png b/scripts/tests/snaps/parts/LED09.png
index 4fd47cb0..ac1a00c3 100644
Binary files a/scripts/tests/snaps/parts/LED09.png and b/scripts/tests/snaps/parts/LED09.png differ
diff --git a/scripts/tests/snaps/parts/MMU101.png b/scripts/tests/snaps/parts/MMU101.png
index ceedf2cd..fe355e19 100644
Binary files a/scripts/tests/snaps/parts/MMU101.png and b/scripts/tests/snaps/parts/MMU101.png differ
diff --git a/scripts/tests/snaps/parts/MMU102.png b/scripts/tests/snaps/parts/MMU102.png
index 130b9429..af8c99be 100644
Binary files a/scripts/tests/snaps/parts/MMU102.png and b/scripts/tests/snaps/parts/MMU102.png differ
diff --git a/scripts/tests/snaps/parts/MMU103.png b/scripts/tests/snaps/parts/MMU103.png
index caeab26f..057ffdac 100644
Binary files a/scripts/tests/snaps/parts/MMU103.png and b/scripts/tests/snaps/parts/MMU103.png differ
diff --git a/scripts/tests/snaps/parts/MMU105.png b/scripts/tests/snaps/parts/MMU105.png
index ceedf2cd..fe355e19 100644
Binary files a/scripts/tests/snaps/parts/MMU105.png and b/scripts/tests/snaps/parts/MMU105.png differ
diff --git a/scripts/tests/snaps/parts/TMC01.png b/scripts/tests/snaps/parts/TMC01.png
index 83125c64..3a7487f3 100644
Binary files a/scripts/tests/snaps/parts/TMC01.png and b/scripts/tests/snaps/parts/TMC01.png differ
diff --git a/scripts/tests/snaps/parts/TMC02.png b/scripts/tests/snaps/parts/TMC02.png
index 573323d9..6cc6e81c 100644
Binary files a/scripts/tests/snaps/parts/TMC02.png and b/scripts/tests/snaps/parts/TMC02.png differ
diff --git a/scripts/tests/snaps/parts/TMC03.png b/scripts/tests/snaps/parts/TMC03.png
index 43f5b9f8..06a2cf78 100644
Binary files a/scripts/tests/snaps/parts/TMC03.png and b/scripts/tests/snaps/parts/TMC03.png differ
diff --git a/scripts/tests/snaps/parts/TMC04.png b/scripts/tests/snaps/parts/TMC04.png
index 3e3b9225..2e961dc2 100644
Binary files a/scripts/tests/snaps/parts/TMC04.png and b/scripts/tests/snaps/parts/TMC04.png differ
diff --git a/scripts/tests/snaps/parts/TMC05.png b/scripts/tests/snaps/parts/TMC05.png
index 3310b5b6..62c2555a 100644
Binary files a/scripts/tests/snaps/parts/TMC05.png and b/scripts/tests/snaps/parts/TMC05.png differ