diff --git a/make.conf.template b/make.conf.template
index 3ff42ee..30a28b8 100644
--- a/make.conf.template
+++ b/make.conf.template
@@ -73,8 +73,8 @@ QEMU_SOFTMMU_TARGETS="i386 x86_64 arm aarch64"
 QEMU_USER_TARGETS="i386 x86_64 arm aarch64"
 OPENLDAP_BDB_SLOTS="4.8"
 PHP_TARGETS="php5-6 php7-2"
-PYTHON_TARGETS="python2_7 python3_6"
-PYTHON_SINGLE_TARGET="python3_6"
+PYTHON_TARGETS="python2_7 python3_7"
+PYTHON_SINGLE_TARGET="python3_7"
 USE_PYTHON="2.7"
 RUBY_TARGETS="ruby25"
 SANE_BACKENDS="mustek_usb2"
diff --git a/package.accept_keywords/all b/package.accept_keywords/all
index 044d048..951a6d1 100644
--- a/package.accept_keywords/all
+++ b/package.accept_keywords/all
@@ -88,6 +88,7 @@ dev-util/gazpacho ~x86 ~amd64
 dev-util/peg ~x86 ~amd64
 =dev-util/strace-4.26 ~x86
 media-gfx/darktable ~x86 ~amd64
+=media-gfx/inkscape-1.0 ~x86 ~amd64
 media-gfx/ipe ~x86 ~amd64
 media-gfx/opencsg ~x86 ~amd64
 media-gfx/openscad ~x86 ~amd64
@@ -142,6 +143,5 @@ www-apps/icingaweb2-module-director ~amd64
 www-client/google-chrome ~amd64
 =www-servers/apache-2.4.39 ~x86
 x11-apps/igt-gpu-tools ~x86 ~amd64
-x11-apps/intel-gpu-tools ~x86 ~amd64
 =x11-misc/shared-mime-info-1.9 ~x86 ~amd64
 =x11-themes/hicolor-icon-theme-0.17 ~x86 ~amd64
diff --git a/package.mask/all b/package.mask/all
index 998b998..662f022 100644
--- a/package.mask/all
+++ b/package.mask/all
@@ -1,6 +1,6 @@
 >=dev-db/postgresql-11
 >=dev-lang/php-7.3
->=dev-lang/python-3.7
+>=dev-lang/python-3.8
 >=dev-scheme/guile-2.2
 >media-fonts/noto-20170403
 =media-libs/netpbm-10.76.00
diff --git a/package.use/all b/package.use/all
index ae5503e..9e672c5 100644
--- a/package.use/all
+++ b/package.use/all
@@ -12,12 +12,13 @@ app-editors/vim -perl
 app-emulation/containerd -btrfs
 app-emulation/docker overlay
 app-emulation/xen efi
-app-emulation/xen-tools api screen python pygrub hvm ovmf system-seabios PYTHON_SINGLE_TARGET: -* python2_7
+<app-emulation/xen-tools-4.13 PYTHON_SINGLE_TARGET: -* python2_7
+app-emulation/xen-tools api screen python pygrub hvm ovmf system-seabios
 app-laptop/tpb xosd
 app-misc/hivex -ocaml
 app-misc/mc -ncurses -samba
 app-mobilephone/obexftp -perl
-app-office/libreoffice-bin PYTHON_SINGLE_TARGET: -* python3_6 PYTHON_TARGETS: python3_6
+app-office/libreoffice-bin PYTHON_SINGLE_TARGET: -* python3_7 PYTHON_TARGETS: python3_7
 app-office/lyx PYTHON_SINGLE_TARGET: -* python2_7
 app-office/openoffice-bin -java
 app-office/scribus -tk PYTHON_SINGLE_TARGET: -* python2_7
@@ -26,7 +27,6 @@ app-pda/libopensync-plugin-syncml obex
 app-portage/layman git subversion
 app-shells/tcsh nls
 app-text/acroread minimal -nsplugin
-app-text/asciidoc PYTHON_SINGLE_TARGET: -* python2_7
 app-text/calibre -udisks
 app-text/evince djvu dvi t1lib tiff postscript
 app-text/ghostscript-gpl -X -gtk cups
@@ -82,7 +82,6 @@ dev-scheme/guile networking
 dev-util/cvs server
 dev-util/git -cgi -gtk -perl -tk
 dev-util/glade python
-dev-util/itstool PYTHON_SINGLE_TARGET: -* python3_6
 dev-util/subversion -perl -java
 dev-vcs/cvs server
 dev-vcs/git -cgi -gtk -perl -tk
@@ -125,7 +124,7 @@ media-gfx/flphoto gphoto2
 media-gfx/graphicsmagick threads postscript
 media-gfx/graphviz -java -perl -gtk -tcl
 media-gfx/imagemagick -perl -openmp
-media-gfx/inkscape postscript visio PYTHON_SINGLE_TARGET: -* python2_7
+media-gfx/inkscape postscript visio
 media-gfx/librecad qt5
 media-gfx/sane-backends gphoto2 threads
 media-gfx/sane-frontends gimp
@@ -225,7 +224,6 @@ sys-apps/groff -X
 sys-apps/hal -crypt -X
 sys-apps/iproute2 -berkdb
 sys-apps/kmod -ssl
-sys-apps/lm_sensors sensord
 sys-apps/lm-sensors sensord
 sys-apps/lshw -gtk
 sys-apps/openwsman -cim -pam -java