diff --git a/editors/o/Makefile b/editors/o/Makefile
index dc38fa5b2764..89f9518117f0 100644
--- a/editors/o/Makefile
+++ b/editors/o/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	o
-DISTVERSION=	2.35.1
+DISTVERSION=	2.36.0
 CATEGORIES=	editors
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,19 +12,19 @@ USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	xyproto
 GH_TUPLE=	\
-		atotto:clipboard:v0.1.2:atotto_clipboard/vendor/github.com/atotto/clipboard \
-		golang:sys:489259a85091:golang_sys/vendor/golang.org/x/sys \
+		atotto:clipboard:v0.1.4:atotto_clipboard/vendor/github.com/atotto/clipboard \
+		golang:sys:5e06dd20ab57:golang_sys/vendor/golang.org/x/sys \
 		jung-kurt:gofpdf:v1.16.2:jung_kurt_gofpdf/vendor/github.com/jung-kurt/gofpdf \
 		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mgutz:ansi:d51e80ef957d:mgutz_ansi/vendor/github.com/mgutz/ansi \
-		pkg:term:v1.2.0-beta.1:pkg_term/vendor/github.com/pkg/term \
+		pkg:term:v1.2.0-beta.2:pkg_term/vendor/github.com/pkg/term \
 		sourcegraph:annotate:f4cad6c6324d:sourcegraph_annotate/vendor/github.com/sourcegraph/annotate \
 		xyproto:env:dd84be2a4935:xyproto_env/vendor/github.com/xyproto/env \
 		xyproto:syntax:v1.7.3:xyproto_syntax/vendor/github.com/xyproto/syntax \
-		xyproto:termtitle:v1.1.0:xyproto_termtitle/vendor/github.com/xyproto/termtitle \
+		xyproto:termtitle:v1.2.0:xyproto_termtitle/vendor/github.com/xyproto/termtitle \
 		xyproto:textoutput:v1.12.2:xyproto_textoutput/vendor/github.com/xyproto/textoutput \
-		xyproto:vt100:1c2ef2e081cd:xyproto_vt100/vendor/github.com/xyproto/vt100
+		xyproto:vt100:v1.8.7:xyproto_vt100/vendor/github.com/xyproto/vt100
 
 PLIST_FILES=	bin/o
 
diff --git a/editors/o/distinfo b/editors/o/distinfo
index 58d541242eef..13b389b3a258 100644
--- a/editors/o/distinfo
+++ b/editors/o/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1615097831
-SHA256 (xyproto-o-2.35.1_GH0.tar.gz) = 4be044064650e1aee09390d3c017a69e6a0689773c56f35819a8e13a5a0eeed3
-SIZE (xyproto-o-2.35.1_GH0.tar.gz) = 1076850
-SHA256 (atotto-clipboard-v0.1.2_GH0.tar.gz) = 84704a60eb4de90eaebe6e8cbfab30bb53d103c26c25560d67d13469fd17934e
-SIZE (atotto-clipboard-v0.1.2_GH0.tar.gz) = 4478
-SHA256 (golang-sys-489259a85091_GH0.tar.gz) = e40f9bc523e1a324d2936f0c6ec031ca9230a1db6efb89fcdb3cbba2552cdd36
-SIZE (golang-sys-489259a85091_GH0.tar.gz) = 1098362
+TIMESTAMP = 1617992151
+SHA256 (xyproto-o-2.36.0_GH0.tar.gz) = 19e1621b552865e264220a29453540be1ebd9253536c03569a32232f3fe89d9a
+SIZE (xyproto-o-2.36.0_GH0.tar.gz) = 1137492
+SHA256 (atotto-clipboard-v0.1.4_GH0.tar.gz) = cafd64dc78f293c1e774386186f3f817461a1a8940ef86d5d9e9524b58aa791e
+SIZE (atotto-clipboard-v0.1.4_GH0.tar.gz) = 5017
+SHA256 (golang-sys-5e06dd20ab57_GH0.tar.gz) = 97d8695750a15cef175f72c6573cf64027600dda28243c311017c77ae71696e3
+SIZE (golang-sys-5e06dd20ab57_GH0.tar.gz) = 1218868
 SHA256 (jung-kurt-gofpdf-v1.16.2_GH0.tar.gz) = a3139d090d12a13d7020dfbe2097c53f7ba6fa529d72531f600b799aed6375d6
 SIZE (jung-kurt-gofpdf-v1.16.2_GH0.tar.gz) = 2795841
 SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f
@@ -13,17 +13,17 @@ SHA256 (mattn-go-isatty-v0.0.12_GH0.tar.gz) = addbdc341d7685ed4cc8d2d8a8fd2bd9b7
 SIZE (mattn-go-isatty-v0.0.12_GH0.tar.gz) = 4548
 SHA256 (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 91cc2a4b9179dca81b3169ad32d4ef854d043c268251abf9a004bf7606fe3222
 SIZE (mgutz-ansi-d51e80ef957d_GH0.tar.gz) = 5097
-SHA256 (pkg-term-v1.2.0-beta.1_GH0.tar.gz) = b6e941c6c14109a3173f3dbdb84bb1cc6e175eb5302799481db439ec299de311
-SIZE (pkg-term-v1.2.0-beta.1_GH0.tar.gz) = 11307
+SHA256 (pkg-term-v1.2.0-beta.2_GH0.tar.gz) = 7ec33e2b31f188923104d3edbecc4362f6d321354a178e4e4e49d1bfc5075e45
+SIZE (pkg-term-v1.2.0-beta.2_GH0.tar.gz) = 11330
 SHA256 (sourcegraph-annotate-f4cad6c6324d_GH0.tar.gz) = 9586ee91b45741f018ac91993dcf794283150aac952e10f965d4daa7c4bdd95f
 SIZE (sourcegraph-annotate-f4cad6c6324d_GH0.tar.gz) = 5960
 SHA256 (xyproto-env-dd84be2a4935_GH0.tar.gz) = dbb496277bf4153f1292f1673613cd113a1173aa819d11380b5d43b4798df53d
 SIZE (xyproto-env-dd84be2a4935_GH0.tar.gz) = 2363
 SHA256 (xyproto-syntax-v1.7.3_GH0.tar.gz) = 46bdee0ae307be384d8ba95abe7b57e813a7fe79eb5d2b115304cc1a69cfd0ad
 SIZE (xyproto-syntax-v1.7.3_GH0.tar.gz) = 782841
-SHA256 (xyproto-termtitle-v1.1.0_GH0.tar.gz) = 475c6b84f666bbd8fa7df95e74aee007fe4cc38eeb7f385f84d2ebe30d507935
-SIZE (xyproto-termtitle-v1.1.0_GH0.tar.gz) = 2077
+SHA256 (xyproto-termtitle-v1.2.0_GH0.tar.gz) = c12951abc8e70eb6aea2be9b09fdb783e41fabce4f7ff763a72f6ceacddfa6fe
+SIZE (xyproto-termtitle-v1.2.0_GH0.tar.gz) = 2276
 SHA256 (xyproto-textoutput-v1.12.2_GH0.tar.gz) = c206f41e04349f900a4d278cc1cfd2da4a7448ff492c5133a9a25a1d9a41f103
 SIZE (xyproto-textoutput-v1.12.2_GH0.tar.gz) = 798987
-SHA256 (xyproto-vt100-1c2ef2e081cd_GH0.tar.gz) = f173cfc9683347238b0f2915c67a3803d66cb49971b6c6a7a2e83b363471b6cf
-SIZE (xyproto-vt100-1c2ef2e081cd_GH0.tar.gz) = 927421
+SHA256 (xyproto-vt100-v1.8.7_GH0.tar.gz) = d05a9b6d3ca3702c22f227a7cedfabe21b28dce73fac14b8dfa767fde8909090
+SIZE (xyproto-vt100-v1.8.7_GH0.tar.gz) = 1005009