diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index afa9b2ae84241..28fd1a5ce1f0f 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -1,4 +1,4 @@
 DIST tribler-swift_6.3.3_amd64.deb 3056230 SHA256 9453576d40312af1395821a49f72c3e87eea5d34ba6dd4d81bb3b60e88556f92 SHA512 590542a94981bcaf289955019b2c51d9e71bf915176a11f0dd8e8f68548137f8c503f9a08a0edee31116373e654cf4cc06b2a2d10d32ce4d12a24980ca6692aa WHIRLPOOL f320c075eca4b98593eafbfb4ea67935b169d6b04b953885941a74260138197233baf15c20b5b4277131082a9748eada1b416d18d75640f652724c2fffa45f8d
 DIST tribler-swift_6.3.3_i386.deb 3073730 SHA256 17d4b0e5c623a1bdde2c2fb3e5e201d32e5e022ed1f13cee7af5e11e96602982 SHA512 980481e694d1977b81ec5cd5e15f4adb971b87ea20b206c101fd80e045d9a48798d647d3a41d2ae23045805da55934ee77dfcb6f50f42ac1981a4c8ee39d20cb WHIRLPOOL 3917ced229360346482fcef62ec2cba57bb46f641c328d803f1ec8f73d2d6bad38ad84bf7c8d23bb521cd605425b68c90f870f9adf768a0bc6c645279dff682a
 DIST tribler_6.3.3_all.deb 1997346 SHA256 95f6cac8f5760229896bb66ee8e4d6b50939b7da4f1fb0c9a589a7617c456010 SHA512 afea5ef80c8dbc8da003997c8070116adf34334aceab91e258dfdddcfd7375238fc933866c655475ebdf347ac8ef4635716ec4ba1ad6bff6f638e804a4bbbf12 WHIRLPOOL 2b11404be050f81f6a8205edaa3c0c402a14148e5bf4e013ab7a95937f389a1a59b3ad44c1d237b1f431f5ceda5a26c48366bb4b78763ff52165ccf2de11d9d3
-DIST tribler-7.0.0_rc3.tar.xz 10078144 SHA256 477daf0947750b4dd6b875f74a52136153bd6bd2c1a74d119ccf87b97e452e38 SHA512 0bfcb4704d9d11e558b7490a09c8876ecfdaba6845a0ec4c3cf9df4d5b44d15483611e1094f23923c40906734e3a3ab0812cc86256e0ced7dc03be49ff800c38 WHIRLPOOL 2a5f925be78338e00219fb5a82d7e3cda305dd68d95ccaf342f08d595a3d34d1b3d1807d3c1837dea89b0f5cfc77c32fbd8d0d27dc3e4ebf040c70f12db22882
+DIST tribler-7.0.0_rc3.tar.xz 10078144 SHA256 477daf0947750b4dd6b875f74a52136153bd6bd2c1a74d119ccf87b97e452e38 SHA512 0bfcb4704d9d11e558b7490a09c8876ecfdaba6845a0ec4c3cf9df4d5b44d15483611e1094f23923c40906734e3a3ab0812cc86256e0ced7dc03be49ff800c38 WHIRLPOOL 2a5f925be78338e00219fb5a82d7e3cda305dd68d95ccaf342f08d595a3d34d1b3d1807d3c1837dea89b0f5cfc77c32fbd8d0d27dc3e4ebf040c70f12db22882
\ No newline at end of file
diff --git a/net-p2p/tribler/tribler-7.0.0_rc3.ebuild b/net-p2p/tribler/tribler-7.0.0_rc3.ebuild
index ed05a4f888c73..176b3cdc6fb9f 100644
--- a/net-p2p/tribler/tribler-7.0.0_rc3.ebuild
+++ b/net-p2p/tribler/tribler-7.0.0_rc3.ebuild
@@ -21,6 +21,7 @@ IUSE="+vlc"
 RDEPEND="
 	dev-lang/python:2.7[sqlite]
 	dev-python/apsw
+	dev-python/backports-functools-lru-cache
 	dev-python/cherrypy
 	dev-python/configobj
 	dev-python/decorator
@@ -34,11 +35,12 @@ RDEPEND="
 	dev-python/psutil
 	dev-python/pyasn1
 	dev-python/pycryptodome
-	dev-python/PyQt5[network]
+	dev-python/PyQt5[gui,network,svg,widgets]
 	dev-python/twisted-core
 	dev-python/twisted-web
 	dev-python/wxpython:=
 	dev-libs/openssl:0[-bindist]
+	dev-libs/libsodium
 	net-libs/libtorrent-rasterbar[python]
 	vlc? (
 			media-video/vlc
@@ -68,27 +70,28 @@ src_install() {
 	#Remove the licenses scattered throughout
 	rm Tribler/binary-LICENSE-postfix.txt # GPL-2 LGPL-2.1+ PSF-2.4 openssl wxWinLL-3.1
 
-	dodir /usr/share/doc/${P}
-	cp "${S}/LICENSE" "${D}/usr/share/doc/${P}/LICENSE.txt"
-	cp "${S}/README.rst" "${D}/usr/share/doc/${P}/README.rst"
+	insinto /usr/share/doc/${P}
+	doins LICENSE
+	doins README.rst
 
 	# Upstream does not provide a proper install file, so we install it ourself.
 	echo "Installing shared files..."
 
-	dodir /usr/share/${PN}
-	cp -R "${S}/TriblerGUI" "${D}/usr/share/${PN}" || die "Installation of TriblerGUI failed!"
-	cp -R "${S}/Tribler" "${D}/usr/share/${PN}" || die "Installation of Tribler's shared files failed!"
-	cp "${S}/Tribler/${schemadb}" "${D}/usr/share/${PN}/Tribler" || die "Installation of Tribler's DB failed."
+	insinto /usr/share/${PN}
+	doins -r Tribler || die "Installation of Tribler failed!"
+	doins -r TriblerGUI || die "Installation of TriblerGUI failed!"
+	doins logger.conf
+	doins run_tribler.py
+	doins check_os.py
 
-	cp "logger.conf" "${D}/usr/share/${PN}/"
-	cp "run_tribler.py" "${D}/usr/share/${PN}/"
-	cp "check_os.py" "${D}/usr/share/${PN}/"
-	dodir /usr/share/${PN}/twisted
-	cp -R "${S}/twisted" "${D}/usr/share/${PN}/twisted"
+	insinto /usr/share/${PN}/Tribler
+	doins Tribler/${schemadb} || die "Installation of Tribler's DB failed."
 
-	insinto /usr/bin
-	doins debian/bin/${PN}
-	fperms 0755 /usr/bin/${PN}
+	insinto /usr/share/${PN}/twisted
+	doins -r twisted
+
+	exeinto /usr/bin
+	doexe debian/bin/${PN}
 
 	# Create desktop icon
 	insinto /usr/share/applications