diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..505ce0d97
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,35 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
+{
+	"name": "Ubuntu",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/base:jammy",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/devcontainers/features/python:1": {}
+	},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "uname -a",
+
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.cpptools",
+				"platformio.platformio-ide"
+			]
+		}
+	},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+
+	// Allow uploading to device
+	"mounts": ["type=bind,source=/dev/bus/usb,target=/dev/bus/usb"],
+	"runArgs": ["--privileged"]
+}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..f33a02cd1
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly
diff --git a/platformio_override-template.ini b/platformio_override-template.ini
index c3791ae86..97f2fbf04 100644
--- a/platformio_override-template.ini
+++ b/platformio_override-template.ini
@@ -22,7 +22,7 @@ build_flags =
 
 ;region -- Default Build Environments : Used when Build All ---
 extra_default_envs =
-    ; Uncomment specific environments or create extra:
+    ; Uncomment specific environments or create extra (copy names from square brackets in user_setups/*/*.ini):
     ; az-touch-mod-esp32_ili9341_4MB
     ; az-touch-mod-esp32_ili9341_8MB
     ; d1-mini-esp32_ili9341
@@ -64,6 +64,9 @@ extra_default_envs =
     ; makerfabs-tft35-cap_4MB
     ; makerfabs-tft-s2_ili9488
     ; nodemcu32s-raspi
+    ; panlee-zw3d95ce01s-ar-4848_16MB
+    ; panlee-zw3d95ce01s-tr-4848_16MB
+    ; panlee-zw3d95ce01s-ur-4848_16MB
     ; s2-mini-esp32s2_ili9341
     ; ttgo_esp32_poe-ili9341
     ; lilygo-lily-pi_ili9481