diff --git a/.devcontainer/030 - Windows 10 Pro/devcontainer.json b/.devcontainer/10/devcontainer.json
similarity index 100%
rename from .devcontainer/030 - Windows 10 Pro/devcontainer.json
rename to .devcontainer/10/devcontainer.json
diff --git a/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json b/.devcontainer/10e/devcontainer.json
similarity index 100%
rename from .devcontainer/040 - Windows 10 Enterprise/devcontainer.json
rename to .devcontainer/10e/devcontainer.json
diff --git a/.devcontainer/050 - Windows 10 LTSC/devcontainer.json b/.devcontainer/10l/devcontainer.json
similarity index 100%
rename from .devcontainer/050 - Windows 10 LTSC/devcontainer.json
rename to .devcontainer/10l/devcontainer.json
diff --git a/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json b/.devcontainer/11e/devcontainer.json
similarity index 100%
rename from .devcontainer/010 - Windows 11 Enterprise/devcontainer.json
rename to .devcontainer/11e/devcontainer.json
diff --git a/.devcontainer/020 - Windows 11 LTSC/devcontainer.json b/.devcontainer/11l/devcontainer.json
similarity index 100%
rename from .devcontainer/020 - Windows 11 LTSC/devcontainer.json
rename to .devcontainer/11l/devcontainer.json
diff --git a/.devcontainer/170 - Windows Server 2003/devcontainer.json b/.devcontainer/2003/devcontainer.json
similarity index 100%
rename from .devcontainer/170 - Windows Server 2003/devcontainer.json
rename to .devcontainer/2003/devcontainer.json
diff --git a/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json b/.devcontainer/2008/devcontainer.json
similarity index 100%
rename from .devcontainer/160 - Windows Server 2008 R2/devcontainer.json
rename to .devcontainer/2008/devcontainer.json
diff --git a/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json b/.devcontainer/2012/devcontainer.json
similarity index 100%
rename from .devcontainer/150 - Windows Server 2012 R2/devcontainer.json
rename to .devcontainer/2012/devcontainer.json
diff --git a/.devcontainer/140 - Windows Server 2016/devcontainer.json b/.devcontainer/2016/devcontainer.json
similarity index 100%
rename from .devcontainer/140 - Windows Server 2016/devcontainer.json
rename to .devcontainer/2016/devcontainer.json
diff --git a/.devcontainer/130 - Windows Server 2019/devcontainer.json b/.devcontainer/2019/devcontainer.json
similarity index 100%
rename from .devcontainer/130 - Windows Server 2019/devcontainer.json
rename to .devcontainer/2019/devcontainer.json
diff --git a/.devcontainer/120 - Windows Server 2022/devcontainer.json b/.devcontainer/2022/devcontainer.json
similarity index 100%
rename from .devcontainer/120 - Windows Server 2022/devcontainer.json
rename to .devcontainer/2022/devcontainer.json
diff --git a/.devcontainer/110 - Windows Server 2025/devcontainer.json b/.devcontainer/2025/devcontainer.json
similarity index 100%
rename from .devcontainer/110 - Windows Server 2025/devcontainer.json
rename to .devcontainer/2025/devcontainer.json
diff --git a/.devcontainer/100 - Windows 2000 Professional/devcontainer.json b/.devcontainer/2k/devcontainer.json
similarity index 100%
rename from .devcontainer/100 - Windows 2000 Professional/devcontainer.json
rename to .devcontainer/2k/devcontainer.json
diff --git a/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json b/.devcontainer/7u/devcontainer.json
similarity index 88%
rename from .devcontainer/070 - Windows 7 Ultimate/devcontainer.json
rename to .devcontainer/7u/devcontainer.json
index ffaf504..6b31cd9 100644
--- a/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json	
+++ b/.devcontainer/7u/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "Windows 7 Ultimate",
+  "name": "Windows 7 Ultimate (64-bit)",
   "service": "windows",
   "containerEnv": {
     "VERSION": "7u"
diff --git a/.devcontainer/7u32/devcontainer.json b/.devcontainer/7u32/devcontainer.json
new file mode 100644
index 0000000..df3f337
--- /dev/null
+++ b/.devcontainer/7u32/devcontainer.json
@@ -0,0 +1,18 @@
+{
+  "name": "Windows 7 Ultimate (32-bit)",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "7ux86"
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json b/.devcontainer/8e/devcontainer.json
similarity index 100%
rename from .devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json
rename to .devcontainer/8e/devcontainer.json
diff --git a/.devcontainer/190 - Tiny11 Core/devcontainer.json b/.devcontainer/core11/devcontainer.json
similarity index 93%
rename from .devcontainer/190 - Tiny11 Core/devcontainer.json
rename to .devcontainer/core11/devcontainer.json
index 1873cbc..dcb8ac6 100644
--- a/.devcontainer/190 - Tiny11 Core/devcontainer.json	
+++ b/.devcontainer/core11/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "Tiny11 Core",
+  "name": "Tiny 11 Core",
   "service": "windows",
   "containerEnv": {
     "VERSION": "core11"
diff --git a/.devcontainer/200 - Tiny11 Nano/devcontainer.json b/.devcontainer/nano11/devcontainer.json
similarity index 93%
rename from .devcontainer/200 - Tiny11 Nano/devcontainer.json
rename to .devcontainer/nano11/devcontainer.json
index f05b707..0aee8ed 100644
--- a/.devcontainer/200 - Tiny11 Nano/devcontainer.json	
+++ b/.devcontainer/nano11/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "Tiny11 Nano",
+  "name": "Tiny 11 Nano",
   "service": "windows",
   "containerEnv": {
     "VERSION": "nano11"
diff --git a/.devcontainer/210 - Tiny10/devcontainer.json b/.devcontainer/tiny10/devcontainer.json
similarity index 94%
rename from .devcontainer/210 - Tiny10/devcontainer.json
rename to .devcontainer/tiny10/devcontainer.json
index 5039698..e21b33c 100644
--- a/.devcontainer/210 - Tiny10/devcontainer.json	
+++ b/.devcontainer/tiny10/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "Tiny10",
+  "name": "Tiny 10",
   "service": "windows",
   "containerEnv": {
     "VERSION": "tiny10"
diff --git a/.devcontainer/180 - Tiny11/devcontainer.json b/.devcontainer/tiny11/devcontainer.json
similarity index 94%
rename from .devcontainer/180 - Tiny11/devcontainer.json
rename to .devcontainer/tiny11/devcontainer.json
index 0ed1384..1d06e20 100644
--- a/.devcontainer/180 - Tiny11/devcontainer.json	
+++ b/.devcontainer/tiny11/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "Tiny11",
+  "name": "Tiny 11",
   "service": "windows",
   "containerEnv": {
     "VERSION": "tiny11"
diff --git a/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json b/.devcontainer/vu/devcontainer.json
similarity index 87%
rename from .devcontainer/080 - Windows Vista Ultimate/devcontainer.json
rename to .devcontainer/vu/devcontainer.json
index 2cdfe89..427e096 100644
--- a/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json	
+++ b/.devcontainer/vu/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "Windows Vista Ultimate",
+  "name": "Windows Vista Ultimate (64-bit)",
   "service": "windows",
   "containerEnv": {
     "VERSION": "vu"
diff --git a/.devcontainer/vu32/devcontainer.json b/.devcontainer/vu32/devcontainer.json
new file mode 100644
index 0000000..96e6b68
--- /dev/null
+++ b/.devcontainer/vu32/devcontainer.json
@@ -0,0 +1,18 @@
+{
+  "name": "Windows Vista Ultimate (32-bit)",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "vux86"
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/090 - Windows XP Professional/devcontainer.json b/.devcontainer/xp/devcontainer.json
similarity index 89%
rename from .devcontainer/090 - Windows XP Professional/devcontainer.json
rename to .devcontainer/xp/devcontainer.json
index 1e375ff..891aacb 100644
--- a/.devcontainer/090 - Windows XP Professional/devcontainer.json	
+++ b/.devcontainer/xp/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "name": "Windows XP Professional",
+  "name": "Windows XP (32-bit)",
   "service": "windows",
   "containerEnv": {
     "VERSION": "xp"
diff --git a/.devcontainer/xp64/devcontainer.json b/.devcontainer/xp64/devcontainer.json
new file mode 100644
index 0000000..be33e94
--- /dev/null
+++ b/.devcontainer/xp64/devcontainer.json
@@ -0,0 +1,18 @@
+{
+  "name": "Windows XP (64-bit)",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "xp64"
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
+}