diff --git a/overlays/blesh.nix b/overlays/blesh.nix
index ee25e015..86942d1e 100644
--- a/overlays/blesh.nix
+++ b/overlays/blesh.nix
@@ -1,10 +1,40 @@
 final: prev: {
   blesh = prev.blesh.overrideAttrs (oldAttrs: rec {
     #inherit (prev.sources.blesh-nvfetcher) version src;
-    version = "0.4.0-devel3";
-    src = prev.fetchzip {
-      url = "https://github.com/akinomyoga/ble.sh/releases/download/v${version}/ble-${version}.tar.xz";
-      sha256 = "sha256-kGLp8RaInYSrJEi3h5kWEOMAbZV/gEPFUjOLgBuMhCI=";
+    version = "0.4.0-devel4";
+    src = prev.fetchFromGitHub {
+      owner = "akinomyoga";
+      repo = "ble.sh";
+      rev = "f16c0d807c8e1fe26fa5d990b561829382cbdc72";
+      hash = "sha256-+tcM1z9uD7WXA7CfHmTbcPRcZfmXZ+Y7y6Bj4QA3f+4=";
+      fetchSubmodules = true;
+      leaveDotGit = true;
     };
+    dontBuild = false;
+    buildInputs = [prev.git];
+    patchPhase = ''
+      substituteInPlace GNUmakefile \
+        --replace "git submodule update --init --recursive" ""
+    '';
+    nativeCheckInputs = oldAttrs.nativeCheckInputs ++ [prev.busybox];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p "$out/share/blesh/lib"
+
+      cat <<EOF >"$out/share/blesh/lib/_package.sh"
+      _ble_base_package_type=nix
+
+      function ble/base/package:nix/update {
+        echo "Ble.sh is installed by Nix. You can update it there." >&2
+        return 1
+      }
+      EOF
+
+      make install INSDIR=$out/share/blesh
+
+      runHook postInstall
+    '';
   });
 }
diff --git a/overlays/element-desktop.nix b/overlays/element-desktop.nix
new file mode 100644
index 00000000..1349c0df
--- /dev/null
+++ b/overlays/element-desktop.nix
@@ -0,0 +1,5 @@
+final: prev: {
+  element-desktop = prev.element-desktop.override {
+    electron = prev.electron_24;
+  };
+}
diff --git a/overlays/signal-desktop.nix b/overlays/signal-desktop.nix
index efdb86f2..2f6085cd 100644
--- a/overlays/signal-desktop.nix
+++ b/overlays/signal-desktop.nix
@@ -2,8 +2,8 @@ final: prev: {
   signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec {
     pname = "signal-desktop";
     dir = "Signal";
-    version = "6.19.0";
-    hash = "sha256-D54A9z5+Y3ns363Zl8IChnykEBhOz8aJCgTCQIjq/fc=";
+    version = "6.21.0";
+    hash = "sha256-MDjh2slEmGCMn0Q4YsIzVQO2I7ZE5XUJX5qH4OYFFxw=";
 
     src = prev.fetchurl {
       url = "https://updates.signal.org/desktop/apt/pool/main/s/${pname}/${pname}_${version}_amd64.deb";