diff --git a/README.md b/README.md
index b50388ab1..58c635658 100644
--- a/README.md
+++ b/README.md
@@ -39,9 +39,9 @@ They mix up python code with some c++, currently i have no idea how to handle th
 First add the Overlay to `/etc/portage/repos.conf/homeassistant.conf`, make sure not to interfere with your gentoo repo, which is at `/usr/portage/gentoo` in my boxes, because i _always_ have more than one repo active by default:
 ```
 [HomeAssistantRepository]
-location = /usr/[local/]portage/homeassistant
+location = /usr/local/portage/homeassistant
 sync-type = git
-sync-uri = https://git.in.edevau.net/onkelbeh/HomeAssistantRepository.git
+sync-uri = https://git.edevau.net/onkelbeh/HomeAssistantRepository.git
 auto-sync = yes
 sync-rsync-verify-metamanifest = no
 ```
diff --git a/app-misc/homeassistant/Manifest b/app-misc/homeassistant/Manifest
index ec827b66c..9a42e371f 100644
--- a/app-misc/homeassistant/Manifest
+++ b/app-misc/homeassistant/Manifest
@@ -33,6 +33,6 @@ EBUILD homeassistant-0.98.4.ebuild 11614 BLAKE2B 7cd3bddede953450073d5d98a12e5b7
 EBUILD homeassistant-0.98.5.ebuild 11614 BLAKE2B 8701e2ee1ccdc026380e4748cf04f21137328abec3c5b79323f4d46da06ad38aba4951d66c75a7643805095ff9f35b6fc8ed540124929f706af5f081e040ff6a SHA512 256465b32eaaad6f7a05ac3244b327325f803c652b8ed27ababb2192a1fb92810dc9d858783afb95fecbb89fcbec5b6c04c475137d42cbeb6a0b93203622bbde
 EBUILD homeassistant-0.99.0.ebuild 11615 BLAKE2B ec802000dbad53a64d1d4667d7692c3ce8b7c38a5e34ea7f458a44e37a8ccd920740b46274065e568edd46d324f37b96ed74ff860833a415ffd3516c392957e4 SHA512 a599e56a5512878a2e31bf191f3fc00dc478e60403aa1f8caa86743f5d89922dda72f860ca726500a9ae3f6264df15f9bd41f552a99827fd9762528f7ec21abc
 EBUILD homeassistant-0.99.1.ebuild 11615 BLAKE2B e99aa604b5e799d8b4a4978ece8bf165718483ccb130d0f0a36737222687ac0c14a2d810af2ebf3d6f851a45090663519f0c17911407575221a3e94bea42649a SHA512 785a9cea6908697212ddac12a0c51634ccfd6893514fe72a5bc0420ffcf15a4409a1cca695915b9c1609d24b53cd70a0030c590ea9021cc058012adeefc918ae
-EBUILD homeassistant-0.99.2.ebuild 11615 BLAKE2B f8f4a8caf145f96c3075233646208f120d47acdd65d5cb19711a9507ea50f4fc6c629acafd31fce605892c758ce62ea14507122de43609e7a82eb7682dfa924c SHA512 3b3d0fdbc674565ed5cd3bb1033759f4adc039f78c20c10ca03974e688ae980ecdee786c178a925a2fa5da36ac0ae976251011396f031959f328287c755e226c
+EBUILD homeassistant-0.99.2.ebuild 11616 BLAKE2B 33eddd4d8bb93c40be90ae8e11bdc5d9d32df74e8cd4204a8f81117372800aca53664e9eb88ca729929bbddfd61880fb350592a0f935f43bfea3b22980486adb SHA512 a585fe6cf0aeb8300cf685c1be475f02a3629b46d54987ce5114811d4a5da136584a7febd8682f83081ab1d5c94e21bc4a5b247ee671da5666709245e4ad16d9
 EBUILD homeassistant-0.99.3.ebuild 11669 BLAKE2B 784e0cf8c026d9f66558c1b7e00e59db6254a07310425904b8a819036bcacee6422dcd30fcff3997aef63e7de335e42d975a40f3a478cf275dbe9984158c4f85 SHA512 c5757c62fd783483abb66835159b956027465618b97f4f9064f27299b0f7099a8a49945827037b57382a3b59b4a1a450b4bb29f3909c6ca90583c5e5b5de0ee9
 MISC metadata.xml 4234 BLAKE2B 846579a2070bb69b7361d0ad7434e6a349026c6abac055c0e6f6603ccdbd3939b9b88817c55eba1aae66b5b9f68f1a960dbd58c6eefdbf0738e4632fe998219a SHA512 af6e3061ca4f1e11c0d3dc0f30a0391630e09656b4aac9f931c4c432bcd8ea0c38e454791a4aa175a6932a87fe9216ab2e9113b765c6a73a675573ef1a003f8e
diff --git a/app-misc/homeassistant/homeassistant-0.99.2.ebuild b/app-misc/homeassistant/homeassistant-0.99.2.ebuild
index f7e3f951f..99d9861b3 100644
--- a/app-misc/homeassistant/homeassistant-0.99.2.ebuild
+++ b/app-misc/homeassistant/homeassistant-0.99.2.ebuild
@@ -102,7 +102,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/python-jose-cryptodome-1.3.2[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
 	=dev-python/RestrictedPython-4.0[${PYTHON_USEDEP}]
-	~dev-python/setuptools-40.8.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-40.8.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
 	~dev-python/sqlalchemy-1.3.8[${PYTHON_USEDEP}]
 	~dev-python/transitions-0.6.9[${PYTHON_USEDEP}]
diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest
index 9ea3cd915..e5dc80cfa 100644
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@@ -14,5 +14,6 @@ EBUILD esphome-1.12.0.ebuild 2273 BLAKE2B 0905ed218237d20e83ccda0b4ac6b922371e50
 EBUILD esphome-1.12.0_beta3.ebuild 2274 BLAKE2B cddbb2597eafa9ed46692315209e698ca687a4815c05593b21c9790f321e94192f466edb79f3cabfe06420dae8a866d5b63318c593a59be814582a2b16a683af SHA512 6945b2eb911ab72dc9aac75dcfbd0f7efe379f9870db7cb5e5e07b186f64881a4743535ce897a4133cb54c2cb6f92438957a12bd5d39cce331c8e70ecb0cc54b
 EBUILD esphome-1.12.0_beta4.ebuild 2274 BLAKE2B cddbb2597eafa9ed46692315209e698ca687a4815c05593b21c9790f321e94192f466edb79f3cabfe06420dae8a866d5b63318c593a59be814582a2b16a683af SHA512 6945b2eb911ab72dc9aac75dcfbd0f7efe379f9870db7cb5e5e07b186f64881a4743535ce897a4133cb54c2cb6f92438957a12bd5d39cce331c8e70ecb0cc54b
 EBUILD esphome-1.13.2.ebuild 2272 BLAKE2B 0249ec14aada441d43cd3509f5c3896e1b500f9196f6337aeab2fc389315c6d93dc30280bc1fc1a2dc6bdd14d852361f3f424036be8a8421181b1ea969c81510 SHA512 515fc7442641734b11a0b898add8389a3825ce6fb4751c754262b99dbdaa03cb5fbcc6a43d876e17dc01706b7e70ba4e035ffb5dfd778166fc4d39d50a5e7451
-EBUILD esphome-1.13.6.ebuild 2272 BLAKE2B 0249ec14aada441d43cd3509f5c3896e1b500f9196f6337aeab2fc389315c6d93dc30280bc1fc1a2dc6bdd14d852361f3f424036be8a8421181b1ea969c81510 SHA512 515fc7442641734b11a0b898add8389a3825ce6fb4751c754262b99dbdaa03cb5fbcc6a43d876e17dc01706b7e70ba4e035ffb5dfd778166fc4d39d50a5e7451
+EBUILD esphome-1.13.6.ebuild 2272 BLAKE2B 2d778ab51ef99d8556dfa35bd174c67d1cd77e1ba8d72d562b408226f6cc025b8efacb3b410aa9f4cf8d26bff4d9b53cd73dcbc8377f2e6869fab01e1f8d3d61 SHA512 d56f589a11c569698427dd43b35d490519a34db8e427e8443970ded3ffbd2572764444ac1ce3e718e66f3b454400267119f6c06a671d568b553fe83623291167
+EBUILD esphome-9999.ebuild 2380 BLAKE2B ad5232859056ebe65573b1199192457641ca2d0c1b6a8f28b59d7fe88bbb76a028c5cfc9cfc0f52e48a8cd85c4e41a97b49badffed4e825367ec7287cb5fe0fb SHA512 44319f5b58d9cbdc7e80553c6e63efe22173769b340854aeec7c5da041a6d4ca6426b2080c238d10c6b22423eb2c9f9269bef904097441afb69880ec9914d379
 MISC metadata.xml 361 BLAKE2B 0752256cba8c0b90e3dcce71eb5c3a8307adbab281c5229abc8aaa21d4ee1b94f2f898ccd9c43c4ff488a995f2e6271a5aa651f78a7e6d35cba0cc6302d387ed SHA512 80327a1c6833cadd82cfcbfa31e48661a8c11b38831c4c6cef002523244be67ee50585c3a10903ef6126974c4f36347f08e39c5a64ab43ad7ebb632106e1c4c1
diff --git a/dev-embedded/esphome/esphome-1.13.6.ebuild b/dev-embedded/esphome/esphome-1.13.6.ebuild
index f0843e3fe..431a8e99c 100644
--- a/dev-embedded/esphome/esphome-1.13.6.ebuild
+++ b/dev-embedded/esphome/esphome-1.13.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit user readme.gentoo-r1 distutils-r1
 
@@ -25,7 +25,7 @@ DEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/tzlocal-1.5.1[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.11.5[${PYTHON_USEDEP}]
-	>=dev-embedded/platformio-3.6.5
+	>=dev-embedded/platformio-4.0.1
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/paho-mqtt-1.3.1[${PYTHON_USEDEP}]
 	>=dev-python/colorlog-3.1.2[${PYTHON_USEDEP}]
diff --git a/dev-embedded/esphome/esphome-9999.ebuild b/dev-embedded/esphome/esphome-9999.ebuild
new file mode 100644
index 000000000..1090fe917
--- /dev/null
+++ b/dev-embedded/esphome/esphome-9999.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit user readme.gentoo-r1 distutils-r1
+
+if [[ ${PV} == *9999* ]]; then
+    inherit git-r3
+fi
+
+# MY_P=${P/_beta/b}
+# MY_PV=${PV/_beta/b}
+
+DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
+HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
+
+# SRC_URI="https://github.com/esphome/esphome/archive/dev.zip"
+EGIT_REPO_URI="https://github.com/esphome/esphome.git"
+EGIT_BRANCH="dev"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="server test"
+
+RDEPEND=""
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.11.5[${PYTHON_USEDEP}]
+	>=dev-embedded/platformio-4.0.1
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/paho-mqtt-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/colorlog-3.1.2[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
+	>=dev-embedded/esptool-2.6[${PYTHON_USEDEP}]
+	>=dev-python/typing-3.6.6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+	>=dev-python/ifaddr-0.1.6[${PYTHON_USEDEP}]
+	server? ( >=dev-python/ifaddr-0.1.6 )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_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
+"
+
+S="${WORKDIR}/${P}/"
+
+DOCS="README.md"
+
+pkg_setup() {
+	if use server; then
+		enewgroup "${PN}"
+		enewuser "${PN}" -1 -1 "/etc/${PN}" "${PN}"
+	fi
+}
+
+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-r1" "${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
+}