diff --git a/flake.lock b/flake.lock
index 4df7e70f..81f49b61 100644
--- a/flake.lock
+++ b/flake.lock
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713782422,
-        "narHash": "sha256-cSi/PSlbDiLw9pxz6vm0hYYkfLIchdfPvQobT0BF1Zg=",
+        "lastModified": 1713998314,
+        "narHash": "sha256-93mAhnQ/pXFmHEcyktDIdwhdabp/2ZycM0rCz5WLcaY=",
         "owner": "accentor",
         "repo": "api",
-        "rev": "ebd6037bc1483fac03366847bda025095444e0dd",
+        "rev": "5738ee99ef2a3ce95b8e86f192d228464ad25069",
         "type": "github"
       },
       "original": {
@@ -72,11 +72,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1713946508,
-        "narHash": "sha256-AKiQx5cLcx0DcHnw6uxlJ25Zd4qblQoQpdfJ/jhwd9I=",
+        "lastModified": 1713998380,
+        "narHash": "sha256-h24xP0NRPXLNrxZt/aw12HxNMxBlUso4VlR/ZLn136Q=",
         "owner": "accentor",
         "repo": "web",
-        "rev": "2f1f52f0b37f72195ec47cefb2509e1c5090f9d6",
+        "rev": "b62174da3abc85d0bc05012aeca3b558df0efd06",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1713978400,
-        "narHash": "sha256-Q/sRS7bKVuaqJWtVwQl3DcjNdW8KikSYx/khPvbgFbc=",
+        "lastModified": 1714012795,
+        "narHash": "sha256-UCst+RoX67NhDgfCcJwOk94ZEjDg09wh1i0gs83Nrvc=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "2426b41b8b6be7ccac87159476b109c81894d0bf",
+        "rev": "bf2ab188e525dd20cdd9448e270fd442cea56949",
         "type": "github"
       },
       "original": {
@@ -362,11 +362,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713906585,
-        "narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=",
+        "lastModified": 1713992342,
+        "narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa",
+        "rev": "2f072c127c041eec36621b8e38a531fe0fe07961",
         "type": "github"
       },
       "original": {
@@ -473,11 +473,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713714899,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "lastModified": 1713895582,
+        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
         "type": "github"
       },
       "original": {
@@ -521,11 +521,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1713988419,
-        "narHash": "sha256-wJqzudiiJ8lwxc3JlFJlGYTAvGObumw1ifgechzUuEM=",
+        "lastModified": 1714021881,
+        "narHash": "sha256-1PCS+QSjMJW0ve7/czqo6XK8aI844Vf1I45Ilw0GzOQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "b9dbb37557ddb95abd4bf780651c16e3d1923069",
+        "rev": "70ac3c0d904dbcf825e13f1639fda317a884acbc",
         "type": "github"
       },
       "original": {
@@ -738,11 +738,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713782188,
-        "narHash": "sha256-3MbXRoItWlxWQOIWOfecJAhEt5kfdjraf1f/0bB5cHE=",
+        "lastModified": 1713994504,
+        "narHash": "sha256-up3dtqUPQ6MNrkDzMGv1TjYATt+eCLkxuQpkOOGaaVo=",
         "owner": "chvp",
         "repo": "tetris",
-        "rev": "10aa79c5dfec8c5d774dbe02f72995e817d4d0fc",
+        "rev": "1e1ae71fb8cedfe3bb6712b66e138107d7d228a3",
         "type": "github"
       },
       "original": {
diff --git a/machines/kharbranth/default.nix b/machines/kharbranth/default.nix
index 54bde816..2e93476c 100644
--- a/machines/kharbranth/default.nix
+++ b/machines/kharbranth/default.nix
@@ -43,7 +43,7 @@
     games.enable = true;
     graphical.enable = true;
     programs = {
-      calibre.enable = false;
+      calibre.enable = true;
       eid.enable = true;
       element.enable = true;
       hledger.enable = true;
diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix
index 855688f2..14c2d4f7 100644
--- a/machines/kholinar/default.nix
+++ b/machines/kholinar/default.nix
@@ -39,7 +39,7 @@
     games.enable = true;
     graphical.enable = true;
     programs = {
-      calibre.enable = false;
+      calibre.enable = true;
       eid.enable = true;
       element.enable = true;
       hledger.enable = true;
diff --git a/patches/304770.patch b/patches/304770.patch
deleted file mode 100644
index 46b6daa4..00000000
--- a/patches/304770.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
-index 68f75d734bd7ff..0fe78286dc5e03 100644
---- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
-+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json
-@@ -1,6 +1,6 @@
- {
-   "name": "matrix-hookshot",
--  "version": "5.2.1",
-+  "version": "5.3.0",
-   "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.",
-   "main": "lib/app.js",
-   "repository": "https://github.com/matrix-org/matrix-hookshot",
-@@ -55,6 +55,7 @@
-     "cors": "^2.8.5",
-     "express": "^4.18.2",
-     "figma-js": "^1.14.0",
-+    "helmet": "^7.1.0",
-     "http-status-codes": "^2.2.0",
-     "ioredis": "^5.2.3",
-     "jira-client": "^8.2.2",
-@@ -114,6 +115,6 @@
-     "ts-jest": "^29.1.1",
-     "ts-node": "^10.9.1",
-     "typescript": "^5.3.3",
--    "vite": "^5.0.12"
-+    "vite": "^5.0.13"
-   }
- }
-diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
-index 08607edb950555..5ab03440fc91e4 100644
---- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
-+++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json
-@@ -1,6 +1,6 @@
- {
--  "version": "5.2.1",
--  "srcHash": "sha256-yh8erXI1r9BqdJvEdk2WuBojXUK7VQf9bc4GQ2a2vIo=",
--  "yarnHash": "0nps2wbpkaivi9wb9zcqsrg77w9mm7inls9jqsx7xmyn4ashbs1p",
--  "cargoHash": "sha256-3euxhE9Y3N9bxo5S+l2mhYF575EoC/A5pH/mD+Ey86g="
-+  "version": "5.3.0",
-+  "srcHash": "sha256-saniKtauX+9lZxPZOtGLlk4//ht0njgWfnOIJsdQlOQ=",
-+  "yarnHash": "1a52j61mb5hq62wd681zqpw7fkjhabqicdyvmam4jdd2qz2vh0w1",
-+  "cargoHash": "sha256-ffjAsYOML+mDBToaVVuxjLUUEpGmBzWB0nN4jzOO098="
- }