diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
index e0002643e008..1fbe8ffb4a5b 100644
--- a/x11/kitty/Makefile
+++ b/x11/kitty/Makefile
@@ -1,85 +1,84 @@
 PORTNAME=	kitty
-DISTVERSION=	0.25.0
-PORTREVISION=	1
+DISTVERSION=	0.25.2
 CATEGORIES=	x11 wayland
 MASTER_SITES=	https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	alexis.praga@free.fr
 COMMENT=	Cross-platform, fast, featureful, GPU-based terminal emulator
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
 		sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
 		wayland-protocols>=0:graphics/wayland-protocols
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libepoll-shim-interpose.so:devel/libepoll-shim \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		liblcms2.so:graphics/lcms2 \
 		libpng.so:graphics/png \
 		librsync.so:net/librsync \
 		libwayland-client.so:graphics/wayland \
 		libwayland-cursor.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
 		pkgconfig python:3.5+ shebangfix tar:xz terminfo xorg
 CPE_VENDOR=	kitty_project
 USE_GL=		gl
 USE_XORG=	x11 xcb xcursor xi xinerama xrandr
 
 SHEBANG_FILES=	build-terminfo count-lines-of-code mypy-editor-integration \
 		update-on-ox update-on-ubuntu
 SHEBANG_GLOB=	*.py
 
 TEST_ENV=	PATH="${STAGEDIR}${PREFIX}/bin:${PATH}"
 TEST_TARGET=	test
 
 CPPFLAGS+=	`pkg-config --cflags epoll-shim-interpose`
 LDFLAGS+=	`pkg-config --libs epoll-shim-interpose`
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
 INSTALL_WRKSRC=	${WRKSRC}/linux-package
 
 _STRIP_TARGETS=	lib/kitty/kitty/fast_data_types.so lib/kitty/kitty/glfw-x11.so \
 		lib/kitty/kittens/diff/diff_speedup.so \
 		lib/kitty/kittens/unicode_input/unicode_names.so \
 		lib/kitty/kitty/glfw-wayland.so \
 		lib/kitty/kittens/choose/subseq_matcher.so bin/kitty \
 		lib/kitty/kittens/transfer/rsync.so
 
 _EMPTY_DIRS=	kittens/choose kittens/diff kittens/unicode_input kittens kitty
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64 || ${ARCH:Mriscv64*}
 MAKE_ENV+=	KITTY_NO_LTO=1
 .endif
 
 # ncursesw and tinfo >= 6.1 seem to be neededd
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1400035
 USES+=		ncurses:port
 .else
 USES+=		ncurses
 .endif
 
 # For librsync, we need to set header and library path
 do-build:
 	(cd ${WRKSRC} && \
 	        ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py linux-package --update-check-interval 0 --extra-include-dirs ${LOCALBASE}/include/ --extra-library-dirs ${LOCALBASE}/lib)
 	${FIND} ${INSTALL_WRKSRC} -name __pycache__ -type d -exec ${RM} -r -- {} +
 
 do-install:
 	${CP} -a ${INSTALL_WRKSRC}/ ${STAGEDIR}${PREFIX}
 	${STRIP_CMD} ${_STRIP_TARGETS:S|^|${STAGEDIR}${PREFIX}/|}
 	${INSTALL_DATA} ${WRKSRC}/terminfo/kitty.terminfo \
 		${STAGEDIR}${PREFIX}/share/misc/
 
 .include <bsd.port.mk>
diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo
index efd016f18b63..e2d938b113e1 100644
--- a/x11/kitty/distinfo
+++ b/x11/kitty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650204987
-SHA256 (kitty-0.25.0.tar.xz) = 1a2c81bf46687d4141d3182dc984bbc0330791705af152199e5b5815dae933de
-SIZE (kitty-0.25.0.tar.xz) = 4640360
+TIMESTAMP = 1660419246
+SHA256 (kitty-0.25.2.tar.xz) = a20a470490fee05bd4bd0ce0964b5b87df1fabe51f05fa076364bbfe2ee4e03c
+SIZE (kitty-0.25.2.tar.xz) = 4681940
diff --git a/x11/kitty/files/patch-kitty_child.py b/x11/kitty/files/patch-kitty_child.py
deleted file mode 100644
index dfae47085879..000000000000
--- a/x11/kitty/files/patch-kitty_child.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- kitty/child.py.orig	2021-11-10 21:33:51 UTC
-+++ kitty/child.py
-@@ -45,7 +45,7 @@ else:
-             return list(filter(None, f.read().decode('utf-8').split('\0')))
- 
-     def cwd_of_process(pid: int) -> str:
--        ans = f'/proc/{pid}/cwd'
-+        ans = subprocess.run(["pwdx", pid], capture_output=True).stdout.split()[1].decode("utf-8")
-         return os.path.realpath(ans)
- 
-     def _environ_of_process(pid: int) -> str:
diff --git a/x11/kitty/files/patch-kitty_data-types.h b/x11/kitty/files/patch-kitty_data-types.h
new file mode 100644
index 000000000000..fecb5ab2d450
--- /dev/null
+++ b/x11/kitty/files/patch-kitty_data-types.h
@@ -0,0 +1,19 @@
+--- kitty/data-types.h.orig	2022-08-13 20:17:56 UTC
++++ kitty/data-types.h
+@@ -164,14 +164,14 @@ typedef struct {
+     sprite_index sprite_x, sprite_y, sprite_z;
+     CellAttrs attrs;
+ } GPUCell;
+-static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
++_Static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell");
+ 
+ typedef struct {
+     char_type ch;
+     hyperlink_id_type hyperlink_id;
+     combining_type cc_idx[3];
+ } CPUCell;
+-static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
++_Static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell");
+ 
+ typedef enum { UNKNOWN_PROMPT_KIND = 0, PROMPT_START = 1, SECONDARY_PROMPT = 2, OUTPUT_START = 3 } PromptKind;
+ typedef union LineAttrs {
diff --git a/x11/kitty/pkg-plist b/x11/kitty/pkg-plist
index 8db677fa51e8..1d5a72f7db7e 100644
--- a/x11/kitty/pkg-plist
+++ b/x11/kitty/pkg-plist
@@ -1,227 +1,235 @@
 bin/kitty
 lib/kitty/__main__.py
 lib/kitty/kittens/__init__.py
 lib/kitty/kittens/ask/__init__.py
 lib/kitty/kittens/ask/main.py
 lib/kitty/kittens/broadcast/__init__.py
 lib/kitty/kittens/broadcast/main.py
 lib/kitty/kittens/choose/__init__.py
 lib/kitty/kittens/choose/main.py
 lib/kitty/kittens/choose/match.py
 lib/kitty/kittens/choose/subseq_matcher.so
 lib/kitty/kittens/clipboard/__init__.py
 lib/kitty/kittens/clipboard/main.py
 lib/kitty/kittens/diff/__init__.py
 lib/kitty/kittens/diff/collect.py
 lib/kitty/kittens/diff/config.py
 lib/kitty/kittens/diff/diff_speedup.so
 lib/kitty/kittens/diff/highlight.py
 lib/kitty/kittens/diff/main.py
 lib/kitty/kittens/diff/options/__init__.py
 lib/kitty/kittens/diff/options/definition.py
 lib/kitty/kittens/diff/options/parse.py
 lib/kitty/kittens/diff/options/types.py
 lib/kitty/kittens/diff/options/utils.py
 lib/kitty/kittens/diff/patch.py
 lib/kitty/kittens/diff/render.py
 lib/kitty/kittens/diff/search.py
 lib/kitty/kittens/hints/__init__.py
 lib/kitty/kittens/hints/main.py
 lib/kitty/kittens/hints/url_regex.py
 lib/kitty/kittens/hyperlinked_grep/__init__.py
 lib/kitty/kittens/hyperlinked_grep/main.py
 lib/kitty/kittens/icat/__init__.py
 lib/kitty/kittens/icat/main.py
 lib/kitty/kittens/mouse_demo/__init__.py
 lib/kitty/kittens/mouse_demo/main.py
 lib/kitty/kittens/panel/__init__.py
 lib/kitty/kittens/panel/main.py
+lib/kitty/kittens/prewarm/__init__.py
+lib/kitty/kittens/prewarm/main.py
 lib/kitty/kittens/query_terminal/__init__.py
 lib/kitty/kittens/query_terminal/main.py
 lib/kitty/kittens/remote_file/__init__.py
 lib/kitty/kittens/remote_file/main.py
 lib/kitty/kittens/resize_window/__init__.py
 lib/kitty/kittens/resize_window/main.py
 lib/kitty/kittens/runner.py
 lib/kitty/kittens/show_error/__init__.py
 lib/kitty/kittens/show_error/main.py
 lib/kitty/kittens/show_key/__init__.py
 lib/kitty/kittens/show_key/kitty_mode.py
 lib/kitty/kittens/show_key/main.py
 lib/kitty/kittens/ssh/__init__.py
 lib/kitty/kittens/ssh/completion.py
 lib/kitty/kittens/ssh/config.py
 lib/kitty/kittens/ssh/copy.py
 lib/kitty/kittens/ssh/main.py
 lib/kitty/kittens/ssh/options/__init__.py
 lib/kitty/kittens/ssh/options/definition.py
 lib/kitty/kittens/ssh/options/parse.py
 lib/kitty/kittens/ssh/options/types.py
 lib/kitty/kittens/ssh/options/utils.py
+lib/kitty/kittens/ssh/utils.py
 lib/kitty/kittens/themes/__init__.py
 lib/kitty/kittens/themes/collection.py
 lib/kitty/kittens/themes/main.py
 lib/kitty/kittens/transfer/__init__.py
 lib/kitty/kittens/transfer/librsync.py
 lib/kitty/kittens/transfer/main.py
 lib/kitty/kittens/transfer/receive.py
 lib/kitty/kittens/transfer/rsync.so
 lib/kitty/kittens/transfer/send.py
 lib/kitty/kittens/transfer/utils.py
 lib/kitty/kittens/tui/__init__.py
 lib/kitty/kittens/tui/dircolors.py
 lib/kitty/kittens/tui/handler.py
 lib/kitty/kittens/tui/images.py
 lib/kitty/kittens/tui/line_edit.py
 lib/kitty/kittens/tui/loop.py
 lib/kitty/kittens/tui/operations.py
 lib/kitty/kittens/tui/operations_stub.py
 lib/kitty/kittens/tui/path_completer.py
 lib/kitty/kittens/tui/progress.py
 lib/kitty/kittens/tui/spinners.py
 lib/kitty/kittens/tui/utils.py
 lib/kitty/kittens/unicode_input/__init__.py
 lib/kitty/kittens/unicode_input/main.py
 lib/kitty/kittens/unicode_input/unicode_names.so
 lib/kitty/kitty/__init__.py
 lib/kitty/kitty/actions.py
 lib/kitty/kitty/bgimage_fragment.glsl
 lib/kitty/kitty/bgimage_vertex.glsl
 lib/kitty/kitty/blit_fragment.glsl
 lib/kitty/kitty/blit_vertex.glsl
 lib/kitty/kitty/border_fragment.glsl
 lib/kitty/kitty/border_vertex.glsl
 lib/kitty/kitty/borders.py
 lib/kitty/kitty/boss.py
 lib/kitty/kitty/cell_fragment.glsl
 lib/kitty/kitty/cell_vertex.glsl
 lib/kitty/kitty/child.py
 lib/kitty/kitty/choose_entry.py
 lib/kitty/kitty/cli.py
 lib/kitty/kitty/cli_stub.py
 lib/kitty/kitty/client.py
 lib/kitty/kitty/complete.py
 lib/kitty/kitty/conf/__init__.py
 lib/kitty/kitty/conf/generate.py
 lib/kitty/kitty/conf/types.py
 lib/kitty/kitty/conf/utils.py
 lib/kitty/kitty/config.py
 lib/kitty/kitty/constants.py
 lib/kitty/kitty/debug_config.py
+lib/kitty/kitty/entry_points.py
 lib/kitty/kitty/fast_data_types.so
 lib/kitty/kitty/file_transmission.py
 lib/kitty/kitty/fonts/__init__.py
 lib/kitty/kitty/fonts/box_drawing.py
 lib/kitty/kitty/fonts/core_text.py
 lib/kitty/kitty/fonts/fontconfig.py
 lib/kitty/kitty/fonts/list.py
 lib/kitty/kitty/fonts/render.py
 lib/kitty/kitty/glfw-wayland.so
 lib/kitty/kitty/glfw-x11.so
 lib/kitty/kitty/graphics_fragment.glsl
 lib/kitty/kitty/graphics_vertex.glsl
 lib/kitty/kitty/guess_mime_type.py
 lib/kitty/kitty/key_encoding.py
 lib/kitty/kitty/key_names.py
 lib/kitty/kitty/keys.py
 lib/kitty/kitty/launch.py
 lib/kitty/kitty/launcher/kitty
 lib/kitty/kitty/layout/__init__.py
 lib/kitty/kitty/layout/base.py
 lib/kitty/kitty/layout/grid.py
 lib/kitty/kitty/layout/interface.py
 lib/kitty/kitty/layout/splits.py
 lib/kitty/kitty/layout/stack.py
 lib/kitty/kitty/layout/tall.py
 lib/kitty/kitty/layout/vertical.py
 lib/kitty/kitty/main.py
 lib/kitty/kitty/marks.py
 lib/kitty/kitty/multiprocessing.py
 lib/kitty/kitty/notify.py
 lib/kitty/kitty/open_actions.py
 lib/kitty/kitty/options/__init__.py
 lib/kitty/kitty/options/definition.py
 lib/kitty/kitty/options/parse.py
 lib/kitty/kitty/options/types.py
 lib/kitty/kitty/options/utils.py
 lib/kitty/kitty/os_window_size.py
 lib/kitty/kitty/rc/__init__.py
 lib/kitty/kitty/rc/base.py
 lib/kitty/kitty/rc/close_tab.py
 lib/kitty/kitty/rc/close_window.py
 lib/kitty/kitty/rc/create_marker.py
 lib/kitty/kitty/rc/detach_tab.py
 lib/kitty/kitty/rc/detach_window.py
 lib/kitty/kitty/rc/disable_ligatures.py
 lib/kitty/kitty/rc/env.py
 lib/kitty/kitty/rc/focus_tab.py
 lib/kitty/kitty/rc/focus_window.py
 lib/kitty/kitty/rc/get_colors.py
 lib/kitty/kitty/rc/get_text.py
 lib/kitty/kitty/rc/goto_layout.py
 lib/kitty/kitty/rc/kitten.py
 lib/kitty/kitty/rc/last_used_layout.py
 lib/kitty/kitty/rc/launch.py
 lib/kitty/kitty/rc/ls.py
 lib/kitty/kitty/rc/new_window.py
 lib/kitty/kitty/rc/remove_marker.py
 lib/kitty/kitty/rc/resize_os_window.py
 lib/kitty/kitty/rc/resize_window.py
 lib/kitty/kitty/rc/scroll_window.py
 lib/kitty/kitty/rc/select_window.py
 lib/kitty/kitty/rc/send_text.py
 lib/kitty/kitty/rc/set_background_image.py
 lib/kitty/kitty/rc/set_background_opacity.py
 lib/kitty/kitty/rc/set_colors.py
 lib/kitty/kitty/rc/set_enabled_layouts.py
 lib/kitty/kitty/rc/set_font_size.py
 lib/kitty/kitty/rc/set_spacing.py
 lib/kitty/kitty/rc/set_tab_color.py
 lib/kitty/kitty/rc/set_tab_title.py
 lib/kitty/kitty/rc/set_window_logo.py
 lib/kitty/kitty/rc/set_window_title.py
 lib/kitty/kitty/rc/signal_child.py
 lib/kitty/kitty/remote_control.py
 lib/kitty/kitty/rgb.py
+lib/kitty/kitty/search_query_parser.py
 lib/kitty/kitty/session.py
 lib/kitty/kitty/shell.py
 lib/kitty/kitty/shell_integration.py
 lib/kitty/kitty/shm.py
 lib/kitty/kitty/short_uuid.py
 lib/kitty/kitty/tab_bar.py
 lib/kitty/kitty/tabs.py
 lib/kitty/kitty/terminfo.py
 lib/kitty/kitty/tint_fragment.glsl
 lib/kitty/kitty/tint_vertex.glsl
 lib/kitty/kitty/types.py
 lib/kitty/kitty/typing.py
 lib/kitty/kitty/update_check.py
 lib/kitty/kitty/utils.py
 lib/kitty/kitty/window.py
 lib/kitty/kitty/window_list.py
 lib/kitty/logo/beam-cursor.png
 lib/kitty/logo/beam-cursor@2x.png
 lib/kitty/logo/kitty-128.png
 lib/kitty/logo/kitty.png
 lib/kitty/shell-integration/bash/kitty.bash
+lib/kitty/shell-integration/fish/vendor_completions.d/clone-in-kitty.fish
+lib/kitty/shell-integration/fish/vendor_completions.d/edit-in-kitty.fish
 lib/kitty/shell-integration/fish/vendor_completions.d/kitty.fish
 lib/kitty/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
 lib/kitty/shell-integration/ssh/askpass.py
 lib/kitty/shell-integration/ssh/bootstrap-utils.sh
 lib/kitty/shell-integration/ssh/bootstrap.py
 lib/kitty/shell-integration/ssh/bootstrap.sh
 lib/kitty/shell-integration/ssh/kitty
 lib/kitty/shell-integration/zsh/.zshenv
 lib/kitty/shell-integration/zsh/completions/_kitty
 lib/kitty/shell-integration/zsh/kitty-integration
 lib/kitty/shell-integration/zsh/kitty.zsh
+lib/kitty/terminfo/kitty.termcap
 lib/kitty/terminfo/kitty.terminfo
 lib/kitty/terminfo/x/xterm-kitty
 share/applications/kitty-open.desktop
 share/applications/kitty.desktop
 share/icons/hicolor/256x256/apps/kitty.png
 share/icons/hicolor/scalable/apps/kitty.svg
 share/man/man1/kitty.1.gz
 share/man/man5/kitty.conf.5.gz
 share/misc/kitty.terminfo
 share/terminfo/x/xterm-kitty