diff --git a/README.md b/README.md
index 849860f8ec..3a7daf4fd0 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@
 | [Aida64 Engineer **(Aida64En)**](./bucket/Aida64En.json)                                                   |   ✔    |    ✔     |       ✔ (⛔)       |
 | [Aida64 Extreme **(Aida64)**](./bucket/Aida64.json)                                                        |   ✔    |    ✔     |       ✔ (⛔)       |
 | [Air Steam Skin **(AirSkin)**](./bucket/AirSkin.json)                                                      |   ✔    |    ✔     |       ✔ (⛔)       |
+| [Apache Open Office **(OpenOffice)**](./bucket/OpenOffice.json)                                            |   ✔    |    ✔     |       ✔ (✔)       |
 | [ArchiSteamFarm **(ArchiSteamFarm)**](./bucket/ArchiSteamFarm.json)                                        |   ✔    |    ✔     |       ✔ (⛔)       |
 | [AutoClicker **(AutoClicker)**](./bucket/AutoClicker.json)                                                 |   ✔    |    ✔     |       ✔ (✔)       |
 | [AutoClickers **(AutoClickers)**](./bucket/AutoClickers.json)                                              |   ✔    |    ✔     |       ✔ (✔)       |
diff --git a/TODO/AOpenOffice.json b/bucket/OpenOffice.json
similarity index 51%
rename from TODO/AOpenOffice.json
rename to bucket/OpenOffice.json
index 9cba7f5bd2..23dca187ff 100644
--- a/TODO/AOpenOffice.json
+++ b/bucket/OpenOffice.json
@@ -5,45 +5,45 @@
     "license": "Apache-2.0",
     "url": "https://archive.apache.org/dist/openoffice/4.1.6/binaries/en-GB/Apache_OpenOffice_4.1.6_Win_x86_install_en-GB.exe#/cosi.7z",
     "hash": "sha512:bf4710d2e247dffe42a6ff9f3c76dcfe9b4e5a28f12a8c0e454550287d466b7b98ea8d4b292510df7f58e05707a4c6b51efda2078785cdae81dd1c89eff7aecd",
-    "pre_install": [
-        "$file = (Get-ChildItem \"$dir\" '*.msi').FullName",
-        "extract_msi \"$file\" \"$dir\""
-    ],
+    "installer": {
+        "script": [
+            "Expand-MsiArchive \"$dir\\openoffice$($version -replace '\\.', '').msi\" \"$dir\\App\" -Removal",
+            "Get-ChildItem \"$dir\" -Exclude 'App' | Remove-Item -Recurse",
+            "Move-Item \"$dir\\App\\OpenOffice 4\\*\" \"$dir\"",
+            "Remove-Item \"$dir\\App\" -Recurse"
+        ]
+    },
     "shortcuts": [
         [
-            "OpenOffice\\OpenOffice",
-            ".exe"
-        ],
-        [
-            "OpenOffice\\Base",
-            ".exe"
+            "program\\soffice.exe",
+            "OpenOffice\\OpenOffice"
         ],
         [
-            "OpenOffice\\Calc",
-            ".exe"
+            "program\\sbase.exe",
+            "OpenOffice\\Base"
         ],
         [
-            "OpenOffice\\Draw",
-            ".exe"
+            "program\\scalc.exe",
+            "OpenOffice\\Calc"
         ],
         [
-            "OpenOffice\\Impress",
-            ".exe"
+            "program\\sdraw.exe",
+            "OpenOffice\\Draw"
         ],
         [
-            "OpenOffice\\Math",
-            ".exe"
+            "program\\simpress.exe",
+            "OpenOffice\\Impress"
         ],
         [
-            "OpenOffice\\Writer",
-            ".exe"
+            "program\\smath.exe",
+            "OpenOffice\\Math"
         ],
         [
-            "OpenOffice\\Calc",
-            ".exe"
+            "program\\swriter.exe",
+            "OpenOffice\\Writer"
         ]
     ],
-    "checkver": "Apache OpenOffice ([\\d\\.]+) released",
+    "checkver": "Apache OpenOffice ([\\d.]+) released",
     "autoupdate": {
         "url": "https://archive.apache.org/dist/openoffice/$version/binaries/en-GB/Apache_OpenOffice_$version_Win_x86_install_en-GB.exe#/cosi.7z",
         "hash": {