diff --git a/OWML.Common/Menus/IModButton.cs b/OWML.Common/Menus/IModButton.cs
index 2cacc51a5..93b096f81 100644
--- a/OWML.Common/Menus/IModButton.cs
+++ b/OWML.Common/Menus/IModButton.cs
@@ -3,23 +3,23 @@
 
 namespace OWML.Common.Menus
 {
-    public interface IModButton
+    public interface IModButton : IModButtonBase
     {
         event Action OnClick;
         int Index { get; set; }
         Button Button { get; }
-        bool IsSelected { get; }
         void Initialize(IModMenu menu);
+        string Title { get; set; }
 
-        IModButton Copy();
-        IModButton Copy(int index);
+        new IModButton Copy();
+        IModButton Copy(string title);
+        IModButton Copy(string title, int index);
 
-        IModButton Duplicate();
-        IModButton Duplicate(int index);
-
-        IModButton Replace();
-        IModButton Replace(int index);
+        IModButton Duplicate(string title);
+        IModButton Duplicate(string title, int index);
 
+        IModButton Replace(string title);
+        IModButton Replace(string title, int index);
         void Show();
         void Hide();
     }
diff --git a/OWML.Common/Menus/IModButtonBase.cs b/OWML.Common/Menus/IModButtonBase.cs
new file mode 100644
index 000000000..2e26a635c
--- /dev/null
+++ b/OWML.Common/Menus/IModButtonBase.cs
@@ -0,0 +1,26 @@
+using System;
+using UnityEngine.UI;
+
+namespace OWML.Common.Menus
+{
+    public interface IModButtonBase
+    {
+        event Action OnClick;
+        int Index { get; set; }
+        Button Button { get; }
+        bool IsSelected { get; }
+        void Initialize(IModMenu menu);
+
+        IModButtonBase Copy();
+        IModButtonBase Copy(int index);
+
+        IModButtonBase Duplicate();
+        IModButtonBase Duplicate(int index);
+
+        IModButtonBase Replace();
+        IModButtonBase Replace(int index);
+
+        void Show();
+        void Hide();
+    }
+}
\ No newline at end of file
diff --git a/OWML.Common/Menus/IModFieldInput.cs b/OWML.Common/Menus/IModFieldInput.cs
index acc98ef93..3c2ca84f7 100644
--- a/OWML.Common/Menus/IModFieldInput.cs
+++ b/OWML.Common/Menus/IModFieldInput.cs
@@ -2,6 +2,6 @@
 {
     public interface IModFieldInput<T> : IModInput<T>
     {
-        IModTitleButton Button { get; }
+        IModButton Button { get; }
     }
 }
diff --git a/OWML.Common/Menus/IModLayoutButton.cs b/OWML.Common/Menus/IModLayoutButton.cs
index c29b72903..e71f1e2f0 100644
--- a/OWML.Common/Menus/IModLayoutButton.cs
+++ b/OWML.Common/Menus/IModLayoutButton.cs
@@ -1,6 +1,6 @@
 namespace OWML.Common.Menus
 {
-    public interface IModLayoutButton : IModButton
+    public interface IModLayoutButton : IModButtonBase
     {
         IModLayoutManager Layout { get; }
     }
diff --git a/OWML.Common/Menus/IModMainMenu.cs b/OWML.Common/Menus/IModMainMenu.cs
index 6c548daf9..8d779031f 100644
--- a/OWML.Common/Menus/IModMainMenu.cs
+++ b/OWML.Common/Menus/IModMainMenu.cs
@@ -2,10 +2,13 @@
 {
     public interface IModMainMenu : IModOWMenu
     {
-        IModTitleButton ResumeExpeditionButton { get; }
-        IModTitleButton NewExpeditionButton { get; }
-        IModTitleButton ViewCreditsButton { get; }
-        IModTitleButton SwitchProfileButton { get; }
+        new IModTabbedMenu OptionsMenu { get; }
+        new IModButton OptionsButton { get; }
+        new IModButton QuitButton { get; }
+        IModButton ResumeExpeditionButton { get; }
+        IModButton NewExpeditionButton { get; }
+        IModButton ViewCreditsButton { get; }
+        IModButton SwitchProfileButton { get; }
 
         void Initialize(TitleScreenManager titleScreenManager);
     }
diff --git a/OWML.Common/Menus/IModMenu.cs b/OWML.Common/Menus/IModMenu.cs
index 2fde02bdb..63d79b475 100644
--- a/OWML.Common/Menus/IModMenu.cs
+++ b/OWML.Common/Menus/IModMenu.cs
@@ -10,18 +10,20 @@ public interface IModMenu
 
         Menu Menu { get; }
 
+        List<IModButtonBase> BaseButtons { get; }
         List<IModButton> Buttons { get; }
-        List<IModTitleButton> TitleButtons { get; }
         List<IModLayoutButton> LayoutButtons { get; }
         List<IModPromptButton> PromptButtons { get; }
 
         [Obsolete("Use GetTitleButton instead")]
-        IModTitleButton GetButton(string title);
-        IModTitleButton GetTitleButton(string title);
+        IModButton GetButton(string title);
+        IModButton GetTitleButton(string title);
         IModPromptButton GetPromptButton(string title);
 
         IModButton AddButton(IModButton button);
         IModButton AddButton(IModButton button, int index);
+        IModButtonBase AddButton(IModButtonBase button);
+        IModButtonBase AddButton(IModButtonBase button, int index);
 
         List<IModToggleInput> ToggleInputs { get; }
         IModToggleInput GetToggleInput(string title);
diff --git a/OWML.Common/Menus/IModOWMenu.cs b/OWML.Common/Menus/IModOWMenu.cs
index d53802826..b4f1cfea4 100644
--- a/OWML.Common/Menus/IModOWMenu.cs
+++ b/OWML.Common/Menus/IModOWMenu.cs
@@ -3,7 +3,7 @@
     public interface IModOWMenu : IModMenu
     {
         IModTabbedMenu OptionsMenu { get; }
-        IModTitleButton OptionsButton { get; }
-        IModTitleButton QuitButton { get; }
+        IModButton OptionsButton { get; }
+        IModButton QuitButton { get; }
     }
 }
diff --git a/OWML.Common/Menus/IModPauseMenu.cs b/OWML.Common/Menus/IModPauseMenu.cs
index 0f58cd8f8..23e541bad 100644
--- a/OWML.Common/Menus/IModPauseMenu.cs
+++ b/OWML.Common/Menus/IModPauseMenu.cs
@@ -2,7 +2,10 @@
 {
     public interface IModPauseMenu : IModPopupMenu, IModOWMenu
     {
-        IModTitleButton ResumeButton { get; }
+        new IModTabbedMenu OptionsMenu { get; }
+        new IModButton OptionsButton { get; }
+        new IModButton QuitButton { get; }
+        IModButton ResumeButton { get; }
 
         void Initialize(SettingsManager settingsManager);
     }
diff --git a/OWML.Common/Menus/IModPromptButton.cs b/OWML.Common/Menus/IModPromptButton.cs
index b34781552..5cf4760c8 100644
--- a/OWML.Common/Menus/IModPromptButton.cs
+++ b/OWML.Common/Menus/IModPromptButton.cs
@@ -1,6 +1,6 @@
 namespace OWML.Common.Menus
 {
-    public interface IModPromptButton : IModTitleButton
+    public interface IModPromptButton : IModButton
     {
         string DefaultTitle { get; }
         ScreenPrompt Prompt { get; set; }
diff --git a/OWML.Common/Menus/IModTitleButton.cs b/OWML.Common/Menus/IModTitleButton.cs
deleted file mode 100644
index 075b208d7..000000000
--- a/OWML.Common/Menus/IModTitleButton.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace OWML.Common.Menus
-{
-    public interface IModTitleButton : IModButton
-    {
-        string Title { get; set; }
-
-        new IModTitleButton Copy();
-        IModTitleButton Copy(string title);
-        IModTitleButton Copy(string title, int index);
-
-        IModTitleButton Duplicate(string title);
-        IModTitleButton Duplicate(string title, int index);
-
-        IModTitleButton Replace(string title);
-        IModTitleButton Replace(string title, int index);
-    }
-}
\ No newline at end of file
diff --git a/OWML.Common/Menus/IModToggleInput.cs b/OWML.Common/Menus/IModToggleInput.cs
index cf0fb7363..de5283868 100644
--- a/OWML.Common/Menus/IModToggleInput.cs
+++ b/OWML.Common/Menus/IModToggleInput.cs
@@ -3,8 +3,8 @@
     public interface IModToggleInput : IModInput<bool>
     {
         TwoButtonToggleElement Toggle { get; }
-        IModTitleButton YesButton { get; }
-        IModTitleButton NoButton { get; }
+        IModButton YesButton { get; }
+        IModButton NoButton { get; }
         IModToggleInput Copy();
         IModToggleInput Copy(string key);
     }
diff --git a/OWML.Common/OWML.Common.csproj b/OWML.Common/OWML.Common.csproj
index 2c31480bb..caebcf639 100644
--- a/OWML.Common/OWML.Common.csproj
+++ b/OWML.Common/OWML.Common.csproj
@@ -49,13 +49,13 @@
     <Compile Include="Menus\IModInputCombinationMenu.cs" />
     <Compile Include="Menus\IModInputCombinationElement.cs" />
     <Compile Include="Menus\IModConfigMenuBase.cs" />
-    <Compile Include="Menus\IModButton.cs" />
+    <Compile Include="Menus\IModButtonBase.cs" />
     <Compile Include="Menus\IModLayoutButton.cs" />
     <Compile Include="Menus\IModComboInput.cs" />
     <Compile Include="Menus\IModOWMenu.cs" />
     <Compile Include="Menus\IModPromptButton.cs" />
     <Compile Include="Menus\InputType.cs" />
-    <Compile Include="Menus\IModTitleButton.cs" />
+    <Compile Include="Menus\IModButton.cs" />
     <Compile Include="IModConfig.cs" />
     <Compile Include="IModData.cs" />
     <Compile Include="Menus\IModConfigMenu.cs" />
diff --git a/OWML.ModHelper.Menus/ModButton.cs b/OWML.ModHelper.Menus/ModButtonBase.cs
similarity index 81%
rename from OWML.ModHelper.Menus/ModButton.cs
rename to OWML.ModHelper.Menus/ModButtonBase.cs
index 6fa0fc974..b0ea4b91f 100644
--- a/OWML.ModHelper.Menus/ModButton.cs
+++ b/OWML.ModHelper.Menus/ModButtonBase.cs
@@ -6,7 +6,7 @@
 
 namespace OWML.ModHelper.Menus
 {
-    public abstract class ModButton : IModButton
+    public abstract class ModButtonBase : IModButtonBase
     {
         public event Action OnClick;
 
@@ -27,7 +27,7 @@ public int Index
 
         private readonly UIStyleApplier _uIStyleApplier;
 
-        protected ModButton(Button button, IModMenu menu)
+        protected ModButtonBase(Button button, IModMenu menu)
         {
             _uIStyleApplier = button.GetComponent<UIStyleApplier>();
             Button = button;
@@ -35,11 +35,11 @@ protected ModButton(Button button, IModMenu menu)
             Initialize(menu);
         }
 
-        public IModButton Copy()
+        public IModButtonBase Copy()
         {
             var button = Object.Instantiate(Button);
             Object.Destroy(button.GetComponent<SubmitAction>());
-            var modButton = (IModButton)Activator.CreateInstance(GetType(), button, Menu);
+            var modButton = (IModButtonBase)Activator.CreateInstance(GetType(), button, Menu);
             modButton.Index = Index + 1;
             return modButton;
         }
@@ -49,35 +49,35 @@ public void Initialize(IModMenu menu)
             Menu = menu;
         }
 
-        public IModButton Copy(int index)
+        public IModButtonBase Copy(int index)
         {
             var copy = Copy();
             copy.Index = index;
             return copy;
         }
 
-        public IModButton Duplicate()
+        public IModButtonBase Duplicate()
         {
             var copy = Copy();
             Menu.AddButton(copy);
             return copy;
         }
 
-        public IModButton Duplicate(int index)
+        public IModButtonBase Duplicate(int index)
         {
             var dupe = Duplicate();
             dupe.Index = index;
             return dupe;
         }
 
-        public IModButton Replace()
+        public IModButtonBase Replace()
         {
             var duplicate = Duplicate();
             Hide();
             return duplicate;
         }
 
-        public IModButton Replace(int index)
+        public IModButtonBase Replace(int index)
         {
             var replacement = Replace();
             replacement.Index = index;
diff --git a/OWML.ModHelper.Menus/ModFieldInput.cs b/OWML.ModHelper.Menus/ModFieldInput.cs
index 7f77756f2..47d475de0 100644
--- a/OWML.ModHelper.Menus/ModFieldInput.cs
+++ b/OWML.ModHelper.Menus/ModFieldInput.cs
@@ -6,7 +6,7 @@ namespace OWML.ModHelper.Menus
 {
     public abstract class ModFieldInput<T> : ModPopupInput<T>, IModFieldInput<T>
     {
-        public IModTitleButton Button { get; }
+        public IModButton Button { get; }
 
         protected readonly IModInputMenu InputMenu;
 
diff --git a/OWML.ModHelper.Menus/ModLayoutButton.cs b/OWML.ModHelper.Menus/ModLayoutButton.cs
index 7b7385686..959e02a67 100644
--- a/OWML.ModHelper.Menus/ModLayoutButton.cs
+++ b/OWML.ModHelper.Menus/ModLayoutButton.cs
@@ -4,7 +4,7 @@
 
 namespace OWML.ModHelper.Menus
 {
-    public class ModLayoutButton : ModButton, IModLayoutButton
+    public class ModLayoutButton : ModButtonBase, IModLayoutButton
     {
         public IModLayoutManager Layout { get; }
 
diff --git a/OWML.ModHelper.Menus/ModMainMenu.cs b/OWML.ModHelper.Menus/ModMainMenu.cs
index a1f1532ca..6d6ee75c1 100644
--- a/OWML.ModHelper.Menus/ModMainMenu.cs
+++ b/OWML.ModHelper.Menus/ModMainMenu.cs
@@ -10,12 +10,12 @@ public class ModMainMenu : ModMenu, IModMainMenu
     {
         public IModTabbedMenu OptionsMenu { get; }
 
-        public IModTitleButton ResumeExpeditionButton { get; private set; }
-        public IModTitleButton NewExpeditionButton { get; private set; }
-        public IModTitleButton OptionsButton { get; private set; }
-        public IModTitleButton ViewCreditsButton { get; private set; }
-        public IModTitleButton SwitchProfileButton { get; private set; }
-        public IModTitleButton QuitButton { get; private set; }
+        public IModButton ResumeExpeditionButton { get; private set; }
+        public IModButton NewExpeditionButton { get; private set; }
+        public IModButton OptionsButton { get; private set; }
+        public IModButton ViewCreditsButton { get; private set; }
+        public IModButton SwitchProfileButton { get; private set; }
+        public IModButton QuitButton { get; private set; }
 
         private TitleAnimationController _anim;
 
@@ -42,10 +42,10 @@ public void Initialize(TitleScreenManager titleScreenManager)
             InvokeOnInit();
         }
 
-        public override IModButton AddButton(IModButton button, int index)
+        public override IModButtonBase AddButton(IModButtonBase button, int index)
         {
             var modButton = base.AddButton(button, index);
-            var fadeControllers = TitleButtons.OrderBy(x => x.Index).Select(x => new CanvasGroupFadeController
+            var fadeControllers = Buttons.OrderBy(x => x.Index).Select(x => new CanvasGroupFadeController
             {
                 group = x.Button.GetComponent<CanvasGroup>()
             });
diff --git a/OWML.ModHelper.Menus/ModMenu.cs b/OWML.ModHelper.Menus/ModMenu.cs
index 9e1ead73c..71829b85a 100644
--- a/OWML.ModHelper.Menus/ModMenu.cs
+++ b/OWML.ModHelper.Menus/ModMenu.cs
@@ -15,15 +15,15 @@ public class ModMenu : IModMenu
         public event Action OnInit;
 
         public Menu Menu { get; protected set; }
-        public List<IModButton> Buttons { get; private set; }
+        public List<IModButtonBase> BaseButtons { get; private set; }
         public List<IModToggleInput> ToggleInputs { get; private set; }
         public List<IModSliderInput> SliderInputs { get; private set; }
         public List<IModTextInput> TextInputs { get; private set; }
         public List<IModComboInput> ComboInputs { get; private set; }
         public List<IModNumberInput> NumberInputs { get; private set; }
-        public List<IModTitleButton> TitleButtons => Buttons.OfType<IModTitleButton>().ToList();
-        public List<IModLayoutButton> LayoutButtons => Buttons.OfType<IModLayoutButton>().ToList();
-        public List<IModPromptButton> PromptButtons => Buttons.OfType<IModPromptButton>().ToList();
+        public List<IModButton> Buttons => BaseButtons.OfType<IModButton>().ToList();
+        public List<IModLayoutButton> LayoutButtons => BaseButtons.OfType<IModLayoutButton>().ToList();
+        public List<IModPromptButton> PromptButtons => BaseButtons.OfType<IModPromptButton>().ToList();
 
         protected LayoutGroup Layout;
         protected readonly IModConsole OwmlConsole;
@@ -46,10 +46,10 @@ public virtual void Initialize(Menu menu, LayoutGroup layoutGroup)
             Layout = layoutGroup;
 
             var promptButtons = Menu.GetComponentsInChildren<ButtonWithHotkeyImageElement>(true).Select(x => x.GetComponent<Button>());
-            Buttons = promptButtons.Select(x => new ModPromptButton(x, this)).Cast<IModButton>().ToList();
+            BaseButtons = promptButtons.Select(x => new ModPromptButton(x, this)).Cast<IModButtonBase>().ToList();
 
             var ordinaryButtons = Menu.GetComponentsInChildren<Button>(true).Except(promptButtons);
-            Buttons.AddRange(ordinaryButtons.Select(x => new ModTitleButton(x, this)).Cast<IModButton>().ToList());
+            BaseButtons.AddRange(ordinaryButtons.Select(x => new ModTitleButton(x, this)).Cast<IModButtonBase>().ToList());
 
             ToggleInputs = Menu.GetComponentsInChildren<TwoButtonToggleElement>(true).Select(x => new ModToggleInput(x, this)).Cast<IModToggleInput>().ToList();
             SliderInputs = Menu.GetComponentsInChildren<SliderElement>(true).Select(x => new ModSliderInput(x, this)).Cast<IModSliderInput>().ToList();
@@ -59,14 +59,14 @@ public virtual void Initialize(Menu menu, LayoutGroup layoutGroup)
         }
 
         [Obsolete("Use GetTitleButton instead")]
-        public IModTitleButton GetButton(string title)
+        public IModButton GetButton(string title)
         {
             return GetTitleButton(title);
         }
 
-        public IModTitleButton GetTitleButton(string title)
+        public IModButton GetTitleButton(string title)
         {
-            return GetTitleButton(title, TitleButtons);
+            return GetTitleButton(title, Buttons);
         }
 
         public IModPromptButton GetPromptButton(string title)
@@ -74,7 +74,7 @@ public IModPromptButton GetPromptButton(string title)
             return GetTitleButton(title, PromptButtons);
         }
 
-        private T GetTitleButton<T>(string title, List<T> buttons) where T : IModTitleButton
+        private T GetTitleButton<T>(string title, List<T> buttons) where T : IModButton
         {
             var button = buttons.FirstOrDefault(x => x.Title == title || x.Button.name == title);
             if (button == null)
@@ -93,7 +93,7 @@ public List<Button> GetButtons()
         [Obsolete("Use button.Duplicate instead")]
         public Button AddButton(string title, int index)
         {
-            var original = TitleButtons?.FirstOrDefault();
+            var original = Buttons?.FirstOrDefault();
             if (original == null)
             {
                 OwmlConsole.WriteLine("Warning: no buttons to copy");
@@ -108,19 +108,31 @@ public Button AddButton(string title, int index)
             return copy.Button;
         }
 
+        [Obsolete("use IModButtonBase")]
         public IModButton AddButton(IModButton button)
         {
             return AddButton(button, button.Index);
         }
 
+        [Obsolete("use IModButtonBase")]
         public virtual IModButton AddButton(IModButton button, int index)
+        {
+            return (IModButton)AddButton((IModButtonBase)button, index);
+        }
+
+        public IModButtonBase AddButton(IModButtonBase button)
+        {
+            return AddButton(button, button.Index);
+        }
+
+        public virtual IModButtonBase AddButton(IModButtonBase button, int index)
         {
             var transform = button.Button.transform;
             var scale = transform.localScale;
             transform.parent = Layout.transform;
             button.Index = index;
             button.Initialize(this);
-            Buttons.Add(button);
+            BaseButtons.Add(button);
             button.Button.transform.localScale = scale;
             return button;
         }
diff --git a/OWML.ModHelper.Menus/ModPauseMenu.cs b/OWML.ModHelper.Menus/ModPauseMenu.cs
index ed8c57017..b8adead6b 100644
--- a/OWML.ModHelper.Menus/ModPauseMenu.cs
+++ b/OWML.ModHelper.Menus/ModPauseMenu.cs
@@ -8,9 +8,9 @@ public class ModPauseMenu : ModPopupMenu, IModPauseMenu
     {
         public IModTabbedMenu OptionsMenu { get; }
 
-        public IModTitleButton ResumeButton { get; private set; }
-        public IModTitleButton OptionsButton { get; private set; }
-        public IModTitleButton QuitButton { get; private set; }
+        public IModButton ResumeButton { get; private set; }
+        public IModButton OptionsButton { get; private set; }
+        public IModButton QuitButton { get; private set; }
 
         public ModPauseMenu(IModConsole console) : base(console)
         {
diff --git a/OWML.ModHelper.Menus/ModPopupInput.cs b/OWML.ModHelper.Menus/ModPopupInput.cs
index f9a31bb22..359588e64 100644
--- a/OWML.ModHelper.Menus/ModPopupInput.cs
+++ b/OWML.ModHelper.Menus/ModPopupInput.cs
@@ -46,7 +46,7 @@ private void SetupCommands()
             CommandListener.OnNewlyPressed += OnOpenCommand;
         }
 
-        protected void Subscribe(IModButton button)
+        protected void Subscribe(IModButtonBase button)
         {
             button.OnClick += Open;
         }
diff --git a/OWML.ModHelper.Menus/ModTitleButton.cs b/OWML.ModHelper.Menus/ModTitleButton.cs
index d4c58836e..a03c2a27f 100644
--- a/OWML.ModHelper.Menus/ModTitleButton.cs
+++ b/OWML.ModHelper.Menus/ModTitleButton.cs
@@ -4,7 +4,7 @@
 
 namespace OWML.ModHelper.Menus
 {
-    public class ModTitleButton : ModButton, IModTitleButton
+    public class ModTitleButton : ModButtonBase, IModButton
     {
         private readonly Text _text;
         public virtual string Title
@@ -22,49 +22,49 @@ public ModTitleButton(Button button, IModMenu menu) : base(button, menu)
             _text = Button.GetComponentInChildren<Text>();
         }
 
-        public new IModTitleButton Copy()
+        public new IModButton Copy()
         {
-            var button = (IModTitleButton)base.Copy();
+            var button = (IModButton)base.Copy();
             button.Title = Title;
             return button;
         }
 
-        public IModTitleButton Copy(string title)
+        public IModButton Copy(string title)
         {
             var copy = Copy();
             copy.Title = title;
             return copy;
         }
 
-        public IModTitleButton Copy(string title, int index)
+        public IModButton Copy(string title, int index)
         {
             var copy = Copy(title);
             copy.Index = index;
             return copy;
         }
 
-        public IModTitleButton Duplicate(string title)
+        public IModButton Duplicate(string title)
         {
-            var dupe = (IModTitleButton)Duplicate();
+            var dupe = (IModButton)Duplicate();
             dupe.Title = title;
             return dupe;
         }
 
-        public IModTitleButton Duplicate(string title, int index)
+        public IModButton Duplicate(string title, int index)
         {
             var dupe = Duplicate(title);
             dupe.Index = index;
             return dupe;
         }
 
-        public IModTitleButton Replace(string title)
+        public IModButton Replace(string title)
         {
-            var replacement = (IModTitleButton)Replace();
+            var replacement = (IModButton)Replace();
             replacement.Title = title;
             return replacement;
         }
 
-        public IModTitleButton Replace(string title, int index)
+        public IModButton Replace(string title, int index)
         {
             var replacement = Replace(title);
             replacement.Index = index;
diff --git a/OWML.ModHelper.Menus/ModToggleInput.cs b/OWML.ModHelper.Menus/ModToggleInput.cs
index 415de755b..47d8351fa 100644
--- a/OWML.ModHelper.Menus/ModToggleInput.cs
+++ b/OWML.ModHelper.Menus/ModToggleInput.cs
@@ -7,8 +7,8 @@ namespace OWML.ModHelper.Menus
 {
     public class ModToggleInput : ModInput<bool>, IModToggleInput
     {
-        public IModTitleButton YesButton { get; }
-        public IModTitleButton NoButton { get; }
+        public IModButton YesButton { get; }
+        public IModButton NoButton { get; }
 
         public TwoButtonToggleElement Toggle { get; }
         public override bool IsSelected => Toggle.GetValue<bool>("_amISelected");
diff --git a/OWML.ModHelper.Menus/ModsMenu.cs b/OWML.ModHelper.Menus/ModsMenu.cs
index 0fccc92a0..e52e3093a 100644
--- a/OWML.ModHelper.Menus/ModsMenu.cs
+++ b/OWML.ModHelper.Menus/ModsMenu.cs
@@ -17,7 +17,7 @@ public class ModsMenu : ModPopupMenu, IModsMenu
         private readonly List<IModConfigMenu> _modConfigMenus;
 
         private Transform _modMenuTemplate;
-        private IModTitleButton _modButtonTemplate;
+        private IModButton _modButtonTemplate;
         private readonly IModInputHandler _inputHandler;
 
         public ModsMenu(IModConsole console, IModMenus menus, IModInputHandler inputHandler) : base(console)
@@ -80,7 +80,7 @@ private void CreateModMenuTemplate(IModOWMenu mainMenu)
         private IModPopupMenu CreateModsMenu(IModTabbedMenu options)
         {
             var modsTab = options.InputTab.Copy("MODS");
-            modsTab.Buttons.ForEach(x => x.Hide());
+            modsTab.BaseButtons.ForEach(x => x.Hide());
             modsTab.Menu.GetComponentsInChildren<Selectable>(true).ToList().ForEach(x => x.gameObject.SetActive(false));
             modsTab.Menu.GetValue<TooltipDisplay>("_tooltipDisplay").GetComponent<Text>().color = Color.clear;
             options.AddTab(modsTab);
diff --git a/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj b/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj
index b83de5c01..706611fe1 100644
--- a/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj
+++ b/OWML.ModHelper.Menus/OWML.ModHelper.Menus.csproj
@@ -85,7 +85,7 @@
     <Compile Include="ModInputCombinationMenu.cs" />
     <Compile Include="ModInputCombinationPopup.cs" />
     <Compile Include="ModLayoutButton.cs" />
-    <Compile Include="ModButton.cs" />
+    <Compile Include="ModButtonBase.cs" />
     <Compile Include="ModConfigMenuBase.cs" />
     <Compile Include="ModTitleButton.cs" />
     <Compile Include="ModConfigMenu.cs" />