diff --git a/Terminal.Gui/Drawing/Alignment.cs b/Terminal.Gui/Drawing/Alignment.cs
index 40061a8c1..6a160096f 100644
--- a/Terminal.Gui/Drawing/Alignment.cs
+++ b/Terminal.Gui/Drawing/Alignment.cs
@@ -1,12 +1,10 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
 /// <summary>
 ///     Determines the position of items when arranged in a container.
 /// </summary>
-[GenerateEnumExtensionMethods (FastHasFlags = true)]
-
 public enum Alignment
 {
     /// <summary>
diff --git a/Terminal.Gui/Drawing/AlignmentModes.cs b/Terminal.Gui/Drawing/AlignmentModes.cs
index 4de4d5c98..b7e0bb87e 100644
--- a/Terminal.Gui/Drawing/AlignmentModes.cs
+++ b/Terminal.Gui/Drawing/AlignmentModes.cs
@@ -1,4 +1,4 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
@@ -6,7 +6,6 @@ namespace Terminal.Gui;
 ///     Determines alignment modes for <see cref="Alignment"/>.
 /// </summary>
 [Flags]
-[GenerateEnumExtensionMethods (FastHasFlags = true)]
 public enum AlignmentModes
 {
     /// <summary>
diff --git a/Terminal.Gui/Input/KeyBindingScope.cs b/Terminal.Gui/Input/KeyBindingScope.cs
index 3b6c53ebc..0c75299c7 100644
--- a/Terminal.Gui/Input/KeyBindingScope.cs
+++ b/Terminal.Gui/Input/KeyBindingScope.cs
@@ -1,4 +1,4 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
@@ -10,7 +10,7 @@ namespace Terminal.Gui;
 ///     <para>Key bindings are scoped to the most-focused view (<see cref="Focused"/>) by default.</para>
 /// </remarks>
 [Flags]
-[GenerateEnumExtensionMethods (FastHasFlags = true)]
+
 public enum KeyBindingScope
 {
     /// <summary>The key binding is disabled.</summary>
diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj
index 21926c19d..3b312dcdd 100644
--- a/Terminal.Gui/Terminal.Gui.csproj
+++ b/Terminal.Gui/Terminal.Gui.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- =================================================================== -->
   <!-- Version numbers -->
   <!-- Automatically updated by gitversion (run `dotnet-gitversion /updateprojectfiles`)  -->
@@ -68,6 +68,7 @@
     <Using Include="JetBrains.Annotations.PureAttribute" Alias="PureAttribute" />
     <Using Include="System.Drawing" />
     <Using Include="System.Text" />
+    <Using Include="Terminal.Gui.EnumExtensions" />
   </ItemGroup>
   <!-- =================================================================== -->
   <!-- Assembliy names for which internal items are visible -->
diff --git a/Terminal.Gui/View/Adornment/BorderSettings.cs b/Terminal.Gui/View/Adornment/BorderSettings.cs
index 5829d1ed6..7b4846d34 100644
--- a/Terminal.Gui/View/Adornment/BorderSettings.cs
+++ b/Terminal.Gui/View/Adornment/BorderSettings.cs
@@ -1,4 +1,4 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
@@ -6,7 +6,7 @@ namespace Terminal.Gui;
 /// Determines the settings for <see cref="Border"/>.
 /// </summary>
 [Flags]
-[GenerateEnumExtensionMethods (FastHasFlags = true)]
+
 public enum BorderSettings
 {
     /// <summary>
diff --git a/Terminal.Gui/View/Layout/AddOrSubtract.cs b/Terminal.Gui/View/Layout/AddOrSubtract.cs
index e03cfbcfd..83d1dd12c 100644
--- a/Terminal.Gui/View/Layout/AddOrSubtract.cs
+++ b/Terminal.Gui/View/Layout/AddOrSubtract.cs
@@ -1,11 +1,8 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
-
-namespace Terminal.Gui;
+namespace Terminal.Gui;
 
 /// <summary>
 ///     Describes whether an operation should add or subtract values.
 /// </summary>
-[GenerateEnumExtensionMethods]
 public enum AddOrSubtract
 {
     /// <summary>
diff --git a/Terminal.Gui/View/Layout/DimAutoStyle.cs b/Terminal.Gui/View/Layout/DimAutoStyle.cs
index f350e8045..ee712f0fb 100644
--- a/Terminal.Gui/View/Layout/DimAutoStyle.cs
+++ b/Terminal.Gui/View/Layout/DimAutoStyle.cs
@@ -1,4 +1,4 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
@@ -6,7 +6,7 @@ namespace Terminal.Gui;
 ///     Specifies how <see cref="Dim.Auto"/> will compute the dimension.
 /// </summary>
 [Flags]
-[GenerateEnumExtensionMethods (FastHasFlags = true)]
+
 public enum DimAutoStyle
 {
     /// <summary>
diff --git a/Terminal.Gui/View/Layout/DimPercentMode.cs b/Terminal.Gui/View/Layout/DimPercentMode.cs
index 60a7da056..10077848b 100644
--- a/Terminal.Gui/View/Layout/DimPercentMode.cs
+++ b/Terminal.Gui/View/Layout/DimPercentMode.cs
@@ -1,12 +1,10 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
 /// <summary>
 /// Indicates the mode for a <see cref="DimPercent"/> object.
 /// </summary>
-[GenerateEnumExtensionMethods]
-
 public enum DimPercentMode
 {
     /// <summary>
diff --git a/Terminal.Gui/View/Layout/Dimension.cs b/Terminal.Gui/View/Layout/Dimension.cs
index cc56ffd4b..8cfb3f7f0 100644
--- a/Terminal.Gui/View/Layout/Dimension.cs
+++ b/Terminal.Gui/View/Layout/Dimension.cs
@@ -1,12 +1,10 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
 /// <summary>
 ///     Indicates the dimension for <see cref="Dim"/> operations.
 /// </summary>
-
-[GenerateEnumExtensionMethods]
 public enum Dimension
 {
     /// <summary>
diff --git a/Terminal.Gui/View/Layout/Side.cs b/Terminal.Gui/View/Layout/Side.cs
index 6708904da..afdc5640e 100644
--- a/Terminal.Gui/View/Layout/Side.cs
+++ b/Terminal.Gui/View/Layout/Side.cs
@@ -1,4 +1,4 @@
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
@@ -6,7 +6,6 @@ namespace Terminal.Gui;
 ///     Indicates the side for <see cref="Pos"/> operations.
 /// </summary>
 ///
-[GenerateEnumExtensionMethods]
 public enum Side
 {
     /// <summary>
diff --git a/Terminal.Gui/View/ViewDiagnostics.cs b/Terminal.Gui/View/ViewDiagnostics.cs
index 20899cfd0..c7ac7b851 100644
--- a/Terminal.Gui/View/ViewDiagnostics.cs
+++ b/Terminal.Gui/View/ViewDiagnostics.cs
@@ -1,11 +1,10 @@
 
-using Terminal.Gui.Analyzers.Internal.Attributes;
+
 
 namespace Terminal.Gui;
 
 /// <summary>Enables diagnostic functions for <see cref="View"/>.</summary>
 [Flags]
-[GenerateEnumExtensionMethods(FastHasFlags = true)]
 public enum ViewDiagnosticFlags : uint
 {
     /// <summary>All diagnostics off</summary>
diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj
index 1295f4f5a..df715a3de 100644
--- a/UICatalog/UICatalog.csproj
+++ b/UICatalog/UICatalog.csproj
@@ -45,6 +45,7 @@
     <Using Include="System.Drawing.PointF" Alias="PointF" />
     <Using Include="System.Drawing.Size" Alias="Size" />
     <Using Include="System.Drawing.SizeF" Alias="SizeF" />
+    <Using Include="Terminal.Gui.EnumExtensions" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="JetBrains.Annotations" Version="2024.2.0" />