diff --git a/.gitignore b/.gitignore
index bf4cf1d..15f9149 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,14 @@ Cargo.lock
 
 # Exclude all backup files
 *.bak
-
-# Autogenerated by cargo
-**/*.rs.bk
+*.bk
 
 # Exclude build result
 /target
-/build
\ No newline at end of file
+/build
+
+# Ignore vendor files
+/vendor
+
+# Do not include clap benches in the commits
+/benches/rustlang/claprs*
\ No newline at end of file
diff --git a/.gitpod.yml b/.gitpod.yml
index 990d49d..5ab9196 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,10 +1,6 @@
 image:
   file: gitpod/gitpod.Dockerfile
 
-ports:
-  - port: 6080
-    onOpen: open-preview
-
 vscode:
   extensions:
     - kalitaalexey.vscode-rust@0.4.2:iw09QffwKU6Xcxr7C2zalA==
diff --git a/Makefile b/Makefile
index 1fca784..a86635b 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,13 @@ all:
 # All build targets are expected in 'build/build-LANG' where 'LANG' is the unique identifier of the language used
 # FIXME: Replace 'exit 1' with helpful messages
 
+# Fetch files from third parties
+vendor:
+	@ [ ! -d vendor ] && mkdir vendor
+	@ [ ! -d vendor/rustlang ] && mkdir vendor/rustlang
+	@ git clone https://github.com/clap-rs/clap.git vendor/rustlang/clap-rs
+	@ for file in vendor/rustlang/clap-rs/benches/*; do cp "$$file" benches/rustlang/claprs-$${file##vendor/rustlang/clap-rs/benches/} || exit 1; done
+
 build:
 	@ printf 'FIXME: %s\n' "Build all targets if executed"
 	@ exit 1
@@ -102,5 +109,9 @@ check-vlang:
 ## CLEAN ##
 
 clean:
-	@ [ -d build ] && { rm -r build || exit 1 ;}
-	@ printf '%s\n' "Build directory has been cleaned"
\ No newline at end of file
+	@ [ -d build ] && rm -r build
+	@ printf '%s\n' "Build directory has been cleaned"
+
+clean-vendor:
+	@ # FIXME: Output helpful message if directory doesn't exists
+	@ [ -d vendor ] && rm -r vendor
\ No newline at end of file
diff --git a/gitpod/exherbo.Dockerfile b/gitpod/exherbo.Dockerfile
new file mode 100644
index 0000000..449fd74
--- /dev/null
+++ b/gitpod/exherbo.Dockerfile
@@ -0,0 +1 @@
+FROM scratch
\ No newline at end of file
diff --git a/gitpod/gitpod.Dockerfile b/gitpod/gitpod.Dockerfile
index 660e55e..d6cdcfc 100644
--- a/gitpod/gitpod.Dockerfile
+++ b/gitpod/gitpod.Dockerfile
@@ -4,13 +4,21 @@ FROM gitpod/workspace-full-vnc:latest
 ARG DEBIAN_FRONTEND=noninteractive
 
 # APT management (https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get)
-RUN apt-get update \
+RUN add-apt-repository \
+    "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+    $(lsb_release -cs) \
+    stable" \
+    && apt-get update \
     && apt-get upgrade -y \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - \
     && apt dist-upgrade -y \
-    && apt-get install -y shellcheck firefox tree xclip umbrello \
+    && apt-get install -y shellcheck docker-ce docker-ce-cli containerd.io firefox tree xclip umbrello \
     && rm -rf /var/lib/apt/lists/* \
     && apt autoremove -y
 
+# Add docker
+RUN 
+
 # Add custom functions
 RUN if ! grep -qF 'ix()' /etc/bash.bashrc; then printf '%s\n' \
 	'# Custom' \
diff --git a/src/subcoms/deploy/rustlang/deploy.rs b/src/subcoms/deploy/rustlang/deploy.rs
index f25e174..f2f80a9 100644
--- a/src/subcoms/deploy/rustlang/deploy.rs
+++ b/src/subcoms/deploy/rustlang/deploy.rs
@@ -1,3 +1,7 @@
+/*
+	FIXME-DOCS: Add docs
+*/
+
 use zernit_logger::fixme;
 
 pub fn deploy() {
diff --git a/src/subcoms/hijack/rustlang/hijack.rs b/src/subcoms/hijack/rustlang/hijack.rs
index ea8c345..9c967de 100644
--- a/src/subcoms/hijack/rustlang/hijack.rs
+++ b/src/subcoms/hijack/rustlang/hijack.rs
@@ -1,3 +1,7 @@
+/*
+	FIXME-DOCS: Add docs
+*/
+
 use zernit_logger::fixme;
 
 pub fn hijack() {
diff --git a/src/subcoms/list/rustlang/list.rs b/src/subcoms/list/rustlang/list.rs
index 1b3108e..af3c120 100644
--- a/src/subcoms/list/rustlang/list.rs
+++ b/src/subcoms/list/rustlang/list.rs
@@ -1,3 +1,7 @@
+/*
+	FIXME-DOCS: Add docs
+*/
+
 use zernit_logger::fixme;
 
 pub fn list() {
diff --git a/src/subcoms/remove/rustlang/remove.rs b/src/subcoms/remove/rustlang/remove.rs
index d49c2e8..8000d58 100644
--- a/src/subcoms/remove/rustlang/remove.rs
+++ b/src/subcoms/remove/rustlang/remove.rs
@@ -1,3 +1,7 @@
+/*
+	FIXME-DOCS: Add docs
+*/
+
 use zernit_logger::fixme;
 
 pub fn remove() {