diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40a4a5a543e30c8863615d5845ea9f813a77df09..dee758308ec3668ce19c53137bb6fbfd8de829ca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-data/appdata/org.gnome.Builder.appdata.xml.in
+data/appdata/org.gnome.Builder.appdata.xml.in.in
 data/gsettings/org.gnome.builder.build.gschema.xml
 data/gsettings/org.gnome.builder.code-insight.gschema.xml.in
 data/gsettings/org.gnome.builder.editor.gschema.xml
@@ -8,138 +8,97 @@ data/gsettings/org.gnome.builder.editor.language.gschema.xml
 data/gsettings/org.gnome.builder.extension-type.gschema.xml
 data/gsettings/org.gnome.builder.gschema.xml
 data/gsettings/org.gnome.builder.plugin.gschema.xml
-data/gsettings/org.gnome.builder.project-tree.gschema.xml
 data/gsettings/org.gnome.builder.project.gschema.xml
+data/gsettings/org.gnome.builder.project-tree.gschema.xml
+data/gsettings/org.gnome.builder.spelling.gschema.xml
 data/gsettings/org.gnome.builder.terminal.gschema.xml
 data/gsettings/org.gnome.builder.workbench.gschema.xml
 data/org.gnome.Builder.desktop.in.in
-data/style-schemes/Adwaita-dark.style-scheme.xml
-data/style-schemes/Adwaita.style-scheme.xml
-data/style-schemes/builder-dark.style-scheme.xml
-data/style-schemes/builder.style-scheme.xml
-src/libide/code/ide-buffer-change-monitor.c
-src/libide/code/ide-buffer-manager.c
+data/styles/builder-dark.xml
+data/styles/builder.xml
+data/styles/peninsula-dark.xml
+data/styles/peninsula.xml
 src/libide/code/ide-buffer.c
-src/libide/code/ide-file-settings.c
-src/libide/code/ide-gsettings-file-settings.c
-src/libide/code/ide-highlight-engine.c
-src/libide/code/ide-highlighter.c
+src/libide/code/ide-buffer-manager.c
 src/libide/code/ide-language-defaults.c
-src/libide/code/ide-symbol-node.c
 src/libide/code/ide-unsaved-files.c
 src/libide/core/ide-context.c
-src/libide/core/ide-global.c
-src/libide/core/ide-settings.c
 src/libide/core/ide-transfer.c
 src/libide/debugger/ide-debug-manager.c
+src/libide/editor/gtk/menus.ui
+src/libide/editor/ide-editor.c
 src/libide/editor/ide-editor-page-actions.c
-src/libide/editor/ide-editor-page-shortcuts.c
-src/libide/editor/ide-editor-page.ui
-src/libide/editor/ide-editor-print-operation.c
-src/libide/editor/ide-editor-search-bar.c
+src/libide/editor/ide-editor-page.c
 src/libide/editor/ide-editor-search-bar.ui
-src/libide/editor/ide-editor-settings-dialog.ui
-src/libide/editor/ide-editor-sidebar.ui
-src/libide/editor/ide-editor-surface-actions.c
-src/libide/editor/ide-editor-surface-shortcuts.c
-src/libide/editor/ide-editor-surface.c
-src/libide/editor/ide-editor-surface.ui
+src/libide/editor/ide-editor-utils.c
 src/libide/editor/ide-editor-workspace.ui
 src/libide/foundry/ide-build-manager.c
 src/libide/foundry/ide-config-manager.c
 src/libide/foundry/ide-device-manager.c
-src/libide/foundry/ide-device.c
 src/libide/foundry/ide-fallback-build-system.c
 src/libide/foundry/ide-local-device.c
 src/libide/foundry/ide-pipeline.c
 src/libide/foundry/ide-pipeline-stage-transfer.c
 src/libide/foundry/ide-run-manager.c
-src/libide/foundry/ide-runner.c
-src/libide/foundry/ide-runtime-manager.c
 src/libide/foundry/ide-runtime.c
 src/libide/foundry/ide-toolchain-manager.c
-src/libide/greeter/ide-clone-surface.c
-src/libide/greeter/ide-clone-surface.ui
+src/libide/greeter/gtk/menus.ui
 src/libide/greeter/ide-greeter-buttons-section.c
 src/libide/greeter/ide-greeter-row.c
-src/libide/greeter/ide-greeter-workspace-actions.c
-src/libide/greeter/ide-greeter-workspace-shortcuts.c
 src/libide/greeter/ide-greeter-workspace.c
 src/libide/greeter/ide-greeter-workspace.ui
+src/libide/gtk/ide-animation.c
+src/libide/gtk/ide-file-chooser-entry.c
+src/libide/gtk/ide-file-manager.c
+src/libide/gtk/ide-gtk.c
+src/libide/gtk/ide-search-entry.c
+src/libide/gtk/ide-search-entry.ui
+src/libide/gtk/ide-shortcut-accel-dialog.c
+src/libide/gtk/ide-shortcut-accel-dialog.ui
+src/libide/gui/gtk/help-overlay.ui
 src/libide/gui/gtk/menus.ui
 src/libide/gui/ide-application-actions.c
 src/libide/gui/ide-application-command-line.c
-src/libide/gui/ide-application-shortcuts.c
-src/libide/gui/ide-application.c
-src/libide/gui/ide-command-manager.c
-src/libide/gui/ide-environment-editor-row.ui
 src/libide/gui/ide-environment-editor.c
-src/libide/gui/ide-frame-empty-state.ui
-src/libide/gui/ide-frame-header.c
-src/libide/gui/ide-frame-header.ui
-src/libide/gui/ide-frame-shortcuts.c
-src/libide/gui/ide-frame.c
+src/libide/gui/ide-environment-editor-row.ui
 src/libide/gui/ide-frame.ui
-src/libide/gui/ide-header-bar-shortcuts.c
-src/libide/gui/ide-keybindings.c
 src/libide/gui/ide-marked-view.c
-src/libide/gui/ide-panel.c
 src/libide/gui/ide-preferences-builtin.c
-src/libide/gui/ide-preferences-surface.c
+src/libide/gui/ide-preferences-window.c
 src/libide/gui/ide-preferences-window.ui
 src/libide/gui/ide-primary-workspace-actions.c
 src/libide/gui/ide-primary-workspace.ui
 src/libide/gui/ide-run-button.c
-src/libide/gui/ide-run-button.ui
-src/libide/gui/ide-search-button.c
-src/libide/gui/ide-shortcuts-window.c
-src/libide/gui/ide-shortcuts-window.ui
-src/libide/gui/ide-transfer-button.c
 src/libide/gui/ide-workbench.c
-src/libide/gui/ide-worker-manager.c
+src/libide/gui/tests/test-preferences.c
 src/libide/io/ide-pkcon-transfer.c
 src/libide/lsp/ide-lsp-client.c
-src/libide/plugins/ide-extension-adapter.c
-src/libide/plugins/ide-extension-set-adapter.c
-src/libide/projects/ide-doap-person.c
-src/libide/projects/ide-doap.c
-src/libide/projects/ide-project-info.c
 src/libide/projects/ide-project.c
 src/libide/projects/ide-projects-global.c
-src/libide/projects/ide-recent-projects.c
 src/libide/projects/xml-reader.c
 src/libide/sourceview/gtk/menus.ui
-src/libide/sourceview/ide-snippet-chunk.c
-src/libide/sourceview/ide-snippet-context.c
-src/libide/sourceview/ide-snippet-parser.c
-src/libide/sourceview/ide-snippet.c
-src/libide/sourceview/ide-source-view-capture.c
-src/libide/sourceview/ide-source-view-mode.c
 src/libide/sourceview/ide-source-view.c
 src/libide/terminal/gtk/menus.ui
-src/libide/terminal/ide-terminal-launcher.c
 src/libide/terminal/ide-terminal-page-actions.c
 src/libide/terminal/ide-terminal-page.c
+src/libide/terminal/ide-terminal-page.ui
 src/libide/terminal/ide-terminal-popover.ui
-src/libide/terminal/ide-terminal-search.c
 src/libide/terminal/ide-terminal-search.ui
-src/libide/terminal/ide-terminal-workspace.ui
-src/libide/terminal/ide-terminal.c
-src/libide/tree/ide-tree-model.c
 src/libide/tree/ide-tree-node.c
 src/libide/vcs/ide-directory-vcs.c
+src/libide/vcs/ide-vcs.c
+src/libide/webkit/ide-webkit-page.ui
 src/main.c
 src/plugins/autotools/ide-autotools-makecache-stage.c
 src/plugins/autotools/ide-autotools-pipeline-addin.c
-src/plugins/autotools/ide-makecache.c
 src/plugins/beautifier/gb-beautifier-config.c
 src/plugins/beautifier/gb-beautifier-editor-addin.c
 src/plugins/beautifier/gb-beautifier-helper.c
 src/plugins/beautifier/gb-beautifier-process.c
 src/plugins/beautifier/gtk/menus.ui
+src/plugins/blueprint/blueprint.lang
 src/plugins/buildconfig/ide-buildconfig-config-provider.c
-src/plugins/buildstream/buildstream_plugin.py
-src/plugins/buildui/gbp-buildui-config-surface.c
+src/plugins/buildstream/gbp-buildstream-pipeline-addin.c
 src/plugins/buildui/gbp-buildui-config-view-addin.c
 src/plugins/buildui/gbp-buildui-log-pane.c
 src/plugins/buildui/gbp-buildui-log-pane.ui
@@ -147,17 +106,18 @@ src/plugins/buildui/gbp-buildui-omni-bar-section.c
 src/plugins/buildui/gbp-buildui-omni-bar-section.ui
 src/plugins/buildui/gbp-buildui-pane.c
 src/plugins/buildui/gbp-buildui-pane.ui
+src/plugins/buildui/gbp-buildui-preferences-addin.c
+src/plugins/buildui/gbp-buildui-runnables-dialog.c
+src/plugins/buildui/gbp-buildui-runnables-dialog.ui
+src/plugins/buildui/gbp-buildui-status-popover.c
+src/plugins/buildui/gbp-buildui-targets-dialog.c
+src/plugins/buildui/gbp-buildui-targets-dialog.ui
 src/plugins/buildui/gbp-buildui-tree-addin.c
-src/plugins/buildui/gbp-buildui-workspace-addin.c
 src/plugins/buildui/gtk/menus.ui
-src/plugins/c-pack/ide-c-indenter.c
-src/plugins/cargo/cargo_plugin.py
-src/plugins/clang/ide-clang-completion-item.c
-src/plugins/clang/ide-clang-diagnostic-provider.c
-src/plugins/clang/ide-clang-highlighter.c
+src/plugins/cargo/gbp-cargo-pipeline-addin.c
+src/plugins/cargo/gbp-cargo-run-command-provider.c
 src/plugins/clang/ide-clang-preferences-addin.c
 src/plugins/clang/ide-clang-symbol-node.c
-src/plugins/clang/ide-clang-symbol-tree.c
 src/plugins/clang/org.gnome.builder.clang.gschema.xml
 src/plugins/cmake/gbp-cmake-build-system.c
 src/plugins/cmake/gbp-cmake-pipeline-addin.c
@@ -166,22 +126,16 @@ src/plugins/code-index/gbp-code-index-application-addin.c
 src/plugins/code-index/gbp-code-index-service.c
 src/plugins/code-index/ide-code-index-index.c
 src/plugins/codespell/ide-codespell-diagnostic-provider.c
-src/plugins/color-picker/data/basic.gstyle.xml
 src/plugins/color-picker/gb-color-picker-editor-addin.c
-src/plugins/color-picker/gb-color-picker-prefs-palette-row.c
 src/plugins/color-picker/gb-color-picker-prefs.c
+src/plugins/color-picker/gb-color-picker-prefs-palette-row.c
 src/plugins/color-picker/gsettings/org.gnome.builder.plugins.color_picker_plugin.gschema.xml
 src/plugins/color-picker/gstyle/data/palettes/basic.gstyle.xml
 src/plugins/color-picker/gstyle/gstyle-color-panel.c
 src/plugins/color-picker/gstyle/gstyle-color-plane.c
-src/plugins/color-picker/gstyle/gstyle-color-scale.c
 src/plugins/color-picker/gstyle/gstyle-color-widget-actions.c
-src/plugins/color-picker/gstyle/gstyle-color-widget.c
-src/plugins/color-picker/gstyle/gstyle-color.c
-src/plugins/color-picker/gstyle/gstyle-palette-widget.c
 src/plugins/color-picker/gstyle/gstyle-palette.c
-src/plugins/color-picker/gstyle/gstyle-slidein.c
-src/plugins/color-picker/gstyle/tests/data/gstyle-color-editor.ui
+src/plugins/color-picker/gstyle/gstyle-palette-widget.c
 src/plugins/color-picker/gstyle/ui/gstyle-color-panel.ui
 src/plugins/color-picker/gstyle/ui/gstyle-color-widget.ui
 src/plugins/color-picker/gstyle/ui/gstyle-rename-popover.ui
@@ -190,88 +144,49 @@ src/plugins/color-picker/gtk/color-picker-prefs.ui
 src/plugins/color-picker/gtk/color-picker-preview.ui
 src/plugins/color-picker/gtk/color-picker.ui
 src/plugins/color-picker/gtk/menus.ui
-src/plugins/command-bar/gbp-command-bar-shortcuts.c
-src/plugins/comment-code/gbp-comment-code-editor-page-addin.c
 src/plugins/comment-code/gtk/menus.ui
-src/plugins/copyright/copyright_plugin.py
+src/plugins/copyright/gbp-copyright-preferences-addin.c
 src/plugins/copyright/org.gnome.builder.plugins.copyright.gschema.xml
 src/plugins/create-project/gbp-create-project-application-addin.c
-src/plugins/create-project/gbp-create-project-surface.c
-src/plugins/create-project/gbp-create-project-surface.ui
+src/plugins/create-project/gbp-create-project-widget.c
+src/plugins/create-project/gbp-create-project-widget.ui
 src/plugins/create-project/gbp-create-project-workspace-addin.c
 src/plugins/create-project/gtk/menus.ui
-src/plugins/ctags/ide-ctags-completion-item.c
-src/plugins/ctags/ide-ctags-completion-provider.c
-src/plugins/ctags/ide-ctags-highlighter.c
-src/plugins/ctags/ide-ctags-index.c
-src/plugins/ctags/ide-ctags-preferences-addin.c
 src/plugins/ctags/ide-ctags-service.c
-src/plugins/ctags/ide-ctags-symbol-resolver.c
 src/plugins/debuggerui/gtk/menus.ui
 src/plugins/debuggerui/ide-debugger-breakpoints-view.ui
 src/plugins/debuggerui/ide-debugger-controls.ui
 src/plugins/debuggerui/ide-debugger-disassembly-view.ui
-src/plugins/debuggerui/ide-debugger-editor-addin.c
 src/plugins/debuggerui/ide-debugger-hover-controls.ui
-src/plugins/debuggerui/ide-debugger-hover-provider.c
 src/plugins/debuggerui/ide-debugger-libraries-view.ui
 src/plugins/debuggerui/ide-debugger-locals-view.c
 src/plugins/debuggerui/ide-debugger-locals-view.ui
 src/plugins/debuggerui/ide-debugger-registers-view.ui
-src/plugins/debuggerui/ide-debugger-threads-view.c
 src/plugins/debuggerui/ide-debugger-threads-view.ui
-src/plugins/devhelp/gbp-devhelp-hover-provider.c
-src/plugins/devhelp/gbp-devhelp-menu-button.c
-src/plugins/devhelp/gbp-devhelp-menu-button.ui
-src/plugins/devhelp/gbp-devhelp-page.c
-src/plugins/devhelp/gbp-devhelp-search.c
-src/plugins/devhelp/gbp-devhelp-search.ui
-src/plugins/devhelp/gtk/menus.ui
+src/plugins/debuggerui/ide-debugger-workspace-addin.c
+src/plugins/deviced/gnome-builder-deviced.c
 src/plugins/dspy/gbp-dspy-application-addin.c
-src/plugins/dspy/gbp-dspy-surface.c
 src/plugins/dspy/gbp-dspy-workspace.ui
 src/plugins/dspy/gtk/menus.ui
-src/plugins/dspy/libdspy/dspy-connection-button.c
-src/plugins/dspy/libdspy/dspy-introspection-model.c
-src/plugins/dspy/libdspy/dspy-method-view.c
-src/plugins/dspy/libdspy/dspy-method-view.ui
-src/plugins/dspy/libdspy/dspy-name-marquee.ui
-src/plugins/dspy/libdspy/dspy-name-row.c
-src/plugins/dspy/libdspy/dspy-node.c
-src/plugins/dspy/libdspy/dspy-signature.c
-src/plugins/dspy/libdspy/dspy-tree-view.c
-src/plugins/dspy/libdspy/dspy-view.c
-src/plugins/dspy/libdspy/dspy-view.ui
-src/plugins/dspy/libdspy/gtk/menus.ui
-src/plugins/editor/gbp-confirm-save-dialog.c
-src/plugins/editor/gbp-confirm-save-dialog.ui
-src/plugins/editor/gbp-editor-application-addin.c
-src/plugins/editor/gbp-editor-frame-controls.c
-src/plugins/editor/gbp-editor-frame-controls.ui
-src/plugins/editor/gbp-editor-hover-provider.c
-src/plugins/editor/gbp-editor-workbench-addin.c
-src/plugins/editor/gtk/menus.ui
 src/plugins/editorconfig/gbp-editorconfig-file-settings.c
-src/plugins/emacs/gbp-emacs-preferences-addin.c
-src/plugins/eslint/eslint_plugin.py
-src/plugins/eslint/org.gnome.builder.plugins.eslint.gschema.xml
-src/plugins/file-search/gbp-file-search-index.c
-src/plugins/file-search/gbp-file-search-provider.c
+src/plugins/editorui/gbp-editorui-application-addin.c
+src/plugins/editorui/gbp-editorui-position-label.c
+src/plugins/editorui/gbp-editorui-preferences-addin.c
+src/plugins/editorui/gbp-editorui-workspace-addin.c
+src/plugins/editorui/gtk/menus.ui
+src/plugins/find-other-file/gbp-find-other-file-workspace-addin.c
 src/plugins/flatpak/daemon/ipc-flatpak-service-impl.c
 src/plugins/flatpak/gbp-flatpak-client.c
-src/plugins/flatpak/gbp-flatpak-clone-widget.c
-src/plugins/flatpak/gbp-flatpak-clone-widget.ui
 src/plugins/flatpak/gbp-flatpak-config-provider.c
 src/plugins/flatpak/gbp-flatpak-download-stage.c
 src/plugins/flatpak/gbp-flatpak-install-dialog.c
 src/plugins/flatpak/gbp-flatpak-install-dialog.ui
 src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
-src/plugins/flatpak/gbp-flatpak-runner.c
+src/plugins/flatpak/gbp-flatpak-run-command-provider.c
 src/plugins/flatpak/gbp-flatpak-runtime.c
 src/plugins/flatpak/gbp-flatpak-runtime-provider.c
 src/plugins/flatpak/gbp-flatpak-sdk-stage.c
 src/plugins/gcc/gbp-gcc-toolchain-provider.c
-src/plugins/gettext/ide-gettext-diagnostic-provider.c
 src/plugins/git/daemon/ipc-git-change-monitor-impl.c
 src/plugins/git/daemon/ipc-git-remote-callbacks.c
 src/plugins/git/daemon/ipc-git-repository-impl.c
@@ -279,58 +194,48 @@ src/plugins/git/daemon/ipc-git-util.h
 src/plugins/git/gbp-git-buffer-change-monitor.c
 src/plugins/git/gbp-git-client.c
 src/plugins/git/gbp-git-dependency-updater.c
-src/plugins/git/gbp-git-pipeline-addin.c
+src/plugins/git/gbp-git-preferences-addin.c
 src/plugins/git/gbp-git-submodule-stage.c
 src/plugins/git/gbp-git-vcs.c
 src/plugins/git/gbp-git-vcs-cloner.c
-src/plugins/glade/gbp-glade-editor-addin.c
-src/plugins/glade/gbp-glade-frame-addin.c
-src/plugins/glade/gbp-glade-page-actions.c
-src/plugins/glade/gbp-glade-page-shortcuts.c
-src/plugins/glade/gbp-glade-page.c
-src/plugins/glade/gbp-glade-properties.c
-src/plugins/glade/gbp-glade-properties.ui
-src/plugins/glade/gtk/menus.ui
-src/plugins/gnome-code-assistance/ide-gca-diagnostic-provider.c
-src/plugins/gnome-code-assistance/ide-gca-preferences-addin.c
-src/plugins/gnome-code-assistance/ide-gca-service.c
-src/plugins/gnome-code-assistance/org.gnome.builder.gnome-code-assistance.gschema.xml
-src/plugins/gradle/gradle_plugin.py
+src/plugins/gradle/gbp-gradle-pipeline-addin.c
+src/plugins/gradle/gbp-gradle-run-command-provider.c
 src/plugins/greeter/gbp-greeter-application-addin.c
-src/plugins/greeter/gtk/menus.ui
-src/plugins/grep/gbp-grep-editor-addin.c
 src/plugins/grep/gbp-grep-panel.c
 src/plugins/grep/gbp-grep-panel.ui
 src/plugins/grep/gbp-grep-popover.ui
 src/plugins/grep/gtk/menus.ui
+src/plugins/host/gbp-host-runtime-provider.c
 src/plugins/html-preview/gtk/menus.ui
-src/plugins/html-preview/html_preview.py
-src/plugins/intelephense/intelephense.py
-src/plugins/jhbuild/jhbuild_plugin.py
+src/plugins/intelephense/gbp-intelephense-service.c
+src/plugins/jhbuild/gbp-jhbuild-runtime-provider.c
 src/plugins/ls/gbp-ls-page.c
 src/plugins/ls/gbp-ls-page.ui
 src/plugins/ls/gtk/menus.ui
-src/plugins/make/make_plugin.py
-src/plugins/maven/maven_plugin.py
-src/plugins/meson-templates/meson_templates.py
+src/plugins/make/gbp-make-build-target.c
+src/plugins/make/gbp-make-pipeline-addin.c
+src/plugins/make/gbp-make-run-command-provider.c
+src/plugins/make-templates/gbp-make-template-provider.c
+src/plugins/markdown-preview/gtk/menus.ui
+src/plugins/maven/gbp-maven-pipeline-addin.c
+src/plugins/maven/gbp-maven-run-command-provider.c
 src/plugins/meson/gbp-meson-build-system.c
 src/plugins/meson/gbp-meson-config-view-addin.c
+src/plugins/meson/gbp-meson-introspection.c
 src/plugins/meson/gbp-meson-pipeline-addin.c
-src/plugins/meson/gbp-meson-tool-row.c
-src/plugins/meson/gbp-meson-tool-row.ui
+src/plugins/meson/gbp-meson-toolchain.c
 src/plugins/meson/gbp-meson-toolchain-edition-preferences-addin.c
 src/plugins/meson/gbp-meson-toolchain-edition-preferences-row.c
 src/plugins/meson/gbp-meson-toolchain-edition-preferences-row.ui
-src/plugins/meson/gbp-meson-toolchain.c
+src/plugins/meson/gbp-meson-tool-row.ui
 src/plugins/meson/gbp-meson-utils.c
+src/plugins/meson-templates/gbp-meson-template-provider.c
 src/plugins/messages/gbp-messages-panel.ui
-src/plugins/modelines/gbp-modelines-file-settings.c
 src/plugins/newcomers/gbp-newcomers-section.ui
 src/plugins/notification/ide-notification-addin.c
-src/plugins/npm/npm_plugin.py
-src/plugins/omni-gutter/gbp-omni-gutter-renderer.c
+src/plugins/npm/gbp-npm-pipeline-addin.c
 src/plugins/open-with-external/gtk/menus.ui
-src/plugins/phpize/phpize_plugin.py
+src/plugins/phpize/gbp-phpize-pipeline-addin.c
 src/plugins/podman/gbp-podman-runtime.c
 src/plugins/project-tree/gbp-new-file-popover.c
 src/plugins/project-tree/gbp-new-file-popover.ui
@@ -343,66 +248,53 @@ src/plugins/qemu/gbp-qemu-device-provider.c
 src/plugins/quick-highlight/gbp-quick-highlight-preferences.c
 src/plugins/recent/gbp-recent-section.c
 src/plugins/recent/gbp-recent-section.ui
-src/plugins/retab/gbp-retab-editor-page-addin.c
 src/plugins/retab/gtk/menus.ui
 src/plugins/rust-analyzer/org.gnome.builder.rust-analyzer.gschema.xml
 src/plugins/rust-analyzer/rust-analyzer-preferences-addin.c
-src/plugins/rust-analyzer/rust-analyzer-service.c
-src/plugins/shellcmd/gbp-shellcmd-command.c
-src/plugins/shellcmd/gbp-shellcmd-command-editor.c
-src/plugins/shellcmd/gbp-shellcmd-command-editor.ui
-src/plugins/shellcmd/gbp-shellcmd-command-provider.c
-src/plugins/shellcmd/gbp-shellcmd-list.c
+src/plugins/shellcmd/gbp-shellcmd-command-dialog.c
+src/plugins/shellcmd/gbp-shellcmd-command-dialog.ui
 src/plugins/shellcmd/gbp-shellcmd-preferences-addin.c
-src/plugins/snippets/ide-snippet-completion-item.c
-src/plugins/snippets/ide-snippet-preferences-addin.c
-src/plugins/spellcheck/gbp-spell-editor-addin.c
-src/plugins/spellcheck/gbp-spell-editor-page-addin.c
-src/plugins/spellcheck/gbp-spell-language-popover.c
-src/plugins/spellcheck/gbp-spell-navigator.c
-src/plugins/spellcheck/gbp-spell-widget.c
-src/plugins/spellcheck/gbp-spell-widget.ui
-src/plugins/spellcheck/gtk/menus.ui
-src/plugins/stylelint/org.gnome.builder.plugins.stylelint.gschema.xml
-src/plugins/stylelint/stylelint_plugin.py
-src/plugins/sublime/gbp-sublime-preferences-addin.c
-src/plugins/support/gtk/menus.ui
-src/plugins/support/ide-support-application-addin.c
-src/plugins/symbol-tree/gbp-symbol-frame-addin.c
+src/plugins/shellcmd/gbp-shellcmd-search-result.c
+src/plugins/shellcmd/gbp-shellcmd-shortcut-provider.c
+src/plugins/shellcmd/org.gnome.builder.shellcmd.command.gschema.xml
+src/plugins/shellcmd/org.gnome.builder.shellcmd.gschema.xml
+src/plugins/spellcheck/editor-enchant-spell-provider.c
+src/plugins/spellcheck/editor-spell-menu.c
+src/plugins/spellcheck/gbp-spell-preferences-addin.c
+src/plugins/sphinx-preview/gtk/menus.ui
 src/plugins/symbol-tree/gbp-symbol-hover-provider.c
-src/plugins/symbol-tree/gbp-symbol-menu-button.c
-src/plugins/symbol-tree/gbp-symbol-menu-button.ui
-src/plugins/symbol-tree/gbp-symbol-tree-builder.c
+src/plugins/symbol-tree/gbp-symbol-popover.ui
+src/plugins/symbol-tree/gbp-symbol-workspace-addin.c
 src/plugins/sysprof/gbp-sysprof-surface.c
-src/plugins/sysprof/gbp-sysprof-surface.ui
 src/plugins/sysprof/gbp-sysprof-workspace-addin.c
 src/plugins/sysprof/gtk/menus.ui
 src/plugins/sysroot/gbp-sysroot-preferences-addin.c
 src/plugins/sysroot/gbp-sysroot-preferences-row.ui
-src/plugins/sysroot/gbp-sysroot-runtime-provider.c
-src/plugins/sysroot/gbp-sysroot-subprocess-launcher.c
 src/plugins/sysroot/gbp-sysroot-toolchain-provider.c
-src/plugins/terminal/gbp-terminal-application-addin.c
 src/plugins/terminal/gbp-terminal-preferences-addin.c
 src/plugins/terminal/gbp-terminal-workspace-addin.c
 src/plugins/terminal/gtk/menus.ui
-src/plugins/testui/gbp-test-output-panel.c
-src/plugins/testui/gbp-test-output-panel.ui
-src/plugins/testui/gbp-test-tree-addin.c
+src/plugins/testui/gbp-testui-item.c
+src/plugins/testui/gbp-testui-output-panel.c
+src/plugins/testui/gbp-testui-output-panel.ui
+src/plugins/testui/gbp-testui-panel.ui
+src/plugins/testui/gbp-testui-preferences-addin.c
+src/plugins/testui/gtk/menus.ui
 src/plugins/todo/gbp-todo-panel.c
 src/plugins/todo/gbp-todo-workspace-addin.c
 src/plugins/update-manager/gbp-update-manager-app-addin.c
-src/plugins/vagrant/gbp-vagrant-runtime-provider.c
-src/plugins/valgrind/gbp-valgrind-workbench-addin.c
 src/plugins/valgrind/gtk/menus.ui
+src/plugins/valgrind/org.gnome.builder.valgrind.gschema.xml
+src/plugins/vcsui/gbp-vcsui-application-addin.c
+src/plugins/vcsui/gbp-vcsui-clone-page.c
+src/plugins/vcsui/gbp-vcsui-clone-page.ui
+src/plugins/vcsui/gbp-vcsui-switcher-popover.ui
 src/plugins/vcsui/gbp-vcsui-tree-addin.c
+src/plugins/vcsui/gbp-vcsui-workspace-addin.c
 src/plugins/vcsui/gtk/menus.ui
-src/plugins/vim/gb-vim.c
-src/plugins/vim/gbp-vim-command-provider.c
 src/plugins/vim/gbp-vim-preferences-addin.c
-src/plugins/waf/waf_plugin.py
-src/plugins/xml-pack/ide-xml-highlighter.c
+src/plugins/waf/gbp-waf-pipeline-addin.c
+src/plugins/web-browser/gtk/menus.ui
 src/plugins/xml-pack/ide-xml-parser.c
-src/plugins/xml-pack/ide-xml-sax.c
 src/plugins/xml-pack/ide-xml-service.c
 src/plugins/xml-pack/ide-xml-tree-builder.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 71407660a8f425b6d229bc040eda30e0d37cbd46..ba32ef03306bc0164e88ea9f766a28b3aba87e3a 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,9 +1,11 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
+data/appdata/org.gnome.Builder.appdata.xml.in
 data/org.gnome.Builder.desktop.in
-src/gstyle/tests/data/gstyle-color-editor.ui
-src/gstyle/tests/data/palette.xml
+src/plugins/color-picker/gstyle/tests/data/gstyle-color-editor.ui
+src/plugins/color-picker/gstyle/tests/data/palette.xml
 src/plugins/gdb/gdbwire.c
+src/plugins/meson-templates/resources/data/hello.gschema.xml
 src/plugins/meson-templates/resources/src/help-overlay.ui
 src/plugins/meson-templates/resources/src/main-cli.c
 src/plugins/meson-templates/resources/src/window-gtk4.ui