diff --git a/src/openrct2-ui/windows/About.cpp b/src/openrct2-ui/windows/About.cpp
index 013424083b..07fd60048b 100644
--- a/src/openrct2-ui/windows/About.cpp
+++ b/src/openrct2-ui/windows/About.cpp
@@ -36,7 +36,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_ABOUT_PAGE_RCT2,
     };
 
-    enum WindowAboutWidgetIdx
+    enum WindowAboutWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/AssetPacks.cpp b/src/openrct2-ui/windows/AssetPacks.cpp
index 88124ea517..3ef75fad5f 100644
--- a/src/openrct2-ui/windows/AssetPacks.cpp
+++ b/src/openrct2-ui/windows/AssetPacks.cpp
@@ -30,7 +30,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = STR_ASSET_PACKS;
     static constexpr ScreenSize kWindowSize = { 400, 200 };
 
-    enum WindowAssetPacksWidgetIdx
+    enum WindowAssetPacksWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp
index c7058a6967..2072d0d19c 100644
--- a/src/openrct2-ui/windows/Banner.cpp
+++ b/src/openrct2-ui/windows/Banner.cpp
@@ -35,7 +35,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = STR_BANNER_WINDOW_TITLE;
     static constexpr ScreenSize kWindowSize = { 113, 96 };
 
-    enum WindowBannerWidgetIdx
+    enum WindowBannerWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp
index e395cf2a4e..c729582f48 100644
--- a/src/openrct2-ui/windows/Changelog.cpp
+++ b/src/openrct2-ui/windows/Changelog.cpp
@@ -27,7 +27,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum
+    enum WindowChangelogWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp
index 2474d3d039..eab73c657d 100644
--- a/src/openrct2-ui/windows/Cheats.cpp
+++ b/src/openrct2-ui/windows/Cheats.cpp
@@ -79,7 +79,7 @@ static constexpr auto kWeatherTypes = std::to_array<WeatherInfo>({
     { SPR_G2_WEATHER_BLIZZARD_SMALL, SPR_G2_WEATHER_BLIZZARD, STR_BLIZZARD },
 });
 
-enum WindowCheatsWidgetIdx
+enum WindowCheatsWidgetIdx : WidgetIndex
 {
     WIDX_BACKGROUND,
     WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp
index 0bddf8acf0..3a56952870 100644
--- a/src/openrct2-ui/windows/CustomCurrency.cpp
+++ b/src/openrct2-ui/windows/CustomCurrency.cpp
@@ -25,7 +25,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = STR_CUSTOM_CURRENCY_WINDOW_TITLE;
     static constexpr ScreenSize kWindowSize = { 400, 100 };
 
-    enum WindowCustomCurrencyWidgetIdx
+    enum WindowCustomCurrencyWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp
index 4abf43c55e..f46b3a2c6a 100644
--- a/src/openrct2-ui/windows/DebugPaint.cpp
+++ b/src/openrct2-ui/windows/DebugPaint.cpp
@@ -23,7 +23,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum WindowDebugPaintWidgetIdx
+    enum WindowDebugPaintWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TOGGLE_SHOW_WIDE_PATHS,
diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
index 54ce3dc8e5..ab6e3c898f 100644
--- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp
+++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
@@ -24,7 +24,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr ScreenSize kWindowSize = { 200, 100 };
 
-    enum WindowRideDemolishWidgetIdx
+    enum WindowRideDemolishWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp
index 66075ba49b..5d9712da81 100644
--- a/src/openrct2-ui/windows/Dropdown.cpp
+++ b/src/openrct2-ui/windows/Dropdown.cpp
@@ -48,7 +48,7 @@ namespace OpenRCT2::Ui::Windows
         9, 9, 9, 9, 9, 9, 9,          // 56
     };
 
-    enum
+    enum WindowDropdownWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
     };
diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
index 3897c7b746..c90da19e8e 100644
--- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
@@ -39,7 +39,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr int32_t kToolbarHeight = 32;
 
-    enum
+    enum WindowEditorBottomToolbarWidgetIdx : WidgetIndex
     {
         WIDX_PREVIOUS_IMAGE,       // 1
         WIDX_PREVIOUS_STEP_BUTTON, // 2
diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp
index 404b3b994e..fe80a972b2 100644
--- a/src/openrct2-ui/windows/EditorInventionsList.cpp
+++ b/src/openrct2-ui/windows/EditorInventionsList.cpp
@@ -42,7 +42,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr ScreenSize kWindowSize = { 600, 400 };
     static constexpr StringId kWindowTitle = STR_INVENTION_LIST;
 
-    enum
+    enum WindowEditorInventionsListWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp
index 3f3c293cec..05c807c544 100644
--- a/src/openrct2-ui/windows/EditorObjectSelection.cpp
+++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp
@@ -196,7 +196,7 @@ namespace OpenRCT2::Ui::Windows
 
 #pragma region Widgets
 
-    enum WindowEditorObjectSelectionWidgetIndex
+    enum WindowEditorObjectSelectionWidgetIndex : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/EditorParkEntrance.cpp b/src/openrct2-ui/windows/EditorParkEntrance.cpp
index 11632ba198..3f42511355 100644
--- a/src/openrct2-ui/windows/EditorParkEntrance.cpp
+++ b/src/openrct2-ui/windows/EditorParkEntrance.cpp
@@ -54,7 +54,7 @@ namespace OpenRCT2::Ui::Windows
         ImageIndex imageId = kImageIndexUndefined;
     };
 
-    enum WindowEditorParkEntranceListWidgetIdx
+    enum WindowEditorParkEntranceListWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
index e406684331..8a495b8476 100644
--- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp
+++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
@@ -102,7 +102,7 @@ namespace OpenRCT2::Ui::Windows
         STR_OBJECTIVE_DROPDOWN_MONTHLY_PROFIT_FROM_FOOD_MERCHANDISE,
     };
 
-    enum
+    enum WindowEditorScenarioOptionsWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Error.cpp b/src/openrct2-ui/windows/Error.cpp
index ccceeec7f4..856c89d03b 100644
--- a/src/openrct2-ui/windows/Error.cpp
+++ b/src/openrct2-ui/windows/Error.cpp
@@ -24,7 +24,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum
+    enum WindowErrorWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
     };
diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp
index 0a2924be33..e23e66bff4 100644
--- a/src/openrct2-ui/windows/Finances.cpp
+++ b/src/openrct2-ui/windows/Finances.cpp
@@ -44,7 +44,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_FINANCES_PAGE_COUNT
     };
 
-    enum
+    enum WindowFinancesWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp
index 7b5ff3ea0f..2d40f758c6 100644
--- a/src/openrct2-ui/windows/GameBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp
@@ -41,7 +41,7 @@ using namespace OpenRCT2::Drawing;
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum WindowGameBottomToolbarWidgetIdx
+    enum WindowGameBottomToolbarWidgetIdx : WidgetIndex
     {
         WIDX_LEFT_OUTSET,
         WIDX_LEFT_INSET,
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
index a1652914a9..d800d1f36e 100644
--- a/src/openrct2-ui/windows/Guest.cpp
+++ b/src/openrct2-ui/windows/Guest.cpp
@@ -68,7 +68,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_GUEST_PAGE_COUNT,
     };
 
-    enum WindowGuestWidgetIdx
+    enum WindowGuestWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index 28cbf7e84a..a160542ba6 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -41,7 +41,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = STR_GUESTS;
     static constexpr ScreenSize kWindowSize = { 350, 330 };
 
-    enum WindowGuestListWidgetIdx
+    enum WindowGuestListWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp
index 5fcd1e93a6..b7ef5da905 100644
--- a/src/openrct2-ui/windows/InstallTrack.cpp
+++ b/src/openrct2-ui/windows/InstallTrack.cpp
@@ -38,7 +38,7 @@ using namespace OpenRCT2::Drawing;
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum
+    enum WindowInstallTrackWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp
index c22b38989b..5503ac969c 100644
--- a/src/openrct2-ui/windows/LandRights.cpp
+++ b/src/openrct2-ui/windows/LandRights.cpp
@@ -39,7 +39,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr ScreenSize kWindowSize = kInGameSize;
     static constexpr StringId kWindowTitle = STR_LAND_RIGHTS;
 
-    enum WindowLandRightsWidgetIdx
+    enum WindowLandRightsWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp
index ded3ac4010..5948ea86bd 100644
--- a/src/openrct2-ui/windows/LoadSave.cpp
+++ b/src/openrct2-ui/windows/LoadSave.cpp
@@ -83,7 +83,7 @@ namespace OpenRCT2::Ui::Windows
     static u8string _defaultPath;
     static TrackDesign* _trackDesign;
 
-    enum
+    enum WindowLoadSaveWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp
index 4ec897d639..8783609667 100644
--- a/src/openrct2-ui/windows/MapGen.cpp
+++ b/src/openrct2-ui/windows/MapGen.cpp
@@ -44,7 +44,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_MAPGEN_PAGE_COUNT
     };
 
-    enum
+    enum WindowMapGenWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp
index 1c3103a525..33bfcdf42e 100644
--- a/src/openrct2-ui/windows/MazeConstruction.cpp
+++ b/src/openrct2-ui/windows/MazeConstruction.cpp
@@ -45,7 +45,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = kStringIdNone;
     static constexpr ScreenSize kWindowSize = { 166, 200 };
 
-    enum : WidgetIndex
+    enum WindowMazeConstructionWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp
index 018acc312d..5611a97168 100644
--- a/src/openrct2-ui/windows/Multiplayer.cpp
+++ b/src/openrct2-ui/windows/Multiplayer.cpp
@@ -39,7 +39,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_MULTIPLAYER_PAGE_OPTIONS
     };
 
-    enum WindowMultiplayerWidgetIdx
+    enum WindowMultiplayerWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/NetworkStatus.cpp b/src/openrct2-ui/windows/NetworkStatus.cpp
index e8af9dc3bd..15d5e3844c 100644
--- a/src/openrct2-ui/windows/NetworkStatus.cpp
+++ b/src/openrct2-ui/windows/NetworkStatus.cpp
@@ -18,7 +18,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum WindowNetworkStatusWidgetIdx
+    enum WindowNetworkStatusWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp
index 2ee436a356..11cce72c55 100644
--- a/src/openrct2-ui/windows/NewCampaign.cpp
+++ b/src/openrct2-ui/windows/NewCampaign.cpp
@@ -34,7 +34,7 @@ namespace OpenRCT2::Ui::Windows
 
     constexpr uint16_t kSelectedItemUndefined = 0xFFFF;
 
-    enum WindowNewCampaignWidgetIdx
+    enum WindowNewCampaignWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp
index 54e30e66f0..47aa569b4e 100644
--- a/src/openrct2-ui/windows/NewRide.cpp
+++ b/src/openrct2-ui/windows/NewRide.cpp
@@ -196,7 +196,7 @@ namespace OpenRCT2::Ui::Windows
 
 #pragma region Widgets
 
-    enum
+    enum WindowNewRideWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/News.cpp b/src/openrct2-ui/windows/News.cpp
index 7ecce869a5..c915cc4dda 100644
--- a/src/openrct2-ui/windows/News.cpp
+++ b/src/openrct2-ui/windows/News.cpp
@@ -35,7 +35,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr ScreenSize kWindowSize = { 400, 300 };
     static constexpr uint8_t kItemSeparatorHeight = 2;
 
-    enum WindowNewsWidgetIdx
+    enum WindowNewsWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp
index e4106fd520..77e0477964 100644
--- a/src/openrct2-ui/windows/Options.cpp
+++ b/src/openrct2-ui/windows/Options.cpp
@@ -83,7 +83,7 @@ namespace OpenRCT2::Ui::Windows
 
 #pragma region Widgets
 
-    enum WindowOptionsWidgetIdx
+    enum WindowOptionsWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/OverwritePrompt.cpp b/src/openrct2-ui/windows/OverwritePrompt.cpp
index 62dcdc2615..afa155d15b 100644
--- a/src/openrct2-ui/windows/OverwritePrompt.cpp
+++ b/src/openrct2-ui/windows/OverwritePrompt.cpp
@@ -23,7 +23,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr ScreenSize kWindowSize = { 200, 100 };
 
-    enum
+    enum WindowOverwritePromptWidgetIdx : WidgetIndex
     {
         WIDX_OVERWRITE_BACKGROUND,
         WIDX_OVERWRITE_TITLE,
diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
index c554bc7015..2895c81f25 100644
--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -61,7 +61,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_PARK_PAGE_COUNT,
     };
 
-    enum WindowParkWidgetIdx
+    enum WindowParkWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/PatrolArea.cpp b/src/openrct2-ui/windows/PatrolArea.cpp
index 47ae1d2a3c..b6dfc853d9 100644
--- a/src/openrct2-ui/windows/PatrolArea.cpp
+++ b/src/openrct2-ui/windows/PatrolArea.cpp
@@ -36,7 +36,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = STR_SET_PATROL_AREA;
     static constexpr ScreenSize kWindowSize = { 104, 54 };
 
-    enum WindowPatrolAreaWidgetIdx
+    enum WindowPatrolAreaWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp
index 25b245143c..6206b28aeb 100644
--- a/src/openrct2-ui/windows/Player.cpp
+++ b/src/openrct2-ui/windows/Player.cpp
@@ -36,7 +36,7 @@ namespace OpenRCT2::Ui::Windows
 
 #pragma region Widgets
 
-    enum WindowPlayerWidgetIdx
+    enum WindowPlayerWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ProgressWindow.cpp b/src/openrct2-ui/windows/ProgressWindow.cpp
index 41e81e1b9e..acef9f21c5 100644
--- a/src/openrct2-ui/windows/ProgressWindow.cpp
+++ b/src/openrct2-ui/windows/ProgressWindow.cpp
@@ -23,7 +23,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum ProgressWindowWidgetIdx
+    enum ProgressWindowWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp
index 67461e0980..993a2dc1f6 100644
--- a/src/openrct2-ui/windows/RefurbishRidePrompt.cpp
+++ b/src/openrct2-ui/windows/RefurbishRidePrompt.cpp
@@ -23,7 +23,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr ScreenSize kWindowSize = { 200, 100 };
 
-    enum WindowRideRefurbishWidgetIdx
+    enum WindowRideRefurbishWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp
index f4523cc1c8..7c77393823 100644
--- a/src/openrct2-ui/windows/Research.cpp
+++ b/src/openrct2-ui/windows/Research.cpp
@@ -40,7 +40,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_RESEARCH_PAGE_COUNT
     };
 
-    enum
+    enum WindowResearchWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index cef5727d22..e9d15edd8e 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -108,7 +108,7 @@ namespace OpenRCT2::Ui::Windows
 
 #pragma region Widgets
 
-    enum
+    enum WindowRideWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index a0cf5f1414..7e4917877b 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -98,7 +98,7 @@ namespace OpenRCT2::Ui::Windows
 
 #pragma region Widgets
 
-    enum
+    enum WindowRideConstructionWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp
index 8fb9cf17f3..60d01ea648 100644
--- a/src/openrct2-ui/windows/RideList.cpp
+++ b/src/openrct2-ui/windows/RideList.cpp
@@ -48,7 +48,7 @@ namespace OpenRCT2::Ui::Windows
         PAGE_COUNT
     };
 
-    enum WindowRideListWidgetIdx
+    enum WindowRideListWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp
index a153a778b9..e6e826fbbf 100644
--- a/src/openrct2-ui/windows/SavePrompt.cpp
+++ b/src/openrct2-ui/windows/SavePrompt.cpp
@@ -26,7 +26,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr ScreenSize kWindowSizeSave = { 260, 54 };
     static constexpr ScreenSize kWindowSizeQuit = { 177, 38 };
 
-    enum WindowSavePromptWidgetIdx
+    enum WindowSavePromptWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ScenarioSelect.cpp b/src/openrct2-ui/windows/ScenarioSelect.cpp
index f57459694c..07d768bc76 100644
--- a/src/openrct2-ui/windows/ScenarioSelect.cpp
+++ b/src/openrct2-ui/windows/ScenarioSelect.cpp
@@ -80,7 +80,7 @@ namespace OpenRCT2::Ui::Windows
         };
     };
 
-    enum
+    enum WindowScenarioSelectWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLEBAR,
diff --git a/src/openrct2-ui/windows/SceneryScatter.cpp b/src/openrct2-ui/windows/SceneryScatter.cpp
index 29f82f3006..9fd3a9436d 100644
--- a/src/openrct2-ui/windows/SceneryScatter.cpp
+++ b/src/openrct2-ui/windows/SceneryScatter.cpp
@@ -21,7 +21,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum WindowSceneryScatterWidgetIdx
+    enum WindowSceneryScatterWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index c953b99e7e..94ec8e40ae 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -42,7 +42,7 @@ namespace OpenRCT2::Ui::Windows
 
     static constexpr size_t kMaxPlayerNameLength = 32;
 
-    enum
+    enum WindowServerListWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp
index fb2a198691..a750dad090 100644
--- a/src/openrct2-ui/windows/ServerStart.cpp
+++ b/src/openrct2-ui/windows/ServerStart.cpp
@@ -27,7 +27,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum
+    enum WindowServerStartWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ShortcutKeys.cpp b/src/openrct2-ui/windows/ShortcutKeys.cpp
index f39f657864..6268c72d11 100644
--- a/src/openrct2-ui/windows/ShortcutKeys.cpp
+++ b/src/openrct2-ui/windows/ShortcutKeys.cpp
@@ -32,7 +32,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr ScreenSize kWindowSize = { 420, 280 };
     static constexpr ScreenSize kMaximumWindowSize = { 1200, 800 };
 
-    enum WindowShortcutWidgetIdx
+    enum WindowShortcutWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp
index ba96d70d3f..1411ed0972 100644
--- a/src/openrct2-ui/windows/Sign.cpp
+++ b/src/openrct2-ui/windows/Sign.cpp
@@ -36,7 +36,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = STR_SIGN;
     static constexpr ScreenSize kWindowSize = { 113, 96 };
 
-    enum WindowSignWidgetIdx
+    enum WindowSignWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index b187d89776..cd86b629f9 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -56,7 +56,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_STAFF_PAGE_COUNT,
     };
 
-    enum WindowStaffWidgetIdx
+    enum WindowStaffWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp
index d1433322d2..c248df9093 100644
--- a/src/openrct2-ui/windows/StaffFirePrompt.cpp
+++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp
@@ -25,7 +25,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr StringId kWindowTitle = STR_SACK_STAFF;
     static constexpr ScreenSize kWindowSize = { 200, 100 };
 
-    enum WindowStaffFireWidgetIdx
+    enum WindowStaffFireWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp
index 042c9132c0..6585ee5e8c 100644
--- a/src/openrct2-ui/windows/StaffList.cpp
+++ b/src/openrct2-ui/windows/StaffList.cpp
@@ -60,7 +60,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_STAFF_LIST_TAB_ENTERTAINERS
     };
 
-    enum WindowStaffListWidgetIdx
+    enum WindowStaffListWidgetIdx : WidgetIndex
     {
         WIDX_STAFF_LIST_BACKGROUND,
         WIDX_STAFF_LIST_TITLE,
diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp
index 45c3cb14af..8ed3a8d481 100644
--- a/src/openrct2-ui/windows/TextInput.cpp
+++ b/src/openrct2-ui/windows/TextInput.cpp
@@ -31,7 +31,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr ScreenSize kWindowSize = { 250, 90 };
 
-    enum WindowTextInputWidgetIdx
+    enum WindowTextInputWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp
index 11bf9437dc..563c02ee0f 100644
--- a/src/openrct2-ui/windows/Themes.cpp
+++ b/src/openrct2-ui/windows/Themes.cpp
@@ -46,7 +46,7 @@ namespace OpenRCT2::Ui::Windows
         WINDOW_THEMES_TAB_COUNT
     };
 
-    enum WindowThemesWidgetIdx
+    enum WindowThemesWidgetIdx : WidgetIndex
     {
         WIDX_THEMES_BACKGROUND,
         WIDX_THEMES_TITLE,
diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp
index 5bbfd27bfa..df1b102e7d 100644
--- a/src/openrct2-ui/windows/TileInspector.cpp
+++ b/src/openrct2-ui/windows/TileInspector.cpp
@@ -82,7 +82,7 @@ namespace OpenRCT2::Ui::Windows
         STR_TILE_INSPECTOR_WALL_ANIMATION_FRAME,
     };
 
-    enum WindowTileInspectorWidgetIdx
+    enum WindowTileInspectorWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp
index 1bf0203e55..025b877834 100644
--- a/src/openrct2-ui/windows/TitleExit.cpp
+++ b/src/openrct2-ui/windows/TitleExit.cpp
@@ -17,7 +17,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr ScreenSize kWindowSize = { 40, 64 };
 
-    enum WindowTitleExitWidgetIdx
+    enum WindowTitleExitWidgetIdx : WidgetIndex
     {
         WIDX_EXIT,
     };
diff --git a/src/openrct2-ui/windows/TitleLogo.cpp b/src/openrct2-ui/windows/TitleLogo.cpp
index 1ab6d7ed2a..4c39f8d48b 100644
--- a/src/openrct2-ui/windows/TitleLogo.cpp
+++ b/src/openrct2-ui/windows/TitleLogo.cpp
@@ -18,7 +18,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr ScreenSize kWindowSize = { 232, 136 };
 
-    enum
+    enum WindowTitleLogoWidgetIdx : WidgetIndex
     {
         WIDX_LOGO
     };
diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp
index 9d21e1ec54..e189dd0f93 100644
--- a/src/openrct2-ui/windows/TitleMenu.cpp
+++ b/src/openrct2-ui/windows/TitleMenu.cpp
@@ -29,7 +29,7 @@ namespace OpenRCT2::Ui::Windows
 {
     using namespace OpenRCT2::Drawing;
 
-    enum
+    enum WindowTitleMenuWidgetIdx : WidgetIndex
     {
         WIDX_START_NEW_GAME,
         WIDX_CONTINUE_SAVED_GAME,
diff --git a/src/openrct2-ui/windows/TitleOptions.cpp b/src/openrct2-ui/windows/TitleOptions.cpp
index f73e3fa26c..dd8700bfcd 100644
--- a/src/openrct2-ui/windows/TitleOptions.cpp
+++ b/src/openrct2-ui/windows/TitleOptions.cpp
@@ -16,7 +16,7 @@ namespace OpenRCT2::Ui::Windows
 {
     static constexpr ScreenSize kWindowSize = { 80, 15 };
 
-    enum WindowTitleOptionsWidgetIdx
+    enum WindowTitleOptionsWidgetIdx : WidgetIndex
     {
         WIDX_OPTIONS,
     };
diff --git a/src/openrct2-ui/windows/Tooltip.cpp b/src/openrct2-ui/windows/Tooltip.cpp
index ef4d05e506..cca4fe16ca 100644
--- a/src/openrct2-ui/windows/Tooltip.cpp
+++ b/src/openrct2-ui/windows/Tooltip.cpp
@@ -26,7 +26,7 @@ using namespace OpenRCT2::Drawing;
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum
+    enum WindowTooltipWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND
     };
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index e972c67ef2..278922dc7c 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -63,7 +63,7 @@ using namespace OpenRCT2::Numerics;
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum
+    enum WindowTopToolbarWidgetIdx : WidgetIndex
     {
         WIDX_PAUSE,
         WIDX_FILE_MENU,
diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp
index 0b8e305f11..a9408ac6f5 100644
--- a/src/openrct2-ui/windows/TrackDesignManage.cpp
+++ b/src/openrct2-ui/windows/TrackDesignManage.cpp
@@ -27,7 +27,7 @@ namespace OpenRCT2::Ui::Windows
 
 #pragma region Widgets
 
-    enum
+    enum WindowTrackManageWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp
index 7acff29096..cdd0752427 100644
--- a/src/openrct2-ui/windows/TrackDesignPlace.cpp
+++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp
@@ -60,7 +60,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr auto kPaletteIndexColourTrack = PaletteIndex::primaryRemap5;   // Grey (dark)
     static constexpr auto kPaletteIndexColourStation = PaletteIndex::primaryRemap9; // Grey (light)
 
-    enum
+    enum WindowTrackDesignPlaceWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/TrackList.cpp b/src/openrct2-ui/windows/TrackList.cpp
index 8d1f725c45..8ef701e836 100644
--- a/src/openrct2-ui/windows/TrackList.cpp
+++ b/src/openrct2-ui/windows/TrackList.cpp
@@ -43,7 +43,7 @@ namespace OpenRCT2::Ui::Windows
     static constexpr int32_t kRotateAndSceneryButtonSize = 24;
     static constexpr int32_t kWindowPadding = 5;
 
-    enum
+    enum WindowTrackListWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Transparency.cpp b/src/openrct2-ui/windows/Transparency.cpp
index 99788735e1..0a5c25e339 100644
--- a/src/openrct2-ui/windows/Transparency.cpp
+++ b/src/openrct2-ui/windows/Transparency.cpp
@@ -30,7 +30,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum WindowTransparencyWidgetIndex
+    enum WindowTransparencyWidgetIndex : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp
index 99eb52da29..e65e081ca8 100644
--- a/src/openrct2-ui/windows/ViewClipping.cpp
+++ b/src/openrct2-ui/windows/ViewClipping.cpp
@@ -26,7 +26,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum WindowViewClippingWidgetIdx
+    enum WindowViewClippingWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp
index 70edb8a93e..15cc9f87fb 100644
--- a/src/openrct2-ui/windows/Viewport.cpp
+++ b/src/openrct2-ui/windows/Viewport.cpp
@@ -20,7 +20,7 @@
 
 namespace OpenRCT2::Ui::Windows
 {
-    enum WindowViewportWidgetIdx
+    enum WindowViewportWidgetIdx : WidgetIndex
     {
         WIDX_BACKGROUND,
         WIDX_TITLE,
diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp
index 570d6ceffa..240faded10 100644
--- a/src/openrct2/interface/Screenshot.cpp
+++ b/src/openrct2/interface/Screenshot.cpp
@@ -233,8 +233,11 @@ static RenderTarget CreateRT(const Viewport& viewport)
     RenderTarget rt;
     rt.width = viewport.width;
     rt.height = viewport.height;
-    rt.bits = new (std::nothrow) PaletteIndex[rt.width * rt.height];
-    if (rt.bits == nullptr)
+    try
+    {
+        rt.bits = new PaletteIndex[rt.width * rt.height];
+    }
+    catch (...)
     {
         throw std::runtime_error("Giant screenshot failed, unable to allocate memory for image.");
     }