diff --git a/tools/rGuiLayout/layouts/sample_messagebox.rgl b/tools/rGuiLayout/layouts/messagebox.rgl
similarity index 100%
rename from tools/rGuiLayout/layouts/sample_messagebox.rgl
rename to tools/rGuiLayout/layouts/messagebox.rgl
diff --git a/tools/rGuiLayout/release/win32/rguilayout.exe b/tools/rGuiLayout/release/win32/rguilayout.exe
index 279a528..5c46729 100644
Binary files a/tools/rGuiLayout/release/win32/rguilayout.exe and b/tools/rGuiLayout/release/win32/rguilayout.exe differ
diff --git a/tools/rGuiLayout/rguilayout.c b/tools/rGuiLayout/rguilayout.c
index 1a6b42e..59bc1df 100644
--- a/tools/rGuiLayout/rguilayout.c
+++ b/tools/rGuiLayout/rguilayout.c
@@ -1,13 +1,36 @@
 /*******************************************************************************************
 *
-*   rGuiLayout - raygui layout editor
+*   rGuiLayout v1.0 - raygui layout editor
 *
-*   This example has been created using raylib 1.9.7 (www.raylib.com)
-*   raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details)
+*   Compile this program using:
+*       gcc -o rguilayout.exe rguilayout.c external/tinyfiledialogs.c -I..\.. \ 
+*       -lraylib -lopengl32 -lgdi32 -lcomdlg32 -lole32 -std=c99 -Wall
 *
-*   Copyright (c) 2014-2018 Ramon Santamaria (@raysan5), Jordi Jorba & Adria Arranz
+*   CONTRIBUTORS:
+*       Ramon Santamaria:   Supervision, review, design, update and maintenance...
+*       Adria Arranz:       Design and implementation v1.0 (2018)
+*       Jordi Jorba:        Design and implementation v1.0 (2018)
 *
-********************************************************************************************/
+*   LICENSE: zlib/libpng
+*
+*   Copyright (c) 2014-2018 raylib technologies (@raysan5)
+*
+*   This software is provided "as-is", without any express or implied warranty. In no event
+*   will the authors be held liable for any damages arising from the use of this software.
+*
+*   Permission is granted to anyone to use this software for any purpose, including commercial
+*   applications, and to alter it and redistribute it freely, subject to the following restrictions:
+*
+*     1. The origin of this software must not be misrepresented; you must not claim that you
+*     wrote the original software. If you use this software in a product, an acknowledgment
+*     in the product documentation would be appreciated but is not required.
+*
+*     2. Altered source versions must be plainly marked as such, and must not be misrepresented
+*     as being the original software.
+*
+*     3. This notice may not be removed or altered from any source distribution.
+*
+**********************************************************************************************/
 
 #include "raylib.h"
 
@@ -1542,7 +1565,9 @@ int main()
 
                     if (fileName != NULL)
                     {
-                        if (GetExtension(fileName) == NULL) strcat(fileName, ".c\0");     // No extension provided
+                        char outFileName[64] = { 0 };
+                        strcpy(outFileName, fileName);
+                        if (GetExtension(fileName) == NULL) strcat(outFileName, ".c\0");     // No extension provided
                         GenerateCode(fileName, config);
                         generateWindowActive = false;
                     } 
diff --git a/tools/rGuiLayout/rguilayout.rc b/tools/rGuiLayout/rguilayout.rc
index f589106..fd19e35 100644
--- a/tools/rGuiLayout/rguilayout.rc
+++ b/tools/rGuiLayout/rguilayout.rc
@@ -1,8 +1,8 @@
 GLFW_ICON ICON "rguilayout.ico"
 
 1 VERSIONINFO
-FILEVERSION     1,6,0,0
-PRODUCTVERSION  1,6,0,0
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -13,7 +13,7 @@ BEGIN
       VALUE "FileDescription", "rGuiLayout - raygui layout editor"
       VALUE "FileVersion", "1.0"
       VALUE "InternalName", "rguilayout"
-      VALUE "LegalCopyright", "(c) 2017 Ramon Santamaria - @raysan5"
+      VALUE "LegalCopyright", "(c) 2017 raylib technologies (@raysan5)"
       //VALUE "OriginalFilename", "raylib_app.exe"
       VALUE "ProductName", "rGuiLayout"
       VALUE "ProductVersion", "1.0"
diff --git a/tools/rGuiLayout/rguilayout_icon b/tools/rGuiLayout/rguilayout_icon
index 66fc10a..9e2eaa5 100644
Binary files a/tools/rGuiLayout/rguilayout_icon and b/tools/rGuiLayout/rguilayout_icon differ
diff --git a/tools/rGuiStyler/rguistyler.c b/tools/rGuiStyler/rguistyler.c
index 550e083..2276e62 100644
--- a/tools/rGuiStyler/rguistyler.c
+++ b/tools/rGuiStyler/rguistyler.c
@@ -3,8 +3,8 @@
 *   rGuiStyler v2.0 - raygui Style Editor
 *
 *   Compile this program using:
-*       gcc -o $(NAME_PART).exe $(FILE_NAME) external/tinyfiledialogs.c -I..\.. \ 
-*       -lraylib -lglfw3 -lopengl32 -lgdi32 -lcomdlg32 -lole32 -std=c99 -Wall
+*       gcc -o rguistyler.exe rguistyler.c external/tinyfiledialogs.c -I..\.. \ 
+*       -lraylib -lopengl32 -lgdi32 -lcomdlg32 -lole32 -std=c99 -Wall
 *
 *   CONTRIBUTORS:
 *       Ramon Santamaria:   Supervision, review, redesign, update and maintenance...
diff --git a/tools/rGuiStyler/rguistyler.rc b/tools/rGuiStyler/rguistyler.rc
index 3cff590..722c078 100644
--- a/tools/rGuiStyler/rguistyler.rc
+++ b/tools/rGuiStyler/rguistyler.rc
@@ -13,7 +13,7 @@ BEGIN
       VALUE "FileDescription", "rGuiStyler - raygui styles editor"
       VALUE "FileVersion", "2.0"
       VALUE "InternalName", "rguistyler"
-      VALUE "LegalCopyright", "(c) 2018 raylib technologies"
+      VALUE "LegalCopyright", "(c) 2018 raylib technologies (@raysan5)"
       //VALUE "OriginalFilename", "raylib_app.exe"
       VALUE "ProductName", "rGuiStyler"
       VALUE "ProductVersion", "2.0"