diff --git a/src/widgets/common/DoubleCheckBox.cpp b/src/widgets/common/DoubleCheckBox.cpp
index 6bbd925fe..26445131c 100644
--- a/src/widgets/common/DoubleCheckBox.cpp
+++ b/src/widgets/common/DoubleCheckBox.cpp
@@ -22,12 +22,17 @@ DoubleCheckBox::DoubleCheckBox(const QString &text, QWidget *parent) :
 void DoubleCheckBox::init_display()
 {
     cb_one = new QCheckBox(this);
-    connect(cb_one, &QCheckBox::toggled, this, &DoubleCheckBox::box1_toggled);
+    connect(cb_one, &QCheckBox::toggled, this, &DoubleCheckBox::box1Toggled);
 
     cb_two = new QCheckBox(this);
-    connect(cb_two, &QCheckBox::toggled, this, &DoubleCheckBox::box2_toggled);
+    connect(cb_two, &QCheckBox::toggled, this, &DoubleCheckBox::box2Toggled);
     label = new QLabel(this);
 
+    // TODO: remove for 2.0
+    connect(cb_one, &QCheckBox::toggled, this, &DoubleCheckBox::box1_toggled);
+    // TODO: remove for 2.0
+    connect(cb_two, &QCheckBox::toggled, this, &DoubleCheckBox::box2_toggled);
+
     auto boxLayout = new QHBoxLayout;
     boxLayout->addWidget(cb_one);
     boxLayout->addWidget(cb_two);
diff --git a/src/widgets/common/DoubleCheckBox.h b/src/widgets/common/DoubleCheckBox.h
index b3fdca9c8..03990bea7 100644
--- a/src/widgets/common/DoubleCheckBox.h
+++ b/src/widgets/common/DoubleCheckBox.h
@@ -11,6 +11,7 @@ class QLabel;
 
 /** \class DoubleCheckBox
  *  \brief one text two checkable boxes
+ *  \todo  remove deprecated Emits on ff7tk 2.0 release
  */
 class FF7TKQTWIDGETS_EXPORT DoubleCheckBox : public QWidget
 {
@@ -58,12 +59,14 @@ class FF7TKQTWIDGETS_EXPORT DoubleCheckBox : public QWidget
     /** \brief Signal: box1 has had its state changed
      *  \param checked checked state
      */
-    void box1_toggled(bool checked);
+    void box1Toggled(bool checked);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use DoubleCheckbox::box1Toggled") ]]void box1_toggled(bool checked);
 
     /** \brief Signal: box2 has had its state changed
      *  \param checked checked state
      */
-    void box2_toggled(bool checked);
+    void box2Toggled(bool checked);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use DoubleCheckbox::box2Toggled") ]]void box2_toggled(bool checked);
 private:
     void init_display();
     QCheckBox *cb_one = nullptr;
diff --git a/src/widgets/data/CharEditor.cpp b/src/widgets/data/CharEditor.cpp
index 7777029f7..2a800ee4c 100644
--- a/src/widgets/data/CharEditor.cpp
+++ b/src/widgets/data/CharEditor.cpp
@@ -23,7 +23,11 @@
 #include <FF7Item>
 #include <FF7Materia>
 #include <MateriaEditor>
-
+/**
+ * @brief CharEditor::CharEditor
+ * @param parent
+ * \todo Remove old signals for 2.0
+ */
 CharEditor::CharEditor(QWidget *parent)
     : QWidget(parent)
     , data(FF7CHAR())
@@ -1124,7 +1128,9 @@ void CharEditor::setLevel(int level)
     if (data.level == level)
         return;
     data.level = quint8(std::clamp(level, 0, 99));
-    Q_EMIT level_changed(qint8(data.level));
+    Q_EMIT levelChanged(data.level);
+    Q_EMIT levelChanged(qint8(data.level));
+/* Remove for 2.0 */Q_EMIT level_changed(qint8(data.level));
 }
 
 void CharEditor::cb_sadness_toggled(bool sad)
@@ -1156,7 +1162,8 @@ void CharEditor::setMaxHp(int maxHp)
     if (data.maxHP == maxHp)
         return;
     data.maxHP = quint16(std::clamp(maxHp, 0, qint16Max));
-    Q_EMIT maxHp_changed(data.maxHP);
+    Q_EMIT maxHpChanged(data.maxHP);
+/* Remove for 2.0 */Q_EMIT maxHp_changed(data.maxHP);
 }
 
 void CharEditor::setCurHp(int curHp)
@@ -1164,7 +1171,8 @@ void CharEditor::setCurHp(int curHp)
     if (data.curHP == curHp)
         return;
     data.curHP = quint16(std::clamp(curHp, 0, qint16Max));
-    Q_EMIT curHp_changed(data.curHP);
+    Q_EMIT curHpChanged(data.curHP);
+/* Remove for 2.0 */Q_EMIT curHp_changed(data.curHP);
 }
 
 void CharEditor::setMaxMp(int maxMp)
@@ -1172,7 +1180,8 @@ void CharEditor::setMaxMp(int maxMp)
     if (data.maxMP == maxMp)
         return;
     data.maxMP = quint16(std::clamp(maxMp, 0, qint16Max));
-    Q_EMIT maxMp_changed(data.maxMP);
+    Q_EMIT maxMpChanged(data.maxMP);
+/* Remove for 2.0 */Q_EMIT maxMp_changed(data.maxMP);
 }
 
 void CharEditor::setCurMp(int curMp)
@@ -1180,7 +1189,8 @@ void CharEditor::setCurMp(int curMp)
     if (data.curMP == curMp)
         return;
     data.curMP = quint16(std::clamp(curMp, 0, qint16Max));
-    Q_EMIT curMp_changed(data.curMP);
+    Q_EMIT curMpChanged(data.curMP);
+/* Remove for 2.0 */Q_EMIT curMp_changed(data.curMP);
 }
 
 void CharEditor::setKills(int kills)
@@ -1188,7 +1198,8 @@ void CharEditor::setKills(int kills)
     if (data.kills == kills)
         return;
     data.kills = quint16(std::clamp(kills, 0, quint16Max));
-    Q_EMIT kills_changed(data.kills);
+    Q_EMIT killsChanged(data.kills);
+/* Remove for 2.0 */Q_EMIT kills_changed(data.kills);
 }
 
 void CharEditor::setName(const QString &name)
@@ -1196,7 +1207,8 @@ void CharEditor::setName(const QString &name)
     if (_name == name)
         return;
     _name = name;
-    Q_EMIT name_changed(_name);
+    Q_EMIT nameChanged(_name);
+/* Remove for 2.0 */Q_EMIT name_changed(_name);
 }
 
 void CharEditor::setId(int id)
@@ -1211,7 +1223,8 @@ void CharEditor::setId(int id)
         data.id = quint8(id);
     setWeapon(0);
     setChar(data, lineName->text());
-    Q_EMIT id_changed(qint8(data.id));
+    Q_EMIT idChanged(qint8(data.id));
+/* Remove for 2.0 */Q_EMIT id_changed(qint8(data.id));
 }
 
 void CharEditor::setStr(int strength)
@@ -1219,7 +1232,8 @@ void CharEditor::setStr(int strength)
     if (data.strength == strength)
         return;
     data.strength = quint8(std::clamp(strength, 0, quint8Max));
-    Q_EMIT str_changed(data.strength);
+    Q_EMIT strengthChanged(data.strength);
+/* Remove for 2.0 */Q_EMIT str_changed(data.strength);
     calc_stats();
 }
 
@@ -1228,7 +1242,8 @@ void CharEditor::setVit(int vitality)
     if (data.vitality == vitality)
         return;
     data.vitality = quint8(std::clamp(vitality, 0, quint8Max));
-    Q_EMIT vit_changed(data.vitality);
+    Q_EMIT vitalityChanged(data.vitality);
+/* Remove for 2.0 */Q_EMIT vit_changed(data.vitality);
     calc_stats();
 }
 
@@ -1237,7 +1252,8 @@ void CharEditor::setMag(int magic)
     if (data.magic == magic)
         return;
     data.magic = quint8(std::clamp(magic, 0, quint8Max));
-    Q_EMIT mag_changed(data.magic);
+    Q_EMIT magicChanged(data.magic);
+/* Remove for 2.0 */Q_EMIT mag_changed(data.magic);
     calc_stats();
 }
 
@@ -1246,7 +1262,8 @@ void CharEditor::setMag(int magic)
     if (data.spirit == spirit)
         return;
     data.spirit = quint8(std::clamp(spirit, 0, quint8Max));
-    Q_EMIT spi_changed(data.spirit);
+    Q_EMIT spiritChanged(data.spirit);
+/* Remove for 2.0 */Q_EMIT spi_changed(data.spirit);
     calc_stats();
 }
 
@@ -1255,7 +1272,8 @@ void CharEditor::setDex(int dexterity)
     if (data.dexterity == dexterity)
         return;
     data.dexterity = quint8(std::clamp(dexterity, 0, quint8Max));
-    Q_EMIT dex_changed(data.dexterity);
+    Q_EMIT dexterityChanged(data.dexterity);
+/* Remove for 2.0 */Q_EMIT dex_changed(data.dexterity);
     calc_stats();
 }
 
@@ -1264,7 +1282,8 @@ void CharEditor::setLck(int luck)
     if (data.luck == luck)
         return;
     data.luck = quint8(std::clamp(luck, 0, quint8Max));
-    Q_EMIT lck_changed(data.luck);
+    Q_EMIT luckChanged(data.luck);
+/* Remove for 2.0 */Q_EMIT lck_changed(data.luck);
     calc_stats();
 }
 
@@ -1273,7 +1292,8 @@ void CharEditor::setStrBonus(int strength_bonus)
     if (data.strength_bonus == strength_bonus)
         return;
     data.strength_bonus = quint8(std::clamp(strength_bonus, 0, quint8Max));
-    Q_EMIT strBonus_changed(data.strength_bonus);
+    Q_EMIT strengthBonusChanged(data.strength_bonus);
+/* Remove for 2.0 */Q_EMIT strBonus_changed(data.strength_bonus);
     calc_stats();
 }
 
@@ -1282,7 +1302,8 @@ void CharEditor::setVitBonus(int vitality_bonus)
     if (data.vitality_bonus == vitality_bonus)
         return;
     data.vitality_bonus = quint8(std::clamp(vitality_bonus, 0, quint8Max));
-    Q_EMIT vitBonus_changed(data.vitality_bonus);
+    Q_EMIT vitalityBonusChanged(data.vitality_bonus);
+/* Remove for 2.0 */Q_EMIT vitBonus_changed(data.vitality_bonus);
     calc_stats();
 }
 
@@ -1291,7 +1312,8 @@ void CharEditor::setMagBonus(int magic_bonus)
     if (data.magic_bonus == magic_bonus)
         return;
     data.magic_bonus = quint8(std::clamp(magic_bonus, 0, quint8Max));
-    Q_EMIT magBonus_changed(data.magic_bonus);
+    Q_EMIT magicBonusChanged(data.magic_bonus);
+/* Remove for 2.0 */Q_EMIT magBonus_changed(data.magic_bonus);
     calc_stats();
 }
 
@@ -1300,7 +1322,8 @@ void CharEditor::setSpiBonus(int spirit_bonus)
     if (data.spirit_bonus == spirit_bonus)
         return;
     data.spirit_bonus = quint8(std::clamp(spirit_bonus, 0, quint8Max));
-    Q_EMIT spiBonus_changed(data.spirit_bonus);
+    Q_EMIT spiritBonusChanged(data.spirit_bonus);
+/* Remove for 2.0 */Q_EMIT spiBonus_changed(data.spirit_bonus);
     calc_stats();
 }
 
@@ -1309,7 +1332,8 @@ void CharEditor::setDexBonus(int dexterity_bonus)
     if (data.dexterity_bonus == dexterity_bonus)
         return;
     data.dexterity_bonus = quint8(std::clamp(dexterity_bonus, 0, quint8Max));
-    Q_EMIT dexBonus_changed(data.dexterity_bonus);
+    Q_EMIT dexterityBonusChanged(data.dexterity_bonus);
+/* Remove for 2.0 */Q_EMIT dexBonus_changed(data.dexterity_bonus);
     calc_stats();
 }
 
@@ -1318,7 +1342,8 @@ void CharEditor::setLckBonus(int luck_bonus)
     if (data.luck_bonus == luck_bonus)
         return;
     data.luck_bonus = quint8(std::clamp(luck_bonus, 0, quint8Max));
-    Q_EMIT lckBonus_changed(data.luck_bonus);
+    Q_EMIT luckBonusChanged(data.luck_bonus);
+/* Remove for 2.0 */Q_EMIT lckBonus_changed(data.luck_bonus);
     calc_stats();
 }
 
@@ -1327,7 +1352,8 @@ void CharEditor::setLimitLevel(int limitlevel)
     if (data.limitlevel == limitlevel)
         return;
     data.limitlevel = qint8(std::clamp(limitlevel, 0, 4));
-    Q_EMIT limitLevel_changed(data.limitlevel);
+    Q_EMIT limitLevelChanged(data.limitlevel);
+/* Remove for 2.0 */Q_EMIT limitLevel_changed(data.limitlevel);
 }
 
 void CharEditor::setLimitBar(int limitbar)
@@ -1335,7 +1361,8 @@ void CharEditor::setLimitBar(int limitbar)
     if (data.limitbar == limitbar)
         return;
     data.limitbar = quint8(std::clamp(limitbar, 0, quint8Max));
-    Q_EMIT limitBar_changed(data.limitbar);
+    Q_EMIT limitBarChanged(data.limitbar);
+/* Remove for 2.0 */Q_EMIT limitBar_changed(data.limitbar);
 }
 
 void CharEditor::setWeapon(int weapon)
@@ -1348,7 +1375,8 @@ void CharEditor::setWeapon(int weapon)
         data.weapon = quint8(FF7Char::numberOfWeapons(data.id) + FF7Char::weaponOffset(data.id));
     else
         data.weapon = quint8(weapon + FF7Char::weaponOffset(data.id));
-    Q_EMIT weapon_changed(data.weapon);
+    Q_EMIT weaponChanged(data.weapon);
+/* Remove for 2.0 */Q_EMIT weapon_changed(data.weapon);
 
     elemental_info();
     status_info();
@@ -1369,7 +1397,8 @@ void CharEditor::setArmor(int armor)
         data.armor = FF7Char::EmptyArmor;
     else
         data.armor = quint8(armor);
-    Q_EMIT armor_changed(data.armor);
+    Q_EMIT armorChanged(data.armor);
+/* Remove for 2.0 */Q_EMIT armor_changed(data.armor);
     elemental_info();
     status_info();
     update_materia_slots();
@@ -1388,7 +1417,8 @@ void CharEditor::setAccessory(int accessory)
         data.accessory = FF7Char::EmptyAccessory;
     else
         data.accessory = quint8(accessory);
-    Q_EMIT accessory_changed(data.accessory);
+    Q_EMIT accessoryChanged(data.accessory);
+/* Remove for 2.0 */Q_EMIT accessory_changed(data.accessory);
     elemental_info();
     status_info();
     calc_stats();
@@ -1403,7 +1433,8 @@ void CharEditor::setSadnessFury(int sad_fury)
         return;
 
     data.statusFlag = sad_fury;
-    Q_EMIT sadnessfury_changed(sad_fury);
+    Q_EMIT stateChanged(sad_fury);
+/* Remove for 2.0 */Q_EMIT sadnessfury_changed(sad_fury);
 }
 
 void CharEditor::setRow(bool front_row)
@@ -1417,7 +1448,8 @@ void CharEditor::setRow(bool front_row)
         data.rowFlag = FF7Char::FrontRow;
     else
         data.rowFlag = FF7Char::BackRow;
-    Q_EMIT row_changed(data.rowFlag);
+    Q_EMIT rowChanged(data.rowFlag);
+/* Remove for 2.0 */Q_EMIT row_changed(data.rowFlag);
 }
 
 void CharEditor::setLevelProgress(int level_progress)
@@ -1426,7 +1458,8 @@ void CharEditor::setLevelProgress(int level_progress)
     if (level_progress == data.tnlFlag)
         return;
     data.tnlFlag = quint8(std::clamp(level_progress, 0, 63));
-    Q_EMIT levelProgress_changed(data.tnlFlag);
+    Q_EMIT levelProgressChanged(data.tnlFlag);
+/* Remove for 2.0 */Q_EMIT levelProgress_changed(data.tnlFlag);
 }
 
 void CharEditor::setLimits(int limits)
@@ -1434,7 +1467,8 @@ void CharEditor::setLimits(int limits)
     if (limits == data.limits)
         return;
     data.limits = quint16(std::clamp(limits, 0, qint16Max));
-    Q_EMIT limits_changed(data.limits);
+    Q_EMIT limitsChanged(data.limits);
+/* Remove for 2.0 */Q_EMIT limits_changed(data.limits);
 }
 
 void CharEditor::setTimesused1(int timesused)
@@ -1442,7 +1476,8 @@ void CharEditor::setTimesused1(int timesused)
     if (timesused == data.timesused1)
         return;
     data.timesused1 = quint16(std::clamp(timesused, 0, quint16Max));
-    Q_EMIT timesused1_changed(data.timesused1);
+    Q_EMIT times1UsedChanged(data.timesused1);
+/* Remove for 2.0 */Q_EMIT timesused1_changed(data.timesused1);
 }
 
 void CharEditor::setTimesused2(int timesused)
@@ -1450,7 +1485,8 @@ void CharEditor::setTimesused2(int timesused)
     if (timesused == data.timesused2)
         return;
     data.timesused2 = quint16(std::clamp(timesused, 0, quint16Max));
-    Q_EMIT timesused2_changed(data.timesused2);
+    Q_EMIT times3UsedChanged(data.timesused2);
+/* Remove for 2.0 */Q_EMIT timesused2_changed(data.timesused2);
 }
 
 void CharEditor::setTimesused3(int timesused)
@@ -1458,7 +1494,8 @@ void CharEditor::setTimesused3(int timesused)
     if (timesused == data.timesused3)
         return;
     data.timesused3 = quint16(std::clamp(timesused, 0, quint16Max));
-    Q_EMIT timesused3_changed(data.timesused3);
+    Q_EMIT times3UsedChanged(data.timesused3);
+/* Remove for 2.0 */Q_EMIT timesused3_changed(data.timesused3);
 }
 
 void CharEditor::setBaseHp(int baseHp)
@@ -1466,7 +1503,8 @@ void CharEditor::setBaseHp(int baseHp)
     if (data.baseHP == baseHp)
         return;
     data.baseHP = quint16(std::clamp(baseHp, 0, qint16Max));
-    Q_EMIT baseHp_changed(data.baseHP);
+    Q_EMIT baseHpChanged(data.baseHP);
+/* Remove for 2.0 */Q_EMIT baseHp_changed(data.baseHP);
     calc_stats();
 }
 
@@ -1475,7 +1513,8 @@ void CharEditor::setBaseMp(int baseMp)
     if (data.baseMP == baseMp)
         return;
     data.baseMP = quint16(std::clamp(baseMp, 0, qint16Max));
-    Q_EMIT baseMp_changed(data.baseMP);
+    Q_EMIT baseMpChanged(data.baseMP);
+/* Remove for 2.0 */Q_EMIT baseMp_changed(data.baseMP);
     calc_stats();
 }
 
@@ -1484,7 +1523,8 @@ void CharEditor::setExp(int exp)
     if (data.exp == quint32(exp))
         return;
     data.exp = std::clamp(exp, 0, expMax);
-    Q_EMIT exp_changed(data.exp);
+    Q_EMIT expChanged(data.exp);
+/* Remove for 2.0 */Q_EMIT exp_changed(data.exp);
 }
 
 void CharEditor::setExpNext(int expNext)
@@ -1492,7 +1532,8 @@ void CharEditor::setExpNext(int expNext)
     if (data.expNext == quint32(expNext))
         return;
     data.expNext = data.exp = std::clamp(expNext, 0, expMax);
-    Q_EMIT expNext_changed(data.expNext);
+    Q_EMIT expNextChanged(data.expNext);
+/* Remove for 2.0 */Q_EMIT expNext_changed(data.expNext);
 }
 
 void CharEditor::calc_limit_value(QModelIndex item)
@@ -2033,8 +2074,10 @@ void CharEditor::matId_changed(qint8 id)
     else
         data.materias[mslotsel].id = FF7Materia::EmptyId;
 
-    if (!load)
-        Q_EMIT Materias_changed(data.materias[mslotsel]);
+    if (!load) {
+        Q_EMIT materiaChanged(data.materias[mslotsel]);
+/* Remove for 2.0 */Q_EMIT Materias_changed(data.materias[mslotsel]);
+    }
     update_materia_slots();
 }
 void CharEditor::matAp_changed(qint32 ap)
@@ -2052,7 +2095,8 @@ void CharEditor::matAp_changed(qint32 ap)
         data.materias[mslotsel].ap[2] = quint8Max;
     }
     if (!load) {
-        Q_EMIT Materias_changed(data.materias[mslotsel]);
+        Q_EMIT materiaChanged(data.materias[mslotsel]);
+/* Remove for 2.0 */Q_EMIT Materias_changed(data.materias[mslotsel]);
     }
     update_materia_slots();
 }
@@ -2166,7 +2210,8 @@ void CharEditor::MaxEquip()
         data.materias[mslotsel].ap[2] = quint8Max;
 
         Q_EMIT mslotChanged(mslotsel);
-        Q_EMIT Materias_changed(data.materias[mslotsel]);
+        Q_EMIT materiaChanged(data.materias[mslotsel]);
+/* Remove for 2.0 */Q_EMIT Materias_changed(data.materias[mslotsel]);
     }
     update_materia_slots();
     cbFrontRow->setCheckState(Qt::Unchecked);
diff --git a/src/widgets/data/CharEditor.h b/src/widgets/data/CharEditor.h
index 5c2edf84f..1e99599aa 100644
--- a/src/widgets/data/CharEditor.h
+++ b/src/widgets/data/CharEditor.h
@@ -85,44 +85,272 @@ class FF7TKWIDGETS_EXPORT CharEditor : public QWidget
     void changeEvent(QEvent *e) override;
 
 signals:
-    void id_changed(qint8);
-    void level_changed(qint8);
-    void str_changed(quint8);
-    void vit_changed(quint8);
-    void mag_changed(quint8);
-    void spi_changed(quint8);
-    void dex_changed(quint8);
-    void lck_changed(quint8);
-    void strBonus_changed(quint8);
-    void vitBonus_changed(quint8);
-    void magBonus_changed(quint8);
-    void spiBonus_changed(quint8);
-    void dexBonus_changed(quint8);
-    void lckBonus_changed(quint8);
-    void limitLevel_changed(qint8);
-    void limitBar_changed(quint8);
-    void name_changed(QString);
-    void weapon_changed(quint8);
-    void armor_changed(quint8);
-    void accessory_changed(quint8);
-    void curHp_changed(quint16);
-    void maxHp_changed(quint16);
-    void curMp_changed(quint16);
-    void maxMp_changed(quint16);
-    void kills_changed(quint16);
-    void row_changed(quint8);
-    void levelProgress_changed(quint8);
-    void sadnessfury_changed(quint8);
-    void limits_changed(quint16);
-    void timesused1_changed(quint16);
-    void timesused2_changed(quint16);
-    void timesused3_changed(quint16);
-    void baseHp_changed(quint16);
-    void baseMp_changed(quint16);
-    void exp_changed(quint32);
-    void mslotChanged(int);
-    void Materias_changed(materia);
-    void expNext_changed(quint32);
+
+    /**
+     * @brief Emitted when the character's id changes
+     * @param id New Id of the character
+     */
+    void idChanged(qint8 id);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::idChanged") ]]void id_changed(qint8);
+
+    /**
+     * @brief Emitted when the character's level changes
+     * @param level New level of the character
+     */
+    void levelChanged(qint8 level);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::levelChanged") ]]void level_changed(qint8);
+
+    /**
+     * @brief Emitted when the character's strength changes
+     * @param strength New strength of the character
+     */
+    void strengthChanged(quint8 strength);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::strengthChanged") ]]void str_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's vitality changes
+     * @param vitality New vitality of the character
+     */
+    void vitalityChanged(quint8 vitality);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::vitalityChanged") ]]void vit_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's magic changes
+     * @param magic New magic of the character
+     */
+    void magicChanged(quint8 magic);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::magicChanged") ]]void mag_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's spirit changes
+     * @param spirit New spirit of the character
+     */
+    void spiritChanged(quint8 spirit);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::spiritChanged") ]]void spi_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's dexterity changes
+     * @param dexterity New dexterity of the character
+     */
+    void dexterityChanged(quint8 dexterity);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::dexterityChanged") ]]void dex_changed(quint8);
+    /**
+     * @brief Emitted when the character's luck changes
+     * @param luck New luck of the character
+     */
+    void luckChanged(quint8 luck);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::luckChanged") ]]void lck_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's strengthBonus changes
+     * @param strengthBonus New strengthBonus of the character
+     */
+    void strengthBonusChanged(quint8 strengthBonus);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::strengthBonusChanged") ]]void strBonus_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's vitalityBonus changes
+     * @param vitalityBonus New vitalityBonus of the character
+     */
+    void vitalityBonusChanged(quint8 vitalityBonus);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::vitalityBonusChanged") ]]void vitBonus_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's magicBonus changes
+     * @param magicBonus New magicBonus of the character
+     */
+    void magicBonusChanged(quint8 magicBonus);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::magicBonusChanged") ]]void magBonus_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's spiritBonus changes
+     * @param spiritBonus New spiritBonus of the character
+     */
+    void spiritBonusChanged(quint8 spiritBonus);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::spiritBonusChanged") ]]void spiBonus_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's dexterityBonus changes
+     * @param dexterityBonus New dexterityBonus of the character
+     */
+    void dexterityBonusChanged(quint8 dexterityBonus);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::dexterityBonusChanged") ]]void dexBonus_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's luckBonus changes
+     * @param luckBonus New luckBonus of the character
+     */
+    void luckBonusChanged(quint8 luckBonus);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::luckBonusChanged") ]]void lckBonus_changed(quint8);
+
+
+    /**
+     * @brief Emitted when the character's limitLevel changes
+     * @param limitLevel New limitLevel of the character
+     */
+    void limitLevelChanged(qint8 limitLevel);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::limitLevelChanged") ]]void limitLevel_changed(qint8);
+
+    /**
+     * @brief Emitted when the character's limitBar changes
+     * @param limitBar New limitBar of the character
+     */
+    void limitBarChanged(qint8 limitBar);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::limitBarChanged") ]]void limitBar_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's name changes
+     * @param name New name of the character
+     */
+    void nameChanged(QString name);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::nameChanged") ]]void name_changed(QString);
+
+    /**
+     * @brief Emitted when the character's weapon changes
+     * @param weapon New weapon of the character
+     */
+    void weaponChanged(quint8 weapon);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::weaponChanged") ]]void weapon_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's armor changes
+     * @param armor New armor of the character
+     */
+    void armorChanged(quint8 armor);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::armorChanged") ]]void armor_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's accessory changes
+     * @param accessory New accessory of the character
+     */
+    void accessoryChanged(quint8 accessory);
+
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::accessoryChanged") ]]void accessory_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's current hit points changes
+     * @param curHp New current hit points of the character
+     */
+    void curHpChanged(quint16 curHp);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::curHpChanged") ]]void curHp_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's current maximum hit points changes
+     * @param maxHp New maximum hit points of the character
+     */
+    void maxHpChanged(quint16 maxHp);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::maxHpChanged") ]]void maxHp_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's current magic points changes
+     * @param curMp New current magic points of the character
+     */
+    void curMpChanged(quint16 curMp);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::curMpChanged") ]]void curMp_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's current maximum magic points changes
+     * @param maxMp New maximum magic points of the character
+     */
+    void maxMpChanged(quint16 maxMp);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::maxMpChanged") ]]void maxMp_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's kills changes
+     * @param kills New name of the character
+     */
+    void killsChanged(quint16 kills);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::killsChanged") ]]void kills_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's row changes
+     * @param row New row of the character
+     */
+    void rowChanged(quint8 row);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::rowChanged") ]]void row_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's levelProgress changes
+     * @param levelProgress New levelProgresss of the character
+     */
+    void levelProgressChanged(quint8 levelProgress);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::levelProgressChanged") ]]void levelProgress_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's sadness / fury state changes
+     * @param state New sadness / fury state of the character
+     */
+    void stateChanged(quint8 state);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::stateChanged") ]]void sadnessfury_changed(quint8);
+
+    /**
+     * @brief Emitted when the character's limits changes
+     * @param limits New limits of the character
+     */
+    void limitsChanged(quint16 limits);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::limitsChanged") ]]void limits_changed(quint16);
+
+    /**
+     * @brief Emitted when the number of times the character's used the 1-1 limit break changes
+     * @param times New times the character has used the 1-1 limit break
+     */
+    void times1UsedChanged(quint16 times);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::times1UsedChanged") ]]void timesused1_changed(quint16);
+
+    /**
+     * @brief Emitted when the number of times the character's used the 2-1 limit break changes
+     * @param times New times the character has used the 2-1 limit break
+     */
+    void times2UsedChanged(quint16 times);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::times2UsedChanged") ]]void timesused2_changed(quint16);
+
+    /**
+     * @brief Emitted when the number of times the character's used the 3-1 limit break changes
+     * @param times New times the character has used the 3-1 limit break
+     */
+    void times3UsedChanged(quint16 times);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::times3UsedChanged") ]]void timesused3_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's base hit points changes
+     * @param baseHp New base hit points of the character
+     */
+    void baseHpChanged(quint16 baseHp);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::baseHpChanged") ]]void baseHp_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's base magic points changes
+     * @param baseMp New base magic points of the character
+     */
+    void baseMpChanged(quint16 baseMp);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::baseMpChanged") ]]void baseMp_changed(quint16);
+
+    /**
+     * @brief Emitted when the character's experience changes
+     * @param exp New experience of the character
+     */
+    void expChanged(quint32 exp);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::expChanged") ]]void exp_changed(quint32);
+
+    /**
+     * @brief Emitted when the current materia slot being viwed changes
+     * @param mslot New materia slot being viewed
+     */
+    void mslotChanged(int mslot);
+
+    /**
+     * @brief Emitted when the character's materia changes
+     * @param mat New materia of the character (at the current mslot)
+     */
+    void materiaChanged(materia mat);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::materiaChanged") ]]void Materias_changed(materia);
+
+    /**
+     * @brief Emitted when the character's amount of experience needed to reach the next level changes
+     * @param expNext New amount of experience needed to reach the next level
+     */
+    void expNextChanged(quint32 expNext);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use CharEditor::expNextChanged") ]]void expNext_changed(quint32);
 
 public slots:
     void setAutoLevel(bool);
diff --git a/src/widgets/data/MenuListWidget.cpp b/src/widgets/data/MenuListWidget.cpp
index 8bf9b8c5d..66bfc1b71 100644
--- a/src/widgets/data/MenuListWidget.cpp
+++ b/src/widgets/data/MenuListWidget.cpp
@@ -198,48 +198,48 @@ void MenuListWidget::cb_save_two_toggled(bool checked)
 
 void MenuListWidget::connectAll()
 {
-    connect(cb_item, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_item_one_toggled);
-    connect(cb_item, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_item_two_toggled);
-    connect(cb_magic, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_magic_one_toggled);
-    connect(cb_magic, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_magic_two_toggled);
-    connect(cb_materia, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_materia_one_toggled);
-    connect(cb_materia, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_materia_two_toggled);
-    connect(cb_equip, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_equip_one_toggled);
-    connect(cb_equip, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_equip_two_toggled);
-    connect(cb_status, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_status_one_toggled);
-    connect(cb_status, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_status_two_toggled);
-    connect(cb_order, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_order_one_toggled);
-    connect(cb_order, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_order_two_toggled);
-    connect(cb_limit, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_limit_one_toggled);
-    connect(cb_limit, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_limit_two_toggled);
-    connect(cb_config, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_config_one_toggled);
-    connect(cb_config, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_config_two_toggled);
-    connect(cb_phs, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_phs_one_toggled);
-    connect(cb_phs, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_phs_two_toggled);
-    connect(cb_save, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_save_one_toggled);
-    connect(cb_save, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_save_two_toggled);
+    connect(cb_item, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_item_one_toggled);
+    connect(cb_item, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_item_two_toggled);
+    connect(cb_magic, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_magic_one_toggled);
+    connect(cb_magic, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_magic_two_toggled);
+    connect(cb_materia, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_materia_one_toggled);
+    connect(cb_materia, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_materia_two_toggled);
+    connect(cb_equip, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_equip_one_toggled);
+    connect(cb_equip, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_equip_two_toggled);
+    connect(cb_status, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_status_one_toggled);
+    connect(cb_status, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_status_two_toggled);
+    connect(cb_order, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_order_one_toggled);
+    connect(cb_order, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_order_two_toggled);
+    connect(cb_limit, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_limit_one_toggled);
+    connect(cb_limit, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_limit_two_toggled);
+    connect(cb_config, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_config_one_toggled);
+    connect(cb_config, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_config_two_toggled);
+    connect(cb_phs, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_phs_one_toggled);
+    connect(cb_phs, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_phs_two_toggled);
+    connect(cb_save, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_save_one_toggled);
+    connect(cb_save, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_save_two_toggled);
 }
 
 void MenuListWidget::disconnectAll()
 {
-    disconnect(cb_item, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_item_one_toggled);
-    disconnect(cb_item, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_item_two_toggled);
-    disconnect(cb_magic, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_magic_one_toggled);
-    disconnect(cb_magic, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_magic_two_toggled);
-    disconnect(cb_materia, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_materia_one_toggled);
-    disconnect(cb_materia, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_materia_two_toggled);
-    disconnect(cb_equip, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_equip_one_toggled);
-    disconnect(cb_equip, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_equip_two_toggled);
-    disconnect(cb_status, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_status_one_toggled);
-    disconnect(cb_status, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_status_two_toggled);
-    disconnect(cb_order, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_order_one_toggled);
-    disconnect(cb_order, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_order_two_toggled);
-    disconnect(cb_limit, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_limit_one_toggled);
-    disconnect(cb_limit, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_limit_two_toggled);
-    disconnect(cb_config, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_config_one_toggled);
-    disconnect(cb_config, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_config_two_toggled);
-    disconnect(cb_phs, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_phs_one_toggled);
-    disconnect(cb_phs, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_phs_two_toggled);
-    disconnect(cb_save, &DoubleCheckBox::box1_toggled, this, &MenuListWidget::cb_save_one_toggled);
-    disconnect(cb_save, &DoubleCheckBox::box2_toggled, this, &MenuListWidget::cb_save_two_toggled);
+    disconnect(cb_item, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_item_one_toggled);
+    disconnect(cb_item, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_item_two_toggled);
+    disconnect(cb_magic, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_magic_one_toggled);
+    disconnect(cb_magic, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_magic_two_toggled);
+    disconnect(cb_materia, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_materia_one_toggled);
+    disconnect(cb_materia, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_materia_two_toggled);
+    disconnect(cb_equip, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_equip_one_toggled);
+    disconnect(cb_equip, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_equip_two_toggled);
+    disconnect(cb_status, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_status_one_toggled);
+    disconnect(cb_status, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_status_two_toggled);
+    disconnect(cb_order, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_order_one_toggled);
+    disconnect(cb_order, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_order_two_toggled);
+    disconnect(cb_limit, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_limit_one_toggled);
+    disconnect(cb_limit, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_limit_two_toggled);
+    disconnect(cb_config, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_config_one_toggled);
+    disconnect(cb_config, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_config_two_toggled);
+    disconnect(cb_phs, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_phs_one_toggled);
+    disconnect(cb_phs, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_phs_two_toggled);
+    disconnect(cb_save, &DoubleCheckBox::box1Toggled, this, &MenuListWidget::cb_save_one_toggled);
+    disconnect(cb_save, &DoubleCheckBox::box2Toggled, this, &MenuListWidget::cb_save_two_toggled);
 }
diff --git a/src/widgets/data/PhsListWidget.cpp b/src/widgets/data/PhsListWidget.cpp
index 2fc127fe6..71d48b3dc 100644
--- a/src/widgets/data/PhsListWidget.cpp
+++ b/src/widgets/data/PhsListWidget.cpp
@@ -185,43 +185,43 @@ void PhsListWidget::cb_cid_visibleToggled(bool checked)
 
 void PhsListWidget::connectAll()
 {
-    connect(cb_cloud, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_cloud_allowedToggled);
-    connect(cb_cloud, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_cloud_visibleToggled);
-    connect(cb_barret, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_barret_allowedToggled);
-    connect(cb_barret, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_barret_visibleToggled);
-    connect(cb_tifa, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_tifa_allowedToggled);
-    connect(cb_tifa, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_tifa_visibleToggled);
-    connect(cb_aerith, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_aerith_allowedToggled);
-    connect(cb_aerith, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_aerith_visibleToggled);
-    connect(cb_red, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_red_allowedToggled);
-    connect(cb_red, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_red_visibleToggled);
-    connect(cb_yuffie, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_yuffie_allowedToggled);
-    connect(cb_yuffie, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_yuffie_visibleToggled);
-    connect(cb_cait, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_cait_allowedToggled);
-    connect(cb_cait, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_cait_visibleToggled);
-    connect(cb_vincent, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_vincent_allowedToggled);
-    connect(cb_vincent, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_vincent_visibleToggled);
-    connect(cb_cid, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_cid_allowedToggled);
-    connect(cb_cid, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_cid_visibleToggled);
+    connect(cb_cloud, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_cloud_allowedToggled);
+    connect(cb_cloud, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_cloud_visibleToggled);
+    connect(cb_barret, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_barret_allowedToggled);
+    connect(cb_barret, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_barret_visibleToggled);
+    connect(cb_tifa, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_tifa_allowedToggled);
+    connect(cb_tifa, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_tifa_visibleToggled);
+    connect(cb_aerith, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_aerith_allowedToggled);
+    connect(cb_aerith, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_aerith_visibleToggled);
+    connect(cb_red, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_red_allowedToggled);
+    connect(cb_red, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_red_visibleToggled);
+    connect(cb_yuffie, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_yuffie_allowedToggled);
+    connect(cb_yuffie, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_yuffie_visibleToggled);
+    connect(cb_cait, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_cait_allowedToggled);
+    connect(cb_cait, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_cait_visibleToggled);
+    connect(cb_vincent, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_vincent_allowedToggled);
+    connect(cb_vincent, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_vincent_visibleToggled);
+    connect(cb_cid, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_cid_allowedToggled);
+    connect(cb_cid, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_cid_visibleToggled);
 }
 void PhsListWidget::disconnectAll()
 {
-    disconnect(cb_cloud, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_cloud_allowedToggled);
-    disconnect(cb_cloud, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_cloud_visibleToggled);
-    disconnect(cb_barret, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_barret_allowedToggled);
-    disconnect(cb_barret, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_barret_visibleToggled);
-    disconnect(cb_tifa, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_tifa_allowedToggled);
-    disconnect(cb_tifa, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_tifa_visibleToggled);
-    disconnect(cb_aerith, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_aerith_allowedToggled);
-    disconnect(cb_aerith, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_aerith_visibleToggled);
-    disconnect(cb_red, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_red_allowedToggled);
-    disconnect(cb_red, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_red_visibleToggled);
-    disconnect(cb_yuffie, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_yuffie_allowedToggled);
-    disconnect(cb_yuffie, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_yuffie_visibleToggled);
-    disconnect(cb_cait, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_cait_allowedToggled);
-    disconnect(cb_cait, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_cait_visibleToggled);
-    disconnect(cb_vincent, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_vincent_allowedToggled);
-    disconnect(cb_vincent, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_vincent_visibleToggled);
-    disconnect(cb_cid, &DoubleCheckBox::box1_toggled, this, &PhsListWidget::cb_cid_allowedToggled);
-    disconnect(cb_cid, &DoubleCheckBox::box2_toggled, this, &PhsListWidget::cb_cid_visibleToggled);
+    disconnect(cb_cloud, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_cloud_allowedToggled);
+    disconnect(cb_cloud, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_cloud_visibleToggled);
+    disconnect(cb_barret, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_barret_allowedToggled);
+    disconnect(cb_barret, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_barret_visibleToggled);
+    disconnect(cb_tifa, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_tifa_allowedToggled);
+    disconnect(cb_tifa, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_tifa_visibleToggled);
+    disconnect(cb_aerith, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_aerith_allowedToggled);
+    disconnect(cb_aerith, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_aerith_visibleToggled);
+    disconnect(cb_red, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_red_allowedToggled);
+    disconnect(cb_red, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_red_visibleToggled);
+    disconnect(cb_yuffie, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_yuffie_allowedToggled);
+    disconnect(cb_yuffie, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_yuffie_visibleToggled);
+    disconnect(cb_cait, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_cait_allowedToggled);
+    disconnect(cb_cait, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_cait_visibleToggled);
+    disconnect(cb_vincent, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_vincent_allowedToggled);
+    disconnect(cb_vincent, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_vincent_visibleToggled);
+    disconnect(cb_cid, &DoubleCheckBox::box1Toggled, this, &PhsListWidget::cb_cid_allowedToggled);
+    disconnect(cb_cid, &DoubleCheckBox::box2Toggled, this, &PhsListWidget::cb_cid_visibleToggled);
 }
diff --git a/src/widgets/data/SlotPreview.cpp b/src/widgets/data/SlotPreview.cpp
index aff870d68..3135a7a08 100644
--- a/src/widgets/data/SlotPreview.cpp
+++ b/src/widgets/data/SlotPreview.cpp
@@ -22,17 +22,20 @@ SlotPreview::SlotPreview(int index, QWidget *parent)
     btn_remove = new QToolButton(this);
     btn_remove->setIcon(QIcon::fromTheme(QString("edit-clear"), QPixmap(":/common/edit-clear")));
     btn_remove->setToolTip(tr("Clear Slot"));
-    connect(btn_remove, &QToolButton::clicked, this, [this] { Q_EMIT btn_remove_clicked(m_index); });
+    connect(btn_remove, &QToolButton::clicked, this, [this] { Q_EMIT remove(m_index); });
+/* REMOVE FOR 2.0 */connect(btn_remove, &QToolButton::clicked, this, [this] { Q_EMIT btn_remove_clicked(m_index); });
 
     btn_copy = new QToolButton(this);
     btn_copy->setIcon(QIcon::fromTheme(QString("edit-copy"), QPixmap(":/common/edit-copy")));
     btn_copy->setToolTip(tr("Copy Slot"));
-    connect(btn_copy, &QToolButton::clicked, this, [this] { Q_EMIT btn_copy_clicked(m_index); });
+    connect(btn_copy, &QToolButton::clicked, this, [this] { Q_EMIT copy(m_index); });
+/* REMOVE FOR 2.0 */connect(btn_copy, &QToolButton::clicked, this, [this] { Q_EMIT btn_copy_clicked(m_index); });
 
     btn_paste = new QToolButton(this);
     btn_paste->setIcon(QIcon::fromTheme(QString("edit-paste"), QPixmap(":/common/edit-paste")));
     btn_paste->setToolTip(tr("Paste Into Slot"));
-    connect(btn_paste, &QToolButton::clicked, this, [this] { Q_EMIT btn_paste_clicked(m_index); });
+    connect(btn_paste, &QToolButton::clicked, this, [this] { Q_EMIT paste(m_index); });
+/* REMOVE FOR 2.0 */connect(btn_paste, &QToolButton::clicked, this, [this] { Q_EMIT btn_paste_clicked(m_index); });
 
     const QList<QToolButton*> buttons = findChildren<QToolButton *>();
 
diff --git a/src/widgets/data/SlotPreview.h b/src/widgets/data/SlotPreview.h
index b372d87f8..d24611736 100644
--- a/src/widgets/data/SlotPreview.h
+++ b/src/widgets/data/SlotPreview.h
@@ -42,10 +42,28 @@ class FF7TKWIDGETS_EXPORT SlotPreview : public QLabel
     void setPSXText(const QString &text);
 
 signals:
-    void clicked(int); /**< \brief Signal: User Clicked on preview, returns index of click */
-    void btn_remove_clicked(int); /**< \brief Signal: User Clicked on remove, returns index of click */
-    void btn_copy_clicked(int); /**< \brief Signal: User Clicked on copy, returns index of click */
-    void btn_paste_clicked(int); /**< \brief Signal: User Clicked on paste, returns index of click */
+    /**
+     *  \brief Signal: User Clicked on preview, returns index of click
+     */
+    void clicked(int);
+
+    /**
+     *  \brief Signal: User Clicked on remove, returns index of click
+    */
+    void remove(int);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use SlotPreview::remove") ]]void btn_remove_clicked(int);
+
+    /**
+      *  \brief Signal: User Clicked on copy, returns index of click
+     */
+    void copy(int);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use SlotPreview::copy") ]]void btn_copy_clicked(int);
+
+    /**
+     *  \brief Signal: User Clicked on paste, returns index of click
+    */
+    void paste(int);
+    [[ deprecated ("will be removed in ff7tk 2.0, Use SlotPreview::paste") ]]void btn_paste_clicked(int);
 
 protected:
     void mousePressEvent(QMouseEvent *ev);
diff --git a/src/widgets/data/SlotSelect.cpp b/src/widgets/data/SlotSelect.cpp
index cff110cb2..e09fcd2bc 100644
--- a/src/widgets/data/SlotSelect.cpp
+++ b/src/widgets/data/SlotSelect.cpp
@@ -171,9 +171,9 @@ void SlotSelect::setSlotPreview(int s)
     }
 
     connect(preview[s], &SlotPreview::clicked, this, &SlotSelect::button_clicked);
-    connect(preview[s], &SlotPreview::btn_remove_clicked, this, &SlotSelect::remove_slot);
-    connect(preview[s], &SlotPreview::btn_copy_clicked, this, &SlotSelect::copy_slot);
-    connect(preview[s], &SlotPreview::btn_paste_clicked, this, &SlotSelect::paste_slot);
+    connect(preview[s], &SlotPreview::remove, this, &SlotSelect::remove_slot);
+    connect(preview[s], &SlotPreview::copy, this, &SlotSelect::copy_slot);
+    connect(preview[s], &SlotPreview::paste, this, &SlotSelect::paste_slot);
 }
 
 void SlotSelect::newFile(void)