diff --git a/generator/DearImGui/Generator/Parser.hs b/generator/DearImGui/Generator/Parser.hs
index 437b3ea..fe7ecab 100644
--- a/generator/DearImGui/Generator/Parser.hs
+++ b/generator/DearImGui/Generator/Parser.hs
@@ -75,7 +75,7 @@ import Data.HashMap.Strict
 import qualified Data.HashMap.Strict as HashMap
   ( fromList, insert, lookup )
 
--- dear-imgui-generator 
+-- dear-imgui-generator
 import DearImGui.Generator.Tokeniser
   ( Tok(..) )
 import DearImGui.Generator.Types
@@ -134,18 +134,20 @@ headers = do
 
   _ <- skipManyTill anySingle ( namedSection "Misc data structures" )
 
-  _ <- skipManyTill anySingle ( namedSection "Obsolete functions" )
+  _ <- skipManyTill anySingle ( namedSection "Helpers (ImGuiOnceUponAFrame, ImGuiTextFilter, ImGuiTextBuffer, ImGuiStorage, ImGuiListClipper, ImColor)" )
 
-  _ <- skipManyTill anySingle ( namedSection "Helpers" )
-
-  _ <- skipManyTill anySingle ( namedSection "Drawing API" )
+  _ <- skipManyTill anySingle ( namedSection "Drawing API (ImDrawCmd, ImDrawIdx, ImDrawVert, ImDrawChannel, ImDrawListSplitter, ImDrawListFlags, ImDrawList, ImDrawData)" )
   skipManyTill anySingle ( try . lookAhead $ many comment *> keyword "enum" )
   drawingEnums <- many ( enumeration enumNamesAndTypes )
 
-  _ <- skipManyTill anySingle ( namedSection "Font API" )
+  _ <- skipManyTill anySingle ( namedSection "Font API (ImFontConfig, ImFontGlyph, ImFontAtlasFlags, ImFontAtlas, ImFontGlyphRangesBuilder, ImFont)" )
   skipManyTill anySingle ( try . lookAhead $ many comment *> keyword "enum" )
   fontEnums <- many ( enumeration enumNamesAndTypes )
 
+  _ <- skipManyTill anySingle ( namedSection "Viewports" )
+
+  _ <- skipManyTill anySingle ( namedSection "Obsolete functions and types" )
+
   let
     enums :: [ Enumeration () ]
     enums = basicEnums <> drawingEnums <> fontEnums
@@ -208,7 +210,7 @@ enumeration enumNamesAndTypes = do
     docs :: [Comment]
     docs = forwardDoc : CommentText "" : inlineDocs
   reservedSymbol '{'
-  ( patterns, EnumState { enumSize, hasExplicitCount } ) <- 
+  ( patterns, EnumState { enumSize, hasExplicitCount } ) <-
     ( `runStateT` EnumState { enumValues = mempty, currEnumTag = 0, enumSize = 0, hasExplicitCount = False } ) $
       catMaybes
           <$> many
diff --git a/imgui b/imgui
index 58075c4..35b1148 160000
--- a/imgui
+++ b/imgui
@@ -1 +1 @@
-Subproject commit 58075c4414b985b352d10718b02a8c43f25efd7c
+Subproject commit 35b1148efb839381b84de9290d9caf0b66ad7d03