diff --git a/x11/swayr/Makefile b/x11/swayr/Makefile
index beee61969758..c2885448a6cb 100644
--- a/x11/swayr/Makefile
+++ b/x11/swayr/Makefile
@@ -1,77 +1,81 @@
 PORTNAME=	swayr
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.2
-PORTREVISION=	2
+DISTVERSION=	0.7.0
 CATEGORIES=	x11
 MASTER_SITES=	https://git.sr.ht/~tsdh/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 # XXX Teach USES=cargo to not override default DISTFILES
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Urgent-first/LRU window switcher for sway
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cargo
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}d
 
 CARGO_CRATES=	aho-corasick-0.7.18 \
 		atty-0.2.14 \
 		autocfg-1.0.1 \
-		bitflags-1.2.1 \
+		bitflags-1.3.2 \
 		cfg-if-1.0.0 \
-		clap-3.0.0-beta.2 \
-		clap_derive-3.0.0-beta.2 \
-		directories-3.0.2 \
+		clap-3.0.0-beta.4 \
+		clap_derive-3.0.0-beta.4 \
+		directories-4.0.1 \
 		dirs-sys-0.3.6 \
 		getrandom-0.2.3 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		indexmap-1.7.0 \
-		itoa-0.4.7 \
+		itoa-0.4.8 \
 		lazy_static-1.4.0 \
-		libc-0.2.98 \
-		memchr-2.4.0 \
-		os_str_bytes-2.4.0 \
+		libc-0.2.102 \
+		memchr-2.4.1 \
+		os_str_bytes-3.1.0 \
+		ppv-lite86-0.2.10 \
 		proc-macro-error-1.0.4 \
 		proc-macro-error-attr-1.0.4 \
-		proc-macro2-1.0.28 \
+		proc-macro2-1.0.29 \
 		quote-1.0.9 \
-		redox_syscall-0.2.9 \
+		rand-0.8.4 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		rand_hc-0.3.1 \
+		redox_syscall-0.2.10 \
 		redox_users-0.4.0 \
 		regex-1.5.4 \
 		regex-syntax-0.6.25 \
 		ryu-1.0.5 \
-		serde-1.0.127 \
-		serde_derive-1.0.127 \
-		serde_json-1.0.66 \
+		serde-1.0.130 \
+		serde_derive-1.0.130 \
+		serde_json-1.0.68 \
 		strsim-0.10.0 \
 		swayipc-3.0.0-alpha.3 \
 		swayipc-types-1.0.0-alpha.3 \
-		syn-1.0.74 \
+		syn-1.0.77 \
 		termcolor-1.1.2 \
-		textwrap-0.12.1 \
-		thiserror-1.0.26 \
-		thiserror-impl-1.0.26 \
+		textwrap-0.14.2 \
+		thiserror-1.0.29 \
+		thiserror-impl-1.0.29 \
 		toml-0.5.8 \
 		unicode-segmentation-1.8.0 \
-		unicode-width-0.1.8 \
+		unicode-width-0.1.9 \
 		unicode-xid-0.2.2 \
 		vec_map-0.8.2 \
 		version_check-0.9.3 \
 		wasi-0.10.2+wasi-snapshot-preview1 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0
 
 post-patch:
 # Respect PREFIX for *.desktop
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/config.rs \
 		${WRKSRC}/src/util.rs
 
 .include <bsd.port.mk>
diff --git a/x11/swayr/distinfo b/x11/swayr/distinfo
index 41736437d22a..92658d2bed39 100644
--- a/x11/swayr/distinfo
+++ b/x11/swayr/distinfo
@@ -1,103 +1,113 @@
-TIMESTAMP = 1627933060
-SHA256 (swayr-v0.6.2.tar.gz) = 35a64cf1d27b7ec305d152029f77c23031cbbff4254161e4893c2525d4be4c82
-SIZE (swayr-v0.6.2.tar.gz) = 922722
+TIMESTAMP = 1632682733
+SHA256 (swayr-v0.7.0.tar.gz) = 64750d317688b917f923c5a2d2c3140a4ec370c7c92cf3377bde0e0480b5272e
+SIZE (swayr-v0.7.0.tar.gz) = 924698
 SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
 SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
 SIZE (rust/crates/atty-0.2.14.crate) = 5470
 SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
 SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
-SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
-SIZE (rust/crates/bitflags-1.2.1.crate) = 16745
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/clap-3.0.0-beta.2.crate) = 4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142
-SIZE (rust/crates/clap-3.0.0-beta.2.crate) = 141105
-SHA256 (rust/crates/clap_derive-3.0.0-beta.2.crate) = 370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1
-SIZE (rust/crates/clap_derive-3.0.0-beta.2.crate) = 23425
-SHA256 (rust/crates/directories-3.0.2.crate) = e69600ff1703123957937708eb27f7a564e48885c537782722ed0ba3189ce1d7
-SIZE (rust/crates/directories-3.0.2.crate) = 15593
+SHA256 (rust/crates/clap-3.0.0-beta.4.crate) = fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406
+SIZE (rust/crates/clap-3.0.0-beta.4.crate) = 150387
+SHA256 (rust/crates/clap_derive-3.0.0-beta.4.crate) = 0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac
+SIZE (rust/crates/clap_derive-3.0.0-beta.4.crate) = 24876
+SHA256 (rust/crates/directories-4.0.1.crate) = f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210
+SIZE (rust/crates/directories-4.0.1.crate) = 16040
 SHA256 (rust/crates/dirs-sys-0.3.6.crate) = 03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780
 SIZE (rust/crates/dirs-sys-0.3.6.crate) = 10626
 SHA256 (rust/crates/getrandom-0.2.3.crate) = 7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753
 SIZE (rust/crates/getrandom-0.2.3.crate) = 26261
 SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
 SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713
 SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c
 SIZE (rust/crates/heck-0.3.3.crate) = 10260
 SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
 SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
 SHA256 (rust/crates/indexmap-1.7.0.crate) = bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5
 SIZE (rust/crates/indexmap-1.7.0.crate) = 50363
-SHA256 (rust/crates/itoa-0.4.7.crate) = dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736
-SIZE (rust/crates/itoa-0.4.7.crate) = 12099
+SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4
+SIZE (rust/crates/itoa-0.4.8.crate) = 11926
 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
-SHA256 (rust/crates/libc-0.2.98.crate) = 320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790
-SIZE (rust/crates/libc-0.2.98.crate) = 522087
-SHA256 (rust/crates/memchr-2.4.0.crate) = b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc
-SIZE (rust/crates/memchr-2.4.0.crate) = 63392
-SHA256 (rust/crates/os_str_bytes-2.4.0.crate) = afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85
-SIZE (rust/crates/os_str_bytes-2.4.0.crate) = 14657
+SHA256 (rust/crates/libc-0.2.102.crate) = a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103
+SIZE (rust/crates/libc-0.2.102.crate) = 537138
+SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
+SIZE (rust/crates/memchr-2.4.1.crate) = 64977
+SHA256 (rust/crates/os_str_bytes-3.1.0.crate) = 6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d
+SIZE (rust/crates/os_str_bytes-3.1.0.crate) = 14434
+SHA256 (rust/crates/ppv-lite86-0.2.10.crate) = ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857
+SIZE (rust/crates/ppv-lite86-0.2.10.crate) = 20915
 SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
 SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
 SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
 SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
-SHA256 (rust/crates/proc-macro2-1.0.28.crate) = 5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612
-SIZE (rust/crates/proc-macro2-1.0.28.crate) = 38732
+SHA256 (rust/crates/proc-macro2-1.0.29.crate) = b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d
+SIZE (rust/crates/proc-macro2-1.0.29.crate) = 38772
 SHA256 (rust/crates/quote-1.0.9.crate) = c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7
 SIZE (rust/crates/quote-1.0.9.crate) = 25042
-SHA256 (rust/crates/redox_syscall-0.2.9.crate) = 5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee
-SIZE (rust/crates/redox_syscall-0.2.9.crate) = 23533
+SHA256 (rust/crates/rand-0.8.4.crate) = 2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8
+SIZE (rust/crates/rand-0.8.4.crate) = 87406
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
+SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
+SHA256 (rust/crates/rand_hc-0.3.1.crate) = d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7
+SIZE (rust/crates/rand_hc-0.3.1.crate) = 11891
+SHA256 (rust/crates/redox_syscall-0.2.10.crate) = 8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff
+SIZE (rust/crates/redox_syscall-0.2.10.crate) = 23582
 SHA256 (rust/crates/redox_users-0.4.0.crate) = 528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64
 SIZE (rust/crates/redox_users-0.4.0.crate) = 13023
 SHA256 (rust/crates/regex-1.5.4.crate) = d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461
 SIZE (rust/crates/regex-1.5.4.crate) = 236581
 SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b
 SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293
 SHA256 (rust/crates/ryu-1.0.5.crate) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
 SIZE (rust/crates/ryu-1.0.5.crate) = 49570
-SHA256 (rust/crates/serde-1.0.127.crate) = f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8
-SIZE (rust/crates/serde-1.0.127.crate) = 75162
-SHA256 (rust/crates/serde_derive-1.0.127.crate) = a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc
-SIZE (rust/crates/serde_derive-1.0.127.crate) = 54201
-SHA256 (rust/crates/serde_json-1.0.66.crate) = 336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127
-SIZE (rust/crates/serde_json-1.0.66.crate) = 115121
+SHA256 (rust/crates/serde-1.0.130.crate) = f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913
+SIZE (rust/crates/serde-1.0.130.crate) = 75305
+SHA256 (rust/crates/serde_derive-1.0.130.crate) = d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b
+SIZE (rust/crates/serde_derive-1.0.130.crate) = 54703
+SHA256 (rust/crates/serde_json-1.0.68.crate) = 0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8
+SIZE (rust/crates/serde_json-1.0.68.crate) = 114986
 SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
 SIZE (rust/crates/strsim-0.10.0.crate) = 11355
 SHA256 (rust/crates/swayipc-3.0.0-alpha.3.crate) = 9cd9a688c43e93f1e1d2b2366a5403815b8017dd5f9cdaf51ae8ae9ae8fba5d0
 SIZE (rust/crates/swayipc-3.0.0-alpha.3.crate) = 3705
 SHA256 (rust/crates/swayipc-types-1.0.0-alpha.3.crate) = e125745767953fbbea5ba38caede26c89e4aeaf741afff7eb655967611b695d6
 SIZE (rust/crates/swayipc-types-1.0.0-alpha.3.crate) = 5648
-SHA256 (rust/crates/syn-1.0.74.crate) = 1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c
-SIZE (rust/crates/syn-1.0.74.crate) = 232974
+SHA256 (rust/crates/syn-1.0.77.crate) = 5239bc68e0fef57495900cfea4e8dc75596d9a319d7e16b1e0a440d24e6fe0a0
+SIZE (rust/crates/syn-1.0.77.crate) = 233424
 SHA256 (rust/crates/termcolor-1.1.2.crate) = 2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4
 SIZE (rust/crates/termcolor-1.1.2.crate) = 17287
-SHA256 (rust/crates/textwrap-0.12.1.crate) = 203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789
-SIZE (rust/crates/textwrap-0.12.1.crate) = 23964
-SHA256 (rust/crates/thiserror-1.0.26.crate) = 93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2
-SIZE (rust/crates/thiserror-1.0.26.crate) = 16711
-SHA256 (rust/crates/thiserror-impl-1.0.26.crate) = 060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745
-SIZE (rust/crates/thiserror-impl-1.0.26.crate) = 13431
+SHA256 (rust/crates/textwrap-0.14.2.crate) = 0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80
+SIZE (rust/crates/textwrap-0.14.2.crate) = 52016
+SHA256 (rust/crates/thiserror-1.0.29.crate) = 602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88
+SIZE (rust/crates/thiserror-1.0.29.crate) = 17455
+SHA256 (rust/crates/thiserror-impl-1.0.29.crate) = bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c
+SIZE (rust/crates/thiserror-impl-1.0.29.crate) = 15201
 SHA256 (rust/crates/toml-0.5.8.crate) = a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa
 SIZE (rust/crates/toml-0.5.8.crate) = 54219
 SHA256 (rust/crates/unicode-segmentation-1.8.0.crate) = 8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b
 SIZE (rust/crates/unicode-segmentation-1.8.0.crate) = 94011
-SHA256 (rust/crates/unicode-width-0.1.8.crate) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
-SIZE (rust/crates/unicode-width-0.1.8.crate) = 16732
+SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973
+SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745
 SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
 SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955
 SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
 SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
 SHA256 (rust/crates/version_check-0.9.3.crate) = 5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe
 SIZE (rust/crates/version_check-0.9.3.crate) = 12547
 SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
 SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
 SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
 SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998