diff --git a/build.sh b/build.sh
index 60ccd66..2f1883a 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,7 @@ clang -I./include/ -o build/core_input_keys ./examples/core_input_keys.c -L./lib
 clang -I./include/ -o build/shapes_colors_palette ./examples/shapes_colors_palette.c -L./lib/ -lraylib -lm
 clang -I./include/ -o build/game ./game.c -L./lib/ -lraylib -lm
 clang -I./include/ -o ./build/core_input_mouse_wheel ./examples/core_input_mouse_wheel.c -L./lib/ -lraylib -lm
+clang -I./include/ -o ./build/textures_logo_raylib ./examples/textures_logo_raylib.c -L./lib/ -lraylib -lm
 
 clang --target=wasm32 -I./include --no-standard-libraries -Wl,--export-table -Wl,--no-entry -Wl,--allow-undefined -Wl,--export=main -o wasm/core_basic_window.wasm ./examples/core_basic_window.c -DPLATFORM_WEB
 clang --target=wasm32 -I./include --no-standard-libraries -Wl,--export-table -Wl,--no-entry -Wl,--allow-undefined -Wl,--export=main -o wasm/core_basic_screen_manager.wasm ./examples/core_basic_screen_manager.c -DPLATFORM_WEB
@@ -17,3 +18,7 @@ clang --target=wasm32 -I./include --no-standard-libraries -Wl,--export-table -Wl
 clang --target=wasm32 -I./include --no-standard-libraries -Wl,--export-table -Wl,--no-entry -Wl,--allow-undefined -Wl,--export=main -o wasm/shapes_colors_palette.wasm ./examples/shapes_colors_palette.c -DPLATFORM_WEB
 clang --target=wasm32 -I./include --no-standard-libraries -Wl,--export-table -Wl,--no-entry -Wl,--allow-undefined -Wl,--export=main -o wasm/game.wasm game.c -DPLATFORM_WEB
 clang --target=wasm32 -I./include --no-standard-libraries -Wl,--export-table -Wl,--no-entry -Wl,--allow-undefined -Wl,--export=main -o wasm/core_input_mouse_wheel.wasm ./examples/core_input_mouse_wheel.c -DPLATFORM_WEB
+clang --target=wasm32 -I./include --no-standard-libraries -Wl,--export-table -Wl,--no-entry -Wl,--allow-undefined -Wl,--export=main -o wasm/textures_logo_raylib.wasm ./examples/textures_logo_raylib.c -DPLATFORM_WEB
+
+# Instrument all wasm files with Asyncify
+ls wasm | xargs -I{} wasm-opt --asyncify wasm/{} --pass-arg=asyncify-imports@env.WindowShouldClose,env.LoadTexture -o wasm/{}
diff --git a/examples/core_basic_screen_manager.c b/examples/core_basic_screen_manager.c
index 6220c35..728ef12 100644
--- a/examples/core_basic_screen_manager.c
+++ b/examples/core_basic_screen_manager.c
@@ -15,117 +15,11 @@
 
 #include "raylib.h"
 
-void raylib_js_set_entry(void (*entry)(void));
-
 //------------------------------------------------------------------------------------------
 // Types and Structures Definition
 //------------------------------------------------------------------------------------------
 typedef enum GameScreen { LOGO = 0, TITLE, GAMEPLAY, ENDING } GameScreen;
 
-const int screenWidth = 800;
-const int screenHeight = 450;
-GameScreen currentScreen = LOGO;
-int framesCounter = 0;          // Useful to count frames
-
-void GameFrame(void)
-{
-    // Update
-    //----------------------------------------------------------------------------------
-    switch(currentScreen)
-    {
-        case LOGO:
-        {
-            // TODO: Update LOGO screen variables here!
-
-            framesCounter++;    // Count frames
-
-            // Wait for 2 seconds (120 frames) before jumping to TITLE screen
-            if (framesCounter > 120)
-            {
-                currentScreen = TITLE;
-            }
-        } break;
-        case TITLE:
-        {
-            // TODO: Update TITLE screen variables here!
-
-            // Press enter to change to GAMEPLAY screen
-            if (IsKeyPressed(KEY_ENTER) || IsGestureDetected(GESTURE_TAP))
-            {
-                currentScreen = GAMEPLAY;
-            }
-        } break;
-        case GAMEPLAY:
-        {
-            // TODO: Update GAMEPLAY screen variables here!
-
-            // Press enter to change to ENDING screen
-            if (IsKeyPressed(KEY_ENTER) || IsGestureDetected(GESTURE_TAP))
-            {
-                currentScreen = ENDING;
-            }
-        } break;
-        case ENDING:
-        {
-            // TODO: Update ENDING screen variables here!
-
-            // Press enter to return to TITLE screen
-            if (IsKeyPressed(KEY_ENTER) || IsGestureDetected(GESTURE_TAP))
-            {
-                currentScreen = TITLE;
-            }
-        } break;
-        default: break;
-    }
-    //----------------------------------------------------------------------------------
-
-    // Draw
-    //----------------------------------------------------------------------------------
-    BeginDrawing();
-
-    ClearBackground(RAYWHITE);
-
-    switch(currentScreen)
-    {
-        case LOGO:
-        {
-            // TODO: Draw LOGO screen here!
-            DrawText("LOGO SCREEN", 20, 20, 40, LIGHTGRAY);
-            DrawText("WAIT for 2 SECONDS...", 290, 220, 20, GRAY);
-
-        } break;
-        case TITLE:
-        {
-            // TODO: Draw TITLE screen here!
-            DrawRectangle(0, 0, screenWidth, screenHeight, GREEN);
-            DrawText("TITLE SCREEN", 20, 20, 40, DARKGREEN);
-            DrawText("PRESS ENTER or TAP to JUMP to GAMEPLAY SCREEN", 120, 220, 20, DARKGREEN);
-
-        } break;
-        case GAMEPLAY:
-        {
-            // TODO: Draw GAMEPLAY screen here!
-            DrawRectangle(0, 0, screenWidth, screenHeight, PURPLE);
-            DrawText("GAMEPLAY SCREEN", 20, 20, 40, MAROON);
-            DrawText("PRESS ENTER or TAP to JUMP to ENDING SCREEN", 130, 220, 20, MAROON);
-
-        } break;
-        case ENDING:
-        {
-            // TODO: Draw ENDING screen here!
-            DrawRectangle(0, 0, screenWidth, screenHeight, BLUE);
-            DrawText("ENDING SCREEN", 20, 20, 40, DARKBLUE);
-            DrawText("PRESS ENTER or TAP to RETURN to TITLE SCREEN", 120, 220, 20, DARKBLUE);
-
-        } break;
-        default: break;
-    }
-
-    EndDrawing();
-    //----------------------------------------------------------------------------------
-}
-
-
 //------------------------------------------------------------------------------------
 // Program main entry point
 //------------------------------------------------------------------------------------
@@ -133,21 +27,117 @@ int main(void)
 {
     // Initialization
     //--------------------------------------------------------------------------------------
+    const int screenWidth = 800;
+    const int screenHeight = 450;
 
     InitWindow(screenWidth, screenHeight, "raylib [core] example - basic screen manager");
 
+    GameScreen currentScreen = LOGO;
+
     // TODO: Initialize all required variables and load all required data here!
 
+    int framesCounter = 0;          // Useful to count frames
+
     SetTargetFPS(60);               // Set desired framerate (frames-per-second)
     //--------------------------------------------------------------------------------------
 
-#ifdef PLATFORM_WEB
-    raylib_js_set_entry(GameFrame);
-#else
     // Main game loop
     while (!WindowShouldClose())    // Detect window close button or ESC key
     {
-        GameFrame();
+        // Update
+        //----------------------------------------------------------------------------------
+        switch(currentScreen)
+        {
+            case LOGO:
+            {
+                // TODO: Update LOGO screen variables here!
+
+                framesCounter++;    // Count frames
+
+                // Wait for 2 seconds (120 frames) before jumping to TITLE screen
+                if (framesCounter > 120)
+                {
+                    currentScreen = TITLE;
+                }
+            } break;
+            case TITLE:
+            {
+                // TODO: Update TITLE screen variables here!
+
+                // Press enter to change to GAMEPLAY screen
+                if (IsKeyPressed(KEY_ENTER) || IsGestureDetected(GESTURE_TAP))
+                {
+                    currentScreen = GAMEPLAY;
+                }
+            } break;
+            case GAMEPLAY:
+            {
+                // TODO: Update GAMEPLAY screen variables here!
+
+                // Press enter to change to ENDING screen
+                if (IsKeyPressed(KEY_ENTER) || IsGestureDetected(GESTURE_TAP))
+                {
+                    currentScreen = ENDING;
+                }
+            } break;
+            case ENDING:
+            {
+                // TODO: Update ENDING screen variables here!
+
+                // Press enter to return to TITLE screen
+                if (IsKeyPressed(KEY_ENTER) || IsGestureDetected(GESTURE_TAP))
+                {
+                    currentScreen = TITLE;
+                }
+            } break;
+            default: break;
+        }
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            switch(currentScreen)
+            {
+                case LOGO:
+                {
+                    // TODO: Draw LOGO screen here!
+                    DrawText("LOGO SCREEN", 20, 20, 40, LIGHTGRAY);
+                    DrawText("WAIT for 2 SECONDS...", 290, 220, 20, GRAY);
+
+                } break;
+                case TITLE:
+                {
+                    // TODO: Draw TITLE screen here!
+                    DrawRectangle(0, 0, screenWidth, screenHeight, GREEN);
+                    DrawText("TITLE SCREEN", 20, 20, 40, DARKGREEN);
+                    DrawText("PRESS ENTER or TAP to JUMP to GAMEPLAY SCREEN", 120, 220, 20, DARKGREEN);
+
+                } break;
+                case GAMEPLAY:
+                {
+                    // TODO: Draw GAMEPLAY screen here!
+                    DrawRectangle(0, 0, screenWidth, screenHeight, PURPLE);
+                    DrawText("GAMEPLAY SCREEN", 20, 20, 40, MAROON);
+                    DrawText("PRESS ENTER or TAP to JUMP to ENDING SCREEN", 130, 220, 20, MAROON);
+
+                } break;
+                case ENDING:
+                {
+                    // TODO: Draw ENDING screen here!
+                    DrawRectangle(0, 0, screenWidth, screenHeight, BLUE);
+                    DrawText("ENDING SCREEN", 20, 20, 40, DARKBLUE);
+                    DrawText("PRESS ENTER or TAP to RETURN to TITLE SCREEN", 120, 220, 20, DARKBLUE);
+
+                } break;
+                default: break;
+            }
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
     }
 
     // De-Initialization
@@ -157,7 +147,6 @@ int main(void)
 
     CloseWindow();        // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
-#endif
 
     return 0;
 }
diff --git a/examples/core_basic_window.c b/examples/core_basic_window.c
index 2790222..a925a39 100644
--- a/examples/core_basic_window.c
+++ b/examples/core_basic_window.c
@@ -23,19 +23,6 @@
 
 #include "raylib.h"
 
-void raylib_js_set_entry(void (*entry)(void));
-
-void GameFrame(void)
-{
-    BeginDrawing();
-
-        ClearBackground(RAYWHITE);
-
-        DrawText("Congrats! You created your first window!", 190, 200, 20, LIGHTGRAY);
-
-    EndDrawing();
-}
-
 //------------------------------------------------------------------------------------
 // Program main entry point
 //------------------------------------------------------------------------------------
@@ -51,9 +38,6 @@ int main(void)
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
 
-#ifdef PLATFORM_WEB
-    raylib_js_set_entry(GameFrame);
-#else
     // Main game loop
     while (!WindowShouldClose())    // Detect window close button or ESC key
     {
@@ -64,7 +48,13 @@ int main(void)
 
         // Draw
         //----------------------------------------------------------------------------------
-        GameFrame();
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawText("Congrats! You created your first window!", 190, 200, 20, LIGHTGRAY);
+
+        EndDrawing();
         //----------------------------------------------------------------------------------
     }
 
@@ -72,7 +62,6 @@ int main(void)
     //--------------------------------------------------------------------------------------
     CloseWindow();        // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
-#endif
 
     return 0;
 }
diff --git a/examples/core_input_keys.c b/examples/core_input_keys.c
index cdc45e2..511e101 100644
--- a/examples/core_input_keys.c
+++ b/examples/core_input_keys.c
@@ -13,33 +13,6 @@
 
 #include "raylib.h"
 
-void raylib_js_set_entry(void (*entry)(void));
-Vector2 ballPosition = { 0 };
-
-void GameFrame()
-{
-    // Update
-    //----------------------------------------------------------------------------------
-    if (IsKeyDown(KEY_RIGHT)) ballPosition.x += 2.0f;
-    if (IsKeyDown(KEY_LEFT)) ballPosition.x -= 2.0f;
-    if (IsKeyDown(KEY_UP)) ballPosition.y -= 2.0f;
-    if (IsKeyDown(KEY_DOWN)) ballPosition.y += 2.0f;
-    //----------------------------------------------------------------------------------
-
-    // Draw
-    //----------------------------------------------------------------------------------
-    BeginDrawing();
-
-        ClearBackground(RAYWHITE);
-
-        DrawText("move the ball with arrow keys", 10, 10, 20, DARKGRAY);
-
-        DrawCircleV(ballPosition, 50, MAROON);
-
-    EndDrawing();
-    //----------------------------------------------------------------------------------
-}
-
 //------------------------------------------------------------------------------------
 // Program main entry point
 //------------------------------------------------------------------------------------
@@ -52,24 +25,40 @@ int main(void)
 
     InitWindow(screenWidth, screenHeight, "raylib [core] example - keyboard input");
 
-    ballPosition.x = (float)screenWidth/2;
-    ballPosition.y = (float)screenHeight/2;
+    Vector2 ballPosition = { (float)screenWidth/2, (float)screenHeight/2 };
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
-#ifdef PLATFORM_WEB
-    raylib_js_set_entry(GameFrame);
-#else
+
     // Main game loop
     while (!WindowShouldClose())    // Detect window close button or ESC key
     {
-        GameFrame();
+        // Update
+        //----------------------------------------------------------------------------------
+        if (IsKeyDown(KEY_RIGHT)) ballPosition.x += 2.0f;
+        if (IsKeyDown(KEY_LEFT)) ballPosition.x -= 2.0f;
+        if (IsKeyDown(KEY_UP)) ballPosition.y -= 2.0f;
+        if (IsKeyDown(KEY_DOWN)) ballPosition.y += 2.0f;
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawText("move the ball with arrow keys", 10, 10, 20, DARKGRAY);
+
+            DrawCircleV(ballPosition, 50, MAROON);
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
     }
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
     CloseWindow();        // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
-#endif
+
     return 0;
-}
\ No newline at end of file
+}
diff --git a/examples/core_input_mouse_wheel.c b/examples/core_input_mouse_wheel.c
index 84350f0..e8152d1 100644
--- a/examples/core_input_mouse_wheel.c
+++ b/examples/core_input_mouse_wheel.c
@@ -1,8 +1,8 @@
 /*******************************************************************************************
 *
-*   raylib [core] example - Keyboard input
+*   raylib [core] example - Mouse input
 *
-*   Example originally created with raylib 1.0, last time updated with raylib 1.0
+*   Example originally created with raylib 1.0, last time updated with raylib 4.0
 *
 *   Example licensed under an unmodified zlib/libpng license, which is an OSI-certified,
 *   BSD-like license that allows static linking with closed source software
@@ -13,35 +13,6 @@
 
 #include "raylib.h"
 
-void raylib_js_set_entry(void (*entry)(void));
-
-const int screenWidth = 800;
-const int screenHeight = 450;
-int boxPositionY = screenHeight/2 - 40;
-int scrollSpeed = 4;            // Scrolling speed in pixels
-Vector2 ballPosition = { 0 };
-
-void GameFrame()
-{
-    // Update
-    //----------------------------------------------------------------------------------
-    boxPositionY -= (GetMouseWheelMove()*scrollSpeed);
-    //----------------------------------------------------------------------------------
-
-    // Draw
-    //----------------------------------------------------------------------------------
-    BeginDrawing();
-
-        ClearBackground(RAYWHITE);
-
-        DrawRectangle(screenWidth/2 - 40, boxPositionY, 80, 80, MAROON);
-
-        DrawText("Use mouse wheel to move the cube up and down!", 10, 10, 20, GRAY);
-        DrawText(TextFormat("Box position Y: %03i", boxPositionY), 10, 40, 20, LIGHTGRAY);
-
-    EndDrawing();
-}
-
 //------------------------------------------------------------------------------------
 // Program main entry point
 //------------------------------------------------------------------------------------
@@ -49,23 +20,45 @@ int main(void)
 {
     // Initialization
     //--------------------------------------------------------------------------------------
-    InitWindow(screenWidth, screenHeight, "raylib [core] example - input mouse wheel");
+    const int screenWidth = 800;
+    const int screenHeight = 450;
+
+    InitWindow(screenWidth, screenHeight, "raylib [core] example - mouse input");
+
+    int boxPositionY = screenHeight / 2 - 40;
+    int scrollSpeed = 4;            // Scrolling speed in pixels
+    Vector2 ballPosition = { 0 };
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
-    //--------------------------------------------------------------------------------------
-#ifdef PLATFORM_WEB
-    raylib_js_set_entry(GameFrame);
-#else
+    //---------------------------------------------------------------------------------------
+
     // Main game loop
     while (!WindowShouldClose())    // Detect window close button or ESC key
     {
-        GameFrame();
+        // Update
+        //----------------------------------------------------------------------------------
+        boxPositionY -= (GetMouseWheelMove()*scrollSpeed);
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawRectangle(screenWidth/2 - 40, boxPositionY, 80, 80, MAROON);
+
+            DrawText("Use mouse wheel to move the cube up and down!", 10, 10, 20, GRAY);
+            DrawText(TextFormat("Box position Y: %03i", boxPositionY), 10, 40, 20, LIGHTGRAY);
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
     }
 
     // De-Initialization
     //--------------------------------------------------------------------------------------
     CloseWindow();        // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
-#endif
+
     return 0;
 }
diff --git a/examples/resources/raylib_logo.png b/examples/resources/raylib_logo.png
new file mode 100644
index 0000000..15bbaa2
Binary files /dev/null and b/examples/resources/raylib_logo.png differ
diff --git a/examples/shapes_colors_palette.c b/examples/shapes_colors_palette.c
index 3cd0e00..34248eb 100644
--- a/examples/shapes_colors_palette.c
+++ b/examples/shapes_colors_palette.c
@@ -12,66 +12,8 @@
 ********************************************************************************************/
 
 #include "raylib.h"
-#define MAX_COLORS_COUNT    21          // Number of colors available
-
-void raylib_js_set_entry(void (*entry)(void));
-
-Color colors[MAX_COLORS_COUNT] = {
-    DARKGRAY, MAROON, ORANGE, DARKGREEN, DARKBLUE, DARKPURPLE, DARKBROWN,
-    GRAY, RED, GOLD, LIME, BLUE, VIOLET, BROWN, LIGHTGRAY, PINK, YELLOW,
-    GREEN, SKYBLUE, PURPLE, BEIGE };
-
-const char *colorNames[MAX_COLORS_COUNT] = {
-    "DARKGRAY", "MAROON", "ORANGE", "DARKGREEN", "DARKBLUE", "DARKPURPLE",
-    "DARKBROWN", "GRAY", "RED", "GOLD", "LIME", "BLUE", "VIOLET", "BROWN",
-    "LIGHTGRAY", "PINK", "YELLOW", "GREEN", "SKYBLUE", "PURPLE", "BEIGE" };
-
-Rectangle colorsRecs[MAX_COLORS_COUNT] = { 0 };     // Rectangles array
-
-int colorState[MAX_COLORS_COUNT] = { 0 };           // Color state: 0-DEFAULT, 1-MOUSE_HOVER
-
-Vector2 mousePoint = { 0.0f, 0.0f };
-
-
-void GameFrame()
-{
-    // Update
-    //----------------------------------------------------------------------------------
-    mousePoint = GetMousePosition();
-
-    for (int i = 0; i < MAX_COLORS_COUNT; i++)
-    {
-        if (CheckCollisionPointRec(mousePoint, colorsRecs[i])) colorState[i] = 1;
-        else colorState[i] = 0;
-    }
-    //----------------------------------------------------------------------------------
-
-    // Draw
-    //----------------------------------------------------------------------------------
-    BeginDrawing();
-
-        ClearBackground(RAYWHITE);
-
-        DrawText("raylib colors palette", 28, 42, 20, BLACK);
-        DrawText("press SPACE to see all colors", GetScreenWidth() - 180, GetScreenHeight() - 40, 10, GRAY);
-
-        for (int i = 0; i < MAX_COLORS_COUNT; i++)    // Draw all rectangles
-        {
-            DrawRectangleRec(colorsRecs[i], Fade(colors[i], colorState[i]? 0.6f : 1.0f));
-
-            if (IsKeyDown(KEY_SPACE) || colorState[i])
-            {
-                DrawRectangle((int)colorsRecs[i].x, (int)(colorsRecs[i].y + colorsRecs[i].height - 26), (int)colorsRecs[i].width, 20, BLACK);
-                DrawRectangleLinesEx(colorsRecs[i], 6, Fade(BLACK, 0.3f));
-                DrawText(colorNames[i], (int)(colorsRecs[i].x + colorsRecs[i].width - MeasureText(colorNames[i], 10) - 12),
-                    (int)(colorsRecs[i].y + colorsRecs[i].height - 20), 10, colors[i]);
-            }
-        }
-
-    EndDrawing();
-    //----------------------------------------------------------------------------------
-}
 
+#define MAX_COLORS_COUNT    21          // Number of colors available
 
 //------------------------------------------------------------------------------------
 // Program main entry point
@@ -85,6 +27,17 @@ int main(void)
 
     InitWindow(screenWidth, screenHeight, "raylib [shapes] example - colors palette");
 
+    static Color colors[MAX_COLORS_COUNT] = {
+        DARKGRAY, MAROON, ORANGE, DARKGREEN, DARKBLUE, DARKPURPLE, DARKBROWN,
+        GRAY, RED, GOLD, LIME, BLUE, VIOLET, BROWN, LIGHTGRAY, PINK, YELLOW,
+        GREEN, SKYBLUE, PURPLE, BEIGE };
+
+    static const char *colorNames[MAX_COLORS_COUNT] = {
+        "DARKGRAY", "MAROON", "ORANGE", "DARKGREEN", "DARKBLUE", "DARKPURPLE",
+        "DARKBROWN", "GRAY", "RED", "GOLD", "LIME", "BLUE", "VIOLET", "BROWN",
+        "LIGHTGRAY", "PINK", "YELLOW", "GREEN", "SKYBLUE", "PURPLE", "BEIGE" };
+
+    static Rectangle colorsRecs[MAX_COLORS_COUNT] = { 0 };     // Rectangles array
 
     // Fills colorsRecs data (for every rectangle)
     for (int i = 0; i < MAX_COLORS_COUNT; i++)
@@ -95,23 +48,57 @@ int main(void)
         colorsRecs[i].height = 100.0f;
     }
 
+    int colorState[MAX_COLORS_COUNT] = { 0 };           // Color state: 0-DEFAULT, 1-MOUSE_HOVER
 
+    Vector2 mousePoint = { 0.0f, 0.0f };
 
     SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
     //--------------------------------------------------------------------------------------
 
-#ifdef PLATFORM_WEB
-    raylib_js_set_entry(GameFrame);
-#else
     // Main game loop
     while (!WindowShouldClose())    // Detect window close button or ESC key
     {
-        GameFrame();
+        // Update
+        //----------------------------------------------------------------------------------
+        mousePoint = GetMousePosition();
+
+        for (int i = 0; i < MAX_COLORS_COUNT; i++)
+        {
+            if (CheckCollisionPointRec(mousePoint, colorsRecs[i])) colorState[i] = 1;
+            else colorState[i] = 0;
+        }
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawText("raylib colors palette", 28, 42, 20, BLACK);
+            DrawText("press SPACE to see all colors", GetScreenWidth() - 180, GetScreenHeight() - 40, 10, GRAY);
+
+            for (int i = 0; i < MAX_COLORS_COUNT; i++)    // Draw all rectangles
+            {
+                DrawRectangleRec(colorsRecs[i], Fade(colors[i], colorState[i]? 0.6f : 1.0f));
+
+                if (IsKeyDown(KEY_SPACE) || colorState[i])
+                {
+                    DrawRectangle((int)colorsRecs[i].x, (int)(colorsRecs[i].y + colorsRecs[i].height - 26), (int)colorsRecs[i].width, 20, BLACK);
+                    DrawRectangleLinesEx(colorsRecs[i], 6, Fade(BLACK, 0.3f));
+                    DrawText(colorNames[i], (int)(colorsRecs[i].x + colorsRecs[i].width - MeasureText(colorNames[i], 10) - 12),
+                        (int)(colorsRecs[i].y + colorsRecs[i].height - 20), 10, colors[i]);
+                }
+            }
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
     }
+
     // De-Initialization
     //--------------------------------------------------------------------------------------
     CloseWindow();                // Close window and OpenGL context
     //--------------------------------------------------------------------------------------
-#endif
+
     return 0;
-}
\ No newline at end of file
+}
diff --git a/examples/textures_logo_raylib.c b/examples/textures_logo_raylib.c
new file mode 100644
index 0000000..f170dab
--- /dev/null
+++ b/examples/textures_logo_raylib.c
@@ -0,0 +1,62 @@
+/*******************************************************************************************
+*
+*   raylib [textures] example - Texture loading and drawing
+*
+*   Example originally created with raylib 1.0, last time updated with raylib 1.0
+*
+*   Example licensed under an unmodified zlib/libpng license, which is an OSI-certified,
+*   BSD-like license that allows static linking with closed source software
+*
+*   Copyright (c) 2014-2024 Ramon Santamaria (@raysan5)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+
+//------------------------------------------------------------------------------------
+// Program main entry point
+//------------------------------------------------------------------------------------
+int main(void)
+{
+    // Initialization
+    //--------------------------------------------------------------------------------------
+    const int screenWidth = 800;
+    const int screenHeight = 450;
+
+    InitWindow(screenWidth, screenHeight, "raylib [textures] example - texture loading and drawing");
+
+    // NOTE: Textures MUST be loaded after Window initialization (OpenGL context is required)
+    Texture2D texture = LoadTexture("resources/raylib_logo.png");        // Texture loading
+    //---------------------------------------------------------------------------------------
+
+    // Main game loop
+    while (!WindowShouldClose())    // Detect window close button or ESC key
+    {
+        // Update
+        //----------------------------------------------------------------------------------
+        // TODO: Update your variables here
+        //----------------------------------------------------------------------------------
+
+        // Draw
+        //----------------------------------------------------------------------------------
+        BeginDrawing();
+
+            ClearBackground(RAYWHITE);
+
+            DrawTexture(texture, screenWidth/2 - texture.width/2, screenHeight/2 - texture.height/2, WHITE);
+
+            DrawText("this IS a texture!", 360, 370, 10, GRAY);
+
+        EndDrawing();
+        //----------------------------------------------------------------------------------
+    }
+
+    // De-Initialization
+    //--------------------------------------------------------------------------------------
+    UnloadTexture(texture);       // Texture unloading
+
+    CloseWindow();                // Close window and OpenGL context
+    //--------------------------------------------------------------------------------------
+
+    return 0;
+}
\ No newline at end of file
diff --git a/game.c b/game.c
index d3f9da1..52c616b 100644
--- a/game.c
+++ b/game.c
@@ -7,8 +7,6 @@
 static Vector2 ball_position = {0};
 static Vector2 ball_velocity = {200, 200};
 
-void raylib_js_set_entry(void (*entry)(void));
-
 void GameFrame()
 {
     BeginDrawing();
@@ -41,13 +39,9 @@ int main()
     ball_position.x = w/2;
     ball_position.y = h/2;
 
-#ifdef PLATFORM_WEB
-    raylib_js_set_entry(GameFrame);
-#else
     while (!WindowShouldClose()) {
         GameFrame();
     }
     CloseWindow();
-#endif
     return 0;
 }
diff --git a/index.html b/index.html
index 5f29ff6..6a3dc0a 100644
--- a/index.html
+++ b/index.html
@@ -34,23 +34,27 @@
             src: url(fonts/acme_7_wide_xtnd.woff);
         }
     </style>
-    <script src="raylib.js"></script>
 </head>
 <body>
     <label for="raylib-example-select">Choose an Example:</label>
-        <select id="raylib-example-select" onchange="startRaylib(this.value)">
+        <select id="raylib-example-select">
         <!-- This is populated by js -->
         </select>
     <canvas id="game"></canvas>
-    <script>
+    <script type="module">
+        import RaylibJs from "./raylib.js";
         // TODO: store the current example in the URL
         const wasmPaths = {
             "tsoding": ["game",],
             "core": ["core_basic_window", "core_basic_screen_manager", "core_input_keys", "core_input_mouse_wheel",],
-            "shapes": ["shapes_colors_palette"]
+            "shapes": ["shapes_colors_palette"],
+            "textures": ["textures_logo_raylib"]
         }
 
         const raylibExampleSelect = document.getElementById("raylib-example-select");
+        raylibExampleSelect.addEventListener("change", (event) => {
+            startRaylib(event.currentTarget.value);
+        });
 
         for (const exampleCategory in wasmPaths){
             raylibExampleSelect.innerHTML += `<optgroup label="${exampleCategory}">`
@@ -73,6 +77,7 @@
                 raylibJs.start({
                     wasmPath: `wasm/${selectedWasm}.wasm`,
                     canvasId: "game",
+                    publicDir: "examples/"
                 });
             } else {
                 window.addEventListener("load", () => {
diff --git a/raylib.js b/raylib.js
index 0f8da8f..97b92fe 100644
--- a/raylib.js
+++ b/raylib.js
@@ -1,3 +1,5 @@
+import * as Asyncify from "https://unpkg.com/asyncify-wasm?module";
+
 function make_environment(env) {
     return new Proxy(env, {
         get(target, prop, receiver) {
@@ -11,7 +13,16 @@ function make_environment(env) {
     });
 }
 
-class RaylibJs {
+/**
+ * Promise version of {@link requestAnimationFrame}.
+ * @returns {Promise<DOMHighResTimeStamp>}
+ */
+function nextFrame() {
+  return new Promise(res => requestAnimationFrame(res));
+}
+
+
+export default class RaylibJs {
     // TODO: We stole the font from the website
     // (https://raylib.com/) and it's slightly different than
     // the one that is "baked" into Raylib library itself. To
@@ -20,19 +31,41 @@ class RaylibJs {
     //
     // It would be nice to have a better approach...
     #FONT_SCALE_MAGIC = 0.65;
+    
+    /**
+     * @typedef {(event: T) => void} EventHandler
+     * @template {Event} T
+     */
+
+    /** @type {EventHandler<KeyEvent> =} */
+    #keyDown;
+    /** @type {EventHandler<KeyEvent> =} */
+    #keyUp;
+    /** @type {EventHandler<WheelEvent> =} */
+    #wheelMove;
+    /** @type {EventHandler<MouseEvent> =} */
+    #mouseMove;
 
     #reset() {
         this.previous = undefined;
+        /** @type {{instance: WebAssembly.Instance, module: WebAssembly.Module}}  */
         this.wasm = undefined;
+        this.publicDir = undefined;
+        /** @type {CanvasRenderingContext2D} */
         this.ctx = undefined;
+        /** @type {CanvasRenderingContext2D} */
         this.dt = undefined;
         this.targetFPS = 60;
-        this.entryFunction = undefined;
         this.prevPressedKeyState = new Set();
         this.currentPressedKeyState = new Set();
         this.currentMouseWheelMoveState = 0;
         this.currentMousePosition = {x: 0, y: 0};
         this.quit = false;
+        // FIXME: Could theoretically be an array
+        /** @type {Map<number, HTMLImageElement>}*/
+        this.textures = new Map();
+        /** @type {Map<string, number>} */
+        this.textureIDs = new Map();
     }
 
     constructor() {
@@ -43,7 +76,7 @@ class RaylibJs {
         this.quit = true;
     }
 
-    async start({ wasmPath, canvasId }) {
+    async start({ wasmPath, canvasId, publicDir = "./" }) {
         if (this.wasm !== undefined) {
             console.error("The game is already running. Please stop() it first.");
             return;
@@ -51,58 +84,64 @@ class RaylibJs {
 
         const canvas = document.getElementById(canvasId);
         this.ctx = canvas.getContext("2d");
-        if (this.ctx === null) {
+        const bgCanvas = document.createElement("canvas");
+        this.btx =  bgCanvas.getContext("2d");
+        if (this.ctx === null || this.btx === null) {
             throw new Error("Could not create 2d canvas context");
         }
-
-        this.wasm = await WebAssembly.instantiateStreaming(fetch(wasmPath), {
+        this.publicDir = publicDir;
+        this.wasm = await Asyncify.instantiateStreaming(fetch(wasmPath), {
             env: make_environment(this)
         });
+        this.wasm.instance.exports.main();
+    }
 
-        const keyDown = (e) => {
+    InitWindow(width, height, title_ptr) {
+        this.ctx.canvas.width = width;
+        this.ctx.canvas.height = height;
+        this.btx.canvas.width = width;
+        this.btx.canvas.height = height;
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        document.title = cstr_by_ptr(buffer, title_ptr);
+        
+        this.#keyDown = (e) => {
             this.currentPressedKeyState.add(glfwKeyMapping[e.code]);
         };
-        const keyUp = (e) => {
+        this.#keyUp = (e) => {
             this.currentPressedKeyState.delete(glfwKeyMapping[e.code]);
         };
-        const wheelMove = (e) => {
+        this.#wheelMove = (e) => {
           this.currentMouseWheelMoveState = Math.sign(-e.deltaY);
         };
-        const mouseMove = (e) => {
+        this.#mouseMove = (e) => {
             this.currentMousePosition = {x: e.clientX, y: e.clientY};
         };
-        window.addEventListener("keydown", keyDown);
-        window.addEventListener("keyup", keyUp);
-        window.addEventListener("wheel", wheelMove);
-        window.addEventListener("mousemove", mouseMove);
-
-        this.wasm.instance.exports.main();
-        const next = (timestamp) => {
-            if (this.quit) {
-                this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
-                window.removeEventListener("keydown", keyDown);
-                this.#reset()
-                return;
-            }
-            this.dt = (timestamp - this.previous)/1000.0;
-            this.previous = timestamp;
-            this.entryFunction();
-            window.requestAnimationFrame(next);
-        };
-        window.requestAnimationFrame((timestamp) => {
-            this.previous = timestamp;
-            window.requestAnimationFrame(next);
-        });
+        window.addEventListener("keydown", this.#keyDown);
+        window.addEventListener("keyup", this.#keyUp);
+        window.addEventListener("wheel", this.#wheelMove);
+        window.addEventListener("mousemove", this.#mouseMove);
     }
-
-    InitWindow(width, height, title_ptr) {
-        this.ctx.canvas.width = width;
-        this.ctx.canvas.height = height;
-        const buffer = this.wasm.instance.exports.memory.buffer;
-        document.title = cstr_by_ptr(buffer, title_ptr);
+    
+    CloseWindow() {
+        this.ctx.clearRect(0, 0, this.ctx.canvas.width, this.ctx.canvas.height);
+        window.removeEventListener("keydown", this.#keyDown);
+        window.removeEventListener("keyup", this.#keyUp);
+        window.removeEventListener("wheel", this.#wheelMove);
+        window.removeEventListener("mousemove", this.#mouseMove);
+        this.#reset();
     }
 
-    WindowShouldClose(){
+    async WindowShouldClose() {
+        let timestamp = await nextFrame();
+        if (this.previous === undefined) {
+            this.previous = timestamp;
+            timestamp = await nextFrame();
+        }
+        if (this.quit) {
+            return true;
+        }
+        this.dt = (timestamp - this.previous)/1000.0;
+        this.previous = timestamp;
         return false;
     }
 
@@ -168,6 +207,32 @@ class RaylibJs {
         this.ctx.fillStyle = color;
         this.ctx.fillRect(posX, posY, width, height);
     }
+    
+    // RLAPI void DrawTexture(Texture2D texture, int posX, int posY, Color tint);                               // Draw a Texture2D
+    DrawTexture(texture_ptr, posX, posY, tint_ptr) {
+        /** @type {ArrayBuffer} */
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        const tint = getColorFromMemory(buffer, tint_ptr);
+        const textureID = new Uint32Array(buffer, texture_ptr)[0];
+        const texture = this.textures.get(textureID);
+        // TODO: actually use width / height from the passed struct
+        const width = texture.width;
+        const height = texture.height;
+        if (texture === undefined) {
+            // TODO: Better error reporting
+            throw new Error(`textureID ${textureID} not found.`);
+        }
+        this.btx.clearRect(0, 0, width, height);
+        this.btx.drawImage(texture, 0, 0);
+        this.btx.fillStyle = tint;
+        this.btx.globalCompositeOperation = "multiply";
+        this.btx.fillRect(0, 0, width, height);
+        this.btx.globalCompositeOperation = "destination-in";
+        this.btx.drawImage(texture, 0, 0);
+        this.btx.globalCompositeOperation = "source-over";
+        this.ctx.drawImage(this.btx.canvas, 0, 0, width, height, posX, posY, width, height);
+        
+    }
 
     IsKeyPressed(key) {
         return !this.prevPressedKeyState.has(key) && this.currentPressedKeyState.has(key);
@@ -235,8 +300,83 @@ class RaylibJs {
         return this.ctx.measureText(text).width;
     }
 
-    raylib_js_set_entry(entry) {
-        this.entryFunction = this.wasm.instance.exports.__indirect_function_table.get(entry);
+    LoadTexture(result_ptr, fileName_ptr) {
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        const fileName = this.publicDir + cstr_by_ptr(buffer, fileName_ptr);
+        const result = new DataView(buffer, result_ptr);
+        if (this.textureIDs.has(fileName)) {
+            const img = this.textures.get(this.textureIDs.get(fileName));
+            this.#setTexture(result, img, fileName);
+            return;
+        }
+        const img = new Image();
+        // Wrap image loading in a promise
+        const promise = new Promise((resolve, reject) => {
+            function wrapResolve() {
+              img.removeEventListener("error", wrapReject);
+              resolve();
+            };
+            function wrapReject() {
+              img.removeEventListener("load", wrapResolve);
+              reject();
+            };
+            img.addEventListener("load", wrapResolve, { once: true });
+            img.addEventListener("error", wrapReject, { once: true });
+        });
+        img.src = fileName;
+        return promise.then(() => {
+            this.#setTexture(result, img, fileName);
+            console.log("Loaded texture", fileName);
+        }).catch((err) => {
+            // TODO: Proper image error handling
+            console.error(err);
+            throw err;
+        });
+    }
+
+    /**
+     * @param {DataView} buffer
+     * @param {HTMLImageElement} img
+     * @param {string} fileName
+     */
+    #setTexture(buffer, img, fileName) {
+        /*
+          // Texture, tex data stored in GPU memory (VRAM)
+          typedef struct Texture {
+              unsigned int id; // OpenGL texture id
+              int width;       // Texture base width
+              int height;      // Texture base height
+              int mipmaps;     // Mipmap levels, 1 by default
+              int format;      // Data format (PixelFormat type)
+          } Texture;
+         */
+        const id = this.textureIDs.size;
+        buffer.setUint32(0, id);
+        this.textures.set(id, img);
+        this.textureIDs.set(fileName, id);
+        const PIXELFORMAT_UNCOMPRESSED_R8G8B8A8 = 7;
+        new Int32Array(
+            buffer.buffer, buffer.byteOffset + 4, 4 * 4
+        ).set([
+            img.width,
+            img.height,
+            1,
+            PIXELFORMAT_UNCOMPRESSED_R8G8B8A8
+        ]);
+    }
+
+    memcpy(dest_ptr, src_ptr, count) {
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        // TODO: Why this does not fix asyncify problems
+        new Uint8Array(buffer, dest_ptr, count)
+          .set(new Uint8Array(buffer, src_ptr, count));
+        return dest_ptr;
+    }
+
+    memset(ptr, value, num) {
+        const buffer = this.wasm.instance.exports.memory.buffer;
+        new Int32Array(buffer, ptr, num).fill(value);
+        return ptr;
     }
 }
 
diff --git a/wasm/core_basic_screen_manager.wasm b/wasm/core_basic_screen_manager.wasm
index 7cf5b22..85d4d10 100755
Binary files a/wasm/core_basic_screen_manager.wasm and b/wasm/core_basic_screen_manager.wasm differ
diff --git a/wasm/core_basic_window.wasm b/wasm/core_basic_window.wasm
index 00991c7..611b855 100755
Binary files a/wasm/core_basic_window.wasm and b/wasm/core_basic_window.wasm differ
diff --git a/wasm/core_input_keys.wasm b/wasm/core_input_keys.wasm
index 5037379..5e6f523 100755
Binary files a/wasm/core_input_keys.wasm and b/wasm/core_input_keys.wasm differ
diff --git a/wasm/core_input_mouse_wheel.wasm b/wasm/core_input_mouse_wheel.wasm
index 23175af..9195fe4 100755
Binary files a/wasm/core_input_mouse_wheel.wasm and b/wasm/core_input_mouse_wheel.wasm differ
diff --git a/wasm/game.wasm b/wasm/game.wasm
index 14abcf2..6f83f12 100755
Binary files a/wasm/game.wasm and b/wasm/game.wasm differ
diff --git a/wasm/shapes_colors_palette.wasm b/wasm/shapes_colors_palette.wasm
index 71a4f9a..529359c 100755
Binary files a/wasm/shapes_colors_palette.wasm and b/wasm/shapes_colors_palette.wasm differ
diff --git a/wasm/textures_logo_raylib.wasm b/wasm/textures_logo_raylib.wasm
new file mode 100755
index 0000000..dcb7aa5
Binary files /dev/null and b/wasm/textures_logo_raylib.wasm differ