diff --git a/samy.tasks.json b/samy.tasks.json
index 54585ea..1b4b48d 100644
--- a/samy.tasks.json
+++ b/samy.tasks.json
@@ -70,6 +70,7 @@
     "HandlerFn": "Set-SVSBitLocker",
     "Page": "onboard",
     "Column": "right",
+    "Group": "tweaks",
     "Tooltip": "Enables BitLocker drive encryption"
   },
   {
@@ -79,6 +80,7 @@
     "HandlerFn": "Invoke-SetEdgeDefaultSearchEngine",
     "Page": "onboard",
     "Column": "right",
+    "Group": "twaeks",
     "Tooltip": "Will configure Edge to use Google as default search provider"
   },
   {
@@ -88,6 +90,7 @@
     "HandlerFn": "Disable-Animations",
     "Page": "onboard",
     "Column": "right",
+    "Group": "tweaks",
     "Tooltip": "Disables Windows UI animations for performance"
   },
   {
@@ -96,7 +99,8 @@
     "Label": "Google Chrome",
     "HandlerFn": "Invoke-InstallChrome",
     "Page": "onboard",
-    "Column": "right"
+    "Column": "right",
+    "Group": "apps"
   },
   {
     "Id": "wingetAcrobat",
@@ -104,7 +108,8 @@
     "Label": "Adobe Acrobat Reader (64-bit)",
     "HandlerFn": "Invoke-InstallAcrobat",
     "Page": "onboard",
-    "Column": "right"
+    "Column": "right",
+    "Group": "apps"
   },
   {
     "Id": "renameComputer",
@@ -113,6 +118,7 @@
     "HandlerFn": "Invoke-RenameComputer",
     "Page": "onboard",
     "Column": "right",
+    "Group": "tweaks",
     "Tooltip": "Renames the device (reboot required)"
   },
   {