diff --git a/tools/rGuiLayout/README.md b/tools/rGuiLayout/README.md
index e7c9046..c443933 100644
--- a/tools/rGuiLayout/README.md
+++ b/tools/rGuiLayout/README.md
@@ -1,7 +1,7 @@
 <img align="left" src="logo/rguilayout_256x256.png" width=256>
 
 # rGuiLayout
-A simple and easy-to-use tool to create raygui-based layouts. Useful for fast tools development. The perfect companion for [rGuiStyler]() tool.
+A simple and easy-to-use tool to create raygui-based layouts. Useful for fast tools development. The perfect companion for [rGuiStyler](https://github.com/raysan5/raygui/tree/master/tools/rGuiStyler) tool.
 
 <br>
 <br>
@@ -10,19 +10,19 @@ A simple and easy-to-use tool to create raygui-based layouts. Useful for fast to
 
 ## Features
 
- - +25 controls available to define your imgui layout
+ - **+25 controls available to define your imgui layout**
  - Place controls visually and move/scale them freely
  - Snap to grid mode for maximum precission
- - Save/Load your layout as .rgl (text or binary mode)
- - Import .rgs files (rGuiStyler) to customize visual style (drag&drop)
- - Export layout directly as plain C code, ready to edit and compile!
+ - Save/Load your layout as **.rgl (text or binary mode)**
+ - Import **.rgs** files ([rGuiStyler](https://github.com/raysan5/raygui/tree/master/tools/rGuiStyler)) to customize visual style (drag&drop)
+ - **Export layout directly as plain C code, ready to edit and compile!**
  - Multiple code generation options to customize exported code
  - Supports image loading to be used as tracemap
  - Autovisible right controls panel for quick selection
  - Anchors mode support to link your controls
  - Controls text edition and name edition (for exported variables)
- - +10 predefined layout available for reference
- - Completely portable (single file)
+ - **+10 predefined layout available for reference**
+ - **Completely portable (single file)**
  - Free and open source
  
 ## Usage
@@ -38,7 +38,7 @@ To compile the code, you need raygui library (single-file header-only) and rayli
 
 ## License
 
-rGuiLayout is free and  open source software. rGuiLayout source code is licensed under an unmodified zlib/libpng license. Check [LICENSE](LICENSE) for further details.
+rGuiLayout is free and open source software. rGuiLayout source code is licensed under an unmodified zlib/libpng license. Check [LICENSE](LICENSE) for further details.
 
 Despite being completely free, consider a small donation for the development efforts or contributing to raylib patreon to help the author keep working on free software for games development.
 
diff --git a/tools/rGuiStyler/README.md b/tools/rGuiStyler/README.md
new file mode 100644
index 0000000..1f9bba8
--- /dev/null
+++ b/tools/rGuiStyler/README.md
@@ -0,0 +1,38 @@
+<img align="left" src="logo/rguistyler_256x256.png" width=256>
+
+# rGuiStyler
+A simple and easy-to-use tool to edit raygui styles. Useful for imgui style customization. The best mate for [rGuiLayout](https://github.com/raysan5/raygui/tree/master/tools/rGuiStyler) tool.
+
+<br>
+<br>
+<br>
+<br>
+
+## Features
+
+ - **Global style editing or control specific**
+ - Preview new style in real time and test controls
+ - Disabled control mode editing included (checkbox)
+ - Save/Load your style as **.rgs (text or binary mode)**
+ - Import style from raygui **.png** style file (drag&drop)
+ - Color palette menu for quick save/selection
+ - **Completely portable (single file)**
+ - Free and open source
+ 
+## Usage
+
+The tool is pretty intuitive and easy-to-use, just choose the control to edit, the property to edit and select a color. Changes can be tested in real time in the same tool. Actually, updated style is directly applied to the same tool.
+
+Once a style has been created, just save it as a **.rgs** file, it can be saved as text or binary mode.
+
+## Screenshots
+
+![rGuiStyler](screenshots/screenshot000.png)
+
+## License
+
+rGuiStyler is free and open source software. rGuiStyler source code is licensed under an unmodified zlib/libpng license. Check [LICENSE](LICENSE) for further details.
+
+Despite being completely free, consider a small donation for the development efforts or contributing to [raylib patreon](https://www.patreon.com/raysan5) to help the author keep working on free software for games development.
+
+*Copyright (c) 2017-2018 raylib technologies ([@raysan5](https://twitter.com/raysan5))*
diff --git a/tools/rGuiStyler/external/tinyfiledialogs.c b/tools/rGuiStyler/src/external/tinyfiledialogs.c
similarity index 100%
rename from tools/rGuiStyler/external/tinyfiledialogs.c
rename to tools/rGuiStyler/src/external/tinyfiledialogs.c
diff --git a/tools/rGuiStyler/external/tinyfiledialogs.h b/tools/rGuiStyler/src/external/tinyfiledialogs.h
similarity index 100%
rename from tools/rGuiStyler/external/tinyfiledialogs.h
rename to tools/rGuiStyler/src/external/tinyfiledialogs.h
diff --git a/tools/rGuiStyler/rguistyler.c b/tools/rGuiStyler/src/rguistyler.c
similarity index 100%
rename from tools/rGuiStyler/rguistyler.c
rename to tools/rGuiStyler/src/rguistyler.c
diff --git a/tools/rGuiStyler/rguistyler.ico b/tools/rGuiStyler/src/rguistyler.ico
similarity index 100%
rename from tools/rGuiStyler/rguistyler.ico
rename to tools/rGuiStyler/src/rguistyler.ico
diff --git a/tools/rGuiStyler/rguistyler.rc b/tools/rGuiStyler/src/rguistyler.rc
similarity index 100%
rename from tools/rGuiStyler/rguistyler.rc
rename to tools/rGuiStyler/src/rguistyler.rc
diff --git a/tools/rGuiStyler/rguistyler_icon b/tools/rGuiStyler/src/rguistyler_icon
similarity index 100%
rename from tools/rGuiStyler/rguistyler_icon
rename to tools/rGuiStyler/src/rguistyler_icon