diff --git a/linux/templates/epitrochoid.template b/linux/templates/epitrochoid.template
index 19386f3e..7cab5b79 100644
--- a/linux/templates/epitrochoid.template
+++ b/linux/templates/epitrochoid.template
@@ -16,5 +16,5 @@ C=epitrochoid_c.txt
 UnitCount=1
 Type=1
 IsCpp=0
-linker=-lrdrawing -lraylib -lopengl32 -lgdi32 -lwinmm
+linker=-lrdrawing -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
 ExecEncoding=UTF-8
diff --git a/linux/templates/epitrochoid_c.txt b/linux/templates/epitrochoid_c.txt
index 340b4ef7..5968e34f 100644
--- a/linux/templates/epitrochoid_c.txt
+++ b/linux/templates/epitrochoid_c.txt
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #define RAYGUI_IMPLEMENTATION
-#include <raygui/raygui.h>
+#include <raygui.h>
 
 void updateRadius(int baseL, int outerL, int pointL, int *pBaseR, int *pOuterR, int *pPointR) {
 	int totalL=baseL+outerL;
@@ -122,4 +122,4 @@ int main() {
 	UnloadImage(circlesImage);
 	UnloadImage(trackImage);
 	CloseWindow();
-}
\ No newline at end of file
+}
diff --git a/linux/templates/hypotrochoid.template b/linux/templates/hypotrochoid.template
index 5fb9227e..bd72a653 100644
--- a/linux/templates/hypotrochoid.template
+++ b/linux/templates/hypotrochoid.template
@@ -16,5 +16,5 @@ C=hypotrochoid_c.txt
 UnitCount=1
 Type=1
 IsCpp=0
-linker=-lrdrawing -lraylib -lopengl32 -lgdi32 -lwinmm
+linker=-lrdrawing -lraylib -lGL -lm -lpthread -ldl -lrt -lX11
 ExecEncoding=UTF-8
diff --git a/linux/templates/hypotrochoid_c.txt b/linux/templates/hypotrochoid_c.txt
index e24b1467..e962516d 100644
--- a/linux/templates/hypotrochoid_c.txt
+++ b/linux/templates/hypotrochoid_c.txt
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #define RAYGUI_IMPLEMENTATION
-#include <raygui/raygui.h>
+#include <raygui.h>
 
 void updateRadius(int baseL, int innerL,int pointL, int *pBaseR, int *pInnerR, int *pPointR) {
 	int totalL=baseL;
@@ -137,4 +137,4 @@ int main() {
 	UnloadImage(circlesImage);
 	UnloadImage(trackImage);
 	CloseWindow();
-}
\ No newline at end of file
+}
diff --git a/linux/templates/raygui.template b/linux/templates/raygui.template
index 86a7cd62..e84f5150 100644
--- a/linux/templates/raygui.template
+++ b/linux/templates/raygui.template
@@ -16,6 +16,6 @@ C=raygui_c.txt
 UnitCount=1
 Type=1
 IsCpp=0
-linker=-lraylib -lopengl32 -lgdi32 -lwinmm
+linker=-lraylib -lGL -lm -lpthread -ldl -lrt -lX11
 ExecEncoding=UTF-8
 
diff --git a/linux/templates/raygui_c.txt b/linux/templates/raygui_c.txt
index e5be517e..236fb8cf 100644
--- a/linux/templates/raygui_c.txt
+++ b/linux/templates/raygui_c.txt
@@ -34,12 +34,12 @@
 *
 **********************************************************************************************/
 
-#include "raylib.h"
+#include <raylib.h>
 
 #define RAYGUI_IMPLEMENTATION
 //#define RAYGUI_CUSTOM_ICONS     // It requires providing gui_icons.h in the same directory
 //#include "gui_icons.h"          // External icons data provided, it can be generated with rGuiIcons tool
-#include "raygui/raygui.h"
+#include <raygui/raygui.h>
 
 #include <string.h>             // Required for: strcpy()
 
diff --git a/windows/templates/epitrochoid_c.txt b/windows/templates/epitrochoid_c.txt
index 23ac9682..6566b3ad 100644
--- a/windows/templates/epitrochoid_c.txt
+++ b/windows/templates/epitrochoid_c.txt
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #define RAYGUI_IMPLEMENTATION
-#include <raygui/raygui.h>
+#include <raygui.h>
 
 void updateRadius(int baseL, int outerL, int pointL, int *pBaseR, int *pOuterR, int *pPointR) {
 	int totalL=baseL+outerL;
@@ -122,4 +122,4 @@ int main() {
 	UnloadImage(circlesImage);
 	UnloadImage(trackImage);
 	CloseWindow();
-}
\ No newline at end of file
+}
diff --git a/windows/templates/hypotrochoid_c.txt b/windows/templates/hypotrochoid_c.txt
index e24b1467..e962516d 100644
--- a/windows/templates/hypotrochoid_c.txt
+++ b/windows/templates/hypotrochoid_c.txt
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #define RAYGUI_IMPLEMENTATION
-#include <raygui/raygui.h>
+#include <raygui.h>
 
 void updateRadius(int baseL, int innerL,int pointL, int *pBaseR, int *pInnerR, int *pPointR) {
 	int totalL=baseL;
@@ -137,4 +137,4 @@ int main() {
 	UnloadImage(circlesImage);
 	UnloadImage(trackImage);
 	CloseWindow();
-}
\ No newline at end of file
+}
diff --git a/windows/templates/raygui_c.txt b/windows/templates/raygui_c.txt
index e5be517e..5e0a84db 100644
--- a/windows/templates/raygui_c.txt
+++ b/windows/templates/raygui_c.txt
@@ -34,12 +34,12 @@
 *
 **********************************************************************************************/
 
-#include "raylib.h"
+#include <raylib.h>
 
 #define RAYGUI_IMPLEMENTATION
 //#define RAYGUI_CUSTOM_ICONS     // It requires providing gui_icons.h in the same directory
 //#include "gui_icons.h"          // External icons data provided, it can be generated with rGuiIcons tool
-#include "raygui/raygui.h"
+#include <raygui.h>
 
 #include <string.h>             // Required for: strcpy()