diff --git a/examples/raylib_compile_execute.bat b/examples/raylib_compile_execute.bat
index 4b356419..ddea6947 100644
--- a/examples/raylib_compile_execute.bat
+++ b/examples/raylib_compile_execute.bat
@@ -4,9 +4,9 @@
 :: .
 :: > Setup required Environment
 :: -------------------------------------
-set RAYLIB_INCLUDE_DIR=C:\GitHub\raylib\src
-set RAYLIB_LIB_DIR=C:\GitHub\raylib\src
-set RAYLIB_RES_FILE=C:\GitHub\raylib\raylib.rc.data
+set RAYLIB_INCLUDE_DIR=C:\raylib\src
+set RAYLIB_LIB_DIR=C:\raylib\src
+set RAYLIB_RES_FILE=C:\raylib\src\raylib.rc.data
 set COMPILER_DIR=C:\raylib\mingw\bin
 set PATH=%PATH%;%COMPILER_DIR%
 :: Get full filename path for input file %1
diff --git a/examples/raylib_makefile_example.bat b/examples/raylib_makefile_example.bat
index f5b77d6c..83fa06e1 100644
--- a/examples/raylib_makefile_example.bat
+++ b/examples/raylib_makefile_example.bat
@@ -4,9 +4,9 @@
 :: .
 :: > Setup required Environment
 :: -------------------------------------
-set RAYLIB_INCLUDE_DIR=C:\GitHub\raylib\src
-set RAYLIB_LIB_DIR=C:\GitHub\raylib\src
-set RAYLIB_RES_FILE=C:\GitHub\raylib\raylib.rc.data
+set RAYLIB_INCLUDE_DIR=C:\raylib\src
+set RAYLIB_LIB_DIR=C:\raylib\src
+set RAYLIB_RES_FILE=C:\raylib\src\raylib.rc.data
 set COMPILER_DIR=C:\raylib\mingw\bin
 set PATH=%PATH%;%COMPILER_DIR%
 set FILENAME=%1
diff --git a/projects/Geany/raylib_compile_execute.bat b/projects/Geany/raylib_compile_execute.bat
index 09783383..b99740c4 100644
--- a/projects/Geany/raylib_compile_execute.bat
+++ b/projects/Geany/raylib_compile_execute.bat
@@ -2,7 +2,8 @@
 :: > Setup required Environment
 :: -------------------------------------
 set RAYLIB_DIR=C:\raylib
-set PATH=%PATH%;%RAYLIB_DIR%\mingw\bin
+set COMPILER_DIR=C:\raylib\mingw\bin
+set PATH=%PATH%;%COMPILER_DIR%
 set FILE_NAME=%1
 set NAME_PART=%FILE_NAME:~0,-2%
 cd %~dp0
diff --git a/projects/Geany/raylib_compile_sources.bat b/projects/Geany/raylib_compile_sources.bat
index a0fb17a2..9ee5f0e1 100644
--- a/projects/Geany/raylib_compile_sources.bat
+++ b/projects/Geany/raylib_compile_sources.bat
@@ -7,7 +7,8 @@ set GRAPHICS_API=GRAPHICS_API_OPENGL_33
 :: > Setup required Environment
 :: -------------------------------------
 set RAYLIB_DIR=C:\raylib
-set PATH=%PATH%;%RAYLIB_DIR%\mingw\bin
+set COMPILER_DIR=C:\raylib\mingw\bin
+set PATH=%PATH%;%COMPILER_DIR%
 cd %RAYLIB_DIR%\raylib\src
 :: .
 :: > Cleaning latest build
@@ -29,7 +30,7 @@ gcc -O2 -c utils.c -std=c99 -Wall -DPLATFORM_DESKTOP
 :: .
 :: . > Generate raylib library
 :: ------------------------------
-ar rcs libraylib.a core.o rglfw.o shapes.o textures.o text.o models.o raudio.o utils.o
+ar rcs libraylib.a rcore.o rglfw.o rshapes.o rtextures.o rtext.o rmodels.o raudio.o utils.o
 :: .
 :: > Installing raylib library
 :: -----------------------------
diff --git a/projects/VSCode/.vscode/c_cpp_properties.json b/projects/VSCode/.vscode/c_cpp_properties.json
index 10881ee8..c4096b3d 100644
--- a/projects/VSCode/.vscode/c_cpp_properties.json
+++ b/projects/VSCode/.vscode/c_cpp_properties.json
@@ -13,7 +13,7 @@
                 "GRAPHICS_API_OPENGL_33",
                 "PLATFORM_DESKTOP"
             ],
-            "compilerPath": "C:/raylib/mingw/bin/gcc.exe",
+            "compilerPath": "C:/raylib/w64devkit/bin/gcc.exe",
             "cStandard": "c99",
             "cppStandard": "c++14",
             "intelliSenseMode": "gcc-x64"
diff --git a/projects/VSCode/.vscode/launch.json b/projects/VSCode/.vscode/launch.json
index afb54b7f..30d8990c 100644
--- a/projects/VSCode/.vscode/launch.json
+++ b/projects/VSCode/.vscode/launch.json
@@ -23,7 +23,7 @@
               }
             ],
             "windows": {
-              "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe",
+              "miDebuggerPath": "C:/raylib/w64devkit/bin/gdb.exe",
             },
             "osx": {
               "MIMode": "lldb"
@@ -46,7 +46,7 @@
             "MIMode": "gdb",
             "windows": {
               "program": "${workspaceFolder}/${fileBasenameNoExtension}.exe",
-              "miDebuggerPath": "C:/raylib/mingw/bin/gdb.exe"
+              "miDebuggerPath": "C:/raylib/w64devkit/bin/gdb.exe"
             },
             "osx": {
               "MIMode": "lldb"
diff --git a/projects/VSCode/.vscode/tasks.json b/projects/VSCode/.vscode/tasks.json
index a610a248..6152d301 100644
--- a/projects/VSCode/.vscode/tasks.json
+++ b/projects/VSCode/.vscode/tasks.json
@@ -14,7 +14,7 @@
                 "OBJS=${fileBasenameNoExtension}.c"
             ],
             "windows": {
-                "command": "C:/raylib/mingw/bin/mingw32-make.exe",
+                "command": "mingw32-make.exe",
                 "args": [
                     "RAYLIB_PATH=C:/raylib/raylib",
                     "PROJECT_NAME=${fileBasenameNoExtension}",
@@ -48,7 +48,7 @@
                 "OBJS=${fileBasenameNoExtension}.c"
             ],
             "windows": {
-                "command": "C:/raylib/mingw/bin/mingw32-make.exe",
+                "command": "mingw32-make.exe",
                 "args": [
                     "RAYLIB_PATH=C:/raylib/raylib",
                     "PROJECT_NAME=${fileBasenameNoExtension}",
diff --git a/projects/VSCode/Makefile b/projects/VSCode/Makefile
index 7fe11f1d..d89a80ff 100644
--- a/projects/VSCode/Makefile
+++ b/projects/VSCode/Makefile
@@ -25,11 +25,11 @@
 
 # Define required raylib variables
 PROJECT_NAME       ?= game
-RAYLIB_VERSION     ?= 3.8.0
+RAYLIB_VERSION     ?= 4.0.0
 RAYLIB_PATH        ?= ..\..
 
 # Define compiler path on Windows
-COMPILER_PATH      ?= C:/raylib/mingw/bin
+COMPILER_PATH      ?= C:/raylib/w64devkit/bin
 
 # Define default options
 # One of PLATFORM_DESKTOP, PLATFORM_RPI, PLATFORM_ANDROID, PLATFORM_WEB
diff --git a/src/Makefile b/src/Makefile
index 0d603771..6fbb8a3f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -76,7 +76,7 @@ RAYLIB_MODULE_MODELS ?= TRUE
 RAYLIB_MODULE_RAYGUI ?= FALSE
 RAYLIB_MODULE_PHYSAC ?= FALSE
 
-RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/../../raygui/src
+RAYLIB_MODULE_RAYGUI_PATH ?= $(RAYLIB_SRC_PATH)/extras
 RAYLIB_MODULE_PHYSAC_PATH ?= $(RAYLIB_SRC_PATH)/extras
 
 # Use external GLFW library instead of rglfw module