diff --git a/raylib.ads b/raylib.ads
index 12259d9..f07b6da 100644
--- a/raylib.ads
+++ b/raylib.ads
@@ -3036,362 +3036,459 @@ package Raylib is
       Convention    => C,
       External_Name => "GenImageText";
 
-   --~function Image ImageCopy (
-      --~Image image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Image_Copy (
+      Data : Image := No_Image
+   ) return Image with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageCopy";
 
-   --~function Image ImageFromImage (
-      --~Image image, Rectangle rec
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Image_From_Image (
+      Data : Image     := No_Image;
+      Crop : Rectangle := No_Rectangle
+   ) return Image with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageFromImage";
 
-   --~function Image ImageText (
-      --~const char *text, int fontSize, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Image_Text (
+      Text      : String  := "";
+      Font_Size : Natural := 0;
+      Tint      : Color   := Black
+   ) return Image with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageText";
 
-   --~function Image ImageTextEx (
-      --~Font font, const char *text, float fontSize, float spacing, Color tint
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Image_Text_Ex (
+      Data      : Font    := No_Font;
+      Text      : String  := "";
+      Font_Size : Natural := 0;
+      Spacing   : Float   := 0.0;
+      Tint      : Color   := Black
+   ) return Image with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageTextEx";
 
-   --~procedure ImageFormat (
-      --~Image *image, int newFormat
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Format (
+      Data   : access Image   := null;
+      Format :        Integer := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageFormat";
 
-   --~procedure ImageToPOT (
-      --~Image *image, Color fill
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_To_POT (
+      Data : access Image := null;
+      Fill :        Color := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageToPOT";
 
-   --~procedure ImageCrop (
-      --~Image *image, Rectangle crop
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Crop (
+      Data : access Image     := null;
+      Crop :        Rectangle := No_Rectangle
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageCrop";
 
-   --~procedure ImageAlphaCrop (
-      --~Image *image, float threshold
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Alpha_Crop (
+      Data      : access Image := null;
+      Threshold :        Float := 0.0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageAlphaCrop";
 
-   --~procedure ImageAlphaClear (
-      --~Image *image, Color color, float threshold
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Alpha_Clear (
+      Data      : access Image := null;
+      Tint      :        Color := White;
+      Threshold :        Float := 0.0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageAlphaClear";
 
-   --~procedure ImageAlphaMask (
-      --~Image *image, Image alphaMask
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Alpha_Mask (
+      Data : access Image := null;
+      Mask :        Image := No_Image
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageAlphaMask";
 
-   --~procedure ImageAlphaPremultiply (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Alpha_Premultiply (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageAlphaPremultiply";
 
-   --~procedure ImageBlurGaussian (
-      --~Image *image, int blurSize
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Blur_Gaussian (
+      Data : access Image   := null;
+      Blur :        Integer := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageBlurGaussian";
 
-   --~procedure ImageKernelConvolution (
-      --~Image *image, float* kernel, int kernelSize
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Kernel_Convolution (
+      Data        : access Image   := null;
+      Kernel      : access Float   := null;
+      Kernel_Size :        Integer := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageKernelConvolution";
 
-   --~procedure ImageResize (
-      --~Image *image, int newWidth, int newHeight
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Resize (
+      Data   : access Image   := null;
+      Width  :        Natural := 0;
+      Height :        Natural := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageResize";
 
-   --~procedure ImageResizeNN (
-      --~Image *image, int newWidth,int newHeight
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Resize_NN (
+      Data   : access Image   := null;
+      Width  :        Natural := 0;
+      Height :        Natural := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageResizeNN";
 
-   --~procedure ImageResizeCanvas (
-      --~Image *image, int newWidth, int newHeight, int offsetX, int offsetY, Color fill
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Resize_Canvas (
+      Data   : access Image   := null;
+      Width  :        Natural := 0;
+      Height :        Natural := 0;
+      X      :        Integer := 0;
+      Y      :        Integer := 0;
+      Fill   :        Color   := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageResizeCanvas";
 
-   --~procedure ImageMipmaps (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Mipmaps (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageMipmaps";
 
-   --~procedure ImageDither (
-      --~Image *image, int rBpp, int gBpp, int bBpp, int aBpp
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Dither (
+      Data : access Image   := null;
+      R    :        Integer := 0;
+      G    :        Integer := 0;
+      B    :        Integer := 0;
+      A    :        Integer := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDither";
 
-   --~procedure ImageFlipVertical (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Flip_Vertical (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageFlipVertical";
 
-   --~procedure ImageFlipHorizontal (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Flip_Horizontal (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageFlipHorizontal";
 
-   --~procedure ImageRotate (
-      --~Image *image, int degrees
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Rotate (
+      Data    : access Image   := null;
+      Degrees :        Integer := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageRotate";
 
-   --~procedure ImageRotateCW (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Rotate_CW (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageRotateCW";
 
-   --~procedure ImageRotateCCW (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Rotate_CCW (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageRotateCCW";
 
-   --~procedure ImageColorTint (
-      --~Image *image, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Color_Tint (
+      Data : access Image := null;
+      Tint :        Color := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageColorTint";
 
-   --~procedure ImageColorInvert (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Color_Invert (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageColorInvert";
 
-   --~procedure ImageColorGrayscale (
-      --~Image *image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Color_Grayscale (
+      Data : access Image := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageColorGrayscale";
 
-   --~procedure ImageColorContrast (
-      --~Image *image, float contrast
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Color_Contrast (
+      Data     : access Image := null;
+      Contrast :        Float := 0.0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageColorContrast";
 
-   --~procedure ImageColorBrightness (
-      --~Image *image, int brightness
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Color_Brightness (
+      Data       : access Image   := null;
+      Brightness :        Integer := 0
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageColorBrightness";
 
-   --~procedure ImageColorReplace (
-      --~Image *image, Color color, Color replace
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Color_Replace (
+      Data    : access Image := null;
+      Color_1 :        Color := White;
+      Color_2 :        Color := Black
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageColorReplace";
 
-   --~function Color *LoadImageColors (
-      --~Image image
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Load_Image_Colors (
+      Data : Image := No_Image
+   ) return access Color with
+      Import        => True,
+      Convention    => C,
+      External_Name => "LoadImageColors";
 
-   --~function Color *LoadImagePalette (
-      --~Image image, int maxPaletteSize, int *colorCount
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Load_Image_Palette (
+      Data         :        Image   := No_Image;
+      Palette_Size :        Natural := 0;
+      Color_Count  : access Integer := null
+   ) return access Color with
+      Import        => True,
+      Convention    => C,
+      External_Name => "LoadImagePalette";
 
-   --~procedure UnloadImageColors (
-      --~Color *colors
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Unload_Image_Colors (
+      Colors : access Color := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "UnloadImageColors";
 
-   --~procedure UnloadImagePalette (
-      --~Color *colors
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Unload_Image_Palette (
+      Colors : access Color := null
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "UnloadImagePalette";
 
-   --~function Rectangle GetImageAlphaBorder (
-      --~Image image, float threshold
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Get_Image_Alpha_Border (
+      Data      : Image := No_Image;
+      Threshold : Float := 0.0
+   ) return Rectangle with
+      Import        => True,
+      Convention    => C,
+      External_Name => "GetImageAlphaBorder";
 
-   --~function Color GetImageColor (
-      --~Image image, int x, int y
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   function Get_Image_Color (
+      Data : Image   := No_Image;
+      X    : Integer := 0;
+      Y    : Integer := 0
+   ) return Color with
+      Import        => True,
+      Convention    => C,
+      External_Name => "GetImageColor";
 
-   --~procedure ImageClearBackground (
-      --~Image *dst, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Clear_Background (
+      Destination : access Image := null;
+      Tint        :        Color := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageClearBackground";
 
-   --~procedure ImageDrawPixel (
-      --~Image *dst, int posX, int posY, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Pixel (
+      Destination : access Image   := null;
+      X           :        Integer := 0;
+      Y           :        Integer := 0;
+      Tint        :        Color   := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawPixel";
 
-   --~procedure ImageDrawPixelV (
-      --~Image *dst, Vector2 position, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Pixel_V (
+      Destination : access Image     := null;
+      Position    :        Vector_2D := (others => 0.0);
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawPixelV";
 
-   --~procedure ImageDrawLine (
-      --~Image *dst, int startPosX, int startPosY, int endPosX, int endPosY, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Line (
+      Destination : access Image   := null;
+      From_X      :        Integer := 0;
+      From_Y      :        Integer := 0;
+      To_X        :        Integer := 0;
+      To_Y        :        Integer := 0;
+      Tint        :        Color   := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawLine";
 
-   --~procedure ImageDrawLineV (
-      --~Image *dst, Vector2 start, Vector2 end, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Line_V (
+      Destination : access Image     := null;
+      From        :        Vector_2D := (others => 0.0);
+      To          :        Vector_2D := (others => 0.0);
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawLineV";
 
-   --~procedure ImageDrawCircle (
-      --~Image *dst, int centerX, int centerY, int radius, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Circle (
+      Destination : access Image   := null;
+      Center_X    :        Integer := 0;
+      Center_Y    :        Integer := 0;
+      Radius      :        Integer := 0;
+      Tint        :        Color   := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawCircle";
 
-   --~procedure ImageDrawCircleV (
-      --~Image *dst, Vector2 center, int radius, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Circle_V (
+      Destination : access Image     := null;
+      Center      :        Vector_2D := (others => 0.0);
+      Radius      :        Integer   := 0;
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawCircleV";
 
-   --~procedure ImageDrawCircleLines (
-      --~Image *dst, int centerX, int centerY, int radius, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Circle_Lines (
+      Destination : access Image   := null;
+      Center_X    :        Integer := 0;
+      Center_Y    :        Integer := 0;
+      Radius      :        Integer := 0;
+      Tint        :        Color   := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawCircleLines";
 
-   --~procedure ImageDrawCircleLinesV (
-      --~Image *dst, Vector2 center, int radius, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Circle_Lines_V (
+      Destination : access Image     := null;
+      Center      :        Vector_2D := (others => 0.0);
+      Radius      :        Integer   := 0;
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawCircleLinesV";
 
-   --~procedure ImageDrawRectangle (
-      --~Image *dst, int posX, int posY, int width, int height, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Rectangle (
+      Destination : access Image   := null;
+      X           :        Integer := 0;
+      Y           :        Integer := 0;
+      Width       :        Integer := 0;
+      Height      :        Integer := 0;
+      Tint        :        Color   := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawRectangle";
 
-   --~procedure ImageDrawRectangleV (
-      --~Image *dst, Vector2 position, Vector2 size, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Rectangle_V (
+      Destination : access Image     := null;
+      Position    :        Vector_2D := (others => 0.0);
+      Size        :        Vector_2D := (others => 0.0);
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawRectangleV";
 
-   --~procedure ImageDrawRectangleRec (
-      --~Image *dst, Rectangle rec, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Rectangle_Rec (
+      Destination : access Image     := null;
+      Data        :        Rectangle := No_Rectangle;
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawRectangleRec";
 
-   --~procedure ImageDrawRectangleLines (
-      --~Image *dst, Rectangle rec, int thick, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Rectangle_Lines (
+      Destination : access Image     := null;
+      Data        :        Rectangle := No_Rectangle;
+      Thick       :        Integer   := 0;
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawRectangleLines";
 
-   --~procedure ImageDraw (
-      --~Image *dst, Image src, Rectangle srcRec, Rectangle dstRec, Color tint
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw (
+      Destination : access Image     := null;
+      Source      :        Image     := No_Image;
+      From        :        Rectangle := No_Rectangle;
+      To          :        Rectangle := No_Rectangle;
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDraw";
 
-   --~procedure ImageDrawText (
-      --~Image *dst, const char *text, int posX, int posY, int fontSize, Color color
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Text (
+      Destination : access Image   := null;
+      Text        :        String  := "";
+      X           :        Integer := 0;
+      Y           :        Integer := 0;
+      Font_Size   :        Integer := 0;
+      Tint        :        Color   := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawText";
 
-   --~procedure ImageDrawTextEx (
-      --~Image *dst, Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint
-   --~) with
-      --~Import        => True,
-      --~Convention    => C,
-      --~External_Name => "";
+   procedure Image_Draw_Text_Ex (
+      Destination : access Image     := null;
+      Data        :        Font      := No_Font;
+      Text        :        String    := "";
+      Position    :        Vector_2D := (others => 0.0);
+      Font_Size   :        Float     := 0.0;
+      Spacing     :        Float     := 0.0;
+      Tint        :        Color     := White
+   ) with
+      Import        => True,
+      Convention    => C,
+      External_Name => "ImageDrawTextEx";
 
    function Load_Texture (
       File_Path : String := ""