diff --git a/.github/workflows/multi-platform.yml b/.github/workflows/multi-platform.yml
index 6998102..7823f62 100644
--- a/.github/workflows/multi-platform.yml
+++ b/.github/workflows/multi-platform.yml
@@ -76,6 +76,7 @@ jobs:
 
             - name: Publish Nightly release
               uses: andelf/nightly-release@main
+              if: ${{ github.ref_name == github.event.repository.default_branch }}
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a9e68c..e4663f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
     set(CMAKE_OSX_ARCHITECTURES "arm64")
diff --git a/README.md b/README.md
index 26070ac..f394b0c 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ This silly lil' mod adds a mod menu filled to the brim with **over 35 crazy trol
 When pressing `\` or by pressing the floating *Horrible Options* button on your screen, a menu will pop up with a list of joke mod options you can toggle anytime on your game to do some interesting things to your gaming experience. You can view more information within the menu itself.
 
 > [!NOTE]
-> *You can customize any keybinds in this mod via the *[Custom Keybinds](https://www.geode-sdk.org/mods/geode.custom-keybinds)* mod.*
+> *You can customize any keybinds in this mod through its settings.*
 
 #### Player Life
 Give the player a limited health-like meter that must always stay above 0 to prevent the player from dying.
diff --git a/about.md b/about.md
index 73c7025..ca402a8 100644
--- a/about.md
+++ b/about.md
@@ -13,7 +13,7 @@ This silly lil' mod adds a mod menu filled to the brim with **over 35 crazy trol
 ### Options
 When <cf>pressing `\` on your keyboard</c> or by <cl>pressing the floating *Horrible Options* button on your screen</c>, a <cg>menu</c> will pop up with <cg>a list of horrible mod options</c> you can <cy>toggle anytime</c> on your game to do some interesting things to your gaming experience. You can view more information within the menu itself.
 
-> ![ℹ️](frame:GJ_infoIcon_001.png?scale=0.5) <cj>*You can customize any keybinds in this mod via the *[Custom Keybinds](mod:geode.custom-keybinds)* mod.*</c>
+> ![ℹ️](frame:GJ_infoIcon_001.png?scale=0.5) <cj>*You can customize any keybinds in this mod through its settings.*</c>
 
 #### Player Life
 Give the player a limited health-like meter that must always stay above 0 to prevent the player from dying.
diff --git a/include/Events.hpp b/include/Events.hpp
index f5ae964..9a866a6 100644
--- a/include/Events.hpp
+++ b/include/Events.hpp
@@ -2,47 +2,12 @@
 
 #include "Horrible.hpp"
 
-#include <cocos2d.h>
-
 #include <Geode/loader/Event.hpp>
 
 // Container for Horrible Ideas API
 namespace horrible {
     // Event for option toggles
-    class OptionEvent : public geode::Event {
-    private:
-        std::string m_id; // Unique ID of the option
-        bool m_toggled; // Toggle boolean of the option
-
-    public:
-        OptionEvent(std::string id, bool toggled); // Constructor
-
-        AWCW_HORRIBLE_API_DLL std::string_view getId() const noexcept; // Get the unique ID of the option
-        AWCW_HORRIBLE_API_DLL bool getToggled() const noexcept; // Get the toggle boolean of the option
-    };
-
-    // Filter for option toggle event
-    class AWCW_HORRIBLE_API_DLL OptionEventFilter : public geode::EventFilter<OptionEvent> {
-    private:
-        std::vector<std::string> m_ids; // Unique ID of the options to listen to
-
-    public:
-        using Callback = geode::ListenerResult(OptionEvent*);
-
-        /**
-         * Event handler
-         *
-         * @param fn Callback function containing a pointer to the event that fired
-         * @param event Pointer to the event that fired
-         */
-        geode::ListenerResult handle(std::function<Callback> fn, OptionEvent* event);
-
-        OptionEventFilter() = default; // Constructor
-
-        OptionEventFilter(std::string id); // Constructor (listens to one option's toggle)
-        OptionEventFilter(std::vector<std::string> ids); // Constructor (listens to any specified options' toggles)
-
-        OptionEventFilter(cocos2d::CCNode*, std::string id); // Constructor with target (listens to one option's toggle)
-        OptionEventFilter(cocos2d::CCNode*, std::vector<std::string> ids); // Constructor with target (listens to any specified options' toggles)
+    struct OptionEvent final : geode::GlobalEvent<OptionEvent, bool(std::string, bool), std::string> {
+        using GlobalEvent::GlobalEvent;
     };
 };
\ No newline at end of file
diff --git a/include/Horrible.hpp b/include/Horrible.hpp
index 087dc78..3a094cc 100644
--- a/include/Horrible.hpp
+++ b/include/Horrible.hpp
@@ -22,21 +22,18 @@
 // Container for Horrible Ideas API functions
 namespace horrible {
     // Mod option manager for Horrible Ideas
-    class AWCW_HORRIBLE_API_DLL OptionManager : public cocos2d::CCObject {
+    class AWCW_HORRIBLE_API_DLL OptionManager final : public cocos2d::CCObject {
     private:
-        class Impl; // PImpl class
-        std::unique_ptr<Impl> m_impl; // PImpl pointer
+        std::vector<Option> m_options; // Array of registered options
+        std::vector<std::string> m_categories; // Array of auto-registered categories
 
     protected:
-        OptionManager(); // Constructor
-        virtual ~OptionManager(); // Destructor
-
         /**
          * Register a category if not already registered
          *
          * @param category Name of the category
          */
-        void registerCategory(std::string_view category);
+        void registerCategory(std::string category);
 
         /**
          * Check if an option already exists
@@ -47,8 +44,6 @@ namespace horrible {
          */
         bool doesOptionExist(std::string_view id) const noexcept;
 
-        friend class OptionEventFilter;
-
     public:
         // Get option manager singleton
         static OptionManager* get() noexcept;
@@ -58,14 +53,14 @@ namespace horrible {
          *
          * @param option Constructed option object
          */
-        void registerOption(Option const& option);
+        void registerOption(Option option);
 
         /**
          * Returns a reference to the array of all registered options
          *
          * @returns An array of every registered option, main and external
          */
-        std::span<const Option> getOptions() const noexcept;
+        [[nodiscard]] std::span<const Option> getOptions() const noexcept;
 
         /**
          * Returns the toggle state of an option
@@ -74,7 +69,7 @@ namespace horrible {
          *
          * @returns Boolean of the current value
          */
-        bool getOption(std::string_view id) const noexcept;
+        [[nodiscard]] bool getOption(std::string_view id) const noexcept;
 
         /**
          * Set the toggle state of an option
@@ -84,13 +79,18 @@ namespace horrible {
          *
          * @returns Boolean of the old value
          */
-        bool setOption(std::string_view id, bool enable) const noexcept;
+        bool setOption(geode::ZStringView id, bool enable) const;
 
         /**
          * Returns a reference to the array of all registered categories
          *
          * @returns An array of every category name
          */
-        std::span<const std::string> getCategories() const noexcept;
+        [[nodiscard]] std::span<const std::string> getCategories() const noexcept;
     };
-};
\ No newline at end of file
+};
+
+// Statically register an option
+#define REGISTER_HORRIBLE_OPTION(opt) $execute {\
+    if (auto om = horrible::OptionManager::get()) om->registerOption(opt); \
+}
\ No newline at end of file
diff --git a/include/Option.hpp b/include/Option.hpp
index 3b055a0..a6c635f 100644
--- a/include/Option.hpp
+++ b/include/Option.hpp
@@ -15,7 +15,7 @@ namespace horrible {
     };
 
     // A horrible option
-    struct Option {
+    struct Option final {
         std::string id; // Unique ID of the option
         std::string name; // Name of the option
         std::string description; // Description of the option
diff --git a/include/OptionalAPI.hpp b/include/OptionalAPI.hpp
index e4c04a8..32e7604 100644
--- a/include/OptionalAPI.hpp
+++ b/include/OptionalAPI.hpp
@@ -11,49 +11,19 @@
 #define MY_MOD_ID "arcticwoof.horrible_ideas"
 
 namespace horrible {
-    class OptionEventV2 : public geode::Event {
-    private:
-        std::string m_id;
-        bool m_toggled;
-
-    public:
-        OptionEventV2(std::string id, bool toggled) : m_id(std::move(id)), m_toggled(toggled) {};
-
-        std::string_view getId() const noexcept { return m_id; };
-        bool getToggled() const noexcept { return m_toggled; };
-    };
-
-    class OptionEventFilterV2 : public geode::EventFilter<OptionEventV2> {
-    private:
-        std::vector<std::string> m_ids;
-
-    public:
-        using Callback = geode::ListenerResult(OptionEventV2*);
-
-        geode::ListenerResult handle(std::function<Callback> fn, OptionEventV2* event) {
-            if (m_ids.empty()) {
-                return fn(event);
-            } else {
-                for (auto const& id : m_ids) if (event->getId() == id) return fn(event);
-            };
-
-            return geode::ListenerResult::Propagate;
-        };
-
-        OptionEventFilterV2() = default;
-        OptionEventFilterV2(std::string id) : m_ids({ std::move(id) }) {};
-        OptionEventFilterV2(std::vector<std::string> ids) : m_ids(std::move(ids)) {};
+    struct OptionEventV2 final : geode::Event<OptionEventV2, bool(std::string, bool)> {
+        using Event::Event;
     };
 
-    class OptionManagerV2 {
+    class OptionManagerV2 final {
     public:
         static geode::Result<> registerOption(Option const& option)
             GEODE_EVENT_EXPORT(&OptionManagerV2::registerOption, (option));
 
-        static geode::Result<bool> getOption(std::string_view id)
+        [[nodiscard]] static geode::Result<bool> getOption(std::string_view id)
             GEODE_EVENT_EXPORT(&OptionManagerV2::getOption, (id));
 
-        static geode::Result<bool> setOption(std::string_view id, bool enable)
+        static geode::Result<bool> setOption(geode::ZStringView id, bool enable)
             GEODE_EVENT_EXPORT(&OptionManagerV2::setOption, (id, enable));
     };
 };
\ No newline at end of file
diff --git a/mod.json b/mod.json
index 6eef774..14cbd61 100644
--- a/mod.json
+++ b/mod.json
@@ -1,10 +1,10 @@
 {
-    "geode": "4.11.0",
+    "geode": "5.0.0-beta.3",
     "gd": {
-        "win": "2.2074",
-        "android": "2.2074",
-        "mac": "2.2074",
-        "ios": "2.2074"
+        "win": "2.2081",
+        "android": "2.2081",
+        "mac": "2.2081",
+        "ios": "2.2081"
     },
     "id": "arcticwoof.horrible_ideas",
     "name": "Horrible Ideas",
@@ -33,19 +33,7 @@
         ]
     },
     "dependencies": {
-        "geode.node-ids": {
-            "importance": "required",
-            "version": ">=1.21.0"
-        },
-        "geode.custom-keybinds": {
-            "importance": "required",
-            "version": ">=1.10.0",
-            "platforms": [
-                "win",
-                "mac",
-                "android"
-            ]
-        }
+        "geode.node-ids": ">=1.22.0"
     },
     "api": {
         "include": [
@@ -61,7 +49,16 @@
         },
         "button": {
             "type": "custom:menu",
-            "name": ""
+            "name": " "
+        },
+        "key-popup": {
+            "type": "keybind",
+            "name": "Options Menu",
+            "description": "Key to open the Horrible Options menu.",
+            "default": [
+                "\\"
+            ],
+            "category": "universal"
         },
         "ui": {
             "type": "title",
diff --git a/src/Keybinds.cpp b/src/Keybinds.cpp
deleted file mode 100644
index 663f139..0000000
--- a/src/Keybinds.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef GEODE_IS_IOS
-#include <Utils.hpp>
-
-#include <Geode/Geode.hpp>
-
-#include <geode.custom-keybinds/include/Keybinds.hpp>
-
-using namespace geode::prelude;
-using namespace horrible::prelude;
-using namespace keybinds;
-
-$on_mod(Loaded) {
-    if (auto bm = BindManager::get()) {
-        bm->registerBindable({
-            "popup"_spr,
-            "Show Menu",
-            "Open the Horrible Ideas option menu.",
-            {
-                Keybind::create(KEY_Backslash, Modifier::None),
-            },
-            "Horrible Ideas",
-                             });
-
-        new EventListener([=](InvokeBindEvent* event) {
-            if (event->isDown()) menu::open();
-            return ListenerResult::Propagate;
-                          },
-                          InvokeBindFilter(nullptr, "popup"_spr));
-    } else {
-        log::error("Failed to get keybind manager");
-    };
-};
-#endif
\ No newline at end of file
diff --git a/src/Utils.hpp b/src/Utils.hpp
index 558b22c..cd1d6bd 100644
--- a/src/Utils.hpp
+++ b/src/Utils.hpp
@@ -43,47 +43,6 @@ namespace horrible {
 
     namespace str = geode::utils::string; // Shortcut for geode::utils::string
 
-    // Default option IDs
-    namespace key {
-        inline constexpr auto oxygen = "oxygen";
-        inline constexpr auto health = "health";
-        inline constexpr auto grief = "grief";
-        inline constexpr auto congregation = "congregation";
-        inline constexpr auto math_quiz = "math_quiz";
-        inline constexpr auto mock = "mock";
-        inline constexpr auto freeze = "freeze";
-        inline constexpr auto spam = "spam";
-        inline constexpr auto achieve = "achieve";
-        inline constexpr auto crash_death = "crash_death";
-        inline constexpr auto confetti = "confetti";
-        inline constexpr auto no_jump = "no_jump";
-        inline constexpr auto gravity = "gravity";
-        inline constexpr auto death = "death";
-        inline constexpr auto upside_down = "upside_down";
-        inline constexpr auto ads = "ads";
-        inline constexpr auto black_screen = "black_screen";
-        inline constexpr auto parry = "parry";
-        inline constexpr auto double_jump = "double_jump";
-        inline constexpr auto sleepy = "sleepy";
-        inline constexpr auto pauses = "pauses";
-        inline constexpr auto ice_level = "ice_level";
-        inline constexpr auto random_mirror = "random_mirror";
-        inline constexpr auto random_speed = "random_speed";
-        inline constexpr auto random_icon = "random_icon";
-        inline constexpr auto blinking_icon = "blinking_icon";
-        inline constexpr auto dementia = "dementia";
-        inline constexpr auto earthquake = "earthquake";
-        inline constexpr auto fake_crash = "fake_crash";
-        inline constexpr auto gambler = "gambler";
-        inline constexpr auto placebo = "placebo";
-        inline constexpr auto click_speed = "click_speed";
-        inline constexpr auto motivation = "motivation";
-        inline constexpr auto flipped = "flipped";
-        inline constexpr auto friends = "friends";
-        inline constexpr auto size_changer = "size_changer";
-        inline constexpr auto timewarp_jump = "timewarp_jump";
-    };
-
     // Default option categories
     namespace category {
         inline constexpr auto playerlife = "Player Life";
diff --git a/src/classes/Options.hpp b/src/classes/Options.hpp
index 2682e9e..234f61c 100644
--- a/src/classes/Options.hpp
+++ b/src/classes/Options.hpp
@@ -2,6 +2,8 @@
 
 #include <Utils.hpp>
 
+#include <Geode/Geode.hpp>
+
 namespace horrible {
     namespace util {
         // Horrible options utilities
@@ -39,7 +41,7 @@ namespace horrible {
              *
              * @returns Boolean of the old value
              */
-            bool set(std::string_view id, bool enable);
+            bool set(geode::ZStringView id, bool enable);
 
             /**
              * Returns the array of all registered option categories
@@ -53,7 +55,7 @@ namespace horrible {
              *
              * @param category The exact name of the category to check
              */
-            bool doesCategoryExist(std::string_view category) noexcept;
+            bool doesCategoryExist(geode::ZStringView category) noexcept;
         };
     };
 };
\ No newline at end of file
diff --git a/src/classes/src/Jumpscares.cpp b/src/classes/src/Jumpscares.cpp
index 68e540e..c81a669 100644
--- a/src/classes/src/Jumpscares.cpp
+++ b/src/classes/src/Jumpscares.cpp
@@ -17,7 +17,7 @@ void jumpscares::downloadGrief() {
 
             log::info("Downloading Grief in background");
 
-            glm->downloadLevel(129066933, false);
+            glm->downloadLevel(129066933, false, 0);
             mdm->downloadSong(482872);
         };
     } else {
@@ -35,7 +35,7 @@ void jumpscares::downloadCongregation() {
 
             log::info("Downloading Congregation in background");
 
-            glm->downloadLevel(129066879, false);
+            glm->downloadLevel(129066879, false, 0);
             mdm->downloadSong(895761);
         };
     } else {
diff --git a/src/classes/src/Options.cpp b/src/classes/src/Options.cpp
index bf2e5ea..165ecbb 100644
--- a/src/classes/src/Options.cpp
+++ b/src/classes/src/Options.cpp
@@ -19,7 +19,7 @@ int options::getChance(std::string_view id) {
     return static_cast<int>(horribleMod->getSettingValue<int64_t>(fmt::format("{}-chance", id)));
 };
 
-bool options::set(std::string_view id, bool enable) {
+bool options::set(ZStringView id, bool enable) {
     if (auto om = OptionManager::get()) return om->setOption(id, enable);
     return false;
 };
@@ -31,7 +31,7 @@ std::span<const std::string> options::getAllCategories() noexcept {
     return ret;
 };
 
-bool options::doesCategoryExist(std::string_view category) noexcept {
+bool options::doesCategoryExist(ZStringView category) noexcept {
     auto cats = getAllCategories();
-    return str::containsAny(category.data(), { cats.begin(), cats.end() });
+    return str::containsAny(category, { cats.begin(), cats.end() });
 };
\ No newline at end of file
diff --git a/src/classes/ui/MathQuiz.hpp b/src/classes/ui/MathQuiz.hpp
index 36f4bb7..7418cf2 100644
--- a/src/classes/ui/MathQuiz.hpp
+++ b/src/classes/ui/MathQuiz.hpp
@@ -6,7 +6,7 @@ using namespace geode::prelude;
 
 namespace horrible {
     namespace ui {
-        class MathQuiz : public CCBlockLayer, public FLAlertLayerProtocol {
+        class MathQuiz final : public CCBlockLayer, public FLAlertLayerProtocol {
         private:
             class Impl;
             std::unique_ptr<Impl> m_impl;
@@ -20,7 +20,7 @@ namespace horrible {
 
         protected:
             MathQuiz();
-            virtual ~MathQuiz();
+            ~MathQuiz();
 
             void closeAfterFeedback(CCNode* node);
             void onAnswerClicked(CCObject* sender);
@@ -35,20 +35,20 @@ namespace horrible {
         public:
             static MathQuiz* create();
 
-            void setCallback(std::function<void(bool)> cb);
+            void setCallback(geode::Function<void(bool)> cb);
             void setCorrect(bool v);
 
             void closePopup();
         };
 
-        class Richard : public CCNode {
+        class Richard final : public CCNode {
         private:
             class Impl;
             std::unique_ptr<Impl> m_impl;
 
         protected:
             Richard();
-            virtual ~Richard();
+            ~Richard();
 
             bool init() override;
 
diff --git a/src/classes/ui/RandomAd.hpp b/src/classes/ui/RandomAd.hpp
index 87a68f5..d4c8fee 100644
--- a/src/classes/ui/RandomAd.hpp
+++ b/src/classes/ui/RandomAd.hpp
@@ -6,11 +6,11 @@ using namespace geode::prelude;
 
 namespace horrible {
     namespace ui {    // Popup that displays a random level thumbnail
-        class RandomAd : public Popup<> {
+        class RandomAd final : public Popup {
         protected:
             void onPlayBtn(CCObject*);
 
-            bool setup() override;
+            bool init();
 
         public:
             static RandomAd* create();
diff --git a/src/classes/ui/SpamChallenge.hpp b/src/classes/ui/SpamChallenge.hpp
index 98975d0..c585860 100644
--- a/src/classes/ui/SpamChallenge.hpp
+++ b/src/classes/ui/SpamChallenge.hpp
@@ -13,7 +13,7 @@ namespace horrible {
 
         protected:
             SpamChallenge();
-            virtual ~SpamChallenge();
+            ~SpamChallenge();
 
             void closeAfterFeedback(float);
             void setSuccess(bool v);
@@ -28,7 +28,7 @@ namespace horrible {
 
             bool ccTouchBegan(CCTouch* touch, CCEvent* event) override;
 
-            void setCallback(std::function<void(bool)> cb);
+            void setCallback(geode::Function<void(bool)> cb);
         };
     };
 };
\ No newline at end of file
diff --git a/src/classes/ui/src/MathQuiz.cpp b/src/classes/ui/src/MathQuiz.cpp
index 83dd2b9..a41df1e 100644
--- a/src/classes/ui/src/MathQuiz.cpp
+++ b/src/classes/ui/src/MathQuiz.cpp
@@ -27,13 +27,10 @@ class MathQuiz::Impl final {
     float m_timeDt = 0.f;
 
     bool m_correct = false;
-    std::function<void(bool)> m_callback = nullptr;
-};
-
-MathQuiz::MathQuiz() {
-    m_impl = std::make_unique<Impl>();
+    Function<void(bool)> m_callback = nullptr;
 };
 
+MathQuiz::MathQuiz() : m_impl(std::make_unique<Impl>()) {};
 MathQuiz::~MathQuiz() {};
 
 bool MathQuiz::init() {
@@ -46,20 +43,19 @@ bool MathQuiz::init() {
 
     m_impl->m_operation = static_cast<MathOperation>(randng::get(3));
     switch (m_impl->m_operation) {
-    case MathOperation::Addition:
-        m_impl->m_correctAnswer = m_impl->m_numFirst + m_impl->m_numSecond;
-        break;
+        default: [[fallthrough]];
 
-    case MathOperation::Subtraction:
-        m_impl->m_correctAnswer = m_impl->m_numFirst - m_impl->m_numSecond;
-        break;
+        case MathOperation::Addition:
+            m_impl->m_correctAnswer = m_impl->m_numFirst + m_impl->m_numSecond;
+            break;
 
-    case MathOperation::Multiplication:
-        m_impl->m_correctAnswer = m_impl->m_numFirst * m_impl->m_numSecond;
-        break;
+        case MathOperation::Subtraction:
+            m_impl->m_correctAnswer = m_impl->m_numFirst - m_impl->m_numSecond;
+            break;
 
-    default:
-        break;
+        case MathOperation::Multiplication:
+            m_impl->m_correctAnswer = m_impl->m_numFirst * m_impl->m_numSecond;
+            break;
     };
 
     auto const winSize = CCDirector::get()->getWinSize();
@@ -108,20 +104,19 @@ bool MathQuiz::init() {
     } else {
         std::string operation;
         switch (m_impl->m_operation) {
-        case MathOperation::Addition:
-            operation = "+";
-            break;
+            default: [[fallthrough]];
 
-        case MathOperation::Subtraction:
-            operation = "-";
-            break;
+            case MathOperation::Addition:
+                operation = "+";
+                break;
 
-        case MathOperation::Multiplication:
-            operation = "x";
-            break;
+            case MathOperation::Subtraction:
+                operation = "-";
+                break;
 
-        default:
-            operation = "?";
+            case MathOperation::Multiplication:
+                operation = "x";
+                break;
         };
 
         problemText = fmt::format("{} {} {}", m_impl->m_numFirst, operation, m_impl->m_numSecond);
@@ -239,7 +234,7 @@ bool MathQuiz::init() {
     return true;
 };
 
-void MathQuiz::setCallback(std::function<void(bool)> cb) {
+void MathQuiz::setCallback(Function<void(bool)> cb) {
     m_impl->m_callback = std::move(cb);
 };
 
@@ -391,7 +386,7 @@ MathQuiz* MathQuiz::create() {
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
 
@@ -429,6 +424,6 @@ Richard* Richard::create() {
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
\ No newline at end of file
diff --git a/src/classes/ui/src/RandomAd.cpp b/src/classes/ui/src/RandomAd.cpp
index 298e3c5..cca55bb 100644
--- a/src/classes/ui/src/RandomAd.cpp
+++ b/src/classes/ui/src/RandomAd.cpp
@@ -7,7 +7,9 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
-bool RandomAd::setup() {
+bool RandomAd::init() {
+    if (!Popup::init(375.f, 250.f)) return false;
+
     setID("ad"_spr);
     setTitle("Sponsored");
 
@@ -80,11 +82,11 @@ void RandomAd::onPlayBtn(CCObject*) { // congregation jumpscare
 
 RandomAd* RandomAd::create() {
     auto ret = new RandomAd();
-    if (ret->initAnchored(375.f, 250.f)) {
+    if (ret->init()) {
         ret->autorelease();
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
\ No newline at end of file
diff --git a/src/classes/ui/src/SpamChallenge.cpp b/src/classes/ui/src/SpamChallenge.cpp
index 7065285..4d2c0ee 100644
--- a/src/classes/ui/src/SpamChallenge.cpp
+++ b/src/classes/ui/src/SpamChallenge.cpp
@@ -20,13 +20,10 @@ class SpamChallenge::Impl final {
     float m_timeDt = 0.f;
 
     bool m_success = false;
-    std::function<void(bool)> m_callback;
-};
-
-SpamChallenge::SpamChallenge() {
-    m_impl = std::make_unique<Impl>();
+    Function<void(bool)> m_callback;
 };
 
+SpamChallenge::SpamChallenge() : m_impl(std::make_unique<Impl>()) {};
 SpamChallenge::~SpamChallenge() {};
 
 bool SpamChallenge::init() {
@@ -90,7 +87,7 @@ bool SpamChallenge::init() {
     return true;
 };
 
-void SpamChallenge::setCallback(std::function<void(bool)> cb) {
+void SpamChallenge::setCallback(Function<void(bool)> cb) {
     m_impl->m_callback = std::move(cb);
 };
 
@@ -171,6 +168,6 @@ SpamChallenge* SpamChallenge::create() {
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
\ No newline at end of file
diff --git a/src/hooks/Achievement.cpp b/src/hooks/Achievement.cpp
index e50d495..6633a5c 100644
--- a/src/hooks/Achievement.cpp
+++ b/src/hooks/Achievement.cpp
@@ -1,4 +1,5 @@
 #include <Utils.hpp>
+#include <Horrible.hpp>
 
 #include <Geode/Geode.hpp>
 
@@ -7,10 +8,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "achieve",
+    "Random Achievements",
+    "Randomly play the achievement sound when clicking buttons.\n<cy>Credit: Cheeseworks</c>",
+    category::randoms,
+    SillyTier::Low
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(AchievementCCMenuItem, CCMenuItem) {
     struct Fields {
-        bool enabled = options::get(key::achieve);
-        int chance = options::getChance(key::achieve);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
     };
 
     void activate() {
@@ -18,14 +28,6 @@ class $modify(AchievementCCMenuItem, CCMenuItem) {
 
         auto f = m_fields.self();
 
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                f->enabled = ev->getToggled();
-                return ListenerResult::Propagate;
-            },
-            key::achieve
-        );
-
         if (f->enabled) {
             if (auto fmod = FMODAudioEngine::sharedEngine()) {
                 int rnd = randng::fast();
diff --git a/src/hooks/Dementia.cpp b/src/hooks/Dementia.cpp
index d42eff4..be45cf2 100644
--- a/src/hooks/Dementia.cpp
+++ b/src/hooks/Dementia.cpp
@@ -8,10 +8,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+static Option const o = {
+    "dementia",
+    "Dementia",
+    "Chance of the player randomly teleports back. This is more like player lagging to be honest!\n<cy>Credit: imdissapearinghelp</c>",
+    category::misc,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(DementiaPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::dementia);
-        int chance = options::getChance(key::dementia);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         int lastMusicTime = 0; // last music time in milliseconds
 
@@ -60,7 +69,7 @@ class $modify(DementiaPlayerObject, PlayerObject) {
 
 class $modify(DementiaEnhancedGameObject, EnhancedGameObject) {
     struct Fields {
-        bool enabled = options::get(key::dementia);
+        bool enabled = options::get(o.id);
     };
 
     bool hasBeenActivated() {
diff --git a/src/hooks/GJBaseGameLayer/FakeCrash.cpp b/src/hooks/GJBaseGameLayer/FakeCrash.cpp
index 17d70d7..07ccf75 100644
--- a/src/hooks/GJBaseGameLayer/FakeCrash.cpp
+++ b/src/hooks/GJBaseGameLayer/FakeCrash.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "fake_crash",
+    "Random Fake Crash",
+    "While playing a level, there's a chance your game will fake a crash.\n<cy>Credit: Timered</c>",
+    category::randoms,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(FakeCrashGJBaseGameLayer, GJBaseGameLayer) {
     struct Fields {
-        bool m_enabled = options::get(key::fake_crash);
-        int m_chance = options::getChance(key::fake_crash);
+        bool m_enabled = options::get(o.id);
+        int m_chance = options::getChance(o.id);
 
         float m_lastTimeWarp = LevelTools::getLastTimewarp();
         bool m_inFakeCrash = false;
diff --git a/src/hooks/GJBaseGameLayer/RandomNoJump.cpp b/src/hooks/GJBaseGameLayer/RandomNoJump.cpp
index 286b718..60d1d39 100644
--- a/src/hooks/GJBaseGameLayer/RandomNoJump.cpp
+++ b/src/hooks/GJBaseGameLayer/RandomNoJump.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "no_jump",
+    "Randomly Don't Jump",
+    "When making an input in a level, there's a chance the player does not respond to it.\n<cy>Credit: GilanyKing12</c>",
+    category::randoms,
+    SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(NoJumpGJBaseGameLayer, GJBaseGameLayer) {
     struct Fields {
-        bool enabled = options::get(key::no_jump);
-        int chance = options::get(key::no_jump);
+        bool enabled = options::get(o.id);
+        int chance = options::get(o.id);
     };
 
     void handleButton(bool down, int button, bool isPlayer1) {
diff --git a/src/hooks/GJBaseGameLayer/TimewarpJump.cpp b/src/hooks/GJBaseGameLayer/TimewarpJump.cpp
index 1d1d570..43c1e7f 100644
--- a/src/hooks/GJBaseGameLayer/TimewarpJump.cpp
+++ b/src/hooks/GJBaseGameLayer/TimewarpJump.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "timewarp_jump",
+    "Timewarp Jump",
+    "When you jump, there's a chance time will briefly slow down or speed up.\n<cy>Credit: KGplayerA</c>",
+    category::randoms,
+    SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(TimewarpJumpGJBaseGameLayer, GJBaseGameLayer) {
     struct Fields {
-        bool enabled = options::get(key::timewarp_jump);
+        bool enabled = options::get(o.id);
     };
 
     void handleButton(bool down, int button, bool isPlayer1) {
diff --git a/src/hooks/Mock.cpp b/src/hooks/Mock.cpp
index 4954a19..b5af9ec 100644
--- a/src/hooks/Mock.cpp
+++ b/src/hooks/Mock.cpp
@@ -11,10 +11,24 @@ using namespace horrible::prelude;
 
 namespace fs = std::filesystem; // Shortcut for std::filesystem
 
+inline static Option const o = {
+    "mock",
+    "Mock your 90%+ Fail",
+    "Taunts you in the main me with a screenshot of one of your 90%-99% fails.\n<cy>Credit: Wuffin</c>",
+    category::misc,
+    SillyTier::Medium,
+    false,
+    {
+        PlatformID::Windows,
+        PlatformID::Android,
+    },
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(MockMenuLayer, MenuLayer) {
     struct Fields {
-        bool enabled = options::get(key::mock);
-        int chance = options::getChance(key::mock);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
     };
 
     bool init() {
@@ -111,21 +125,13 @@ class $modify(MockMenuLayer, MenuLayer) {
 
 class $modify(MockPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::mock);
+        bool enabled = options::get(o.id);
     };
 
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
 
         auto f = m_fields.self();
-
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                f->enabled = ev->getToggled();
-                return ListenerResult::Propagate;
-            },
-            key::mock
-        );
     };
 
     void showNewBest(bool newReward, int orbs, int diamonds, bool demonKey, bool noRetry, bool noTitle) {
@@ -165,11 +171,11 @@ class $modify(MockPlayLayer, PlayLayer) {
                         auto mockConfigUnwr = mockConfig.unwrapOr(matjson::Value());
 
                         // overwrite this field (or add it) with the percent
-                        mockConfigUnwr[utils::numToString(id)] = percentage;
+                        mockConfigUnwr[utils::numToString(o.id)] = percentage;
 
                         toWrite = mockConfigUnwr;
                     } else {
-                        toWrite = matjson::makeObject({ {utils::numToString(id), percentage} });
+                        toWrite = matjson::makeObject({ {utils::numToString(o.id), percentage} });
                     };
 
                     if (!toWrite.isNull()) {
@@ -207,7 +213,7 @@ class $modify(MockPlayLayer, PlayLayer) {
             if (mockConfig.isOk()) {
                 log::debug("Clearing mock record for {}", id);
                 auto mockConfigUnwr = mockConfig.unwrapOr(matjson::Value());
-                mockConfigUnwr[utils::numToString(id)].clear();
+                mockConfigUnwr[utils::numToString(o.id)].clear();
 
                 auto const mockJson = file::writeToJson(mockConfigPath, mockConfigUnwr);
 
diff --git a/src/hooks/Parry.cpp b/src/hooks/Parry.cpp
index 22e2521..498a94e 100644
--- a/src/hooks/Parry.cpp
+++ b/src/hooks/Parry.cpp
@@ -11,6 +11,8 @@
 // using namespace geode::prelude;
 // using namespace horrible::prelude;
 
+// static constexpr auto id = "parry";
+
 // static GameObject* s_pendingKiller1 = nullptr;
 // static GameObject* s_pendingKiller2 = nullptr;
 
@@ -27,9 +29,19 @@
 
 // constexpr float kParryWindow = 0.5f;  // seconds
 
+    // {
+    //     "parry",
+    //     "Parry Obstacles",
+    //     "Whenever your hitbox is inside of a hazard hitbox, you will instead destroy it if you time your input right.\n<cy>Credit: Wuffin</c>",
+    //     category::misc,
+    //     SillyTier::Low,
+    //     true,
+    //     {},
+    // },
+
 // class $modify(ParryPlayerObject, PlayerObject) {
 //     struct Fields {
-//         bool enabled = options::get(key::parry);
+//         bool enabled = options::get(id);
 //     };
 
 //     bool pushButton(PlayerButton p0) {
@@ -49,7 +61,7 @@
 //                 s_pendingPlayer1 = nullptr;
 
 //                 // hide UI
-//                 if (auto bar = typeinfo_cast<ProgressBar*>(pl->getChildByID(key::parry_spr))) bar->setVisible(false);
+//                 if (auto bar = typeinfo_cast<ProgressBar*>(pl->getChildByID(id_spr))) bar->setVisible(false);
 //                 if (auto lbl = typeinfo_cast<CCLabelBMFont*>(pl->getChildByID("parry_label"_spr))) lbl->setVisible(false);
 
 //                 s_activeParryPlayer = nullptr;
@@ -67,7 +79,7 @@
 //                 s_pendingKiller2 = nullptr;
 //                 s_pendingPlayer2 = nullptr;
 
-//                 if (auto bar = typeinfo_cast<ProgressBar*>(pl->getChildByID(key::parry_spr))) bar->setVisible(false);
+//                 if (auto bar = typeinfo_cast<ProgressBar*>(pl->getChildByID(id_spr))) bar->setVisible(false);
 //                 if (auto lbl = typeinfo_cast<CCLabelBMFont*>(pl->getChildByID("parry_label"_spr))) lbl->setVisible(false);
 
 //                 s_activeParryPlayer = nullptr;
@@ -83,7 +95,7 @@
 
 // class $modify(ParryPlayLayer, PlayLayer) {
 //     struct Fields {
-//         bool enabled = options::get(key::parry);
+//         bool enabled = options::get(id);
 
 //         ProgressBar* m_parryBar = nullptr;
 //         CCLabelBMFont* m_parryLabel = nullptr;
@@ -96,7 +108,7 @@
 //         // Create shared UI and hide initially
 //         if (!m_fields->m_parryBar) {
 //             m_fields->m_parryBar = ProgressBar::create();
-//             m_fields->m_parryBar->setID(key::parry_spr);
+//             m_fields->m_parryBar->setID(id_spr);
 //             m_fields->m_parryBar->setFillColor(colors::yellow);
 //             m_fields->m_parryBar->setAnchorPoint({ 0.5f, 0.5f });
 //             m_fields->m_parryBar->setVisible(false);
diff --git a/src/hooks/Placebo.cpp b/src/hooks/Placebo.cpp
index 0257fbe..794822b 100644
--- a/src/hooks/Placebo.cpp
+++ b/src/hooks/Placebo.cpp
@@ -8,10 +8,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "placebo",
+    "Placebo",
+    "A random chance that when you start a level, all the options you have enabled are disabled, or all the options you have disabled are enabled.\n<cy>Credit: tmdXD</c>",
+    category::misc,
+    SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 void placeboEffect() {
     log::info("Checking for placebo effect...");
 
-    if (options::get(key::placebo)) {
+    if (options::get(o.id)) {
         int rnd = randng::fast();
         log::info("placebo effect roll: {}", rnd);
 
diff --git a/src/hooks/PlayLayer/Adverts.cpp b/src/hooks/PlayLayer/Adverts.cpp
index f5f673c..bd2690b 100644
--- a/src/hooks/PlayLayer/Adverts.cpp
+++ b/src/hooks/PlayLayer/Adverts.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "ads",
+        "Level Ads",
+        "While playing a level in normal mode, an ad for a random level will pop up on your screen from time to time.\n<cy>Credit: staticGD</c>",
+        category::obstructive,
+        SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(AdvertsPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::ads);
+        bool enabled = options::get(o.id);
 
         RandomAd* m_ad = nullptr;
     };
@@ -19,19 +28,6 @@ class $modify(AdvertsPlayLayer, PlayLayer) {
 
         auto f = m_fields.self();
 
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                unschedule(schedule_selector(AdvertsPlayLayer::showAd));
-
-                f->enabled = ev->getToggled();
-
-                if (f->enabled) nextAd();
-
-                return ListenerResult::Propagate;
-            },
-            key::ads
-        );
-
         if (f->enabled) nextAd();
     };
 
diff --git a/src/hooks/PlayLayer/BlackScreen.cpp b/src/hooks/PlayLayer/BlackScreen.cpp
index ebc0680..fcef2b3 100644
--- a/src/hooks/PlayLayer/BlackScreen.cpp
+++ b/src/hooks/PlayLayer/BlackScreen.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "black_screen",
+    "Black Screen Blink",
+    "The screen can suddenly blink while playing a level.\n<cy>Credit: elite_smiler_ispro</c>",
+    category::obstructive,
+    SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(BlackScreenPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::black_screen);
+        bool enabled = options::get(o.id);
     };
 
     void setupHasCompleted() {
diff --git a/src/hooks/PlayLayer/BlinkingIcon.cpp b/src/hooks/PlayLayer/BlinkingIcon.cpp
index 621c4b5..955a05f 100644
--- a/src/hooks/PlayLayer/BlinkingIcon.cpp
+++ b/src/hooks/PlayLayer/BlinkingIcon.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "blinking_icon",
+        "Blinking Icon",
+        "Your icon will start to randomly blink.\n<cy>Credit: DragonixGD</c>",
+        category::obstructive,
+        SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(BlinkingIconPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::blinking_icon);
+        bool enabled = options::get(o.id);
     };
 
     void setupHasCompleted() {
diff --git a/src/hooks/PlayLayer/Confetti.cpp b/src/hooks/PlayLayer/Confetti.cpp
index 225789d..89124eb 100644
--- a/src/hooks/PlayLayer/Confetti.cpp
+++ b/src/hooks/PlayLayer/Confetti.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "confetti",
+    "Confetti Explosion",
+    "While playing a level, the screen will sometimes cause an explosion of random textures.\n<cy>Credit: Cheeseworks</c>",
+    category::obstructive,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(ConfettiPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::confetti);
+        bool enabled = options::get(o.id);
 
         static constexpr auto confettis = std::to_array<const char*>({
             "diffIcon_02_btn_001.png",
@@ -35,20 +44,6 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
 
         auto f = m_fields.self();
 
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                unschedule(schedule_selector(ConfettiPlayLayer::confetti));
-                unschedule(schedule_selector(ConfettiPlayLayer::nextConfetti));
-
-                f->enabled = ev->getToggled();
-
-                if (f->enabled) scheduleOnce(schedule_selector(ConfettiPlayLayer::nextConfetti), randng::get(0.125f));
-
-                return ListenerResult::Propagate;
-            },
-            key::confetti
-        );
-
         if (f->enabled) scheduleOnce(schedule_selector(ConfettiPlayLayer::nextConfetti), randng::get(0.125f));
     };
 
diff --git a/src/hooks/PlayLayer/CrashGame.cpp b/src/hooks/PlayLayer/CrashGame.cpp
index d5f4d66..672246b 100644
--- a/src/hooks/PlayLayer/CrashGame.cpp
+++ b/src/hooks/PlayLayer/CrashGame.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "crash_death",
+        "Crash Chance on Death",
+        "When you die in a level, there's a chance your game will die too.\n<cg>Don't worry, your progress will save when crashing!</c> :)\n<cy>Credit: DragonixGD</c>",
+        category::chances,
+        SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(CrashGamePlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::crash_death);
-        int chance = options::getChance(key::crash_death);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
     };
 
     void destroyPlayer(PlayerObject * p0, GameObject * p1) {
diff --git a/src/hooks/PlayLayer/Earthquake.cpp b/src/hooks/PlayLayer/Earthquake.cpp
index cbdfe4e..ba0516c 100644
--- a/src/hooks/PlayLayer/Earthquake.cpp
+++ b/src/hooks/PlayLayer/Earthquake.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "earthquake",
+    "Earthquake",
+    "Constantly shakes the camera while playing a level.\n<cy>Credit: ArcticWoof</c>",
+    category::obstructive,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(EarthquakePlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::earthquake);
+        bool enabled = options::get(o.id);
     };
 
     void setupHasCompleted() {
diff --git a/src/hooks/PlayLayer/FakeDeath.cpp b/src/hooks/PlayLayer/FakeDeath.cpp
index c193e3e..97043d9 100644
--- a/src/hooks/PlayLayer/FakeDeath.cpp
+++ b/src/hooks/PlayLayer/FakeDeath.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "death",
+        "Fake Death",
+        "The player's death effect will show without dying.\n<cy>Credit: DragonixGD</c>",
+        category::obstructive,
+        SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(FakeDeathPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::death);
+        bool enabled = options::get(o.id);
 
         bool m_dontCreateObjects = false;
         GameObject* m_destroyingObject;
diff --git a/src/hooks/PlayLayer/Flipped.cpp b/src/hooks/PlayLayer/Flipped.cpp
index 88b48ae..53adf58 100644
--- a/src/hooks/PlayLayer/Flipped.cpp
+++ b/src/hooks/PlayLayer/Flipped.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "flipped",
+    "FLIPPED",
+    "Sometimes while playing, your entire screen will just do a flip!\n<cy>Credit: Cheeseworks</c>",
+    category::obstructive,
+    SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(FlippedPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::flipped);
-        int chance = options::getChance(key::flipped);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         bool flipping = false;
     };
diff --git a/src/hooks/PlayLayer/ForceLevels.cpp b/src/hooks/PlayLayer/ForceLevels.cpp
index abb6c2b..c213d0c 100644
--- a/src/hooks/PlayLayer/ForceLevels.cpp
+++ b/src/hooks/PlayLayer/ForceLevels.cpp
@@ -7,13 +7,31 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const oGrief = {
+        "grief",
+        "Get Back on Grief",
+        "A chance at death of forcing you to play Grief.\n<cy>Credit: Sweep</c>",
+        category::jumpscares,
+        SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(oGrief);
+
+inline static Option const oCongregation = {
+        "congregation",
+        "Congregation Jumpscare",
+        "A chance at death of forcing you to play Congregation.\n<cy>Credit: StaticGD</c>",
+        category::jumpscares,
+        SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(oCongregation);
+
 class $modify(ForceLevelsPlayLayer, PlayLayer) {
     struct Fields {
-        bool griefEnabled = options::get("grief");
-        bool congregEnabled = options::get("congregation");
+        bool griefEnabled = options::get(oGrief.id);
+        bool congregEnabled = options::get(oCongregation.id);
 
-        int griefChance = options::getChance("grief");
-        int congregChance = options::getChance("congregation");
+        int griefChance = options::getChance(oGrief.id);
+        int congregChance = options::getChance(oCongregation.id);
 
         bool m_dontCreateObjects = false;
         GameObject* m_destroyingObject;
diff --git a/src/hooks/PlayLayer/Freeze.cpp b/src/hooks/PlayLayer/Freeze.cpp
index d3820cc..5111d16 100644
--- a/src/hooks/PlayLayer/Freeze.cpp
+++ b/src/hooks/PlayLayer/Freeze.cpp
@@ -7,9 +7,73 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "freeze",
+    "Random 90%+ FPS Drop",
+    "Your visual framerate starts randomly dropping during 90-99% in a level.\n<cy>Credit: Hexfire</c>",
+    category::randoms,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(FreezePlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::freeze);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
+    };
+
+    void setupHasCompleted() {
+        PlayLayer::setupHasCompleted();
+
+        auto f = m_fields.self();
+
+        if (f->enabled) {
+            if (auto gm = GameManager::sharedState()) {
+                int rnd = randng::fast();
+                if (rnd % 100 < f->chance) capFPS(1.f);
+            };
+        } else {
+            log::warn("Random freezing at 90% is disabled");
+        };
+    };
+
+    void pauseGame(bool p0) {
+        revertFPS();
+        PlayLayer::pauseGame(p0);
+    };
+
+    void revertFPS() {
+        // default to user old fps
+        auto gm = GameManager::get();
+
+        float oldFPS = horribleMod->getSavedValue<float>("fps");
+
+        gm->setGameVariable("0116", true);
+
+        // Use seconds per frame, not raw FPS
+        float interval = (oldFPS > 10.f) ? (1.f / oldFPS) : (1.f / 60.f); // minimum 10 FPS
+        if (interval <= 0.f || interval > 1.f) interval = 1.f / 60.f; // fallback to 60 FPS if invalid
+
+        CCDirector::sharedDirector()->setAnimationInterval(interval);
+        log::debug("reset fps to {} (interval {})", oldFPS, interval);
+    };
+
+    void capFPS(float value) {
+        auto gm = GameManager::get();
+
+        gm->setGameVariable("0116", true);
+        gm->setGameVariable("0116", true);
+
+        float interval = 1.f / value; // cap fps to 60
+        if (interval <= 0.f || interval > 1.f) interval = 1.f / 60.f; // fallback to 60 FPS if invalid
+
+        CCDirector::sharedDirector()->setAnimationInterval(interval);
+        log::debug("cap fps to {} (interval {})", value, interval);
+    };
+
+    void onQuit() {
+        revertFPS();
+        PlayLayer::onQuit();
     };
 
     void updateProgressbar() {
diff --git a/src/hooks/PlayLayer/FreezeFPS.cpp b/src/hooks/PlayLayer/FreezeFPS.cpp
deleted file mode 100644
index b55c7a5..0000000
--- a/src/hooks/PlayLayer/FreezeFPS.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <Utils.hpp>
-
-#include <Geode/Geode.hpp>
-
-#include <Geode/modify/PlayLayer.hpp>
-
-using namespace geode::prelude;
-using namespace horrible::prelude;
-
-class $modify(FreezePlayLayer, PlayLayer) {
-    struct Fields {
-        bool enabled = options::get(key::freeze);
-        int chance = options::getChance(key::freeze);
-    };
-
-    void setupHasCompleted() {
-        PlayLayer::setupHasCompleted();
-
-        auto f = m_fields.self();
-
-        if (f->enabled) {
-            if (auto gm = GameManager::sharedState()) {
-                int rnd = randng::fast();
-                if (rnd % 100 < f->chance) capFPS(1.f);
-            };
-        } else {
-            log::warn("Random freezing at 90% is disabled");
-        };
-    };
-
-    void pauseGame(bool p0) {
-        revertFPS();
-        PlayLayer::pauseGame(p0);
-    };
-
-    void revertFPS() {
-        // default to user old fps
-        auto gm = GameManager::get();
-
-        float oldFPS = horribleMod->getSavedValue<float>("fps");
-
-        gm->setGameVariable("0116", true);
-
-        // Use seconds per frame, not raw FPS
-        float interval = (oldFPS > 10.f) ? (1.f / oldFPS) : (1.f / 60.f); // minimum 10 FPS
-        if (interval <= 0.f || interval > 1.f) interval = 1.f / 60.f; // fallback to 60 FPS if invalid
-
-        CCDirector::sharedDirector()->setAnimationInterval(interval);
-        log::debug("reset fps to {} (interval {})", oldFPS, interval);
-    };
-
-    void capFPS(float value) {
-        auto gm = GameManager::get();
-
-        gm->setGameVariable("0116", true);
-        gm->setGameVariable("0116", true);
-
-        float interval = 1.f / value; // cap fps to 60
-        if (interval <= 0.f || interval > 1.f) interval = 1.f / 60.f; // fallback to 60 FPS if invalid
-
-        CCDirector::sharedDirector()->setAnimationInterval(interval);
-        log::debug("cap fps to {} (interval {})", value, interval);
-    };
-
-    void onQuit() {
-        revertFPS();
-        PlayLayer::onQuit();
-    };
-};
\ No newline at end of file
diff --git a/src/hooks/PlayLayer/Friends.cpp b/src/hooks/PlayLayer/Friends.cpp
index 8aca4c0..1f8cb8b 100644
--- a/src/hooks/PlayLayer/Friends.cpp
+++ b/src/hooks/PlayLayer/Friends.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "friends",
+        "Friends",
+        "Random friends fly across your screen while you play a level!\n<cy>Credit: Cheeseworks</c>",
+        category::obstructive,
+        SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(FriendsPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::friends);
+        bool enabled = options::get(o.id);
 
         static constexpr auto friends = std::to_array<const char*>({
             "diffIcon_00_btn_001.png",
diff --git a/src/hooks/PlayLayer/Gambler.cpp b/src/hooks/PlayLayer/Gambler.cpp
index 50095a8..b372d36 100644
--- a/src/hooks/PlayLayer/Gambler.cpp
+++ b/src/hooks/PlayLayer/Gambler.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "gambler",
+    "Gambler",
+    "While playing a level and reach at the 95%, there's a 50/50 chance you either complete a level or blast into the space backwards.\n<cy>Credit: Timered</c>",
+    category::misc,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(GamblerPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::gambler);
+        bool enabled = options::get(o.id);
 
         bool triggered = false;
         bool tricked = false;
diff --git a/src/hooks/PlayLayer/Health.cpp b/src/hooks/PlayLayer/Health.cpp
index 5c5a4e1..4d7ad95 100644
--- a/src/hooks/PlayLayer/Health.cpp
+++ b/src/hooks/PlayLayer/Health.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "health",
+    "Player Health",
+    "Add a health bar and decreases everytime you collide with a hazard. If your health reaches zero, the player dies.\n<cy>Credit: Cheeseworks</c>",
+    category::playerlife,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(HealthPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get("health");
+        bool enabled = options::get(o.id);
 
         float m_health = 100.f;
 
@@ -27,7 +36,7 @@ class $modify(HealthPlayLayer, PlayLayer) {
 
             if (!f->m_healthBar) {
                 f->m_healthBar = ProgressBar::create();
-                f->m_healthBar->setID("health"_spr);
+                f->m_healthBar->setID("health-bar"_spr);
                 f->m_healthBar->setFillColor(colors::red);
                 f->m_healthBar->setAnchorPoint({ 0.5f, 0.5f });
                 f->m_healthBar->setPosition({ 10.f, getScaledContentHeight() / 2.f });
diff --git a/src/hooks/PlayLayer/Math.cpp b/src/hooks/PlayLayer/Math.cpp
index c6b380a..4b99bad 100644
--- a/src/hooks/PlayLayer/Math.cpp
+++ b/src/hooks/PlayLayer/Math.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "math_quiz",
+    "Richard's Math Quiz!",
+    "When playing a level in Practice mode, there's a chance Richard will pop out and give you a quick math quiz. Answer correctly to continue, or restart the level from the beginning.\n<cy>Credit: CyanBoi</c>",
+    category::obstructive,
+    SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(MathPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::math_quiz);
-        int chance = options::getChance(key::math_quiz);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         MathQuiz* m_currentQuiz = nullptr;
     };
@@ -20,19 +29,6 @@ class $modify(MathPlayLayer, PlayLayer) {
 
         auto f = m_fields.self();
 
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                unschedule(schedule_selector(MathPlayLayer::doQuiz));
-
-                f->enabled = ev->getToggled();
-
-                if (f->enabled) scheduleOnce(schedule_selector(MathPlayLayer::doQuiz), randng::get(30.f, 5.f) * chanceToDelayPct(m_fields->chance));
-
-                return ListenerResult::Propagate;
-            },
-            key::math_quiz
-        );
-
         if (f->enabled) nextQuiz();
     };
 
diff --git a/src/hooks/PlayLayer/Motivation.cpp b/src/hooks/PlayLayer/Motivation.cpp
index 895cd3b..428e677 100644
--- a/src/hooks/PlayLayer/Motivation.cpp
+++ b/src/hooks/PlayLayer/Motivation.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "motivation",
+    "Motivational Quotes",
+    "You'll get motivational messages while playing! The motivator isn't in the best mood, though...\n<cy>Credit: Cheeseworks</c>",
+    category::obstructive,
+    SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(MotivationPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::motivation);
+        bool enabled = options::get(o.id);
 
         static constexpr auto msgs = std::to_array<const char*>({
             "Surprised you haven't quit already.",
@@ -111,19 +120,6 @@ class $modify(MotivationPlayLayer, PlayLayer) {
 
         auto f = m_fields.self();
 
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                unschedule(schedule_selector(MotivationPlayLayer::showMessage));
-
-                f->enabled = ev->getToggled();
-
-                if (f->enabled) scheduleOnce(schedule_selector(MotivationPlayLayer::showMessage), randng::get(10.f, 3.f));
-
-                return ListenerResult::Propagate;
-            },
-            key::motivation
-        );
-
         if (f->enabled) {
             log::debug("Preparing {} motivational messages", Fields::msgs.size());
 
diff --git a/src/hooks/PlayLayer/Oxygen.cpp b/src/hooks/PlayLayer/Oxygen.cpp
index c6b635e..2854e9a 100644
--- a/src/hooks/PlayLayer/Oxygen.cpp
+++ b/src/hooks/PlayLayer/Oxygen.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "oxygen",
+        "Oxygen Level",
+        "Limited oxygen level. You gain oxygen as a flying gamemode. If your oxygen runs out, the player dies.\n<cy>Credit: ArcticWoof</c>",
+        category::playerlife,
+        SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(OxygenPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get("oxygen");
+        bool enabled = options::get(o.id);
 
         bool withHealth = options::get("health");
 
@@ -33,7 +42,7 @@ class $modify(OxygenPlayLayer, PlayLayer) {
 
             if (!f->m_oxygenBar) {
                 f->m_oxygenBar = ProgressBar::create();
-                f->m_oxygenBar->setID("oxygen"_spr);
+                f->m_oxygenBar->setID("oxygen-bar"_spr);
                 f->m_oxygenBar->setFillColor(colors::cyan);
                 f->m_oxygenBar->setAnchorPoint({ 0.5f, 0.5f });
                 f->m_oxygenBar->setPosition({ 10.f, getScaledContentHeight() / 2.f });
diff --git a/src/hooks/PlayLayer/Pause.cpp b/src/hooks/PlayLayer/Pause.cpp
index c9b4cf6..0b45410 100644
--- a/src/hooks/PlayLayer/Pause.cpp
+++ b/src/hooks/PlayLayer/Pause.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "pauses",
+        "Random Pauses",
+        "While playing a level, it will randomly pause itself.\n<cy>Credit: DragonixGD</c>",
+        category::randoms,
+        SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(PausePlayerObject, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::pauses);
-        int chance = options::getChance(key::pauses);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
     };
 
     void setupHasCompleted() {
diff --git a/src/hooks/PlayLayer/RandomMirror.cpp b/src/hooks/PlayLayer/RandomMirror.cpp
index 7bb5aa6..12c7239 100644
--- a/src/hooks/PlayLayer/RandomMirror.cpp
+++ b/src/hooks/PlayLayer/RandomMirror.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "random_mirror",
+    "Random Mirror Portal",
+    "Randomly activates a mirror portal while playing.\n<cy>Credit: TimeRed</c>",
+    category::randoms,
+    SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(RandomMirrorPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::random_mirror);
-        int chance = options::getChance(key::random_mirror);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         bool isFlipped = false;
     };
@@ -24,7 +33,7 @@ class $modify(RandomMirrorPlayLayer, PlayLayer) {
         auto f = m_fields.self();
 
         f->isFlipped = p0;
-        log::debug("{}", f->isFlipped ? key::flipped : "unflipped");
+        log::debug("{}", f->isFlipped ? o.id : "unflipped");
 
         PlayLayer::toggleFlipped(p0, p1);
     };
diff --git a/src/hooks/PlayLayer/Spam.cpp b/src/hooks/PlayLayer/Spam.cpp
index 0696be4..ccdc437 100644
--- a/src/hooks/PlayLayer/Spam.cpp
+++ b/src/hooks/PlayLayer/Spam.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "spam",
+        "Spam Challenge!",
+        "Sometimes forces a challenge on you to mercilessly spam an input sometimes while playing a level in Normal mode.\n<cy>Credit: Cheeseworks</c>",
+        category::obstructive,
+        SillyTier::High,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(SpamPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::spam);
-        int chance = options::getChance(key::spam);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         SpamChallenge* m_currentSpam = nullptr;
     };
@@ -20,19 +29,6 @@ class $modify(SpamPlayLayer, PlayLayer) {
 
         auto f = m_fields.self();
 
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                unschedule(schedule_selector(SpamPlayLayer::doSpam));
-
-                f->enabled = ev->getToggled();
-
-                if (f->enabled) scheduleOnce(schedule_selector(SpamPlayLayer::doSpam), randng::get(30.f, 5.f) * chanceToDelayPct(m_fields->chance));
-
-                return ListenerResult::Propagate;
-            },
-            key::spam
-        );
-
         if (f->enabled) nextSpam();
     };
 
diff --git a/src/hooks/PlayLayer/UpsideDown.cpp b/src/hooks/PlayLayer/UpsideDown.cpp
index d776385..bd13002 100644
--- a/src/hooks/PlayLayer/UpsideDown.cpp
+++ b/src/hooks/PlayLayer/UpsideDown.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "upside_down",
+    "Upside-Down Chance",
+    "While navigating the game, there's a chance a layer will be upside-down, and probably break everything...\n<cy>Credit: Cheeseworks</c>",
+    category::chances,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(ForceLevelsPlayLayer, PlayLayer) {
     struct Fields {
-        bool enabled = options::get(key::upside_down);
-        int chance = options::getChance(key::upside_down); // chance as percent
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id); // chance as percent
     };
 
     void setupHasCompleted() {
diff --git a/src/hooks/PlayerObject/ClickSpeed.cpp b/src/hooks/PlayerObject/ClickSpeed.cpp
index b125bf1..2c86593 100644
--- a/src/hooks/PlayerObject/ClickSpeed.cpp
+++ b/src/hooks/PlayerObject/ClickSpeed.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "click_speed",
+        "Click Player Speed",
+        "Randomly increases or decreases the player speed everytime you jump.\n<cy>Credit: KGplayerA</c>",
+        category::randoms,
+        SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(ClickSpeedPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::click_speed);
+        bool enabled = options::get(o.id);
     };
 
     bool pushButton(PlayerButton p0) {
diff --git a/src/hooks/PlayerObject/DoubleJump.cpp b/src/hooks/PlayerObject/DoubleJump.cpp
index 2c7708f..c2699b3 100644
--- a/src/hooks/PlayerObject/DoubleJump.cpp
+++ b/src/hooks/PlayerObject/DoubleJump.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "double_jump",
+    "Double-Jump",
+    "Allows your character to double-jump in a level.\n<cy>Credit: Cheeseworks</c>",
+    category::misc,
+    SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(DoubleJumpPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::double_jump);
+        bool enabled = options::get(o.id);
 
         int m_jumps = 0;
     };
@@ -19,14 +28,6 @@ class $modify(DoubleJumpPlayerObject, PlayerObject) {
 
         auto f = m_fields.self();
 
-        this->template addEventListener<OptionEventFilter>(
-            [this, f](OptionEvent* ev) {
-                f->enabled = ev->getToggled();
-                return ListenerResult::Propagate;
-            },
-            key::double_jump
-        );
-
         return true;
     };
 
diff --git a/src/hooks/PlayerObject/Gravity.cpp b/src/hooks/PlayerObject/Gravity.cpp
index a3f4ad6..da5f753 100644
--- a/src/hooks/PlayerObject/Gravity.cpp
+++ b/src/hooks/PlayerObject/Gravity.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "gravity",
+    "Randomize Gravity",
+    "Every time you jump in a level, gravity force will increase or decrease randomly.\n<cy>Credit: NJAgain</c>",
+    category::randoms,
+    SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(GravityPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::gravity);
+        bool enabled = options::get(o.id);
 
         bool m_isOnSlope = false;
         bool m_wasOnSlope = false;
diff --git a/src/hooks/PlayerObject/OnIce.cpp b/src/hooks/PlayerObject/OnIce.cpp
index 867685e..88f9c37 100644
--- a/src/hooks/PlayerObject/OnIce.cpp
+++ b/src/hooks/PlayerObject/OnIce.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "ice_level",
+    "Ice Level",
+    "Makes every surface icy. Slip n' slide!\n<cy>Credit: TimeRed</c>",
+    category::misc,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(OnIcePlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::ice_level);
+        bool enabled = options::get(o.id);
     };
 
     void update(float p0) {
diff --git a/src/hooks/PlayerObject/RandomIcon.cpp b/src/hooks/PlayerObject/RandomIcon.cpp
index 5af15c9..65c3ecb 100644
--- a/src/hooks/PlayerObject/RandomIcon.cpp
+++ b/src/hooks/PlayerObject/RandomIcon.cpp
@@ -7,9 +7,18 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "random_icon",
+        "Random Icon Change",
+        "Randomly change your icon every time you jump.\n<cy>Credit: JompyDoJump</c>",
+        category::randoms,
+        SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(RandomIconPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::random_icon);
+        bool enabled = options::get(o.id);
     };
 
     bool pushButton(PlayerButton p0) {
diff --git a/src/hooks/PlayerObject/RandomSpeed.cpp b/src/hooks/PlayerObject/RandomSpeed.cpp
index 70e4447..a579405 100644
--- a/src/hooks/PlayerObject/RandomSpeed.cpp
+++ b/src/hooks/PlayerObject/RandomSpeed.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "random_speed",
+        "Random Speed Change",
+        "Randomly changes your speed while playing a level.\n<cy>Credit: imdissapearinghelp</c>",
+        category::randoms,
+        SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(RandomSpeedPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::random_speed);
-        int chance = options::getChance(key::random_speed);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
     };
 
     bool pushButton(PlayerButton button) {
diff --git a/src/hooks/PlayerObject/SizeChanger.cpp b/src/hooks/PlayerObject/SizeChanger.cpp
index 717bb35..39a524f 100644
--- a/src/hooks/PlayerObject/SizeChanger.cpp
+++ b/src/hooks/PlayerObject/SizeChanger.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+    "size_changer",
+    "Size Changer",
+    "Randomly change the player size every time you jump.\n<cy>Credit: himynameisryan21</c>",
+    category::randoms,
+    SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(SizeChangerPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::size_changer);
-        int chance = options::getChance(key::size_changer);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         bool scaled = false;
     };
diff --git a/src/hooks/PlayerObject/Sleepy.cpp b/src/hooks/PlayerObject/Sleepy.cpp
index 541d8f1..43e2cfa 100644
--- a/src/hooks/PlayerObject/Sleepy.cpp
+++ b/src/hooks/PlayerObject/Sleepy.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "sleepy",
+        "Sleepy Player",
+        "Your character will occasionally fall asleep while playing.\n<cy>Credit: this_guy_yt</c>",
+        category::misc,
+        SillyTier::Low,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(SleepyPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get(key::sleepy);
-        int chance = options::getChance(key::sleepy);
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         bool m_sleepy = false; // decelerating-to-zero stage
         bool m_waking = false; // 5s buffer stage (cannot be re-slept)
diff --git a/src/hooks/PlayerObject/Sticky.cpp b/src/hooks/PlayerObject/Sticky.cpp
index a0d1348..4e01eb0 100644
--- a/src/hooks/PlayerObject/Sticky.cpp
+++ b/src/hooks/PlayerObject/Sticky.cpp
@@ -7,10 +7,19 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
+inline static Option const o = {
+        "sticky",
+        "Sticky Grounds",
+        "When your character lands on an object, it may stay stuck on its surface until you jump again.\n<cy>Credit: Cheeseworks</c>",
+        category::misc,
+        SillyTier::Medium,
+};
+REGISTER_HORRIBLE_OPTION(o);
+
 class $modify(StickyPlayerObject, PlayerObject) {
     struct Fields {
-        bool enabled = options::get("sticky");
-        int chance = options::getChance("sticky");
+        bool enabled = options::get(o.id);
+        int chance = options::getChance(o.id);
 
         float m_defSpeed = 0.f;
 
diff --git a/src/include/Horrible.cpp b/src/include/Horrible.cpp
index 6e5f050..10cabab 100644
--- a/src/include/Horrible.cpp
+++ b/src/include/Horrible.cpp
@@ -7,48 +7,9 @@
 using namespace geode::prelude;
 using namespace horrible;
 
-OptionEvent::OptionEvent(std::string id, bool toggled) : m_id(std::move(id)), m_toggled(toggled) {};
-
-std::string_view OptionEvent::getId() const noexcept {
-    return m_id;
-};
-
-bool OptionEvent::getToggled() const noexcept {
-    return m_toggled;
-};
-
-OptionEventFilter::OptionEventFilter(std::string id) : m_ids({ std::move(id) }) {};
-OptionEventFilter::OptionEventFilter(std::vector<std::string> ids) : m_ids(std::move(ids)) {};
-
-OptionEventFilter::OptionEventFilter(CCNode*, std::string id) : m_ids({ std::move(id) }) {};
-OptionEventFilter::OptionEventFilter(CCNode*, std::vector<std::string> ids) : m_ids(std::move(ids)) {};
-
-ListenerResult OptionEventFilter::handle(std::function<Callback> fn, OptionEvent* event) {
-    if (m_ids.empty()) {
-        return fn(event);
-    } else {
-        for (auto const& id : m_ids) if (event->getId() == id) return fn(event);
-    };
-
-    return ListenerResult::Propagate;
-};
-
-class OptionManager::Impl final {
-public:
-    std::vector<Option> options; // Array of registered options
-    std::vector<std::string> categories; // Array of auto-registered categories
-};
-
-OptionManager::OptionManager() {
-    m_impl = std::make_unique<Impl>();
-    retain();
-};
-
-OptionManager::~OptionManager() {};
-
-void OptionManager::registerCategory(std::string_view category) {
+void OptionManager::registerCategory(std::string category) {
     auto cats = getCategories();
-    if (!utils::string::containsAny(category.data(), { cats.begin(), cats.end() })) m_impl->categories.push_back(category.data());
+    if (!utils::string::containsAny(category, { cats.begin(), cats.end() })) m_categories.push_back(std::move(category));
 };
 
 bool OptionManager::doesOptionExist(std::string_view id) const noexcept {
@@ -56,47 +17,51 @@ bool OptionManager::doesOptionExist(std::string_view id) const noexcept {
     return false;
 };
 
-void OptionManager::registerOption(Option const& option) {
+void OptionManager::registerOption(Option option) {
     if (doesOptionExist(option.id)) {
         log::error("Could not register option '{}' ({}) because it already exists!", option.name, option.id);
     } else {
-        m_impl->options.push_back(option);
         registerCategory(option.category.c_str());
+        m_options.push_back(std::move(option));
 
         log::debug("Registered option {} of category {}", option.id, option.category);
     };
 };
 
 std::span<const Option> OptionManager::getOptions() const noexcept {
-    return m_impl->options;
+    return m_options;
 };
 
 std::span<const std::string> OptionManager::getCategories() const noexcept {
-    return m_impl->categories;
+    return m_categories;
 };
 
 bool OptionManager::getOption(std::string_view id) const noexcept {
-    return Mod::get()->getSavedValue<bool>(id.data(), false);
+    return Mod::get()->getSavedValue<bool>(id, false);
 };
 
-bool OptionManager::setOption(std::string_view id, bool enable) const noexcept {
-    auto event = new OptionEvent(id.data(), enable);
-    event->postFromMod(Mod::get());
+bool OptionManager::setOption(ZStringView id, bool enable) const {
+    auto event = OptionEvent();
+    event.send(id, enable);
 
-    auto eventV2 = new OptionEventV2(id.data(), enable);
-    eventV2->postFromMod(Mod::get());
+    auto eventV2 = OptionEventV2();
+    eventV2.send(id, enable);
 
-    return Mod::get()->setSavedValue(id.data(), enable);
+    return Mod::get()->setSavedValue(id, enable);
 };
 
 OptionManager* OptionManager::get() noexcept {
-    static auto inst = new OptionManager();
+    static auto inst = new (std::nothrow) OptionManager();
     return inst;
 };
 
 Result<> OptionManagerV2::registerOption(Option const& option) {
-    if (auto om = OptionManager::get()) om->registerOption(option);
-    return Ok();
+    if (auto om = OptionManager::get()) {
+        om->registerOption(option);
+        return Ok();
+    };
+
+    return Err("Failed to get OptionManager");
 };
 
 Result<bool> OptionManagerV2::getOption(std::string_view id) {
@@ -104,7 +69,7 @@ Result<bool> OptionManagerV2::getOption(std::string_view id) {
     return Err("Failed to get OptionManager");
 };
 
-Result<bool> OptionManagerV2::setOption(std::string_view id, bool enable) {
+Result<bool> OptionManagerV2::setOption(ZStringView id, bool enable) {
     if (auto om = OptionManager::get()) return Ok(om->setOption(id, enable));
     return Err("Failed to get OptionManager");
 };
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 3e158dd..098e0a7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -9,316 +9,43 @@
 #include <Geode/modify/GJGameLevel.hpp>
 #include <Geode/modify/LevelEditorLayer.hpp>
 
-using namespace horrible;
-
-// Default horrible options
-static std::vector<Option> defOpts = {
-    {
-        key::oxygen,
-        "Oxygen Level",
-        "Limited oxygen level. You gain oxygen as a flying gamemode. If your oxygen runs out, the player dies.\n<cy>Credit: ArcticWoof</c>",
-        category::playerlife,
-        SillyTier::High,
-    },
-    {
-        key::health,
-        "Player Health",
-        "Add a health bar and decreases everytime you collide with a hazard. If your health reaches zero, the player dies.\n<cy>Credit: Cheeseworks</c>",
-        category::playerlife,
-        SillyTier::Medium,
-    },
-    {
-        key::grief,
-        "Get Back on Grief",
-        "A chance at death of forcing you to play Grief.\n<cy>Credit: Sweep</c>",
-        category::jumpscares,
-        SillyTier::High,
-    },
-    {
-        key::congregation,
-        "Congregation Jumpscare",
-        "A chance at death of forcing you to play Congregation.\n<cy>Credit: StaticGD</c>",
-        category::jumpscares,
-        SillyTier::High,
-    },
-    {
-        key::math_quiz,
-        "Richard's Math Quiz!",
-        "When playing a level in Practice mode, there's a chance Richard will pop out and give you a quick math quiz. Answer correctly to continue, or restart the level from the beginning.\n<cy>Credit: CyanBoi</c>",
-        category::obstructive,
-        SillyTier::High,
-    },
-    {
-        key::mock,
-        "Mock your 90%+ Fail",
-        "Taunts you in the main me with a screenshot of one of your 90%-99% fails.\n<cy>Credit: Wuffin</c>",
-        category::misc,
-        SillyTier::Medium,
-        false,
-        {
-            PlatformID::Windows,
-            PlatformID::Android,
-        },
-    },
-    {
-        key::freeze,
-        "Random 90%+ FPS Drop",
-        "Your visual framerate starts randomly dropping during 90-99% in a level.\n<cy>Credit: Hexfire</c>",
-        category::randoms,
-        SillyTier::Medium,
-    },
-    {
-        key::spam,
-        "Spam Challenge!",
-        "Sometimes forces a challenge on you to mercilessly spam an input sometimes while playing a level in Normal mode.\n<cy>Credit: Cheeseworks</c>",
-        category::obstructive,
-        SillyTier::High,
-    },
-    {
-        key::achieve,
-        "Random Achievements",
-        "Randomly play the achievement sound when clicking buttons.\n<cy>Credit: Cheeseworks</c>",
-        category::randoms,
-        SillyTier::Low,
-    },
-    {
-        key::crash_death,
-        "Crash Chance on Death",
-        "When you die in a level, there's a chance your game will die too.\n<cg>Don't worry, your progress will save when crashing!</c> :)\n<cy>Credit: DragonixGD</c>",
-        category::chances,
-        SillyTier::High,
-    },
-    {
-        key::confetti,
-        "Confetti Explosion",
-        "While playing a level, the screen will sometimes cause an explosion of random textures.\n<cy>Credit: Cheeseworks</c>",
-        category::obstructive,
-        SillyTier::Medium,
-    },
-    {
-        key::no_jump,
-        "Randomly Don't Jump",
-        "When making an input in a level, there's a chance the player does not respond to it.\n<cy>Credit: GilanyKing12</c>",
-        category::randoms,
-        SillyTier::Low,
-    },
-    {
-        key::gravity,
-        "Randomize Gravity",
-        "Every time you jump in a level, gravity force will increase or decrease randomly.\n<cy>Credit: NJAgain</c>",
-        category::randoms,
-        SillyTier::Low,
-    },
-    {
-        key::death,
-        "Fake Death",
-        "The player's death effect will show without dying.\n<cy>Credit: DragonixGD</c>",
-        category::obstructive,
-        SillyTier::Medium,
-    },
-    {
-        key::upside_down,
-        "Upside-Down Chance",
-        "While navigating the game, there's a chance a layer will be upside-down, and probably break everything...\n<cy>Credit: Cheeseworks</c>",
-        category::chances,
-        SillyTier::Medium,
-    },
-    {
-        key::ads,
-        "Level Ads",
-        "While playing a level in normal mode, an ad for a random level will pop up on your screen from time to time.\n<cy>Credit: staticGD</c>",
-        category::obstructive,
-        SillyTier::Medium,
-    },
-    {
-        key::black_screen,
-        "Black Screen Blink",
-        "The screen can suddenly blink while playing a level.\n<cy>Credit: elite_smiler_ispro</c>",
-        category::obstructive,
-        SillyTier::Low,
-    },
-    {
-        key::parry,
-        "Parry Obstacles",
-        "Whenever your hitbox is inside of a hazard hitbox, you will instead destroy it if you time your input right.\n<cy>Credit: Wuffin</c>",
-        category::misc,
-        SillyTier::Low,
-        true,
-        {},
-    },
-    {
-        key::double_jump,
-        "Double-Jump",
-        "Allows your character to double-jump in a level.\n<cy>Credit: Cheeseworks</c>",
-        category::misc,
-        SillyTier::Low,
-    },
-    {
-        key::sleepy,
-        "Sleepy Player",
-        "Your character will occasionally fall asleep while playing.\n<cy>Credit: this_guy_yt</c>",
-        category::misc,
-        SillyTier::Low,
-    },
-    {
-        "sticky",
-        "Sticky Grounds",
-        "When your character lands on an object, it may stay stuck on its surface until you jump again.\n<cy>Credit: Cheeseworks</c>",
-        category::misc,
-        SillyTier::Medium,
-    },
-    {
-        key::pauses,
-        "Random Pauses",
-        "While playing a level, it will randomly pause itself.\n<cy>Credit: DragonixGD</c>",
-        category::randoms,
-        SillyTier::Low,
-    },
-    {
-        key::ice_level,
-        "Ice Level",
-        "Makes every surface icy. Slip n' slide!\n<cy>Credit: TimeRed</c>",
-        category::misc,
-        SillyTier::Medium,
-    },
-    {
-        key::random_mirror,
-        "Random Mirror Portal",
-        "Randomly activates a mirror portal while playing.\n<cy>Credit: TimeRed</c>",
-        category::randoms,
-        SillyTier::Low,
-    },
-    {
-        key::random_speed,
-        "Random Speed Change",
-        "Randomly changes your speed while playing a level.\n<cy>Credit: imdissapearinghelp</c>",
-        category::randoms,
-        SillyTier::Medium,
-    },
-    {
-        key::random_icon,
-        "Random Icon Change",
-        "Randomly change your icon every time you jump.\n<cy>Credit: JompyDoJump</c>",
-        category::randoms,
-        SillyTier::Low,
-    },
-    {
-        key::blinking_icon,
-        "Blinking Icon",
-        "Your icon will start to randomly blink.\n<cy>Credit: DragonixGD</c>",
-        category::obstructive,
-        SillyTier::Low,
-    },
-    {
-        key::dementia,
-        "Dementia",
-        "Chance of the player randomly teleports back. This is more like player lagging to be honest!\n<cy>Credit: imdissapearinghelp</c>",
-        category::misc,
-        SillyTier::Medium,
-    },
-    {
-        key::earthquake,
-        "Earthquake",
-        "Constantly shakes the camera while playing a level.\n<cy>Credit: ArcticWoof</c>",
-        category::obstructive,
-        SillyTier::Medium,
-    },
-    {
-        key::fake_crash,
-        "Random Fake Crash",
-        "While playing a level, there's a chance your game will fake a crash.\n<cy>Credit: Timered</c>",
-        category::randoms,
-        SillyTier::Medium,
-    },
-    {
-        key::gambler,
-        "Gambler",
-        "While playing a level and reach at the 95%, there's a 50/50 chance you either complete a level or blast into the space backwards.\n<cy>Credit: Timered</c>",
-        category::misc,
-        SillyTier::Medium,
-    },
-    {
-        key::placebo,
-        "Placebo",
-        "A random chance that when you start a level, all the options you have enabled are disabled, or all the options you have disabled are enabled.\n<cy>Credit: tmdXD</c>",
-        category::misc,
-        SillyTier::High,
-    },
-    {
-        key::click_speed,
-        "Click Player Speed",
-        "Randomly increases or decreases the player speed everytime you jump.\n<cy>Credit: KGplayerA</c>",
-        category::randoms,
-        SillyTier::Medium,
-    },
-    {
-        key::motivation,
-        "Motivational Quotes",
-        "You'll get motivational messages while playing! The motivator isn't in the best mood, though...\n<cy>Credit: Cheeseworks</c>",
-        category::obstructive,
-        SillyTier::Low,
-    },
-    {
-        key::flipped,
-        "FLIPPED",
-        "Sometimes while playing, your entire screen will just do a flip!\n<cy>Credit: Cheeseworks</c>",
-        category::obstructive,
-        SillyTier::High,
-    },
-    {
-        key::friends,
-        "Friends",
-        "Random friends fly across your screen while you play a level!\n<cy>Credit: Cheeseworks</c>",
-        category::obstructive,
-        SillyTier::Medium,
-    },
-    {
-        key::size_changer,
-        "Size Changer",
-        "Randomly change the player size every time you jump.\n<cy>Credit: himynameisryan21</c>",
-        category::randoms,
-        SillyTier::Medium,
-    },
-    {
-        key::timewarp_jump,
-        "Timewarp Jump",
-        "When you jump, there's a chance time will briefly slow down or speed up.\n<cy>Credit: KGplayerA</c>",
-        category::randoms,
-        SillyTier::Low,
-    },
-};
-
-$on_mod(Loaded) {
-    if (auto om = OptionManager::get()) {
-        log::debug("Registering {} default options...", defOpts.size());
-
-        for (auto const& option : defOpts) om->registerOption(option);
-
-        log::info("Done registering {} default options!", defOpts.size());
-
-        defOpts.clear();
-        defOpts.shrink_to_fit();
-
-        log::debug("Cleaned up default option array");
-    } else {
-        log::error("Failed to get OptionManager");
-    };
-
-    listenForSettingChanges("floating-button", [](bool value) {
-        if (auto fb = OptionMenuButton::get()) fb->setVisible(value);
-                            });
-
-    listenForSettingChanges("floating-button-level", [](bool value) {
-        if (auto fb = OptionMenuButton::get()) fb->setShowInLevel(value);
-                            });
-
-    listenForSettingChanges("floating-button-scale", [](double value) {
-        if (auto fb = OptionMenuButton::get()) fb->setScale(static_cast<float>(value));
-                            });
-
-    listenForSettingChanges("floating-button-opacity", [](int64_t value) {
-        if (auto fb = OptionMenuButton::get()) fb->setOpacity(value);
-                            });
+using namespace horrible::prelude;
+
+$on_game(Loaded) {
+    listenForKeybindSettingPresses(
+        "key-popup",
+        [](Keybind const&, bool down, bool repeat, double) {
+            if (down && !repeat) menu::open();
+        }
+    );
+
+    listenForSettingChanges<bool>(
+        "floating-button",
+        [](bool value) {
+            if (auto fb = OptionMenuButton::get()) fb->setVisible(value);
+        }
+    );
+
+    listenForSettingChanges<bool>(
+        "floating-button-level",
+        [](bool value) {
+            if (auto fb = OptionMenuButton::get()) fb->setShowInLevel(value);
+        }
+    );
+
+    listenForSettingChanges<double>(
+        "floating-button-scale",
+        [](double value) {
+            if (auto fb = OptionMenuButton::get()) fb->setScale(static_cast<float>(value));
+        }
+    );
+
+    listenForSettingChanges<int64_t>(
+        "floating-button-opacity",
+        [](int64_t value) {
+            if (auto fb = OptionMenuButton::get()) fb->setOpacity(value);
+        }
+    );
 
     (void)horribleMod->registerCustomSettingType("menu", &HorribleSettingV3::parse);
 };
@@ -327,7 +54,7 @@ class $modify(HIMenuLayer, MenuLayer) {
     bool init() {
         if (!MenuLayer::init()) return false;
 
-        if (auto fb = OptionMenuButton::get()) SceneManager::get()->keepAcrossScenes(fb);
+        if (auto fb = OptionMenuButton::get()) OverlayManager::get()->addChild(fb);
 
         if (auto gm = GameManager::get()) {
             // get and store user current fps
diff --git a/src/menu/OptionCategoryItem.hpp b/src/menu/OptionCategoryItem.hpp
index 7ce1d76..6376348 100644
--- a/src/menu/OptionCategoryItem.hpp
+++ b/src/menu/OptionCategoryItem.hpp
@@ -5,47 +5,23 @@
 using namespace geode::prelude;
 
 // Event for option toggles
-class CategoryEvent : public Event {
-protected:
-    std::string m_id;
-    bool m_enabled;
-
-public:
-    CategoryEvent(std::string id, bool enabled = false);
-
-    std::string_view getId() const noexcept;
-    bool isEnabled() const noexcept;
+struct CategoryEvent final : Event<CategoryEvent, bool(std::string_view, bool)> {
+    using Event::Event;
 };
 
-// Filter for option toggle event
-class CategoryEventFilter : public EventFilter<CategoryEvent> {
-public:
-    using Callback = ListenerResult(CategoryEvent*);
-    ListenerResult handle(std::function<Callback> fn, CategoryEvent* event);
-};
-
-class OptionCategoryItem : public CCMenu {
+class OptionCategoryItem final : public CCMenu {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;
 
 protected:
-    EventListener<CategoryEventFilter> m_listener = {
-        [this](CategoryEvent* event) {
-            return OnCategory(event->getId(), event->isEnabled());
-        },
-        CategoryEventFilter()
-    };
-
     OptionCategoryItem();
-    virtual ~OptionCategoryItem();
-
-    ListenerResult OnCategory(std::string_view category, bool enabled = false);
+    ~OptionCategoryItem();
 
     void onToggle(CCObject* sender);
 
-    bool init(CCSize const& size, std::string_view category);
+    bool init(CCSize const& size, std::string category);
 
 public:
-    static OptionCategoryItem* create(CCSize const& size, std::string_view category);
+    static OptionCategoryItem* create(CCSize const& size, std::string category);
 };
\ No newline at end of file
diff --git a/src/menu/OptionItem.hpp b/src/menu/OptionItem.hpp
index aebddef..bb66756 100644
--- a/src/menu/OptionItem.hpp
+++ b/src/menu/OptionItem.hpp
@@ -7,14 +7,14 @@
 using namespace geode::prelude;
 using namespace horrible;
 
-class OptionItem : public CCMenu {
+class OptionItem final : public CCMenu {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;
 
 protected:
     OptionItem();
-    virtual ~OptionItem();
+    ~OptionItem();
 
     void saveTogglerState();
 
@@ -22,10 +22,10 @@ class OptionItem : public CCMenu {
     void onDescription(CCObject*);
     void onExit() override;
 
-    bool init(CCSize const& size, Option const& option);
+    bool init(CCSize const& size, Option option);
 
 public:
-    static OptionItem* create(CCSize const& size, Option const& option);
+    static OptionItem* create(CCSize const& size, Option option);
 
     Option getOption() const noexcept;
     bool isCompatible() const noexcept;
diff --git a/src/menu/OptionMenuButton.hpp b/src/menu/OptionMenuButton.hpp
index 6139574..6a909c5 100644
--- a/src/menu/OptionMenuButton.hpp
+++ b/src/menu/OptionMenuButton.hpp
@@ -4,14 +4,14 @@
 
 using namespace geode::prelude;
 
-class OptionMenuButton : public CCLayer {
+class OptionMenuButton final : public CCLayer {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;
 
 protected:
     OptionMenuButton();
-    virtual ~OptionMenuButton();
+    ~OptionMenuButton();
 
     void onScaleEnd();
 
diff --git a/src/menu/OptionMenuPopup.hpp b/src/menu/OptionMenuPopup.hpp
index f819bb3..30432c3 100644
--- a/src/menu/OptionMenuPopup.hpp
+++ b/src/menu/OptionMenuPopup.hpp
@@ -9,12 +9,12 @@
 using namespace geode::prelude;
 using namespace horrible;
 
-class OptionMenuPopup : public Popup<> {
+class OptionMenuPopup final : public Popup {
 private:
     class Impl;
     std::unique_ptr<Impl> m_impl;
 
-    struct SillyFilter {
+    struct SillyFilter final {
         SillyTier tier;
         const char* label;
         ccColor3B color;
@@ -23,27 +23,9 @@ class OptionMenuPopup : public Popup<> {
 protected:
     static OptionMenuPopup* s_inst;
 
-    EventListener<OptionEventFilter> m_listener = {
-        [](OptionEvent* event) {
-            log::debug("{} option of ID '{}'", event->getToggled() ? "Enabled" : "Disabled", event->getId());
-            return ListenerResult::Propagate;
-        },
-        OptionEventFilter()
-    };
-
-    EventListener<CategoryEventFilter> m_catListener = {
-        [this](CategoryEvent* event) {
-            return OnCategory(event->getId(), event->isEnabled());
-        },
-        CategoryEventFilter()
-    };
-
     OptionMenuPopup();
-    virtual ~OptionMenuPopup();
-
-    ListenerResult OnCategory(std::string_view category, bool enabled = true);
+    ~OptionMenuPopup();
 
-    void filterOptions(std::span<const Option>  optList, SillyTier tier = SillyTier::None, std::string_view category = "");
     void filterTierCallback(CCObject*);
 
     void resetFilters(CCObject*);
@@ -56,7 +38,7 @@ class OptionMenuPopup : public Popup<> {
     void onExit() override;
     void cleanup() override;
 
-    bool setup() override;
+    bool init() override;
 
 public:
     static OptionMenuPopup* create();
diff --git a/src/menu/SettingV3.hpp b/src/menu/SettingV3.hpp
index 1d1afee..b01335e 100644
--- a/src/menu/SettingV3.hpp
+++ b/src/menu/SettingV3.hpp
@@ -6,18 +6,18 @@
 
 using namespace geode::prelude;
 
-class HorribleSettingV3 : public SettingV3 {
+class HorribleSettingV3 final : public SettingV3 {
 public:
     static Result<std::shared_ptr<SettingV3>> parse(
-        std::string_view key,
-        std::string_view modID,
+        ZStringView key,
+        ZStringView modID,
         matjson::Value const& json
     );
 
     bool load(matjson::Value const& json) override;
     bool save(matjson::Value& json) const override;
 
-    bool isDefaultValue() const override;
+    bool isDefaultValue() const noexcept override;
 
     void reset() override;
 
@@ -31,7 +31,7 @@ class HorribleSettingNodeV3 : public SettingNodeV3 {
 
 protected:
     HorribleSettingNodeV3();
-    virtual ~HorribleSettingNodeV3();
+    ~HorribleSettingNodeV3();
 
     void updateState(CCNode* invoker) override;
     void onButton(CCObject*);
@@ -43,8 +43,8 @@ class HorribleSettingNodeV3 : public SettingNodeV3 {
 public:
     static HorribleSettingNodeV3* create(std::shared_ptr<HorribleSettingV3> setting, float width);
 
-    bool hasUncommittedChanges() const override;
-    bool hasNonDefaultValue() const override;
+    bool hasUncommittedChanges() const noexcept override;
+    bool hasNonDefaultValue() const noexcept override;
 
-    std::shared_ptr<HorribleSettingV3> getSetting() const;
+    std::shared_ptr<HorribleSettingV3> getSetting() const noexcept;
 };
\ No newline at end of file
diff --git a/src/menu/src/OptionCategoryItem.cpp b/src/menu/src/OptionCategoryItem.cpp
index 88106bd..34d0f66 100644
--- a/src/menu/src/OptionCategoryItem.cpp
+++ b/src/menu/src/OptionCategoryItem.cpp
@@ -7,39 +7,22 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
-CategoryEvent::CategoryEvent(std::string id, bool enabled) : m_id(std::move(id)), m_enabled(enabled) {};
-
-std::string_view CategoryEvent::getId() const noexcept {
-    return m_id;
-};
-
-bool CategoryEvent::isEnabled() const noexcept {
-    return m_enabled;
-};
-
-ListenerResult CategoryEventFilter::handle(std::function<Callback> fn, CategoryEvent* event) {
-    return fn(event);
-};
-
 class OptionCategoryItem::Impl final {
 public:
-    std::string m_category = ""; // The category name
+    std::string category = ""; // The category name
 
-    CCMenuItemToggler* m_toggler = nullptr; // The toggler for the option
-};
-
-OptionCategoryItem::OptionCategoryItem() {
-    m_impl = std::make_unique<Impl>();
+    CCMenuItemToggler* toggler = nullptr; // The toggler for the option
 };
 
+OptionCategoryItem::OptionCategoryItem() : m_impl(std::make_unique<Impl>()) {};
 OptionCategoryItem::~OptionCategoryItem() {};
 
-bool OptionCategoryItem::init(CCSize const& size, std::string_view category) {
-    m_impl->m_category = category;
+bool OptionCategoryItem::init(CCSize const& size, std::string category) {
+    m_impl->category = std::move(category);
 
     if (!CCMenu::init()) return false;
 
-    setID(str::join(str::split(str::filter(str::toLower(category.data()), "abcdefghijklmnopqrstuvwxyz0123456789-_./ "), " "), "-"));
+    setID(str::join(str::split(str::filter(str::toLower(m_impl->category), "abcdefghijklmnopqrstuvwxyz0123456789-_./ "), " "), "-"));
     setContentSize(size);
     setAnchorPoint({ 0.5, 1 });
 
@@ -58,22 +41,22 @@ bool OptionCategoryItem::init(CCSize const& size, std::string_view category) {
     togglerOn->setScale(0.5f);
 
     // toggler for the category
-    m_impl->m_toggler = CCMenuItemToggler::create(
+    m_impl->toggler = CCMenuItemToggler::create(
         togglerOff,
         togglerOn,
         this,
         menu_selector(OptionCategoryItem::onToggle)
     );
-    m_impl->m_toggler->setID("toggler");
-    m_impl->m_toggler->setAnchorPoint({ 0.5f, 0.5f });
-    m_impl->m_toggler->setPosition({ 10.f, getScaledContentHeight() / 2.f });
-    m_impl->m_toggler->setScale(0.875f);
+    m_impl->toggler->setID("toggler");
+    m_impl->toggler->setAnchorPoint({ 0.5f, 0.5f });
+    m_impl->toggler->setPosition({ 10.f, getScaledContentHeight() / 2.f });
+    m_impl->toggler->setScale(0.875f);
 
-    addChild(m_impl->m_toggler);
+    addChild(m_impl->toggler);
 
     // name of the joke
     auto nameLabel = CCLabelBMFont::create(
-        m_impl->m_category.c_str(),
+        m_impl->category.c_str(),
         "goldFont.fnt",
         getScaledContentWidth() - 35.f,
         kCCTextAlignmentLeft
@@ -86,25 +69,27 @@ bool OptionCategoryItem::init(CCSize const& size, std::string_view category) {
 
     addChild(nameLabel);
 
-    return true;
-};
+    addEventListener(
+        CategoryEvent(),
+        [this](std::string_view category, bool enabled) {
+            if (m_impl->toggler) if (category != m_impl->category) m_impl->toggler->toggle(false);
+        }
+    );
 
-ListenerResult OptionCategoryItem::OnCategory(std::string_view category, bool enabled) {
-    if (m_impl->m_toggler) if (category != m_impl->m_category) m_impl->m_toggler->toggle(false);
-    return ListenerResult::Propagate;
+    return true;
 };
 
 void OptionCategoryItem::onToggle(CCObject* sender) {
-    if (m_impl->m_toggler) CategoryEvent(m_impl->m_category, !m_impl->m_toggler->isOn()).post();
+    if (m_impl->toggler) CategoryEvent().send(m_impl->category, !m_impl->toggler->isOn());
 };
 
-OptionCategoryItem* OptionCategoryItem::create(CCSize const& size, std::string_view category) {
+OptionCategoryItem* OptionCategoryItem::create(CCSize const& size, std::string category) {
     auto ret = new OptionCategoryItem();
-    if (ret->init(size, category)) {
+    if (ret->init(size, std::move(category))) {
         ret->autorelease();
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
\ No newline at end of file
diff --git a/src/menu/src/OptionItem.cpp b/src/menu/src/OptionItem.cpp
index 23381d9..f5f1427 100644
--- a/src/menu/src/OptionItem.cpp
+++ b/src/menu/src/OptionItem.cpp
@@ -9,39 +9,36 @@ using namespace horrible::prelude;
 
 class OptionItem::Impl final {
 public:
-    bool s_compatible = false; // If this option is compatible with the current platform
+    bool compatible = false; // If this option is compatible with the current platform
 
     // The option
-    Option m_option = {
+    Option option = {
         "unk"_spr,
         "Unknown Option",
         "No description provided.",
         "General"
     };
 
-    CCMenuItemToggler* m_toggler = nullptr; // The toggler for the option
-};
-
-OptionItem::OptionItem() {
-    m_impl = std::make_unique<Impl>();
+    CCMenuItemToggler* toggler = nullptr; // The toggler for the option
 };
 
+OptionItem::OptionItem() : m_impl(std::make_unique<Impl>()) {};
 OptionItem::~OptionItem() {};
 
-bool OptionItem::init(CCSize const& size, Option const& option) {
-    m_impl->m_option = option;
+bool OptionItem::init(CCSize const& size, Option option) {
+    m_impl->option = std::move(option);
 
     // check for compatibility
-    for (auto const& p : m_impl->m_option.platforms) {
+    for (auto const& p : m_impl->option.platforms) {
         if (p & GEODE_PLATFORM_TARGET) {
-            m_impl->s_compatible = true;
+            m_impl->compatible = true;
             break;
         };
     };
 
     if (!CCMenu::init()) return false;
 
-    setID(m_impl->m_option.id);
+    setID(m_impl->option.id);
     setContentSize(size);
     setAnchorPoint({ 0.5, 1 });
 
@@ -66,27 +63,27 @@ bool OptionItem::init(CCSize const& size, Option const& option) {
     togglerOn->setScale(0.875f);
 
     // toggler for the option
-    m_impl->m_toggler = CCMenuItemToggler::create(
+    m_impl->toggler = CCMenuItemToggler::create(
         togglerOff,
         togglerOn,
         this,
         menu_selector(OptionItem::onToggle)
     );
-    m_impl->m_toggler->setID("toggler");
-    m_impl->m_toggler->setAnchorPoint({ 0.5f, 0.5f });
-    m_impl->m_toggler->setPosition({ x + 12.f, yCenter });
-    m_impl->m_toggler->setScale(0.875f);
+    m_impl->toggler->setID("toggler");
+    m_impl->toggler->setAnchorPoint({ 0.5f, 0.5f });
+    m_impl->toggler->setPosition({ x + 12.f, yCenter });
+    m_impl->toggler->setScale(0.875f);
 
     // Set toggler state based on saved mod option value
-    if (horribleMod) m_impl->m_toggler->toggle(horribleMod->getSavedValue<bool>(m_impl->m_option.id));
+    if (horribleMod) m_impl->toggler->toggle(horribleMod->getSavedValue<bool>(m_impl->option.id));
 
-    addChild(m_impl->m_toggler);
+    addChild(m_impl->toggler);
 
     x += 30.f;
 
     // name of the joke
     auto nameLabel = CCLabelBMFont::create(
-        m_impl->m_option.name.c_str(),
+        m_impl->option.name.c_str(),
         "bigFont.fnt",
         getScaledContentWidth() - 40.f,
         kCCTextAlignmentLeft
@@ -98,7 +95,7 @@ bool OptionItem::init(CCSize const& size, Option const& option) {
     nameLabel->setScale(0.4f);
 
     auto categoryLabel = CCLabelBMFont::create(
-        m_impl->m_option.category.c_str(),
+        m_impl->option.category.c_str(),
         "goldFont.fnt",
         getScaledContentWidth() - 60.f,
         kCCTextAlignmentLeft
@@ -110,8 +107,8 @@ bool OptionItem::init(CCSize const& size, Option const& option) {
     categoryLabel->setOpacity(200);
     categoryLabel->setScale(0.25f);
 
-    // Set color based on m_impl->m_option.Tier
-    switch (m_impl->m_option.silly) {
+    // Set color based on m_impl->option.Tier
+    switch (m_impl->option.silly) {
     case SillyTier::Low: // green
         nameLabel->setColor(colors::green);
         break;
@@ -134,7 +131,7 @@ bool OptionItem::init(CCSize const& size, Option const& option) {
 
     if (horribleMod->getSettingValue<bool>("dev-mode")) {
         auto idLabel = CCLabelBMFont::create(
-            m_impl->m_option.id.c_str(),
+            m_impl->option.id.c_str(),
             "chatFont.fnt",
             getScaledContentWidth() - 20.f,
             kCCTextAlignmentLeft
@@ -167,8 +164,8 @@ bool OptionItem::init(CCSize const& size, Option const& option) {
 
     addChild(helpBtn);
 
-    if (!m_impl->s_compatible) {
-        m_impl->m_toggler->toggle(false);
+    if (!m_impl->compatible) {
+        m_impl->toggler->toggle(false);
 
         togglerOn->setDisplayFrame(togglerOff->displayFrame());
 
@@ -192,30 +189,34 @@ bool OptionItem::init(CCSize const& size, Option const& option) {
 };
 
 void OptionItem::saveTogglerState() {
-    if (m_impl->m_toggler) options::set(m_impl->m_option.id, m_impl->m_toggler->isToggled());
+    if (m_impl->toggler) options::set(m_impl->option.id, m_impl->toggler->isToggled());
 };
 
 void OptionItem::onToggle(CCObject*) {
-    if (m_impl->s_compatible) {
+    if (m_impl->compatible) {
         saveTogglerState();
-        if (m_impl->m_option.restart) {
+        if (m_impl->option.restart) {
             Notification::create("Restart required!", NotificationIcon::Warning, 2.5f)->show();
-            log::warn("Restart required to apply option {}", m_impl->m_option.id);
+            log::warn("Restart required to apply option {}", m_impl->option.id);
         };
 
-        log::info("Option {} now set to {}", m_impl->m_option.name, options::get(m_impl->m_option.id) ? "disabled" : "enabled"); // wtf is it other way around lmao
-    } else if (m_impl->m_toggler) {
-        Notification::create(fmt::format("{} is unavailable for {}", m_impl->m_option.name, GEODE_PLATFORM_NAME), NotificationIcon::Error, 1.25f)->show();
-        log::error("Option {} is not available for platform {}", m_impl->m_option.id, GEODE_PLATFORM_SHORT_IDENTIFIER);
+        auto now = options::get(m_impl->option.id);
+
+        OptionEvent(m_impl->option.id).send(m_impl->option.id, now);
+
+        log::info("Option {} now set to {}", m_impl->option.name, now ? "disabled" : "enabled"); // wtf is it other way around lmao
+    } else if (m_impl->toggler) {
+        Notification::create(fmt::format("{} is unavailable for {}", m_impl->option.name, GEODE_PLATFORM_NAME), NotificationIcon::Error, 1.25f)->show();
+        log::error("Option {} is not available for platform {}", m_impl->option.id, GEODE_PLATFORM_SHORT_IDENTIFIER);
 
-        m_impl->m_toggler->toggle(false);
+        m_impl->toggler->toggle(false);
     };
 };
 
 void OptionItem::onDescription(CCObject*) {
     if (auto popup = FLAlertLayer::create(
-        m_impl->m_option.name.c_str(),
-        m_impl->m_option.description.c_str(),
+        m_impl->option.name.c_str(),
+        m_impl->option.description.c_str(),
         "OK"
     )) popup->show();
 };
@@ -226,20 +227,20 @@ void OptionItem::onExit() {
 };
 
 Option OptionItem::getOption() const noexcept {
-    return m_impl->m_option;
+    return m_impl->option;
 };
 
 bool OptionItem::isCompatible() const noexcept {
-    return m_impl->s_compatible;
+    return m_impl->compatible;
 };
 
-OptionItem* OptionItem::create(CCSize const& size, Option const& option) {
+OptionItem* OptionItem::create(CCSize const& size, Option option) {
     auto ret = new OptionItem();
-    if (ret->init(size, option)) {
+    if (ret->init(size, std::move(option))) {
         ret->autorelease();
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 }; 
\ No newline at end of file
diff --git a/src/menu/src/OptionMenuButton.cpp b/src/menu/src/OptionMenuButton.cpp
index c0d3315..a09e233 100644
--- a/src/menu/src/OptionMenuButton.cpp
+++ b/src/menu/src/OptionMenuButton.cpp
@@ -9,26 +9,23 @@ using namespace horrible::prelude;
 
 class OptionMenuButton::Impl final {
 public:
-    bool m_inLevel = horribleMod->getSettingValue<bool>("floating-button-level");
+    bool inLevel = horribleMod->getSettingValue<bool>("floating-button-level");
 
-    float m_scale = static_cast<float>(horribleMod->getSettingValue<double>("floating-button-scale"));
-    int64_t m_opacity = horribleMod->getSettingValue<int64_t>("floating-button-opacity");
+    float scale = static_cast<float>(horribleMod->getSettingValue<double>("floating-button-scale"));
+    int64_t opacity = horribleMod->getSettingValue<int64_t>("floating-button-opacity");
 
-    bool m_isDragging = false;
-    bool m_isMoving = false;
+    bool isDragging = false;
+    bool isMoving = false;
 
-    CCSize const m_screenSize = CCDirector::sharedDirector()->getWinSize();
-    CCPoint m_dragStartPos = { 0, 0 };
+    CCSize const screenSize = CCDirector::sharedDirector()->getWinSize();
+    CCPoint dragStartPos = { 0, 0 };
 
-    Ref<CircleButtonSprite> m_sprite = nullptr;
+    Ref<CircleButtonSprite> sprite = nullptr;
 
-    bool m_isAnimating = false;
-};
-
-OptionMenuButton::OptionMenuButton() {
-    m_impl = std::make_unique<Impl>();
+    bool isAnimating = false;
 };
 
+OptionMenuButton::OptionMenuButton() : m_impl(std::make_unique<Impl>()) {};
 OptionMenuButton::~OptionMenuButton() {};
 
 bool OptionMenuButton::init() {
@@ -46,59 +43,59 @@ bool OptionMenuButton::init() {
     setTouchPriority(-512);  // ewww touch priority
     setZOrder(9999);
 
-    m_impl->m_sprite = CircleButtonSprite::createWithSprite(
+    m_impl->sprite = CircleButtonSprite::createWithSprite(
         "icon.png"_spr,
         0.925f
     );
-    m_impl->m_sprite->setAnchorPoint({ 0.5, 0.5 });
+    m_impl->sprite->setAnchorPoint({ 0.5, 0.5 });
 
-    setContentSize(m_impl->m_sprite->getScaledContentSize());
+    setContentSize(m_impl->sprite->getScaledContentSize());
 
-    m_impl->m_sprite->setPosition(getScaledContentSize() / 2.f);
+    m_impl->sprite->setPosition(getScaledContentSize() / 2.f);
 
-    setScale(m_impl->m_scale); // set initial scale
-    setOpacity(m_impl->m_opacity); // set initial opacity
+    setScale(m_impl->scale); // set initial scale
+    setOpacity(m_impl->opacity); // set initial opacity
 
     setVisible(horribleMod->getSettingValue<bool>("floating-button")); // set initial visibility
 
-    addChild(m_impl->m_sprite);
+    addChild(m_impl->sprite);
 
     return true;
 };
 
 void OptionMenuButton::setOpacity(GLubyte opacity) {
-    m_impl->m_opacity = opacity;
-    if (m_impl->m_sprite) m_impl->m_sprite->setOpacity(isVisible() ? opacity : 0);
+    m_impl->opacity = opacity;
+    if (m_impl->sprite) m_impl->sprite->setOpacity(isVisible() ? opacity : 0);
 };
 
 void OptionMenuButton::setShowInLevel(bool show) {
-    m_impl->m_inLevel = show;
+    m_impl->inLevel = show;
 };
 
 void OptionMenuButton::setScale(float scale) {
-    m_impl->m_scale = scale;
+    m_impl->scale = scale;
 
-    if (!m_impl->m_isDragging && !m_impl->m_isAnimating) {
-        if (m_impl->m_sprite) {
-            m_impl->m_sprite->setScale(scale);
-            setContentSize(m_impl->m_sprite->getScaledContentSize());
+    if (!m_impl->isDragging && !m_impl->isAnimating) {
+        if (m_impl->sprite) {
+            m_impl->sprite->setScale(scale);
+            setContentSize(m_impl->sprite->getScaledContentSize());
         };
     };
 };
 
 void OptionMenuButton::setPosition(CCPoint const& position) {
-    if (m_impl->m_sprite) {
-        auto halfX = m_impl->m_sprite->getScaledContentWidth() / 2.f;
-        auto halfY = m_impl->m_sprite->getScaledContentHeight() / 2.f;
+    if (m_impl->sprite) {
+        auto halfX = m_impl->sprite->getScaledContentWidth() / 2.f;
+        auto halfY = m_impl->sprite->getScaledContentHeight() / 2.f;
 
-        auto clampX = std::clamp<float>(position.x, halfX, m_impl->m_screenSize.width - halfX);
-        auto clampY = std::clamp<float>(position.y, halfY, m_impl->m_screenSize.height - halfY);
+        auto clampX = std::clamp<float>(position.x, halfX, m_impl->screenSize.width - halfX);
+        auto clampY = std::clamp<float>(position.y, halfY, m_impl->screenSize.height - halfY);
 
         auto clampPos = ccp(clampX, clampY);
         CCLayer::setPosition(clampPos);
 
         // Save only when not dragging
-        if (!m_impl->m_isDragging) {
+        if (!m_impl->isDragging) {
             horribleMod->setSavedValue<float>("button-x", clampPos.x);
             horribleMod->setSavedValue<float>("button-y", clampPos.y);
         };
@@ -108,20 +105,20 @@ void OptionMenuButton::setPosition(CCPoint const& position) {
 };
 
 bool OptionMenuButton::ccTouchBegan(CCTouch* touch, CCEvent* ev) {
-    if (m_impl->m_sprite && isVisible()) {
+    if (m_impl->sprite && isVisible()) {
         CCPoint const touchLocation = convertToNodeSpace(touch->getLocation());
 
-        auto box = m_impl->m_sprite->boundingBox();
+        auto box = m_impl->sprite->boundingBox();
         if (box.containsPoint(touchLocation)) {
-            m_impl->m_isDragging = true;
+            m_impl->isDragging = true;
 
-            m_impl->m_dragStartPos = ccpSub(getPosition(), touch->getLocation());
+            m_impl->dragStartPos = ccpSub(getPosition(), touch->getLocation());
 
-            m_impl->m_sprite->stopAllActions();
-            m_impl->m_isAnimating = true;
-            m_impl->m_sprite->runAction(CCSequence::createWithTwoActions(
+            m_impl->sprite->stopAllActions();
+            m_impl->isAnimating = true;
+            m_impl->sprite->runAction(CCSequence::createWithTwoActions(
                 CCSpawn::createWithTwoActions(
-                    CCEaseExponentialOut::create(CCScaleTo::create(0.25f, m_impl->m_scale * 0.875f)),
+                    CCEaseExponentialOut::create(CCScaleTo::create(0.25f, m_impl->scale * 0.875f)),
                     CCFadeTo::create(0.25f, 255)
                 ),
                 CCCallFunc::create(this, callfunc_selector(OptionMenuButton::onScaleEnd))
@@ -135,40 +132,40 @@ bool OptionMenuButton::ccTouchBegan(CCTouch* touch, CCEvent* ev) {
 };
 
 void OptionMenuButton::ccTouchMoved(CCTouch* touch, CCEvent* ev) {
-    if (m_impl->m_isDragging) {
+    if (m_impl->isDragging) {
         CCPoint const touchLocation = touch->getLocation();
-        CCPoint const newLocation = ccpAdd(touchLocation, m_impl->m_dragStartPos);
+        CCPoint const newLocation = ccpAdd(touchLocation, m_impl->dragStartPos);
 
         setPosition(newLocation);
 
-        m_impl->m_isMoving = true;
+        m_impl->isMoving = true;
     };
 };
 
 void OptionMenuButton::ccTouchEnded(CCTouch* touch, CCEvent* ev) {
-    if (!m_impl->m_isMoving) menu::open();
+    if (!m_impl->isMoving) menu::open();
 
     // reset state
-    m_impl->m_isDragging = false;
-    m_impl->m_isMoving = false;
+    m_impl->isDragging = false;
+    m_impl->isMoving = false;
 
     // store position
     horribleMod->setSavedValue<float>("button-x", getPosition().x);
     horribleMod->setSavedValue<float>("button-y", getPosition().y);
 
-    m_impl->m_isAnimating = true;
+    m_impl->isAnimating = true;
 
-    if (m_impl->m_sprite) {
+    if (m_impl->sprite) {
         // reset scale
-        m_impl->m_sprite->stopAllActions();
-        m_impl->m_sprite->runAction(CCSequence::create(
+        m_impl->sprite->stopAllActions();
+        m_impl->sprite->runAction(CCSequence::create(
             CCSpawn::createWithTwoActions(
                 CCFadeTo::create(0.125f, 255),
-                CCEaseElasticOut::create(CCScaleTo::create(0.875f, m_impl->m_scale))
+                CCEaseElasticOut::create(CCScaleTo::create(0.875f, m_impl->scale))
             ),
             CCCallFunc::create(this, callfunc_selector(OptionMenuButton::onScaleEnd)),
             CCDelayTime::create(1.f),
-            CCFadeTo::create(0.5f, m_impl->m_opacity),
+            CCFadeTo::create(0.5f, m_impl->opacity),
             nullptr));
     };
 };
@@ -179,19 +176,19 @@ void OptionMenuButton::onEnter() {
 };
 
 void OptionMenuButton::onScaleEnd() {
-    m_impl->m_isAnimating = false;
+    m_impl->isAnimating = false;
 };
 
 int64_t OptionMenuButton::getOpacitySetting() const noexcept {
-    return m_impl->m_opacity;
+    return m_impl->opacity;
 };
 
 float OptionMenuButton::getScaleSetting() const noexcept {
-    return m_impl->m_scale;
+    return m_impl->scale;
 };
 
 bool OptionMenuButton::showInLevel() const noexcept {
-    return m_impl->m_inLevel;
+    return m_impl->inLevel;
 };
 
 OptionMenuButton* OptionMenuButton::create() {
@@ -201,7 +198,7 @@ OptionMenuButton* OptionMenuButton::create() {
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
 
diff --git a/src/menu/src/OptionMenuPopup.cpp b/src/menu/src/OptionMenuPopup.cpp
index 1bf3c83..802c408 100644
--- a/src/menu/src/OptionMenuPopup.cpp
+++ b/src/menu/src/OptionMenuPopup.cpp
@@ -19,25 +19,70 @@ OptionMenuPopup* OptionMenuPopup::s_inst = nullptr;
 
 class OptionMenuPopup::Impl final {
 public:
-    SillyTier s_selectedTier = SillyTier::None;
-    std::string s_selectedCategory = "";
+    SillyTier selectedTier = SillyTier::None;
+    std::string selectedCategory = "";
 
-    std::string m_searchText = "";
+    std::string searchText = "";
 
-    bool m_showIncompatible = horribleMod->getSettingValue<bool>("show-incompatible");
+    bool showIncompatible = horribleMod->getSettingValue<bool>("show-incompatible");
 
-    ScrollLayer* m_optionList = nullptr;
-    ScrollLayer* m_categoryList = nullptr;
-    TextInput* m_searchInput = nullptr;
-};
+    ScrollLayer* optionList = nullptr;
+    ScrollLayer* categoryList = nullptr;
+    TextInput* searchInput = nullptr;
+
+    void filterOptions(std::span<const Option> optList, SillyTier tier = SillyTier::None, ZStringView category = "") {
+        if (optionList) {
+            optionList->m_contentLayer->removeAllChildren();
+
+            auto useCategory = options::doesCategoryExist(category);
+
+            for (auto const& opt : optList) {
+                // tier filter
+                auto tierMatches = tier == SillyTier::None || tier == opt.silly;
+                // category filter
+                auto categoryMatches = !useCategory || (opt.category == category);
+
+                // search filter
+                auto searchMatches = true;
+                if (!searchText.empty()) {
+                    auto const searchLower = str::toLower(searchText);
+                    auto const nameLower = str::toLower(opt.name);
+
+                    searchMatches = str::contains(nameLower, searchLower);
+                };
+
+                if (tierMatches && categoryMatches && searchMatches) {
+                    if (auto modOption = OptionItem::create(
+                        {
+                            optionList->m_contentLayer->getScaledContentWidth(),
+                            32.5f,
+                        },
+                        opt
+                        )) {
+                        if (modOption->isCompatible() || showIncompatible) {
+                            optionList->m_contentLayer->addChild(modOption);
+                        } else {
+                            log::error("{} is incompatible with the current platform", modOption->getOption().id);
+                            modOption->removeMeAndCleanup();
+                        };
+                    };
+                };
+            };
 
-OptionMenuPopup::OptionMenuPopup() {
-    m_impl = std::make_unique<Impl>();
+            optionList->m_contentLayer->updateLayout();
+            optionList->scrollToTop();
+        } else {
+            log::error("Option list layer not found");
+        };
+    };
 };
 
+OptionMenuPopup::OptionMenuPopup() : m_impl(std::make_unique<Impl>()) {};
 OptionMenuPopup::~OptionMenuPopup() {};
 
-bool OptionMenuPopup::setup() {
+bool OptionMenuPopup::init() {
+    if (!Popup::init(450.f, 280.f)) return false;
+
     setID("options"_spr);
     setTitle("Horrible Options");
 
@@ -59,21 +104,21 @@ bool OptionMenuPopup::setup() {
         ->setAutoGrowAxis(categoryListBg->getScaledContentHeight() - 8.75f);
 
     // scroll layer
-    m_impl->m_categoryList = ScrollLayer::create({ categoryListBg->getScaledContentWidth() - 8.75f, categoryListBg->getScaledContentHeight() - 8.75f });
-    m_impl->m_categoryList->setID("categories-list");
-    m_impl->m_categoryList->setAnchorPoint({ 0.5, 0.5 });
-    m_impl->m_categoryList->ignoreAnchorPointForPosition(false);
-    m_impl->m_categoryList->setPosition(categoryListBg->getPosition());
-    m_impl->m_categoryList->m_contentLayer->setLayout(layoutCategories);
+    m_impl->categoryList = ScrollLayer::create({ categoryListBg->getScaledContentWidth() - 8.75f, categoryListBg->getScaledContentHeight() - 8.75f });
+    m_impl->categoryList->setID("categories-list");
+    m_impl->categoryList->setAnchorPoint({ 0.5, 0.5 });
+    m_impl->categoryList->ignoreAnchorPointForPosition(false);
+    m_impl->categoryList->setPosition(categoryListBg->getPosition());
+    m_impl->categoryList->m_contentLayer->setLayout(layoutCategories);
 
     for (auto const& category : options::getAllCategories()) {
-        if (auto categoryItem = OptionCategoryItem::create({ m_impl->m_categoryList->getScaledContentWidth(), 20.f }, category)) m_impl->m_categoryList->m_contentLayer->addChild(categoryItem);
+        if (auto categoryItem = OptionCategoryItem::create({ m_impl->categoryList->getScaledContentWidth(), 20.f }, category)) m_impl->categoryList->m_contentLayer->addChild(categoryItem);
     };
 
-    m_impl->m_categoryList->m_contentLayer->updateLayout();
-    m_impl->m_categoryList->scrollToTop();
+    m_impl->categoryList->m_contentLayer->updateLayout();
+    m_impl->categoryList->scrollToTop();
 
-    m_mainLayer->addChild(m_impl->m_categoryList, 1);
+    m_mainLayer->addChild(m_impl->categoryList, 1);
 
     // Add a background sprite to the popup
     auto optionListBg = CCScale9Sprite::create("square02_001.png");
@@ -91,30 +136,30 @@ bool OptionMenuPopup::setup() {
         ->setAutoGrowAxis(optionListBg->getScaledContentHeight() - 10.f);
 
     // scroll layer
-    m_impl->m_optionList = ScrollLayer::create({ optionListBg->getScaledContentWidth() - 10.f, optionListBg->getScaledContentHeight() - 10.f });
-    m_impl->m_optionList->setID("options-list");
-    m_impl->m_optionList->setAnchorPoint({ 0.5, 0.5 });
-    m_impl->m_optionList->ignoreAnchorPointForPosition(false);
-    m_impl->m_optionList->setPosition(optionListBg->getPosition());
-    m_impl->m_optionList->m_contentLayer->setLayout(layoutOptions);
+    m_impl->optionList = ScrollLayer::create({ optionListBg->getScaledContentWidth() - 10.f, optionListBg->getScaledContentHeight() - 10.f });
+    m_impl->optionList->setID("options-list");
+    m_impl->optionList->setAnchorPoint({ 0.5, 0.5 });
+    m_impl->optionList->ignoreAnchorPointForPosition(false);
+    m_impl->optionList->setPosition(optionListBg->getPosition());
+    m_impl->optionList->m_contentLayer->setLayout(layoutOptions);
 
-    m_mainLayer->addChild(m_impl->m_optionList, 9);
+    m_mainLayer->addChild(m_impl->optionList, 9);
 
     // add search bar
-    m_impl->m_searchInput = TextInput::create(optionListBg->getScaledContentWidth(), "Search...", "bigFont.fnt");
-    m_impl->m_searchInput->setID("search-input");
-    m_impl->m_searchInput->setPosition({ optionListBg->getPositionX(), mainLayerSize.height - 52.5f });
+    m_impl->searchInput = TextInput::create(optionListBg->getScaledContentWidth(), "Search...", "bigFont.fnt");
+    m_impl->searchInput->setID("search-input");
+    m_impl->searchInput->setPosition({ optionListBg->getPositionX(), mainLayerSize.height - 52.5f });
 
-    m_impl->m_searchInput->setCallback([this](std::string_view str) {
-        m_impl->m_searchText = str;
-        filterOptions(
+    m_impl->searchInput->setCallback([this](std::string_view str) {
+        m_impl->searchText = str;
+        m_impl->filterOptions(
             options::getAll(),
-            m_impl->s_selectedTier,
-            m_impl->s_selectedCategory
+            m_impl->selectedTier,
+            m_impl->selectedCategory
         );  // lets search this crap
-                                       });
+                                     });
 
-    m_mainLayer->addChild(m_impl->m_searchInput);
+    m_mainLayer->addChild(m_impl->searchInput);
 
     // add a list button background
     auto filterMenuBg = CCScale9Sprite::create("square02_001.png");
@@ -167,7 +212,7 @@ bool OptionMenuPopup::setup() {
     };
 
     // get the options data
-    filterOptions(options::getAll());
+    m_impl->filterOptions(options::getAll());
 
     m_mainLayer->addChild(filterMenu);
 
@@ -242,70 +287,26 @@ bool OptionMenuPopup::setup() {
 
     m_mainLayer->addChild(safeModeLabel, 9);
 
-    return true;
-};
-
-ListenerResult OptionMenuPopup::OnCategory(std::string_view category, bool enabled) {
-    m_impl->s_selectedCategory = enabled ? category : "";
-    filterOptions(options::getAll(), m_impl->s_selectedTier, m_impl->s_selectedCategory);
-    return ListenerResult::Propagate;
-};
-
-void OptionMenuPopup::filterOptions(std::span<const Option>  optList, SillyTier tier, std::string_view category) {
-    if (m_impl->m_optionList) {
-        m_impl->m_optionList->m_contentLayer->removeAllChildren();
-
-        auto useCategory = options::doesCategoryExist(category);
-
-        for (auto const& opt : optList) {
-            // tier filter
-            auto tierMatches = tier == SillyTier::None || opt.silly == tier;
-            // category filter
-            auto categoryMatches = !useCategory || (opt.category == category);
-
-            // search filter
-            auto searchMatches = true;
-            if (!m_impl->m_searchText.empty()) {
-                auto const searchLower = str::toLower(m_impl->m_searchText);
-                auto const nameLower = str::toLower(opt.name);
-
-                searchMatches = str::contains(nameLower, searchLower);
-            };
-
-            if (tierMatches && categoryMatches && searchMatches) {
-                if (auto modOption = OptionItem::create(
-                    {
-                        m_impl->m_optionList->m_contentLayer->getScaledContentWidth(),
-                        32.5f,
-                    },
-                    opt
-                    )) {
-                    if (modOption->isCompatible() || m_impl->m_showIncompatible) {
-                        m_impl->m_optionList->m_contentLayer->addChild(modOption);
-                    } else {
-                        log::error("{} is incompatible with the current platform", modOption->getOption().id);
-                        modOption->removeMeAndCleanup();
-                    };
-                };
-            };
-        };
+    addEventListener(
+        CategoryEvent(),
+        [this](std::string_view category, bool enabled) {
+            m_impl->selectedCategory = enabled ? category : "";
+            m_impl->filterOptions(options::getAll(), m_impl->selectedTier, m_impl->selectedCategory);
+        }
+    );
 
-        m_impl->m_optionList->m_contentLayer->updateLayout();
-        m_impl->m_optionList->scrollToTop();
-    } else {
-        log::error("Option list layer not found");
-    };
+    return true;
 };
 
 void OptionMenuPopup::filterTierCallback(CCObject* sender) {
     if (auto btn = typeinfo_cast<CCMenuItemSpriteExtra*>(sender)) {
         auto tier = static_cast<SillyTier>(btn->getTag());
 
-        m_impl->s_selectedTier = tier;
+        m_impl->selectedTier = tier;
         // Toggle: clicking same button disables filter
-        if (m_impl->s_selectedTier == tier) m_impl->s_selectedTier = SillyTier::None;
+        if (m_impl->selectedTier == tier) m_impl->selectedTier = SillyTier::None;
 
-        filterOptions(options::getAll(), m_impl->s_selectedTier, m_impl->s_selectedCategory);
+        m_impl->filterOptions(options::getAll(), m_impl->selectedTier, m_impl->selectedCategory);
     } else {
         log::error("Filter button cast failed");
     };
@@ -318,8 +319,8 @@ void OptionMenuPopup::resetFilters(CCObject*) {
         "Cancel", "OK",
         [this](bool, bool ok) {
             if (ok) {
-                m_impl->s_selectedTier = SillyTier::None;
-                CategoryEvent("", false).post();
+                m_impl->selectedTier = SillyTier::None;
+                CategoryEvent().send("", false);
             };
         });
 };
@@ -345,17 +346,17 @@ void OptionMenuPopup::openSupporterPopup(CCObject*) {
 
 void OptionMenuPopup::onClose(CCObject* sender) {
     s_inst = nullptr;
-    Popup<>::onClose(sender);
+    Popup::onClose(sender);
 };
 
 void OptionMenuPopup::onExit() {
     s_inst = nullptr;
-    Popup<>::onExit();
+    Popup::onExit();
 };
 
 void OptionMenuPopup::cleanup() {
     s_inst = nullptr;
-    Popup<>::cleanup();
+    Popup::cleanup();
 };
 
 OptionMenuPopup* OptionMenuPopup::get() noexcept {
@@ -364,12 +365,12 @@ OptionMenuPopup* OptionMenuPopup::get() noexcept {
 
 OptionMenuPopup* OptionMenuPopup::create() {
     auto ret = new OptionMenuPopup();
-    if (ret->initAnchored(450.f, 280.f)) {
+    if (ret->init()) {
         ret->autorelease();
         s_inst = ret;
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
\ No newline at end of file
diff --git a/src/menu/src/SettingV3.cpp b/src/menu/src/SettingV3.cpp
index 2ec0702..9ad5944 100644
--- a/src/menu/src/SettingV3.cpp
+++ b/src/menu/src/SettingV3.cpp
@@ -7,11 +7,11 @@
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
-Result<std::shared_ptr<SettingV3>> HorribleSettingV3::parse(std::string_view key, std::string_view modID, matjson::Value const& json) {
+Result<std::shared_ptr<SettingV3>> HorribleSettingV3::parse(ZStringView key, ZStringView modID, matjson::Value const& json) {
     auto res = std::make_shared<HorribleSettingV3>();
     auto root = checkJson(json, "HorribleSettingV3");
 
-    res->init(key.data(), modID.data(), root);
+    res->init(key, modID, root);
     res->parseNameAndDescription(root);
     res->parseEnableIf(root);
 
@@ -28,7 +28,7 @@ bool HorribleSettingV3::save(matjson::Value&) const {
     return true;
 };
 
-bool HorribleSettingV3::isDefaultValue() const {
+bool HorribleSettingV3::isDefaultValue() const noexcept {
     return true;
 };
 
@@ -44,10 +44,7 @@ class HorribleSettingNodeV3::Impl final {
     CCMenuItemSpriteExtra* button = nullptr;
 };
 
-HorribleSettingNodeV3::HorribleSettingNodeV3() {
-    m_impl = std::make_unique<Impl>();
-};
-
+HorribleSettingNodeV3::HorribleSettingNodeV3() : m_impl(std::make_unique<Impl>()) {};
 HorribleSettingNodeV3::~HorribleSettingNodeV3() {};
 
 bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, float width) {
@@ -61,10 +58,11 @@ bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, flo
     );
     m_impl->buttonSprite->setScale(.5f);
 
-    m_impl->button = CCMenuItemSpriteExtra::create(
+    m_impl->button = CCMenuItemExt::createSpriteExtra(
         m_impl->buttonSprite,
-        this,
-        menu_selector(HorribleSettingNodeV3::onButton)
+        [](auto) {
+            menu::open();
+        }
     );
 
     if (auto menu = getButtonMenu()) {
@@ -96,10 +94,6 @@ void HorribleSettingNodeV3::updateState(CCNode* invoker) {
     m_impl->buttonSprite->setColor(shouldEnable ? ccWHITE : ccGRAY);
 };
 
-void HorribleSettingNodeV3::onButton(CCObject*) {
-    menu::open();
-};
-
 void HorribleSettingNodeV3::onCommit() {};
 void HorribleSettingNodeV3::onResetToDefault() {};
 
@@ -110,19 +104,19 @@ HorribleSettingNodeV3* HorribleSettingNodeV3::create(std::shared_ptr<HorribleSet
         return ret;
     };
 
-    CC_SAFE_DELETE(ret);
+    delete ret;
     return nullptr;
 };
 
-bool HorribleSettingNodeV3::hasUncommittedChanges() const {
+bool HorribleSettingNodeV3::hasUncommittedChanges() const noexcept {
     return false;
 };
 
-bool HorribleSettingNodeV3::hasNonDefaultValue() const {
+bool HorribleSettingNodeV3::hasNonDefaultValue() const noexcept {
     return false;
 };
 
-std::shared_ptr<HorribleSettingV3> HorribleSettingNodeV3::getSetting() const {
+std::shared_ptr<HorribleSettingV3> HorribleSettingNodeV3::getSetting() const noexcept {
     return std::static_pointer_cast<HorribleSettingV3>(
         SettingNodeV3::getSetting()
     );