From afe2eea737d5df3e0ed2f72ae4bf7301c06c6f6d Mon Sep 17 00:00:00 2001
From: FlenarnTemp <68670981+FlenarnTemp@users.noreply.github.com>
Date: Tue, 13 Aug 2024 12:42:03 +0200
Subject: [PATCH] misc work here and there (#19)

* chore: Cleanup enum declaration.

* fix: Class override incorrect.

* oopsies

* fix: Missing import.

* fix: Misc. adjustments/comments.

* feat: Fix `ICallBack` class & add mising value in `InitDataRepairFailure`.

* fix: `ENUM_FORM_ID` used in `REX::EnumSet` incorrectly.

* chore: Enum value specifications.

* chore: Enum values declared all around.

---------

Co-authored-by: FalloutCascadia <54562300+FalloutCascadia@users.noreply.github.com>
---
 CommonLibF4/include/RE/Bethesda/Actor.h       | 211 ++---
 .../include/RE/Bethesda/ActorValueInfo.h      |  20 +-
 .../include/RE/Bethesda/BGSBaseAliases.h      |  16 +-
 .../include/RE/Bethesda/BGSCharacterTint.h    |  64 +-
 .../RE/Bethesda/BGSDefaultObjectManager.h     | 796 +++++++++---------
 CommonLibF4/include/RE/Bethesda/BGSHeadPart.h |  20 +-
 CommonLibF4/include/RE/Bethesda/BGSMod.h      |   4 +-
 .../include/RE/Bethesda/BGSPrimitive.h        |  12 +-
 .../include/RE/Bethesda/BGSSceneAction.h      |  32 +-
 .../include/RE/Bethesda/BGSTextureSet.h       |  10 +-
 CommonLibF4/include/RE/Bethesda/BSContainer.h |   4 +-
 CommonLibF4/include/RE/Bethesda/BSExtraData.h | 185 ++--
 CommonLibF4/include/RE/Bethesda/BSGraphics.h  |   2 +-
 .../RE/Bethesda/BSInputDeviceManager.h        |  12 +-
 .../include/RE/Bethesda/BSMTAManager.h        |   8 +-
 CommonLibF4/include/RE/Bethesda/BSModelDB.h   |   2 +-
 .../RE/Bethesda/BSResource/BSResourceEnums.h  |  24 +-
 .../RE/Bethesda/BSScript/ErrorLogger.h        |   8 +-
 .../include/RE/Bethesda/BSScript/IFunction.h  |  16 +-
 .../RE/Bethesda/BSScript/ObjectTypeInfo.h     |  10 +-
 .../include/RE/Bethesda/BSScript/Stack.h      |  24 +-
 .../RE/Bethesda/BSScript/StructTypeInfo.h     |   8 +-
 .../include/RE/Bethesda/BSScript/TypeInfo.h   |  36 +-
 .../include/RE/Bethesda/BSShaderMaterial.h    |  50 +-
 .../include/RE/Bethesda/BSShaderProperty.h    |  18 +-
 .../include/RE/Bethesda/BSTempEffect.h        |  24 +-
 CommonLibF4/include/RE/Bethesda/BSVisit.h     |   4 +-
 CommonLibF4/include/RE/Bethesda/Calendar.h    |  26 +-
 CommonLibF4/include/RE/Bethesda/ControlMap.h  |   4 +-
 CommonLibF4/include/RE/Bethesda/Events.h      |  78 +-
 .../include/RE/Bethesda/FormComponents.h      |  56 +-
 .../include/RE/Bethesda/GamePlayFormulas.h    |   4 +-
 CommonLibF4/include/RE/Bethesda/GameScript.h  |  62 +-
 CommonLibF4/include/RE/Bethesda/IMenu.h       | 115 +--
 CommonLibF4/include/RE/Bethesda/InputEvent.h  |  26 +-
 CommonLibF4/include/RE/Bethesda/Interface3D.h |  46 +-
 .../include/RE/Bethesda/MessageMenuManager.h  |  68 +-
 .../include/RE/Bethesda/PipboyInventoryData.h |  20 +-
 .../include/RE/Bethesda/PipboyManager.h       |   8 +-
 .../include/RE/Bethesda/PlayerControls.h      |   6 +-
 CommonLibF4/include/RE/Bethesda/Script.h      | 182 ++--
 CommonLibF4/include/RE/Bethesda/Sky.h         |  10 +-
 .../include/RE/Bethesda/TESBoundAnimObjects.h |  26 +-
 .../include/RE/Bethesda/TESBoundObjects.h     |  64 +-
 CommonLibF4/include/RE/Bethesda/TESCamera.h   |  28 +-
 .../include/RE/Bethesda/TESCondition.h        |  34 +-
 CommonLibF4/include/RE/Bethesda/TESForms.h    |  96 +--
 .../include/RE/Bethesda/TESObjectREFRs.h      |  58 +-
 CommonLibF4/include/RE/Bethesda/TESRace.h     |   8 +-
 CommonLibF4/include/RE/Bethesda/UIMessage.h   |  34 +-
 CommonLibF4/include/RE/Bethesda/UserEvents.h  |  78 +-
 CommonLibF4/include/RE/Bethesda/VATS.h        |   4 +-
 .../RE/Bethesda/bhkCharacterController.h      |  12 +-
 53 files changed, 1388 insertions(+), 1385 deletions(-)

diff --git a/CommonLibF4/include/RE/Bethesda/Actor.h b/CommonLibF4/include/RE/Bethesda/Actor.h
index c91fcfc6..d6f08d73 100644
--- a/CommonLibF4/include/RE/Bethesda/Actor.h
+++ b/CommonLibF4/include/RE/Bethesda/Actor.h
@@ -111,86 +111,87 @@ namespace RE
 
 	enum class ACTOR_CRITICAL_STAGE : std::int32_t
 	{
-		kNone,
-		kGooStart,
-		kGooEnd,
-		kDisintegrateStart,
-		kDisintegrateEnd,
-		kFreezeStart,
-		kFreezeEnd,
-		kCount
+		kNone = 0x0,
+		kGooStart = 0x1,
+		kGooEnd = 0x2,
+		kDisintegrateStart = 0x3,
+		kDisintegrateEnd = 0x4,
+		kFreezeStart = 0x5,
+		kFreezeEnd = 0x6,
+		kCount = 0x7
 	};
 
 	enum class ACTOR_LIFE_STATE : std::int32_t
 	{
-		kAlive,
-		kDying,
-		kDead,
-		kUnconscious,
-		kReanimate,
-		kRecycle,
-		kRestrained,
-		kEssentialDown,
-		kBleedout
+		kAlive = 0x0,
+		kDying = 0x1,
+		kDead = 0x2,
+		kUnconscious = 0x3,
+		kReanimate = 0x4,
+		kRecycle = 0x5,
+		kRestrained = 0x6,
+		kEssentialDown = 0x7,
+		kBleedout = 0x8
 	};
 
 	enum class ACTOR_LOS_LOCATION : std::int32_t
 	{
-		kNone,
-		kEye,
-		kHead,
-		kTorse,
-		kFeet,
-		kCount
+		kNone = 0x0,
+		kEye = 0x1,
+		kHead = 0x2,
+		kTorse = 0x3,
+		kFeet = 0x4,
+		kCount = 0x5
 	};
 
 	enum class PTYPE : std::int32_t
 	{
-		kExplore = 0,
-		kFollow = 1,
-		kEscore = 2,
-		kEat = 3,
-		kSleep = 4,
-		kWander = 5,
-		kTravel = 6,
-		kAccompany = 7,
-		kUseItemAt = 8,
-		kAmbush = 9,
-		kFleeNonCombat = 10,
-		kCastMagic = 11,
-		kSandbox = 12,
-		kPatrol = 13,
-		kGuard = 14,
-		kDialogue = 15,
-		kUseWeapon = 16,
-		kFind = 17,
-		kCustom = 18,
-		kTemplate = 19,
-		kActivate = 20,
-		kAlarm = 21,
-		kFlee = 22,
-		kTrespass = 23,
-		kSpectator = 24,
-		kGreet = 25,
-		kGetUp = 26,
-		kDoNothing = 27,
-		kInGameDialogue = 28,
-		kSurface = 29,
-		kSearchForAttacker = 30,
-		kAvoidReference = 31,
-		kBumpReaction = 32,
-		kGrenadeMineReaction = 33,
-		kStealWarning = 34,
-		kPickpocketWarning = 35,
-		kMovementBlocked = 36,
-		kVampireFeed = 37,
-		kCannibal = 38,
-		kLand = 39,
-		kUnused = 40,
-		kMountActor = 41,
-		kDismountActor = 42,
-		kClearMountPosition = 43,
-		kClearPowerArmorExit = 44,
+		kExplore = 0x0,
+		kFollow = 0x1,
+		kEscore = 0x2,
+		kEat = 0x3,
+		kSleep = 0x4,
+		kWander = 0x5,
+		kTravel = 0x6,
+		kAccompany = 0x7,
+		kUseItemAt = 0x8,
+		kAmbush = 0x9,
+		kFleeNonCombat = 0xA,
+		kCastMagic = 0xB,
+		kSandbox = 0xC,
+		kPatrol = 0xD,
+		kGuard = 0xE,
+		kDialogue = 0xF,
+		kUseWeapon = 0x10,
+		kFind = 0x11,
+		kCustom = 0x12,
+		kTemplate = 0x13,
+		kActivate = 0x14,
+		kAlarm = 0x15,
+		kFlee = 0x16,
+		kTrespass = 0x17,
+		kSpectator = 0x18,
+		kGreet = 0x19,
+		kGetUp = 0x1A,
+		kDoNothing = 0x1B,
+		kInGameDialogue = 0x1C,
+		kSurface = 0x1D,
+		kSearchForAttacker = 0x1E,
+		kAvoidReference = 0x1F,
+		kBumpReaction = 0x20,
+		kGrenadeMineReaction = 0x21,
+		kStealWarning = 0x22,
+		kPickpocketWarning = 0x23,
+		kMovementBlocked = 0x24,
+		kVampireFeed = 0x25,
+		kCannibal = 0x26,
+		kLand = 0x27,
+		kUnused = 0x28,
+		kMountActor = 0x29,
+		kDismountActor = 0x2A,
+		kClearMountPosition = 0x2B,
+		kClearPowerArmorExit = 0x2C,
+		kCount = 0x2D
 	};
 
 	struct MiddleLowProcessData
@@ -522,9 +523,9 @@ namespace RE
 
 	enum class WEAPON_CULL_TYPE
 	{
-		kGeneral,
-		kAnimation,
-		kWeaponSwitch,
+		kGeneral = 0x0,
+		kAnimation = 0x1,
+		kWeaponSwitch = 0x2,
 	};
 
 	class AITimer
@@ -729,46 +730,46 @@ namespace RE
 
 	enum class LIFE_STATE : std::uint32_t
 	{
-		kAlive,
-		kDying,
-		kDead,
-		kUnconscious,
-		kReanimate,
-		kRecycle,
-		kRestrained,
-		kEssentialDown,
-		kBleedout
+		kAlive = 0x0,
+		kDying = 0x1,
+		kDead = 0x2,
+		kUnconscious = 0x3,
+		kReanimate = 0x4,
+		kRecycle = 0x5,
+		kRestrained = 0x6,
+		kEssentialDown = 0x7,
+		kBleedout = 0x8
 	};
 
 	enum class WEAPON_STATE : std::uint32_t
 	{
-		kSheathed,
-		kWantToDraw,
-		kDrawing,
-		kDrawn,
-		kWantToSheathe,
-		kSheathing
+		kSheathed = 0x0,
+		kWantToDraw = 0x1,
+		kDrawing = 0x2,
+		kDrawn = 0x3,
+		kWantToSheathe = 0x4,
+		kSheathing = 0x5
 	};
 
 	enum class GUN_STATE : std::uint32_t
 	{
-		kDrawn,
-		kRelaxed,
-		kBlocked,
-		kAlert,
-		kReloading,
-		kThrowing,
-		kSighted,
-		kFire,
-		kFireSighted
+		kDrawn = 0x0,
+		kRelaxed = 0x1,
+		kBlocked = 0x2,
+		kAlert = 0x3,
+		kReloading = 0x4,
+		kThrowing = 0x5,
+		kSighted = 0x6,
+		kFire = 0x7,
+		kFireSighted = 0x8
 	};
 
 	enum class INTERACTING_STATE : std::uint32_t
 	{
-		kNotInteracting,
-		kWaitingToInteract,
-		kInteracting,
-		kWaitingToStopInteracting
+		kNotInteracting = 0x0,
+		kWaitingToInteract = 0x1,
+		kInteracting = 0x2,
+		kWaitingToStopInteracting = 0x3
 	};
 
 	class __declspec(novtable) ActorState :
@@ -913,12 +914,12 @@ namespace RE
 
 		enum class DETECTION_PRIORITY
 		{
-			kNone = 0,
-			kVeryLow = 1,
-			kLow = 2,
-			kNormal = 3,
-			kHigh = 4,
-			kCritical = 5,
+			kNone = 0x0,
+			kVeryLow = 0x1,
+			kLow = 0x2,
+			kNormal = 0x3,
+			kHigh = 0x4,
+			kCritical = 0x5,
 		};
 
 		// add
diff --git a/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h b/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h
index 26220a76..c62b7112 100644
--- a/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h
+++ b/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h
@@ -17,16 +17,16 @@ namespace RE
 	public:
 		enum class AVType
 		{
-			kDerivedAttribute,
-			kAttribute,
-			kSkill,
-			kAIAttribute,
-			kResistance,
-			kCondition,
-			kCharge,
-			kIntValue,
-			kVariable,
-			kResource
+			kDerivedAttribute = 0x0,
+			kAttribute = 0x1,
+			kSkill = 0x2,
+			kAIAttribute = 0x3,
+			kResistance = 0x4,
+			kCondition = 0x5,
+			kCharge = 0x6,
+			kIntValue = 0x7,
+			kVariable = 0x8,
+			kResource = 0x9
 		};
 
 		enum class Flags : std::int32_t
diff --git a/CommonLibF4/include/RE/Bethesda/BGSBaseAliases.h b/CommonLibF4/include/RE/Bethesda/BGSBaseAliases.h
index 0f5db7a4..3aae130f 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSBaseAliases.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSBaseAliases.h
@@ -73,14 +73,14 @@ namespace RE
 
 		enum class FILL_TYPE
 		{
-			kConditions,
-			kForced,
-			kFromAlias,
-			kFromEvent,
-			kCreated,
-			kFromExternal,
-			kUniqueActor,
-			kNearAlias,
+			kConditions = 0x0,
+			kForced = 0x1,
+			kFromAlias = 0x2,
+			kFromEvent = 0x3,
+			kCreated = 0x4,
+			kFromExternal = 0x5,
+			kUniqueActor = 0x6,
+			kNearAlias = 0x7,
 		};
 
 		struct GenericFillData
diff --git a/CommonLibF4/include/RE/Bethesda/BGSCharacterTint.h b/CommonLibF4/include/RE/Bethesda/BGSCharacterTint.h
index 57967fc4..063c54d0 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSCharacterTint.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSCharacterTint.h
@@ -14,12 +14,12 @@ namespace RE
 	{
 		enum BlendOp : std::uint32_t
 		{
-			kDefault = 0,
-			kMultiply = 1,
-			kOverlay = 2,
-			kSoftLight = 3,
-			kHardLight = 4,
-			kTotal = 5
+			kDefault = 0x0,
+			kMultiply = 0x1,
+			kOverlay = 0x2,
+			kSoftLight = 0x3,
+			kHardLight = 0x4,
+			kTotal = 0x5
 		};
 
 		enum EntryType : std::uint32_t
@@ -32,32 +32,32 @@ namespace RE
 
 		enum class EntrySlot
 		{
-			kForeheadMask,
-			kEyesMask,
-			kNoseMask,
-			kEarsMask,
-			kCheeksMask,
-			kMouthMask,
-			kNeckMask,
-			kLipColor,
-			kCheekColor,
-			kEyeliner,
-			kEyeSocketUpper,
-			kEyeSocketLower,
-			kSkinTone,
-			kPaint,
-			kLaughLines,
-			kCheekColorLower,
-			kNose,
-			kChin,
-			kNeck,
-			kForehead,
-			kDirt,
-			kScars,
-			kFaceDetail,
-			kBrow,
-			kWrinkles,
-			kBeard
+			kForeheadMask = 0x0,
+			kEyesMask = 0x1,
+			kNoseMask = 0x2,
+			kEarsMask = 0x3,
+			kCheeksMask = 0x4,
+			kMouthMask = 0x5,
+			kNeckMask = 0x6,
+			kLipColor = 0x7,
+			kCheekColor = 0x8,
+			kEyeliner = 0x9,
+			kEyeSocketUpper = 0xA,
+			kEyeSocketLower = 0xB,
+			kSkinTone = 0xC,
+			kPaint = 0xD,
+			kLaughLines = 0xE,
+			kCheekColorLower = 0xF,
+			kNose = 0x10,
+			kChin = 0x11,
+			kNeck = 0x12,
+			kForehead = 0x13,
+			kDirt = 0x14,
+			kScars = 0x15,
+			kFaceDetail = 0x16,
+			kBrow = 0x17,
+			kWrinkles = 0x18,
+			kBeard = 0x19
 		};
 
 		namespace Template
diff --git a/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h b/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h
index adbaf358..15ab225f 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSDefaultObjectManager.h
@@ -8,412 +8,412 @@ namespace RE
 {
 	enum class DEFAULT_OBJECT
 	{
-		kSittingAngleLimit = 1,
-		kAllowPlayerShout,
-		kGold,
-		kLockpick,
-		kSkeletonKey,
-		kPlayerFaction,
-		kGuardFaction,
-		kBattleMusic,
-		kDeathMusic,
-		kDungeonClearedMusic,
-		kPlayerVoiceMale,
-		kPlayerVoiceMaleChild,
-		kPlayerVoiceFemale,
-		kPlayerVoiceFemaleChild,
-		kEatPackageDefaultFood,
-		kVoiceEquip,
-		kPotionEquip,
-		kEveryActorAbility,
-		kCommandedActorAbility,
-		kDrugWearsOffImageSpace,
-		kFootstepSet,
-		kLandscapeMaterial,
-		kDragonLandZoneMarker,
-		kDragonCrashZoneMarker,
-		kCombatStyle,
-		kDefaultPackList,
-		kWaitForDialoguePackage,
-		kVirtualLocation,
-		kPersistAllLocation,
-		kPathingTestNPC,
-		kActionSwimStateChange,
-		kActionLook,
-		kActionLeftAttack,
-		kActionLeftReady,
-		kActionLeftRelease,
-		kActionLeftInterrupt,
-		kActionRightAttack,
-		kActionRightReady,
-		kActionRightRelease,
-		kActionRightInterrupt,
-		kActionDualAttack,
-		kActionDualRelease,
-		kActionActivate,
-		kActionJump,
-		kActionFall,
-		kActionLand,
-		kActionMantle,
-		kActionSneak,
-		kActionVoice,
-		kActionVoiceReady,
-		kActionVoiceRelease,
-		kActionVoiceInterrupt,
-		kActionIdle,
-		kActionSprintStart,
-		kActionSprintStop,
-		kActionDraw,
-		kActionSheath,
-		kActionLeftPowerAttack,
-		kActionRightPowerAttack,
-		kActionDualPowerAttack,
-		kActionLeftSyncAttack,
-		kActionRightSyncAttack,
-		kActionStaggerStart,
-		kActionBlockHit,
-		kActionBlockAnticipate,
-		kActionRecoil,
-		kActionLargeRecoil,
-		kActionBleedoutStart,
-		kActionBleedoutStop,
-		kActionIdleStop,
-		kActionWardHit,
-		kActionForceEquip,
-		kActionShieldChange,
-		kActionPathStart,
-		kActionPathEnd,
-		kActionLargeMovementDelta,
-		kActionFlyStart,
-		kActionFlyStop,
-		kActionHoverStart,
-		kActionHoverStop,
-		kActionBumpedInto,
-		kActionSummonedStart,
-		kActionDialogueTalking,
-		kActionDialogueListen,
-		kActionDialogueListenPositive,
-		kActionDialogueListenNegative,
-		kActionDialogueListenQuestion,
-		kActionDialogueListenNeutral,
-		kActionDialogueEnter,
-		kActionDialogueExit,
-		kActionDeath,
-		kActionDeathWait,
-		kActionIdleWarn,
-		kActionMoveStart,
-		kActionMoveStop,
-		kActionTurnRight,
-		kActionTurnLeft,
-		kActionTurnStop,
-		kActionMoveForward,
-		kActionMoveBackward,
-		kActionMoveLeft,
-		kActionMoveRight,
-		kActionKnockdown,
-		kActionGetUp,
-		kActionIdleStopInstant,
-		kActionRagdollInstant,
-		kActionWaterwalkStart,
-		kActionReload,
-		kActionBoltCharge,
-		kActionSighted,
-		kActionSightedRelease,
-		kActionMelee,
-		kActionFireSingle,
-		kActionFireCharge,
-		kActionFireChargeHold,
-		kActionFireAuto,
-		kActionFireEmpty,
-		kActionThrow,
-		kActionEnterCover,
-		kActionExitCover,
-		kActionCoverSprintStart,
-		kActionShuffle,
-		kActionPipboy,
-		kActionPipboyClose,
-		kActionPipboyZoom,
-		kActionPipboyStats,
-		kActionPipboyInventory,
-		kActionPipboyData,
-		kActionPipboyMap,
-		kActionPipboyTab,
-		kActionPipboyTabPrevious,
-		kActionPipboySelect,
-		kActionPipboyRadioOn,
-		kActionPipboyRadioOff,
-		kActionPipboyLoadHolotape,
-		kActionPipboyInspect,
-		kActionNonSupportContact,
-		kActionInteractionEnter,
-		kActionInteractionExit,
-		kActionInteractionExitAlternate,
-		kActionInteractionExitQuick,
-		kActionIntimidate,
-		kActionGunChargeStart,
-		kActionGunDown,
-		kActionGunRelaxed,
-		kActionGunAlert,
-		kActionGunReady,
-		kActionFlipThrow,
-		kActionEnterCombat,
-		kActionExitCombat,
-		kActionLimbCritical,
-		kActionEvade,
-		kActionDodge,
-		kActionAoEAttack,
-		kActionPanic,
-		kActionCower,
-		kActionTunnel,
-		kActionHide,
-		kPickupSoundGeneric,
-		kPutdownSoundGeneric,
-		kPickupSoundWeapon,
-		kPutdownSoundWeapon,
-		kPickupSoundArmor,
-		kPutdownSoundArmor,
-		kPickupSoundBook,
-		kPutdownSoundBook,
-		kPickupSoundIngredient,
-		kPutdownSoundIngredient,
-		kHarvestSound,
-		kHarvestFailedSound,
-		kWardBreakSound,
-		kWardAbsorbSound,
-		kWardDeflectSound,
-		kMagicFailSound,
-		kShoutFailSound,
-		kHeartbeatSoundFast,
-		kHeartbeatSoundSlow,
-		kImagespaceLowHealth,
-		kSoulCapturedSound,
-		kNoActivationSound,
-		kMapMenuLoopingSound,
-		kDialogueVoiceCategory,
-		kNonDialogueVoiceCategory,
-		kSFXToFadeInDialogueCategory,
-		kPauseDuringMenuCategoryFade,
-		kPauseDuringMenuCategoryImmediate,
-		kPauseDuringLoadingMenuCategory,
-		kMusicSoundCategory,
-		kStatsMuteCategory,
-		kStatsMusic,
-		kMasterSoundCategory,
-		kDialogueOutputModel3D,
-		kDialogueOutputModel2D,
-		kPlayersOutputModel1stPerson,
-		kPlayersOutputModel3rdPerson,
-		kInterfaceOutputModel,
-		kReverbType,
-		kUnderwaterLoopSound,
-		kUnderwaterReverbType,
-		kKeywordHorse,
-		kKeywordUndead,
-		kKeywordNPC,
+		kSittingAngleLimit = 0x1,
+		kAllowPlayerShout = 0x2,
+		kGold = 0x3,
+		kLockpick = 0x4,
+		kSkeletonKey = 0x5,
+		kPlayerFaction = 0x6,
+		kGuardFaction = 0x7,
+		kBattleMusic = 0x8,
+		kDeathMusic = 0x9,
+		kDungeonClearedMusic = 0xA,
+		kPlayerVoiceMale = 0xB,
+		kPlayerVoiceMaleChild = 0xC,
+		kPlayerVoiceFemale = 0xD,
+		kPlayerVoiceFemaleChild = 0xE,
+		kEatPackageDefaultFood = 0xF,
+		kVoiceEquip = 0x10,
+		kPotionEquip = 0x11,
+		kEveryActorAbility = 0x12,
+		kCommandedActorAbility = 0x13,
+		kDrugWearsOffImageSpace = 0x14,
+		kFootstepSet = 0x15,
+		kLandscapeMaterial = 0x16,
+		kDragonLandZoneMarker = 0x17,
+		kDragonCrashZoneMarker = 0x18,
+		kCombatStyle = 0x19,
+		kDefaultPackList = 0x1A,
+		kWaitForDialoguePackage = 0x1B,
+		kVirtualLocation = 0x1C,
+		kPersistAllLocation = 0x1D,
+		kPathingTestNPC = 0x1E,
+		kActionSwimStateChange = 0x1F,
+		kActionLook = 0x20,
+		kActionLeftAttack = 0x21,
+		kActionLeftReady = 0x22,
+		kActionLeftRelease = 0x23,
+		kActionLeftInterrupt = 0x24,
+		kActionRightAttack = 0x25,
+		kActionRightReady = 0x26,
+		kActionRightRelease = 0x27,
+		kActionRightInterrupt = 0x28,
+		kActionDualAttack = 0x29,
+		kActionDualRelease = 0x2A,
+		kActionActivate = 0x2B,
+		kActionJump = 0x2C,
+		kActionFall = 0x2D,
+		kActionLand = 0x2E,
+		kActionMantle = 0x2F,
+		kActionSneak = 0x30,
+		kActionVoice = 0x31,
+		kActionVoiceReady = 0x32,
+		kActionVoiceRelease = 0x33,
+		kActionVoiceInterrupt = 0x34,
+		kActionIdle = 0x35,
+		kActionSprintStart = 0x36,
+		kActionSprintStop = 0x37,
+		kActionDraw = 0x38,
+		kActionSheath = 0x39,
+		kActionLeftPowerAttack = 0x3A,
+		kActionRightPowerAttack = 0x3B,
+		kActionDualPowerAttack = 0x3C,
+		kActionLeftSyncAttack = 0x3D,
+		kActionRightSyncAttack = 0x3E,
+		kActionStaggerStart = 0x3F,
+		kActionBlockHit = 0x40,
+		kActionBlockAnticipate = 0x41,
+		kActionRecoil = 0x42,
+		kActionLargeRecoil = 0x43,
+		kActionBleedoutStart = 0x44,
+		kActionBleedoutStop = 0x45,
+		kActionIdleStop = 0x46,
+		kActionWardHit = 0x47,
+		kActionForceEquip = 0x48,
+		kActionShieldChange = 0x49,
+		kActionPathStart = 0x4A,
+		kActionPathEnd = 0x4B,
+		kActionLargeMovementDelta = 0x4C,
+		kActionFlyStart = 0x4D,
+		kActionFlyStop = 0x4E,
+		kActionHoverStart = 0x4F,
+		kActionHoverStop = 0x50,
+		kActionBumpedInto = 0x51,
+		kActionSummonedStart = 0x52,
+		kActionDialogueTalking = 0x53,
+		kActionDialogueListen = 0x54,
+		kActionDialogueListenPositive = 0x55,
+		kActionDialogueListenNegative = 0x56,
+		kActionDialogueListenQuestion = 0x57,
+		kActionDialogueListenNeutral = 0x58,
+		kActionDialogueEnter = 0x59,
+		kActionDialogueExit = 0x5A,
+		kActionDeath = 0x5B,
+		kActionDeathWait = 0x5C,
+		kActionIdleWarn = 0x5D,
+		kActionMoveStart = 0x5E,
+		kActionMoveStop = 0x5F,
+		kActionTurnRight = 0x60,
+		kActionTurnLeft = 0x61,
+		kActionTurnStop = 0x62,
+		kActionMoveForward = 0x63,
+		kActionMoveBackward = 0x64,
+		kActionMoveLeft = 0x65,
+		kActionMoveRight = 0x66,
+		kActionKnockdown = 0x67,
+		kActionGetUp = 0x68,
+		kActionIdleStopInstant = 0x69,
+		kActionRagdollInstant = 0x6A,
+		kActionWaterwalkStart = 0x6B,
+		kActionReload = 0x6C,
+		kActionBoltCharge = 0x6D,
+		kActionSighted = 0x6E,
+		kActionSightedRelease = 0x6F,
+		kActionMelee = 0x70,
+		kActionFireSingle = 0x71,
+		kActionFireCharge = 0x72,
+		kActionFireChargeHold = 0x73,
+		kActionFireAuto = 0x74,
+		kActionFireEmpty = 0x75,
+		kActionThrow = 0x76,
+		kActionEnterCover = 0x77,
+		kActionExitCover = 0x78,
+		kActionCoverSprintStart = 0x79,
+		kActionShuffle = 0x7A,
+		kActionPipboy = 0x7B,
+		kActionPipboyClose = 0x7C,
+		kActionPipboyZoom = 0x7D,
+		kActionPipboyStats = 0x7E,
+		kActionPipboyInventory = 0x7F,
+		kActionPipboyData = 0x80,
+		kActionPipboyMap = 0x81,
+		kActionPipboyTab = 0x82,
+		kActionPipboyTabPrevious = 0x83,
+		kActionPipboySelect = 0x84,
+		kActionPipboyRadioOn = 0x85,
+		kActionPipboyRadioOff = 0x86,
+		kActionPipboyLoadHolotape = 0x87,
+		kActionPipboyInspect = 0x88,
+		kActionNonSupportContact = 0x89,
+		kActionInteractionEnter = 0x8A,
+		kActionInteractionExit = 0x8B,
+		kActionInteractionExitAlternate = 0x8C,
+		kActionInteractionExitQuick = 0x8D,
+		kActionIntimidate = 0x8E,
+		kActionGunChargeStart = 0x8F,
+		kActionGunDown = 0x90,
+		kActionGunRelaxed = 0x91,
+		kActionGunAlert = 0x92,
+		kActionGunReady = 0x93,
+		kActionFlipThrow = 0x94,
+		kActionEnterCombat = 0x95,
+		kActionExitCombat = 0x96,
+		kActionLimbCritical = 0x97,
+		kActionEvade = 0x98,
+		kActionDodge = 0x99,
+		kActionAoEAttack = 0x9A,
+		kActionPanic = 0x9B,
+		kActionCower = 0x9C,
+		kActionTunnel = 0x9D,
+		kActionHide = 0x9E,
+		kPickupSoundGeneric = 0x9F,
+		kPutdownSoundGeneric = 0xA0,
+		kPickupSoundWeapon = 0xA1,
+		kPutdownSoundWeapon = 0xA2,
+		kPickupSoundArmor = 0xA3,
+		kPutdownSoundArmor = 0xA4,
+		kPickupSoundBook = 0xA5,
+		kPutdownSoundBook = 0xA6,
+		kPickupSoundIngredient = 0xA7,
+		kPutdownSoundIngredient = 0xA8,
+		kHarvestSound = 0xA9,
+		kHarvestFailedSound = 0xAA,
+		kWardBreakSound = 0xAB,
+		kWardAbsorbSound = 0xAC,
+		kWardDeflectSound = 0xAD,
+		kMagicFailSound = 0xAE,
+		kShoutFailSound = 0xAF,
+		kHeartbeatSoundFast = 0xB0,
+		kHeartbeatSoundSlow = 0xB1,
+		kImagespaceLowHealth = 0xB2,
+		kSoulCapturedSound = 0xB3,
+		kNoActivationSound = 0xB4,
+		kMapMenuLoopingSound = 0xB5,
+		kDialogueVoiceCategory = 0xB6,
+		kNonDialogueVoiceCategory = 0xB7,
+		kSFXToFadeInDialogueCategory = 0xB8,
+		kPauseDuringMenuCategoryFade = 0xB9,
+		kPauseDuringMenuCategoryImmediate = 0xBA,
+		kPauseDuringLoadingMenuCategory = 0xBB,
+		kMusicSoundCategory = 0xBC,
+		kStatsMuteCategory = 0xBD,
+		kStatsMusic = 0xBE,
+		kMasterSoundCategory = 0xBF,
+		kDialogueOutputModel3D = 0xC0,
+		kDialogueOutputModel2D = 0xC1,
+		kPlayersOutputModel1stPerson = 0xC2,
+		kPlayersOutputModel3rdPerson = 0xC3,
+		kInterfaceOutputModel = 0xC4,
+		kReverbType = 0xC5,
+		kUnderwaterLoopSound = 0xC6,
+		kUnderwaterReverbType = 0xC7,
+		kKeywordHorse = 0xC8,
+		kKeywordUndead = 0xC9,
+		kKeywordNPC = 0xCA,
 
-		kKeywordDummyObject = 204,
-		kKeywordUseGeometryEmitter,
-		kKeywordMustStop,
-		kMaleFaceTextureSetHead,
-		kMaleFaceTextureSetMouth,
-		kMaleFaceTextureSetEyes,
-		kFemaleFaceTextureSetHead,
-		kFemaleFaceTextureSetMouth,
-		kFemaleFaceTextureSetEyes,
-		kImageSpaceModifierForInventoryMenu,
-		kImageSpaceModifierForPipboyMenuInPowerArmor,
-		kPackageTemplate,
-		kMainMenuCell,
-		kDefaultMovementTypeDefault,
-		kDefaultMovementTypeSwim,
-		kDefaultMovementTypeFly,
-		kDefaultMovementTypeSneak,
-		kKeywordSpecialFurniture,
-		kKeywordFurnitureForces1stPerson,
-		kKeywordFurnitureForces3rdPerson,
-		kKeywordActivatorFurnitureNoPlayer,
-		kTelekinesisGrabSound,
-		kTelekinesisThrowSound,
-		kWorldMapWeather,
-		kHelpManualPC,
-		kHelpManualXBox,
-		kKeywordTypeAmmo,
-		kKeywordTypeArmor,
-		kKeywordTypeBook,
-		kKeywordTypeIngredient,
-		kKeywordTypeKey,
-		kKeywordTypeMisc,
-		kKeywordTypeSoulGem,
-		kKeywordTypeWeapon,
-		kKeywordTypePotion,
-		kBaseWeaponEnchantment,
-		kBaseArmorEnchantment,
-		kBasePotion,
-		kBasePoison,
-		kKeywordDragon,
-		kKeywordMovable,
-		kArtObjectAbsorbEffect,
-		kWeaponMaterialList,
-		kArmorMaterialList,
-		kKeywordDisallowEnchanting,
-		kFavortravelmarkerlocation,
-		kTeammateReadyWeapon,
-		kKeywordHoldLocation,
-		kKeywordCivilWarOwner,
-		kKeywordCivilWarNeutral,
-		kLocRefTypeCivilWarSoldier,
-		kKeywordClearableLocation,
-		kLocRefTypeResourceDestructible,
-		kFormListHairColorList,
-		kComplexSceneObject,
-		kKeywordReusableSoulGem,
-		kKeywordAnimal,
-		kKeywordDaedra,
-		kKeywordRobot,
-		kKeywordNirnroot,
-		kFightersGuildFaction,
-		kMagesGuildFaction,
-		kThievesGuildFaction,
-		kDarkBrotherhoodFaction,
-		kJarlFaction,
-		kBunnyFaction,
-		kPlayerIsVampireVariable,
+		kKeywordDummyObject = 0xCC,
+		kKeywordUseGeometryEmitter = 0xCD,
+		kKeywordMustStop = 0xCE,
+		kMaleFaceTextureSetHead = 0xCF,
+		kMaleFaceTextureSetMouth = 0xD0,
+		kMaleFaceTextureSetEyes = 0xD1,
+		kFemaleFaceTextureSetHead = 0xD2,
+		kFemaleFaceTextureSetMouth = 0xD3,
+		kFemaleFaceTextureSetEyes = 0xD4,
+		kImageSpaceModifierForInventoryMenu = 0xD5,
+		kImageSpaceModifierForPipboyMenuInPowerArmor = 0xD6,
+		kPackageTemplate = 0xD7,
+		kMainMenuCell = 0xD8,
+		kDefaultMovementTypeDefault = 0xD9,
+		kDefaultMovementTypeSwim = 0xDA,
+		kDefaultMovementTypeFly = 0xDB,
+		kDefaultMovementTypeSneak = 0xDC,
+		kKeywordSpecialFurniture = 0xDD,
+		kKeywordFurnitureForces1stPerson = 0xDE,
+		kKeywordFurnitureForces3rdPerson = 0xDF,
+		kKeywordActivatorFurnitureNoPlayer = 0xE0,
+		kTelekinesisGrabSound = 0xE1,
+		kTelekinesisThrowSound = 0xE2,
+		kWorldMapWeather = 0xE3,
+		kHelpManualPC = 0xE4,
+		kHelpManualXBox = 0xE5,
+		kKeywordTypeAmmo = 0xE6,
+		kKeywordTypeArmor = 0xE7,
+		kKeywordTypeBook = 0xE8,
+		kKeywordTypeIngredient = 0xE9,
+		kKeywordTypeKey = 0xEA,
+		kKeywordTypeMisc = 0xEB,
+		kKeywordTypeSoulGem = 0xEC,
+		kKeywordTypeWeapon = 0xED,
+		kKeywordTypePotion = 0xEE,
+		kBaseWeaponEnchantment = 0xEF,
+		kBaseArmorEnchantment = 0xF0,
+		kBasePotion = 0xF1,
+		kBasePoison = 0xF2,
+		kKeywordDragon = 0xF3,
+		kKeywordMovable = 0xF4,
+		kArtObjectAbsorbEffect = 0xF5,
+		kWeaponMaterialList = 0xF6,
+		kArmorMaterialList = 0xF7,
+		kKeywordDisallowEnchanting = 0xF8,
+		kFavortravelmarkerlocation = 0xF9,
+		kTeammateReadyWeapon = 0xFA,
+		kKeywordHoldLocation = 0xFB,
+		kKeywordCivilWarOwner = 0xFC,
+		kKeywordCivilWarNeutral = 0xFD,
+		kLocRefTypeCivilWarSoldier = 0xFE,
+		kKeywordClearableLocation = 0xFF,
+		kLocRefTypeResourceDestructible = 0x100,
+		kFormListHairColorList = 0x101,
+		kComplexSceneObject = 0x102,
+		kKeywordReusableSoulGem = 0x103,
+		kKeywordAnimal = 0x104,
+		kKeywordDaedra = 0x105,
+		kKeywordRobot = 0x106,
+		kKeywordNirnroot = 0x107,
+		kFightersGuildFaction = 0x108,
+		kMagesGuildFaction = 0x109,
+		kThievesGuildFaction = 0x10A,
+		kDarkBrotherhoodFaction = 0x10B,
+		kJarlFaction = 0x10C,
+		kBunnyFaction = 0x10D,
+		kPlayerIsVampireVariable = 0x10E,
 
-		kRoadMarker = 272,
-		kKeywordScaleActorTo10,
-		kKeywordVampire,
-		kKeywordForge,
-		kKeywordCookingPot,
-		kKeywordSmelter,
-		kKeywordTanningRack,
-		kHelpBasicLockpickingPC,
-		kHelpBasicLockpickingConsole,
-		kHelpBasicForging,
-		kHelpBasicCooking,
-		kHelpBasicSmelting,
-		kHelpBasicTanning,
-		kHelpBasicObjectCreation,
-		kHelpBasicEnchanting,
-		kHelpBasicSmithingWeapon,
-		kHelpBasicSmithingArmor,
-		kHelpBasicAlchemy,
-		kHelpBarter,
-		kHelpLevelingup,
-		kHelpSkillsMenu,
-		kHelpMapMenu,
-		kHelpJournal,
-		kHelpLowHealth,
-		kHelpLowMagicka,
-		kHelpLowStamina,
-		kHelpJail,
-		kHelpTeamateFavor,
-		kHelpWeaponCharge,
-		kHelpFavorites,
-		kKinectHelpFormList,
-		kImagespaceLoadscreen,
-		kKeywordWeaponMaterialDaedric,
-		kKeywordWeaponMaterialDraugr,
-		kKeywordWeaponMaterialDraugrHoned,
-		kKeywordWeaponMaterialDwarven,
-		kKeywordWeaponMaterialEbony,
-		kKeywordWeaponMaterialElven,
-		kKeywordWeaponMaterialFalmer,
-		kKeywordWeaponMaterialFalmerHoned,
-		kKeywordWeaponMaterialGlass,
-		kKeywordWeaponMaterialImperial,
-		kKeywordWeaponMaterialIron,
-		kKeywordWeaponMaterialOrcish,
-		kKeywordWeaponMaterialSteel,
-		kKeywordWeaponMaterialWood,
-		kKeywordWeaponTypeBoundArrow,
-		kKeywordArmorMaterialDaedric,
-		kKeywordArmorMaterialDragonplate,
-		kKeywordArmorMaterialDragonscale,
-		kKeywordArmorMaterialDragonbone,
-		kKeywordArmorMaterialDwarven,
-		kKeywordArmorMaterialEbony,
-		kKeywordArmorMaterialElven,
-		kKeywordArmorMaterialElvenSplinted,
-		kKeywordArmorMaterialFullLeather,
-		kKeywordArmorMaterialGlass,
-		kKeywordArmorMaterialHide,
-		kKeywordArmorMaterialImperial,
-		kKeywordArmorMaterialImperialHeavy,
-		kKeywordArmorMaterialImperialReinforced,
-		kKeywordArmorMaterialIron,
-		kKeywordArmorMaterialIronBanded,
-		kKeywordArmorMaterialOrcish,
-		kKeywordArmorMaterialScaled,
-		kKeywordArmorMaterialSteel,
-		kKeywordArmorMaterialSteelPlate,
-		kKeywordArmorMaterialStormcloak,
-		kKeywordArmorMaterialStudded,
-		kKeywordGenericCraftableKeyword01,
-		kKeywordGenericCraftableKeyword02,
-		kKeywordGenericCraftableKeyword03,
-		kKeywordGenericCraftableKeyword04,
-		kKeywordGenericCraftableKeyword05,
-		kKeywordGenericCraftableKeyword06,
-		kKeywordGenericCraftableKeyword07,
-		kKeywordGenericCraftableKeyword08,
-		kKeywordGenericCraftableKeyword09,
-		kKeywordGenericCraftableKeyword10,
-		kKeywordnullptrMOD,
-		kKeywordJewelry,
-		kKeywordCuirass,
-		kLocalMapHidePlane,
-		kSnowLODMaterial,
-		kSnowLODMaterialHD,
-		kDialogueImagespace,
-		kDialogueFollowerQuest,
-		kPotentialFollowerFaction,
+		kRoadMarker = 0x110,
+		kKeywordScaleActorTo10 = 0x111,
+		kKeywordVampire = 0x112,
+		kKeywordForge = 0x113,
+		kKeywordCookingPot = 0x114,
+		kKeywordSmelter = 0x115,
+		kKeywordTanningRack = 0x116,
+		kHelpBasicLockpickingPC = 0x117,
+		kHelpBasicLockpickingConsole = 0x118,
+		kHelpBasicForging = 0x119,
+		kHelpBasicCooking = 0x11A,
+		kHelpBasicSmelting = 0x11B,
+		kHelpBasicTanning = 0x11C,
+		kHelpBasicObjectCreation = 0x11D,
+		kHelpBasicEnchanting = 0x11E,
+		kHelpBasicSmithingWeapon = 0x11F,
+		kHelpBasicSmithingArmor = 0x120,
+		kHelpBasicAlchemy = 0x121,
+		kHelpBarter = 0x122,
+		kHelpLevelingup = 0x123,
+		kHelpSkillsMenu = 0x124,
+		kHelpMapMenu = 0x125,
+		kHelpJournal = 0x126,
+		kHelpLowHealth = 0x127,
+		kHelpLowMagicka = 0x128,
+		kHelpLowStamina = 0x129,
+		kHelpJail = 0x12A,
+		kHelpTeamateFavor = 0x12B,
+		kHelpWeaponCharge = 0x12C,
+		kHelpFavorites = 0x12D,
+		kKinectHelpFormList = 0x12E,
+		kImagespaceLoadscreen = 0x12F,
+		kKeywordWeaponMaterialDaedric = 0x130,
+		kKeywordWeaponMaterialDraugr = 0x131,
+		kKeywordWeaponMaterialDraugrHoned = 0x132,
+		kKeywordWeaponMaterialDwarven = 0x133,
+		kKeywordWeaponMaterialEbony = 0x134,
+		kKeywordWeaponMaterialElven = 0x135,
+		kKeywordWeaponMaterialFalmer = 0x136,
+		kKeywordWeaponMaterialFalmerHoned = 0x137,
+		kKeywordWeaponMaterialGlass = 0x138,
+		kKeywordWeaponMaterialImperial = 0x139,
+		kKeywordWeaponMaterialIron = 0x13A,
+		kKeywordWeaponMaterialOrcish = 0x13B,
+		kKeywordWeaponMaterialSteel = 0x13C,
+		kKeywordWeaponMaterialWood = 0x13D,
+		kKeywordWeaponTypeBoundArrow = 0x13E,
+		kKeywordArmorMaterialDaedric = 0x13F,
+		kKeywordArmorMaterialDragonplate = 0x140,
+		kKeywordArmorMaterialDragonscale = 0x141,
+		kKeywordArmorMaterialDragonbone = 0x142,
+		kKeywordArmorMaterialDwarven = 0x143,
+		kKeywordArmorMaterialEbony = 0x144,
+		kKeywordArmorMaterialElven = 0x145,
+		kKeywordArmorMaterialElvenSplinted = 0x146,
+		kKeywordArmorMaterialFullLeather = 0x147,
+		kKeywordArmorMaterialGlass = 0x148,
+		kKeywordArmorMaterialHide = 0x149,
+		kKeywordArmorMaterialImperial = 0x14A,
+		kKeywordArmorMaterialImperialHeavy = 0x14B,
+		kKeywordArmorMaterialImperialReinforced = 0x14C,
+		kKeywordArmorMaterialIron = 0x14D,
+		kKeywordArmorMaterialIronBanded = 0x14E,
+		kKeywordArmorMaterialOrcish = 0x14F,
+		kKeywordArmorMaterialScaled = 0x150,
+		kKeywordArmorMaterialSteel = 0x151,
+		kKeywordArmorMaterialSteelPlate = 0x152,
+		kKeywordArmorMaterialStormcloak = 0x153,
+		kKeywordArmorMaterialStudded = 0x154,
+		kKeywordGenericCraftableKeyword01 = 0x155,
+		kKeywordGenericCraftableKeyword02 = 0x156,
+		kKeywordGenericCraftableKeyword03 = 0x157,
+		kKeywordGenericCraftableKeyword04 = 0x158,
+		kKeywordGenericCraftableKeyword05 = 0x159,
+		kKeywordGenericCraftableKeyword06 = 0x15A,
+		kKeywordGenericCraftableKeyword07 = 0x15B,
+		kKeywordGenericCraftableKeyword08 = 0x15C,
+		kKeywordGenericCraftableKeyword09 = 0x15D,
+		kKeywordGenericCraftableKeyword10 = 0x15E,
+		kKeywordnullptrMOD = 0x15F,
+		kKeywordJewelry = 0x160,
+		kKeywordCuirass = 0x161,
+		kLocalMapHidePlane = 0x162,
+		kSnowLODMaterial = 0x163,
+		kSnowLODMaterialHD = 0x164,
+		kDialogueImagespace = 0x165,
+		kDialogueFollowerQuest = 0x166,
+		kPotentialFollowerFaction = 0x167,
 
-		kVampireAvailablePerks = 361,
+		kVampireAvailablePerks = 0x169,
 
-		kVampireRace = 363,
-		kVampireSpells,
-		kKeywordMount,
-		kVerletCape,
-		kFurnitureTestNPC,
-		kKeywordConditionalExplosion,
-		kDefaultLight1,
-		kDefaultLight2,
-		kDefaultLight3,
-		kDefaultLight4,
-		kPipboyLight,
-		kActionBeginLoopingActivate,
-		kActionEndLoopingActivate,
-		kWorkshopPlayerOwnership,
-		kQuestMarkerFollower,
-		kQuestMarkerLocation,
-		kQuestMarkerEnemy,
-		kQuestMarkerEnemyAbove,
-		kQuestMarkerEnemyBelow,
-		kWorkshopMiscItemKeyword,
-		kHeavyWeaponItemKeyword,
-		kMineItemKeyword,
-		kGrenadeItemKeyword,
-		kChemItemKeyword,
-		kAlcoholItemKeyword,
-		kFoodItemKeyword,
-		kRepairKitItemKeyword,
-		kMedbagitemKeyword,
-		kGlovesitemKeyword,
-		kHelmetitemkeyword,
-		kClothesitemkeyword,
+		kVampireRace = 0x16B,
+		kVampireSpells = 0x16C,
+		kKeywordMount = 0x16D,
+		kVerletCape = 0x16E,
+		kFurnitureTestNPC = 0x16F,
+		kKeywordConditionalExplosion = 0x170,
+		kDefaultLight1 = 0x171,
+		kDefaultLight2 = 0x172,
+		kDefaultLight3 = 0x173,
+		kDefaultLight4 = 0x174,
+		kPipboyLight = 0x175,
+		kActionBeginLoopingActivate = 0x176,
+		kActionEndLoopingActivate = 0x177,
+		kWorkshopPlayerOwnership = 0x178,
+		kQuestMarkerFollower = 0x179,
+		kQuestMarkerLocation = 0x17A,
+		kQuestMarkerEnemy = 0x17B,
+		kQuestMarkerEnemyAbove = 0x17C,
+		kQuestMarkerEnemyBelow = 0x17D,
+		kWorkshopMiscItemKeyword = 0x17E,
+		kHeavyWeaponItemKeyword = 0x17F,
+		kMineItemKeyword = 0x180,
+		kGrenadeItemKeyword = 0x181,
+		kChemItemKeyword = 0x182,
+		kAlcoholItemKeyword = 0x183,
+		kFoodItemKeyword = 0x184,
+		kRepairKitItemKeyword = 0x185,
+		kMedbagitemKeyword = 0x186,
+		kGlovesitemKeyword = 0x187,
+		kHelmetitemkeyword = 0x188,
+		kClothesitemkeyword = 0x189,
 
 		kTotal
 	};
 
 	enum class DEFAULT_OBJECT_TYPE
 	{
-		kMisc,
-		kFacegen,
-		kMovement,
-		kActions,
-		kItems,
-		kSounds,
-		kKeywords
+		kMisc = 0x0,
+		kFacegen = 0x1,
+		kMovement = 0x2,
+		kActions = 0x3,
+		kItems = 0x4,
+		kSounds = 0x5,
+		kKeywords = 0x6
 	};
 
 	struct DEFAULT_OBJECT_DATA
@@ -421,7 +421,7 @@ namespace RE
 	public:
 		// members
 		const char*                                     name;           // 00
-		REX::EnumSet<ENUM_FORM_ID, std::uint8_t>        type;           // 08
+		ENUM_FORM_ID									type;           // 08
 		std::uint32_t                                   uniqueID;       // 0C
 		REX::EnumSet<DEFAULT_OBJECT_TYPE, std::int32_t> doType;         // 10
 		const char*                                     newObjectName;  // 18
@@ -501,7 +501,7 @@ namespace RE
 
 		// members
 		TESForm*                                 form;          // 20
-		REX::EnumSet<ENUM_FORM_ID, std::uint8_t> type;          // 28
+		ENUM_FORM_ID							 type;          // 28
 		BSFixedString                            formEditorID;  // 30
 
 	private:
diff --git a/CommonLibF4/include/RE/Bethesda/BGSHeadPart.h b/CommonLibF4/include/RE/Bethesda/BGSHeadPart.h
index f226f88b..184a5cd5 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSHeadPart.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSHeadPart.h
@@ -30,16 +30,16 @@ namespace RE
 
 		enum class HeadPartType
 		{
-			kMisc,
-			kFace,
-			kEyes,
-			kHair,
-			kFacialHair,
-			kScar,
-			kEyebrows,
-			kMeatcaps,
-			kTeeth,
-			kHeadRear
+			kMisc = 0x0,
+			kFace = 0x1,
+			kEyes = 0x2,
+			kHair = 0x3,
+			kFacialHair = 0x4,
+			kScar = 0x5,
+			kEyebrows = 0x6,
+			kMeatcaps = 0x7,
+			kTeeth = 0x8,
+			kHeadRear = 0x9
 		};
 
 		[[nodiscard]] bool IsExtraPart() const noexcept { return flags.all(Flag::kExtraPart); }
diff --git a/CommonLibF4/include/RE/Bethesda/BGSMod.h b/CommonLibF4/include/RE/Bethesda/BGSMod.h
index e3dc3270..a6f2ad59 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSMod.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSMod.h
@@ -155,7 +155,7 @@ namespace RE::BGSMod
 			{
 			public:
 				// members
-				REX::EnumSet<ENUM_FORM_ID, std::uint8_t> targetFormType;           // 18
+				ENUM_FORM_ID							 targetFormType;           // 18
 				std::int8_t                              maxRank;                  // 19
 				std::int8_t                              lvlsPerTierScaledOffset;  // 1A
 				bool                                     optional;                 // 1B
@@ -195,7 +195,7 @@ namespace RE::BGSMod
 			BGSAttachParentArray                                         attachParents;            // 98
 			BGSTypedKeywordValueArray<KeywordType::kInstantiationFilter> filterKeywords;           // B0
 			BGSTypedKeywordValue<KeywordType::kAttachPoint>              attachPoint;              // C0
-			REX::EnumSet<ENUM_FORM_ID, std::uint8_t>                     targetFormType;           // C2
+			ENUM_FORM_ID								                 targetFormType;           // C2
 			std::uint8_t                                                 maxRank;                  // C3
 			std::uint8_t                                                 lvlsPerTierScaledOffset;  // C4
 			std::int8_t                                                  priority;                 // C5
diff --git a/CommonLibF4/include/RE/Bethesda/BGSPrimitive.h b/CommonLibF4/include/RE/Bethesda/BGSPrimitive.h
index 2e2c34ef..442fa362 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSPrimitive.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSPrimitive.h
@@ -17,12 +17,12 @@ namespace RE
 
 		enum class PRIMITIVE_TYPE
 		{
-			kNone,
-			kBox,
-			kSphere,
-			kPlane,
-			kLine,
-			kEllipsoid
+			kNone = 0x0,
+			kBox = 0x1,
+			kSphere = 0x2,
+			kPlane = 0x3,
+			kLine = 0x4,
+			kEllipsoid = 0x5
 		};
 
 		virtual ~BGSPrimitive();  // 00
diff --git a/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h b/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h
index 000a63c7..05ae5809 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSSceneAction.h
@@ -34,23 +34,23 @@ namespace RE
 
 		enum SCENE_ACTION_PLAYER_RESPONSE_TYPE : std::uint32_t
 		{
-			kPositive = 0,
-			kNegative = 1,
-			kNeutral = 2,
-			kQuestion = 3,
-			kTotal = 4,
-			kNone
+			kPositive = 0x0,
+			kNegative = 0x1,
+			kNeutral = 0x2,
+			kQuestion = 0x3,
+			kTotal = 0x4,
+			kNone  =0x5
 		};
 
 		enum SCENE_ACTION_TYPE : std::uint32_t
 		{
-			kDialogue = 0,
-			kPackage = 1,
-			kTimer = 2,
-			kPlayerDialogue = 3,
-			kStartScene = 4,
-			kNPCResponse = 5,
-			kRadio = 6,
+			kDialogue = 0x0,
+			kPackage = 0x1,
+			kTimer = 0x2,
+			kPlayerDialogue = 0x3,
+			kStartScene = 0x4,
+			kNPCResponse = 0x5,
+			kRadio = 0x6,
 		};
 
 		enum class Flag
@@ -68,9 +68,9 @@ namespace RE
 
 		enum class Status
 		{
-			kStopped,
-			kRunning,
-			kComplete
+			kStopped = 0x0,
+			kRunning = 0x1,
+			kComplete = 0x2
 		};
 
 		virtual ~BGSSceneAction();  // 00
diff --git a/CommonLibF4/include/RE/Bethesda/BGSTextureSet.h b/CommonLibF4/include/RE/Bethesda/BGSTextureSet.h
index 5b90323f..4f4af1bb 100644
--- a/CommonLibF4/include/RE/Bethesda/BGSTextureSet.h
+++ b/CommonLibF4/include/RE/Bethesda/BGSTextureSet.h
@@ -30,11 +30,11 @@ namespace RE
 	public:
 		enum class LightingShaderEnum
 		{
-			kStandard,
-			kWater,
-			kEffect,
-			kSky,
-			kTallGrass
+			kStandard = 0x0,
+			kWater = 0x1,
+			kEffect = 0x2,
+			kSky = 0x3,
+			kTallGrass = 0x4
 		};
 
 		// members
diff --git a/CommonLibF4/include/RE/Bethesda/BSContainer.h b/CommonLibF4/include/RE/Bethesda/BSContainer.h
index 0a5c3340..868c6924 100644
--- a/CommonLibF4/include/RE/Bethesda/BSContainer.h
+++ b/CommonLibF4/include/RE/Bethesda/BSContainer.h
@@ -4,7 +4,7 @@ namespace RE::BSContainer
 {
 	enum class ForEachResult
 	{
-		kContinue = 0,
-		kStop = 1
+		kContinue = 0x0,
+		kStop = 0x1
 	};
 }
diff --git a/CommonLibF4/include/RE/Bethesda/BSExtraData.h b/CommonLibF4/include/RE/Bethesda/BSExtraData.h
index 556dd817..50beaacb 100644
--- a/CommonLibF4/include/RE/Bethesda/BSExtraData.h
+++ b/CommonLibF4/include/RE/Bethesda/BSExtraData.h
@@ -382,98 +382,99 @@ namespace RE
 	{
 		enum MARKER_TYPE : std::uint16_t
 		{
-			kCave = 0,
-			kCity,
-			kDiamondCity,
-			kEncampment,
-			kIndustrial,
-			kGovtBuilding,
-			kMetro,
-			kMilitaryBase,
-			kLandmark,
-			kOffice,
-			kRuinsTown,
-			kRuinsUrban,
-			kSanctuary,
-			kSettlement,
-			kSewer,
-			kVault,
-			kAirfield,
-			kBunkerHill,
-			kCamper,
-			kCar,
-			kChurch,
-			kCountryClub,
-			kCustomHouse,
-			kDriveIn,
-			kElevatedHighway,
-			kFaneuilHall,
-			kFarm,
-			kFillingStation,
-			kForest,
-			kGoodNeighbor,
-			kGraveyard,
-			kHospital,
-			kIndustrialDome,
-			kIndustrialStacks,
-			kInstitute,
-			kIrishPride,
-			kJunkyard,
-			kObservatory,
-			kPier,
-			kPondOrLake,
-			kQuarry,
-			kRadioactiveArea,
-			kRadioTower,
-			kSalem,
-			kSchool,
-			kShipwreck,
-			kSubmarine,
-			kSwanPond,
-			kSynthHead,
-			kTown,
-			kBOS,
-			kBrownstone,
-			kBunker,
-			kCastle,
-			kSkyscraper,
-			kLibertalia,
-			kLowrise,
-			kMinutemen,
-			kPoliceStation,
-			kPrydwen,
-			kRailroadFaction,
-			kRailroad,
-			kSatellite,
-			kSentinel,
-			kUSSConstitution,
-			kMechanist,
-			kRaiderSettlement,
-			kVassalSettlement,
-			kPotentialVassalSettlement,
-			kBottlingPlant,
-			kGalactic,
-			kHub,
-			kKiddieKingdom,
-			kMonorail,
-			kRides,
-			kSafari,
-			kWildWest,
-			kPOI,
-			kDisciples,
-			kOperators,
-			kPack,
-			kDoor,
-			kCountEditor,
-			kQuest,
-			kQuestDoor,
-			kQuestMultiple,
-			kPlayerSet,
-			kPlayerLocation,
-			kPowerArmorLocation,
-			kDogmeat,
-			kTeammate,
-			kCountTotal
+			kCave = 0x0,
+			kCity = 0x1,
+			kDiamondCity = 0x2,
+			kEncampment = 0x3,
+			kIndustrial = 0x4,
+			kGovtBuilding = 0x5,
+			kMetro = 0x6,
+			kMilitaryBase = 0x7,
+			kLandmark = 0x8,
+			kOffice = 0x9,
+			kRuinsTown = 0xA,
+			kRuinsUrban = 0xB,
+			kSanctuary = 0xC,
+			kSettlement = 0xD,
+			kSewer = 0xE,
+			kVault = 0xF,
+			kAirfield = 0x10,
+			kBunkerHill = 0x11,
+			kCamper = 0x12,
+			kCar = 0x13,
+			kChurch = 0x14,
+			kCountryClub = 0x15,
+			kCustomHouse = 0x16,
+			kDriveIn = 0x17,
+			kElevatedHighway = 0x18,
+			kFaneuilHall = 0x19,
+			kFarm = 0x1A,
+			kFillingStation = 0x1B,
+			kForest = 0x1C,
+			kGoodNeighbor = 0x1D,
+			kGraveyard = 0x1E,
+			kHospital = 0x1F,
+			kIndustrialDome = 0x20,
+			kIndustrialStacks = 0x21,
+			kInstitute = 0x22,
+			kIrishPride = 0x23,
+			kJunkyard = 0x24,
+			kObservatory = 0x25,
+			kPier = 0x26,
+			kPondOrLake = 0x27,
+			kQuarry = 0x28,
+			kRadioactiveArea = 0x29,
+			kRadioTower = 0x2A,
+			kSalem = 0x2B,
+			kSchool = 0x2C,
+			kShipwreck = 0x2D,
+			kSubmarine = 0x2E,
+			kSwanPond = 0x2F,
+			kSynthHead = 0x0,
+			kTown = 0x31,
+			kBOS = 0x32,
+			kBrownstone = 0x33,
+			kBunker = 0x34,
+			kCastle = 0x35,
+			kSkyscraper = 0x36,
+			kLibertalia = 0x37,
+			kLowrise = 0x38,
+			kMinutemen = 0x39,
+			kPoliceStation = 0x3A,
+			kPrydwen = 0x3B,
+			kRailroadFaction = 0x3C,
+			kRailroad = 0x3D,
+			kSatellite = 0x3E,
+			kSentinel = 0x3F,
+			kUSSConstitution = 0x40,
+			kMechanist = 0x41,
+			kRaiderSettlement = 0x42,
+			kVassalSettlement = 0x43,
+			kPotentialVassalSettlement = 0x44,
+			kBottlingPlant = 0x45,
+			kGalactic = 0x46,
+			kHub = 0x47,
+			kKiddieKingdom = 0x48,
+			kMonorail = 0x49,
+			kRides = 0x4A,
+			kSafari = 0x4B,
+			kWildWest = 0x4C,
+			kPOI = 0x4D,
+			kDisciples = 0x4E,
+			kOperators = 0x4F,
+			kPack = 0x50,
+			kDoor = 0x51,
+			kCountEditor = 0x52,
+			kQuest = 0x53,
+			kQuestDoor = 0x54,
+			kQuestMultiple = 0x55,
+			kPlayerSet = 0x56,
+			kPlayerLocation = 0x57,
+			kPowerArmorLocation = 0x58,
+			kDogmeat = 0x59,
+			kTeammate = 0x5A,
+			
+			kCountTotal = 0x5B
 		};
 
 		std::uint8_t flags;				// 10
diff --git a/CommonLibF4/include/RE/Bethesda/BSGraphics.h b/CommonLibF4/include/RE/Bethesda/BSGraphics.h
index 19c3af26..474583f4 100644
--- a/CommonLibF4/include/RE/Bethesda/BSGraphics.h
+++ b/CommonLibF4/include/RE/Bethesda/BSGraphics.h
@@ -362,7 +362,7 @@ namespace RE
 				VA_LANDDATA = 0x7,
 				VA_EYEDATA = 0x8,
 
-				VA_COUNT = 9
+				VA_COUNT = 0X9
 			};
 
 			enum Flags : std::uint16_t
diff --git a/CommonLibF4/include/RE/Bethesda/BSInputDeviceManager.h b/CommonLibF4/include/RE/Bethesda/BSInputDeviceManager.h
index 24ec12ad..348edec4 100644
--- a/CommonLibF4/include/RE/Bethesda/BSInputDeviceManager.h
+++ b/CommonLibF4/include/RE/Bethesda/BSInputDeviceManager.h
@@ -44,13 +44,13 @@ namespace RE
 	public:
 		enum class BS_DEVICES
 		{
-			kKeyboard,
-			kMouse,
-			kGamepad,
-			kDebugGamepad,
-			kVirtualKeyboard,
+			kKeyboard = 0x0,
+			kMouse = 0x1,
+			kGamepad = 0x2,
+			kDebugGamepad = 0x3,
+			kVirtualKeyboard = 0x4,
 
-			kTotal
+			kTotal = 0x5
 		};
 
 		[[nodiscard]] static BSInputDeviceManager* GetSingleton()
diff --git a/CommonLibF4/include/RE/Bethesda/BSMTAManager.h b/CommonLibF4/include/RE/Bethesda/BSMTAManager.h
index c5a35e14..59702545 100644
--- a/CommonLibF4/include/RE/Bethesda/BSMTAManager.h
+++ b/CommonLibF4/include/RE/Bethesda/BSMTAManager.h
@@ -51,7 +51,7 @@ namespace RE
 			kWaterStencil = 0x15,
 			kWaterDepth = 0x16,
 
-			kTotal
+			kTotal = 0x17
 		};
 
 		struct CommandBufferPassesMapAccess;
@@ -127,9 +127,9 @@ namespace RE
 	{
 		enum class MODE
 		{
-			kIdle,
-			kCollecting,
-			kExecuting,
+			kIdle = 0x0,
+			kCollecting = 0x1,
+			kExecuting = 0x2,
 		};
 
 		class CalculateBoneMatricesTask
diff --git a/CommonLibF4/include/RE/Bethesda/BSModelDB.h b/CommonLibF4/include/RE/Bethesda/BSModelDB.h
index 8942a42a..4539673d 100644
--- a/CommonLibF4/include/RE/Bethesda/BSModelDB.h
+++ b/CommonLibF4/include/RE/Bethesda/BSModelDB.h
@@ -18,7 +18,7 @@ namespace RE
 		kActorBodyPart = 0x7,
 		kRenderedMenu = 0x8,
 		kInvisible = 0x9,
-		kSkyCell = 0xa,
+		kSkyCell = 0xA,
 	};
 
 	struct BSModelDB
diff --git a/CommonLibF4/include/RE/Bethesda/BSResource/BSResourceEnums.h b/CommonLibF4/include/RE/Bethesda/BSResource/BSResourceEnums.h
index b0a16cc0..2fae072f 100644
--- a/CommonLibF4/include/RE/Bethesda/BSResource/BSResourceEnums.h
+++ b/CommonLibF4/include/RE/Bethesda/BSResource/BSResourceEnums.h
@@ -4,22 +4,22 @@ namespace RE::BSResource
 {
 	enum class ErrorCode : std::uint32_t
 	{
-		kNone = 0,
-		kNotExist = 1,
-		kInvalidPath = 2,
-		kFileError = 3,
-		kInvalidType = 4,
-		kMemoryError = 5,
-		kBusy = 6,
-		kInvalidParam = 7,
-		kUnsupported = 8
+		kNone = 0x0,
+		kNotExist = 0x1,
+		kInvalidPath = 0x2,
+		kFileError = 0x3,
+		kInvalidType = 0x4,
+		kMemoryError = 0x5,
+		kBusy = 0x6,
+		kInvalidParam = 0x7,
+		kUnsupported = 0x8
 	};
 
 	enum class SeekMode
 	{
-		kSet = 0,
-		kCurrent = 1,
-		kEnd = 2
+		kSet = 0x0,
+		kCurrent = 0x1,
+		kEnd = 0x2
 	};
 
 	struct FileID
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/ErrorLogger.h b/CommonLibF4/include/RE/Bethesda/BSScript/ErrorLogger.h
index 2b588138..5dd38d0d 100644
--- a/CommonLibF4/include/RE/Bethesda/BSScript/ErrorLogger.h
+++ b/CommonLibF4/include/RE/Bethesda/BSScript/ErrorLogger.h
@@ -29,10 +29,10 @@ namespace RE
 
 			enum class Severity
 			{
-				kInfo,
-				kWarning,
-				kError,
-				kFatal
+				kInfo = 0x0,
+				kWarning = 0x1,
+				kError = 0x2,
+				kFatal = 0x3
 			};
 
 			struct PerThreadErrorCounts
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/IFunction.h b/CommonLibF4/include/RE/Bethesda/BSScript/IFunction.h
index f683a04f..566ec062 100644
--- a/CommonLibF4/include/RE/Bethesda/BSScript/IFunction.h
+++ b/CommonLibF4/include/RE/Bethesda/BSScript/IFunction.h
@@ -38,18 +38,18 @@ namespace RE
 
 			enum class CallResult
 			{
-				kCompleted,
-				kSetupForVM,
-				kInProgress,
-				kFailedRetry,
-				kFailedAbort
+				kCompleted = 0x0,
+				kSetupForVM = 0x1,
+				kInProgress = 0x2,
+				kFailedRetry = 0x3,
+				kFailedAbort = 0x4
 			};
 
 			enum class FunctionType
 			{
-				kNormal,
-				kPropertyGetter,
-				kPropertySetter
+				kNormal = 0x0,
+				kPropertyGetter = 0x1,
+				kPropertySetter = 0x2
 			};
 
 			virtual ~IFunction() = default;  // 00
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/ObjectTypeInfo.h b/CommonLibF4/include/RE/Bethesda/BSScript/ObjectTypeInfo.h
index d8c9f94e..f7c402b7 100644
--- a/CommonLibF4/include/RE/Bethesda/BSScript/ObjectTypeInfo.h
+++ b/CommonLibF4/include/RE/Bethesda/BSScript/ObjectTypeInfo.h
@@ -32,10 +32,10 @@ namespace RE
 
 			enum class LinkValidState : std::uint32_t
 			{
-				kNotLinked,
-				kCurrentlyLinking,
-				kLinkedInvalid,
-				kLinkedValid
+				kNotLinked = 0x0,
+				kCurrentlyLinking = 0x1,
+				kLinkedInvalid = 0x2,
+				kLinkedValid = 0x3
 			};
 
 			[[nodiscard]] std::uint32_t GetVariableCount() const noexcept
@@ -123,7 +123,7 @@ namespace RE
 				enum : std::uint32_t
 				{
 					kFuncCountMask = 0x1FF,
-					kFuncOffsetShift = 9
+					kFuncOffsetShift = 0x9
 				};
 
 				struct Func
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/Stack.h b/CommonLibF4/include/RE/Bethesda/BSScript/Stack.h
index 57313bee..8235a66b 100644
--- a/CommonLibF4/include/RE/Bethesda/BSScript/Stack.h
+++ b/CommonLibF4/include/RE/Bethesda/BSScript/Stack.h
@@ -48,22 +48,22 @@ namespace RE
 
 			enum class FreezeState
 			{
-				kUnfrozen,
-				kFreezing,
-				kFrozen
+				kUnfrozen = 0x0,
+				kFreezing = 0x1,
+				kFrozen = 0x2
 			};
 
 			enum class State
 			{
-				kRunning,
-				kFinished,
-				kWaitingOnMemory,
-				kWaitingOnLatentFunction,
-				kWaitingInOtherStackForCall,
-				kWaitingInOtherStackForReturn,
-				kWaitingInOtherStackForReturnNoPop,
-				kRetryReturnNoPop,
-				kRetryCall
+				kRunning = 0x0,
+				kFinished = 0x1,
+				kWaitingOnMemory = 0x2,
+				kWaitingOnLatentFunction = 0x3,
+				kWaitingInOtherStackForCall = 0x4,
+				kWaitingInOtherStackForReturn = 0x5,
+				kWaitingInOtherStackForReturnNoPop = 0x6,
+				kRetryReturnNoPop = 0x7,
+				kRetryCall = 0x8
 			};
 
 			struct MemoryPageData
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/StructTypeInfo.h b/CommonLibF4/include/RE/Bethesda/BSScript/StructTypeInfo.h
index f139a438..acee64f3 100644
--- a/CommonLibF4/include/RE/Bethesda/BSScript/StructTypeInfo.h
+++ b/CommonLibF4/include/RE/Bethesda/BSScript/StructTypeInfo.h
@@ -33,10 +33,10 @@ namespace RE
 
 			enum class LinkValidState
 			{
-				kNotLinked,
-				kCurrentlyLinking,
-				kLinkedInvalid,
-				kLinkedValid
+				kNotLinked = 0x0,
+				kCurrentlyLinking = 0x1,
+				kLinkedInvalid = 0x2,
+				kLinkedValid = 0x3
 			};
 
 			struct StructVar
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/TypeInfo.h b/CommonLibF4/include/RE/Bethesda/BSScript/TypeInfo.h
index 7105d278..618b95f2 100644
--- a/CommonLibF4/include/RE/Bethesda/BSScript/TypeInfo.h
+++ b/CommonLibF4/include/RE/Bethesda/BSScript/TypeInfo.h
@@ -24,24 +24,24 @@ namespace RE
 		public:
 			enum class RawType : std::uint32_t
 			{
-				kNone,
-				kObject,
-				kString,
-				kInt,
-				kFloat,
-				kBool,
-				kVar,
-				kStruct,
-
-				kArrayStart = 10,
-				kArrayObject,
-				kArrayString,
-				kArrayInt,
-				kArrayFloat,
-				kArrayBool,
-				kArrayVar,
-				kArrayStruct,
-				kArrayEnd
+				kNone = 0x0,
+				kObject = 0x1,
+				kString = 0x2,
+				kInt = 0x3,
+				kFloat = 0x4,
+				kBool = 0x5,
+				kVar = 0x6,
+				kStruct = 0x7,
+
+				kArrayStart = 0xA,
+				kArrayObject = 0xB,
+				kArrayString = 0xC,
+				kArrayInt = 0xD,
+				kArrayFloat = 0xE,
+				kArrayBool = 0xF,
+				kArrayVar = 0x10,
+				kArrayStruct = 0x11,
+				kArrayEnd = 0x12
 			};
 
 			TypeInfo() noexcept = default;
diff --git a/CommonLibF4/include/RE/Bethesda/BSShaderMaterial.h b/CommonLibF4/include/RE/Bethesda/BSShaderMaterial.h
index 262b58ea..27f38856 100644
--- a/CommonLibF4/include/RE/Bethesda/BSShaderMaterial.h
+++ b/CommonLibF4/include/RE/Bethesda/BSShaderMaterial.h
@@ -24,35 +24,35 @@ namespace RE
 		enum class Feature
 		{
 			kNone = static_cast<std::underlying_type_t<Feature>>(-1),
-			kDefault = 0,
-			kEnvmap,
-			kGlowmap,
-			kParallax,
-			kFace,
-			kSkinTint,
-			kHairTint,
-			kParallaxOcc,
-			kLandscape,
-			kLODLandscape,
-			kSnow,
-			kMultiLayerParallax,
-			kTreeAnim,
-			kLODObjects,
-			kMultiIndexSnow,
-			kLODObjectsHD,
-			kEye,
-			kCloud,
-			kLODLandscapeNoise,
-			kLODLandscapeBlend,
-			kDismemberment
+			kDefault = 0x0,
+			kEnvmap = 0x1,
+			kGlowmap = 0x2,
+			kParallax = 0x3,
+			kFace = 0x4,
+			kSkinTint = 0x5,
+			kHairTint = 0x6,
+			kParallaxOcc = 0x7,
+			kLandscape = 0x8,
+			kLODLandscape = 0x9,
+			kSnow = 0xA,
+			kMultiLayerParallax = 0xB,
+			kTreeAnim = 0xC,
+			kLODObjects = 0xD,
+			kMultiIndexSnow = 0xE,
+			kLODObjectsHD = 0xF,
+			kEye = 0x10,
+			kCloud = 0x11,
+			kLODLandscapeNoise = 0x12,
+			kLODLandscapeBlend = 0x13,
+			kDismemberment = 0x14
 		};
 
 		enum class Type
 		{
-			kBase = 0,
-			kEffect = 1,
-			kLighting = 2,
-			kWater = 3
+			kBase = 0x0,
+			kEffect = 0x1,
+			kLighting = 0x2,
+			kWater = 0x3
 		};
 
 		virtual ~BSShaderMaterial();
diff --git a/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h b/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h
index ec2c0733..63894300 100644
--- a/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h
+++ b/CommonLibF4/include/RE/Bethesda/BSShaderProperty.h
@@ -26,17 +26,17 @@ namespace RE
 
 		enum class TextureTypeEnum
 		{
-			kBase = 0,
-			kNormal,
-			kGlow,
-			kHeight,
-			kEnv,
-			kWrinkles,
-			kMultilayer,
-			kBacklightMask,
+			kBase = 0x0,
+			kNormal = 0x1,
+			kGlow = 0x2,
+			kHeight = 0x3,
+			kEnv = 0x4,
+			kWrinkles = 0x5,
+			kMultilayer = 0x6,
+			kBacklightMask = 0x7,
 			kSmoothSpec = kBacklightMask,
 
-			kTotal,
+			kTotal
 		};
 
 		enum class EShaderPropertyFlag : std::uint64_t
diff --git a/CommonLibF4/include/RE/Bethesda/BSTempEffect.h b/CommonLibF4/include/RE/Bethesda/BSTempEffect.h
index 4c486434..e9fc5e97 100644
--- a/CommonLibF4/include/RE/Bethesda/BSTempEffect.h
+++ b/CommonLibF4/include/RE/Bethesda/BSTempEffect.h
@@ -58,18 +58,18 @@ namespace RE
 
 	enum class TEMP_EFFECT_TYPE
 	{
-		kTerrain = 0,
-		kWeaponBlood = 1,
-		kDecal = 2,
-		kGeometryDecal = 3,
-		kParticle = 4,
-		kDebris = 5,
-		kSPG = 6,
-		kDefault = 7,
-		kRefDefault = 8,
-		kRefModel = 9,
-		kRefShader = 10,
-		kMagicSummon = 11
+		kTerrain = 0x0,
+		kWeaponBlood = 0x1,
+		kDecal = 0x2,
+		kGeometryDecal = 0x3,
+		kParticle = 0x4,
+		kDebris = 0x5,
+		kSPG = 0x6,
+		kDefault = 0x7,
+		kRefDefault = 0x8,
+		kRefModel = 0x9,
+		kRefShader = 0xA,
+		kMagicSummon = 0xB
 	};
 
 	class __declspec(novtable) BSTempEffect :
diff --git a/CommonLibF4/include/RE/Bethesda/BSVisit.h b/CommonLibF4/include/RE/Bethesda/BSVisit.h
index 65576116..c7ca6dea 100644
--- a/CommonLibF4/include/RE/Bethesda/BSVisit.h
+++ b/CommonLibF4/include/RE/Bethesda/BSVisit.h
@@ -10,8 +10,8 @@ namespace RE
 	{
 		enum class BSVisitControl
 		{
-			kContinue = 0,
-			kStop = 1
+			kContinue = 0x0,
+			kStop = 0x1
 		};
 
 		BSVisitControl TraverseScenegraphGeometries(NiAVObject* a_object, std::function<BSVisitControl(BSGeometry*)> a_func);
diff --git a/CommonLibF4/include/RE/Bethesda/Calendar.h b/CommonLibF4/include/RE/Bethesda/Calendar.h
index 02ba5a9f..e482b08a 100644
--- a/CommonLibF4/include/RE/Bethesda/Calendar.h
+++ b/CommonLibF4/include/RE/Bethesda/Calendar.h
@@ -14,19 +14,19 @@ namespace RE
 		{
 			enum Month
 			{
-				kJanuary,
-				kFebruary,
-				kMarch,
-				kApril,
-				kMay,
-				kJune,
-				kJuly,
-				kAugust,
-				kSeptember,
-				kOctober,
-				kNovember,
-				kDecember,
-				kTotal
+				kJanuary = 0x0,
+				kFebruary = 0x1,
+				kMarch = 0x2,
+				kApril = 0x3,
+				kMay = 0x4,
+				kJune = 0x5,
+				kJuly = 0x6,
+				kAugust = 0x7,
+				kSeptember = 0x8,
+				kOctober = 0x9,
+				kNovember = 0xA,
+				kDecember = 0xB,
+				kTotal = 0xC
 			};
 		};
 		using Month = Months::Month;
diff --git a/CommonLibF4/include/RE/Bethesda/ControlMap.h b/CommonLibF4/include/RE/Bethesda/ControlMap.h
index 15b24640..7b01e9f8 100644
--- a/CommonLibF4/include/RE/Bethesda/ControlMap.h
+++ b/CommonLibF4/include/RE/Bethesda/ControlMap.h
@@ -10,8 +10,8 @@ namespace RE
 {
 	enum class PC_GAMEPAD_TYPE
 	{
-		kDirectX,
-		kOrbis,
+		kDirectX  = 0x0,
+		kOrbis = 0x1,
 
 		kTotal
 	};
diff --git a/CommonLibF4/include/RE/Bethesda/Events.h b/CommonLibF4/include/RE/Bethesda/Events.h
index e9f1f764..dd49aefc 100644
--- a/CommonLibF4/include/RE/Bethesda/Events.h
+++ b/CommonLibF4/include/RE/Bethesda/Events.h
@@ -26,22 +26,22 @@ namespace RE
 
 	enum class QuickContainerMode : std::int32_t
 	{
-		kLoot,
-		kTeammate,
-		kPowerArmor,
-		kTurret,
-		kWorkshop,
-		kCrafting,
-		kStealing,
-		kStealingPowerArmor
+		kLoot = 0x0,
+		kTeammate = 0x1,
+		kPowerArmor = 0x2,
+		kTurret = 0x3,
+		kWorkshop = 0x4,
+		kCrafting = 0x5,
+		kStealing = 0x6,
+		kStealingPowerArmor = 0x7
 	};
 
 	namespace ActorEquipManagerEvent
 	{
 		enum class Type : std::int32_t
 		{
-			kEquip,
-			kUnequip
+			kEquip = 0x0,
+			kUnequip = 0x1
 		};
 
 		struct Event
@@ -59,8 +59,8 @@ namespace RE
 	{
 		enum class Type : std::int32_t
 		{
-			kAdd,
-			kRemove
+			kAdd = 0x0,
+			kRemove = 0x1
 		};
 
 		struct PerkValueChangedEvent
@@ -84,11 +84,11 @@ namespace RE
 	{
 		enum Type : std::int32_t
 		{
-			kAddObjective,
-			kUpdateObjective,
-			kRemoveQuest,
-			kRemoveQuestTarget,
-			kUpdateQuestTarget
+			kAddObjective = 0x0,
+			kUpdateObjective = 0x1,
+			kRemoveQuest = 0x2,
+			kRemoveQuestTarget = 0x3,
+			kUpdateQuestTarget = 0x4
 		};
 
 		struct Event
@@ -110,10 +110,10 @@ namespace RE
 	{
 		enum Type : std::int32_t
 		{
-			kUpdateQuestActiveStatus,
-			kUpdateQuestEnableStatus,
-			kUpdateQuestStageChange,
-			kUpdateMiscQuestVisibility
+			kUpdateQuestActiveStatus = 0x0,
+			kUpdateQuestEnableStatus = 0x1,
+			kUpdateQuestStageChange = 0x2,
+			kUpdateMiscQuestVisibility = 0x3
 		};
 
 		struct Event
@@ -143,9 +143,9 @@ namespace RE
 	{
 		enum Status : std::int32_t
 		{
-			kAdded,
-			kRemoved,
-			kStatusChanged
+			kAdded = 0x0,
+			kRemoved = 0x1,
+			kStatusChanged = 0x2
 		};
 
 		struct Event
@@ -286,8 +286,8 @@ namespace RE
 	public:
 		enum class CellFlag
 		{
-			kEnter,
-			kLeave
+			kEnter = 0x0,
+			kLeave = 0x1
 		};
 
 		// members
@@ -310,8 +310,8 @@ namespace RE
 	public:
 		enum class Event
 		{
-			kOnStartup,
-			kOnShutdown
+			kOnStartup = 0x0,
+			kOnShutdown = 0x1
 		};
 
 		static void InitSDM()
@@ -383,10 +383,10 @@ namespace RE
 	public:
 		enum class EVENT_TYPE : std::int32_t
 		{
-			kPreAttach,
-			kPostAttach,
-			kPreDetach,
-			kPostDetach
+			kPreAttach = 0x0,
+			kPostAttach = 0x1,
+			kPreDetach = 0x2,
+			kPostDetach = 0x3
 		};
 
 		// members
@@ -861,8 +861,8 @@ namespace RE
 	public:
 		enum class FurnitureEventType : std::int32_t
 		{
-			kEnter,
-			kExit
+			kEnter = 0x0,
+			kExit = 0x1
 		};
 
 		[[nodiscard]] static BSTEventSource<TESFurnitureEvent>* GetEventSource()
@@ -1061,11 +1061,11 @@ namespace RE
 	{
 		enum EVENT_TYPE : std::int32_t
 		{
-			kPrePositionPlayer,
-			kPositionPlayerPreUpdatePackages,
-			kPositionPlayerPostUpdatePackages,
-			kPostPositionPlayer,
-			kFinishPositionPlayer,
+			kPrePositionPlayer = 0x0,
+			kPositionPlayerPreUpdatePackages = 0x1,
+			kPositionPlayerPostUpdatePackages = 0x2,
+			kPostPositionPlayer = 0x3,
+			kFinishPositionPlayer = 0x4,
 		};
 
 		// members
diff --git a/CommonLibF4/include/RE/Bethesda/FormComponents.h b/CommonLibF4/include/RE/Bethesda/FormComponents.h
index e452b644..9e643d5b 100644
--- a/CommonLibF4/include/RE/Bethesda/FormComponents.h
+++ b/CommonLibF4/include/RE/Bethesda/FormComponents.h
@@ -144,9 +144,9 @@ namespace RE
 
 	enum class ACTOR_VALUE_MODIFIER
 	{
-		kPermanent,
-		kTemporary,
-		kDamage
+		kPermanent = 0,
+		kTemporary = 1,
+		kDamage = 2
 	};
 
 	class __declspec(novtable) ActorValueOwner
@@ -554,27 +554,27 @@ namespace RE
 
 	enum class KeywordType
 	{
-		kNone,
-		kComponentTechLevel,
-		kAttachPoint,
-		kComponentProperty,
-		kInstantiationFilter,
-		kModAssociation,
-		kSound,
-		kAnimArchetype,
-		kFunctionCall,
-		kRecipeFilter,
-		kAttractionType,
-		kDialogueSubtype,
-		kQuestTarget,
-		kAnimFlavor,
-		kAnimGender,
-		kAnimFaceArchetype,
-		kQuestGroup,
-		kAnimInjured,
-		kDispelEffect,
-
-		kTotal
+		kNone = 0x0,
+		kComponentTechLevel = 0x1,
+		kAttachPoint = 0x2,
+		kComponentProperty = 0x3,
+		kInstantiationFilter = 0x4,
+		kModAssociation = 0x5,
+		kSound = 0x6,
+		kAnimArchetype = 0x7,
+		kFunctionCall = 0x8,
+		kRecipeFilter = 0x9,
+		kAttractionType = 0xA,
+		kDialogueSubtype = 0xB,
+		kQuestTarget = 0xC,
+		kAnimFlavor = 0xD,
+		kAnimGender = 0xE,
+		kAnimFaceArchetype = 0xF,
+		kQuestGroup = 0x10,
+		kAnimInjured = 0x11,
+		kDispelEffect = 0x12,
+
+		kTotal = 0x13
 	};
 
 	template <KeywordType TYPE>
@@ -1835,10 +1835,10 @@ namespace RE
 
 	enum class FIGHT_REACTION
 	{
-		kNeutral = 0,
-		kEnemy = 1,
-		kAlly = 2,
-		kFriend = 3
+		kNeutral = 0x0,
+		kEnemy = 0x1,
+		kAlly = 0x2,
+		kFriend = 0x3
 	};
 
 	struct GROUP_REACTION
diff --git a/CommonLibF4/include/RE/Bethesda/GamePlayFormulas.h b/CommonLibF4/include/RE/Bethesda/GamePlayFormulas.h
index 5e61232f..618086a0 100644
--- a/CommonLibF4/include/RE/Bethesda/GamePlayFormulas.h
+++ b/CommonLibF4/include/RE/Bethesda/GamePlayFormulas.h
@@ -21,8 +21,8 @@ namespace RE
 	{
 		enum class EXPERIENCE_ACTIVITY
 		{
-			kKillNPC = 0,
-			kHackComputer = 1,
+			kKillNPC = 0x0,
+			kHackComputer = 0x1,
 		};
 
 		inline bool CanHackGateCheck(LOCK_LEVEL a_lockLevel)
diff --git a/CommonLibF4/include/RE/Bethesda/GameScript.h b/CommonLibF4/include/RE/Bethesda/GameScript.h
index 2f2201d0..4805849f 100644
--- a/CommonLibF4/include/RE/Bethesda/GameScript.h
+++ b/CommonLibF4/include/RE/Bethesda/GameScript.h
@@ -159,37 +159,37 @@ namespace RE
 
 			enum class FunctorType
 			{
-				kMoveTo,
-				kMoveToOwnEditorLoc,
-				kDamageObject,
-				kEnable,
-				kDisable,
-				kDelete,
-				kSetPosition,
-				kSetAngle,
-				kSetMotionType,
-				kNonLatentDelete,
-				kMoveToPackLoc,
-				kSetScale,
-				kDropObject,
-				kAttachAshPile,
-				kAddRemoveConstraint,
-				kAddRemoveRagdoll,
-				kApplyHavokImpulse,
-				kResetRefr,
-				kSendPlayerToJail,
-				kAddItem,
-				kResurrect,
-				kCast,
-				kScrollCast,
-				kRemoveItem,
-				kWaitFor3D,
-				kPlayBink,
-				kMoveToNearestNavmesh,
-				kClearDestruction,
-				kWaitForResourceRecalc,
-				kRemoveComponent,
-				kDropRef
+				kMoveTo = 0x0,
+				kMoveToOwnEditorLoc = 0x1,
+				kDamageObject = 0x2,
+				kEnable = 0x3,
+				kDisable = 0x4,
+				kDelete = 0x5,
+				kSetPosition = 0x6,
+				kSetAngle = 0x7,
+				kSetMotionType = 0x8,
+				kNonLatentDelete = 0x9,
+				kMoveToPackLoc = 0xA,
+				kSetScale = 0xB,
+				kDropObject = 0xC,
+				kAttachAshPile = 0xD,
+				kAddRemoveConstraint = 0xE,
+				kAddRemoveRagdoll = 0xF,
+				kApplyHavokImpulse = 0x10,
+				kResetRefr = 0x11,
+				kSendPlayerToJail = 0x12,
+				kAddItem = 0x13,
+				kResurrect = 0x14,
+				kCast = 0x15,
+				kScrollCast = 0x16,
+				kRemoveItem = 0x17,
+				kWaitFor3D = 0x18,
+				kPlayBink = 0x19,
+				kMoveToNearestNavmesh = 0x1A,
+				kClearDestruction = 0x1B,
+				kWaitForResourceRecalc = 0x1C,
+				kRemoveComponent = 0x1D,
+				kDropRe = 0x1Ef
 			};
 
 			virtual ~DelayFunctor();  // 00
diff --git a/CommonLibF4/include/RE/Bethesda/IMenu.h b/CommonLibF4/include/RE/Bethesda/IMenu.h
index cb20a6cf..f32b312f 100644
--- a/CommonLibF4/include/RE/Bethesda/IMenu.h
+++ b/CommonLibF4/include/RE/Bethesda/IMenu.h
@@ -82,59 +82,59 @@ namespace RE
 
 	enum class HUDColorTypes
 	{
-		kNoColorMultiplier = 0,
-		kMenuNoColorBackground = 1,
-		kGameplayHUDColor = 2,
-		kPlayerSetColor = 3,
-		kPowerArmorColorOnly = 4,
-		kWarningColor = 5,
-		kAltWarningColor = 6,
-		kCustomColor = 7
+		kNoColorMultiplier = 0x0,
+		kMenuNoColorBackground = 0x1,
+		kGameplayHUDColor = 0x2,
+		kPlayerSetColor = 0x3,
+		kPowerArmorColorOnly = 0x4,
+		kWarningColor = 0x5,
+		kAltWarningColor = 0x6,
+		kCustomColor = 0x7
 	};
 
 	enum class MENU_RENDER_CONTEXT : std::int32_t
 	{
-		kMenuDelete,
-		kPreDisplay,
-		kRenderScreenspace,
-		kRenderCopyQuads,
-		kRenderImagespace,
-		kEnsureDisplayMenuCalled,
-		kPostDisplay
+		kMenuDelete = 0x0,
+		kPreDisplay = 0x1,
+		kRenderScreenspace = 0x2,
+		kRenderCopyQuads = 0x3,
+		kRenderImagespace = 0x4,
+		kEnsureDisplayMenuCalled = 0x5,
+		kPostDisplay = 0x6
 	};
 
 	enum class PIPBOY_PAGES : std::uint32_t
 	{
-		kStat,
-		kInv,
-		kData,
-		kMap,
-		kRadio
+		kStat = 0x0,
+		kInv = 0x1,
+		kData = 0x2,
+		kMap = 0x3,
+		kRadio = 0x4
 	};
 
 	enum class UI_DEPTH_PRIORITY
 	{
-		kUndefined,
-		k3DUnderHUD,  // WorkshopMenu3D
-		kBook,        // BookMenu
-		kScope,       // ScopeMenu
-		kSWFLoader,
-		kHUD,
-		kStandard,         // PipboyMenu, PowerArmorRenderer, HUDRainRenderer, LockpickingMenu3D
-		kStandard3DModel,  // Container3D, WorkbenchItem3D
-		kPipboy,
-		kTerminal,
-		kGameMessage,
-		kPauseMenu,
-		kLoadingFader,
-		kLoading3DModel,  // BackgroundScreenModel
-		kLoadingMenu,
-		kMessage,
-		kButtonBarMenu,  // FlatScreenModel, HUDScreenModel
-		kButtonBarSupressingMenu,
-		kDebug,
-		kConsole,
-		kCursor
+		kUndefined = 0x0,
+		k3DUnderHUD = 0x1,  // WorkshopMenu3D
+		kBook = 0x2,        // BookMenu
+		kScope = 0x3,       // ScopeMenu
+		kSWFLoader = 0x4,
+		kHUD = 0x5,
+		kStandard = 0x6,         // PipboyMenu, PowerArmorRenderer, HUDRainRenderer, LockpickingMenu3D
+		kStandard3DModel = 0x7,  // Container3D, WorkbenchItem3D
+		kPipboy = 0x8,
+		kTerminal = 0x9,
+		kGameMessage = 0xA,
+		kPauseMenu = 0xB,
+		kLoadingFader = 0xC,
+		kLoading3DModel = 0xD,  // BackgroundScreenModel
+		kLoadingMenu = 0xE,
+		kMessage = 0xF,
+		kButtonBarMenu = 0x10,  // FlatScreenModel, HUDScreenModel
+		kButtonBarSupressingMenu = 0x11,
+		kDebug = 0x12,
+		kConsole = 0x13,
+		kCursor = 0x14
 	};
 
 	enum class UI_MENU_FLAGS : std::uint32_t
@@ -872,10 +872,10 @@ namespace RE
 
 		enum class ShowMenuState
 		{
-			kConstructed = 0,
-			kShown,
-			kHidden,
-			kReshowOnDestructor
+			kConstructed = 0x0,
+			kShown = 0x1,
+			kHidden = 0x2,
+			kReshowOnDestructor = 0x3
 		};
 
 		// members
@@ -1440,13 +1440,13 @@ namespace RE
 		public:
 			enum class SORT_ON_FIELD
 			{
-				kAlphabetical = 0,
-				kDamage = 1,
-				kRateOfFire = 2,
-				kRange = 3,
-				kAccuracy = 4,
-				kValue = 5,
-				kWeight = 6,
+				kAlphabetical = 0x0,
+				kDamage = 0x1,
+				kRateOfFire = 0x2,
+				kRange = 0x3,
+				kAccuracy = 0x4,
+				kValue = 0x5,
+				kWeight = 0x6,
 			};
 
 			void IncrementSort()
@@ -1786,10 +1786,10 @@ namespace RE
 
 		enum class CONFIRM_TYPE
 		{
-			kSimple,
-			kBuild,
-			kScrap,
-			kRepairFailure
+			kSimple = 0,
+			kBuild = 1,
+			kScrap = 2,
+			kRepairFailure = 3
 		};
 
 		class __declspec(novtable) ICallback
@@ -1807,7 +1807,7 @@ namespace RE
 			virtual ~ICallback() = default;  // 00
 
 			// add
-			virtual void OnAccept() = 0;  // 01
+			virtual void OnAccept();  // 01
 
 			F4_HEAP_REDEFINE_NEW(ICallback);
 
@@ -1878,6 +1878,7 @@ namespace RE
 				InitData(GameSettingCollection::GetSingleton()->GetSetting("sCannotRepairMessage")->GetString(), "$OK", CONFIRM_TYPE::kRepairFailure),
 				requiredItems(requiredItems)
 			{
+				this->hasCancelButton = false;
 				stl::emplace_vtable(this);
 			}
 
diff --git a/CommonLibF4/include/RE/Bethesda/InputEvent.h b/CommonLibF4/include/RE/Bethesda/InputEvent.h
index 20de0643..c9f876fb 100644
--- a/CommonLibF4/include/RE/Bethesda/InputEvent.h
+++ b/CommonLibF4/include/RE/Bethesda/InputEvent.h
@@ -7,23 +7,23 @@ namespace RE
 {
 	enum class DIRECTION_VAL : std::int32_t
 	{
-		kNone,
-		kUp,
-		kRight,
-		kDown,
-		kLeft
+		kNone = 0x0,
+		kUp = 0x1,
+		kRight = 0x2,
+		kDown = 0x3,
+		kLeft = 0x4
 	};
 
 	enum class INPUT_EVENT_TYPE : std::int32_t
 	{
-		kButton,
-		kMouseMove,
-		kCursorMove,
-		kChar,
-		kThumbstick,
-		kDeviceConnect,
-		kKinect,
-		kNone
+		kButton = 0x0,
+		kMouseMove = 0x1,
+		kCursorMove = 0x2,
+		kChar = 0x3,
+		kThumbstick = 0x4,
+		kDeviceConnect = 0x5,
+		kKinect = 0x6,
+		kNone = 0x7
 	};
 
 	enum class BS_BUTTON_CODE : std::int32_t
diff --git a/CommonLibF4/include/RE/Bethesda/Interface3D.h b/CommonLibF4/include/RE/Bethesda/Interface3D.h
index 2a5661b3..dd3b6d1c 100644
--- a/CommonLibF4/include/RE/Bethesda/Interface3D.h
+++ b/CommonLibF4/include/RE/Bethesda/Interface3D.h
@@ -23,53 +23,53 @@ namespace RE
 	{
 		enum class BackgroundMode
 		{
-			kLive,
-			kStatic,
-			kSolidColor
+			kLive = 0x0,
+			kStatic = 0x1,
+			kSolidColor = 0x2
 		};
 
 		enum class PostEffect
 		{
-			kNone,
-			kPipboy,
-			kHUDGlass,
-			kHUDGlassWithMod,
-			kModMenu,
-			kModMenuHighlightAll,
-			kModMenuHighlightAllNoPulseOrScanLines
+			kNone = 0x0,
+			kPipboy = 0x1,
+			kHUDGlass = 0x2,
+			kHUDGlassWithMod = 0x3,
+			kModMenu = 0x4,
+			kModMenuHighlightAll = 0x5,
+			kModMenuHighlightAllNoPulseOrScanLines = 0x6
 		};
 
 		enum class HighlightEffect
 		{
-			kNone,
-			kVATS
+			kNone = 0x0,
+			kVATS = 0x1
 		};
 
 		enum class OffscreenMenuSize
 		{
-			kPipboy,
-			kFullFrame,
-			kFullFrameText
+			kPipboy = 0x0,
+			kFullFrame = 0x1,
+			kFullFrameText = 0x2
 		};
 
 		enum class ScreenMode
 		{
-			kNone,
-			kWorldAttached,
-			kScreenAttached
+			kNone = 0x0,
+			kWorldAttached = 0x1,
+			kScreenAttached = 0x2
 		};
 
 		enum class OffscreenMenuBlendMode
 		{
-			kAdditive,
-			kAlpha
+			kAdditive = 0x0,
+			kAlpha = 0x1
 		};
 
 		enum class LightType
 		{
-			kSpot,
-			kShadowSpot,
-			kPoint
+			kSpot = 0x0,
+			kShadowSpot = 0x1,
+			kPoint = 0x2
 		};
 
 		class OldScreenEffectControl
diff --git a/CommonLibF4/include/RE/Bethesda/MessageMenuManager.h b/CommonLibF4/include/RE/Bethesda/MessageMenuManager.h
index 06cd991f..b5b9eafb 100644
--- a/CommonLibF4/include/RE/Bethesda/MessageMenuManager.h
+++ b/CommonLibF4/include/RE/Bethesda/MessageMenuManager.h
@@ -13,40 +13,40 @@ namespace RE
 
 	enum class WARNING_TYPES
 	{
-		kDefault,
-		kSystem,
-		kCombat,
-		kAnimation,
-		kAI,
-		kScripts,
-		kSaveLoad,
-		kDialogue,
-		kQuests,
-		kPackages,
-		kEditor,
-		kModels,
-		kTextures,
-		kPlugins,
-		kMasterFile,
-		kForms,
-		kMagic,
-		kShaders,
-		kRendering,
-		kPathfinding,
-		kMenus,
-		kAudio,
-		kCells,
-		kHavok,
-		kFaceGen,
-		kWater,
-		kInGameMessage,
-		kMemory,
-		kPerformance,
-		kLootJoy,
-		kVATS,
-		kDismember,
-		kCompanion,
-		kWorkshop,
+		kDefault = 0x0,
+		kSystem = 0x1,
+		kCombat = 0x2,
+		kAnimation = 0x3,
+		kAI = 0x4,
+		kScripts = 0x5,
+		kSaveLoad = 0x6,
+		kDialogue = 0x7,
+		kQuests = 0x8,
+		kPackages = 0x9,
+		kEditor = 0xA,
+		kModels = 0xB,
+		kTextures = 0xC,
+		kPlugins = 0xD,
+		kMasterFile = 0xE,
+		kForms = 0xF,
+		kMagic = 0x10,
+		kShaders = 0x11,
+		kRendering = 0x12,
+		kPathfinding = 0x13,
+		kMenus = 0x14,
+		kAudio = 0x15,
+		kCells = 0x16,
+		kHavok = 0x17,
+		kFaceGen = 0x18,
+		kWater = 0x19,
+		kInGameMessage = 0x1A,
+		kMemory = 0x1B,
+		kPerformance = 0x1C,
+		kLootJoy = 0x1D,
+		kVATS = 0x1E,
+		kDismember = 0x1F,
+		kCompanion = 0x20,
+		kWorkshop = 0x21,
 	};
 
 	class alignas(0x10) IMessageBoxCallback :
diff --git a/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h b/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h
index 0dd02583..e71088e1 100644
--- a/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h
+++ b/CommonLibF4/include/RE/Bethesda/PipboyInventoryData.h
@@ -31,20 +31,20 @@ namespace RE
 
 		enum ENTRY_TYPE
 		{
-			ENTRY_INT = 0,
-			ENTRY_FIXED_STRING,
-			ENTRY_FLOAT
+			ENTRY_INT = 0x0,
+			ENTRY_FIXED_STRING = 0x1,
+			ENTRY_FLOAT = 0x1
 		};
 
 		enum SORT_ON_FIELD
 		{
-			SOF_ALPHABETICALLY = 0,
-			SOF_DAMAGE,
-			SOF_ROF,
-			SOF_RANGE,
-			SOF_ACCURARY,
-			SOF_VALUE,
-			SOF_WEIGHT
+			SOF_ALPHABETICALLY = 0x0,
+			SOF_DAMAGE = 0x1,
+			SOF_ROF = 0x2,
+			SOF_RANGE = 0x3,
+			SOF_ACCURARY = 0x4,
+			SOF_VALUE = 0x5,
+			SOF_WEIGHT = 0x6
 		};
 
 		struct StackEntry
diff --git a/CommonLibF4/include/RE/Bethesda/PipboyManager.h b/CommonLibF4/include/RE/Bethesda/PipboyManager.h
index c1ac0ff4..cb289ba9 100644
--- a/CommonLibF4/include/RE/Bethesda/PipboyManager.h
+++ b/CommonLibF4/include/RE/Bethesda/PipboyManager.h
@@ -45,10 +45,10 @@ namespace RE
 
 		enum class LOWER_REASON
 		{
-			kNone = 0,
-			kBook = 1,
-			kPerkGrid = 2,
-			kInspect = 3
+			kNone = 0x0,
+			kBook = 0x1,
+			kPerkGrid = 0x2,
+			kInspect = 0x3
 		};
 
 		virtual ~PipboyManager();  // 00
diff --git a/CommonLibF4/include/RE/Bethesda/PlayerControls.h b/CommonLibF4/include/RE/Bethesda/PlayerControls.h
index e068ea1f..6531535c 100644
--- a/CommonLibF4/include/RE/Bethesda/PlayerControls.h
+++ b/CommonLibF4/include/RE/Bethesda/PlayerControls.h
@@ -40,9 +40,9 @@ namespace RE
 
 		enum class ACTIONPRIORITY
 		{
-			kImperative,
-			kQueue,
-			kTry
+			kImperative = 0x0,
+			kQueue = 0x1,
+			kTry = 0x2
 		};
 
 		struct Data
diff --git a/CommonLibF4/include/RE/Bethesda/Script.h b/CommonLibF4/include/RE/Bethesda/Script.h
index 4ffb249f..7aacd344 100644
--- a/CommonLibF4/include/RE/Bethesda/Script.h
+++ b/CommonLibF4/include/RE/Bethesda/Script.h
@@ -9,101 +9,101 @@ namespace RE
 {
 	enum class COMPILER_NAME
 	{
-		kDefault,
-		kSystemWindow,
-		kDialogue
+		kDefault = 0x0,
+		kSystemWindow = 0x1,
+		kDialogue = 0x2
 	};
 
 	enum class SCRIPT_PARAM_TYPE
 	{
-		kChar,
-		kInt,
-		kFloat,
-		kInventoryObject,
-		kObjectRef,
-		kActorValue,
-		kActor,
-		kSpellItem,
-		kAxis,
-		kCell,
-		kAnimGroup,
-		kMagicItem,
-		kSound,
-		kTopic,
-		kQuest,
-		kRace,
-		kClass,
-		kFaction,
-		kSex,
-		kGlobal,
-		kFurnitureOrFormList,
-		kObject,
-		kScriptVar,
-		kStage,
-		kMapMarker,
-		kActorBase,
-		kContainerRef,
-		kWorlOrList,
-		kCrimeType,
-		kPackage,
-		kCombatStyle,
-		kMagicEffect,
-		kFormType,
-		kWeather,
-		kNPC,
-		kOwner,
-		kShaderEffect,
-		kFormList,
-		kMenuIcon,
-		kPerk,
-		kNote,
-		kMiscStat,
-		kImageSpaceMod,
-		kImageSpace,
-		kVATSValue,
-		kVATSValueData,
-		kEventFunction,
-		kEventFunctionMember,
-		kEventFunctionData,
-		kVoiceType,
-		kEncounterZone,
-		kIdleForm,
-		kMessage,
-		kInvObjectOrFormList,
-		kAlignment,
-		kEquipType,
-		kObjectOrFormList,
-		kMusic,
-		kCritStage,
-		kKeyword,
-		kRefType,
-		kLocation,
-		kForm,
-		kAlias,
-		kShout,
-		kWordOfPower,
-		kRelationshipRank,
-		kBGSScene,
-		kCastingSource,
-		kAssociationType,
-		kWardState,
-		kPackageDataCanBeNull,
-		kPackageDataNumeric,
-		kPackageDataReference,
-		kVMScriptVar,
-		kReferenceEffect,
-		kPackageDataLocation,
-		kSoundCategory,
-		kKnowableForm,
-		kRegion,
-		kAction,
-		kMovementIdleFromState,
-		kMovementIdleToState,
-		kVMRefOrAliasScript,
-		kDamageType,
-		kSceneAction,
-		kKeywordOrFormlist,
-		kFurnEntryType
+		kChar = 0x0,
+		kInt = 0x1,
+		kFloat = 0x2,
+		kInventoryObject = 0x3,
+		kObjectRef = 0x4,
+		kActorValue = 0x5,
+		kActor = 0x6,
+		kSpellItem = 0x7,
+		kAxis = 0x8,
+		kCell = 0x9,
+		kAnimGroup = 0xA,
+		kMagicItem = 0xB,
+		kSound = 0xC,
+		kTopic = 0xD,
+		kQuest = 0xE,
+		kRace = 0xF,
+		kClass = 0x10,
+		kFaction = 0x11,
+		kSex = 0x12,
+		kGlobal = 0x13,
+		kFurnitureOrFormList = 0x14,
+		kObject = 0x15,
+		kScriptVar = 0x16,
+		kStage = 0x17,
+		kMapMarker = 0x18,
+		kActorBase = 0x19,
+		kContainerRef = 0x1A,
+		kWorlOrList = 0x1B,
+		kCrimeType = 0x1C,
+		kPackage = 0x1D,
+		kCombatStyle = 0xE,
+		kMagicEffect = 0x1F,
+		kFormType = 0x20,
+		kWeather = 0x21,
+		kNPC = 0x22,
+		kOwner = 0x23,
+		kShaderEffect = 0x24,
+		kFormList = 0x25,
+		kMenuIcon = 0x26,
+		kPerk = 0x27,
+		kNote = 0x28,
+		kMiscStat = 0x29,
+		kImageSpaceMod = 0x2A,
+		kImageSpace = 0x2B,
+		kVATSValue = 0x2C,
+		kVATSValueData = 0x2D,
+		kEventFunction = 0x2E,
+		kEventFunctionMember = 0x2F,
+		kEventFunctionData = 0x30,
+		kVoiceType = 0x31,
+		kEncounterZone = 0x32,
+		kIdleForm = 0x33,
+		kMessage = 0x34,
+		kInvObjectOrFormList = 0x35,
+		kAlignment = 0x36,
+		kEquipType = 0x37,
+		kObjectOrFormList = 0x38,
+		kMusic = 0x39,
+		kCritStage = 0x3A,
+		kKeyword = 0x3B,
+		kRefType = 0x3C,
+		kLocation = 0x3D,
+		kForm = 0x3E,
+		kAlias = 0x3F,
+		kShout = 0x40,
+		kWordOfPower = 0x41,
+		kRelationshipRank = 0x42,
+		kBGSScene = 0x43,
+		kCastingSource = 0x44,
+		kAssociationType = 0x45,
+		kWardState = 0x46,
+		kPackageDataCanBeNull = 0x47,
+		kPackageDataNumeric = 0x48,
+		kPackageDataReference = 0x49,
+		kVMScriptVar = 0x4A,
+		kReferenceEffect = 0x4B,
+		kPackageDataLocation = 0x4C,
+		kSoundCategory = 0x4D,
+		kKnowableForm = 0x4E,
+		kRegion = 0x4F,
+		kAction = 0x50,
+		kMovementIdleFromState = 0x51,
+		kMovementIdleToState = 0x52,
+		kVMRefOrAliasScript = 0x53,
+		kDamageType = 0x54,
+		kSceneAction = 0x55,
+		kKeywordOrFormlist = 0x56,
+		kFurnEntryType = 0x57
 	};
 
 	enum class SCRIPT_ERROR;
diff --git a/CommonLibF4/include/RE/Bethesda/Sky.h b/CommonLibF4/include/RE/Bethesda/Sky.h
index 228dfd27..8147ba4b 100644
--- a/CommonLibF4/include/RE/Bethesda/Sky.h
+++ b/CommonLibF4/include/RE/Bethesda/Sky.h
@@ -38,12 +38,12 @@ namespace RE
 
 		enum class Mode
 		{
-			kNone = 0,
-			kInterior,
-			kSkyDomeOnly,
-			kFull,
+			kNone = 0x0,
+			kInterior = 0x1,
+			kSkyDomeOnly = 0x2,
+			kFull = 0x3,
 
-			kTotal
+			kTotal = 0x4
 		};
 
 		enum class Flags
diff --git a/CommonLibF4/include/RE/Bethesda/TESBoundAnimObjects.h b/CommonLibF4/include/RE/Bethesda/TESBoundAnimObjects.h
index 95db8bcd..2e608a1d 100644
--- a/CommonLibF4/include/RE/Bethesda/TESBoundAnimObjects.h
+++ b/CommonLibF4/include/RE/Bethesda/TESBoundAnimObjects.h
@@ -229,16 +229,16 @@ namespace RE
 	public:
 		enum class Type
 		{
-			kNone,
-			kCreateObject,
-			kWeapons,
-			kEnchanting,
-			kEnchantingExperiment,
-			kAlchemy,
-			kAlchemyExperiment,
-			kArmor,
-			kPowerArmor,
-			kRobotMod
+			kNone = 0x0,
+			kCreateObject = 0x1,
+			kWeapons = 0x2,
+			kEnchanting = 0x3,
+			kEnchantingExperiment = 0x4,
+			kAlchemy = 0x5,
+			kAlchemyExperiment = 0x6,
+			kArmor = 0x7,
+			kPowerArmor = 0x8,
+			kRobotMod = 0x9
 		};
 
 		// members
@@ -342,10 +342,10 @@ namespace RE
 	enum class SEX : std::uint32_t
 	{
 		kNone = static_cast<std::underlying_type_t<SEX>>(-1),
-		kMale = 0,
-		kFemale = 1,
+		kMale = 0x0,
+		kFemale = 0x1,
 
-		kTotal = 2
+		kTotal = 0x2
 	};
 
 	class __declspec(novtable) TESNPC :
diff --git a/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h b/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h
index 299f5136..535a1e5b 100644
--- a/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h
+++ b/CommonLibF4/include/RE/Bethesda/TESBoundObjects.h
@@ -462,28 +462,28 @@ namespace RE
 
 	enum class MELEE_ATTACK_SPEED : std::int32_t
 	{
-		kVerySlow = 0,
-		kSlow = 1,
-		kMedium = 2,
-		kFast = 3,
-		kVeryFast = 4
+		kVerySlow = 0x0,
+		kSlow = 0x1,
+		kMedium = 0x2,
+		kFast = 0x3,
+		kVeryFast = 0x4
 	};
 
 	enum class WEAPON_TYPE : std::uint8_t
 	{
 		kNone = 0xFF,
-		kHandToHand = 0,
-		kOneHandSword = 1,
-		kOneHandDagger = 2,
-		kOneHandAxe = 3,
-		kOneHandMace = 4,
-		kTwoHandSword = 5,
-		kTwoHandAxe = 6,
-		kBow = 7,
-		kStaff = 8,
-		kGun = 9,
-		kGrenade = 10,
-		kMine = 11,
+		kHandToHand = 0x0,
+		kOneHandSword = 0x1,
+		kOneHandDagger = 0x2,
+		kOneHandAxe = 0x3,
+		kOneHandMace = 0x4,
+		kTwoHandSword = 0x5,
+		kTwoHandAxe = 0x6,
+		kBow = 0x7,
+		kStaff = 0x8,
+		kGun = 0x9,
+		kGrenade = 0xA,
+		kMine = 0xB,
 	};
 
 	enum class WEAPON_FLAGS : std::uint32_t
@@ -515,29 +515,29 @@ namespace RE
 
 	enum class WEAPON_RUMBLE_PATTERN : std::int32_t
 	{
-		kConstant = 0,
-		kPeriodicSquare = 1,
-		kPeriodicTriangle = 2,
-		kPeriodicSawtooth = 3,
-		kPatternCount = 4
+		kConstant = 0x0,
+		kPeriodicSquare = 0x1,
+		kPeriodicTriangle = 0x2,
+		kPeriodicSawtooth = 0x3,
+		kPatternCount = 0x4
 	};
 
 	enum class WEAPONHITBEHAVIOR : std::int32_t
 	{
-		kNormal = 0,
-		kDismemberOnly = 1,
-		kExplodeOnly = 2,
-		kNoDismemberOrExplode = 3
+		kNormal = 0x0,
+		kDismemberOnly = 0x1,
+		kExplodeOnly = 0x2,
+		kNoDismemberOrExplode = 0x3
 	};
 
 	enum class SOUND_LEVEL : std::int32_t
 	{
-		kLoud = 0,
-		kNormal = 1,
-		kSilent = 2,
-		kVeryLoud = 3,
-		kQuiet = 4,
-		kCount = 5
+		kLoud = 0x0,
+		kNormal = 0x1,
+		kSilent = 0x2,
+		kVeryLoud = 0x3,
+		kQuiet = 0x4,
+		kCount = 0x5
 	};
 
 	class __declspec(novtable) TESObjectWEAP :
diff --git a/CommonLibF4/include/RE/Bethesda/TESCamera.h b/CommonLibF4/include/RE/Bethesda/TESCamera.h
index 9a4e62e5..a3847fea 100644
--- a/CommonLibF4/include/RE/Bethesda/TESCamera.h
+++ b/CommonLibF4/include/RE/Bethesda/TESCamera.h
@@ -31,21 +31,21 @@ namespace RE
 	{
 		enum CameraState : std::uint32_t
 		{
-			kFirstPerson,
-			kAutoVanity,
-			kVATS,
-			kFree,
-			kIronSights,
-			kPCTransition,
-			kTween,
-			kAnimated,
-			k3rdPerson,
-			kFurniture,
-			kMount,
-			kBleedout,
-			kDialogue,
+			kFirstPerson = 0x0,
+			kAutoVanity = 0x1,
+			kVATS = 0x2,
+			kFree = 0x3,
+			kIronSights = 0x4,
+			kPCTransition = 0x5,
+			kTween = 0x6,
+			kAnimated = 0x7,
+			k3rdPerson = 0x8,
+			kFurniture = 0x9,
+			kMount = 0xA,
+			kBleedout = 0xB,
+			kDialogue = 0xC,
 
-			kTotal
+			kTotal = 0xD
 		};
 	};
 	using CameraState = CameraStates::CameraState;
diff --git a/CommonLibF4/include/RE/Bethesda/TESCondition.h b/CommonLibF4/include/RE/Bethesda/TESCondition.h
index 013ea95b..2c1bc7cf 100644
--- a/CommonLibF4/include/RE/Bethesda/TESCondition.h
+++ b/CommonLibF4/include/RE/Bethesda/TESCondition.h
@@ -14,27 +14,27 @@ namespace RE
 
 	enum class CONDITIONITEMOBJECT : unsigned
 	{
-		kSelf,
-		kTarget,
-		kRef,
-		kCombatTarget,
-		kLinkedRef,
-		kQuestAlias,
-		kPackData,
-		kEventData,
-		kCommandTarget,
-		kEventCameraRef,
-		kMyKiller
+		kSelf = 0x0,
+		kTarget = 0x1,
+		kRef = 0x2,
+		kCombatTarget = 0x3,
+		kLinkedRef = 0x4,
+		kQuestAlias = 0x5,
+		kPackData = 0x6,
+		kEventData = 0x7,
+		kCommandTarget = 0x8,
+		kEventCameraRef = 0x9,
+		kMyKiller = 0xA
 	};
 
 	enum class ENUM_COMPARISON_CONDITION : std::uint8_t
 	{
-		kEqual,
-		kNotEqual,
-		kGreaterThan,
-		kGreaterThanEqual,
-		kLessThan,
-		kLessThanEqual
+		kEqual = 0x0,
+		kNotEqual = 0x1,
+		kGreaterThan = 0x2,
+		kGreaterThanEqual = 0x3,
+		kLessThan = 0x4,
+		kLessThanEqual = 0x5
 	};
 
 	struct FUNCTION_DATA
diff --git a/CommonLibF4/include/RE/Bethesda/TESForms.h b/CommonLibF4/include/RE/Bethesda/TESForms.h
index 19e53538..6f8ea56f 100644
--- a/CommonLibF4/include/RE/Bethesda/TESForms.h
+++ b/CommonLibF4/include/RE/Bethesda/TESForms.h
@@ -910,7 +910,7 @@ namespace RE
 		std::uint32_t                            formFlags;        // 10
 		TESFormID                                formID;           // 14
 		std::uint16_t                            inGameFormFlags;  // 18
-		REX::EnumSet<ENUM_FORM_ID, std::uint8_t> formType;         // 1A
+		ENUM_FORM_ID							 formType;         // 1A
 	};
 	static_assert(sizeof(TESForm) == 0x20);
 
@@ -1243,16 +1243,16 @@ namespace RE
 
 		enum class SpellContext
 		{
-			kApplyOnLightning,
-			kApplyWhenActive
+			kApplyOnLightning = 0x0,
+			kApplyWhenActive = 0x1
 		};
 
 		enum class SoundType
 		{
-			kDefault,
-			kPrecipitation,
-			kWind,
-			kThunder
+			kDefault = 0x0,
+			kPrecipitation = 0x1,
+			kWind = 0x2,
+			kThunder = 0x3
 		};
 
 		struct SpellData
@@ -1471,15 +1471,15 @@ namespace RE
 
 		enum class CELL_STATE
 		{
-			kNotLoaded,
-			kUnloading,
-			kLoadingData,
-			kLoading,
-			kLoaded,
-			kDetaching,
-			kAttachQueued,
-			kAttaching,
-			kAttached
+			kNotLoaded = 0x0,
+			kUnloading = 0x1,
+			kLoadingData = 0x2,
+			kLoading = 0x3,
+			kLoaded = 0x4,
+			kDetaching = 0x5,
+			kAttachQueued = 0x6,
+			kAttaching = 0x7,
+			kAttached = 0x8
 		};
 
 		enum class Flag
@@ -1675,7 +1675,7 @@ namespace RE
 	public:
 		enum class TOPIC_INFO_FLAGS : std::uint32_t
 		{
-			kNone = 0,
+			kNone = 0x0,
 			kStartSceneOnEnd = 0x1,
 			kRandom = 0x2,
 			kSayOnce = 0x4,
@@ -1774,10 +1774,10 @@ namespace RE
 
 		enum CHARISMA_CHALLENGE_SUCCESS : int32_t
 		{
-			CC_SUCCESS_FAIL = 0,
-			CC_SUCCESS_SUCCEED = 1,
-			CC_SUCCESS_COUNT = 2,
-			CC_SUCCESS_NONE = -1,
+			CC_SUCCESS_FAIL = 0x0,
+			CC_SUCCESS_SUCCEED = 0x1,
+			CC_SUCCESS_COUNT = 0x2,
+			CC_SUCCESS_NONE = 0xFFFFFFFF,
 		};
 
 		// Returns nullptr if no parent.
@@ -2213,32 +2213,32 @@ namespace RE
 
 		enum PartType
 		{
-			Torso,
-			Head1,
-			Eye,
-			LookAt,
-			FlyGrab,
-			Head2,
-			LeftArm1,
-			LeftArm2,
-			RightArm1,
-			RightArm2,
-			LeftLeg1,
-			LeftLeg2,
-			LeftLeg3,
-			RightLeg1,
-			RightLeg2,
-			RightLeg3,
-			Brain,
-			Weapon,
-			Root,
-			COM,
-			Pelvis,
-			Camera,
-			OffsetRoot,
-			LeftFoot,
-			RightFoot,
-			FaceTargetSource
+			Torso = 0x0,
+			Head1 = 0x1,
+			Eye = 0x2,
+			LookAt = 0x3,
+			FlyGrab = 0x4,
+			Head2 = 0x5,
+			LeftArm1 = 0x6,
+			LeftArm2 = 0x7,
+			RightArm1 = 0x8,
+			RightArm2 = 0x9,
+			LeftLeg1 = 0xA,
+			LeftLeg2 = 0xB,
+			LeftLeg3 = 0xC,
+			RightLeg1 = 0xD,
+			RightLeg2 = 0xE,
+			RightLeg3 = 0xF,
+			Brain = 0x10,
+			Weapon = 0x11,
+			Root = 0x12,
+			COM = 0x13,
+			Pelvis = 0x14,
+			Camera = 0x15,
+			OffsetRoot = 0x16,
+			LeftFoot = 0x17,
+			RightFoot = 0x18,
+			FaceTargetSource = 0x19
 		};
 
 		// members
@@ -3361,7 +3361,7 @@ namespace RE
 		static_assert(sizeof(RuleSet) == 0x18);
 
 		// members
-		REX::EnumSet<ENUM_FORM_ID, std::int32_t> type;          // 020
+		ENUM_FORM_ID							 type;          // 020
 		RuleSet                                  ruleSets[10];  // 028
 		BSTArray<const BGSInstanceNamingRules*>  mergeSources;  // 118
 	};
diff --git a/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h b/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h
index 98911b1d..c70908b7 100644
--- a/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h
+++ b/CommonLibF4/include/RE/Bethesda/TESObjectREFRs.h
@@ -100,12 +100,12 @@ namespace RE
 
 	enum class ITEM_REMOVE_REASON
 	{
-		kNone = 0,
-		kStealing = 1,
-		kSelling = 2,
-		KDropping = 3,
-		kStoreContainer = 4,
-		kStoreTeammate = 5
+		kNone = 0x0,
+		kStealing = 0x1,
+		kSelling = 0x2,
+		KDropping = 0x3,
+		kStoreContainer = 0x4,
+		kStoreTeammate = 0x5
 	};
 
 	enum class RESET_3D_FLAGS
@@ -393,22 +393,22 @@ namespace RE
 	{
 		kNone = static_cast<std::underlying_type_t<BIPED_OBJECT>>(-1),
 
-		kEditorCount = 32,
+		kEditorCount = 0x20,
 
 		kWeaponHand = kEditorCount,
-		kWeaponSword,
-		kWeaponDagger,
-		kWeaponAxe,
-		kWeaponMace,
-		kWeaponTwoHandMelee,
-		kWeaponBow,
-		kWeaponStaff,
-		kQuiver,
-		kWeaponGun,
-		kWeaponGrenade,
-		kWeaponMine,
-
-		kTotal
+		kWeaponSword = 0x21,
+		kWeaponDagger = 0x22,
+		kWeaponAxe = 0x23,
+		kWeaponMace = 0x24,
+		kWeaponTwoHandMelee = 0x25,
+		kWeaponBow = 0x26,
+		kWeaponStaff = 0x27,
+		kQuiver = 0x28,
+		kWeaponGun = 0x29,
+		kWeaponGrenade = 0x2A,
+		kWeaponMine = 0x2B,
+
+		kTotal = 0x2C
 	};
 
 	struct BIPOBJECT
@@ -461,15 +461,15 @@ namespace RE
 	enum class LOCK_LEVEL
 	{
 		kUnlocked = static_cast<std::underlying_type_t<BIPED_OBJECT>>(-1),
-		kEasy = 0,
-		kAverage = 1,
-		kHard = 2,
-		kVeryHard = 3,
-		kRequiresKey = 4,
-		kInaccessible = 5,
-		kTerminal = 6,
-		kBarred = 7,
-		kChained = 8,
+		kEasy = 0x0,
+		kAverage = 0x1,
+		kHard = 0x2,
+		kVeryHard = 0x3,
+		kRequiresKey = 0x4,
+		kInaccessible = 0x5,
+		kTerminal = 0x6,
+		kBarred = 0x7,
+		kChained = 0x8,
 	};
 
 	struct REFR_LOCK
diff --git a/CommonLibF4/include/RE/Bethesda/TESRace.h b/CommonLibF4/include/RE/Bethesda/TESRace.h
index 753a8075..4ec508f0 100644
--- a/CommonLibF4/include/RE/Bethesda/TESRace.h
+++ b/CommonLibF4/include/RE/Bethesda/TESRace.h
@@ -19,10 +19,10 @@ namespace RE
 
 	enum class RACE_SIZE
 	{
-		kSmall,
-		kMedium,
-		kLarge,
-		kExtraLarge
+		kSmall = 0x0,
+		kMedium = 0x1,
+		kLarge = 0x2,
+		kExtraLarge = 0x2
 	};
 
 	struct RACE_DATA
diff --git a/CommonLibF4/include/RE/Bethesda/UIMessage.h b/CommonLibF4/include/RE/Bethesda/UIMessage.h
index 3366b15a..adaa37a0 100644
--- a/CommonLibF4/include/RE/Bethesda/UIMessage.h
+++ b/CommonLibF4/include/RE/Bethesda/UIMessage.h
@@ -13,27 +13,27 @@ namespace RE
 
 	enum class UI_MESSAGE_RESULTS
 	{
-		kHandled,
-		kIgnore,
-		kPassOn
+		kHandled = 0x0,
+		kIgnore = 0x1,
+		kPassOn = 0x2
 	};
 
 	enum class UI_MESSAGE_TYPE
 	{
-		kUpdate,
-		kShow,
-		kReshow,
-		kHide,
-		kForceHide,
-		kScaleformEvent,
-		kUserEvent,
-		kInventoryUpdate,
-		kUserProfileChange,
-		kMUStatusChange,
-		kResumeCaching,
-		kUpdateController,
-		kChatterEvent,
-		kTotal
+		kUpdate = 0x0,
+		kShow = 0x1,
+		kReshow = 0x2,
+		kHide = 0x3,
+		kForceHide = 0x4,
+		kScaleformEvent = 0x5,
+		kUserEvent = 0x6,
+		kInventoryUpdate = 0x7,
+		kUserProfileChange = 0x8,
+		kMUStatusChange = 0x9,
+		kResumeCaching = 0xA,
+		kUpdateController = 0xB,
+		kChatterEvent = 0xC,
+		kTotal = 0xD
 	};
 
 	class IUIMessageData;
diff --git a/CommonLibF4/include/RE/Bethesda/UserEvents.h b/CommonLibF4/include/RE/Bethesda/UserEvents.h
index 35263b63..0b7b0f15 100644
--- a/CommonLibF4/include/RE/Bethesda/UserEvents.h
+++ b/CommonLibF4/include/RE/Bethesda/UserEvents.h
@@ -24,51 +24,51 @@ namespace RE
 
 		enum class INPUT_CONTEXT_ID
 		{
-			kMainGameplay = 0,
-			kBasicMenuNav,
-			kThumbNav,
-			kVirtualController,
-			kCursor,
-			kLThumbCursor,
-			kConsole,
-			kDebugText,
-			kBook,
-			kDebugOverlay,
-			kTFC,
-			kDebugMap,
-			kLockpick,
-			kVATS,
-			kVATSPlayback,
-			kMultiActivate,
-			kWorkshop,
-			kScope,
-			kSitWait,
-			kLooksMenu,
-			kWorkshopAddendum,
-			kPauseMenu,
-			kLevelUpMenu,
-			kLevelUpMenuPrevNext,
-			kMainMenu,
-			kQuickContainerMenu,
-			kSpecialActivateRollover,
-			kTwoButtonRollover,
-			kQuickContainerMenuPerk,
-			kVertibird,
-			kPlayBinkMenu,
-			kRobotModAddendum,
-			kCreationClub,
+			kMainGameplay = 0x0,
+			kBasicMenuNav = 0x1,
+			kThumbNav = 0x2,
+			kVirtualController = 0x3,
+			kCursor = 0x4,
+			kLThumbCursor = 0x5,
+			kConsole = 0x6,
+			kDebugText = 0x7,
+			kBook = 0x8,
+			kDebugOverlay = 0x9,
+			kTFC = 0xA,
+			kDebugMap = 0xB,
+			kLockpick = 0xC,
+			kVATS = 0xD,
+			kVATSPlayback = 0xE,
+			kMultiActivate = 0xF,
+			kWorkshop = 0x10,
+			kScope = 0x11,
+			kSitWait = 0x12,
+			kLooksMenu = 0x13,
+			kWorkshopAddendum = 0x14,
+			kPauseMenu = 0x15,
+			kLevelUpMenu = 0x16,
+			kLevelUpMenuPrevNext = 0x17,
+			kMainMenu = 0x18,
+			kQuickContainerMenu = 0x19,
+			kSpecialActivateRollover = 0x1A,
+			kTwoButtonRollover = 0x1B,
+			kQuickContainerMenuPerk = 0x1C,
+			kVertibird = 0x1D,
+			kPlayBinkMenu = 0x1E,
+			kRobotModAddendum = 0x1F,
+			kCreationClub = 0x20,
 
-			kTotal,
+			kTotal = 0x21,
 
-			kNone
+			kNone = 0x22
 		};
 
 		enum class SENDER_ID
 		{
-			kNone,
-			kGameplay,
-			kMenu,
-			kScript
+			kNone = 0x0,
+			kGameplay = 0x1,
+			kMenu = 0x2,
+			kScript = 0x3
 		};
 	}
 
diff --git a/CommonLibF4/include/RE/Bethesda/VATS.h b/CommonLibF4/include/RE/Bethesda/VATS.h
index b3cd65fc..21a0d33c 100644
--- a/CommonLibF4/include/RE/Bethesda/VATS.h
+++ b/CommonLibF4/include/RE/Bethesda/VATS.h
@@ -34,8 +34,8 @@ namespace RE
 
 		enum class VATS_MODE_ENUM
 		{
-			kNone = 0,
-			kPlayback = 1
+			kNone = 0x0,
+			kPlayback = 0x1
 		};
 
 		virtual ~VATS();  // 00
diff --git a/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h b/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h
index b3305c0f..54839134 100644
--- a/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h
+++ b/CommonLibF4/include/RE/Bethesda/bhkCharacterController.h
@@ -41,13 +41,13 @@ namespace RE
 	public:
 		enum class Preset
 		{
-			STATIC = 0,  ///< No velocity allowed
-			DYNAMIC,     ///< For regular dynamic bodies, undamped and gravity factor = 1
-			KEYFRAMED,   ///< like DYNAMIC, but gravity factor = 0
-			FROZEN,      ///< like KEYFRAMED, but lots of damping
-			DEBRIS,      ///< like DYNAMIC, but aggressive deactivation
+			STATIC = 0x0,		///< No velocity allowed
+			DYNAMIC = 0x1,		///< For regular dynamic bodies, undamped and gravity factor = 1
+			KEYFRAMED = 0x2,	///< like DYNAMIC, but gravity factor = 0
+			FROZEN = 0x3,		///< like KEYFRAMED, but lots of damping
+			DEBRIS = 0x4,		///< like DYNAMIC, but aggressive deactivation
 
-			NUM_PRESETS
+			NUM_PRESETS = 0x5
 		};
 	};