diff --git a/mame-module.yml b/mame-module.yml
index 92ff609..a10f95b 100644
--- a/mame-module.yml
+++ b/mame-module.yml
@@ -6,20 +6,32 @@ modules:
     build-options:
       no-debuginfo: true
       strip: true
-    env:
-      CC: clang
-      CXX: clang++
-      LD: lld
+    # env:
+    #   CC: clang
+    #   CXX: clang++
+    #   LD: lld
     build-commands:
       - make
           -j ${FLATPAK_BUILDER_N_JOBS}
           CFLAGS+=-Wno-error=restrict
-          USE_QTDEBUG=0 
+          TOOLS=1
+          USE_QTDEBUG=0
           USE_WAYLAND=1
           USE_SYSTEM_LIB_FLAC=1
           SDL_INI_PATH='$$HOME/.APP_NAME;/app/share/APP_NAME/ini'
           LDOPTS=-Wl,-s
       - install -Dm 0755 mame ${FLATPAK_DEST}/bin/mame
+      - install -Dm 0755 castool ${FLATPAK_DEST}/bin/castool
+      - install -Dm 0755 chdman ${FLATPAK_DEST}/bin/chdman
+      - install -Dm 0755 floptool ${FLATPAK_DEST}/bin/floptool
+      - install -Dm 0755 imgtool ${FLATPAK_DEST}/bin/imgtool
+      - install -Dm 0755 jedutil ${FLATPAK_DEST}/bin/jedutil
+      - install -Dm 0755 ldresample ${FLATPAK_DEST}/bin/ldresample
+      - install -Dm 0755 ldverify ${FLATPAK_DEST}/bin/ldverify
+      - install -Dm 0755 nltool ${FLATPAK_DEST}/bin/nltool
+      - install -Dm 0755 nlwav ${FLATPAK_DEST}/bin/nlwav
+      - install -Dm 0755 romcmp ${FLATPAK_DEST}/bin/romcmp
+      - install -Dm 0755 unidasm ${FLATPAK_DEST}/bin/unidasm
       - cp COPYING ${FLATPAK_DEST}/bin/
       - cp uismall.bdf ${FLATPAK_DEST}/bin/
       - mkdir -p ${FLATPAK_DEST}/share/mame/
@@ -39,8 +51,8 @@ modules:
       - cp -r samples/ ${FLATPAK_DEST}/share/mame/
     sources:
       - type: archive
-        url: https://github.com/mamedev/mame/archive/refs/tags/mame0264.tar.gz
-        sha256: 3d9f69ed3ef7c1628d5714c8ae2695ea77b1a652a93347b2703f7c862299376e
+        url: https://github.com/mamedev/mame/archive/refs/tags/mame0266.tar.gz
+        sha256: 0210be24f838f565302eed057dd6a4b1a252c9e0ca3d3f0832e8a4b1cf481f3e
       - type: file
         path: mame-patches/mame.ini
       - type: patch
diff --git a/manifest-header.yml b/manifest-header.yml
index 8a903ae..d890a7e 100644
--- a/manifest-header.yml
+++ b/manifest-header.yml
@@ -1,35 +1,36 @@
 app-id: net.retrodeck.mame
 runtime: org.kde.Platform
-runtime-version: "6.5"
+runtime-version: "6.7"
 sdk: org.kde.Sdk
-sdk-extensions:
-  - org.freedesktop.Sdk.Extension.llvm16
 command: /app/bin/mame
 
 finish-args:
-  - --socket=fallback-x11
   - --socket=wayland
+  - --socket=x11
   - --socket=pulseaudio
   - --share=ipc
   - --share=network
   - --device=all
-  - --filesystem=home
-  - --filesystem=/run/media
-  - --filesystem=/media
+  - --filesystem=host
   - --filesystem=home/.var/app/com.valvesoftware.Steam
   - --allow=multiarch
   - --talk-name=org.freedesktop.ScreenSaver
   - --talk-name=org.freedesktop.PowerManagement.Inhibit
   - --talk-name=org.freedesktop.login1.Manager
-  - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor
   - --filesystem=xdg-run/app/com.discordapp.Discord:create
-  #- --filesystem=xdg-config/gtk-3.0:ro #not needed as we got --filesystem=home
+  - --filesystem=xdg-config/gtk-3.0:ro
+  - --env=QT_QPA_PLATFORM=wayland;wayland-egl;xcb
   # Dolphin
   - --allow=bluetooth
-  # PPSSPP
   # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
-  - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.mame
-  - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.mame
+  - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck
+  - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck
   # XEMU - Fixes issues with openSUSE systems, QEMU_AUDIO_DRV is defined as "pa" causing xemu to not launch
   - --unset-env=QEMU_AUDIO_DRV
+  # BoilR
+  - --filesystem=xdg-data/Steam:rw #Steam (flatpak)
+  - --filesystem=~/.steam:rw # Steam (Non-flatpak)
+  - --filesystem=~/.var/app/com.valvesoftware.Steam:rw # Steam (Flatpak)
+  # PPSSPP, DOLPHIN
+  - --filesystem=xdg-run/gamescope-0:ro