diff --git a/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx b/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx
index cd144a4c1..e91803310 100644
--- a/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx
+++ b/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings } from "@api/Settings";
+import { definePluginSettings, migratePluginSettings, migrateSettingsFromPlugin } from "@api/Settings";
 import { Button } from "@components/Button";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
+import { Devs, EquicordDevs } from "@utils/constants";
+import definePlugin, { makeRange, OptionType } from "@utils/types";
 import { Activity, SelectOption } from "@vencord/discord-types";
 import { openUserSettingsPanel, PresenceStore, UserStore } from "@webpack/common";
 
+migratePluginSettings("ClipsEnhancements", "TimelessClips");
+migrateSettingsFromPlugin("ClipsEnhancements", "TimelessClips", "clipLength");
+
 const settings = definePluginSettings({
     richPresenceTagging: {
         type: OptionType.SELECT,
@@ -21,6 +24,31 @@ const settings = definePluginSettings({
             { label: "Never", value: "never" },
         ]
     },
+    clipLength: {
+        description: "Custom clip length in minutes",
+        type: OptionType.SLIDER,
+        markers: makeRange(3, 30, 1),
+        default: 5,
+        stickToMarkers: true,
+    },
+    enableScreenshotKeybind: {
+        type: OptionType.BOOLEAN,
+        description: "Enable the screenshot keybind feature",
+        default: true,
+        restartNeeded: true
+    },
+    enableVoiceOnlyClips: {
+        type: OptionType.BOOLEAN,
+        description: "Enable voice-only clips (audio without video)",
+        default: true,
+        restartNeeded: true
+    },
+    enableAdvancedSignals: {
+        type: OptionType.BOOLEAN,
+        description: "Enable advanced clip signals (auto-clip triggers)",
+        default: true,
+        restartNeeded: true
+    },
     clipsLink: {
         type: OptionType.COMPONENT,
         description: "",
@@ -42,10 +70,11 @@ const settings = definePluginSettings({
 
 export default definePlugin({
     name: "ClipsEnhancements",
-    description: "Add more Clip FPS and duration options, plus RPC tagging!",
-    authors: [Devs.niko],
+    description: "Add more Clip FPS and duration options, custom clip length, RPC tagging and more",
+    authors: [Devs.niko, Devs.Joona, EquicordDevs.keyages],
     settings,
     patches: [
+        // FPS and duration options
         {
             find: "clips_recording_settings",
             replacement: [
@@ -65,6 +94,29 @@ export default definePlugin({
                 match: /(applicationName:)(.{0,50})(,applicationId:)(\i)/,
                 replace: "$1$2$3$self.getApplicationId($2)??$4"
             }
+        },
+        // TimelessClips custom clip length
+        {
+            find: '"Save clip keybind unset"',
+            replacement: {
+                match: /\)}](?<={value:.{14,17},label:(.{35,55}:).{3,7})/,
+                replace: "$&.concat({value:$self.getClipLength(true),label:$1$self.getClipLength(false)})})"
+            }
+        },
+        // enables clips
+        {
+            find: "2022-11_clips_experiment",
+            replacement: {
+                match: /defaultConfig:\{enableClips:!\d,ignorePlatformRestriction:!\d,showClipsHeaderEntrypoint:!\d,enableScreenshotKeybind:!\d,enableVoiceOnlyClips:!\d,enableAdvancedSignals:!\d\}/,
+                replace: "defaultConfig:{enableClips:!0,ignorePlatformRestriction:!0,showClipsHeaderEntrypoint:!0,enableScreenshotKeybind:$self.settings.store.enableScreenshotKeybind,enableVoiceOnlyClips:$self.settings.store.enableVoiceOnlyClips,enableAdvancedSignals:$self.settings.store.enableAdvancedSignals}"
+            }
+        },
+        {
+            find: "2023-10_viewer_clipping",
+            replacement: {
+                match: /defaultConfig:\{enableViewerClipping:!\d,ignoreSenderPreference:!\d\}/,
+                replace: "defaultConfig:{enableViewerClipping:!0,ignoreSenderPreference:!0}"
+            }
         }
     ],
 
@@ -94,12 +146,24 @@ export default definePlugin({
 
         const activities: Activity[] = PresenceStore.getActivities(UserStore.getCurrentUser().id);
         const validActivities = activities.filter(activity => activity.type === 0 && activity.application_id !== null);
-
         const splitName = activityName.split(" ");
 
         // Try to match activity by it's start and end
         const matchedActivities = validActivities.filter(activity => activity.name.endsWith(splitName.at(-1)!) || activity.name.startsWith(splitName.at(0)!));
 
-        return (matchedActivities ?? (settings.store.richPresenceTagging === "whenMatched" ? null : validActivities))[0]?.application_id;
+        if (matchedActivities.length > 0) {
+            return matchedActivities[0].application_id;
+        }
+
+        if (settings.store.richPresenceTagging !== "whenMatched") {
+            return validActivities[0]?.application_id ?? null;
+        }
+
+        return null;
+    },
+
+    getClipLength(millis: boolean) {
+        const minutes = settings.store.clipLength;
+        return millis ? minutes * 6e4 : minutes;
     }
 });
diff --git a/src/equicordplugins/timelessClips.desktop/index.ts b/src/equicordplugins/timelessClips.desktop/index.ts
deleted file mode 100644
index bd9e4c139..000000000
--- a/src/equicordplugins/timelessClips.desktop/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import { Devs } from "@utils/constants";
-import definePlugin, { makeRange, OptionType, } from "@utils/types";
-
-const settings = definePluginSettings({
-    clipLength: {
-        description: "Add clip length option in minutes",
-        type: OptionType.SLIDER,
-        markers: makeRange(3, 30, 1),
-        default: 5,
-        stickToMarkers: true,
-    },
-});
-
-export default definePlugin({
-    name: "TimelessClips",
-    authors: [Devs.Joona],
-    description: "Add a your own clip length",
-    patches: [
-        {
-            find: '"Save clip keybind unset"',
-            replacement: {
-                match: /\)}](?<={value:.{14,17},label:(.{35,55}:).{3,7})/,
-                replace: "$&.concat({value:$self.getClipLength(true),label:$1$self.getClipLength(false)})})"
-            }
-        },
-    ],
-    settings,
-    getClipLength(millis: boolean) {
-        const minutes = settings.store.clipLength;
-        return millis ? minutes * 6e4 : minutes;
-
-    }
-});