diff --git a/package.json b/package.json
index ecb94a7e..28c17442 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,8 @@
   "main": ".webpack/main",
   "scripts": {
     "start": "electron-forge start",
-    "package": "electron-forge package",
-    "make": "electron-forge make",
+    "package": "yarn peggy && electron-forge package",
+    "make": "yarn peggy && electron-forge make",
     "peggy": "peggy --format es --output ./src/main/modules/Filters/FilterLang.js ./src/main/modules/Filters/FilterLang.pegjs",
     "mas": "PLATFORM=mas DEBUG=electron-osx-sign* electron-forge make --arch=universal --platform=mas",
     "lint": "eslint --ext .ts,.tsx ."
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8c661d91..29c2a3cb 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -13,11 +13,13 @@ confinement: strict
 icon: ./assets/icons/512x512.png
 license: MIT
 compression: lzo
-architectures:
-- build-on: [amd64]
-  run-on: [amd64]
-- build-on: [arm64]
-  run-on: [arm64]
+platforms:
+  amd64:
+    build-on: [amd64]
+    build-for: [amd64]
+  arm64:
+    build-on: [arm64]
+    build-for: [arm64]
 apps:
   sleek:
     command: snap/command-chain/desktop-launch $SNAP/sleek/sleek --disable-gpu --no-sandbox
@@ -27,7 +29,7 @@ apps:
       PATH: "$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
       SNAP_DESKTOP_RUNTIME: $SNAP/gnome-platform
       GTK_USE_PORTAL: '1'
-    extensions: [gnome]
+    extensions: [gnome-46-2404]
     plugs:
     - desktop
     - home
@@ -40,7 +42,7 @@ parts:
     build-environment:
     - PATH: "$PATH:$SNAPCRAFT_PART_BUILD/node_modules/.bin"
     build-snaps:
-    - node/18/stable
+    - node/23/stable
     source: .
     override-build: |
       if [ -n "$http_proxy" ]; then
@@ -50,6 +52,7 @@ parts:
       fi
 
       node.yarn
+      node.yarn peggy
       node.yarn make
 
       mv $SNAPCRAFT_PART_BUILD/out/sleek-* \
@@ -59,7 +62,7 @@ parts:
   cleanup:
     after: [ sleek ]
     plugin: nil
-    build-snaps: [ gnome ]
+    build-snaps: [ gnome-46-2404 ]
     override-prime: |
       cd sleek
       ls -l
@@ -67,7 +70,7 @@ parts:
       rm chrome-sandbox
       ls -l
       set -eux
-      for snap in "gnome"; do  # List all content-snaps you're using here
+      for snap in "gnome-46-2404"; do  # List all content-snaps you're using here
         cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" "$SNAPCRAFT_PRIME/usr/{}" \;
       done
       for CRUFT in bug lintian man; do