diff --git a/plugins/all-in-one/settings.tsx b/plugins/all-in-one/settings.tsx
index d70dae4..dd16964 100644
--- a/plugins/all-in-one/settings.tsx
+++ b/plugins/all-in-one/settings.tsx
@@ -37,7 +37,7 @@ export default function Settings() {
       <ScrollView style={{ flex: 1 }}>
         <Stack spacing={8}>
           {/* Facts Commands Settings */}
-          <TableRowGroup title="Facts Settings">
+          <TableRowGroup title="Facts Commands">
             <TableSwitchRow
               label="Send as Reply"
               subLabel="Send facts as a reply to the command message"
@@ -58,38 +58,6 @@ export default function Settings() {
                 forceRerender();
               }}
             />
-          </TableRowGroup>
-
-          {/* Plugin List Settings */}
-          <TableRowGroup title="Plugin List Settings">
-            <TableSwitchRow
-              label="Always Send Detailed List"
-              subLabel="Always use detailed mode when listing plugins"
-              icon={getAssetIDByName("ic_message_copy")}
-              value={storage.listSettings.pluginListAlwaysDetailed}
-              onValueChange={(v: boolean) => {
-                storage.listSettings.pluginListAlwaysDetailed = v;
-                forceRerender();
-              }}
-            />
-          </TableRowGroup>
-
-          {/* Theme List Settings */}
-          <TableRowGroup title="Theme List Settings">
-            <TableSwitchRow
-              label="Always Send Detailed List"
-              subLabel="Always use detailed mode when listing themes"
-              icon={getAssetIDByName("ic_theme")}
-              value={storage.listSettings.themeListAlwaysDetailed}
-              onValueChange={(v: boolean) => {
-                storage.listSettings.themeListAlwaysDetailed = v;
-                forceRerender();
-              }}
-            />
-          </TableRowGroup>
-
-          {/* Commands Overview */}
-          <TableRowGroup title="Available Commands">
             <TableSwitchRow
               label="/catfact"
               subLabel="Get random cat facts"
@@ -111,12 +79,29 @@ export default function Settings() {
               value={true}
               disabled={true}
             />
+          </TableRowGroup>
+
+          {/* List Commands Settings */}
+          <TableRowGroup title="List Commands">
             <TableSwitchRow
-              label="/petpet"
-              subLabel="Create pet-pet GIF of a user"
-              icon={getAssetIDByName("ic_image")}
-              value={true}
-              disabled={true}
+              label="Always Send Detailed Plugin List"
+              subLabel="Always use detailed mode when listing plugins"
+              icon={getAssetIDByName("ic_message_copy")}
+              value={storage.listSettings.pluginListAlwaysDetailed}
+              onValueChange={(v: boolean) => {
+                storage.listSettings.pluginListAlwaysDetailed = v;
+                forceRerender();
+              }}
+            />
+            <TableSwitchRow
+              label="Always Send Detailed Theme List"
+              subLabel="Always use detailed mode when listing themes"
+              icon={getAssetIDByName("ic_theme")}
+              value={storage.listSettings.themeListAlwaysDetailed}
+              onValueChange={(v: boolean) => {
+                storage.listSettings.themeListAlwaysDetailed = v;
+                forceRerender();
+              }}
             />
             <TableSwitchRow
               label="/plugin-list"
@@ -132,9 +117,31 @@ export default function Settings() {
               value={true}
               disabled={true}
             />
+          </TableRowGroup>
+
+          {/* Image Commands */}
+          <TableRowGroup title="Image Commands">
             <TableSwitchRow
-              label="/konoself, /konosend"
-              subLabel="Get random images from KonoChan"
+              label="/petpet"
+              subLabel="Create pet-pet GIF of a user"
+              icon={getAssetIDByName("ic_image")}
+              value={true}
+              disabled={true}
+            />
+          </TableRowGroup>
+
+          {/* KonoChan Commands */}
+          <TableRowGroup title="KonoChan Commands">
+            <TableSwitchRow
+              label="/konoself"
+              subLabel="Get random image from KonoChan (private)"
+              icon={getAssetIDByName("ic_image")}
+              value={true}
+              disabled={true}
+            />
+            <TableSwitchRow
+              label="/konosend"
+              subLabel="Send random image from KonoChan to channel"
               icon={getAssetIDByName("ic_image")}
               value={true}
               disabled={true}
diff --git a/plugins/all-in-one/src/commands/konochan.ts b/plugins/all-in-one/src/commands/konochan.ts
index 200ecb0..4e0b12a 100644
--- a/plugins/all-in-one/src/commands/konochan.ts
+++ b/plugins/all-in-one/src/commands/konochan.ts
@@ -1,4 +1,5 @@
 import { findByProps } from "@vendetta/metro";
+import { alerts } from "@vendetta/ui";
 import { sendMessage } from "../utils/messages";
 
 /**
@@ -37,6 +38,17 @@ const nsfwOption = {
   displayDescription: "Include NSFW content?",
 };
 
+const showNSFWWarning = () => {
+  return alerts.showConfirmationAlert({
+    title: "NSFW Content Warning",
+    content: "NSFW content can only be sent in NSFW channels!",
+    confirmText: "Okay",
+    cancelText: null,
+    confirmColor: "brand",
+    isDismissable: true,
+  });
+};
+
 export const konoSelfCommand = {
   name: "konoself",
   displayName: "konoself",
@@ -49,10 +61,8 @@ export const konoSelfCommand = {
 
     // Check if channel is NSFW for NSFW content
     if (isNSFW && !ctx.channel.nsfw) {
-      return sendMessage(
-        ctx.channel.id,
-        "❌ NSFW content can only be sent in NSFW channels!",
-      );
+      showNSFWWarning();
+      return { type: 4 };
     }
 
     const imageUrl = await fetchImage(isNSFW);
@@ -81,10 +91,8 @@ export const konoSendCommand = {
 
     // Check if channel is NSFW for NSFW content
     if (isNSFW && !ctx.channel.nsfw) {
-      return sendMessage(
-        ctx.channel.id,
-        "❌ NSFW content can only be sent in NSFW channels!",
-      );
+      showNSFWWarning();
+      return { type: 4 };
     }
 
     const imageUrl = await fetchImage(isNSFW);