diff --git a/Dalamud/Game/Config/SystemConfigOption.cs b/Dalamud/Game/Config/SystemConfigOption.cs
index f7e3bd3f8..154992637 100644
--- a/Dalamud/Game/Config/SystemConfigOption.cs
+++ b/Dalamud/Game/Config/SystemConfigOption.cs
@@ -597,6 +597,20 @@ public enum SystemConfigOption
     [GameConfigOption("EnablePsFunction", ConfigType.UInt)]
     EnablePsFunction,
 
+    /// <summary>
+    /// System option with the internal name ActiveInstanceGuid.
+    /// This option is a String.
+    /// </summary>
+    [GameConfigOption("ActiveInstanceGuid", ConfigType.String)]
+    ActiveInstanceGuid,
+
+    /// <summary>
+    /// System option with the internal name ActiveProductGuid.
+    /// This option is a String.
+    /// </summary>
+    [GameConfigOption("ActiveProductGuid", ConfigType.String)]
+    ActiveProductGuid,
+
     /// <summary>
     /// System option with the internal name WaterWet.
     /// This option is a UInt.
@@ -996,6 +1010,27 @@ public enum SystemConfigOption
     [GameConfigOption("AutoChangeCameraMode", ConfigType.UInt)]
     AutoChangeCameraMode,
 
+    /// <summary>
+    /// System option with the internal name MsqProgress.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("MsqProgress", ConfigType.UInt)]
+    MsqProgress,
+
+    /// <summary>
+    /// System option with the internal name PromptConfigUpdate.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("PromptConfigUpdate", ConfigType.UInt)]
+    PromptConfigUpdate,
+
+    /// <summary>
+    /// System option with the internal name TitleScreenType.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("TitleScreenType", ConfigType.UInt)]
+    TitleScreenType,
+
     /// <summary>
     /// System option with the internal name AccessibilitySoundVisualEnable.
     /// This option is a UInt.
@@ -1059,6 +1094,13 @@ public enum SystemConfigOption
     [GameConfigOption("IdlingCameraAFK", ConfigType.UInt)]
     IdlingCameraAFK,
 
+    /// <summary>
+    /// System option with the internal name FirstConfigBackup.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("FirstConfigBackup", ConfigType.UInt)]
+    FirstConfigBackup,
+
     /// <summary>
     /// System option with the internal name MouseSpeed.
     /// This option is a Float.
@@ -1436,46 +1478,4 @@ public enum SystemConfigOption
     /// </summary>
     [GameConfigOption("PadButton_R3", ConfigType.String)]
     PadButton_R3,
-
-    /// <summary>
-    /// System option with the internal name ActiveInstanceGuid.
-    /// This option is a String.
-    /// </summary>
-    [GameConfigOption("ActiveInstanceGuid", ConfigType.String)]
-    ActiveInstanceGuid,
-
-    /// <summary>
-    /// System option with the internal name ActiveProductGuid.
-    /// This option is a String.
-    /// </summary>
-    [GameConfigOption("ActiveProductGuid", ConfigType.String)]
-    ActiveProductGuid,
-
-    /// <summary>
-    /// System option with the internal name MsqProgress.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("MsqProgress", ConfigType.UInt)]
-    MsqProgress,
-
-    /// <summary>
-    /// System option with the internal name PromptConfigUpdate.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("PromptConfigUpdate", ConfigType.UInt)]
-    PromptConfigUpdate,
-
-    /// <summary>
-    /// System option with the internal name TitleScreenType.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("TitleScreenType", ConfigType.UInt)]
-    TitleScreenType,
-
-    /// <summary>
-    /// System option with the internal name FirstConfigBackup.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("FirstConfigBackup", ConfigType.UInt)]
-    FirstConfigBackup,
 }
diff --git a/Dalamud/Game/Config/UiConfigOption.cs b/Dalamud/Game/Config/UiConfigOption.cs
index 53e64c89f..1a59b8945 100644
--- a/Dalamud/Game/Config/UiConfigOption.cs
+++ b/Dalamud/Game/Config/UiConfigOption.cs
@@ -37,6 +37,13 @@ public enum UiConfigOption
     [GameConfigOption("BattleEffectPvPEnemyPc", ConfigType.UInt)]
     BattleEffectPvPEnemyPc,
 
+    /// <summary>
+    /// UiConfig option with the internal name PadMode.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("PadMode", ConfigType.UInt)]
+    PadMode,
+
     /// <summary>
     /// UiConfig option with the internal name WeaponAutoPutAway.
     /// This option is a UInt.
@@ -114,14 +121,6 @@ public enum UiConfigOption
     [GameConfigOption("LockonDefaultZoom", ConfigType.Float)]
     LockonDefaultZoom,
 
-    /// <summary>
-    /// UiConfig option with the internal name LockonDefaultZoom_179.
-    /// This option is a Float.
-    /// </summary>
-    [Obsolete("This option won't work. Use LockonDefaultZoom.", true)]
-    [GameConfigOption("LockonDefaultZoom_179", ConfigType.Float)]
-    LockonDefaultZoom_179,
-
     /// <summary>
     /// UiConfig option with the internal name CameraProductionOfAction.
     /// This option is a UInt.
@@ -311,6 +310,27 @@ public enum UiConfigOption
     [GameConfigOption("RightClickExclusionMinion", ConfigType.UInt)]
     RightClickExclusionMinion,
 
+    /// <summary>
+    /// UiConfig option with the internal name EnableMoveTiltCharacter.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("EnableMoveTiltCharacter", ConfigType.UInt)]
+    EnableMoveTiltCharacter,
+
+    /// <summary>
+    /// UiConfig option with the internal name EnableMoveTiltMountGround.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("EnableMoveTiltMountGround", ConfigType.UInt)]
+    EnableMoveTiltMountGround,
+
+    /// <summary>
+    /// UiConfig option with the internal name EnableMoveTiltMountFly.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("EnableMoveTiltMountFly", ConfigType.UInt)]
+    EnableMoveTiltMountFly,
+
     /// <summary>
     /// UiConfig option with the internal name TurnSpeed.
     /// This option is a UInt.
@@ -1130,6 +1150,27 @@ public enum UiConfigOption
     [GameConfigOption("HotbarXHBEditEnable", ConfigType.UInt)]
     HotbarXHBEditEnable,
 
+    /// <summary>
+    /// UiConfig option with the internal name HotbarContentsAction2ReverseOperation.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("HotbarContentsAction2ReverseOperation", ConfigType.UInt)]
+    HotbarContentsAction2ReverseOperation,
+
+    /// <summary>
+    /// UiConfig option with the internal name HotbarContentsAction2ReturnInitialSlot.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("HotbarContentsAction2ReturnInitialSlot", ConfigType.UInt)]
+    HotbarContentsAction2ReturnInitialSlot,
+
+    /// <summary>
+    /// UiConfig option with the internal name HotbarContentsAction2ReverseRotate.
+    /// This option is a UInt.
+    /// </summary>
+    [GameConfigOption("HotbarContentsAction2ReverseRotate", ConfigType.UInt)]
+    HotbarContentsAction2ReverseRotate,
+
     /// <summary>
     /// UiConfig option with the internal name PlateType.
     /// This option is a UInt.
@@ -3572,32 +3613,4 @@ public enum UiConfigOption
     /// </summary>
     [GameConfigOption("PvPFrontlinesGCFree", ConfigType.UInt)]
     PvPFrontlinesGCFree,
-
-    /// <summary>
-    /// UiConfig option with the internal name PadMode.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("PadMode", ConfigType.UInt)]
-    PadMode,
-
-    /// <summary>
-    /// UiConfig option with the internal name EnableMoveTiltCharacter.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("EnableMoveTiltCharacter", ConfigType.UInt)]
-    EnableMoveTiltCharacter,
-
-    /// <summary>
-    /// UiConfig option with the internal name EnableMoveTiltMountGround.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("EnableMoveTiltMountGround", ConfigType.UInt)]
-    EnableMoveTiltMountGround,
-
-    /// <summary>
-    /// UiConfig option with the internal name EnableMoveTiltMountFly.
-    /// This option is a UInt.
-    /// </summary>
-    [GameConfigOption("EnableMoveTiltMountFly", ConfigType.UInt)]
-    EnableMoveTiltMountFly,
 }