24 files changed, 72 insertions, 144 deletions
diff --git a/src/anaconda/README.md b/src/anaconda/README.md
index 4145d90..2e060bb 100644
--- a/src/anaconda/README.md
+++ b/src/anaconda/README.md
@@ -6,14 +6,11 @@
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/anaconda@latest",
-        "options": {
+"features": {
+        "devcontainers/features/anaconda@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/aws-cli/README.md b/src/aws-cli/README.md
index 6a64379..37dfb3d 100644
--- a/src/aws-cli/README.md
+++ b/src/aws-cli/README.md
@@ -6,14 +6,11 @@ Installs the AWS CLI along with needed dependencies. Useful for base Dockerfiles
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/aws-cli@latest",
-        "options": {
+"features": {
+        "devcontainers/features/aws-cli@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/azure-cli/README.md b/src/azure-cli/README.md
index 09150e2..91381dd 100644
--- a/src/azure-cli/README.md
+++ b/src/azure-cli/README.md
@@ -6,14 +6,11 @@ Installs the Azure CLI along with needed dependencies. Useful for base Dockerfil
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/azure-cli@latest",
-        "options": {
+"features": {
+        "devcontainers/features/azure-cli@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/common/README.md b/src/common/README.md
index c7bc31c..b32cd45 100644
--- a/src/common/README.md
+++ b/src/common/README.md
@@ -6,14 +6,11 @@ Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-r
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/common@latest",
-        "options": {
+"features": {
+        "devcontainers/features/common@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/desktop-lite/README.md b/src/desktop-lite/README.md
index 55b623d..cc2e359 100644
--- a/src/desktop-lite/README.md
+++ b/src/desktop-lite/README.md
@@ -6,14 +6,11 @@ Adds a lightweight Fluxbox based desktop to the container that can be accessed u
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/desktop-lite@latest",
-        "options": {
+"features": {
+        "devcontainers/features/desktop-lite@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/docker-from-docker/README.md b/src/docker-from-docker/README.md
index c9ad5e2..d26b655 100644
--- a/src/docker-from-docker/README.md
+++ b/src/docker-from-docker/README.md
@@ -6,14 +6,11 @@
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/docker-from-docker@latest",
-        "options": {
+"features": {
+        "devcontainers/features/docker-from-docker@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/docker-in-docker/README.md b/src/docker-in-docker/README.md
index c3abfa7..8ba58cb 100644
--- a/src/docker-in-docker/README.md
+++ b/src/docker-in-docker/README.md
@@ -6,14 +6,11 @@ Create child containers *inside* a container, independent from the host's docker
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/docker-in-docker@latest",
-        "options": {
+"features": {
+        "devcontainers/features/docker-in-docker@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/dotnet/README.md b/src/dotnet/README.md
index cce0df5..c7155e5 100644
--- a/src/dotnet/README.md
+++ b/src/dotnet/README.md
@@ -6,14 +6,11 @@ Installs the .NET CLI. Provides option of installing sdk or runtime, and option
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/dotnet@latest",
-        "options": {
+"features": {
+        "devcontainers/features/dotnet@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/git-lfs/README.md b/src/git-lfs/README.md
index 3b799d6..4bbd78e 100644
--- a/src/git-lfs/README.md
+++ b/src/git-lfs/README.md
@@ -6,14 +6,11 @@ Installs Git Large File Support (Git LFS) along with needed dependencies. Useful
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/git-lfs@latest",
-        "options": {
+"features": {
+        "devcontainers/features/git-lfs@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/git/README.md b/src/git/README.md
index 6f637b9..2aec2c7 100644
--- a/src/git/README.md
+++ b/src/git/README.md
@@ -6,14 +6,11 @@ Install an up-to-date version of Git, built from source as needed. Useful for wh
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/git@latest",
-        "options": {
+"features": {
+        "devcontainers/features/git@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/github-cli/README.md b/src/github-cli/README.md
index 5192bba..f9fe337 100644
--- a/src/github-cli/README.md
+++ b/src/github-cli/README.md
@@ -6,14 +6,11 @@ Installs the GitHub CLI. Auto-detects latest version and installs needed depende
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/github-cli@latest",
-        "options": {
+"features": {
+        "devcontainers/features/github-cli@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/go/README.md b/src/go/README.md
index 6f02ca4..a0af1a7 100644
--- a/src/go/README.md
+++ b/src/go/README.md
@@ -6,14 +6,11 @@ Installs Go and common Go utilities. Auto-detects latest version and installs ne
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/go@latest",
-        "options": {
+"features": {
+        "devcontainers/features/go@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/hugo/README.md b/src/hugo/README.md
index 18aae05..28b4e57 100644
--- a/src/hugo/README.md
+++ b/src/hugo/README.md
@@ -6,14 +6,11 @@
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/hugo@latest",
-        "options": {
+"features": {
+        "devcontainers/features/hugo@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/java/README.md b/src/java/README.md
index 8d9e444..b56b19b 100644
--- a/src/java/README.md
+++ b/src/java/README.md
@@ -6,14 +6,11 @@ Installs Java, SDKMAN! (if not installed), and needed dependencies.
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/java@latest",
-        "options": {
+"features": {
+        "devcontainers/features/java@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/kubectl-helm-minikube/README.md b/src/kubectl-helm-minikube/README.md
index 5ba2294..1347908 100644
--- a/src/kubectl-helm-minikube/README.md
+++ b/src/kubectl-helm-minikube/README.md
@@ -6,14 +6,11 @@ Installs latest version of kubectl, Helm, and optionally minikube. Auto-detects
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/kubectl-helm-minikube@latest",
-        "options": {
+"features": {
+        "devcontainers/features/kubectl-helm-minikube@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/node/README.md b/src/node/README.md
index 73d314c..afc58d3 100644
--- a/src/node/README.md
+++ b/src/node/README.md
@@ -6,14 +6,11 @@ Installs Node.js, nvm, yarn, and needed dependencies.
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/node@latest",
-        "options": {
+"features": {
+        "devcontainers/features/node@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/oryx/README.md b/src/oryx/README.md
index a15c114..3e782f6 100644
--- a/src/oryx/README.md
+++ b/src/oryx/README.md
@@ -6,14 +6,11 @@ Installs the oryx CLI
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/oryx@latest",
-        "options": {
+"features": {
+        "devcontainers/features/oryx@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/php/README.md b/src/php/README.md
index bcc5253..bb6187b 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -6,14 +6,11 @@
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/php@latest",
-        "options": {
+"features": {
+        "devcontainers/features/php@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/powershell/README.md b/src/powershell/README.md
index 21372ff..cebef8f 100644
--- a/src/powershell/README.md
+++ b/src/powershell/README.md
@@ -6,14 +6,11 @@ Installs PowerShell along with needed dependencies. Useful for base Dockerfiles
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/powershell@latest",
-        "options": {
+"features": {
+        "devcontainers/features/powershell@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/python/README.md b/src/python/README.md
index 793e428..5267d93 100644
--- a/src/python/README.md
+++ b/src/python/README.md
@@ -6,14 +6,11 @@ Installs the provided version of Python, as well as PIPX, and other common Pytho
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/python@latest",
-        "options": {
+"features": {
+        "devcontainers/features/python@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/ruby/README.md b/src/ruby/README.md
index 55268f0..700424c 100644
--- a/src/ruby/README.md
+++ b/src/ruby/README.md
@@ -6,14 +6,11 @@ Installs Ruby, rvm, rbenv, common Ruby utilities, and needed dependencies.
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/ruby@latest",
-        "options": {
+"features": {
+        "devcontainers/features/ruby@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/rust/README.md b/src/rust/README.md
index 24a2348..f739ffc 100644
--- a/src/rust/README.md
+++ b/src/rust/README.md
@@ -6,14 +6,11 @@ Installs Rust, common Rust utilities, and their required dependencies
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/rust@latest",
-        "options": {
+"features": {
+        "devcontainers/features/rust@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/sshd/README.md b/src/sshd/README.md
index 838cda7..b9e01fa 100644
--- a/src/sshd/README.md
+++ b/src/sshd/README.md
@@ -6,14 +6,11 @@ Adds a SSH server into a container so that you can use an external terminal, sft
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/sshd@latest",
-        "options": {
+"features": {
+        "devcontainers/features/sshd@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options
diff --git a/src/terraform/README.md b/src/terraform/README.md
index cd6bb67..5a003ad 100644
--- a/src/terraform/README.md
+++ b/src/terraform/README.md
@@ -6,14 +6,11 @@ Installs the Terraform CLI and optionally TFLint and Terragrunt. Auto-detects la
 ## Example Usage
 
 ```json
-"features": [
-    {
-        "id": "devcontainers/features/terraform@latest",
-        "options": {
+"features": {
+        "devcontainers/features/terraform@latest": {
             "version": "latest"
         }
-    }
-]
+}
 ```
 
 ## Options