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