diff --git a/generation/WinSDK/enums.json b/generation/WinSDK/enums.json
index 200796f0a..f69079230 100644
--- a/generation/WinSDK/enums.json
+++ b/generation/WinSDK/enums.json
@@ -1674,32 +1674,11 @@
   {
     "name": "PARAFORMAT_MASK",
     "flags": true,
-    "members": [
-      {
-        "name": "PFM_ALIGNMENT"
-      },
-      {
-        "name": "PFM_NUMBERING"
-      },
-      {
-        "name": "PFM_OFFSET"
-      },
-      {
-        "name": "PFM_OFFSETINDENT"
-      },
-      {
-        "name": "PFM_RIGHTINDENT"
-      },
-      {
-        "name": "PFM_RTLPARA"
-      },
-      {
-        "name": "PFM_STARTINDENT"
-      },
-      {
-        "name": "PFM_TABSTOPS"
-      }
-    ],
+    "autoPopulate": {
+      "filter": "PFM_",
+      "header": "richedit.h"
+    },
+    "members": [],
     "uses": [
       {
         "struct": "PARAFORMAT",
@@ -19023,26 +19002,11 @@
     "name": "RICH_EDIT_GET_CONTEXT_MENU_SEL_TYPE",
     "type": "ushort",
     "flags": true,
-    "members": [
-      {
-        "name": "SEL_EMPTY"
-      },
-      {
-        "name": "SEL_TEXT"
-      },
-      {
-        "name": "SEL_OBJECT"
-      },
-      {
-        "name": "SEL_MULTICHAR"
-      },
-      {
-        "name": "SEL_MULTIOBJECT"
-      },
-      {
-        "name": "GCM_RIGHTMOUSEDROP"
-      }
-    ],
+    "autoPopulate": {
+      "filter": "SEL_|GCM_RIGHTMOUSEDROP",
+      "header": "richedit.h"
+    },
+    "members": [],
     "uses": [
       {
         "interface": "IRichEditOleCallback",
@@ -28464,17 +28428,11 @@
   {
     "name": "PARAFORMAT_ALIGNMENT",
     "type": "ushort",
-    "members": [
-      {
-        "name": "PFA_CENTER"
-      },
-      {
-        "name": "PFA_LEFT"
-      },
-      {
-        "name": "PFA_RIGHT"
-      }
-    ],
+    "autoPopulate": {
+      "filter": "PFA_",
+      "header": "richedit.h"
+    },
+    "members": [],
     "uses": [
       {
         "struct": "PARAFORMAT",
diff --git a/scripts/ChangesSinceLastRelease.txt b/scripts/ChangesSinceLastRelease.txt
index df6e34944..7be91f253 100644
--- a/scripts/ChangesSinceLastRelease.txt
+++ b/scripts/ChangesSinceLastRelease.txt
@@ -1046,3 +1046,65 @@ Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_NCRYPT_KEY
 Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_ONLY_NCRYPT_KEY_FLAG added
 Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_PREFER_NCRYPT_KEY_FLAG added
 Windows.Win32.Security.Cryptography.CRYPT_ACQUIRE_FLAGS.CRYPT_ACQUIRE_WINDOW_HANDLE_FLAG added
+# fix PARAFORMAT enums missing values
+Windows.Win32.UI.Controls.RichEdit.Apis.PFA_FULL_GLYPHS removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFA_FULL_INTERLETTER removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFA_FULL_INTERWORD removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFA_FULL_NEWSPAPER removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFA_FULL_SCALED removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFA_JUSTIFY removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_BORDER removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_BOX removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_COLLAPSED removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_DONOTHYPHEN removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_KEEP removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_KEEPNEXT removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_LINESPACING removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_NOLINENUMBER removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_NOWIDOWCONTROL removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_NUMBERINGSTART removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_NUMBERINGSTYLE removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_NUMBERINGTAB removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_OUTLINELEVEL removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_PAGEBREAKBEFORE removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_RESERVED2 removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_SHADING removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_SIDEBYSIDE removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_SPACEAFTER removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_SPACEBEFORE removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_STYLE removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_TABLE removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_TABLEROWDELIMITER removed
+Windows.Win32.UI.Controls.RichEdit.Apis.PFM_TEXTWRAPPINGBREAK removed
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_ALIGNMENT.PFA_FULL_GLYPHS added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_ALIGNMENT.PFA_FULL_INTERLETTER added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_ALIGNMENT.PFA_FULL_INTERWORD added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_ALIGNMENT.PFA_FULL_NEWSPAPER added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_ALIGNMENT.PFA_FULL_SCALED added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_ALIGNMENT.PFA_JUSTIFY added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_ALL added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_ALL2 added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_BORDER added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_BOX added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_COLLAPSED added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_DONOTHYPHEN added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_EFFECTS added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_KEEP added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_KEEPNEXT added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_LINESPACING added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_NOLINENUMBER added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_NOWIDOWCONTROL added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_NUMBERINGSTART added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_NUMBERINGSTYLE added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_NUMBERINGTAB added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_OUTLINELEVEL added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_PAGEBREAKBEFORE added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_RESERVED2 added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_SHADING added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_SIDEBYSIDE added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_SPACEAFTER added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_SPACEBEFORE added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_STYLE added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_TABLE added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_TABLEROWDELIMITER added
+Windows.Win32.UI.Controls.RichEdit.PARAFORMAT_MASK.PFM_TEXTWRAPPINGBREAK added