diff --git a/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json b/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json
index cc0e5ae..4e67f1a 100644
--- a/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json	
+++ b/.devcontainer/010 - Windows 11 Enterprise/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "11e"
-  },
+  },  
   "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/020 - Windows 11 LTSC/devcontainer.json b/.devcontainer/020 - Windows 11 LTSC/devcontainer.json
index 23e54ff..e93fbf1 100644
--- a/.devcontainer/020 - Windows 11 LTSC/devcontainer.json	
+++ b/.devcontainer/020 - Windows 11 LTSC/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "11l"
-  },
+  },  
   "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/030 - Windows 10 Pro/devcontainer.json b/.devcontainer/030 - Windows 10 Pro/devcontainer.json
index c5a647b..573f6ab 100644
--- a/.devcontainer/030 - Windows 10 Pro/devcontainer.json	
+++ b/.devcontainer/030 - Windows 10 Pro/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "10"
-  },
+  },  
   "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json b/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json
index 1466e11..b5ef076 100644
--- a/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json	
+++ b/.devcontainer/040 - Windows 10 Enterprise/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "10e"
-  },
+  },  
   "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/050 - Windows 10 LTSC/devcontainer.json b/.devcontainer/050 - Windows 10 LTSC/devcontainer.json
index dfc8f5c..30ced2a 100644
--- a/.devcontainer/050 - Windows 10 LTSC/devcontainer.json	
+++ b/.devcontainer/050 - Windows 10 LTSC/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "10l"
-  },
+  },  
   "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json b/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json
index e58f7ad..41870d0 100644
--- a/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json	
+++ b/.devcontainer/060 - Windows 8.1 Enterprise/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "8e"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json b/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json
index 85878f0..ffaf504 100644
--- a/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json	
+++ b/.devcontainer/070 - Windows 7 Ultimate/devcontainer.json	
@@ -3,18 +3,16 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "7u"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
-  }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json b/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json
index b99c942..2cdfe89 100644
--- a/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json	
+++ b/.devcontainer/080 - Windows Vista Ultimate/devcontainer.json	
@@ -3,18 +3,16 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "vu"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
-  }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/090 - Windows XP Professional/devcontainer.json b/.devcontainer/090 - Windows XP Professional/devcontainer.json
index a2c51c4..1e375ff 100644
--- a/.devcontainer/090 - Windows XP Professional/devcontainer.json	
+++ b/.devcontainer/090 - Windows XP Professional/devcontainer.json	
@@ -3,18 +3,16 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "xp"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
-  }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/100 - Windows 2000 Professional/devcontainer.json b/.devcontainer/100 - Windows 2000 Professional/devcontainer.json
index e5fab13..9ee27cb 100644
--- a/.devcontainer/100 - Windows 2000 Professional/devcontainer.json	
+++ b/.devcontainer/100 - Windows 2000 Professional/devcontainer.json	
@@ -3,18 +3,16 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2k"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
-  }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/110 - Windows Server 2025/devcontainer.json b/.devcontainer/110 - Windows Server 2025/devcontainer.json
index 96089cc..2ef30e8 100644
--- a/.devcontainer/110 - Windows Server 2025/devcontainer.json	
+++ b/.devcontainer/110 - Windows Server 2025/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2025"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/120 - Windows Server 2022/devcontainer.json b/.devcontainer/120 - Windows Server 2022/devcontainer.json
index 9897a67..4994c5f 100644
--- a/.devcontainer/120 - Windows Server 2022/devcontainer.json	
+++ b/.devcontainer/120 - Windows Server 2022/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2022"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/130 - Windows Server 2019/devcontainer.json b/.devcontainer/130 - Windows Server 2019/devcontainer.json
index 9903599..333902b 100644
--- a/.devcontainer/130 - Windows Server 2019/devcontainer.json	
+++ b/.devcontainer/130 - Windows Server 2019/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2019"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/140 - Windows Server 2016/devcontainer.json b/.devcontainer/140 - Windows Server 2016/devcontainer.json
index 614b171..f611b12 100644
--- a/.devcontainer/140 - Windows Server 2016/devcontainer.json	
+++ b/.devcontainer/140 - Windows Server 2016/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2016"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json b/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json
index 158036c..d9d72f5 100644
--- a/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json	
+++ b/.devcontainer/150 - Windows Server 2012 R2/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2012"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json b/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json
index 5dc1af6..cca5f42 100644
--- a/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json	
+++ b/.devcontainer/160 - Windows Server 2008 R2/devcontainer.json	
@@ -3,18 +3,16 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2008"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
-  }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/170 - Windows Server 2003/devcontainer.json b/.devcontainer/170 - Windows Server 2003/devcontainer.json
index c47effb..14eb337 100644
--- a/.devcontainer/170 - Windows Server 2003/devcontainer.json	
+++ b/.devcontainer/170 - Windows Server 2003/devcontainer.json	
@@ -3,18 +3,16 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "2003"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
-  }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+    "onAutoForward": "silent"
+  },
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/180 - Tiny11/devcontainer.json b/.devcontainer/180 - Tiny11/devcontainer.json
index 225a746..0ed1384 100644
--- a/.devcontainer/180 - Tiny11/devcontainer.json	
+++ b/.devcontainer/180 - Tiny11/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "tiny11"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/190 - Tiny11 Core/devcontainer.json b/.devcontainer/190 - Tiny11 Core/devcontainer.json
index 78da098..1873cbc 100644
--- a/.devcontainer/190 - Tiny11 Core/devcontainer.json	
+++ b/.devcontainer/190 - Tiny11 Core/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "core11"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/200 - Tiny11 Nano/devcontainer.json b/.devcontainer/200 - Tiny11 Nano/devcontainer.json
index c7fdca9..f05b707 100644
--- a/.devcontainer/200 - Tiny11 Nano/devcontainer.json	
+++ b/.devcontainer/200 - Tiny11 Nano/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "nano11"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/210 - Tiny10/devcontainer.json b/.devcontainer/210 - Tiny10/devcontainer.json
index 3df1b88..5039698 100644
--- a/.devcontainer/210 - Tiny10/devcontainer.json	
+++ b/.devcontainer/210 - Tiny10/devcontainer.json	
@@ -3,18 +3,19 @@
   "service": "windows",
   "containerEnv": {
     "VERSION": "tiny10"
-  },
-  "forwardPorts": [8006],
+  },  
+  "forwardPorts": [8006],  
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   }, 
-  "dockerComposeFile": "../codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "hostRequirements": {
+    "storage": "64gb"
+  },  
+  "dockerComposeFile": "../codespaces.yml"
 }
diff --git a/.devcontainer/codespaces.yml b/.devcontainer/codespaces.yml
index 85e3f64..02c57be 100644
--- a/.devcontainer/codespaces.yml
+++ b/.devcontainer/codespaces.yml
@@ -1,8 +1,9 @@
 services:
   windows:
+    image: dockurr/windows
     container_name: windows
-    image: ghcr.io/dockur/windows
     environment:
+      ALLOCATE: "Y"
       RAM_SIZE: "half"
       DISK_SIZE: "max"
       CPU_CORES: "max"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d7c98a8..9772d1c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,13 +8,11 @@
   "portsAttributes": {
     "8006": {
       "label": "Web",
-      "onAutoForward": "notify"
+      "onAutoForward": "openBrowser"
     }
   },
   "otherPortsAttributes": {
-    "onAutoForward": "ignore"
+    "onAutoForward": "silent"
   },
-  "dockerComposeFile": "codespaces.yml",
-  "workspaceFolder": "/workspaces/windows",
-  "initializeCommand": "docker system prune --all --force"
+  "dockerComposeFile": "codespaces.yml"
 }
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
deleted file mode 100644
index 51f8503..0000000
--- a/.github/workflows/review.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-on:
-  pull_request:
-
-name: "Review"
-
-permissions:
-  contents: read
-  pull-requests: write
-  checks: write
-
-jobs:
-  review:
-    name: review
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v5
-      -
-        name: Spelling
-        uses: reviewdog/action-misspell@v1
-        with:
-          locale: "US"
-          level: warning
-          pattern: |
-            *.md
-            *.sh
-          reporter: github-pr-review
-          github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
-      -
-        name: Hadolint
-        uses: reviewdog/action-hadolint@v1
-        with:
-          level: warning
-          reporter: github-pr-review
-          hadolint_ignore: DL3006 DL3008
-          github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
-      -
-        name: YamlLint
-        uses: reviewdog/action-yamllint@v1
-        with:
-          level: warning
-          reporter: github-pr-review
-          github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
-      -
-        name: ActionLint
-        uses: reviewdog/action-actionlint@v1
-        with:
-          level: warning
-          reporter: github-pr-review
-          github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
-      -
-        name: Shellformat
-        uses: reviewdog/action-shfmt@v1
-        with:
-          level: warning
-          shfmt_flags: "-i 2 -ci -bn"
-          github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
-      -
-        name: Shellcheck
-        uses: reviewdog/action-shellcheck@v1
-        with:
-          level: warning
-          reporter: github-pr-review
-          shellcheck_flags: -x -e SC1091 -e SC2001 -e SC2002 -e SC2034 -e SC2064 -e SC2153 -e SC2317 -e SC2028
-          github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
index bf6dab2..1f8a231 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 ARG VERSION_ARG="latest"
 FROM scratch AS build-amd64
 
-COPY --from=qemux/qemu:7.27 / /
+COPY --from=qemux/qemu:7.25 / /
 
 ARG TARGETARCH
 ARG DEBCONF_NOWARNINGS="yes"
@@ -19,7 +19,7 @@ RUN set -eu && \
         cabextract \
         libxml2-utils \
         libarchive-tools && \
-    wget "https://github.com/gershnik/wsdd-native/releases/download/v1.22/wsddn_1.22_${TARGETARCH}.deb" -O /tmp/wsddn.deb -q && \
+    wget "https://github.com/gershnik/wsdd-native/releases/download/v1.21/wsddn_1.21_${TARGETARCH}.deb" -O /tmp/wsddn.deb -q && \
     dpkg -i /tmp/wsddn.deb && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/readme.md b/readme.md
index adbb6bf..4256727 100644
--- a/readme.md
+++ b/readme.md
@@ -53,7 +53,7 @@ services:
 ##### Via Docker CLI:
 
 ```bash
-docker run -it --rm --name windows -e "VERSION=11" -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/windows:/storage" --stop-timeout 120 docker.io/dockurr/windows
+docker run -it --rm --name windows -p 8006:8006 --device=/dev/kvm --device=/dev/net/tun --cap-add NET_ADMIN -v "${PWD:-.}/windows:/storage" --stop-timeout 120 dockurr/windows
 ```
 
 ##### Via Kubernetes:
diff --git a/src/define.sh b/src/define.sh
index 3db2069..9198389 100644
--- a/src/define.sh
+++ b/src/define.sh
@@ -1108,14 +1108,14 @@ getLink4() {
       url="nano11_25h2/nano11%2025h2.iso"
       ;;
     "core11" )
-      size=3176654848
-      sum="29c055fcfb7b089abd9e007e7abe4bb82c70a03aac9d65e56a38b87ab32d04d2"
-      url="tiny11_25H2/tiny11core_25H2_Oct25.iso"
+      size=2159738880
+      sum="78f0f44444ff95b97125b43e560a72e0d6ce0a665cf9f5573bf268191e5510c1"
+      url="tiny-11-core-x-64-beta-1/tiny11%20core%20x64%20beta%201.iso"
       ;;
     "tiny11" )
-      size=5514559488
-      sum="92484f2b7f707e42383294402a9eabbadeaa5ede80ac633390ae7f3537e36275"
-      url="tiny11_25H2/tiny11_25H2_Oct25.iso"
+      size=3788177408
+      sum="a028800a91addc35d8ae22dce7459b67330f7d69d2f11c70f53c0fdffa5b4280"
+      url="tiny11-2311/tiny11%202311%20x64.iso"
       ;;
     "tiny10" )
       size=3839819776
@@ -1123,9 +1123,9 @@ getLink4() {
       url="tiny-10-23-h2/tiny10%20x64%2023h2.iso"
       ;;
     "win11x64" )
-      size=7736125440
-      sum="d141f6030fed50f75e2b03e1eb2e53646c4b21e5386047cb860af5223f102a32"
-      url="W11x64_26200.6584/26200.6584.250915-1905.25h2_ge_release_svc_refresh_CLIENT_CONSUMER_x64FRE_en-us.iso"
+      size=5819484160
+      sum="b56b911bf18a2ceaeb3904d87e7c770bdf92d3099599d61ac2497b91bf190b11"
+      url="windows-11-24h2-x64/Windows%2011%2024H2%20x64.iso"
       ;;
     "win11x64-enterprise" | "win11x64-enterprise-eval" )
       size=6209064960
diff --git a/src/entry.sh b/src/entry.sh
index 71e939e..2929503 100644
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -39,8 +39,6 @@ terminal
 tail -fn +0 "$QEMU_LOG" --pid=$$ 2>/dev/null &
 cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" | \
 sed -u -e 's/\x1B\[[=0-9;]*[a-z]//gi' \
--e 's/\x1B\x63//g' -e 's/\x1B\[[=?]7l//g' \
--e '/^$/d' -e 's/\x44\x53\x73//g' \
 -e 's/failed to load Boot/skipped Boot/g' \
 -e 's/0): Not Found/0)/g' & wait $! || :
 
diff --git a/src/install.sh b/src/install.sh
index 7be2996..50cf7ea 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -22,11 +22,7 @@ backup () {
 
   fi
 
-  if ! makeDir "$root"; then
-    error "Failed to create directory \"$root\" !"
-    return 1
-  fi
-
+  mkdir -p "$root"
   local folder="$name"
   local dir="$root/$folder"
 
@@ -38,11 +34,7 @@ backup () {
   done
 
   rm -rf "$dir"
-
-  if ! makeDir "$dir"; then
-    error "Failed to create directory \"$dir\" !"
-    return 1
-  fi
+  mkdir -p "$dir"
 
   [ -f "$iso" ] && mv -f "$iso" "$dir/"
   find "$STORAGE" -maxdepth 1 -type f -iname 'data.*' -not -iname '*.iso' -exec mv -n {} "$dir/" \;
@@ -135,6 +127,7 @@ startInstall() {
     if [[ "${VERSION,,}" == "http"* ]]; then
 
       file=$(basename "${VERSION%%\?*}")
+      file="${file//+/ }"
       printf -v file '%b' "${file//%/\\x}"
       file="${file//[!A-Za-z0-9._-]/_}"
 
@@ -163,9 +156,7 @@ startInstall() {
     ! backup "" && error "Backup failed!"
   fi
 
-  if ! makeDir "$TMP"; then
-    error "Failed to create directory \"$TMP\" !"
-  fi
+  mkdir -p "$TMP"
 
   if [ -z "$CUSTOM" ]; then
 
@@ -187,20 +178,6 @@ startInstall() {
   return 0
 }
 
-writeFile() {
-
-  local txt="$1"
-  local path="$2"
-
-  echo "$txt" >"$path"
-
-  if ! setOwner "$path"; then
-    error "Failed to set the owner for \"$path\" !"
-  fi
-
-  return 0
-}
-
 finishInstall() {
 
   local iso="$1"
@@ -211,10 +188,6 @@ finishInstall() {
     error "Failed to find ISO file: $iso" && return 1
   fi
 
-  if [[ "$iso" == "$STORAGE/"* ]]; then
-    ! setOwner "$iso" && error "Failed to set the owner for \"$iso\" !"
-  fi
-
   if [[ "$aborted" != [Yy1]* ]]; then
     # Mark ISO as prepared via magic byte
     byte="16" && [[ "$MANUAL" == [Yy1]* ]] && byte="17"
@@ -223,68 +196,56 @@ finishInstall() {
     fi
   fi
 
-  local file="$STORAGE/windows.ver"
-  cp -f /run/version "$file"
-  ! setOwner "$file" && error "Failed to set the owner for \"$file\" !"
+  cp -f /run/version "$STORAGE/windows.ver"
 
   if [[ "$iso" == "$STORAGE/"* ]]; then
     if [[ "$aborted" != [Yy1]* ]] || [ -z "$CUSTOM" ]; then
       base=$(basename "$iso")
-      file="$STORAGE/windows.base"
-      writeFile "$base" "$file"
+      echo "$base" > "$STORAGE/windows.base"
     fi
   fi
 
   if [[ "${PLATFORM,,}" == "x64" ]]; then
     if [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then
-      file="$STORAGE/windows.mode"
-      writeFile "$BOOT_MODE" "$file"
+      echo "$BOOT_MODE" > "$STORAGE/windows.mode"
       if [[ "${MACHINE,,}" != "q35" ]]; then
-        file="$STORAGE/windows.old"
-        writeFile "$MACHINE" "$file"
+        echo "$MACHINE" > "$STORAGE/windows.old"
       fi
     else
       # Enable secure boot + TPM on manual installs as Win11 requires
       if [[ "$MANUAL" == [Yy1]* || "$aborted" == [Yy1]* ]]; then
         if [[ "${DETECTED,,}" == "win11"* ]]; then
           BOOT_MODE="windows_secure"
-          file="$STORAGE/windows.mode"
-          writeFile "$BOOT_MODE" "$file"
+          echo "$BOOT_MODE" > "$STORAGE/windows.mode"
         fi
       fi
       # Enable secure boot on multi-socket systems to workaround freeze
       if [ -n "$SOCKETS" ] && [[ "$SOCKETS" != "1" ]]; then
         BOOT_MODE="windows_secure"
-        file="$STORAGE/windows.mode"
-        writeFile "$BOOT_MODE" "$file"
+        echo "$BOOT_MODE" > "$STORAGE/windows.mode"
       fi
     fi
   fi
 
   if [ -n "${ARGS:-}" ]; then
     ARGUMENTS="$ARGS ${ARGUMENTS:-}"
-    file="$STORAGE/windows.args"
-    writeFile "$ARGS" "$file"
+    echo "$ARGS" > "$STORAGE/windows.args"
   fi
 
   if [ -n "${VGA:-}" ] && [[ "${VGA:-}" != "virtio"* ]]; then
-    file="$STORAGE/windows.vga"
-    writeFile "$VGA" "$file"
+    echo "$VGA" > "$STORAGE/windows.vga"
   fi
 
   if [ -n "${USB:-}" ] && [[ "${USB:-}" != "qemu-xhci"* ]]; then
-    file="$STORAGE/windows.usb"
-    writeFile "$USB" "$file"
+    echo "$USB" > "$STORAGE/windows.usb"
   fi
 
   if [ -n "${DISK_TYPE:-}" ] && [[ "${DISK_TYPE:-}" != "scsi" ]]; then
-    file="$STORAGE/windows.type"
-    writeFile "$DISK_TYPE" "$file"
+    echo "$DISK_TYPE" > "$STORAGE/windows.type"
   fi
 
   if [ -n "${ADAPTER:-}" ] && [[ "${ADAPTER:-}" != "virtio-net-pci" ]]; then
-    file="$STORAGE/windows.net"
-    writeFile "$ADAPTER" "$file"
+    echo "$ADAPTER" > "$STORAGE/windows.net"
   fi
 
   rm -rf "$TMP"
@@ -378,24 +339,19 @@ extractESD() {
   local dir="$2"
   local version="$3"
   local desc="$4"
-  local size size_gb sizes space space_gb
-  local desc total total1 total2 total3 total4
-  local imageIndex links links1 links2 links3 links4
+  local size size_gb space space_gb desc
 
-  local msg="Extracting $desc bootdisk"
-  info "$msg..." && html "$msg..."
+  local msg="Extracting $desc bootdisk..."
+  info "$msg" && html "$msg"
 
   if [ "$(stat -c%s "$iso")" -lt 100000000 ]; then
     error "Invalid ESD file: Size is smaller than 100 MB" && return 1
   fi
 
   rm -rf "$dir"
+  mkdir -p "$dir"
 
-  if ! makeDir "$dir"; then
-    error "Failed to create directory \"$dir\" !" && return 1
-  fi
-
-  size=9606127360
+  size=16106127360
   size_gb=$(formatBytes "$size")
   space=$(df --output=avail -B 1 "$dir" | tail -n 1)
   space_gb=$(formatBytes "$space")
@@ -411,70 +367,40 @@ extractESD() {
     error "Cannot read the image count in ESD file!" && return 1
   fi
 
-  sizes=$(wimlib-imagex info "$iso" | grep "Total Bytes:")
-  links=$(wimlib-imagex info "$iso" | grep "Hard Link Bytes:")
-
-  total1=$(awk "NR==1{ print; }" <<< "$sizes" | cut -d':' -f2 | sed 's/^ *//')
-  links1=$(awk "NR==1{ print; }" <<< "$links" | cut -d':' -f2 | sed 's/^ *//')
-  total=$(( total1 - links1 ))
-
-  total3=$(awk "NR==3{ print; }" <<< "$sizes" | cut -d':' -f2 | sed 's/^ *//')
-  links3=$(awk "NR==3{ print; }" <<< "$links" | cut -d':' -f2 | sed 's/^ *//')
-  total3=$(( total3 - links3 ))
-  total3=$(( total3 + 60000000 ))
-
-  /run/progress.sh "$dir" "$total" "$msg ([P])..." &
-
-  imageIndex="1"
-  wimlib-imagex apply "$iso" "$imageIndex" "$dir" --quiet 2>/dev/null || {
+  wimlib-imagex apply "$iso" 1 "$dir" --quiet 2>/dev/null || {
     retVal=$?
-    fKill "progress.sh"
-    error "Extracting $desc bootdisk failed ($retVal)" && return 1
+    error "Extracting $desc bootdisk failed" && return $retVal
   }
 
-  fKill "progress.sh"
-
   local bootWimFile="$dir/sources/boot.wim"
   local installWimFile="$dir/sources/install.wim"
 
-  local msg="Extracting $desc environment"
-  info "$msg..." && html "$msg..."
+  local msg="Extracting $desc environment..."
+  info "$msg" && html "$msg"
 
-  imageIndex="2"
-  /run/progress.sh "$bootWimFile" "$total3" "$msg ([P])..." &
-
-  wimlib-imagex export "$iso" "$imageIndex" "$bootWimFile" --compress=none --quiet || {
+  wimlib-imagex export "$iso" 2 "$bootWimFile" --compress=none --quiet || {
     retVal=$?
-    fKill "progress.sh"
-    error "Adding WinPE failed ($retVal)" && return 1
+    error "Adding WinPE failed" && return ${retVal}
   }
 
-  fKill "progress.sh"
+  local msg="Extracting $desc setup..."
+  info "$msg" && html "$msg"
 
-  local msg="Extracting $desc setup"
-  info "$msg..."
-
-  imageIndex="3"
-  /run/progress.sh "$bootWimFile" "$total3" "$msg ([P])..." &
-
-  wimlib-imagex export "$iso" "$imageIndex" "$bootWimFile" --compress=none --boot --quiet || {
+  wimlib-imagex export "$iso" 3 "$bootWimFile" --compress=none --boot --quiet || {
    retVal=$?
-   fKill "progress.sh"
-   error "Adding Windows Setup failed ($retVal)" && return 1
+   error "Adding Windows Setup failed" && return ${retVal}
   }
 
-  fKill "progress.sh"
-
   if [[ "${PLATFORM,,}" == "x64" ]]; then
     LABEL="CCCOMA_X64FRE_EN-US_DV9"
   else
     LABEL="CPBA_A64FRE_EN-US_DV9"
   fi
 
-  local msg="Extracting $desc image"
-  info "$msg..." && html "$msg..."
+  local msg="Extracting $desc image..."
+  info "$msg" && html "$msg"
 
-  local edition imageEdition
+  local edition imageIndex imageEdition
   edition=$(getCatalog "$version" "name")
 
   if [ -z "$edition" ]; then
@@ -482,27 +408,15 @@ extractESD() {
   fi
 
   for (( imageIndex=4; imageIndex<=esdImageCount; imageIndex++ )); do
-
-    imageEdition=$(wimlib-imagex info "$iso" "$imageIndex" | grep '^Description:' | sed 's/Description:[ \t]*//')
+    imageEdition=$(wimlib-imagex info "$iso" ${imageIndex} | grep '^Description:' | sed 's/Description:[ \t]*//')
     [[ "${imageEdition,,}" != "${edition,,}" ]] && continue
-
-    total4=$(du -sb "$iso" | cut -f1)
-    total4=$(( total4 + 3000000 ))
-
-    /run/progress.sh "$installWimFile" "$total4" "$msg ([P])..." &
-
-    wimlib-imagex export "$iso" "$imageIndex" "$installWimFile" --compress=LZMS --chunk-size 128K --quiet || {
+    wimlib-imagex export "$iso" ${imageIndex} "$installWimFile" --compress=LZMS --chunk-size 128K --quiet || {
       retVal=$?
-      fKill "progress.sh"
-      error "Addition of $imageIndex to the $desc image failed ($retVal)" && return 1
+      error "Addition of $imageIndex to the $desc image failed" && return $retVal
     }
-
-    fKill "progress.sh"
     return 0
-
   done
 
-  fKill "progress.sh"
   error "Failed to find product '$edition' in install.wim!" && return 1
 }
 
@@ -526,21 +440,18 @@ extractImage() {
     return 1
   fi
 
-  local msg="Extracting $desc image"
-  info "$msg..." && html "$msg..."
+  local msg="Extracting $desc image..."
+  info "$msg" && html "$msg"
 
   rm -rf "$dir"
-
-  if ! makeDir "$dir"; then
-    error "Failed to create directory \"$dir\" !" && return 1
-  fi
+  mkdir -p "$dir"
 
   size=$(stat -c%s "$iso")
   size_gb=$(formatBytes "$size")
   space=$(df --output=avail -B 1 "$dir" | tail -n 1)
   space_gb=$(formatBytes "$space")
 
-  if (( size < 100000000 )); then
+  if ((size<100000000)); then
     error "Invalid ISO file: Size is smaller than 100 MB" && return 1
   fi
 
@@ -549,15 +460,11 @@ extractImage() {
   fi
 
   rm -rf "$dir"
-  /run/progress.sh "$dir" "$size" "$msg ([P])..." &
 
   if ! 7z x "$iso" -o"$dir" > /dev/null; then
-    fKill "progress.sh"
     error "Failed to extract ISO file: $iso" && return 1
   fi
 
-  fKill "progress.sh"
-
   if [[ "${UNPACK:-}" != [Yy1]* ]]; then
 
     LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p')
@@ -1170,8 +1077,8 @@ buildImage() {
 
   desc=$(printVersion "$DETECTED" "ISO")
 
-  local msg="Building $desc image"
-  info "$msg..." && html "$msg..."
+  local msg="Building $desc image..."
+  info "$msg" && html "$msg"
 
   [ -z "$LABEL" ] && LABEL="Windows"
 
@@ -1188,8 +1095,6 @@ buildImage() {
     error "Not enough free space in $STORAGE, have $space_gb available but need at least $size_gb." && return 1
   fi
 
-  /run/progress.sh "$out" "$size" "$msg ([P])..." &
-
   if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
 
     genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "${LABEL::30}" \
@@ -1210,8 +1115,6 @@ buildImage() {
 
   fi
 
-  fKill "progress.sh"
-
   if [ -n "$failed" ]; then
     [ -s "$log" ] && echo "$(<"$log")"
     error "Failed to build image!" && return 1
@@ -1224,8 +1127,6 @@ buildImage() {
   [[ "$error" != "$hide" ]] && echo "$error"
 
   mv -f "$out" "$BOOT" || return 1
-  ! setOwner "$BOOT" && error "Failed to set the owner for \"$BOOT\" !"
-
   return 0
 }
 
diff --git a/src/mido.sh b/src/mido.sh
index 369fc17..cc5b251 100644
--- a/src/mido.sh
+++ b/src/mido.sh
@@ -487,11 +487,8 @@ getESD() {
   info "$msg" && html "$msg"
 
   rm -rf "$dir"
+  mkdir -p "$dir"
 
-  if ! makeDir "$dir"; then
-    error "Failed to create directory \"$dir\" !" && return 1
-  fi
-  
   local xFile="products.xml"
   local eFile="esd_edition.xml"
   local fFile="products_filter.xml"
diff --git a/src/power.sh b/src/power.sh
index 98a6f73..1c2c223 100644
--- a/src/power.sh
+++ b/src/power.sh
@@ -74,7 +74,6 @@ ready() {
 finish() {
 
   local pid
-  local cnt=0
   local reason=$1
 
   touch "$QEMU_END"
@@ -82,32 +81,20 @@ finish() {
   if [ -s "$QEMU_PID" ]; then
 
     pid=$(<"$QEMU_PID")
-    echo && error "Forcefully terminating Windows, reason: $reason..."
+    error "Forcefully terminating Windows, reason: $reason..."
     { kill -15 "$pid" || true; } 2>/dev/null
 
     while isAlive "$pid"; do
-
       sleep 1
-      cnt=$((cnt+1))
-
       # Workaround for zombie pid
       [ ! -s "$QEMU_PID" ] && break
-
-      if [ "$cnt" == "5" ]; then
-        echo && error "QEMU did not terminate itself, forcefully killing process..."
-        { kill -9 "$pid" || true; } 2>/dev/null
-      fi
-
     done
-
   fi
 
   if [ ! -f "$STORAGE/windows.boot" ] && [ -f "$BOOT" ]; then
     # Remove CD-ROM ISO after install
     if ready; then
-      local file="$STORAGE/windows.boot"
-      touch "$file"
-      ! setOwner "$file" && error "Failed to set the owner for \"$file\" !"
+      touch "$STORAGE/windows.boot"
       if [[ "$REMOVE" != [Nn]* ]]; then
         rm -f "$BOOT" 2>/dev/null || true
       fi
diff --git a/src/samba.sh b/src/samba.sh
index 7cd3210..d70cb1a 100644
--- a/src/samba.sh
+++ b/src/samba.sh
@@ -46,21 +46,10 @@ addShare() {
   local cfg="$5"
   local owner=""
 
-  if [ ! -d "$dir" ]; then
-    if ! mkdir -p "$dir"; then
-      error "Failed to create shared folder ($dir)." && return 1
-    fi
-  fi
+  mkdir -p "$dir" || return 1
 
   if ! ls -A "$dir" >/dev/null 2>&1; then
-    msg="No permission to access shared folder ($dir)."
-    msg+=" If SELinux is active, you need to add the \":Z\" flag to the bind mount."
-    error "$msg" && return 1
-  fi
-
-  if [ ! -w "$dir" ]; then
-    msg="shared folder ($dir) is not writeable!"
-    warn "$msg"
+    error "Failed to access directory $dir" && return 1
   fi
 
   if [ -z "$(ls -A "$dir")" ]; then
@@ -147,21 +136,26 @@ share="/shared"
 [ ! -d "$share" ] && [ -d "$STORAGE/data" ] && share="$STORAGE/data"
 [ ! -d "$share" ] && share="$tmp"
 
-! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_CONFIG" && return 0
+m1="Failed to add shared folder"
+m2="Please check its permissions."
+
+if ! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_CONFIG"; then
+  error "$m1 '$share'. $m2" && return 0
+fi
 
 if [ -d "/shared2" ]; then
-  addShare "/shared2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || :
+  addShare "/shared2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || error "$m1 '/shared2'. $m2"
 else
   if [ -d "/data2" ]; then
-    addShare "/data2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || :
+    addShare "/data2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || error "$m1 '/data2'. $m2."
   fi
 fi
 
 if [ -d "/shared3" ]; then
-  addShare "/shared3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || :
+  addShare "/shared3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || error "$m1 '/shared3'. $m2"
 else
   if [ -d "/data3" ]; then
-    addShare "/data3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || :
+    addShare "/data3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || error "$m1 '/data3'. $m2"
   fi
 fi