diff --git a/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/Experimental.kt b/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/Experimental.kt
index e9969f3c..043d0641 100644
--- a/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/Experimental.kt
+++ b/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/Experimental.kt
@@ -4,8 +4,14 @@ import me.rhunk.snapenhance.common.config.ConfigContainer
 import me.rhunk.snapenhance.common.config.FeatureNotice
 
 class Experimental : ConfigContainer() {
+    class NativeHooks : ConfigContainer(hasGlobalState = true) {
+        val disableBitmoji = boolean("disable_bitmoji")
+        val fixGalleryMediaOverride = boolean("fix_gallery_media_override")
+    }
+
     val nativeHooks = container("native_hooks", NativeHooks()) { icon = "Memory"; requireRestart() }
     val spoof = container("spoof", Spoof()) { icon = "Fingerprint" }
+    val snapToChatMedia = boolean("snap_to_chat_media") { requireRestart(); addNotices(FeatureNotice.UNSTABLE) }
     val appPasscode = string("app_passcode")
     val appLockOnResume = boolean("app_lock_on_resume")
     val infiniteStoryBoost = boolean("infinite_story_boost")
diff --git a/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/MessagingTweaks.kt b/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/MessagingTweaks.kt
index 19d5f5ae..a9b6a279 100644
--- a/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/MessagingTweaks.kt
+++ b/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/MessagingTweaks.kt
@@ -17,7 +17,6 @@ class MessagingTweaks : ConfigContainer() {
         "EXTERNAL_MEDIA",
         "STICKER"
     ) { requireRestart() }
-    val snapToChatMedia = boolean("snap_to_chat_media") { requireRestart() }
     val preventMessageSending = multiple("prevent_message_sending", *NotificationType.getOutgoingValues().map { it.key }.toTypedArray()) {
         customOptionTranslationPath = "features.options.notifications"
     }
diff --git a/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/NativeHooks.kt b/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/NativeHooks.kt
deleted file mode 100644
index 032eca4b..00000000
--- a/common/src/main/kotlin/me/rhunk/snapenhance/common/config/impl/NativeHooks.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package me.rhunk.snapenhance.common.config.impl
-
-import me.rhunk.snapenhance.common.config.ConfigContainer
-
-class NativeHooks: ConfigContainer(hasGlobalState = true) {
-    val disableBitmoji = boolean("disable_bitmoji")
-    val fixGalleryMediaOverride = boolean("fix_gallery_media_override")
-}
\ No newline at end of file
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/spying/SnapToChatMedia.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/SnapToChatMedia.kt
similarity index 88%
rename from core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/spying/SnapToChatMedia.kt
rename to core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/SnapToChatMedia.kt
index 21183cd5..6a23c0fa 100644
--- a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/spying/SnapToChatMedia.kt
+++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/SnapToChatMedia.kt
@@ -1,4 +1,4 @@
-package me.rhunk.snapenhance.core.features.impl.spying
+package me.rhunk.snapenhance.core.features.impl.experiments
 
 import me.rhunk.snapenhance.common.data.ContentType
 import me.rhunk.snapenhance.common.util.protobuf.ProtoReader
@@ -9,7 +9,7 @@ import me.rhunk.snapenhance.core.features.FeatureLoadParams
 
 class SnapToChatMedia : Feature("SnapToChatMedia", loadParams = FeatureLoadParams.ACTIVITY_CREATE_SYNC) {
     override fun onActivityCreate() {
-        if (!context.config.messaging.snapToChatMedia.get()) return
+        if (!context.config.experimental.snapToChatMedia.get()) return
 
         context.event.subscribe(BuildMessageEvent::class, priority = 100) { event ->
             if (event.message.messageContent.contentType != ContentType.SNAP) return@subscribe
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/manager/impl/FeatureManager.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/manager/impl/FeatureManager.kt
index d7ce2279..60e9c157 100644
--- a/core/src/main/kotlin/me/rhunk/snapenhance/core/manager/impl/FeatureManager.kt
+++ b/core/src/main/kotlin/me/rhunk/snapenhance/core/manager/impl/FeatureManager.kt
@@ -15,7 +15,7 @@ import me.rhunk.snapenhance.core.features.impl.experiments.*
 import me.rhunk.snapenhance.core.features.impl.global.*
 import me.rhunk.snapenhance.core.features.impl.messaging.*
 import me.rhunk.snapenhance.core.features.impl.spying.MessageLogger
-import me.rhunk.snapenhance.core.features.impl.spying.SnapToChatMedia
+import me.rhunk.snapenhance.core.features.impl.experiments.SnapToChatMedia
 import me.rhunk.snapenhance.core.features.impl.spying.StealthMode
 import me.rhunk.snapenhance.core.features.impl.tweaks.CameraTweaks
 import me.rhunk.snapenhance.core.features.impl.ui.*