diff --git a/bin/core/imag-annotate/Cargo.toml b/bin/core/imag-annotate/Cargo.toml
index ddcb8972..601f6f9f 100644
--- a/bin/core/imag-annotate/Cargo.toml
+++ b/bin/core/imag-annotate/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 url = "1.2"
 toml = "0.4"
@@ -33,3 +32,8 @@ libimagentryannotation = { version = "0.6.0", path = "../../../lib/entry/libimag
 libimagentryedit = { version = "0.6.0", path = "../../../lib/entry/libimagentryedit" }
 libimagutil      = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/core/imag-diagnostics/Cargo.toml b/bin/core/imag-diagnostics/Cargo.toml
index f3cd6fec..81bc1e63 100644
--- a/bin/core/imag-diagnostics/Cargo.toml
+++ b/bin/core/imag-diagnostics/Cargo.toml
@@ -14,7 +14,6 @@ repository    = "https://github.com/matthiasbeyer/imag"
 homepage      = "http://imag-pim.org"
 
 [dependencies]
-clap = ">=2.17"
 toml = "0.4"
 toml-query = "0.6"
 
@@ -23,3 +22,8 @@ libimagrt        = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror     = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagentrylink = { version = "0.6.0", path = "../../../lib/entry/libimagentrylink" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["suggestions", "color"]
+
diff --git a/bin/core/imag-gps/Cargo.toml b/bin/core/imag-gps/Cargo.toml
index ecd1c492..43f80613 100644
--- a/bin/core/imag-gps/Cargo.toml
+++ b/bin/core/imag-gps/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 url = "1.2"
 toml = "0.4"
@@ -32,6 +31,11 @@ libimagerror     = { version = "0.6.0", path = "../../../lib/core/libimagerror"
 libimagentrygps = { version = "0.6.0", path = "../../../lib/entry/libimagentrygps" }
 libimagutil      = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
 [dev-dependencies.libimagutil]
 version          = "0.6.0"
 path = "../../../lib/etc/libimagutil"
diff --git a/bin/core/imag-grep/Cargo.toml b/bin/core/imag-grep/Cargo.toml
index 39ea9016..b4c74fc4 100644
--- a/bin/core/imag-grep/Cargo.toml
+++ b/bin/core/imag-grep/Cargo.toml
@@ -20,10 +20,14 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 regex = "0.2"
 
 libimagstore     = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
 libimagrt        = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror     = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/core/imag-init/Cargo.toml b/bin/core/imag-init/Cargo.toml
index cbe42a38..bd63902b 100644
--- a/bin/core/imag-init/Cargo.toml
+++ b/bin/core/imag-init/Cargo.toml
@@ -20,7 +20,11 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
 
 [dev-dependencies]
 toml = "0.4"
diff --git a/bin/core/imag-link/Cargo.toml b/bin/core/imag-link/Cargo.toml
index d56cb05b..2d393785 100644
--- a/bin/core/imag-link/Cargo.toml
+++ b/bin/core/imag-link/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 url = "1.5"
 toml = "0.4"
@@ -32,6 +31,11 @@ libimagerror     = { version = "0.6.0", path = "../../../lib/core/libimagerror"
 libimagentrylink = { version = "0.6.0", path = "../../../lib/entry/libimagentrylink" }
 libimagutil      = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
 [dev-dependencies.libimagutil]
 version          = "0.6.0"
 path = "../../../lib/etc/libimagutil"
@@ -44,3 +48,4 @@ path             = "../../../lib/core/libimagrt"
 default-features = false
 features         = ["testing"]
 
+
diff --git a/bin/core/imag-mv/Cargo.toml b/bin/core/imag-mv/Cargo.toml
index d2de054f..97a0bc80 100644
--- a/bin/core/imag-mv/Cargo.toml
+++ b/bin/core/imag-mv/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 
 libimagrt    = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
@@ -28,3 +27,8 @@ libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
 libimagentrylink = { version = "0.6.0", path = "../../../lib/entry/libimagentrylink" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/core/imag-ref/Cargo.toml b/bin/core/imag-ref/Cargo.toml
index 76b80a67..21001a4f 100644
--- a/bin/core/imag-ref/Cargo.toml
+++ b/bin/core/imag-ref/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 
 libimagrt          = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
@@ -29,3 +28,9 @@ libimagentryref    = { version = "0.6.0", path = "../../../lib/entry/libimagentr
 libimagentrylist   = { version = "0.6.0", path = "../../../lib/entry/libimagentrylist" }
 libimaginteraction = { version = "0.6.0", path = "../../../lib/etc/libimaginteraction" }
 libimagutil        = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/core/imag-store/Cargo.toml b/bin/core/imag-store/Cargo.toml
index 93a89f9b..453c41d6 100644
--- a/bin/core/imag-store/Cargo.toml
+++ b/bin/core/imag-store/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 error-chain = "0.11"
@@ -30,6 +29,11 @@ libimagrt    = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagutil  = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
 [features]
 early-panic = [ "libimagstore/early-panic" ]
 
diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml
index 02d821ea..a8975583 100644
--- a/bin/core/imag-tag/Cargo.toml
+++ b/bin/core/imag-tag/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 
@@ -30,6 +29,11 @@ libimagerror    = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagentrytag = { version = "0.6.0", path = "../../../lib/entry/libimagentrytag" }
 libimagutil     = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
 [dev-dependencies]
 toml-query = "0.6"
 env_logger = "0.5"
diff --git a/bin/core/imag-view/Cargo.toml b/bin/core/imag-view/Cargo.toml
index e31c34f7..00b883b4 100644
--- a/bin/core/imag-view/Cargo.toml
+++ b/bin/core/imag-view/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 toml-query = "0.6"
@@ -32,3 +31,8 @@ libimagrt        = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror     = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagentryview = { version = "0.6.0", path = "../../../lib/entry/libimagentryview" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/core/imag/Cargo.toml b/bin/core/imag/Cargo.toml
index 4d9462bf..2fbb07c2 100644
--- a/bin/core/imag/Cargo.toml
+++ b/bin/core/imag/Cargo.toml
@@ -21,7 +21,6 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 walkdir = "1"
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 toml-query = "0.6"
@@ -29,4 +28,8 @@ toml-query = "0.6"
 libimagrt    = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["suggestions", "color"]
 
diff --git a/bin/domain/imag-bookmark/Cargo.toml b/bin/domain/imag-bookmark/Cargo.toml
index 634fcb66..36fc53a8 100644
--- a/bin/domain/imag-bookmark/Cargo.toml
+++ b/bin/domain/imag-bookmark/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 toml-query = "0.6"
@@ -29,3 +28,9 @@ libimagrt        = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror     = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagbookmark  = { version = "0.6.0", path = "../../../lib/domain/libimagbookmark" }
 libimagutil      = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-contact/Cargo.toml b/bin/domain/imag-contact/Cargo.toml
index a7ca08cc..c29e1e56 100644
--- a/bin/domain/imag-contact/Cargo.toml
+++ b/bin/domain/imag-contact/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 toml-query = "0.6"
@@ -38,3 +37,8 @@ libimagentryref = { version = "0.6.0", path = "../../../lib/entry/libimagentryre
 libimagentryedit = { version = "0.6.0", path = "../../../lib/entry/libimagentryedit" }
 libimaginteraction    = { version = "0.6.0", path = "../../../lib/etc/libimaginteraction" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-diary/Cargo.toml b/bin/domain/imag-diary/Cargo.toml
index 922a52e2..0a18143c 100644
--- a/bin/domain/imag-diary/Cargo.toml
+++ b/bin/domain/imag-diary/Cargo.toml
@@ -21,7 +21,6 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 chrono = "0.4"
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 toml-query = "0.6"
@@ -36,3 +35,8 @@ libimaginteraction = { version = "0.6.0", path = "../../../lib/etc/libimagintera
 libimagutil        = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 libimagtimeui      = { version = "0.6.0", path = "../../../lib/etc/libimagtimeui" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-habit/Cargo.toml b/bin/domain/imag-habit/Cargo.toml
index 05f53409..f6fbacbf 100644
--- a/bin/domain/imag-habit/Cargo.toml
+++ b/bin/domain/imag-habit/Cargo.toml
@@ -21,7 +21,6 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 chrono = "0.4"
-clap = ">=2.17"
 log = "0.3"
 toml = "0.4"
 toml-query = "0.6"
@@ -37,3 +36,8 @@ libimagutil        = { version = "0.6.0", path = "../../../lib/etc/libimagutil"
 libimagtimeui      = { version = "0.6.0", path = "../../../lib/etc/libimagtimeui" }
 libimaghabit       = { version = "0.6.0", path = "../../../lib/domain/libimaghabit" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-log/Cargo.toml b/bin/domain/imag-log/Cargo.toml
index fb054d7e..f05e09ad 100644
--- a/bin/domain/imag-log/Cargo.toml
+++ b/bin/domain/imag-log/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.3"
 toml = "0.4"
 toml-query = "0.6"
@@ -30,3 +29,9 @@ libimagrt    = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagdiary = { version = "0.6.0", path = "../../../lib/domain/libimagdiary" }
 libimaglog = { version = "0.6.0", path = "../../../lib/domain/libimaglog" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-mail/Cargo.toml b/bin/domain/imag-mail/Cargo.toml
index 670daa1d..645a3b06 100644
--- a/bin/domain/imag-mail/Cargo.toml
+++ b/bin/domain/imag-mail/Cargo.toml
@@ -20,10 +20,15 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 
 libimagrt       = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror    = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagmail     = { version = "0.6.0", path = "../../../lib/domain/libimagmail" }
 libimagutil     = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-notes/Cargo.toml b/bin/domain/imag-notes/Cargo.toml
index 9d4091e8..3be6b59e 100644
--- a/bin/domain/imag-notes/Cargo.toml
+++ b/bin/domain/imag-notes/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 itertools = "0.7"
 
@@ -30,3 +29,9 @@ libimagnotes     = { version = "0.6.0", path = "../../../lib/domain/libimagnotes
 libimagentryedit = { version = "0.6.0", path = "../../../lib/entry/libimagentryedit" }
 libimagutil      = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 libimagstore     = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-timetrack/Cargo.toml b/bin/domain/imag-timetrack/Cargo.toml
index 562310d1..4aea4ec3 100644
--- a/bin/domain/imag-timetrack/Cargo.toml
+++ b/bin/domain/imag-timetrack/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 chrono = "0.4"
 filters = "0.2"
@@ -32,3 +31,9 @@ libimagrt        = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror     = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagtimetrack = { version = "0.6.0", path = "../../../lib/domain/libimagtimetrack" }
 libimagutil      = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/bin/domain/imag-todo/Cargo.toml b/bin/domain/imag-todo/Cargo.toml
index 9c2c3c80..d6ac7f5b 100644
--- a/bin/domain/imag-todo/Cargo.toml
+++ b/bin/domain/imag-todo/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 toml = "0.4"
 toml-query = "0.6"
@@ -29,3 +28,9 @@ is-match = "0.1"
 libimagrt    = { version = "0.6.0", path = "../../../lib/core/libimagrt" }
 libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagtodo  = { version = "0.6.0", path = "../../../lib/domain/libimagtodo" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml
index 5fd673d4..f429ee6f 100644
--- a/lib/core/libimagrt/Cargo.toml
+++ b/lib/core/libimagrt/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 env_logger = "0.5"
 toml = "0.4"
 xdg-basedir = "1.0"
@@ -36,6 +35,11 @@ libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagutil  = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
 libimaginteraction = { version = "0.6.0", path = "../../../lib/etc/libimaginteraction" }
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["suggestions", "color"]
+
 [dependencies.log]
 version = "0.4.0-rc.1"
 default-features = false
diff --git a/lib/entry/libimagentryfilter/Cargo.toml b/lib/entry/libimagentryfilter/Cargo.toml
index 0437a2c5..3befbfd7 100644
--- a/lib/entry/libimagentryfilter/Cargo.toml
+++ b/lib/entry/libimagentryfilter/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 filters = "0.2"
 itertools = "0.7"
 log = "0.4.0"
@@ -31,3 +30,9 @@ toml-query = "0.6"
 
 libimagstore    = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
 libimagentrytag = { version = "0.6.0", path = "../../../lib/entry/libimagentrytag" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/lib/entry/libimagentrylist/Cargo.toml b/lib/entry/libimagentrylist/Cargo.toml
index 36fdadf0..55dfaa17 100644
--- a/lib/entry/libimagentrylist/Cargo.toml
+++ b/lib/entry/libimagentrylist/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 prettytable-rs = "0.6.*"
 error-chain = "0.11"
@@ -28,3 +27,9 @@ error-chain = "0.11"
 libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
 libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
 libimagutil  = { version = "0.6.0", path = "../../../lib/etc/libimagutil" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/lib/entry/libimagentrytag/Cargo.toml b/lib/entry/libimagentrytag/Cargo.toml
index 632a93df..0890776c 100644
--- a/lib/entry/libimagentrytag/Cargo.toml
+++ b/lib/entry/libimagentrytag/Cargo.toml
@@ -20,7 +20,6 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 log = "0.4.0"
 regex = "0.2"
 toml = "0.4"
@@ -32,3 +31,9 @@ error-chain = "0.11"
 
 libimagstore = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
 libimagerror = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/lib/etc/libimaginteraction/Cargo.toml b/lib/etc/libimaginteraction/Cargo.toml
index f6031911..3ba74e0b 100644
--- a/lib/etc/libimaginteraction/Cargo.toml
+++ b/lib/etc/libimaginteraction/Cargo.toml
@@ -21,7 +21,6 @@ maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
 ansi_term = "0.10"
-clap = ">=2.17"
 interactor = "0.1"
 lazy_static = "0.2"
 log = "0.4.0"
@@ -33,3 +32,9 @@ serde_json = "1"
 
 libimagstore       = { version = "0.6.0", path = "../../../lib/core/libimagstore" }
 libimagerror       = { version = "0.6.0", path = "../../../lib/core/libimagerror" }
+
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+
diff --git a/lib/etc/libimagtimeui/Cargo.toml b/lib/etc/libimagtimeui/Cargo.toml
index 46ec5bca..e2a8c959 100644
--- a/lib/etc/libimagtimeui/Cargo.toml
+++ b/lib/etc/libimagtimeui/Cargo.toml
@@ -20,9 +20,13 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-clap = ">=2.17"
 lazy_static = "0.2"
 log = "0.4.0"
 chrono = "0.4"
 regex = "0.2"
 
+[dependencies.clap]
+version = ">=2.17"
+default-features = false
+features = ["color", "suggestions"]
+