diff --git a/default.nix b/default.nix
index 143597e..7f0b342 100644
--- a/default.nix
+++ b/default.nix
@@ -1,24 +1,29 @@
-{ lib, fetchgit
+{ lib
 , makeWrapper, makeDesktopItem, mkYarnPackage, callPackage
-, electron_16
+, electron
 , unstableGitUpdater
-, fetchFromGitHub
+, fetchFromGitea
+, fetchzip
 }:
 
 let
   executableName = "vikunja-desktop";
   version = "unstable";
 
-  src = fetchFromGitHub {
-    githubBase = "kolaente.dev"; # Using this until we can use fetchFromGitea
+  src = fetchFromGitea {
+    domain = "kolaente.dev";
     owner = "vikunja";
     repo = "desktop";
-    rev = "5f17d9b1dee64a2c90de059da2cae5a3154e90e0";
-    sha256 = "1vgy5cd85rszhb9f8rwpnhjr79ip9mvy375xdvah25vhhznb5g8x";
+    rev = "678afc46f8d7f5cde34617dd9ce01a590cdfd4d7";
+    sha256 = "sha256-9DLvlzEavCuLGEV7dPp/8J9DGN3RDS4EWxKdo83E8Ck=";
   };
 
-  electron = electron_16;
-  vikunja-frontend = callPackage ./frontend {};
+  #vikunja-frontend = callPackage ./frontend {};
+  vikunja-frontend = fetchzip {
+    url = "https://dl.vikunja.io/frontend/vikunja-frontend-unstable.zip";
+    sha256 = "sha256-L0YyYHzafo8DzrO2sE28hKH2uLAJGAM99BFg1W1O3ec=";
+    stripRoot = false;
+  };
 
 in mkYarnPackage rec {
   name = "vikunja-desktop-${version}";
@@ -63,10 +68,7 @@ in mkYarnPackage rec {
     desktopName = "Vikunja Desktop";
     genericName = "To-Do list app";
     comment = meta.description;
-    categories = "ProjectManagement;Office;";
-    extraEntries = ''
-      StartupWMClass=vikunja
-    '';
+    categories = [ "ProjectManagement" "Office" ];
   };