diff --git a/docs/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
similarity index 100%
rename from docs/CODE_OF_CONDUCT.md
rename to .github/CODE_OF_CONDUCT.md
diff --git a/PULL_REQUEST_TEMPLATE b/.github/pull_request_template.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE
rename to .github/pull_request_template.md
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 4ff3db01c..4619c8230 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -104,8 +104,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
@@ -113,47 +111,19 @@ jobs:
         image: midwan/amiberry-debian-x86_64:bullseye
         options: -v ${{ github.workspace }}:/build
         run: |
-          make -j8 PLATFORM=x86-64
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-x86_64
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bullseye-x86_64.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
+          cmake -B build && cmake --build build -j4
+          cpack --config build/CPackConfig.cmake
 
     - name: Upload artifact
-      if: github.ref_type == 'tag'
       uses: actions/upload-artifact@v4
       with:
         name: amiberry-debian-bullseye-x86_64
-        path: amiberry-${{ github.ref_name }}-debian-bullseye-x86_64.zip
+        path: amiberry_*.deb
 
   build-debian-bookworm-x86_64:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
@@ -161,47 +131,19 @@ jobs:
         image: midwan/amiberry-debian-x86_64:bookworm
         options: -v ${{ github.workspace }}:/build
         run: |
-          make -j8 PLATFORM=x86-64
+          cmake -B build && cmake --build build -j4
+          cpack --config build/CPackConfig.cmake
 
     - name: Upload artifact
-      if: github.ref_type != 'tag'
       uses: actions/upload-artifact@v4
       with:
         name: amiberry-debian-bookworm-x86_64
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bookworm-x86_64.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
+        path: amiberry_*.deb
 
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-x86_64
-        path: amiberry-${{ github.ref_name }}-debian-bookworm-x86_64.zip
-  
-  build-debian-bookworm-aarch64-rpi5:
+  build-debian-bookworm-aarch64:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
@@ -209,48 +151,19 @@ jobs:
         image: midwan/amiberry-debian-aarch64:bookworm
         options: -v ${{ github.workspace }}:/build
         run: |
-          make -j8 PLATFORM=rpi5-64-sdl2
+          cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-aarch64-linux-gnu.cmake -B build && cmake --build build -j4
+          cpack --config build/CPackConfig.cmake
 
     - name: Upload artifact
-      if: github.ref_type != 'tag'
       uses: actions/upload-artifact@v4
       with:
-        name: amiberry-debian-bookworm-aarch64-rpi5
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi5.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
+        name: amiberry-debian-bookworm-aarch64
+        path: amiberry_*.deb
 
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-aarch64-rpi5
-        path: amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi5.zip
-
-  build-debian-bookworm-armhf-rpi5:
-    if: (github.ref == 'refs/heads/master') || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v'))
+  build-debian-bookworm-armhf:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
@@ -258,47 +171,19 @@ jobs:
         image: midwan/amiberry-debian-armhf:bookworm
         options: -v ${{ github.workspace }}:/build
         run: |
-          make -j8 PLATFORM=rpi5-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-armhf-rpi5
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi5.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
+          cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-arm-linux-gnueabihf.cmake -B build && cmake --build build -j4
+          cpack --config build/CPackConfig.cmake
 
     - name: Upload artifact
-      if: github.ref_type == 'tag'
       uses: actions/upload-artifact@v4
       with:
-        name: amiberry-debian-bookworm-armhf-rpi5
-        path: amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi5.zip
+        name: amiberry-debian-bookworm-armhf
+        path: amiberry_*.deb
 
-  build-debian-bullseye-aarch64-rpi4:
+  build-debian-bullseye-aarch64:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
@@ -306,48 +191,19 @@ jobs:
         image: midwan/amiberry-debian-aarch64:bullseye
         options: -v ${{ github.workspace }}:/build
         run: |
-          make -j8 PLATFORM=rpi4-64-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-aarch64-rpi4
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bullseye-aarch64-rpi4.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
+          cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-aarch64-linux-gnu.cmake -B build && cmake --build build -j4
+          cpack --config build/CPackConfig.cmake
 
     - name: Upload artifact
-      if: github.ref_type == 'tag'
       uses: actions/upload-artifact@v4
       with:
-        name: amiberry-debian-bullseye-aarch64-rpi4
-        path: amiberry-${{ github.ref_name }}-debian-bullseye-aarch64-rpi4.zip
+        name: amiberry-debian-bullseye-aarch64
+        path: amiberry_*.deb
 
-  build-debian-bullseye-armhf-rpi4:
-    if: (github.ref == 'refs/heads/master') || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v'))
+  build-debian-bullseye-armhf:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
 
     - name: Run the build process with Docker
       uses: addnab/docker-run-action@v3
@@ -355,336 +211,17 @@ jobs:
         image: midwan/amiberry-debian-armhf:bullseye
         options: -v ${{ github.workspace }}:/build
         run: |
-          make -j8 PLATFORM=rpi4-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-armhf-rpi4
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bullseye-armhf-rpi4.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
-
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-armhf-rpi4
-        path: amiberry-${{ github.ref_name }}-debian-bullseye-armhf-rpi4.zip
-
-  build-debian-bookworm-aarch64-rpi4:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-
-    - name: Run the build process with Docker
-      uses: addnab/docker-run-action@v3
-      with:
-        image: midwan/amiberry-debian-aarch64:bookworm
-        options: -v ${{ github.workspace }}:/build
-        run: |
-          make -j8 PLATFORM=rpi4-64-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-aarch64-rpi4
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi4.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
-
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-aarch64-rpi4
-        path: amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi4.zip
-
-  build-debian-bookworm-armhf-rpi4:
-    if: (github.ref == 'refs/heads/master') || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v'))
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-
-    - name: Run the build process with Docker
-      uses: addnab/docker-run-action@v3
-      with:
-        image: midwan/amiberry-debian-armhf:bookworm
-        options: -v ${{ github.workspace }}:/build
-        run: |
-          make -j8 PLATFORM=rpi4-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-armhf-rpi4
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi4.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
-
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-armhf-rpi4
-        path: amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi4.zip
-
-  build-debian-bullseye-aarch64-rpi3:
-    if: (github.ref == 'refs/heads/master') || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v'))
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-
-    - name: Run the build process with Docker
-      uses: addnab/docker-run-action@v3
-      with:
-        image: midwan/amiberry-debian-aarch64:bullseye
-        options: -v ${{ github.workspace }}:/build
-        run: |
-          make -j8 PLATFORM=rpi3-64-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-aarch64-rpi3
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bullseye-aarch64-rpi3.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
-
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-aarch64-rpi3
-        path: amiberry-${{ github.ref_name }}-debian-bullseye-aarch64-rpi3.zip
-
-  build-debian-bullseye-armhf-rpi3:
-    if: (github.ref == 'refs/heads/master') || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v'))
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-
-    - name: Run the build process with Docker
-      uses: addnab/docker-run-action@v3
-      with:
-        image: midwan/amiberry-debian-armhf:bullseye
-        options: -v ${{ github.workspace }}:/build
-        run: |
-          make -j8 PLATFORM=rpi3-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-armhf-rpi3
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bullseye-armhf-rpi3.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
-
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bullseye-armhf-rpi3
-        path: amiberry-${{ github.ref_name }}-debian-bullseye-armhf-rpi3.zip
-
-  build-debian-bookworm-aarch64-rpi3:
-    if: (github.ref == 'refs/heads/master') || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v'))
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-
-    - name: Run the build process with Docker
-      uses: addnab/docker-run-action@v3
-      with:
-        image: midwan/amiberry-debian-aarch64:bookworm
-        options: -v ${{ github.workspace }}:/build
-        run: |
-          make -j8 PLATFORM=rpi3-64-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-aarch64-rpi3
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi3.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
-
-    - name: Upload artifact
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-aarch64-rpi3
-        path: amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi3.zip
-
-  build-debian-bookworm-armhf-rpi3:
-    if: (github.ref == 'refs/heads/master') || (github.ref_type == 'tag' && startsWith(github.ref_name, 'v'))
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: 'true'
-
-    - name: Run the build process with Docker
-      uses: addnab/docker-run-action@v3
-      with:
-        image: midwan/amiberry-debian-armhf:bookworm
-        options: -v ${{ github.workspace }}:/build
-        run: |
-          make -j8 PLATFORM=rpi3-sdl2
-
-    - name: Upload artifact
-      if: github.ref_type != 'tag'
-      uses: actions/upload-artifact@v4
-      with:
-        name: amiberry-debian-bookworm-armhf-rpi3
-        path: |
-          amiberry
-          cdroms/**
-          conf/**
-          controllers/**
-          data/**
-          floppies/**
-          harddrives/**
-          inputrecordings/**
-          kickstarts/**
-          lha/**
-          nvram/**
-          plugins/**
-          savestates/**
-          screenshots/**
-          whdboot/**
-
-    - name: ZIP binaries
-      if: github.ref_type == 'tag'
-      run: zip -r amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi3.zip amiberry cdroms conf controllers data floppies harddrives kickstarts lha nvram plugins savestates screenshots whdboot
+          cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-arm-linux-gnueabihf.cmake -B build && cmake --build build -j4
+          cpack --config build/CPackConfig.cmake
 
     - name: Upload artifact
-      if: github.ref_type == 'tag'
       uses: actions/upload-artifact@v4
       with:
-        name: amiberry-debian-bookworm-armhf-rpi3
-        path: amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi3.zip
+        name: amiberry-debian-bullseye-armhf
+        path: amiberry_*.deb
 
   create-release:
-    needs: [build-macOS-x86_64, build-macOS-apple-silicon, build-debian-bullseye-x86_64, build-debian-bookworm-x86_64, build-debian-bookworm-aarch64-rpi5, build-debian-bookworm-armhf-rpi5, build-debian-bullseye-aarch64-rpi4, build-debian-bullseye-armhf-rpi4, build-debian-bookworm-aarch64-rpi4, build-debian-bookworm-armhf-rpi4, build-debian-bullseye-aarch64-rpi3, build-debian-bullseye-armhf-rpi3, build-debian-bookworm-aarch64-rpi3, build-debian-bookworm-armhf-rpi3]
+    needs: [build-macOS-x86_64, build-macOS-apple-silicon, build-debian-bookworm-x86_64, build-debian-bookworm-aarch64, build-debian-bookworm-armhf, build-debian-bullseye-x86_64, build-debian-bullseye-aarch64, build-debian-bullseye-armhf]
     runs-on: ubuntu-latest
     if: github.ref_type == 'tag' && startsWith(github.ref_name, 'v')
     steps:
@@ -711,21 +248,15 @@ jobs:
           artifacts: |
             amiberry-macOS-64bit-intel/amiberry-${{ github.ref_name }}-macOS-x86_64.zip
             amiberry-macOS-64bit-apple-silicon/amiberry-${{ github.ref_name }}-macOS-apple-silicon.zip
-            amiberry-debian-bullseye-x86_64/amiberry-${{ github.ref_name }}-debian-bullseye-x86_64.zip
-            amiberry-debian-bookworm-x86_64/amiberry-${{ github.ref_name }}-debian-bookworm-x86_64.zip
-            amiberry-debian-bookworm-aarch64-rpi5/amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi5.zip
-            amiberry-debian-bookworm-armhf-rpi5/amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi5.zip
-            amiberry-debian-bullseye-aarch64-rpi4/amiberry-${{ github.ref_name }}-debian-bullseye-aarch64-rpi4.zip
-            amiberry-debian-bullseye-armhf-rpi4/amiberry-${{ github.ref_name }}-debian-bullseye-armhf-rpi4.zip
-            amiberry-debian-bookworm-aarch64-rpi4/amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi4.zip
-            amiberry-debian-bookworm-armhf-rpi4/amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi4.zip
-            amiberry-debian-bullseye-aarch64-rpi3/amiberry-${{ github.ref_name }}-debian-bullseye-aarch64-rpi3.zip
-            amiberry-debian-bullseye-armhf-rpi3/amiberry-${{ github.ref_name }}-debian-bullseye-armhf-rpi3.zip
-            amiberry-debian-bookworm-aarch64-rpi3/amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi3.zip
-            amiberry-debian-bookworm-armhf-rpi3/amiberry-${{ github.ref_name }}-debian-bookworm-armhf-rpi3.zip
+            amiberry-debian-bookworm-x86_64/amiberry_*.deb
+            amiberry-debian-bookworm-aarch64/amiberry_*.deb
+            amiberry-debian-bookworm-armhf/amiberry_*.deb
+            amiberry-debian-bullseye-x86_64/amiberry_*.deb
+            amiberry-debian-bullseye-aarch64/amiberry_*.deb
+            amiberry-debian-bullseye-armhf/amiberry_*.deb
 
   create-prerelease:
-    needs: [build-macOS-x86_64, build-macOS-apple-silicon, build-debian-bullseye-x86_64, build-debian-bookworm-x86_64, build-debian-bookworm-aarch64-rpi5, build-debian-bullseye-aarch64-rpi4, build-debian-bookworm-aarch64-rpi4]
+    needs: [build-macOS-x86_64, build-macOS-apple-silicon, build-debian-bookworm-x86_64, build-debian-bookworm-aarch64, build-debian-bookworm-armhf, build-debian-bullseye-x86_64, build-debian-bullseye-aarch64, build-debian-bullseye-armhf]
     runs-on: ubuntu-latest
     if: github.ref_type == 'tag' && startsWith(github.ref_name, 'preview-v')
     steps:
@@ -753,8 +284,9 @@ jobs:
           artifacts: |
             amiberry-macOS-64bit-intel/amiberry-${{ github.ref_name }}-macOS-x86_64.zip
             amiberry-macOS-64bit-apple-silicon/amiberry-${{ github.ref_name }}-macOS-apple-silicon.zip
-            amiberry-debian-bullseye-x86_64/amiberry-${{ github.ref_name }}-debian-bullseye-x86_64.zip
-            amiberry-debian-bookworm-x86_64/amiberry-${{ github.ref_name }}-debian-bookworm-x86_64.zip
-            amiberry-debian-bookworm-aarch64-rpi5/amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi5.zip
-            amiberry-debian-bullseye-aarch64-rpi4/amiberry-${{ github.ref_name }}-debian-bullseye-aarch64-rpi4.zip
-            amiberry-debian-bookworm-aarch64-rpi4/amiberry-${{ github.ref_name }}-debian-bookworm-aarch64-rpi4.zip
+            amiberry-debian-bookworm-x86_64/amiberry_*.deb
+            amiberry-debian-bookworm-aarch64/amiberry_*.deb
+            amiberry-debian-bookworm-armhf/amiberry_*.deb
+            amiberry-debian-bullseye-x86_64/amiberry_*.deb
+            amiberry-debian-bullseye-aarch64/amiberry_*.deb
+            amiberry-debian-bullseye-armhf/amiberry_*.deb
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29bb..000000000
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77aca96d0..10d2ed61f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.16)
-project(amiberry)
+project(amiberry VERSION 6.3.5)
 enable_language(C CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_C_FLAGS_RELEASE "-O3 -pipe")
-set(CMAKE_C_FLAGS_DEBUG "-Og -g -funwind-tables -DDEBUG -pipe")
+set(CMAKE_C_FLAGS_RELEASE "-O3 -pipe -fno-pie -no-pie")
+set(CMAKE_C_FLAGS_DEBUG "-Og -g -funwind-tables -DDEBUG -pipe -fno-pie -no-pie")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 
@@ -43,371 +43,381 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     endif ()
 endif ()
 
-add_executable(${PROJECT_NAME}
-        src/a2065.cpp
-        src/a2091.cpp
-        src/akiko.cpp
-        src/amax.cpp
-        src/ar.cpp
-        src/arcadia.cpp
-        src/audio.cpp
-        src/autoconf.cpp
-        src/blitfunc.cpp
-        src/blittable.cpp
-        src/blitter.cpp
-        src/blkdev.cpp
-        src/blkdev_cdimage.cpp
-        src/bsdsocket.cpp
-        src/calc.cpp
-        src/catweasel.cpp
-        src/cd32_fmv.cpp
-        src/cd32_fmv_genlock.cpp
-        src/cdrom.cpp
-        src/cdtv.cpp
-        src/cdtvcr.cpp
-        src/cfgfile.cpp
-        src/cia.cpp
-        src/consolehook.cpp
-        src/cpuboard.cpp
-        src/crc32.cpp
-        src/custom.cpp
-        src/debug.cpp
-        src/debugmem.cpp
-        src/def_icons.cpp
-        src/devices.cpp
-        src/disasm.cpp
-        src/disk.cpp
-        src/diskutil.cpp
-        src/dlopen.cpp
-        src/dongle.cpp
-        src/draco.cpp
-        src/drawing.cpp
-        src/driveclick.cpp
-        src/enforcer.cpp
-        src/ethernet.cpp
-        src/events.cpp
-        src/expansion.cpp
-        src/fdi2raw.cpp
-        src/filesys.cpp
-        src/flashrom.cpp
-        src/fpp.cpp
-        src/fpp_native.cpp
-        src/framebufferboards.cpp
-        src/fsdb.cpp
-        src/fsusage.cpp
-        src/gayle.cpp
-        src/gfxboard.cpp
-        src/gfxlib.cpp
-        src/gfxutil.cpp
-        src/hardfile.cpp
-        src/hrtmon.rom.cpp
-        src/ide.cpp
-        src/idecontrollers.cpp
-        src/identify.cpp
-        src/ini.cpp
-        src/inputdevice.cpp
-        src/inputrecord.cpp
-        src/isofs.cpp
-        src/keybuf.cpp
-        src/luascript.cpp
-        src/main.cpp
-        src/memory.cpp
-        src/midiemu.cpp
-        src/native2amiga.cpp
-        src/ncr9x_scsi.cpp
-        src/ncr_scsi.cpp
-        src/parser.cpp
-        src/pci.cpp
-        src/rommgr.cpp
-        src/rtc.cpp
-        src/sampler.cpp
-        src/sana2.cpp
-        src/savestate.cpp
-        src/scp.cpp
-        src/scsi.cpp
-        src/scsiemul.cpp
-        src/scsitape.cpp
-        src/slirp_uae.cpp
-        src/sndboard.cpp
-        src/specialmonitors.cpp
-        src/statusline.cpp
-        src/tabletlibrary.cpp
-        src/test_card.cpp
-        src/tinyxml2.cpp
-        src/traps.cpp
-        src/uaeexe.cpp
-        src/uaelib.cpp
-        src/uaenative.cpp
-        src/uaeresource.cpp
-        src/uaeserial.cpp
-        src/vm.cpp
-        src/x86.cpp
-        src/zfile.cpp
-        src/zfile_archive.cpp
-        src/archivers/7z/7zAlloc.c
-        src/archivers/7z/7zArcIn.c
-        src/archivers/7z/7zBuf.c
-        src/archivers/7z/7zBuf2.c
-        src/archivers/7z/7zCrc.c
-        src/archivers/7z/7zCrcOpt.c
-        src/archivers/7z/7zDec.c
-        src/archivers/7z/7zFile.c
-        src/archivers/7z/7zStream.c
-        src/archivers/7z/Aes.c
-        src/archivers/7z/AesOpt.c
-        src/archivers/7z/Alloc.c
-        src/archivers/7z/Bcj2.c
-        src/archivers/7z/Bra.c
-        src/archivers/7z/Bra86.c
-        src/archivers/7z/BraIA64.c
-        src/archivers/7z/CpuArch.c
-        src/archivers/7z/Delta.c
-        src/archivers/7z/LzFind.c
-        src/archivers/7z/Lzma2Dec.c
-        src/archivers/7z/Lzma2Enc.c
-        src/archivers/7z/Lzma86Dec.c
-        src/archivers/7z/Lzma86Enc.c
-        src/archivers/7z/LzmaDec.c
-        src/archivers/7z/LzmaEnc.c
-        src/archivers/7z/LzmaLib.c
-        src/archivers/7z/Ppmd7.c
-        src/archivers/7z/Ppmd7Dec.c
-        src/archivers/7z/Ppmd7Enc.c
-        src/archivers/7z/Sha256.c
-        src/archivers/7z/Sort.c
-        src/archivers/7z/Xz.c
-        src/archivers/7z/XzCrc64.c
-        src/archivers/7z/XzCrc64Opt.c
-        src/archivers/7z/XzDec.c
-        src/archivers/7z/XzEnc.c
-        src/archivers/7z/XzIn.c
-        src/archivers/chd/avhuff.cpp
-        src/archivers/chd/bitmap.cpp
-        src/archivers/chd/cdrom.cpp
-        src/archivers/chd/chd.cpp
-        src/archivers/chd/chdcd.cpp
-        src/archivers/chd/chdcodec.cpp
-        src/archivers/chd/corealloc.cpp
-        src/archivers/chd/corefile.cpp
-        src/archivers/chd/corestr.cpp
-        src/archivers/chd/flac.cpp
-        src/archivers/chd/harddisk.cpp
-        src/archivers/chd/hashing.cpp
-        src/archivers/chd/huffman.cpp
-        src/archivers/chd/md5.cpp
-        src/archivers/chd/osdcore.cpp
-        src/archivers/chd/osdlib_unix.cpp
-        src/archivers/chd/osdsync.cpp
-        src/archivers/chd/palette.cpp
-        src/archivers/chd/posixdir.cpp
-        src/archivers/chd/posixfile.cpp
-        src/archivers/chd/posixptty.cpp
-        src/archivers/chd/posixsocket.cpp
-        src/archivers/chd/strconv.cpp
-        src/archivers/chd/strformat.cpp
-        src/archivers/chd/unicode.cpp
-        src/archivers/chd/vecstream.cpp
-        src/archivers/chd/utf8proc.c
-        src/archivers/dms/crc_csum.cpp
-        src/archivers/dms/getbits.cpp
-        src/archivers/dms/maketbl.cpp
-        src/archivers/dms/pfile.cpp
-        src/archivers/dms/tables.cpp
-        src/archivers/dms/u_deep.cpp
-        src/archivers/dms/u_heavy.cpp
-        src/archivers/dms/u_init.cpp
-        src/archivers/dms/u_medium.cpp
-        src/archivers/dms/u_quick.cpp
-        src/archivers/dms/u_rle.cpp
-        src/archivers/lha/crcio.cpp
-        src/archivers/lha/dhuf.cpp
-        src/archivers/lha/header.cpp
-        src/archivers/lha/huf.cpp
-        src/archivers/lha/larc.cpp
-        src/archivers/lha/lhamaketbl.cpp
-        src/archivers/lha/lharc.cpp
-        src/archivers/lha/shuf.cpp
-        src/archivers/lha/shuf.cpp
-        src/archivers/lha/slide.cpp
-        src/archivers/lha/uae_lha.cpp
-        src/archivers/lha/util.cpp
-        src/archivers/lzx/unlzx.cpp
-        src/archivers/mp2/kjmp2.cpp
-        src/archivers/wrp/warp.cpp
-        src/archivers/zip/unzip.cpp
-        src/caps/caps_amiberry.cpp
-        src/dsp3210/dsp_glue.cpp
-        src/dsp3210/DSP3210_emulation.cpp
-        src/machdep/support.cpp
-        src/mame/a2410.cpp
-        src/mame/tm34010/tms34010.cpp
-        external/floppybridge/src/floppybridge_lib.cpp
-        src/osdep/ahi_v1.cpp
-        src/osdep/bsdsocket_host.cpp
-        src/osdep/cda_play.cpp
-        src/osdep/charset.cpp
-        src/osdep/fsdb_host.cpp
-        src/osdep/clipboard.cpp
-        src/osdep/amiberry_hardfile.cpp
-        src/osdep/keyboard.cpp
-        src/osdep/midi.cpp
-        src/osdep/mp3decoder.cpp
-        src/osdep/picasso96.cpp
-        src/osdep/writelog.cpp
-        src/osdep/amiberry.cpp
-        src/osdep/ahi_v2.cpp
-        src/osdep/amiberry_dbus.cpp
-        src/osdep/amiberry_filesys.cpp
-        src/osdep/amiberry_input.cpp
-        src/osdep/amiberry_gfx.cpp
-        src/osdep/amiberry_gui.cpp
-        src/osdep/amiberry_mem.cpp
-        src/osdep/amiberry_serial.cpp
-        src/osdep/amiberry_uaenet.cpp
-        src/osdep/amiberry_whdbooter.cpp
-        src/osdep/ioport.cpp
-        src/osdep/sigsegv_handler.cpp
-        src/osdep/socket.cpp
-        src/osdep/retroarch.cpp
-        src/osdep/vpar.cpp
-        src/pcem/386.cpp
-        src/pcem/386_common.cpp
-        src/pcem/386_dynarec.cpp
-        src/pcem/808x.cpp
-        src/pcem/cpu.cpp
-        src/pcem/dosbox/dbopl.cpp
-        src/pcem/dma.cpp
-        src/pcem/keyboard.cpp
-        src/pcem/keyboard_at.cpp
-        src/pcem/keyboard_at_draco.cpp
-        src/pcem/mem.cpp
-        src/pcem/mouse_ps2.cpp
-        src/pcem/mouse_serial.cpp
-        src/pcem/dosbox/nukedopl.cpp
-        src/pcem/nvr.cpp
-        src/pcem/pcemglue.cpp
-        src/pcem/pcemrtc.cpp
-        src/pcem/pic.cpp
-        src/pcem/pit.cpp
-        src/pcem/serial.cpp
-        src/pcem/sound_cms.cpp
-        src/pcem/sound_dbopl.cpp
-        src/pcem/sound_mpu401_uart.cpp
-        src/pcem/sound_opl.cpp
-        src/pcem/sound_sb.cpp
-        src/pcem/sound_sb_dsp.cpp
-        src/pcem/sound_speaker.cpp
-        src/pcem/timer.cpp
-        src/pcem/vid_bt482_ramdac.cpp
-        src/pcem/vid_cl5429.cpp
-        src/pcem/vid_et4000.cpp
-        src/pcem/vid_et4000w32.cpp
-        src/pcem/vid_inmos.cpp
-        src/pcem/vid_ncr.cpp
-        src/pcem/vid_permedia2.cpp
-        src/pcem/vid_s3.cpp
-        src/pcem/vid_s3_virge.cpp
-        src/pcem/vid_sc1502x_ramdac.cpp
-        src/pcem/vid_sdac_ramdac.cpp
-        src/pcem/vid_svga.cpp
-        src/pcem/vid_svga_render.cpp
-        src/pcem/vid_voodoo.cpp
-        src/pcem/vid_voodoo_banshee.cpp
-        src/pcem/vid_voodoo_banshee_blitter.cpp
-        src/pcem/vid_voodoo_blitter.cpp
-        src/pcem/vid_voodoo_display.cpp
-        src/pcem/vid_voodoo_fb.cpp
-        src/pcem/vid_voodoo_fifo.cpp
-        src/pcem/vid_voodoo_reg.cpp
-        src/pcem/vid_voodoo_render.cpp
-        src/pcem/vid_voodoo_setup.cpp
-        src/pcem/vid_voodoo_texture.cpp
-        src/pcem/x86seg.cpp
-        src/pcem/x87.cpp
-        src/pcem/x87_timings.cpp
-        src/ppc/ppc.cpp
-        src/ppc/ppcd.cpp
-        src/qemuvga/cirrus_vga.cpp
-        src/qemuvga/es1370.cpp
-        src/qemuvga/esp.cpp
-        src/qemuvga/lsi53c710.cpp
-        src/qemuvga/lsi53c895a.cpp
-        src/qemuvga/ne2000.cpp
-        src/qemuvga/qemu.cpp
-        src/qemuvga/qemuuaeglue.cpp
-        src/qemuvga/vga.cpp
-        src/sounddep/sound.cpp
-        src/threaddep/threading.cpp
-        src/osdep/gui/ControllerMap.cpp
-        src/osdep/gui/CreateFolder.cpp
-        src/osdep/gui/SelectorEntry.cpp
-        src/osdep/gui/ShowCustomFields.cpp
-        src/osdep/gui/ShowHelp.cpp
-        src/osdep/gui/ShowMessage.cpp
-        src/osdep/gui/ShowDiskInfo.cpp
-        src/osdep/gui/SelectFolder.cpp
-        src/osdep/gui/SelectFile.cpp
-        src/osdep/gui/CreateFilesysHardfile.cpp
-        src/osdep/gui/EditFilesysVirtual.cpp
-        src/osdep/gui/EditFilesysHardfile.cpp
-        src/osdep/gui/EditFilesysHardDrive.cpp
-        src/osdep/gui/EditTapeDrive.cpp
-        src/osdep/gui/PanelAbout.cpp
-        src/osdep/gui/PanelPaths.cpp
-        src/osdep/gui/PanelQuickstart.cpp
-        src/osdep/gui/PanelConfig.cpp
-        src/osdep/gui/PanelCPU.cpp
-        src/osdep/gui/PanelChipset.cpp
-        src/osdep/gui/PanelCustom.cpp
-        src/osdep/gui/PanelROM.cpp
-        src/osdep/gui/PanelRAM.cpp
-        src/osdep/gui/PanelFloppy.cpp
-        src/osdep/gui/PanelExpansions.cpp
-        src/osdep/gui/PanelHD.cpp
-        src/osdep/gui/PanelRTG.cpp
-        src/osdep/gui/PanelHWInfo.cpp
-        src/osdep/gui/PanelInput.cpp
-        src/osdep/gui/PanelIOPorts.cpp
-        src/osdep/gui/PanelDisplay.cpp
-        src/osdep/gui/PanelSound.cpp
-        src/osdep/gui/PanelDiskSwapper.cpp
-        src/osdep/gui/PanelMisc.cpp
-        src/osdep/gui/PanelPrio.cpp
-        src/osdep/gui/PanelSavestate.cpp
-        src/osdep/gui/PanelVirtualKeyboard.cpp
-        src/osdep/gui/PanelWHDLoad.cpp
-        src/osdep/gui/main_window.cpp
-        src/osdep/gui/Navigation.cpp
-        src/osdep/vkbd/vkbd.cpp
-        src/newcpu.cpp
-        src/newcpu_common.cpp
-        src/readcpu.cpp
-        src/cpudefs.cpp
-        src/cpustbl.cpp
-        src/cpummu.cpp
-        src/cpummu30.cpp
-        src/cpuemu_0.cpp
-        src/cpuemu_11.cpp
-        src/cpuemu_13.cpp
-        src/cpuemu_20.cpp
-        src/cpuemu_21.cpp
-        src/cpuemu_22.cpp
-        src/cpuemu_23.cpp
-        src/cpuemu_24.cpp
-        src/cpuemu_31.cpp
-        src/cpuemu_32.cpp
-        src/cpuemu_33.cpp
-        src/cpuemu_34.cpp
-        src/cpuemu_35.cpp
-        src/cpuemu_40.cpp
-        src/cpuemu_50.cpp
-        src/jit/compemu.cpp
-        src/jit/compstbl.cpp
-        src/jit/compemu_fpp.cpp
-        src/jit/compemu_support.cpp
+# Define the list of source files
+set(SOURCE_FILES
+    src/a2065.cpp
+    src/a2091.cpp
+    src/akiko.cpp
+    src/amax.cpp
+    src/ar.cpp
+    src/arcadia.cpp
+    src/audio.cpp
+    src/autoconf.cpp
+    src/blitfunc.cpp
+    src/blittable.cpp
+    src/blitter.cpp
+    src/blkdev.cpp
+    src/blkdev_cdimage.cpp
+    src/bsdsocket.cpp
+    src/calc.cpp
+    src/catweasel.cpp
+    src/cd32_fmv.cpp
+    src/cd32_fmv_genlock.cpp
+    src/cdrom.cpp
+    src/cdtv.cpp
+    src/cdtvcr.cpp
+    src/cfgfile.cpp
+    src/cia.cpp
+    src/consolehook.cpp
+    src/cpuboard.cpp
+    src/crc32.cpp
+    src/custom.cpp
+    src/debug.cpp
+    src/debugmem.cpp
+    src/def_icons.cpp
+    src/devices.cpp
+    src/disasm.cpp
+    src/disk.cpp
+    src/diskutil.cpp
+    src/dlopen.cpp
+    src/dongle.cpp
+    src/draco.cpp
+    src/drawing.cpp
+    src/driveclick.cpp
+    src/enforcer.cpp
+    src/ethernet.cpp
+    src/events.cpp
+    src/expansion.cpp
+    src/fdi2raw.cpp
+    src/filesys.cpp
+    src/flashrom.cpp
+    src/fpp.cpp
+    src/fpp_native.cpp
+    src/framebufferboards.cpp
+    src/fsdb.cpp
+    src/fsusage.cpp
+    src/gayle.cpp
+    src/gfxboard.cpp
+    src/gfxlib.cpp
+    src/gfxutil.cpp
+    src/hardfile.cpp
+    src/hrtmon.rom.cpp
+    src/ide.cpp
+    src/idecontrollers.cpp
+    src/identify.cpp
+    src/ini.cpp
+    src/inputdevice.cpp
+    src/inputrecord.cpp
+    src/isofs.cpp
+    src/keybuf.cpp
+    src/luascript.cpp
+    src/main.cpp
+    src/memory.cpp
+    src/midiemu.cpp
+    src/native2amiga.cpp
+    src/ncr9x_scsi.cpp
+    src/ncr_scsi.cpp
+    src/parser.cpp
+    src/pci.cpp
+    src/rommgr.cpp
+    src/rtc.cpp
+    src/sampler.cpp
+    src/sana2.cpp
+    src/savestate.cpp
+    src/scp.cpp
+    src/scsi.cpp
+    src/scsiemul.cpp
+    src/scsitape.cpp
+    src/slirp_uae.cpp
+    src/sndboard.cpp
+    src/specialmonitors.cpp
+    src/statusline.cpp
+    src/tabletlibrary.cpp
+    src/test_card.cpp
+    src/tinyxml2.cpp
+    src/traps.cpp
+    src/uaeexe.cpp
+    src/uaelib.cpp
+    src/uaenative.cpp
+    src/uaeresource.cpp
+    src/uaeserial.cpp
+    src/vm.cpp
+    src/x86.cpp
+    src/zfile.cpp
+    src/zfile_archive.cpp
+    src/archivers/7z/7zAlloc.c
+    src/archivers/7z/7zArcIn.c
+    src/archivers/7z/7zBuf.c
+    src/archivers/7z/7zBuf2.c
+    src/archivers/7z/7zCrc.c
+    src/archivers/7z/7zCrcOpt.c
+    src/archivers/7z/7zDec.c
+    src/archivers/7z/7zFile.c
+    src/archivers/7z/7zStream.c
+    src/archivers/7z/Aes.c
+    src/archivers/7z/AesOpt.c
+    src/archivers/7z/Alloc.c
+    src/archivers/7z/Bcj2.c
+    src/archivers/7z/Bra.c
+    src/archivers/7z/Bra86.c
+    src/archivers/7z/BraIA64.c
+    src/archivers/7z/CpuArch.c
+    src/archivers/7z/Delta.c
+    src/archivers/7z/LzFind.c
+    src/archivers/7z/Lzma2Dec.c
+    src/archivers/7z/Lzma2Enc.c
+    src/archivers/7z/Lzma86Dec.c
+    src/archivers/7z/Lzma86Enc.c
+    src/archivers/7z/LzmaDec.c
+    src/archivers/7z/LzmaEnc.c
+    src/archivers/7z/LzmaLib.c
+    src/archivers/7z/Ppmd7.c
+    src/archivers/7z/Ppmd7Dec.c
+    src/archivers/7z/Ppmd7Enc.c
+    src/archivers/7z/Sha256.c
+    src/archivers/7z/Sort.c
+    src/archivers/7z/Xz.c
+    src/archivers/7z/XzCrc64.c
+    src/archivers/7z/XzCrc64Opt.c
+    src/archivers/7z/XzDec.c
+    src/archivers/7z/XzEnc.c
+    src/archivers/7z/XzIn.c
+    src/archivers/chd/avhuff.cpp
+    src/archivers/chd/bitmap.cpp
+    src/archivers/chd/cdrom.cpp
+    src/archivers/chd/chd.cpp
+    src/archivers/chd/chdcd.cpp
+    src/archivers/chd/chdcodec.cpp
+    src/archivers/chd/corealloc.cpp
+    src/archivers/chd/corefile.cpp
+    src/archivers/chd/corestr.cpp
+    src/archivers/chd/flac.cpp
+    src/archivers/chd/harddisk.cpp
+    src/archivers/chd/hashing.cpp
+    src/archivers/chd/huffman.cpp
+    src/archivers/chd/md5.cpp
+    src/archivers/chd/osdcore.cpp
+    src/archivers/chd/osdlib_unix.cpp
+    src/archivers/chd/osdsync.cpp
+    src/archivers/chd/palette.cpp
+    src/archivers/chd/posixdir.cpp
+    src/archivers/chd/posixfile.cpp
+    src/archivers/chd/posixptty.cpp
+    src/archivers/chd/posixsocket.cpp
+    src/archivers/chd/strconv.cpp
+    src/archivers/chd/strformat.cpp
+    src/archivers/chd/unicode.cpp
+    src/archivers/chd/vecstream.cpp
+    src/archivers/chd/utf8proc.c
+    src/archivers/dms/crc_csum.cpp
+    src/archivers/dms/getbits.cpp
+    src/archivers/dms/maketbl.cpp
+    src/archivers/dms/pfile.cpp
+    src/archivers/dms/tables.cpp
+    src/archivers/dms/u_deep.cpp
+    src/archivers/dms/u_heavy.cpp
+    src/archivers/dms/u_init.cpp
+    src/archivers/dms/u_medium.cpp
+    src/archivers/dms/u_quick.cpp
+    src/archivers/dms/u_rle.cpp
+    src/archivers/lha/crcio.cpp
+    src/archivers/lha/dhuf.cpp
+    src/archivers/lha/header.cpp
+    src/archivers/lha/huf.cpp
+    src/archivers/lha/larc.cpp
+    src/archivers/lha/lhamaketbl.cpp
+    src/archivers/lha/lharc.cpp
+    src/archivers/lha/shuf.cpp
+    src/archivers/lha/shuf.cpp
+    src/archivers/lha/slide.cpp
+    src/archivers/lha/uae_lha.cpp
+    src/archivers/lha/util.cpp
+    src/archivers/lzx/unlzx.cpp
+    src/archivers/mp2/kjmp2.cpp
+    src/archivers/wrp/warp.cpp
+    src/archivers/zip/unzip.cpp
+    src/caps/caps_amiberry.cpp
+    src/dsp3210/dsp_glue.cpp
+    src/dsp3210/DSP3210_emulation.cpp
+    src/machdep/support.cpp
+    src/mame/a2410.cpp
+    src/mame/tm34010/tms34010.cpp
+    external/floppybridge/src/floppybridge_lib.cpp
+    src/osdep/ahi_v1.cpp
+    src/osdep/bsdsocket_host.cpp
+    src/osdep/cda_play.cpp
+    src/osdep/charset.cpp
+    src/osdep/fsdb_host.cpp
+    src/osdep/clipboard.cpp
+    src/osdep/amiberry_hardfile.cpp
+    src/osdep/keyboard.cpp
+    src/osdep/midi.cpp
+    src/osdep/mp3decoder.cpp
+    src/osdep/picasso96.cpp
+    src/osdep/writelog.cpp
+    src/osdep/amiberry.cpp
+    src/osdep/ahi_v2.cpp
+    src/osdep/amiberry_dbus.cpp
+    src/osdep/amiberry_filesys.cpp
+    src/osdep/amiberry_input.cpp
+    src/osdep/amiberry_gfx.cpp
+    src/osdep/amiberry_gui.cpp
+    src/osdep/amiberry_mem.cpp
+    src/osdep/amiberry_serial.cpp
+    src/osdep/amiberry_uaenet.cpp
+    src/osdep/amiberry_whdbooter.cpp
+    src/osdep/ioport.cpp
+    src/osdep/sigsegv_handler.cpp
+    src/osdep/socket.cpp
+    src/osdep/retroarch.cpp
+    src/osdep/vpar.cpp
+    src/pcem/386.cpp
+    src/pcem/386_common.cpp
+    src/pcem/386_dynarec.cpp
+    src/pcem/808x.cpp
+    src/pcem/cpu.cpp
+    src/pcem/dosbox/dbopl.cpp
+    src/pcem/dma.cpp
+    src/pcem/keyboard.cpp
+    src/pcem/keyboard_at.cpp
+    src/pcem/keyboard_at_draco.cpp
+    src/pcem/mem.cpp
+    src/pcem/mouse_ps2.cpp
+    src/pcem/mouse_serial.cpp
+    src/pcem/dosbox/nukedopl.cpp
+    src/pcem/nvr.cpp
+    src/pcem/pcemglue.cpp
+    src/pcem/pcemrtc.cpp
+    src/pcem/pic.cpp
+    src/pcem/pit.cpp
+    src/pcem/serial.cpp
+    src/pcem/sound_cms.cpp
+    src/pcem/sound_dbopl.cpp
+    src/pcem/sound_mpu401_uart.cpp
+    src/pcem/sound_opl.cpp
+    src/pcem/sound_sb.cpp
+    src/pcem/sound_sb_dsp.cpp
+    src/pcem/sound_speaker.cpp
+    src/pcem/timer.cpp
+    src/pcem/vid_bt482_ramdac.cpp
+    src/pcem/vid_cl5429.cpp
+    src/pcem/vid_et4000.cpp
+    src/pcem/vid_et4000w32.cpp
+    src/pcem/vid_inmos.cpp
+    src/pcem/vid_ncr.cpp
+    src/pcem/vid_permedia2.cpp
+    src/pcem/vid_s3.cpp
+    src/pcem/vid_s3_virge.cpp
+    src/pcem/vid_sc1502x_ramdac.cpp
+    src/pcem/vid_sdac_ramdac.cpp
+    src/pcem/vid_svga.cpp
+    src/pcem/vid_svga_render.cpp
+    src/pcem/vid_voodoo.cpp
+    src/pcem/vid_voodoo_banshee.cpp
+    src/pcem/vid_voodoo_banshee_blitter.cpp
+    src/pcem/vid_voodoo_blitter.cpp
+    src/pcem/vid_voodoo_display.cpp
+    src/pcem/vid_voodoo_fb.cpp
+    src/pcem/vid_voodoo_fifo.cpp
+    src/pcem/vid_voodoo_reg.cpp
+    src/pcem/vid_voodoo_render.cpp
+    src/pcem/vid_voodoo_setup.cpp
+    src/pcem/vid_voodoo_texture.cpp
+    src/pcem/x86seg.cpp
+    src/pcem/x87.cpp
+    src/pcem/x87_timings.cpp
+    src/ppc/ppc.cpp
+    src/ppc/ppcd.cpp
+    src/qemuvga/cirrus_vga.cpp
+    src/qemuvga/es1370.cpp
+    src/qemuvga/esp.cpp
+    src/qemuvga/lsi53c710.cpp
+    src/qemuvga/lsi53c895a.cpp
+    src/qemuvga/ne2000.cpp
+    src/qemuvga/qemu.cpp
+    src/qemuvga/qemuuaeglue.cpp
+    src/qemuvga/vga.cpp
+    src/sounddep/sound.cpp
+    src/threaddep/threading.cpp
+    src/osdep/gui/ControllerMap.cpp
+    src/osdep/gui/CreateFolder.cpp
+    src/osdep/gui/SelectorEntry.cpp
+    src/osdep/gui/ShowCustomFields.cpp
+    src/osdep/gui/ShowHelp.cpp
+    src/osdep/gui/ShowMessage.cpp
+    src/osdep/gui/ShowDiskInfo.cpp
+    src/osdep/gui/SelectFolder.cpp
+    src/osdep/gui/SelectFile.cpp
+    src/osdep/gui/CreateFilesysHardfile.cpp
+    src/osdep/gui/EditFilesysVirtual.cpp
+    src/osdep/gui/EditFilesysHardfile.cpp
+    src/osdep/gui/EditFilesysHardDrive.cpp
+    src/osdep/gui/EditTapeDrive.cpp
+    src/osdep/gui/PanelAbout.cpp
+    src/osdep/gui/PanelPaths.cpp
+    src/osdep/gui/PanelQuickstart.cpp
+    src/osdep/gui/PanelConfig.cpp
+    src/osdep/gui/PanelCPU.cpp
+    src/osdep/gui/PanelChipset.cpp
+    src/osdep/gui/PanelCustom.cpp
+    src/osdep/gui/PanelROM.cpp
+    src/osdep/gui/PanelRAM.cpp
+    src/osdep/gui/PanelFloppy.cpp
+    src/osdep/gui/PanelExpansions.cpp
+    src/osdep/gui/PanelHD.cpp
+    src/osdep/gui/PanelRTG.cpp
+    src/osdep/gui/PanelHWInfo.cpp
+    src/osdep/gui/PanelInput.cpp
+    src/osdep/gui/PanelIOPorts.cpp
+    src/osdep/gui/PanelDisplay.cpp
+    src/osdep/gui/PanelSound.cpp
+    src/osdep/gui/PanelDiskSwapper.cpp
+    src/osdep/gui/PanelMisc.cpp
+    src/osdep/gui/PanelPrio.cpp
+    src/osdep/gui/PanelSavestate.cpp
+    src/osdep/gui/PanelVirtualKeyboard.cpp
+    src/osdep/gui/PanelWHDLoad.cpp
+    src/osdep/gui/main_window.cpp
+    src/osdep/gui/Navigation.cpp
+    src/osdep/vkbd/vkbd.cpp
+    src/newcpu.cpp
+    src/newcpu_common.cpp
+    src/readcpu.cpp
+    src/cpudefs.cpp
+    src/cpustbl.cpp
+    src/cpummu.cpp
+    src/cpummu30.cpp
+    src/cpuemu_0.cpp
+    src/cpuemu_11.cpp
+    src/cpuemu_13.cpp
+    src/cpuemu_20.cpp
+    src/cpuemu_21.cpp
+    src/cpuemu_22.cpp
+    src/cpuemu_23.cpp
+    src/cpuemu_24.cpp
+    src/cpuemu_31.cpp
+    src/cpuemu_32.cpp
+    src/cpuemu_33.cpp
+    src/cpuemu_34.cpp
+    src/cpuemu_35.cpp
+    src/cpuemu_40.cpp
+    src/cpuemu_50.cpp
+    src/jit/compemu.cpp
+    src/jit/compstbl.cpp
+    src/jit/compemu_fpp.cpp
+    src/jit/compemu_support.cpp
 )
 
-target_compile_options(${PROJECT_NAME} PRIVATE -fno-pie)
+if (APPLE)
+    add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${SOURCE_FILES})
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist
+    )
+else ()
+    add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+endif()
+
 target_compile_definitions(${PROJECT_NAME} PRIVATE _FILE_OFFSET_BITS=64)
 
 if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
@@ -453,10 +463,7 @@ add_subdirectory(external/libguisan)
 add_dependencies(${PROJECT_NAME} mt32emu floppybridge capsimage guisan)
 
 target_include_directories(${PROJECT_NAME} PRIVATE src src/osdep src/include src/threaddep src/archivers src/ppc/pearpc external/libguisan/include external/mt32emu/src external/floppybridge/src)
-target_link_libraries(${PROJECT_NAME} PRIVATE SDL2 SDL2_image SDL2_ttf guisan mt32emu ${DBUS_LIBRARIES} FLAC portmidi png mpg123 mpeg2convert mpeg2 serialport z)
-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-    target_link_options(${PROJECT_NAME} PRIVATE "LINKER:-as-needed,-no-pie")
-endif ()
+target_link_libraries(${PROJECT_NAME} PRIVATE SDL2 SDL2_image SDL2_ttf guisan mt32emu ${DBUS_LIBRARIES} FLAC portmidi png MPG123::libmpg123 mpeg2convert mpeg2 serialport z pthread dl)
 
 if (USE_OPENGL)
     target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OPENGL)
@@ -518,58 +525,93 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         DEPENDS external/capsimage)
 
 # Install the executable
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+if (APPLE)
+    install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION .)
+else ()
+    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+    # Install additional directories
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/cdroms
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/controllers
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/data
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/floppies
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/harddrives
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/inputrecordings
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/kickstarts
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/lha
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/nvram
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/savestates
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/screenshots
+        DESTINATION share/${PROJECT_NAME}
+    )
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/whdboot
+        DESTINATION share/${PROJECT_NAME}
+    )
 
-# Install additional directories
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/cdroms
-    DESTINATION share/${PROJECT_NAME}/cdroms
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf
-    DESTINATION share/${PROJECT_NAME}/conf
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/controllers
-    DESTINATION share/${PROJECT_NAME}/controllers
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/data
-    DESTINATION share/${PROJECT_NAME}/data
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/floppies
-    DESTINATION share/${PROJECT_NAME}/floppies
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/harddrives
-    DESTINATION share/${PROJECT_NAME}/harddrives
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/inputrecordings
-    DESTINATION share/${PROJECT_NAME}/inputrecordings
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/kickstarts
-    DESTINATION share/${PROJECT_NAME}/kickstarts
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/lha
-    DESTINATION share/${PROJECT_NAME}/lha
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/nvram
-    DESTINATION share/${PROJECT_NAME}/nvram
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins
-    DESTINATION share/${PROJECT_NAME}/plugins
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/savestates
-    DESTINATION share/${PROJECT_NAME}/savestates
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/screenshots
-    DESTINATION share/${PROJECT_NAME}/screenshots
-)
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/whdboot
-    DESTINATION share/${PROJECT_NAME}/whdboot
-)
+    # Install shared libraries
+    install(FILES ${CMAKE_BINARY_DIR}/external/floppybridge/libfloppybridge.so
+        DESTINATION share/${PROJECT_NAME}/plugins
+    )
+    install(FILES ${CMAKE_BINARY_DIR}/external/capsimage/libcapsimage.so
+        DESTINATION share/${PROJECT_NAME}/plugins
+    )
 
-# Install shared libraries
-install(FILES ${CMAKE_BINARY_DIR}/external/floppybridge/libfloppybridge.so
-    DESTINATION share/${PROJECT_NAME}/plugins
-)
-install(FILES ${CMAKE_BINARY_DIR}/external/capsimage/libcapsimage.so
-    DESTINATION share/${PROJECT_NAME}/plugins
-)
+    # Install desktop file
+    install(FILES ${CMAKE_SOURCE_DIR}/data/Amiberry.desktop
+        DESTINATION share/applications
+    )
+endif ()
+
+include(InstallRequiredSystemLibraries)
+
+if(APPLE)
+    set(CPACK_GENERATOR "Bundle")
+    set(CPACK_BUNDLE_NAME "Amiberry")
+    set(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/Info.plist)
+    set(CPACK_BUNDLE_APPLE_ENTITLEMENTS ${CMAKE_SOURCE_DIR}/Entitlements.plist)
+    set(CPACK_BUNDLE_ICON ${CMAKE_SOURCE_DIR}/data/amiberry.png)
+else()
+    set(CPACK_GENERATOR "DEB")
+    set(CPACK_SOURCE_IGNORE_FILES .git/ .github/ .vscode/ _CPack_Packages/)
+    SET(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
+    SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+    SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+    SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+    SET(CPACK_PACKAGE_VENDOR "BlitterStudio")
+    SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+    SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/docs/README.md")
+    SET(CPACK_DEBIAN_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
+    set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://amiberry.com")
+    set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Dimitris Panokostas <midwan@gmail.com>") # Required
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.27), libstdc++6 (>= 8.3.0), libsdl2-2.0-0, libsdl2-image-2.0-0, libsdl2-ttf-2.0-0, flac, libmpg123-0, libpng16-16, zlib1g, libserialport0, libportmidi0, libmpeg2-4") # Adjust dependencies as needed
+    set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Amiberry is an optimized Amiga emulator various platforms.")
+    set(CPACK_DEBIAN_PACKAGE_SECTION "games")
+    set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")
+endif()
 
 include(CPack)
diff --git a/cmake/Findmpg123.cmake b/cmake/Findmpg123.cmake
index 046f3f58f..ff3d19ee0 100644
--- a/cmake/Findmpg123.cmake
+++ b/cmake/Findmpg123.cmake
@@ -1,31 +1,58 @@
-# - Find mpg123
-# Find the native mpg123 includes and libraries
-#
-#  MPG123_INCLUDE_DIRS - where to find mpg123.h, etc.
-#  MPG123_LIBRARIES    - List of libraries when using mpg123.
-#  MPG123_FOUND        - True if Mpg123 found.
-
-if (MPG123_INCLUDE_DIR)
+#[=======================================================================[.rst:
+Findmpg123
+-------
+
+Finds the mpg123 library.
+
+Imported Targets
+^^^^^^^^^^^^^^^^
+
+This module provides the following imported targets, if found:
+
+``MPG123::libmpg123``
+  The mpg123 library
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This will define the following variables:
+
+``mpg123_FOUND``
+  True if the system has the mpg123 package.
+``mpg123_VERSION``
+	The version of mpg123 that was found on the system.
+
+Cache Variables
+^^^^^^^^^^^^^^^
+
+The following cache variables may also be set:
+
+``mpg123_INCLUDE_DIR``
+  The directory containing ``mpg123.h``.
+``mpg123_LIBRARY``
+  The path to the mpg123 library.
+
+#]=======================================================================]
+
+if (mpg123_INCLUDE_DIR)
     # Already in cache, be silent
-    set(MPG123_FIND_QUIETLY TRUE)
+    set(mpg123_FIND_QUIETLY TRUE)
 endif ()
 
 find_package (PkgConfig QUIET)
 pkg_check_modules(PC_MPG123 QUIET libmpg123>=1.25.10)
 
-set (MPG123_VERSION ${PC_MPG123_VERSION})
-
-find_path (MPG123_INCLUDE_DIR mpg123.h
+find_path (mpg123_INCLUDE_DIR mpg123.h
 	HINTS
 		${PC_MPG123_INCLUDEDIR}
 		${PC_MPG123_INCLUDE_DIRS}
-		${MPG123_ROOT}
+		${mpg123_ROOT}
 	)
 
 # MSVC built mpg123 may be named mpg123_static.
 # The provided project files name the library with the lib prefix.
 
-find_library (MPG123_LIBRARY
+find_library (mpg123_LIBRARY
 	NAMES
 		mpg123
 		mpg123_static
@@ -34,31 +61,35 @@ find_library (MPG123_LIBRARY
 	HINTS
 		${PC_MPG123_LIBDIR}
 		${PC_MPG123_LIBRARY_DIRS}
-		${MPG123_ROOT}
+		${mpg123_ROOT}
 	)
 
-# Handle the QUIETLY and REQUIRED arguments and set MPG123_FOUND
+if (PC_MPG123_FOUND)
+	set (mpg123_VERSION ${PC_MPG123_VERSION})
+elseif (mpg123_INCLUDE_DIR)
+	file (READ "${mpg123_INCLUDE_DIR}/mpg123.h" _mpg123_h)
+	string (REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" _mpg123_version_re "${_mpg123_h}")
+	set (mpg123_VERSION "${_mpg123_version_re}")
+endif ()
+
+# Handle the QUIETLY and REQUIRED arguments and set mpg123_FOUND
 # to TRUE if all listed variables are TRUE.
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args (mpg123
 	REQUIRED_VARS
-		MPG123_LIBRARY
-		MPG123_INCLUDE_DIR
+		mpg123_LIBRARY
+		mpg123_INCLUDE_DIR
 	VERSION_VAR
-		MPG123_VERSION
+		mpg123_VERSION
 	)
 
-if (MPG123_FOUND)
-	set (MPG123_LIBRARIES ${MPG123_LIBRARY})
-	set (MPG123_INCLUDE_DIRS ${MPG123_INCLUDE_DIR})
-
-	if (NOT TARGET MPG123::libmpg123)
-		add_library (MPG123::libmpg123 UNKNOWN IMPORTED)
-		set_target_properties (MPG123::libmpg123 PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${MPG123_INCLUDE_DIRS}"
-			IMPORTED_LOCATION "${MPG123_LIBRARIES}"
+if (mpg123_FOUND AND NOT TARGET MPG123::libmpg123)
+	add_library (MPG123::libmpg123 UNKNOWN IMPORTED)
+	set_target_properties (MPG123::libmpg123
+		PROPERTIES 
+			IMPORTED_LOCATION "${mpg123_LIBRARY}"
+			INTERFACE_INCLUDE_DIRECTORIES "${mpg123_INCLUDE_DIR}"
 		)
-	endif ()
 endif ()
 
-mark_as_advanced(MPG123_INCLUDE_DIR MPG123_LIBRARY)
\ No newline at end of file
+mark_as_advanced(mpg123_INCLUDE_DIR mpg123_LIBRARY)
\ No newline at end of file
diff --git a/cmake/Toolchain-aarch64-linux-gnu.cmake b/cmake/Toolchain-aarch64-linux-gnu.cmake
index a39cb0783..dbcc4697c 100644
--- a/cmake/Toolchain-aarch64-linux-gnu.cmake
+++ b/cmake/Toolchain-aarch64-linux-gnu.cmake
@@ -1,6 +1,6 @@
 set(CMAKE_SYSTEM_NAME Linux)
-SET(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
-SET(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
+set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
+set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(CMAKE_CROSSCOMPILING TRUE)
-
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE arm64)
\ No newline at end of file
diff --git a/cmake/Toolchain-arm-linux-gnueabihf.cmake b/cmake/Toolchain-arm-linux-gnueabihf.cmake
index 9884a17e4..9e57c2d79 100644
--- a/cmake/Toolchain-arm-linux-gnueabihf.cmake
+++ b/cmake/Toolchain-arm-linux-gnueabihf.cmake
@@ -1,6 +1,6 @@
 set(CMAKE_SYSTEM_NAME Linux)
-SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
-SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
+set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
+set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
 set(CMAKE_SYSTEM_PROCESSOR arm)
 set(CMAKE_CROSSCOMPILING TRUE)
-
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE armhf)
\ No newline at end of file
diff --git a/data/Amiberry.desktop b/data/Amiberry.desktop
new file mode 100644
index 000000000..5bfab694a
--- /dev/null
+++ b/data/Amiberry.desktop
@@ -0,0 +1,28 @@
+[Desktop Entry]
+
+# The type of the Desktop Entry, usually Application
+Type = Application
+
+# The version of the Desktop Entry specification to which this file complies
+Version = 1.0
+
+# The name of the application
+Name = Amiberry
+
+# A comment which can/will be used as a tooltip
+Comment = Amiga Emulator
+
+# The executable of the application, possibly with arguments
+Exec = /usr/bin/amiberry
+
+# The name of the icon that will be used to display this entry
+Icon = /usr/share/amiberry/data/amiberry.png
+
+# Describes whether this application needs to be run in a terminal or not
+Terminal = false
+
+# Describes the categories in which this entry should be shown
+Categories = Game;Emulator;
+
+# Describes the encoding for the desktop entry
+Encoding=UTF-8
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 3a41827c9..000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-amiberry (6.3.5-1) UNRELEASED; urgency=low
-
-  * Initial release. (Closes: #XXXXXX)
-
- -- Dimitris Panokostas <midwan@gmail.com>  Wed, 11 Sep 2024 18:53:49 +0200
diff --git a/debian/control b/debian/control
deleted file mode 100644
index aea589a74..000000000
--- a/debian/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: amiberry
-Maintainer: Dimitris Panokostas <midwan@gmail.com>
-Section: games
-Priority: optional
-Standards-Version: 4.6.2
-Build-Depends: debhelper-compat (= 13)
-
-Package: amiberry
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: An optimized Amiga emulator
-  Amiberry is an optimized multi-platform Amiga emulator
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index ff3d2429c..000000000
--- a/debian/copyright
+++ /dev/null
@@ -1,7 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Amiberry
-Upstream-Contact: Dimitris Panokostas <midwan@gmail.com>
-Source: https://github.com/BlitterStudio/amiberry
-
-Files: *
-License: GPL-3
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
deleted file mode 100644
index 933b1da34..000000000
--- a/debian/rules
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@
\ No newline at end of file
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/external/capsimage/CMakeLists.txt b/external/capsimage/CMakeLists.txt
index 730649844..378658b2b 100644
--- a/external/capsimage/CMakeLists.txt
+++ b/external/capsimage/CMakeLists.txt
@@ -71,9 +71,9 @@ install(TARGETS ${PROJECT_NAME}
   FRAMEWORK DESTINATION "/Library/Frameworks"
   PUBLIC_HEADER DESTINATION include/caps${INCLUDE_SUFFIX})
 
-if (NOT APPLE OR NOT BUILD_FRAMEWORK)
-  install(FILES ${API_HEADERS} DESTINATION include/caps${INCLUDE_SUFFIX})
-endif()
+#if (NOT APPLE OR NOT BUILD_FRAMEWORK)
+#  install(FILES ${API_HEADERS} DESTINATION include/caps${INCLUDE_SUFFIX})
+#endif()
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT BUILD_FRAMEWORK)
     message(STATUS "macOS platform detected")
diff --git a/external/libguisan/CMakeLists.txt b/external/libguisan/CMakeLists.txt
index 47aa37380..9e4ddc924 100644
--- a/external/libguisan/CMakeLists.txt
+++ b/external/libguisan/CMakeLists.txt
@@ -58,8 +58,3 @@ add_library(guisan STATIC
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_link_libraries(${PROJECT_NAME} SDL2 SDL2_ttf SDL2_image)
 
-install(TARGETS ${PROJECT_NAME}
-  ARCHIVE DESTINATION lib
-  LIBRARY DESTINATION lib
-  RUNTIME DESTINATION bin
-)
diff --git a/external/mt32emu/CMakeLists.txt b/external/mt32emu/CMakeLists.txt
index 93838a818..d911c6fea 100644
--- a/external/mt32emu/CMakeLists.txt
+++ b/external/mt32emu/CMakeLists.txt
@@ -323,63 +323,64 @@ target_include_directories(mt32emu
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME Runtime)
 set(libmt32emu_COMPONENT_DEVEL COMPONENT Devel)
 
-install(TARGETS mt32emu EXPORT MT32EmuTargets
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${libmt32emu_COMPONENT_DEVEL}
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP
-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-# TODO: Use NAMELINK_COMPONENT with CMake 3.12 instead.
 if(libmt32emu_SHARED)
-  install(TARGETS mt32emu EXPORT MT32EmuTargets
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ${libmt32emu_COMPONENT_DEVEL} NAMELINK_ONLY
-  )
-endif()
+    install(TARGETS mt32emu EXPORT MT32EmuTargets
+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ${libmt32emu_COMPONENT_DEVEL}
+      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP
+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+    # TODO: Use NAMELINK_COMPONENT with CMake 3.12 instead.
 
-install(DIRECTORY
-  "${CMAKE_CURRENT_BINARY_DIR}/include/mt32emu"
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  ${libmt32emu_COMPONENT_DEVEL}
-)
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/include/mt32emu.h
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  ${libmt32emu_COMPONENT_DEVEL}
-)
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/mt32emu.pc
-  DESTINATION ${libmt32emu_PKGCONFIG_INSTALL_DIR}
-  ${libmt32emu_COMPONENT_DEVEL}
-)
-install(EXPORT MT32EmuTargets
-  DESTINATION ${libmt32emu_CMAKE_PACKAGE_INSTALL_DIR}
-  NAMESPACE MT32Emu::
-  ${libmt32emu_COMPONENT_DEVEL}
-)
-configure_file(cmake/MT32EmuConfig.cmake.in cmake/MT32EmuConfig.cmake @ONLY)
-include(CMakePackageConfigHelpers)
-write_basic_package_version_file(cmake/MT32EmuConfigVersion.cmake
-  VERSION ${libmt32emu_VERSION}
-  COMPATIBILITY SameMajorVersion
-)
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/cmake/MT32EmuConfig.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/cmake/MT32EmuConfigVersion.cmake
-  DESTINATION ${libmt32emu_CMAKE_PACKAGE_INSTALL_DIR}
-  ${libmt32emu_COMPONENT_DEVEL}
-)
-if(libmt32emu_EXT_MODULE)
-  install(FILES
-    cmake/CheckDependencies.cmake
-    cmake/${libmt32emu_EXT_MODULE}
-    DESTINATION ${libmt32emu_CMAKE_PACKAGE_INSTALL_DIR}
-    ${libmt32emu_COMPONENT_DEVEL}
-  )
-endif()
+    install(TARGETS mt32emu EXPORT MT32EmuTargets
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ${libmt32emu_COMPONENT_DEVEL} NAMELINK_ONLY
+    )
 
-install(FILES
-  AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.md TODO.txt
-  DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/munt/${PROJECT_NAME}
-)
+    install(DIRECTORY
+      "${CMAKE_CURRENT_BINARY_DIR}/include/mt32emu"
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+      ${libmt32emu_COMPONENT_DEVEL}
+    )
+    install(FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/include/mt32emu.h
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+      ${libmt32emu_COMPONENT_DEVEL}
+    )
+    install(FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/mt32emu.pc
+      DESTINATION ${libmt32emu_PKGCONFIG_INSTALL_DIR}
+      ${libmt32emu_COMPONENT_DEVEL}
+    )
+    install(EXPORT MT32EmuTargets
+      DESTINATION ${libmt32emu_CMAKE_PACKAGE_INSTALL_DIR}
+      NAMESPACE MT32Emu::
+      ${libmt32emu_COMPONENT_DEVEL}
+    )
+    configure_file(cmake/MT32EmuConfig.cmake.in cmake/MT32EmuConfig.cmake @ONLY)
+    include(CMakePackageConfigHelpers)
+    write_basic_package_version_file(cmake/MT32EmuConfigVersion.cmake
+      VERSION ${libmt32emu_VERSION}
+      COMPATIBILITY SameMajorVersion
+    )
+    install(FILES
+      ${CMAKE_CURRENT_BINARY_DIR}/cmake/MT32EmuConfig.cmake
+      ${CMAKE_CURRENT_BINARY_DIR}/cmake/MT32EmuConfigVersion.cmake
+      DESTINATION ${libmt32emu_CMAKE_PACKAGE_INSTALL_DIR}
+      ${libmt32emu_COMPONENT_DEVEL}
+    )
+    if(libmt32emu_EXT_MODULE)
+      install(FILES
+        cmake/CheckDependencies.cmake
+        cmake/${libmt32emu_EXT_MODULE}
+        DESTINATION ${libmt32emu_CMAKE_PACKAGE_INSTALL_DIR}
+        ${libmt32emu_COMPONENT_DEVEL}
+      )
+    endif()
+
+    install(FILES
+      AUTHORS.txt COPYING.txt COPYING.LESSER.txt NEWS.txt README.md TODO.txt
+      DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/munt/${PROJECT_NAME}
+    )
+endif()
 
 # Facilitates usage of the library in another project either through
 # an imported target or directly from the build tree.
diff --git a/src/include/options.h b/src/include/options.h
index 095c03a30..0ba3c9c56 100644
--- a/src/include/options.h
+++ b/src/include/options.h
@@ -20,7 +20,7 @@
 
 #define UAEMAJOR 6
 #define UAEMINOR 3
-#define UAESUBREV 4
+#define UAESUBREV 5
 
 #define MAX_AMIGADISPLAYS 1
 
diff --git a/src/main.cpp b/src/main.cpp
index 1a405f6fd..a35106b9f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -75,7 +75,7 @@
 #include "fsdb_host.h"
 #include "keyboard.h"
 
-static const char __ver[40] = "$VER: Amiberry v6.3.4 (2024-09-01)";
+static const char __ver[40] = "$VER: Amiberry v6.3.5 (2024-09-20)";
 long int version = 256 * 65536L * UAEMAJOR + 65536L * UAEMINOR + UAESUBREV;
 
 extern int console_logging;
diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
index c9742ea33..c50cd71e3 100644
--- a/src/osdep/amiberry.cpp
+++ b/src/osdep/amiberry.cpp
@@ -4350,7 +4350,7 @@ int main(int argc, char* argv[])
 
 	init_amiberry_paths(data_directory, home_directory, config_directory);
 
-	// Parse command line to get possibly set amiberry_config.
+	// Parse command line to possibly set amiberry_config.
 	// Do not remove used args yet.
 	if (!parse_amiberry_cmd_line(&argc, argv, 0))
 	{
diff --git a/src/osdep/target.h b/src/osdep/target.h
index a920496a3..a592cdc13 100644
--- a/src/osdep/target.h
+++ b/src/osdep/target.h
@@ -20,8 +20,8 @@
 #define GETBDM(x) (((x) - (((x) / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define AMIBERRYVERSION _T("Amiberry v6.3.4 preview (2024-09-01)")
-#define AMIBERRYDATE MAKEBD(2024, 9, 1)
+#define AMIBERRYVERSION _T("Amiberry v6.3.5 (2024-09-20)")
+#define AMIBERRYDATE MAKEBD(2024, 9, 20)
 #define COPYRIGHT _T("Copyright (C) 2016-2024 Dimitris Panokostas")
 
 #define IHF_WINDOWHIDDEN 6