diff --git a/Cargo.lock b/Cargo.lock
index cd5eacb..dc56461 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -505,8 +505,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lettre"
-version = "0.10.0-rc.3"
-source = "git+https://github.com/TornaxO7/lettre/?branch=master#0aee778acf12a32c25585fb6d3e9a30afdfc09b3"
+version = "0.10.0-rc.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71d8da8f34d086b081c9cc3b57d3bb3b51d16fc06b5c848a188e2f14d58ac2a5"
 dependencies = [
  "base64 0.13.0",
  "fastrand",
@@ -519,7 +520,6 @@ dependencies = [
  "nom 7.0.0",
  "once_cell",
  "quoted_printable",
- "r2d2",
  "regex",
  "serde",
 ]
@@ -916,17 +916,6 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1238256b09923649ec89b08104c4dfe9f6cb2fea734a5db5384e44916d59e9c5"
 
-[[package]]
-name = "r2d2"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f"
-dependencies = [
- "log",
- "parking_lot 0.11.2",
- "scheduled-thread-pool",
-]
-
 [[package]]
 name = "radium"
 version = "0.5.3"
@@ -1102,15 +1091,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "scheduled-thread-pool"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7"
-dependencies = [
- "parking_lot 0.11.2",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 0fbaa5c..0e2fd11 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,17 @@ description = "Command-line interface for email management"
 version = "0.5.2"
 authors = ["soywod <clement.douin@posteo.net>"]
 edition = "2018"
+license-file = "LICENSE"
+readme = "README.md"
+categories = ["command-line-interface", "command-line-utilities", "email"]
+keywords = ["cli", "mail", "email", "client", "imap"]
+homepage = "https://github.com/soywod/himalaya/wiki"
+documentation = "https://github.com/soywod/himalaya/wiki"
+repository = "https://github.com/soywod/himalaya"
+
+[package.metadata.deb]
+priority = "optional"
+section = "mail"
 
 [dependencies]
 ammonia = "3.1.2"
@@ -15,9 +26,7 @@ env_logger = "0.8.3"
 html-escape = "0.2.9"
 imap = "3.0.0-alpha.4"
 imap-proto = "0.14.3"
-# This commit includes the de/serialization of the ContentType
-# lettre = { version = "0.10.0-rc.1", features = ["serde"] }
-lettre = { git = "https://github.com/TornaxO7/lettre/", branch = "master", features = ["serde"] }
+lettre = { version = "0.10.0-rc.1", features = ["serde"] }
 log = "0.4.14"
 mailparse = "0.13.6"
 native-tls = "0.2.8"
diff --git a/LICENSE b/LICENSE
index ad9998a..8cc414e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2020,2021 Clément DOUIN (AKA soywod) <clement.douin@posteo.net>
+Copyright © 2020,2021 soywod <clement.douin@posteo.net>
 
 All rights reserved.
 
diff --git a/README.md b/README.md
index 595e6ce..ad33b6b 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,12 @@ Possibilities are endless!
 ## Installation
 
 ```sh
+# From registry
+nix-env -i himalaya
+brew install himalaya
+cargo install himalaya
+
+# From script
 curl -sSL https://raw.githubusercontent.com/soywod/himalaya/master/install.sh | PREFIX=~/.local sh
 ```