diff --git a/cmake/LibraryConfigurations.cmake b/cmake/LibraryConfigurations.cmake
index d12df3a00..1debfeb42 100644
--- a/cmake/LibraryConfigurations.cmake
+++ b/cmake/LibraryConfigurations.cmake
@@ -73,19 +73,6 @@ elseif (${PLATFORM} MATCHES "Android")
     find_library(OPENGL_LIBRARY OpenGL)
     set(LIBS_PRIVATE m log android EGL GLESv2 OpenSLES atomic c)
 
-elseif (${PLATFORM} MATCHES "Raspberry Pi")
-    set(PLATFORM_CPP "PLATFORM_RPI")
-    set(GRAPHICS "GRAPHICS_API_OPENGL_ES2")
-
-    add_definitions(-D_DEFAULT_SOURCE)
-
-    find_library(GLESV2 brcmGLESv2 HINTS /opt/vc/lib)
-    find_library(EGL brcmEGL HINTS /opt/vc/lib)
-    find_library(BCMHOST bcm_host HINTS /opt/vc/lib)
-    include_directories(/opt/vc/include /opt/vc/include/interface/vmcs_host/linux /opt/vc/include/interface/vcos/pthreads)
-    link_directories(/opt/vc/lib)
-    set(LIBS_PRIVATE ${GLESV2} ${EGL} ${BCMHOST} pthread rt m dl)
-
 elseif ("${PLATFORM}" MATCHES "DRM")
     set(PLATFORM_CPP "PLATFORM_DRM")
     set(GRAPHICS "GRAPHICS_API_OPENGL_ES2")
diff --git a/examples/Makefile b/examples/Makefile
index ff5098948..f70c077cf 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -25,7 +25,7 @@
 
 # Define required environment variables
 #------------------------------------------------------------------------------------------------
-# Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB
+# Define target platform: PLATFORM_DESKTOP, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB
 PLATFORM              ?= PLATFORM_DESKTOP
 
 # Define required raylib variables
@@ -58,15 +58,6 @@ BUILD_WEB_HEAP_SIZE   ?= 134217728
 BUILD_WEB_RESOURCES   ?= TRUE
 BUILD_WEB_RESOURCES_PATH  ?= $(dir $<)resources@resources
 
-# Use cross-compiler for PLATFORM_RPI
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    USE_RPI_CROSS_COMPILER ?= FALSE
-    ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-        RPI_TOOLCHAIN ?= C:/SysGCC/Raspberry
-        RPI_TOOLCHAIN_SYSROOT ?= $(RPI_TOOLCHAIN)/arm-linux-gnueabihf/sysroot
-    endif
-endif
-
 # Determine PLATFORM_OS in case PLATFORM_DESKTOP or PLATFORM_WEB selected
 ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_WEB))
     # No uname.exe on MinGW!, but OS=Windows_NT on Windows!
@@ -95,12 +86,6 @@ ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_WEB))
         endif
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    UNAMEOS = $(shell uname)
-    ifeq ($(UNAMEOS),Linux)
-        PLATFORM_OS = LINUX
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     UNAMEOS = $(shell uname)
     ifeq ($(UNAMEOS),Linux)
@@ -118,9 +103,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 endif
 
 # Default path for raylib on Raspberry Pi
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    RAYLIB_PATH        ?= /home/pi/raylib
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     RAYLIB_PATH        ?= /home/pi/raylib
 endif
@@ -154,13 +136,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         CC = clang
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-        # Define RPI cross-compiler
-        #CC = armv6j-hardfloat-linux-gnueabi-gcc
-        CC = $(RPI_TOOLCHAIN)/bin/arm-linux-gnueabihf-gcc
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
     # HTML5 emscripten compiler
     # WARNING: To compile to HTML5, code must be redesigned
@@ -231,9 +206,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         endif
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    CFLAGS += -std=gnu99
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     CFLAGS += -std=gnu99 -DEGL_NO_X11
 endif
@@ -252,11 +224,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         INCLUDE_PATHS += -I$(RAYLIB_INCLUDE_PATH)
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vmcs_host/linux
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vcos/pthreads
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     INCLUDE_PATHS += -I/usr/include/libdrm
 endif
@@ -323,9 +290,6 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
     # logic to a self contained function: UpdateDrawFrame(), check core_basic_window_web.c for reference.
 
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LDFLAGS += -L$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/lib
-endif
 
 # Define libraries required on linking: LDLIBS
 # NOTE: To link libraries (lib<name>.so or lib<name>.a), use -l<name>
@@ -376,14 +340,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         LDLIBS += -lglfw
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    # Libraries for Raspberry Pi compiling
-    # NOTE: Required packages: libasound2-dev (ALSA)
-    LDLIBS = -lraylib -lbrcmGLESv2 -lbrcmEGL -lpthread -lrt -lm -lbcm_host -ldl -latomic
-    ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-        LDLIBS += -lvchiq_arm -lvcos
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     # Libraries for DRM compiling
     # NOTE: Required packages: libasound2-dev (ALSA)
@@ -586,10 +542,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 		rm -f *.o
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-	find . -type f -executable -delete
-	rm -fv *.o
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
 	find . -type f -executable -delete
 	rm -fv *.o
diff --git a/examples/Makefile.Web b/examples/Makefile.Web
index e65351e07..c26761829 100644
--- a/examples/Makefile.Web
+++ b/examples/Makefile.Web
@@ -25,7 +25,7 @@
 
 # Define required environment variables
 #------------------------------------------------------------------------------------------------
-# Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB
+# Define target platform: PLATFORM_DESKTOP, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB
 PLATFORM              ?= PLATFORM_WEB
 
 # Define required raylib variables
@@ -51,15 +51,6 @@ USE_EXTERNAL_GLFW     ?= FALSE
 # NOTE: This variable is only used for PLATFORM_OS: LINUX
 USE_WAYLAND_DISPLAY   ?= FALSE
 
-# Use cross-compiler for PLATFORM_RPI
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    USE_RPI_CROSS_COMPILER ?= FALSE
-    ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-        RPI_TOOLCHAIN ?= C:/SysGCC/Raspberry
-        RPI_TOOLCHAIN_SYSROOT ?= $(RPI_TOOLCHAIN)/arm-linux-gnueabihf/sysroot
-    endif
-endif
-
 # Determine PLATFORM_OS in case PLATFORM_DESKTOP or PLATFORM_WEB selected
 ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_WEB))
     # No uname.exe on MinGW!, but OS=Windows_NT on Windows!
@@ -88,12 +79,6 @@ ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_WEB))
         endif
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    UNAMEOS = $(shell uname)
-    ifeq ($(UNAMEOS),Linux)
-        PLATFORM_OS = LINUX
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     UNAMEOS = $(shell uname)
     ifeq ($(UNAMEOS),Linux)
@@ -111,9 +96,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 endif
 
 # Default path for raylib on Raspberry Pi
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    RAYLIB_PATH        ?= /home/pi/raylib
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     RAYLIB_PATH        ?= /home/pi/raylib
 endif
@@ -147,13 +129,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         CC = clang
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-        # Define RPI cross-compiler
-        #CC = armv6j-hardfloat-linux-gnueabi-gcc
-        CC = $(RPI_TOOLCHAIN)/bin/arm-linux-gnueabihf-gcc
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_WEB)
     # HTML5 emscripten compiler
     # WARNING: To compile to HTML5, code must be redesigned
@@ -224,9 +199,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         endif
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    CFLAGS += -std=gnu99
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     CFLAGS += -std=gnu99 -DEGL_NO_X11
 endif
@@ -245,11 +217,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         INCLUDE_PATHS += -I$(RAYLIB_INCLUDE_PATH)
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vmcs_host/linux
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vcos/pthreads
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     INCLUDE_PATHS += -I/usr/include/libdrm
 endif
@@ -304,9 +271,6 @@ ifeq ($(PLATFORM),PLATFORM_WEB)
     LDFLAGS += --shell-file $(RAYLIB_PATH)/src/shell.html
     EXT = .html
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LDFLAGS += -L$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/lib
-endif
 
 # Define libraries required on linking: LDLIBS
 # NOTE: To link libraries (lib<name>.so or lib<name>.a), use -l<name>
@@ -357,14 +321,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         LDLIBS += -lglfw
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    # Libraries for Raspberry Pi compiling
-    # NOTE: Required packages: libasound2-dev (ALSA)
-    LDLIBS = -lraylib -lbrcmGLESv2 -lbrcmEGL -lpthread -lrt -lm -lbcm_host -ldl -latomic
-    ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-        LDLIBS += -lvchiq_arm -lvcos
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     # Libraries for DRM compiling
     # NOTE: Required packages: libasound2-dev (ALSA)
@@ -1065,10 +1021,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
 		rm -f *.o
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-	find . -type f -executable -delete
-	rm -fv *.o
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
 	find . -type f -executable -delete
 	rm -fv *.o
diff --git a/examples/audio/audio_mixed_processor b/examples/audio/audio_mixed_processor
new file mode 100755
index 000000000..bf3037c09
Binary files /dev/null and b/examples/audio/audio_mixed_processor differ
diff --git a/examples/audio/audio_module_playing b/examples/audio/audio_module_playing
new file mode 100755
index 000000000..d191be95c
Binary files /dev/null and b/examples/audio/audio_module_playing differ
diff --git a/examples/audio/audio_music_stream b/examples/audio/audio_music_stream
new file mode 100755
index 000000000..8544ed1e6
Binary files /dev/null and b/examples/audio/audio_music_stream differ
diff --git a/examples/audio/audio_raw_stream b/examples/audio/audio_raw_stream
new file mode 100755
index 000000000..eefa16496
Binary files /dev/null and b/examples/audio/audio_raw_stream differ
diff --git a/examples/audio/audio_sound_loading b/examples/audio/audio_sound_loading
new file mode 100755
index 000000000..5b2b4b6c3
Binary files /dev/null and b/examples/audio/audio_sound_loading differ
diff --git a/examples/audio/audio_sound_multi b/examples/audio/audio_sound_multi
new file mode 100755
index 000000000..224663b5b
Binary files /dev/null and b/examples/audio/audio_sound_multi differ
diff --git a/examples/audio/audio_stream_effects b/examples/audio/audio_stream_effects
new file mode 100755
index 000000000..7809ce2d5
Binary files /dev/null and b/examples/audio/audio_stream_effects differ
diff --git a/examples/core/core_2d_camera b/examples/core/core_2d_camera
new file mode 100755
index 000000000..bbd8cfd3c
Binary files /dev/null and b/examples/core/core_2d_camera differ
diff --git a/examples/core/core_2d_camera_mouse_zoom b/examples/core/core_2d_camera_mouse_zoom
new file mode 100755
index 000000000..f95b8aeb9
Binary files /dev/null and b/examples/core/core_2d_camera_mouse_zoom differ
diff --git a/examples/core/core_2d_camera_platformer b/examples/core/core_2d_camera_platformer
new file mode 100755
index 000000000..92cf72b8a
Binary files /dev/null and b/examples/core/core_2d_camera_platformer differ
diff --git a/examples/core/core_3d_camera_first_person b/examples/core/core_3d_camera_first_person
new file mode 100755
index 000000000..dffcf2d7e
Binary files /dev/null and b/examples/core/core_3d_camera_first_person differ
diff --git a/examples/core/core_3d_camera_free b/examples/core/core_3d_camera_free
new file mode 100755
index 000000000..d9c5e9cb0
Binary files /dev/null and b/examples/core/core_3d_camera_free differ
diff --git a/examples/core/core_3d_camera_mode b/examples/core/core_3d_camera_mode
new file mode 100755
index 000000000..5f7c8955f
Binary files /dev/null and b/examples/core/core_3d_camera_mode differ
diff --git a/examples/core/core_3d_picking b/examples/core/core_3d_picking
new file mode 100755
index 000000000..720e5c6bc
Binary files /dev/null and b/examples/core/core_3d_picking differ
diff --git a/examples/core/core_basic_screen_manager b/examples/core/core_basic_screen_manager
new file mode 100755
index 000000000..97743e269
Binary files /dev/null and b/examples/core/core_basic_screen_manager differ
diff --git a/examples/core/core_basic_window b/examples/core/core_basic_window
new file mode 100755
index 000000000..dcb49f057
Binary files /dev/null and b/examples/core/core_basic_window differ
diff --git a/examples/core/core_basic_window_web.c b/examples/core/core_basic_window_web.c
index 7d83254a1..e0e1f9fb1 100644
--- a/examples/core/core_basic_window_web.c
+++ b/examples/core/core_basic_window_web.c
@@ -2,7 +2,7 @@
 *
 *   raylib [core] example - Basic window (adapted for HTML5 platform)
 *
-*   NOTE: This example is prepared to compile for PLATFORM_WEB, PLATFORM_DESKTOP and PLATFORM_RPI
+*   NOTE: This example is prepared to compile for PLATFORM_WEB, and PLATFORM_DESKTOP
 *   As you will notice, code structure is slightly diferent to the other examples...
 *   To compile it for PLATFORM_WEB just uncomment #define PLATFORM_WEB at beginning
 *
diff --git a/examples/core/core_custom_frame_control b/examples/core/core_custom_frame_control
new file mode 100755
index 000000000..d94e90c9f
Binary files /dev/null and b/examples/core/core_custom_frame_control differ
diff --git a/examples/core/core_custom_logging b/examples/core/core_custom_logging
new file mode 100755
index 000000000..410d43417
Binary files /dev/null and b/examples/core/core_custom_logging differ
diff --git a/examples/core/core_drop_files b/examples/core/core_drop_files
new file mode 100755
index 000000000..c624bade1
Binary files /dev/null and b/examples/core/core_drop_files differ
diff --git a/examples/core/core_input_gamepad b/examples/core/core_input_gamepad
new file mode 100755
index 000000000..ee621eedd
Binary files /dev/null and b/examples/core/core_input_gamepad differ
diff --git a/examples/core/core_input_gamepad.c b/examples/core/core_input_gamepad.c
index 1eb516e85..c28ff1f9e 100644
--- a/examples/core/core_input_gamepad.c
+++ b/examples/core/core_input_gamepad.c
@@ -21,13 +21,8 @@
 
 // NOTE: Gamepad name ID depends on drivers and OS
 #define XBOX360_LEGACY_NAME_ID  "Xbox Controller"
-#if defined(PLATFORM_RPI)
-    #define XBOX360_NAME_ID     "Microsoft X-Box 360 pad"
-    #define PS3_NAME_ID         "PLAYSTATION(R)3 Controller"
-#else
-    #define XBOX360_NAME_ID     "Xbox 360 Controller"
-    #define PS3_NAME_ID         "PLAYSTATION(R)3 Controller"
-#endif
+#define XBOX360_NAME_ID     "Xbox 360 Controller"
+#define PS3_NAME_ID         "PLAYSTATION(R)3 Controller"
 
 //------------------------------------------------------------------------------------
 // Program main entry point
diff --git a/examples/core/core_input_gestures b/examples/core/core_input_gestures
new file mode 100755
index 000000000..8ad24c3bb
Binary files /dev/null and b/examples/core/core_input_gestures differ
diff --git a/examples/core/core_input_gestures_web b/examples/core/core_input_gestures_web
new file mode 100755
index 000000000..0bc3019fb
Binary files /dev/null and b/examples/core/core_input_gestures_web differ
diff --git a/examples/core/core_input_keys b/examples/core/core_input_keys
new file mode 100755
index 000000000..9de31b4dc
Binary files /dev/null and b/examples/core/core_input_keys differ
diff --git a/examples/core/core_input_mouse b/examples/core/core_input_mouse
new file mode 100755
index 000000000..139d930e0
Binary files /dev/null and b/examples/core/core_input_mouse differ
diff --git a/examples/core/core_input_mouse_wheel b/examples/core/core_input_mouse_wheel
new file mode 100755
index 000000000..0bf951448
Binary files /dev/null and b/examples/core/core_input_mouse_wheel differ
diff --git a/examples/core/core_input_multitouch b/examples/core/core_input_multitouch
new file mode 100755
index 000000000..b9498c208
Binary files /dev/null and b/examples/core/core_input_multitouch differ
diff --git a/examples/core/core_loading_thread b/examples/core/core_loading_thread
new file mode 100755
index 000000000..e57fe0078
Binary files /dev/null and b/examples/core/core_loading_thread differ
diff --git a/examples/core/core_random_values b/examples/core/core_random_values
new file mode 100755
index 000000000..ec4f5e1df
Binary files /dev/null and b/examples/core/core_random_values differ
diff --git a/examples/core/core_scissor_test b/examples/core/core_scissor_test
new file mode 100755
index 000000000..a293d769e
Binary files /dev/null and b/examples/core/core_scissor_test differ
diff --git a/examples/core/core_smooth_pixelperfect b/examples/core/core_smooth_pixelperfect
new file mode 100755
index 000000000..2b64336a2
Binary files /dev/null and b/examples/core/core_smooth_pixelperfect differ
diff --git a/examples/core/core_split_screen b/examples/core/core_split_screen
new file mode 100755
index 000000000..58571619c
Binary files /dev/null and b/examples/core/core_split_screen differ
diff --git a/examples/core/core_storage_values b/examples/core/core_storage_values
new file mode 100755
index 000000000..69c0d538b
Binary files /dev/null and b/examples/core/core_storage_values differ
diff --git a/examples/core/core_vr_simulator b/examples/core/core_vr_simulator
new file mode 100755
index 000000000..4d7750ef0
Binary files /dev/null and b/examples/core/core_vr_simulator differ
diff --git a/examples/core/core_vr_simulator.c b/examples/core/core_vr_simulator.c
index bc69cc698..fc2dee6b9 100644
--- a/examples/core/core_vr_simulator.c
+++ b/examples/core/core_vr_simulator.c
@@ -15,7 +15,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION        330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION        100
 #endif
 
diff --git a/examples/core/core_window_flags b/examples/core/core_window_flags
new file mode 100755
index 000000000..4f45c6b35
Binary files /dev/null and b/examples/core/core_window_flags differ
diff --git a/examples/core/core_window_letterbox b/examples/core/core_window_letterbox
new file mode 100755
index 000000000..99d2f4b03
Binary files /dev/null and b/examples/core/core_window_letterbox differ
diff --git a/examples/core/core_window_should_close b/examples/core/core_window_should_close
new file mode 100755
index 000000000..15f378ea1
Binary files /dev/null and b/examples/core/core_window_should_close differ
diff --git a/examples/core/core_world_screen b/examples/core/core_world_screen
new file mode 100755
index 000000000..75f07b59f
Binary files /dev/null and b/examples/core/core_world_screen differ
diff --git a/examples/models/models_animation b/examples/models/models_animation
new file mode 100755
index 000000000..9272a3864
Binary files /dev/null and b/examples/models/models_animation differ
diff --git a/examples/models/models_billboard b/examples/models/models_billboard
new file mode 100755
index 000000000..2286b8717
Binary files /dev/null and b/examples/models/models_billboard differ
diff --git a/examples/models/models_box_collisions b/examples/models/models_box_collisions
new file mode 100755
index 000000000..ebaac834a
Binary files /dev/null and b/examples/models/models_box_collisions differ
diff --git a/examples/models/models_cubicmap b/examples/models/models_cubicmap
new file mode 100755
index 000000000..42e223b8f
Binary files /dev/null and b/examples/models/models_cubicmap differ
diff --git a/examples/models/models_draw_cube_texture b/examples/models/models_draw_cube_texture
new file mode 100755
index 000000000..9b72d9c17
Binary files /dev/null and b/examples/models/models_draw_cube_texture differ
diff --git a/examples/models/models_first_person_maze b/examples/models/models_first_person_maze
new file mode 100755
index 000000000..75556d29c
Binary files /dev/null and b/examples/models/models_first_person_maze differ
diff --git a/examples/models/models_geometric_shapes b/examples/models/models_geometric_shapes
new file mode 100755
index 000000000..93ca87678
Binary files /dev/null and b/examples/models/models_geometric_shapes differ
diff --git a/examples/models/models_heightmap b/examples/models/models_heightmap
new file mode 100755
index 000000000..13f850c66
Binary files /dev/null and b/examples/models/models_heightmap differ
diff --git a/examples/models/models_loading b/examples/models/models_loading
new file mode 100755
index 000000000..0275a2228
Binary files /dev/null and b/examples/models/models_loading differ
diff --git a/examples/models/models_loading_gltf b/examples/models/models_loading_gltf
new file mode 100755
index 000000000..df539c436
Binary files /dev/null and b/examples/models/models_loading_gltf differ
diff --git a/examples/models/models_loading_m3d b/examples/models/models_loading_m3d
new file mode 100755
index 000000000..bd1d824e9
Binary files /dev/null and b/examples/models/models_loading_m3d differ
diff --git a/examples/models/models_loading_vox b/examples/models/models_loading_vox
new file mode 100755
index 000000000..094e30c5e
Binary files /dev/null and b/examples/models/models_loading_vox differ
diff --git a/examples/models/models_mesh_generation b/examples/models/models_mesh_generation
new file mode 100755
index 000000000..9cf7987a0
Binary files /dev/null and b/examples/models/models_mesh_generation differ
diff --git a/examples/models/models_mesh_picking b/examples/models/models_mesh_picking
new file mode 100755
index 000000000..2e08d3652
Binary files /dev/null and b/examples/models/models_mesh_picking differ
diff --git a/examples/models/models_orthographic_projection b/examples/models/models_orthographic_projection
new file mode 100755
index 000000000..839bbea94
Binary files /dev/null and b/examples/models/models_orthographic_projection differ
diff --git a/examples/models/models_rlgl_solar_system b/examples/models/models_rlgl_solar_system
new file mode 100755
index 000000000..ba2913ffb
Binary files /dev/null and b/examples/models/models_rlgl_solar_system differ
diff --git a/examples/models/models_skybox b/examples/models/models_skybox
new file mode 100755
index 000000000..a0151f7d7
Binary files /dev/null and b/examples/models/models_skybox differ
diff --git a/examples/models/models_skybox.c b/examples/models/models_skybox.c
index 34616de59..7a500e04d 100644
--- a/examples/models/models_skybox.c
+++ b/examples/models/models_skybox.c
@@ -18,7 +18,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/models/models_waving_cubes b/examples/models/models_waving_cubes
new file mode 100755
index 000000000..1451c3102
Binary files /dev/null and b/examples/models/models_waving_cubes differ
diff --git a/examples/models/models_yaw_pitch_roll b/examples/models/models_yaw_pitch_roll
new file mode 100755
index 000000000..f717f3427
Binary files /dev/null and b/examples/models/models_yaw_pitch_roll differ
diff --git a/examples/others/easings_testbed b/examples/others/easings_testbed
new file mode 100755
index 000000000..d249165e0
Binary files /dev/null and b/examples/others/easings_testbed differ
diff --git a/examples/others/embedded_files_loading b/examples/others/embedded_files_loading
new file mode 100755
index 000000000..96a88f473
Binary files /dev/null and b/examples/others/embedded_files_loading differ
diff --git a/examples/others/raylib_opengl_interop b/examples/others/raylib_opengl_interop
new file mode 100755
index 000000000..fa3802d5e
Binary files /dev/null and b/examples/others/raylib_opengl_interop differ
diff --git a/examples/others/raylib_opengl_interop.c b/examples/others/raylib_opengl_interop.c
index bcdbbbdd5..09b548c60 100644
--- a/examples/others/raylib_opengl_interop.c
+++ b/examples/others/raylib_opengl_interop.c
@@ -42,7 +42,7 @@
         #endif
         #define GLSL_VERSION            330
     #endif
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/others/raymath_vector_angle b/examples/others/raymath_vector_angle
new file mode 100755
index 000000000..c6e01e0f0
Binary files /dev/null and b/examples/others/raymath_vector_angle differ
diff --git a/examples/others/rlgl_compute_shader b/examples/others/rlgl_compute_shader
new file mode 100755
index 000000000..2472e7370
Binary files /dev/null and b/examples/others/rlgl_compute_shader differ
diff --git a/examples/shaders/shaders_basic_lighting b/examples/shaders/shaders_basic_lighting
new file mode 100755
index 000000000..af29d6b45
Binary files /dev/null and b/examples/shaders/shaders_basic_lighting differ
diff --git a/examples/shaders/shaders_basic_lighting.c b/examples/shaders/shaders_basic_lighting.c
index 61cec2e80..3fbe60b83 100644
--- a/examples/shaders/shaders_basic_lighting.c
+++ b/examples/shaders/shaders_basic_lighting.c
@@ -27,7 +27,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_custom_uniform b/examples/shaders/shaders_custom_uniform
new file mode 100755
index 000000000..f23fd3335
Binary files /dev/null and b/examples/shaders/shaders_custom_uniform differ
diff --git a/examples/shaders/shaders_custom_uniform.c b/examples/shaders/shaders_custom_uniform.c
index eaeca5e51..0a1a76428 100644
--- a/examples/shaders/shaders_custom_uniform.c
+++ b/examples/shaders/shaders_custom_uniform.c
@@ -22,7 +22,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_eratosthenes b/examples/shaders/shaders_eratosthenes
new file mode 100755
index 000000000..8f186883b
Binary files /dev/null and b/examples/shaders/shaders_eratosthenes differ
diff --git a/examples/shaders/shaders_eratosthenes.c b/examples/shaders/shaders_eratosthenes.c
index a481f3008..005a97aea 100644
--- a/examples/shaders/shaders_eratosthenes.c
+++ b/examples/shaders/shaders_eratosthenes.c
@@ -29,7 +29,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_fog b/examples/shaders/shaders_fog
new file mode 100755
index 000000000..5b675b8b3
Binary files /dev/null and b/examples/shaders/shaders_fog differ
diff --git a/examples/shaders/shaders_fog.c b/examples/shaders/shaders_fog.c
index 24a1c1068..cd36936d6 100644
--- a/examples/shaders/shaders_fog.c
+++ b/examples/shaders/shaders_fog.c
@@ -27,7 +27,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_hot_reloading b/examples/shaders/shaders_hot_reloading
new file mode 100755
index 000000000..4b28a902c
Binary files /dev/null and b/examples/shaders/shaders_hot_reloading differ
diff --git a/examples/shaders/shaders_hot_reloading.c b/examples/shaders/shaders_hot_reloading.c
index 395d44cfe..2b1175e4b 100644
--- a/examples/shaders/shaders_hot_reloading.c
+++ b/examples/shaders/shaders_hot_reloading.c
@@ -21,7 +21,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_hybrid_render b/examples/shaders/shaders_hybrid_render
new file mode 100755
index 000000000..7069cd38a
Binary files /dev/null and b/examples/shaders/shaders_hybrid_render differ
diff --git a/examples/shaders/shaders_hybrid_render.c b/examples/shaders/shaders_hybrid_render.c
index f07917fb0..53e14b884 100644
--- a/examples/shaders/shaders_hybrid_render.c
+++ b/examples/shaders/shaders_hybrid_render.c
@@ -20,7 +20,7 @@
 
 #if defined(PLATFORM_DESKTOP)
 #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
 #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_julia_set b/examples/shaders/shaders_julia_set
new file mode 100755
index 000000000..d0005dc05
Binary files /dev/null and b/examples/shaders/shaders_julia_set differ
diff --git a/examples/shaders/shaders_julia_set.c b/examples/shaders/shaders_julia_set.c
index ee1988058..aebb287a1 100644
--- a/examples/shaders/shaders_julia_set.c
+++ b/examples/shaders/shaders_julia_set.c
@@ -22,7 +22,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_lightmap.c b/examples/shaders/shaders_lightmap.c
index b636c8b28..c5ed6094c 100644
--- a/examples/shaders/shaders_lightmap.c
+++ b/examples/shaders/shaders_lightmap.c
@@ -25,7 +25,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_mesh_instancing b/examples/shaders/shaders_mesh_instancing
new file mode 100755
index 000000000..77cde4819
Binary files /dev/null and b/examples/shaders/shaders_mesh_instancing differ
diff --git a/examples/shaders/shaders_mesh_instancing.c b/examples/shaders/shaders_mesh_instancing.c
index 7789f2cb0..7d603a6bf 100644
--- a/examples/shaders/shaders_mesh_instancing.c
+++ b/examples/shaders/shaders_mesh_instancing.c
@@ -24,7 +24,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_model_shader b/examples/shaders/shaders_model_shader
new file mode 100755
index 000000000..732c98cd8
Binary files /dev/null and b/examples/shaders/shaders_model_shader differ
diff --git a/examples/shaders/shaders_model_shader.c b/examples/shaders/shaders_model_shader.c
index e84ecbfbe..739a33b7e 100644
--- a/examples/shaders/shaders_model_shader.c
+++ b/examples/shaders/shaders_model_shader.c
@@ -22,7 +22,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_multi_sample2d b/examples/shaders/shaders_multi_sample2d
new file mode 100755
index 000000000..e42993358
Binary files /dev/null and b/examples/shaders/shaders_multi_sample2d differ
diff --git a/examples/shaders/shaders_multi_sample2d.c b/examples/shaders/shaders_multi_sample2d.c
index d6f8803b7..f7c369bc4 100644
--- a/examples/shaders/shaders_multi_sample2d.c
+++ b/examples/shaders/shaders_multi_sample2d.c
@@ -22,7 +22,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_palette_switch b/examples/shaders/shaders_palette_switch
new file mode 100755
index 000000000..e516b54f5
Binary files /dev/null and b/examples/shaders/shaders_palette_switch differ
diff --git a/examples/shaders/shaders_palette_switch.c b/examples/shaders/shaders_palette_switch.c
index bb1eda4e0..6b108b092 100644
--- a/examples/shaders/shaders_palette_switch.c
+++ b/examples/shaders/shaders_palette_switch.c
@@ -24,7 +24,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_postprocessing b/examples/shaders/shaders_postprocessing
new file mode 100755
index 000000000..c91dc44ea
Binary files /dev/null and b/examples/shaders/shaders_postprocessing differ
diff --git a/examples/shaders/shaders_postprocessing.c b/examples/shaders/shaders_postprocessing.c
index 7f6bd0092..1a7c621e5 100644
--- a/examples/shaders/shaders_postprocessing.c
+++ b/examples/shaders/shaders_postprocessing.c
@@ -22,7 +22,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_raymarching b/examples/shaders/shaders_raymarching
new file mode 100755
index 000000000..fcb56421d
Binary files /dev/null and b/examples/shaders/shaders_raymarching differ
diff --git a/examples/shaders/shaders_raymarching.c b/examples/shaders/shaders_raymarching.c
index 7b34a5233..e9b7755ad 100644
--- a/examples/shaders/shaders_raymarching.c
+++ b/examples/shaders/shaders_raymarching.c
@@ -18,7 +18,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB -> Not supported at this moment
+#else   // PLATFORM_ANDROID, PLATFORM_WEB -> Not supported at this moment
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_shapes_textures b/examples/shaders/shaders_shapes_textures
new file mode 100755
index 000000000..59ace2aca
Binary files /dev/null and b/examples/shaders/shaders_shapes_textures differ
diff --git a/examples/shaders/shaders_shapes_textures.c b/examples/shaders/shaders_shapes_textures.c
index d3ec8daf0..cca4959ed 100644
--- a/examples/shaders/shaders_shapes_textures.c
+++ b/examples/shaders/shaders_shapes_textures.c
@@ -22,7 +22,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_simple_mask b/examples/shaders/shaders_simple_mask
new file mode 100755
index 000000000..9c6af2db8
Binary files /dev/null and b/examples/shaders/shaders_simple_mask differ
diff --git a/examples/shaders/shaders_simple_mask.c b/examples/shaders/shaders_simple_mask.c
index 6283ccbcc..7ed315b0a 100644
--- a/examples/shaders/shaders_simple_mask.c
+++ b/examples/shaders/shaders_simple_mask.c
@@ -25,7 +25,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_spotlight b/examples/shaders/shaders_spotlight
new file mode 100755
index 000000000..c2609f28b
Binary files /dev/null and b/examples/shaders/shaders_spotlight differ
diff --git a/examples/shaders/shaders_spotlight.c b/examples/shaders/shaders_spotlight.c
index c96c983d0..067f9622d 100644
--- a/examples/shaders/shaders_spotlight.c
+++ b/examples/shaders/shaders_spotlight.c
@@ -34,7 +34,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_texture_drawing b/examples/shaders/shaders_texture_drawing
new file mode 100755
index 000000000..90fff7571
Binary files /dev/null and b/examples/shaders/shaders_texture_drawing differ
diff --git a/examples/shaders/shaders_texture_drawing.c b/examples/shaders/shaders_texture_drawing.c
index 006168d57..43ffa21ef 100644
--- a/examples/shaders/shaders_texture_drawing.c
+++ b/examples/shaders/shaders_texture_drawing.c
@@ -19,7 +19,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_texture_outline b/examples/shaders/shaders_texture_outline
new file mode 100755
index 000000000..29dbcd72e
Binary files /dev/null and b/examples/shaders/shaders_texture_outline differ
diff --git a/examples/shaders/shaders_texture_outline.c b/examples/shaders/shaders_texture_outline.c
index a28ab80e4..9bfca3f58 100644
--- a/examples/shaders/shaders_texture_outline.c
+++ b/examples/shaders/shaders_texture_outline.c
@@ -20,7 +20,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_texture_waves b/examples/shaders/shaders_texture_waves
new file mode 100755
index 000000000..e99d0fee9
Binary files /dev/null and b/examples/shaders/shaders_texture_waves differ
diff --git a/examples/shaders/shaders_texture_waves.c b/examples/shaders/shaders_texture_waves.c
index a087ec4d0..741f37fc0 100644
--- a/examples/shaders/shaders_texture_waves.c
+++ b/examples/shaders/shaders_texture_waves.c
@@ -24,7 +24,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shaders/shaders_write_depth b/examples/shaders/shaders_write_depth
new file mode 100755
index 000000000..326fba544
Binary files /dev/null and b/examples/shaders/shaders_write_depth differ
diff --git a/examples/shaders/shaders_write_depth.c b/examples/shaders/shaders_write_depth.c
index 048e297ad..d9e40d0dd 100644
--- a/examples/shaders/shaders_write_depth.c
+++ b/examples/shaders/shaders_write_depth.c
@@ -19,7 +19,7 @@
 
 #if defined(PLATFORM_DESKTOP)
 #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
 #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/shapes/shapes_basic_shapes b/examples/shapes/shapes_basic_shapes
new file mode 100755
index 000000000..8b9187f3b
Binary files /dev/null and b/examples/shapes/shapes_basic_shapes differ
diff --git a/examples/shapes/shapes_bouncing_ball b/examples/shapes/shapes_bouncing_ball
new file mode 100755
index 000000000..8638d87e1
Binary files /dev/null and b/examples/shapes/shapes_bouncing_ball differ
diff --git a/examples/shapes/shapes_collision_area b/examples/shapes/shapes_collision_area
new file mode 100755
index 000000000..788b55c8c
Binary files /dev/null and b/examples/shapes/shapes_collision_area differ
diff --git a/examples/shapes/shapes_colors_palette b/examples/shapes/shapes_colors_palette
new file mode 100755
index 000000000..bb33a9e6a
Binary files /dev/null and b/examples/shapes/shapes_colors_palette differ
diff --git a/examples/shapes/shapes_draw_circle_sector b/examples/shapes/shapes_draw_circle_sector
new file mode 100755
index 000000000..c5cad2233
Binary files /dev/null and b/examples/shapes/shapes_draw_circle_sector differ
diff --git a/examples/shapes/shapes_draw_rectangle_rounded b/examples/shapes/shapes_draw_rectangle_rounded
new file mode 100755
index 000000000..a19eeacb6
Binary files /dev/null and b/examples/shapes/shapes_draw_rectangle_rounded differ
diff --git a/examples/shapes/shapes_draw_ring b/examples/shapes/shapes_draw_ring
new file mode 100755
index 000000000..3132d4e5a
Binary files /dev/null and b/examples/shapes/shapes_draw_ring differ
diff --git a/examples/shapes/shapes_easings_ball_anim b/examples/shapes/shapes_easings_ball_anim
new file mode 100755
index 000000000..ef2c17a92
Binary files /dev/null and b/examples/shapes/shapes_easings_ball_anim differ
diff --git a/examples/shapes/shapes_easings_box_anim b/examples/shapes/shapes_easings_box_anim
new file mode 100755
index 000000000..75b9cb603
Binary files /dev/null and b/examples/shapes/shapes_easings_box_anim differ
diff --git a/examples/shapes/shapes_easings_rectangle_array b/examples/shapes/shapes_easings_rectangle_array
new file mode 100755
index 000000000..f913af21d
Binary files /dev/null and b/examples/shapes/shapes_easings_rectangle_array differ
diff --git a/examples/shapes/shapes_following_eyes b/examples/shapes/shapes_following_eyes
new file mode 100755
index 000000000..3891d9cb2
Binary files /dev/null and b/examples/shapes/shapes_following_eyes differ
diff --git a/examples/shapes/shapes_lines_bezier b/examples/shapes/shapes_lines_bezier
new file mode 100755
index 000000000..96620ee41
Binary files /dev/null and b/examples/shapes/shapes_lines_bezier differ
diff --git a/examples/shapes/shapes_logo_raylib b/examples/shapes/shapes_logo_raylib
new file mode 100755
index 000000000..9b9d1f405
Binary files /dev/null and b/examples/shapes/shapes_logo_raylib differ
diff --git a/examples/shapes/shapes_logo_raylib_anim b/examples/shapes/shapes_logo_raylib_anim
new file mode 100755
index 000000000..20cd1edea
Binary files /dev/null and b/examples/shapes/shapes_logo_raylib_anim differ
diff --git a/examples/shapes/shapes_rectangle_scaling b/examples/shapes/shapes_rectangle_scaling
new file mode 100755
index 000000000..9808bfbaa
Binary files /dev/null and b/examples/shapes/shapes_rectangle_scaling differ
diff --git a/examples/shapes/shapes_top_down_lights b/examples/shapes/shapes_top_down_lights
new file mode 100755
index 000000000..128860031
Binary files /dev/null and b/examples/shapes/shapes_top_down_lights differ
diff --git a/examples/text/text_codepoints_loading b/examples/text/text_codepoints_loading
new file mode 100755
index 000000000..43abb10f3
Binary files /dev/null and b/examples/text/text_codepoints_loading differ
diff --git a/examples/text/text_draw_3d b/examples/text/text_draw_3d
new file mode 100755
index 000000000..581706ef6
Binary files /dev/null and b/examples/text/text_draw_3d differ
diff --git a/examples/text/text_font_filters b/examples/text/text_font_filters
new file mode 100755
index 000000000..7490bab14
Binary files /dev/null and b/examples/text/text_font_filters differ
diff --git a/examples/text/text_font_loading b/examples/text/text_font_loading
new file mode 100755
index 000000000..24611126d
Binary files /dev/null and b/examples/text/text_font_loading differ
diff --git a/examples/text/text_font_sdf b/examples/text/text_font_sdf
new file mode 100755
index 000000000..f11045e3e
Binary files /dev/null and b/examples/text/text_font_sdf differ
diff --git a/examples/text/text_font_sdf.c b/examples/text/text_font_sdf.c
index 6a223ae5c..cba47b438 100644
--- a/examples/text/text_font_sdf.c
+++ b/examples/text/text_font_sdf.c
@@ -15,7 +15,7 @@
 
 #if defined(PLATFORM_DESKTOP)
     #define GLSL_VERSION            330
-#else   // PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+#else   // PLATFORM_ANDROID, PLATFORM_WEB
     #define GLSL_VERSION            100
 #endif
 
diff --git a/examples/text/text_font_spritefont b/examples/text/text_font_spritefont
new file mode 100755
index 000000000..305c7a720
Binary files /dev/null and b/examples/text/text_font_spritefont differ
diff --git a/examples/text/text_format_text b/examples/text/text_format_text
new file mode 100755
index 000000000..4cde910b5
Binary files /dev/null and b/examples/text/text_format_text differ
diff --git a/examples/text/text_input_box b/examples/text/text_input_box
new file mode 100755
index 000000000..3c22467d6
Binary files /dev/null and b/examples/text/text_input_box differ
diff --git a/examples/text/text_raylib_fonts b/examples/text/text_raylib_fonts
new file mode 100755
index 000000000..977fd85fe
Binary files /dev/null and b/examples/text/text_raylib_fonts differ
diff --git a/examples/text/text_rectangle_bounds b/examples/text/text_rectangle_bounds
new file mode 100755
index 000000000..ccd39bc16
Binary files /dev/null and b/examples/text/text_rectangle_bounds differ
diff --git a/examples/text/text_unicode b/examples/text/text_unicode
new file mode 100755
index 000000000..5ddd1cf7c
Binary files /dev/null and b/examples/text/text_unicode differ
diff --git a/examples/text/text_writing_anim b/examples/text/text_writing_anim
new file mode 100755
index 000000000..fd84f1fa9
Binary files /dev/null and b/examples/text/text_writing_anim differ
diff --git a/examples/textures/textures_background_scrolling b/examples/textures/textures_background_scrolling
new file mode 100755
index 000000000..e2546b72e
Binary files /dev/null and b/examples/textures/textures_background_scrolling differ
diff --git a/examples/textures/textures_blend_modes b/examples/textures/textures_blend_modes
new file mode 100755
index 000000000..f0137d34d
Binary files /dev/null and b/examples/textures/textures_blend_modes differ
diff --git a/examples/textures/textures_bunnymark b/examples/textures/textures_bunnymark
new file mode 100755
index 000000000..ac958ac3f
Binary files /dev/null and b/examples/textures/textures_bunnymark differ
diff --git a/examples/textures/textures_draw_tiled b/examples/textures/textures_draw_tiled
new file mode 100755
index 000000000..42c771dba
Binary files /dev/null and b/examples/textures/textures_draw_tiled differ
diff --git a/examples/textures/textures_fog_of_war b/examples/textures/textures_fog_of_war
new file mode 100755
index 000000000..dc2d5a698
Binary files /dev/null and b/examples/textures/textures_fog_of_war differ
diff --git a/examples/textures/textures_gif_player b/examples/textures/textures_gif_player
new file mode 100755
index 000000000..14cb12dfd
Binary files /dev/null and b/examples/textures/textures_gif_player differ
diff --git a/examples/textures/textures_image_drawing b/examples/textures/textures_image_drawing
new file mode 100755
index 000000000..d5c4d7557
Binary files /dev/null and b/examples/textures/textures_image_drawing differ
diff --git a/examples/textures/textures_image_generation b/examples/textures/textures_image_generation
new file mode 100755
index 000000000..fdf9fbaae
Binary files /dev/null and b/examples/textures/textures_image_generation differ
diff --git a/examples/textures/textures_image_loading b/examples/textures/textures_image_loading
new file mode 100755
index 000000000..08fa95c17
Binary files /dev/null and b/examples/textures/textures_image_loading differ
diff --git a/examples/textures/textures_image_processing b/examples/textures/textures_image_processing
new file mode 100755
index 000000000..ffa0f75e7
Binary files /dev/null and b/examples/textures/textures_image_processing differ
diff --git a/examples/textures/textures_image_rotate b/examples/textures/textures_image_rotate
new file mode 100755
index 000000000..f7d238d1e
Binary files /dev/null and b/examples/textures/textures_image_rotate differ
diff --git a/examples/textures/textures_image_text b/examples/textures/textures_image_text
new file mode 100755
index 000000000..dac1d3575
Binary files /dev/null and b/examples/textures/textures_image_text differ
diff --git a/examples/textures/textures_logo_raylib b/examples/textures/textures_logo_raylib
new file mode 100755
index 000000000..8b9a79749
Binary files /dev/null and b/examples/textures/textures_logo_raylib differ
diff --git a/examples/textures/textures_mouse_painting b/examples/textures/textures_mouse_painting
new file mode 100755
index 000000000..2d412eb5e
Binary files /dev/null and b/examples/textures/textures_mouse_painting differ
diff --git a/examples/textures/textures_npatch_drawing b/examples/textures/textures_npatch_drawing
new file mode 100755
index 000000000..20641111f
Binary files /dev/null and b/examples/textures/textures_npatch_drawing differ
diff --git a/examples/textures/textures_particles_blending b/examples/textures/textures_particles_blending
new file mode 100755
index 000000000..b23d445e9
Binary files /dev/null and b/examples/textures/textures_particles_blending differ
diff --git a/examples/textures/textures_polygon b/examples/textures/textures_polygon
new file mode 100755
index 000000000..ae5c92bae
Binary files /dev/null and b/examples/textures/textures_polygon differ
diff --git a/examples/textures/textures_raw_data b/examples/textures/textures_raw_data
new file mode 100755
index 000000000..bae62c744
Binary files /dev/null and b/examples/textures/textures_raw_data differ
diff --git a/examples/textures/textures_sprite_anim b/examples/textures/textures_sprite_anim
new file mode 100755
index 000000000..de21275a3
Binary files /dev/null and b/examples/textures/textures_sprite_anim differ
diff --git a/examples/textures/textures_sprite_button b/examples/textures/textures_sprite_button
new file mode 100755
index 000000000..35eecfd3d
Binary files /dev/null and b/examples/textures/textures_sprite_button differ
diff --git a/examples/textures/textures_sprite_explosion b/examples/textures/textures_sprite_explosion
new file mode 100755
index 000000000..86775cfa4
Binary files /dev/null and b/examples/textures/textures_sprite_explosion differ
diff --git a/examples/textures/textures_srcrec_dstrec b/examples/textures/textures_srcrec_dstrec
new file mode 100755
index 000000000..70a78d5b0
Binary files /dev/null and b/examples/textures/textures_srcrec_dstrec differ
diff --git a/examples/textures/textures_textured_curve b/examples/textures/textures_textured_curve
new file mode 100755
index 000000000..f799003d6
Binary files /dev/null and b/examples/textures/textures_textured_curve differ
diff --git a/examples/textures/textures_to_image b/examples/textures/textures_to_image
new file mode 100755
index 000000000..c54da1065
Binary files /dev/null and b/examples/textures/textures_to_image differ
diff --git a/projects/CMake/core_basic_window.c b/projects/CMake/core_basic_window.c
index 0e5542967..86709f7a9 100644
--- a/projects/CMake/core_basic_window.c
+++ b/projects/CMake/core_basic_window.c
@@ -2,7 +2,7 @@
 *
 *   raylib [core] example - Basic window (adapted for HTML5 platform)
 *
-*   This example is prepared to compile for PLATFORM_WEB, PLATFORM_DESKTOP and PLATFORM_RPI
+*   This example is prepared to compile for PLATFORM_WEB and PLATFORM_DESKTOP
 *   As you will notice, code structure is slightly different to the other examples...
 *   To compile it for PLATFORM_WEB just uncomment #define PLATFORM_WEB at beginning
 *
diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile
index 9ab042e8f..a2a26f092 100644
--- a/projects/VSCode/Makefile
+++ b/projects/VSCode/Makefile
@@ -32,7 +32,7 @@ RAYLIB_PATH        ?= ..\..
 COMPILER_PATH      ?= C:/raylib/w64devkit/bin
 
 # Define default options
-# One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
+# One of PLATFORM_DESKTOP, PLATFORM_ANDROID, PLATFORM_WEB
 PLATFORM           ?= PLATFORM_DESKTOP
 
 # Locations of your newly installed library and associated headers. See ../src/Makefile
diff --git a/src/Makefile b/src/Makefile
index e9b68cd93..ce7edb9fb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,6 @@
 #    PLATFORM_DESKTOP:  OSX/macOS (arm64, x86_64)
 #    PLATFORM_DESKTOP:  FreeBSD, OpenBSD, NetBSD, DragonFly
 #    PLATFORM_ANDROID:  Android (arm, i686, arm64, x86_64)
-#    PLATFORM_RPI:      Raspberry Pi (deprecated - RPI OS Buster only)
 #    PLATFORM_DRM:      Linux native mode, including Raspberry Pi (RPI OS Bullseye)
 #    PLATFORM_WEB:      HTML5 (Chrome, Firefox)
 #
@@ -41,7 +40,7 @@
 
 # Define required environment variables
 #------------------------------------------------------------------------------------------------
-# Define target platform: PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB
+# Define target platform: PLATFORM_DESKTOP, PLATFORM_DRM, PLATFORM_ANDROID, PLATFORM_WEB
 PLATFORM             ?= PLATFORM_DESKTOP
 
 # Define required raylib variables
@@ -94,14 +93,6 @@ USE_EXTERNAL_GLFW     ?= FALSE
 # NOTE: This variable is only used for PLATFORM_OS: LINUX
 USE_WAYLAND_DISPLAY   ?= FALSE
 
-# Use cross-compiler for PLATFORM_RPI
-USE_RPI_CROSS_COMPILER ?= FALSE
-ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-    RPI_TOOLCHAIN ?= C:/SysGCC/Raspberry
-    RPI_TOOLCHAIN_NAME ?= arm-linux-gnueabihf
-    RPI_TOOLCHAIN_SYSROOT ?= $(RPI_TOOLCHAIN)/$(RPI_TOOLCHAIN_NAME)/sysroot
-endif
-
 # Determine if the file has root access (only required to install raylib)
 # "whoami" prints the name of the user that calls him (so, if it is the root user, "whoami" prints "root")
 ROOT = $(shell whoami)
@@ -144,15 +135,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         endif
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    UNAMEOS = $(shell uname)
-    ifeq ($(UNAMEOS),Linux)
-        PLATFORM_OS = LINUX
-    endif
-    ifndef PLATFORM_SHELL
-        PLATFORM_SHELL = sh
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     UNAMEOS = $(shell uname)
     ifeq ($(UNAMEOS),Linux)
@@ -235,10 +217,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
     #GRAPHICS = GRAPHICS_API_OPENGL_43      # Uncomment to use OpenGL 4.3
     #GRAPHICS = GRAPHICS_API_OPENGL_ES2     # Uncomment to use OpenGL ES 2.0 (ANGLE)
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    # On RPI OpenGL ES 2.0 must be used
-    GRAPHICS = GRAPHICS_API_OPENGL_ES2
-endif
+
 ifeq ($(PLATFORM),PLATFORM_DRM)
     # On DRM OpenGL ES 2.0 must be used
     GRAPHICS = GRAPHICS_API_OPENGL_ES2
@@ -269,14 +248,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         CC = clang
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
-        # Define RPI cross-compiler
-        #CC = armv6j-hardfloat-linux-gnueabi-gcc
-        CC = $(RPI_TOOLCHAIN)/bin/$(RPI_TOOLCHAIN_NAME)-gcc
-        AR = $(RPI_TOOLCHAIN)/bin/$(RPI_TOOLCHAIN_NAME)-ar
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     ifeq ($(USE_RPI_CROSS_COMPILER),TRUE)
         # Define RPI cross-compiler
@@ -452,11 +423,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         INCLUDE_PATHS += -I/usr/local/include
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vmcs_host/linux
-    INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vcos/pthreads
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     INCLUDE_PATHS += -I/usr/include/libdrm
     ifeq ($(USE_RPI_CROSSCOMPILER), TRUE)
@@ -506,9 +472,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         LDFLAGS += -Wl,-soname,lib$(RAYLIB_LIB_NAME).$(RAYLIB_API_VERSION).so -Lsrc -L/usr/local/lib
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LDFLAGS += -Wl,-soname,lib$(RAYLIB_LIB_NAME).so.$(RAYLIB_API_VERSION) -L$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/lib
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     LDFLAGS += -Wl,-soname,lib$(RAYLIB_LIB_NAME).so.$(RAYLIB_API_VERSION)
     ifeq ($(USE_RPI_CROSSCOMPILER), TRUE)
@@ -557,12 +520,6 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP)
         LDLIBS = -lglfw
     endif
 endif
-ifeq ($(PLATFORM),PLATFORM_RPI)
-    LDLIBS = -lbrcmGLESv2 -lbrcmEGL -lpthread -lrt -lm -lbcm_host -ldl
-    ifeq ($(RAYLIB_MODULE_AUDIO),TRUE)
-        LDLIBS += -latomic
-    endif
-endif
 ifeq ($(PLATFORM),PLATFORM_DRM)
     LDLIBS = -lGLESv2 -lEGL -ldrm -lgbm -lpthread -lrt -lm -ldl
     ifeq ($(RAYLIB_MODULE_AUDIO),TRUE)
@@ -647,14 +604,6 @@ else
 				cd $(RAYLIB_RELEASE_PATH) && ln -fs lib$(RAYLIB_LIB_NAME).$(RAYLIB_VERSION).so lib$(RAYLIB_LIB_NAME).so
             endif
         endif
-        ifeq ($(PLATFORM),PLATFORM_RPI)
-                # Compile raylib shared library version $(RAYLIB_VERSION).
-                # WARNING: you should type "make clean" before doing this target
-				$(CC) -shared -o $(RAYLIB_RELEASE_PATH)/lib$(RAYLIB_LIB_NAME).so.$(RAYLIB_VERSION) $(OBJS) $(LDFLAGS) $(LDLIBS)
-				@echo "raylib shared library generated (lib$(RAYLIB_LIB_NAME).so.$(RAYLIB_VERSION)) in $(RAYLIB_RELEASE_PATH)!"
-				cd $(RAYLIB_RELEASE_PATH) && ln -fsv lib$(RAYLIB_LIB_NAME).so.$(RAYLIB_VERSION) lib$(RAYLIB_LIB_NAME).so.$(RAYLIB_API_VERSION)
-				cd $(RAYLIB_RELEASE_PATH) && ln -fsv lib$(RAYLIB_LIB_NAME).so.$(RAYLIB_API_VERSION) lib$(RAYLIB_LIB_NAME).so
-        endif
         ifeq ($(PLATFORM),PLATFORM_DRM)
                 # Compile raylib shared library version $(RAYLIB_VERSION).
                 # WARNING: you should type "make clean" before doing this target
diff --git a/src/rcore.c b/src/rcore.c
index 97d010a9f..38096074d 100644
--- a/src/rcore.c
+++ b/src/rcore.c
@@ -8,7 +8,6 @@
 *       - PLATFORM_DESKTOP: FreeBSD, OpenBSD, NetBSD, DragonFly (X11 desktop)
 *       - PLATFORM_DESKTOP: OSX/macOS
 *       - PLATFORM_ANDROID: Android (ARM, ARM64)
-*       - PLATFORM_RPI:     Raspberry Pi 0,1,2,3 (Raspbian, native mode)
 *       - PLATFORM_DRM:     Linux native mode, including Raspberry Pi 4 with V3D fkms driver
 *       - PLATFORM_WEB:     HTML5 with WebAssembly
 *
@@ -21,12 +20,6 @@
 *           Windowing and input system configured for Android device, app activity managed internally in this module.
 *           NOTE: OpenGL ES 2.0 is required and graphic device is managed by EGL
 *
-*       #define PLATFORM_RPI (deprecated - RPI OS Buster only)
-*           Windowing and input system configured for Raspberry Pi in native mode (no XWindow required),
-*           graphic device is managed by EGL and inputs are processed is raw mode, reading from /dev/input/
-*           WARNING: This platform is deprecated, since RPI OS Bullseye, the old Dispmanx libraries are not
-*           supported and you must be using PLATFORM_DRM
-*
 *       #define PLATFORM_DRM
 *           Windowing and input system configured for DRM native mode (RPI4 and other devices)
 *           graphic device is managed by EGL and inputs are processed is raw mode, reading from /dev/input/
@@ -263,7 +256,7 @@
     //#include <GLES2/gl2.h>                // OpenGL ES 2.0 library (not required in this module, only in rlgl)
 #endif
 
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
     #include <fcntl.h>                  // POSIX file control definitions - open(), creat(), fcntl()
     #include <unistd.h>                 // POSIX standard function definitions - read(), close(), STDIN_FILENO
     #include <termios.h>                // POSIX terminal control definitions - tcgetattr(), tcsetattr()
@@ -275,9 +268,6 @@
     #include <linux/input.h>            // Linux: Keycodes constants definition (KEY_A, ...)
     #include <linux/joystick.h>         // Linux: Joystick support library
 
-#if defined(PLATFORM_RPI)
-    #include "bcm_host.h"               // Raspberry Pi VideoCore IV access functions
-#endif
 #if defined(PLATFORM_DRM)
     #include <gbm.h>                    // Generic Buffer Management (native platform for EGL on DRM)
     #include <xf86drm.h>                // Direct Rendering Manager user-level library interface
@@ -302,7 +292,7 @@
 //----------------------------------------------------------------------------------
 // Defines and Macros
 //----------------------------------------------------------------------------------
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
     #define USE_LAST_TOUCH_DEVICE       // When multiple touchscreens are connected, only use the one with the highest event<N> number
 
     #define DEFAULT_GAMEPAD_DEV    "/dev/input/js"  // Gamepad input (base dev for all gamepads: js0, js1, ...)
@@ -354,7 +344,7 @@
 //----------------------------------------------------------------------------------
 // Types and Structures Definition
 //----------------------------------------------------------------------------------
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
 typedef struct {
     pthread_t threadId;             // Event reading thread id
     int fd;                         // File descriptor to the device it is assigned to
@@ -378,10 +368,7 @@ typedef struct CoreData {
 #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
         GLFWwindow *handle;                 // GLFW window handle (graphic device)
 #endif
-#if defined(PLATFORM_RPI)
-        EGL_DISPMANX_WINDOW_T handle;       // Native window handle (graphic device)
-#endif
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
 #if defined(PLATFORM_DRM)
         int fd;                             // File descriptor for /dev/dri/...
         drmModeConnector *connector;        // Direct Rendering Manager (DRM) mode connector
@@ -431,7 +418,7 @@ typedef struct CoreData {
         const char *basePath;               // Base path for data storage
     } Storage;
     struct {
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
         InputEventWorker eventWorker[10];   // List of worker threads for every monitored "/dev/input/event<N>"
 #endif
         struct {
@@ -445,7 +432,7 @@ typedef struct CoreData {
             int charPressedQueue[MAX_CHAR_PRESSED_QUEUE];   // Input characters queue (unicode)
             int charPressedQueueCount;      // Input characters queue count
 
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
             int defaultMode;                // Default keyboard mode
 #if defined(SUPPORT_SSH_KEYBOARD_RPI)
             bool evtMode;                   // Keyboard in event mode
@@ -469,7 +456,7 @@ typedef struct CoreData {
             char previousButtonState[MAX_MOUSE_BUTTONS];    // Registers previous mouse button state
             Vector2 currentWheelMove;       // Registers current mouse wheel variation
             Vector2 previousWheelMove;      // Registers previous mouse wheel variation
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
             Vector2 eventWheelMove;         // Registers the event mouse wheel variation
             // NOTE: currentButtonState[] can't be written directly due to multithreading, app could miss the update
             char currentButtonStateEvdev[MAX_MOUSE_BUTTONS]; // Holds the new mouse state for the next polling event to grab
@@ -490,7 +477,7 @@ typedef struct CoreData {
             char currentButtonState[MAX_GAMEPADS][MAX_GAMEPAD_BUTTONS];     // Current gamepad buttons state
             char previousButtonState[MAX_GAMEPADS][MAX_GAMEPAD_BUTTONS];    // Previous gamepad buttons state
             float axisState[MAX_GAMEPADS][MAX_GAMEPAD_AXIS];                // Gamepad axis state
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
             pthread_t threadId;             // Gamepad reading thread id
             int streamId[MAX_GAMEPADS];     // Gamepad device file descriptor
 #endif
@@ -503,7 +490,7 @@ typedef struct CoreData {
         double draw;                        // Time measure for frame draw
         double frame;                       // Time measure for one frame
         double target;                      // Desired time for one frame, if 0 not applied
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
         unsigned long long base;            // Base time measure for hi-res timer
 #endif
         unsigned int frameCounter;          // Frame counter
@@ -668,7 +655,7 @@ static EM_BOOL EmscriptenTouchCallback(int eventType, const EmscriptenTouchEvent
 static EM_BOOL EmscriptenGamepadCallback(int eventType, const EmscriptenGamepadEvent *gamepadEvent, void *userData);
 #endif
 
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
 static void InitKeyboard(void);                         // Initialize raw keyboard system
 static void RestoreKeyboard(void);                      // Restore keyboard system
 #if defined(SUPPORT_SSH_KEYBOARD_RPI)
@@ -683,13 +670,11 @@ static void *EventThread(void *arg);                    // Input device events r
 static void InitGamepad(void);                          // Initialize raw gamepad input
 static void *GamepadThread(void *arg);                  // Mouse reading thread
 
-#if defined(PLATFORM_DRM)
 static int FindMatchingConnectorMode(const drmModeConnector *connector, const drmModeModeInfo *mode);                               // Search matching DRM mode in connector's mode list
 static int FindExactConnectorMode(const drmModeConnector *connector, uint width, uint height, uint fps, bool allowInterlaced);      // Search exactly matching DRM connector mode in connector's list
 static int FindNearestConnectorMode(const drmModeConnector *connector, uint width, uint height, uint fps, bool allowInterlaced);    // Search the nearest matching DRM connector mode in connector's list
-#endif
 
-#endif  // PLATFORM_RPI || PLATFORM_DRM
+#endif  // PLATFORM_DRM
 
 #if defined(SUPPORT_EVENTS_AUTOMATION)
 static void LoadAutomationEvents(const char *fileName);     // Load automation events from file
@@ -858,7 +843,7 @@ void InitWindow(int width, int height, const char *title)
         }
     }
 #endif
-#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) || defined(PLATFORM_DRM)
     // Initialize graphics device (display device and OpenGL context)
     // NOTE: returns true if window and graphic device has been initialized successfully
     CORE.Window.ready = InitGraphicsDevice(width, height);
@@ -907,7 +892,7 @@ void InitWindow(int width, int height, const char *title)
     }
 #endif
 
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
     // Initialize raw input system
     InitEvdevInput();   // Evdev inputs initialization
     InitGamepad();      // Gamepad init
@@ -949,7 +934,7 @@ void InitWindow(int width, int height, const char *title)
     CORE.Time.frameCounter = 0;
 #endif
 
-#endif        // PLATFORM_DESKTOP || PLATFORM_WEB || PLATFORM_RPI || PLATFORM_DRM
+#endif        // PLATFORM_DESKTOP || PLATFORM_WEB || PLATFORM_DRM
 }
 
 // Close window and unload OpenGL context
@@ -979,7 +964,7 @@ void CloseWindow(void)
     timeEndPeriod(1);           // Restore time period
 #endif
 
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI)
+#if defined(PLATFORM_ANDROID)
     // Close surface, context and display
     if (CORE.Window.device != EGL_NO_DISPLAY)
     {
@@ -1067,7 +1052,7 @@ void CloseWindow(void)
     }
 #endif
 
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
     // Wait for mouse and gamepad threads to finish before closing
     // NOTE: Those threads should already have finished at this point
     // because they are controlled by CORE.Window.shouldClose variable
@@ -1129,7 +1114,7 @@ bool WindowShouldClose(void)
     else return true;
 #endif
 
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
     if (CORE.Window.ready) return CORE.Window.shouldClose;
     else return true;
 #endif
@@ -1315,7 +1300,7 @@ void ToggleFullscreen(void)
 
     CORE.Window.fullscreen = !CORE.Window.fullscreen;          // Toggle fullscreen flag
 #endif
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
     TRACELOG(LOG_WARNING, "SYSTEM: Failed to toggle to windowed mode");
 #endif
 }
@@ -3038,7 +3023,7 @@ double GetTime(void)
     time = glfwGetTime();   // Elapsed time since glfwInit()
 #endif
 
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
     struct timespec ts = { 0 };
     clock_gettime(CLOCK_MONOTONIC, &ts);
     unsigned long long int nanoSeconds = (unsigned long long int)ts.tv_sec*1000000000LLU + (unsigned long long int)ts.tv_nsec;
@@ -3851,7 +3836,7 @@ const char *GetGamepadName(int gamepad)
     if (CORE.Input.Gamepad.ready[gamepad]) return glfwGetJoystickName(gamepad);
     else return NULL;
 #endif
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
     if (CORE.Input.Gamepad.ready[gamepad]) ioctl(CORE.Input.Gamepad.streamId[gamepad], JSIOCGNAME(64), &CORE.Input.Gamepad.name[gamepad]);
     return CORE.Input.Gamepad.name[gamepad];
 #endif
@@ -3864,7 +3849,7 @@ const char *GetGamepadName(int gamepad)
 // Get gamepad axis count
 int GetGamepadAxisCount(int gamepad)
 {
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
     int axisCount = 0;
     if (CORE.Input.Gamepad.ready[gamepad]) ioctl(CORE.Input.Gamepad.streamId[gamepad], JSIOCGAXES, &axisCount);
     CORE.Input.Gamepad.axisCount = axisCount;
@@ -4106,7 +4091,7 @@ int GetTouchX(void)
 {
 #if defined(PLATFORM_ANDROID) || defined(PLATFORM_WEB)
     return (int)CORE.Input.Touch.position[0].x;
-#else   // PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM
+#else   // PLATFORM_DESKTOP, PLATFORM_DRM
     return GetMouseX();
 #endif
 }
@@ -4116,7 +4101,7 @@ int GetTouchY(void)
 {
 #if defined(PLATFORM_ANDROID) || defined(PLATFORM_WEB)
     return (int)CORE.Input.Touch.position[0].y;
-#else   // PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_DRM
+#else   // PLATFORM_DESKTOP, PLATFORM_DRM
     return GetMouseY();
 #endif
 }
@@ -4133,7 +4118,7 @@ Vector2 GetTouchPosition(int index)
     // https://docs.microsoft.com/en-us/windows/win32/wintouch/getting-started-with-multi-touch-messages
     if (index == 0) position = GetMousePosition();
 #endif
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_WEB) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_WEB) || defined(PLATFORM_DRM)
     if (index < MAX_TOUCH_POINTS) position = CORE.Input.Touch.position[index];
     else TRACELOG(LOG_WARNING, "INPUT: Required touch point out of range (Max touch points: %i)", MAX_TOUCH_POINTS);
 #endif
@@ -4502,21 +4487,10 @@ static bool InitGraphicsDevice(int width, int height)
 
 #endif  // PLATFORM_DESKTOP || PLATFORM_WEB
 
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
     CORE.Window.fullscreen = true;
     CORE.Window.flags |= FLAG_FULLSCREEN_MODE;
 
-#if defined(PLATFORM_RPI)
-    bcm_host_init();
-
-    DISPMANX_ELEMENT_HANDLE_T dispmanElement = { 0 };
-    DISPMANX_DISPLAY_HANDLE_T dispmanDisplay = { 0 };
-    DISPMANX_UPDATE_HANDLE_T dispmanUpdate = { 0 };
-
-    VC_RECT_T dstRect = { 0 };
-    VC_RECT_T srcRect = { 0 };
-#endif
-
 #if defined(PLATFORM_DRM)
     CORE.Window.fd = -1;
     CORE.Window.connector = NULL;
@@ -4713,7 +4687,7 @@ static bool InitGraphicsDevice(int width, int height)
         EGL_NONE
     };
 
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
     EGLint numConfigs = 0;
 
     // Get an EGL device connection
@@ -4828,58 +4802,6 @@ static bool InitGraphicsDevice(int width, int height)
     CORE.Window.surface = eglCreateWindowSurface(CORE.Window.device, CORE.Window.config, CORE.Android.app->window, NULL);
 #endif  // PLATFORM_ANDROID
 
-#if defined(PLATFORM_RPI)
-    graphics_get_display_size(0, &CORE.Window.display.width, &CORE.Window.display.height);
-
-    // Screen size security check
-    if (CORE.Window.screen.width <= 0) CORE.Window.screen.width = CORE.Window.display.width;
-    if (CORE.Window.screen.height <= 0) CORE.Window.screen.height = CORE.Window.display.height;
-
-    // At this point we need to manage render size vs screen size
-    // NOTE: This function use and modify global module variables:
-    //  -> CORE.Window.screen.width/CORE.Window.screen.height
-    //  -> CORE.Window.render.width/CORE.Window.render.height
-    //  -> CORE.Window.screenScale
-    SetupFramebuffer(CORE.Window.display.width, CORE.Window.display.height);
-
-    dstRect.x = 0;
-    dstRect.y = 0;
-    dstRect.width = CORE.Window.display.width;
-    dstRect.height = CORE.Window.display.height;
-
-    srcRect.x = 0;
-    srcRect.y = 0;
-    srcRect.width = CORE.Window.render.width << 16;
-    srcRect.height = CORE.Window.render.height << 16;
-
-    // NOTE: RPI dispmanx windowing system takes care of source rectangle scaling to destination rectangle by hardware (no cost)
-    // Take care that renderWidth/renderHeight fit on displayWidth/displayHeight aspect ratio
-
-    VC_DISPMANX_ALPHA_T alpha = { 0 };
-    alpha.flags = DISPMANX_FLAGS_ALPHA_FIXED_ALL_PIXELS;
-    //alpha.flags = DISPMANX_FLAGS_ALPHA_FROM_SOURCE;       // TODO: Allow transparent framebuffer! -> FLAG_WINDOW_TRANSPARENT
-    alpha.opacity = 255;    // Set transparency level for framebuffer, requires EGLAttrib: EGL_TRANSPARENT_TYPE
-    alpha.mask = 0;
-
-    dispmanDisplay = vc_dispmanx_display_open(0);   // LCD
-    dispmanUpdate = vc_dispmanx_update_start(0);
-
-    dispmanElement = vc_dispmanx_element_add(dispmanUpdate, dispmanDisplay, 0/*layer*/, &dstRect, 0/*src*/,
-                                            &srcRect, DISPMANX_PROTECTION_NONE, &alpha, 0/*clamp*/, DISPMANX_NO_ROTATE);
-
-    CORE.Window.handle.element = dispmanElement;
-    CORE.Window.handle.width = CORE.Window.render.width;
-    CORE.Window.handle.height = CORE.Window.render.height;
-    vc_dispmanx_update_submit_sync(dispmanUpdate);
-
-    CORE.Window.surface = eglCreateWindowSurface(CORE.Window.device, CORE.Window.config, &CORE.Window.handle, NULL);
-
-    const unsigned char *const renderer = glGetString(GL_RENDERER);
-    if (renderer) TRACELOG(LOG_INFO, "DISPLAY: Renderer name is: %s", renderer);
-    else TRACELOG(LOG_WARNING, "DISPLAY: Failed to get renderer name");
-    //---------------------------------------------------------------------------------
-#endif  // PLATFORM_RPI
-
 #if defined(PLATFORM_DRM)
     CORE.Window.surface = eglCreateWindowSurface(CORE.Window.device, CORE.Window.config, (EGLNativeWindowType)CORE.Window.gbmSurface, NULL);
     if (EGL_NO_SURFACE == CORE.Window.surface)
@@ -4917,7 +4839,7 @@ static bool InitGraphicsDevice(int width, int height)
         TRACELOG(LOG_INFO, "    > Render size:  %i x %i", CORE.Window.render.width, CORE.Window.render.height);
         TRACELOG(LOG_INFO, "    > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y);
     }
-#endif  // PLATFORM_ANDROID || PLATFORM_RPI || PLATFORM_DRM
+#endif  // PLATFORM_ANDROID || PLATFORM_DRM
 
     // Load OpenGL extensions
     // NOTE: GL procedures address loader is required to load extensions
@@ -5061,7 +4983,7 @@ static void InitTimer(void)
     timeBeginPeriod(1);                 // Setup high-resolution timer to 1ms (granularity of 1-2 ms)
 #endif
 
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
     struct timespec now = { 0 };
 
     if (clock_gettime(CLOCK_MONOTONIC, &now) == 0)  // Success
@@ -5125,7 +5047,7 @@ void SwapScreenBuffer(void)
     glfwSwapBuffers(CORE.Window.handle);
 #endif
 
-#if defined(PLATFORM_ANDROID) || defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_ANDROID) || defined(PLATFORM_DRM)
     eglSwapBuffers(CORE.Window.device, CORE.Window.surface);
 
 #if defined(PLATFORM_DRM)
@@ -5155,7 +5077,7 @@ void SwapScreenBuffer(void)
     CORE.Window.prevBO = bo;
 
 #endif  // PLATFORM_DRM
-#endif  // PLATFORM_ANDROID || PLATFORM_RPI || PLATFORM_DRM
+#endif  // PLATFORM_ANDROID || PLATFORM_DRM
 }
 
 // Register all input events
@@ -5171,13 +5093,11 @@ void PollInputEvents(void)
     CORE.Input.Keyboard.keyPressedQueueCount = 0;
     CORE.Input.Keyboard.charPressedQueueCount = 0;
 
-#if !(defined(PLATFORM_RPI) || defined(PLATFORM_DRM))
     // Reset last gamepad button/axis registered state
     CORE.Input.Gamepad.lastButtonPressed = 0;       // GAMEPAD_BUTTON_UNKNOWN
     CORE.Input.Gamepad.axisCount = 0;
-#endif
 
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
     // Register previous keys states
     for (int i = 0; i < MAX_KEYBOARD_KEYS; i++) CORE.Input.Keyboard.previousKeyState[i] = CORE.Input.Keyboard.currentKeyState[i];
 
@@ -5412,7 +5332,7 @@ void PollInputEvents(void)
     }
 #endif
 
-#if (defined(PLATFORM_RPI) || defined(PLATFORM_DRM)) && defined(SUPPORT_SSH_KEYBOARD_RPI)
+#if defined(PLATFORM_DRM) && defined(SUPPORT_SSH_KEYBOARD_RPI)
     // NOTE: Keyboard reading could be done using input_event(s) or just read from stdin, both methods are used here.
     // stdin reading is still used for legacy purposes, it allows keyboard input trough SSH console
 
@@ -6285,7 +6205,7 @@ static EM_BOOL EmscriptenTouchCallback(int eventType, const EmscriptenTouchEvent
 }
 #endif
 
-#if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+#if defined(PLATFORM_DRM)
 // Initialize Keyboard system (using standard input)
 static void InitKeyboard(void)
 {
@@ -6918,7 +6838,7 @@ static void *EventThread(void *arg)
             if (CORE.Input.Touch.position[2].x >= 0) CORE.Input.Touch.pointCount++;
             if (CORE.Input.Touch.position[3].x >= 0) CORE.Input.Touch.pointCount++;
 
-#if defined(SUPPORT_GESTURES_SYSTEM)        // PLATFORM_RPI, PLATFORM_DRM
+#if defined(SUPPORT_GESTURES_SYSTEM)        // PLATFORM_DRM
             if (gestureUpdate)
             {
                 GestureEvent gestureEvent = { 0 };
@@ -7035,7 +6955,7 @@ static void *GamepadThread(void *arg)
 
     return NULL;
 }
-#endif  // PLATFORM_RPI || PLATFORM_DRM
+#endif  // PLATFORM_DRM
 
 #if defined(PLATFORM_DRM)
 // Search matching DRM mode in connector's mode list
diff --git a/src/rlgl.h b/src/rlgl.h
index 717fa59fb..64dd0d04f 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -815,7 +815,7 @@ RLAPI void rlLoadDrawQuad(void);     // Load and draw a quad
 
     // It seems OpenGL ES 2.0 instancing entry points are not defined on Raspberry Pi
     // provided headers (despite being defined in official Khronos GLES2 headers)
-    #if defined(PLATFORM_RPI) || defined(PLATFORM_DRM)
+    #if defined(PLATFORM_DRM)
     typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
     typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
     typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISOREXTPROC) (GLuint index, GLuint divisor);