diff --git a/.devcontainer/11e/devcontainer.json b/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json
similarity index 80%
rename from .devcontainer/11e/devcontainer.json
rename to .devcontainer/010 - Windows 11 Enterprise/devcontainer.json
index c67781a..4e67f1a 100644
--- a/.devcontainer/11e/devcontainer.json
+++ b/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows 11 Enterprise",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "11e",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "11e"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/11l/devcontainer.json b/.devcontainer/020 - Windows 11 LTSC/devcontainer.json
similarity index 79%
rename from .devcontainer/11l/devcontainer.json
rename to .devcontainer/020 - Windows 11 LTSC/devcontainer.json
index 6cda36c..e93fbf1 100644
--- a/.devcontainer/11l/devcontainer.json
+++ b/.devcontainer/020 - Windows 11 LTSC/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows 11 LTSC",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "11l",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "11l"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/10/devcontainer.json b/.devcontainer/030 - Windows 10 Pro/devcontainer.json
similarity index 79%
rename from .devcontainer/10/devcontainer.json
rename to .devcontainer/030 - Windows 10 Pro/devcontainer.json
index bdc023e..573f6ab 100644
--- a/.devcontainer/10/devcontainer.json
+++ b/.devcontainer/030 - Windows 10 Pro/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows 10 Pro",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "10",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "10"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/10e/devcontainer.json b/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json
similarity index 80%
rename from .devcontainer/10e/devcontainer.json
rename to .devcontainer/040 - Windows 10 Enterprise/devcontainer.json
index e401fea..b5ef076 100644
--- a/.devcontainer/10e/devcontainer.json
+++ b/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows 10 Enterprise",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "10e",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "10e"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/10l/devcontainer.json b/.devcontainer/050 - Windows 10 LTSC/devcontainer.json
similarity index 79%
rename from .devcontainer/10l/devcontainer.json
rename to .devcontainer/050 - Windows 10 LTSC/devcontainer.json
index 25109bb..30ced2a 100644
--- a/.devcontainer/10l/devcontainer.json
+++ b/.devcontainer/050 - Windows 10 LTSC/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows 10 LTSC",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "10l",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "10l"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/8e/devcontainer.json b/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json
similarity index 80%
rename from .devcontainer/8e/devcontainer.json
rename to .devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json
index d27348b..41870d0 100644
--- a/.devcontainer/8e/devcontainer.json
+++ b/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows 8.1 Enterprise",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "8e",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "8e"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/xp/devcontainer.json b/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json
similarity index 69%
rename from .devcontainer/xp/devcontainer.json
rename to .devcontainer/070 - Windows 7 Ultimate/devcontainer.json
index d7a8dfd..ffaf504 100644
--- a/.devcontainer/xp/devcontainer.json
+++ b/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json	
@@ -1,11 +1,8 @@
 {
-  "name": "Windows XP (32-bit)",
+  "name": "Windows 7 Ultimate",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "xp",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "7u"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json b/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json
new file mode 100644
index 0000000..2cdfe89
--- /dev/null
+++ b/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json	
@@ -0,0 +1,18 @@
+{
+  "name": "Windows Vista Ultimate",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "vu"
+  },  
+  "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/090 - Windows XP Professional/devcontainer.json
new file mode 100644
index 0000000..1e375ff
--- /dev/null
+++ b/.devcontainer/090 - Windows XP Professional/devcontainer.json	
@@ -0,0 +1,18 @@
+{
+  "name": "Windows XP Professional",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "xp"
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/2k/devcontainer.json b/.devcontainer/100 - Windows 2000 Professional/devcontainer.json
similarity index 77%
rename from .devcontainer/2k/devcontainer.json
rename to .devcontainer/100 - Windows 2000 Professional/devcontainer.json
index 2aa0e55..9ee27cb 100644
--- a/.devcontainer/2k/devcontainer.json
+++ b/.devcontainer/100 - Windows 2000 Professional/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows 2000 Professional",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2k",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2k"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/2025/devcontainer.json b/.devcontainer/110 - Windows Server 2025/devcontainer.json
similarity index 79%
rename from .devcontainer/2025/devcontainer.json
rename to .devcontainer/110 - Windows Server 2025/devcontainer.json
index f5b2984..2ef30e8 100644
--- a/.devcontainer/2025/devcontainer.json
+++ b/.devcontainer/110 - Windows Server 2025/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows Server 2025",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2025",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2025"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/2022/devcontainer.json b/.devcontainer/120 - Windows Server 2022/devcontainer.json
similarity index 79%
rename from .devcontainer/2022/devcontainer.json
rename to .devcontainer/120 - Windows Server 2022/devcontainer.json
index 5c66d43..4994c5f 100644
--- a/.devcontainer/2022/devcontainer.json
+++ b/.devcontainer/120 - Windows Server 2022/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows Server 2022",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2022",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2022"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/2019/devcontainer.json b/.devcontainer/130 - Windows Server 2019/devcontainer.json
similarity index 79%
rename from .devcontainer/2019/devcontainer.json
rename to .devcontainer/130 - Windows Server 2019/devcontainer.json
index 68e2829..333902b 100644
--- a/.devcontainer/2019/devcontainer.json
+++ b/.devcontainer/130 - Windows Server 2019/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows Server 2019",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2019",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2019"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/2016/devcontainer.json b/.devcontainer/140 - Windows Server 2016/devcontainer.json
similarity index 79%
rename from .devcontainer/2016/devcontainer.json
rename to .devcontainer/140 - Windows Server 2016/devcontainer.json
index 2ede9d5..f611b12 100644
--- a/.devcontainer/2016/devcontainer.json
+++ b/.devcontainer/140 - Windows Server 2016/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows Server 2016",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2016",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2016"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/2012/devcontainer.json b/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json
similarity index 79%
rename from .devcontainer/2012/devcontainer.json
rename to .devcontainer/150 - Windows Server 2012 R2/devcontainer.json
index 8d3519c..d9d72f5 100644
--- a/.devcontainer/2012/devcontainer.json
+++ b/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows Server 2012 R2",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2012",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2012"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/2008/devcontainer.json b/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json
similarity index 77%
rename from .devcontainer/2008/devcontainer.json
rename to .devcontainer/160 - Windows Server 2008 R2/devcontainer.json
index 5930e9c..cca5f42 100644
--- a/.devcontainer/2008/devcontainer.json
+++ b/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows Server 2008 R2",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2008",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2008"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/2003/devcontainer.json b/.devcontainer/170 - Windows Server 2003/devcontainer.json
similarity index 77%
rename from .devcontainer/2003/devcontainer.json
rename to .devcontainer/170 - Windows Server 2003/devcontainer.json
index ffe7dc5..14eb337 100644
--- a/.devcontainer/2003/devcontainer.json
+++ b/.devcontainer/170 - Windows Server 2003/devcontainer.json	
@@ -2,10 +2,7 @@
   "name": "Windows Server 2003",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "2003",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "2003"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/tiny10/devcontainer.json b/.devcontainer/180 - Tiny11/devcontainer.json
similarity index 74%
rename from .devcontainer/tiny10/devcontainer.json
rename to .devcontainer/180 - Tiny11/devcontainer.json
index 9b7dd6b..0ed1384 100644
--- a/.devcontainer/tiny10/devcontainer.json
+++ b/.devcontainer/180 - Tiny11/devcontainer.json	
@@ -1,11 +1,8 @@
 {
-  "name": "Tiny 10",
+  "name": "Tiny11",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "tiny10",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "tiny11"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/tiny11/devcontainer.json b/.devcontainer/190 - Tiny11 Core/devcontainer.json
similarity index 74%
rename from .devcontainer/tiny11/devcontainer.json
rename to .devcontainer/190 - Tiny11 Core/devcontainer.json
index a659705..1873cbc 100644
--- a/.devcontainer/tiny11/devcontainer.json
+++ b/.devcontainer/190 - Tiny11 Core/devcontainer.json	
@@ -1,11 +1,8 @@
 {
-  "name": "Tiny 11",
+  "name": "Tiny11 Core",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "tiny11",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "core11"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/core11/devcontainer.json b/.devcontainer/200 - Tiny11 Nano/devcontainer.json
similarity index 73%
rename from .devcontainer/core11/devcontainer.json
rename to .devcontainer/200 - Tiny11 Nano/devcontainer.json
index 44ba15f..f05b707 100644
--- a/.devcontainer/core11/devcontainer.json
+++ b/.devcontainer/200 - Tiny11 Nano/devcontainer.json	
@@ -1,11 +1,8 @@
 {
-  "name": "Tiny 11 Core",
+  "name": "Tiny11 Nano",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "core11",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
+    "VERSION": "nano11"
   },  
   "forwardPorts": [8006],  
   "portsAttributes": {
diff --git a/.devcontainer/210 - Tiny10/devcontainer.json b/.devcontainer/210 - Tiny10/devcontainer.json
new file mode 100644
index 0000000..5039698
--- /dev/null
+++ b/.devcontainer/210 - Tiny10/devcontainer.json	
@@ -0,0 +1,21 @@
+{
+  "name": "Tiny10",
+  "service": "windows",
+  "containerEnv": {
+    "VERSION": "tiny10"
+  },  
+  "forwardPorts": [8006],  
+  "portsAttributes": {
+    "8006": {
+      "label": "Web",
+      "onAutoForward": "openBrowser"
+    }
+  },
+  "otherPortsAttributes": {
+    "onAutoForward": "silent"
+  }, 
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
+}
diff --git a/.devcontainer/7u/devcontainer.json b/.devcontainer/7u/devcontainer.json
deleted file mode 100644
index ac4314c..0000000
--- a/.devcontainer/7u/devcontainer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Windows 7 Ultimate (64-bit)",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "7u",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  },
-  "dockerComposeFile": "../codespaces.yml"
-}
diff --git a/.devcontainer/7u32/devcontainer.json b/.devcontainer/7u32/devcontainer.json
deleted file mode 100644
index 612ddc2..0000000
--- a/.devcontainer/7u32/devcontainer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Windows 7 Ultimate (32-bit)",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "7ux86",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  },
-  "dockerComposeFile": "../codespaces.yml"
-}
diff --git a/.devcontainer/codespaces.yml b/.devcontainer/codespaces.yml
index 7aaba65..f9682d1 100644
--- a/.devcontainer/codespaces.yml
+++ b/.devcontainer/codespaces.yml
@@ -4,7 +4,8 @@ services:
     container_name: windows
     environment:
       VERSION: "11"
-      RAM_SIZE: "max"
+      ALLOCATE: "Y"
+      RAM_SIZE: "half"
       DISK_SIZE: "max"
       CPU_CORES: "max"
     devices:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7a9ad96..5de96d5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,10 +2,7 @@
   "name": "Windows 11 Pro",
   "service": "windows",
   "containerEnv": {
-    "VERSION": "11",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"
+    "VERSION": "11"
   },
   "forwardPorts": [8006],
   "portsAttributes": {
diff --git a/.devcontainer/nano11/devcontainer.json b/.devcontainer/nano11/devcontainer.json
deleted file mode 100644
index a5ea04a..0000000
--- a/.devcontainer/nano11/devcontainer.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "Tiny 11 Nano",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "nano11",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  }, 
-  "hostRequirements": {
-    "storage": "64gb"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
-}
diff --git a/.devcontainer/vu/devcontainer.json b/.devcontainer/vu/devcontainer.json
deleted file mode 100644
index 2b9e871..0000000
--- a/.devcontainer/vu/devcontainer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Windows Vista Ultimate (64-bit)",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "vu",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
-  },  
-  "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 7c5be1c..0000000
--- a/.devcontainer/vu32/devcontainer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Windows Vista Ultimate (32-bit)",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "vux86",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
-  },  
-  "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 a03df31..0000000
--- a/.devcontainer/xp64/devcontainer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "Windows XP (64-bit)",
-  "service": "windows",
-  "containerEnv": {
-    "VERSION": "xp64",
-    "RAM_SIZE": "max",
-    "DISK_SIZE": "max",
-    "CPU_CORES": "max"    
-  },  
-  "forwardPorts": [8006],  
-  "portsAttributes": {
-    "8006": {
-      "label": "Web",
-      "onAutoForward": "openBrowser"
-    }
-  },
-  "otherPortsAttributes": {
-    "onAutoForward": "silent"
-  },  
-  "dockerComposeFile": "../codespaces.yml"
-}