diff --git a/Cargo.lock b/Cargo.lock
index 08221a4..48712e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -51,9 +51,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "3.0.0-beta.5"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
+checksum = "f6f34b09b9ee8c7c7b400fe2f8df39cafc9538b03d6ba7f4ae13e4cb90bfbb7d"
 dependencies = [
  "atty",
  "bitflags",
@@ -64,16 +64,15 @@ dependencies = [
  "strsim",
  "termcolor",
  "textwrap",
- "unicase",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.5"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
+checksum = "41a0645a430ec9136d2d701e54a95d557de12649a9dd7109ced3187e648ac824"
 dependencies = [
- "heck",
+ "heck 0.4.0",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -231,6 +230,12 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -419,9 +424,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "4.2.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
+checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
 dependencies = [
  "memchr",
 ]
@@ -676,7 +681,7 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb"
 dependencies = [
- "heck",
+ "heck 0.3.3",
  "proc-macro2",
  "quote",
  "syn",
@@ -727,9 +732,6 @@ name = "textwrap"
 version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
-dependencies = [
- "unicode-width",
-]
 
 [[package]]
 name = "tinyvec"
@@ -755,15 +757,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.7"
diff --git a/Cargo.toml b/Cargo.toml
index 2f39628..d14b4c5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,8 @@ version = "=0.13.25"
 version = "=2.1.0"
 
 [dependencies.clap]
-version = "=3.0.0-beta.5"
+version = "=3.0.5"
+features = ["derive", "cargo"]
 
 [dependencies.console]
 version = "=0.15.0"
diff --git a/depcheck/update-cargo-dependencies.py b/depcheck/update-cargo-dependencies.py
index 2e50f80..8f8f533 100755
--- a/depcheck/update-cargo-dependencies.py
+++ b/depcheck/update-cargo-dependencies.py
@@ -10,9 +10,7 @@ import tomlkit
 
 INDEX_DIR = "crates.io-index"
 
-AUTOUPDATE_DISABLED = [
-    "clap",
-]
+AUTOUPDATE_DISABLED = []
 
 if os.path.exists(INDEX_DIR):
     subprocess.run(
diff --git a/src/grm/cmd.rs b/src/grm/cmd.rs
index 017357b..7588499 100644
--- a/src/grm/cmd.rs
+++ b/src/grm/cmd.rs
@@ -7,10 +7,8 @@ use clap::{AppSettings, Parser};
     author = clap::crate_authors!("\n"),
     about = clap::crate_description!(),
     long_version = clap::crate_version!(),
-    license = clap::crate_license!(),
     setting = AppSettings::DeriveDisplayOrder,
     setting = AppSettings::PropagateVersion,
-    setting = AppSettings::HelpRequired,
 )]
 pub struct Opts {
     #[clap(subcommand)]
@@ -51,7 +49,7 @@ pub struct Sync {
         short,
         long,
         default_value = "./config.toml",
-        about = "Path to the configuration file"
+        help = "Path to the configuration file"
     )]
     pub config: String,
 }
@@ -59,13 +57,13 @@ pub struct Sync {
 #[derive(Parser)]
 #[clap()]
 pub struct OptionalConfig {
-    #[clap(short, long, about = "Path to the configuration file")]
+    #[clap(short, long, help = "Path to the configuration file")]
     pub config: Option<String>,
 }
 
 #[derive(Parser)]
 pub struct Find {
-    #[clap(about = "The path to search through")]
+    #[clap(help = "The path to search through")]
     pub path: String,
 }
 
@@ -97,23 +95,23 @@ pub enum WorktreeAction {
 
 #[derive(Parser)]
 pub struct WorktreeAddArgs {
-    #[clap(about = "Name of the worktree")]
+    #[clap(help = "Name of the worktree")]
     pub name: String,
 
-    #[clap(short = 't', long = "track", about = "Remote branch to track")]
+    #[clap(short = 't', long = "track", help = "Remote branch to track")]
     pub track: Option<String>,
 
-    #[clap(long = "--no-track", about = "Disable tracking")]
+    #[clap(long = "--no-track", help = "Disable tracking")]
     pub no_track: bool,
 }
 #[derive(Parser)]
 pub struct WorktreeDeleteArgs {
-    #[clap(about = "Name of the worktree")]
+    #[clap(help = "Name of the worktree")]
     pub name: String,
 
     #[clap(
         long = "force",
-        about = "Force deletion, even when there are uncommitted/unpushed changes"
+        help = "Force deletion, even when there are uncommitted/unpushed changes"
     )]
     pub force: bool,
 }
@@ -132,18 +130,15 @@ pub struct WorktreeFetchArgs {}
 
 #[derive(Parser)]
 pub struct WorktreePullArgs {
-    #[clap(
-        long = "--rebase",
-        about = "Perform a rebase instead of a fast-forward"
-    )]
+    #[clap(long = "--rebase", help = "Perform a rebase instead of a fast-forward")]
     pub rebase: bool,
 }
 
 #[derive(Parser)]
 pub struct WorktreeRebaseArgs {
-    #[clap(long = "--pull", about = "Perform a pull before rebasing")]
+    #[clap(long = "--pull", help = "Perform a pull before rebasing")]
     pub pull: bool,
-    #[clap(long = "--rebase", about = "Perform a rebase when doing a pull")]
+    #[clap(long = "--rebase", help = "Perform a rebase when doing a pull")]
     pub rebase: bool,
 }