diff --git a/dev-embedded/esphome-dashboard/Manifest b/dev-embedded/esphome-dashboard/Manifest
index f9e266bc9..095289d5e 100644
--- a/dev-embedded/esphome-dashboard/Manifest
+++ b/dev-embedded/esphome-dashboard/Manifest
@@ -1,7 +1,10 @@
 DIST esphome-dashboard-20210617.1.tar.gz 502282 BLAKE2B 3319e62d3e13f8063e68639f3fbacc367b60b3eebb3b7e62c47e4d206d36355067ae6ba243d63d9f305c5ab114e959ebad182bd9215de610d9a27ef687ba314c SHA512 9679dbca5cb603fab38a665a7b1c688f812a7aff7d6cbf0ff24134b862167f01c85005b149c8b712b102fbe38af1667a2a7a1497c6d6b665a3397bd8e1323a8c
 DIST esphome-dashboard-20210623.0.tar.gz 520305 BLAKE2B ac3dadb79062ad925eaecfdc313a588e3e6598f835f380ebd67bc319dd3c724543b7364454b67c79a2ce18b325bf0991cc5f07463d22cead3f9fe6c6dfe9fb6d SHA512 4868120f725fb8772e10bae095f7a0efeec79ad9cd502290bda48534de9984e71c502d9b69f8ae289020dfa0823a39dc203e21b686dee6e713ffb546a08be289
 DIST esphome-dashboard-20210719.0.tar.gz 521987 BLAKE2B 947d0eec8f4c3d52740f875ba48bf2ddd496d0eeff7ce78b717709f174f3d0f6af02dafdf7ccd111117bfb7bd31f18771ae3761a1cd7d18786bfbdeae5d8cf1f SHA512 a795c1984720c6f31925ea544f706732eb6236ddbd8a660be62f86fe857d327ec4fee69850d8b48760c6ef67fedc45a66599e82543c8e09590180f7c45ddd871
+DIST esphome-dashboard-20210728.0.tar.gz 520769 BLAKE2B 630c8771c2a338a4b433392ac00c502c9d3669d673e7e443161f1a43f275afc50f01f86000c4e742443bc7052fbece5976621c00236dffb4594e9f3f264dc414 SHA512 970399d462e126475b1685b370ad53cc3a2882019de358414ab7f09731fb97aefa00d2b32763e8f09fbd2d571715ad29b5e5d1f8f64249533ee4213c479d98ef
 EBUILD esphome-dashboard-20210617.1.ebuild 683 BLAKE2B 7b8d1326c5a59a999e1596b329a1f6976790881811375597ba3b248b8d7b14032ed1f1f1b8017eab57b851205a49efd003b0964ae2da50e91d16671a763730b0 SHA512 947e0c3874b6cbab376089ede61c63c298a6250bc605ee1ad589484b14180ffae58004359653e6474603c0476e27f1723764aaa8ddcf7e7c40eeeaae39ace002
 EBUILD esphome-dashboard-20210623.0.ebuild 683 BLAKE2B 7b8d1326c5a59a999e1596b329a1f6976790881811375597ba3b248b8d7b14032ed1f1f1b8017eab57b851205a49efd003b0964ae2da50e91d16671a763730b0 SHA512 947e0c3874b6cbab376089ede61c63c298a6250bc605ee1ad589484b14180ffae58004359653e6474603c0476e27f1723764aaa8ddcf7e7c40eeeaae39ace002
 EBUILD esphome-dashboard-20210719.0.ebuild 683 BLAKE2B 7b8d1326c5a59a999e1596b329a1f6976790881811375597ba3b248b8d7b14032ed1f1f1b8017eab57b851205a49efd003b0964ae2da50e91d16671a763730b0 SHA512 947e0c3874b6cbab376089ede61c63c298a6250bc605ee1ad589484b14180ffae58004359653e6474603c0476e27f1723764aaa8ddcf7e7c40eeeaae39ace002
+EBUILD esphome-dashboard-20210728.0.ebuild 683 BLAKE2B 7b8d1326c5a59a999e1596b329a1f6976790881811375597ba3b248b8d7b14032ed1f1f1b8017eab57b851205a49efd003b0964ae2da50e91d16671a763730b0 SHA512 947e0c3874b6cbab376089ede61c63c298a6250bc605ee1ad589484b14180ffae58004359653e6474603c0476e27f1723764aaa8ddcf7e7c40eeeaae39ace002
 MISC metadata.xml 457 BLAKE2B fb323c348ed5e2f693be7b58df4affee5a7826e24e992289d119364b8e82b0c018e3ea9f4c8f75b4fc25b9b9c29a3333807d5fd1e224090ff35ed288785f1f4d SHA512 15f5f9e99324d166192481d3ea2a24a06c9612279a214c7f31827ff9c4b0fd4175354a783b5656873dc493928cbd8e074009fe2568c88c608f0be91aea1ad5dc
+DIST esphome-dashboard-20210728.0.tar.gz 520769 MD5 80fb1d1b1dcbda39319e98223f02d163
\ No newline at end of file
diff --git a/dev-embedded/esphome-dashboard/esphome-dashboard-20210728.0.ebuild b/dev-embedded/esphome-dashboard/esphome-dashboard-20210728.0.ebuild
new file mode 100644
index 000000000..282f78753
--- /dev/null
+++ b/dev-embedded/esphome-dashboard/esphome-dashboard-20210728.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="ESPHome dashboard"
+HOMEPAGE="https://github.com/esphome/dashboard https://pypi.org/project/esphome-dashboard/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DOCS="README.md"
+
+RDEPEND=""
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest
index e1065e5b8..cba7108c4 100644
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@@ -1,17 +1,15 @@
 AUX esphome.conf.d 349 BLAKE2B 54df063ef9805fd8de3eeb4f77331b22c256786817a305d9b3b8d1fcfb11a39b080a7630f70b5b36a2321446e18d54c67db94a64e3fe0d731b626734e2721148 SHA512 ea6e04b41ed7a885b239ff4547442f4589152ba612df040f950eafa85e31daf9a6791a2d93351401dc0ac633f62fd5f3c2c89f77c2d92ac94f7bf8d7ff92e5ff
 AUX esphome.init.d-r1 605 BLAKE2B c6443e2a9730638bda08bda51638d4cd8ee965526ae0fdb04d74a1b376ea7b461d5925b0fe8cb35cc991709a824c1c942902cfbdbe99823b39bd80abf46ca5f3 SHA512 98ef2a6d5524152e24b04b1e644e5672e6bebee8b68fbcc37b46f403fdbf1de24547e394ce52281b6ff5711a987c56c9f55c36b9ae871433ca7a4d3fc6e19297
 AUX esphome.init.d-r2 650 BLAKE2B 106e71245d76858dcd3deccfae0f4880053a39d7c280ca79a74adbf44ebff73c56fe7903a3dc1c1a3088d513be2e98c6edc2742ff137b384cbf088967395c09b SHA512 b983ca4b4645e5b79cab2804bc6fc0220a61e2b0234d6f7655c7eaef6cf507bc9791ec16843bee0767c9f3f0dbd88e28b93c39a9e945ca6a5e849dec5c58aa64
-DIST esphome-1.16.1.tar.gz 1299334 BLAKE2B 322b7cd29c266bee81566045cd6857d2c3e6c3406a12cdc007709d6b31324fb8fb79ec66f8ba976dbf9c36836593c3364f597ff1b0461d14e0a0eec1fb3ab288 SHA512 97f9b96c2ab616ec548be70f85964f33029eadc932a490ca79f09a98920fdf2bd4fb5edf4de4edbeabb524aa4d46ce5b6afc4992acdfe1628cbb90f251105578
 DIST esphome-1.16.2.tar.gz 1299627 BLAKE2B ea294ac96c1e5b2528a48aed50e17abaf629b66bd0386cf1ad91d87cd32683ba11d9f288fb8505f10b7b4f3f41242916b918de97d891391b634a12140bed2960 SHA512 fbd042ce818f35612f4f3d2b10b629f249436b705a49c1ad1cbf6f69db1c699da1938a81b0e222ad786929f281e798981da470034dbc2be1a915fe24cc73413f
 DIST esphome-1.17.2.tar.gz 1338970 BLAKE2B 4ec0524d56325b3137d4240f90776e23fe3895a0e9a0fd846cd2cb24834cc525f82bd3bdd282df2bb0da0e82496acddedbe00fc86a250aa4aab5a0db9ade4da1 SHA512 37c3eaed3ab42e174060d35f63a08de76e47ec27c3319b4a89a0efd9ed4cda190d56fc845b746bfeb3bd30a1d78cb6dd26e99ca7e1d0eca78f138dd510a5edca
-DIST esphome-1.19.1.tar.gz 978454 BLAKE2B 161173e8dd051f2909606f931cae0a50ad28be8aaa169d53614474801eb564fc0a94fedb29dcbcc36f9df339202e28742476867bf96286d1da49794fa130f9da SHA512 29d2685583ae1e8239b1dd735da1e928f9e032fab2082cc3f1305f4f8d6a2523b2c3cf02efd1c8ceba48c1185bb646d34f5feac6ae558b40c5774c313c1611ae
 DIST esphome-1.19.4.tar.gz 978617 BLAKE2B a4a39c64e00e7e102a07ee2b801b68960c4a1fba86f3a018a3de9c255fe991d98ad5df9f6c8f027d51dcbe11efcbe95d797998a66252a6e92d15a88faaa07a60 SHA512 684958ed92415b33d59c43c04d42db97f10735e4bfa936c70480f1fdb80b544738a4293b5c1ebf534137de8bfb543290f3afd939005df585a8736639e78b19ef
 DIST esphome-1.20.1.tar.gz 1017011 BLAKE2B 568152a4b636a1564dae7976445d9fcda9096ac1aa99fe26d5e6264f82c01dce066e06374ce264b108e7ffc5941d1f0257bb7cd60de47d8a3d80602fd07bc434 SHA512 fa53e1d97a76f25d099cbaa7da6eb6de10d6580452f5d42de3772b350d9012f9884eddf78e686c0502006ca309f4d6d1dfd01734f6e976587058ceca796c2188
-EBUILD esphome-1.16.1.ebuild 3038 BLAKE2B b9d98f42fae14eb76e4d84a15260db85040f824496acc0b18750e3270d6776a349b6bcbc5aee3656be96597d403456b9a115f4411bef5b5154bf48bad443d2e7 SHA512 5fc8244fe4dac1c4388d036aa2de9bd91f482ae39c8d004210220f55be9aa254346ca94380b9bcad24a3ee9403dff0cd98cd68d31ee929861ba836d8bcc6de33
+DIST esphome-1.20.4.tar.gz 1017163 BLAKE2B 66331fd25867a44225714d937f3d5cad53e1caba7c84410a88b7e52ced1eb151eb9c69de35a87b7cff77dab80324081e2e7f6b07b948b6f9a6ee44d82a185e33 SHA512 733a9ab747af178882524b8819186bd4ae478306b92427f395612f38e77fd8845c00f4e2cfe94421b928e875c95f8833222c4e66a02f44090f424714b0335385
 EBUILD esphome-1.16.2.ebuild 3038 BLAKE2B b9d98f42fae14eb76e4d84a15260db85040f824496acc0b18750e3270d6776a349b6bcbc5aee3656be96597d403456b9a115f4411bef5b5154bf48bad443d2e7 SHA512 5fc8244fe4dac1c4388d036aa2de9bd91f482ae39c8d004210220f55be9aa254346ca94380b9bcad24a3ee9403dff0cd98cd68d31ee929861ba836d8bcc6de33
 EBUILD esphome-1.17.2.ebuild 2824 BLAKE2B 097193d93e287a96885614b59970950ec2eaf67d3816047358e2351ec76930f7b52c7a7fe1e53a416947a6a87e05f91dd8b07712fd0196d4d4488d4ad11f6207 SHA512 2609553202c0d5b4064831abd49bdeac885631c9cf00b8e953963abec6f99d4ca3f1296e8e28fb43a61dbd9da5681a7dcf769430ca6bebe8bc023421cb15ec5a
-EBUILD esphome-1.19.1.ebuild 3104 BLAKE2B 36fc28f8e9b6fcc2487a05c6220c185b879fb40290ae71fa2641f27cdd4897cef71768416f47f478d45ff0f5b45ec0197098ab7adc53021c8ba8934ac44d23bf SHA512 cddcd1ddddf7ead1de8f9236711a866456024ee7a3e937e2881f7b9707404d4b432cbe210386645e28748c7627fd483b881c53c9aaf701ef29d52acd3e78f04d
 EBUILD esphome-1.19.4.ebuild 3104 BLAKE2B ffbd16c2d4d8728814955d729ffd50a4ade1e1e3b8329395cdb1099219e2a654af7a38a56c35a2a5a757ee79efaafa938d9e2c6cfa3405fedebba52c2b92bf39 SHA512 a16c18e703b82948576da9aa176987b218ef763a6355599fabb1f5ef852b8818d0b5f8792955cceee18789bca1401cfdea3fa2b565c212c7f51585b278dc1c6a
 EBUILD esphome-1.20.1.ebuild 2956 BLAKE2B 859a3bdb8d414cfc945d742e4f0d58ece240344883c39b8bc74ba8913b878274ce6288bcc2d00833a7917fb5f409d062225f90771fa4b386462585c8b5c246e4 SHA512 bcad5a83a47f8671c45e9f8c74a4860a140d52a544fd4b1d119f85c77bd732d5ca03c16ec9fb18741136a4f0df21fdf14f4e1870db4fad8213030b4c75376ba6
+EBUILD esphome-1.20.4.ebuild 2956 BLAKE2B 2c6d67ea3c1c0ac5fdff633b0636c7daa8d116bc7a32d3597703adf31aca75251a42243d49dff1d67b6a26064c7c0f2c456f587f59e1e9ebbdfb69221a9b2843 SHA512 c6c8cde698eec457c4206c506e555ed3121c0a856b37c177d052daaea73c26d126a0add2cc039e8cda579bdf65ba71e9b5cdec30bf9b044f937fb74b7459040c
 EBUILD esphome-9999.ebuild 3899 BLAKE2B b95184694faaced0b20ce5ae6059580d379dfc7df0c1ec63b2b4008c24dced09bdab2006fda17f32a7f37d56d87001b4b404517ab0ae69aee5d02fe68388a448 SHA512 b9fba1fb4ea6a9a52a1616869c9e582d115aa60ea404406ba53d54d8ae4eb80ec0fecd304c2cc32b3f213ad2f96fdab2ef6fa74d639c1c7dcbbc9d1e04fd8f2e
 MISC metadata.xml 447 BLAKE2B abbb8e7fe21d59bb5dd077af1a58f2ca1e9ba399df38d2b6f16e64e0b363006c31908312aa03df6597ca69a4e85fdcebfbf02fbb56e5bf2b5a792109df29189f SHA512 df303f1b969fb49ea13f77adb2105ea86ed2f883b0936643134978408d5fc86d5b23b47d1e19101c800fa615c75c09248712077f8a8fb71f4c1cf5f4023cac26
diff --git a/dev-embedded/esphome/esphome-1.16.1.ebuild b/dev-embedded/esphome/esphome-1.16.1.ebuild
deleted file mode 100644
index 09a67d642..000000000
--- a/dev-embedded/esphome/esphome-1.16.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit readme.gentoo-r1 distutils-r1
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/esphome/esphome.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/${P}/"
-else
-	MY_P=${P/_beta/b}
-	MY_PV=${PV/_beta/b}
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}/"
-fi
-
-DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
-HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 amd64-linux x86-linux"
-IUSE="+server test"
-
-RDEPEND="
-	server? ( acct-group/${PN} acct-user/${PN} )
-	$(python_gen_cond_dep '
-	  ~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
-	  ~dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	  ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	  ~dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
-	  dev-python/colorlog[${PYTHON_USEDEP}]
-	  server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] )
-	  ~dev-libs/protobuf-3.14.0
-	  ~dev-python/protobuf-python-3.14.0[${PYTHON_USEDEP}]
-	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
-	  ~dev-python/pytz-2021.1[${PYTHON_USEDEP}]
-	  ~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
-	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
-	  ~dev-embedded/platformio-5.0.4
-	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
-	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	')"
-
-	BDEPEND="
-	  $(python_gen_cond_dep '
-		  dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		  test? (
-			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/pytest[${PYTHON_MULTI_USEDEP}] )
-		')"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The ESPHome dashboard listens on port 6052
-ESPHome configuration is in: /etc/${PN}
-dashboard command line arguments are configured in: /etc/conf.d/${PN}
-logging is to: /var/log/${PN}/{dashboard,warnings}.log
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-DOCS="README.md"
-
-src_prepare() {
-	sed -e 's;voluptuous==0.12.0;voluptuous>=0.12.1;' \
-		-i requirements.txt || die
-	sed -e 's;PyYAML==5.3.1;PyYAML==5.4.1;' \
-		-i requirements.txt || die
-	sed -e 's;colorlog==4.6.2;colorlog;' \
-		-i requirements.txt || die
-	sed -e 's;protobuf==3.13.0;protobuf>=3.13.0;' \
-		-i requirements.txt || die
-	sed -e 's;pytz==2020.5;pytz==2021.1;' \
-		-i requirements.txt || die
-	eapply_user
-}
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	if use server; then
-		keepdir "/etc/${PN}"
-		fowners -R "${PN}:${PN}" "/etc/${PN}"
-		keepdir "/var/log/${PN}"
-		fowners -R "${PN}:${PN}" "/var/log/${PN}"
-		newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-		newinitd "${FILESDIR}/${PN}.init.d-r2" "${PN}"
-		readme.gentoo_create_doc
-	fi
-}
-
-python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
-}
-
-pkg_postinst() {
-	if use server; then
-		readme.gentoo_print_elog
-	fi
-}
diff --git a/dev-embedded/esphome/esphome-1.19.1.ebuild b/dev-embedded/esphome/esphome-1.20.4.ebuild
similarity index 88%
rename from dev-embedded/esphome/esphome-1.19.1.ebuild
rename to dev-embedded/esphome/esphome-1.20.4.ebuild
index 54a9048f5..d4bb7bd58 100644
--- a/dev-embedded/esphome/esphome-1.19.1.ebuild
+++ b/dev-embedded/esphome/esphome-1.20.4.ebuild
@@ -40,16 +40,16 @@ RDEPEND="
 	  ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
 	  ~dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
 	  server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] )
-	  dev-libs/protobuf
-	  dev-python/protobuf-python[${PYTHON_USEDEP}]
+	  ~dev-libs/protobuf-3.17.3
+	  ~dev-python/protobuf-python-3.17.3[${PYTHON_USEDEP}]
 	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
 	  ~dev-python/pytz-2021.1[${PYTHON_USEDEP}]
 	  ~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
 	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
 	  ~dev-embedded/platformio-5.1.1
-	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
+	  ~dev-embedded/esptool-3.1[${PYTHON_USEDEP}]
 	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
-	  ~dev-embedded/esphome-dashboard-20210617.1[${PYTHON_USEDEP}]
+	  ~dev-embedded/esphome-dashboard-20210728.0[${PYTHON_USEDEP}]
 	')"
 
 BDEPEND="
@@ -75,14 +75,6 @@ logging is to: /var/log/${PN}/{dashboard,warnings}.log
 support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
 "
 
-src_prepare() {
-	sed -e 's;protobuf==3.17.0;protobuf;' \
-		-i requirements.txt || die
-	sed -e 's;pytz==2021.1;pytz;' \
-		-i requirements.txt || die
-	eapply_user
-}
-
 python_install_all() {
 	dodoc ${DOCS}
 	distutils-r1_python_install_all