diff --git a/mail-client/mutt-wizard/Manifest b/mail-client/mutt-wizard/Manifest
index dcb4f04c02..7ceed0815a 100644
--- a/mail-client/mutt-wizard/Manifest
+++ b/mail-client/mutt-wizard/Manifest
@@ -1 +1 @@
-DIST mutt-wizard-0_pre20200313.tar.gz 31817 BLAKE2B a4e4cef43e879c8fbfb13e8a66ba57816f42e7fe1269bb9162dc82ac04715a81a78bf4e83c3f85a5c72c1a6214585e7850236791ed0e44d3ea08b7a4c9ca895d SHA512 b6ef413756bf85b9180534537b7794a9641d666017da43dfbaef48d7ea6a618ce2bc9af9563556445a3471b3c0c30f34886bf5e1099b8135c6c3cc8a85330004
+DIST mutt-wizard-0_pre20200412.tar.gz 31845 BLAKE2B db798819fb403e0e8cc473dd31fecc4c4ad62ef0748b714fb9c11555bad4865ba8e43795f9cfc553ec103fa80dee51acd09c59991836b974bbfccca4d465212d SHA512 a37c85e23b473834a2f4c95666ae019323cac40115aeb8d7265de26ed0c4456199870909ba9aa4fb10cac5606892382f3b3efa55afcf6494ef900a2881cd0dd1
diff --git a/mail-client/mutt-wizard/mutt-wizard-0_pre20200313.ebuild b/mail-client/mutt-wizard/mutt-wizard-0_pre20200412.ebuild
similarity index 84%
rename from mail-client/mutt-wizard/mutt-wizard-0_pre20200313.ebuild
rename to mail-client/mutt-wizard/mutt-wizard-0_pre20200412.ebuild
index 78c0f38f54..d171f864c2 100644
--- a/mail-client/mutt-wizard/mutt-wizard-0_pre20200313.ebuild
+++ b/mail-client/mutt-wizard/mutt-wizard-0_pre20200412.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="A system for automatically configuring mutt and isync"
 HOMEPAGE="https://github.com/LukeSmithxyz/mutt-wizard"
 
-COMMIT=5ace69bdf56da3883b2666247aac462b0df5b020
+COMMIT=7c980ec6fbc4e51f3fa663a541de4ff5a4f6587f
 SRC_URI="https://github.com/LukeSmithxyz/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
@@ -28,3 +28,8 @@ RDEPEND="
 src_compile() {
 	return 0;
 }
+
+src_install() {
+	# Do not install to /usr/local
+	PREFIX="/usr" default
+}
diff --git a/net-wireless/eiwd/eiwd-1.6.1.ebuild b/net-wireless/eiwd/eiwd-1.6.1.ebuild
index b00e9d12fe..de51dc21be 100644
--- a/net-wireless/eiwd/eiwd-1.6.1.ebuild
+++ b/net-wireless/eiwd/eiwd-1.6.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+system-ell"
 
-COMMON_DEPEND="system-ell? ( ~dev-libs/ell-0.30 )"
+COMMON_DEPEND="system-ell? ( >=dev-libs/ell-0.31 )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	!net-wireless/iwd
diff --git a/net-wireless/eiwd/eiwd-9999.ebuild b/net-wireless/eiwd/eiwd-9999.ebuild
index 90565bddc6..223e00e569 100644
--- a/net-wireless/eiwd/eiwd-9999.ebuild
+++ b/net-wireless/eiwd/eiwd-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+system-ell"
 
-COMMON_DEPEND="system-ell? ( ~dev-libs/ell-0.30 )"
+COMMON_DEPEND="system-ell? ( >=dev-libs/ell-0.31 )"
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}
 	!net-wireless/iwd
diff --git a/profiles/make.defaults b/profiles/make.defaults
new file mode 100644
index 0000000000..9b93bcdec8
--- /dev/null
+++ b/profiles/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# System-wide defaults for the Portage system
+# See portage(5) manpage
+
+# Env vars to expand into USE vars.
+USE_EXPAND="GEOIDS_DATASETS GRAVITY_MODELS MAGNETIC_MODELS PRECISION"
+