diff --git a/src/raygui.h b/src/raygui.h
index 1a412f7..ebe5e95 100644
--- a/src/raygui.h
+++ b/src/raygui.h
@@ -322,30 +322,54 @@ typedef enum { DISABLED, NORMAL, FOCUSED, PRESSED } ControlState;
 
 #if defined(RAYGUI_STYLE_DEFAULT_LIGHT)
 
-#define DEFAULT_BACKGROUND_COLOR        0xf5f5f5ff
-#define DEFAULT_LINES_COLOR             0x90abb5ff
-#define DEFAULT_TEXT_FONT               0
-#define DEFAULT_TEXT_SIZE               10
+    #define DEFAULT_BACKGROUND_COLOR        0xf5f5f5ff
+    #define DEFAULT_LINES_COLOR             0x90abb5ff
+    #define DEFAULT_TEXT_FONT               0
+    #define DEFAULT_TEXT_SIZE               10
+    #define DEFAULT_BORDER_WIDTH            1
 
-#define DEFAULT_BORDER_COLOR_NORMAL     0x828282ff
-#define DEFAULT_BASE_COLOR_NORMAL       0xc8c8c8ff
-#define DEFAULT_TEXT_COLOR_NORMAL       0x686868ff
-#define DEFAULT_BORDER_COLOR_FOCUSED    0x7bb0d6ff
-#define DEFAULT_BASE_COLOR_FOCUSED      0xc9effeff
-#define DEFAULT_TEXT_COLOR_FOCUSED      0x6c9bbcff
-#define DEFAULT_BORDER_COLOR_PRESSED    0x048cc7ff
-#define DEFAULT_BASE_COLOR_PRESSED      0x7ceafeff
-#define DEFAULT_TEXT_COLOR_PRESSED      0x0480b5ff
-#define DEFAULT_BORDER_COLOR_DISABLED   0xb1b1b1ff
-#define DEFAULT_BASE_COLOR_DISABLED     0xfafafaff
-#define DEFAULT_TEXT_COLOR_DISABLED     0xc8c8c8ff
+    #define DEFAULT_BORDER_COLOR_NORMAL     0x828282ff
+    #define DEFAULT_BASE_COLOR_NORMAL       0xc8c8c8ff
+    #define DEFAULT_TEXT_COLOR_NORMAL       0x686868ff
+    #define DEFAULT_BORDER_COLOR_FOCUSED    0x7bb0d6ff
+    #define DEFAULT_BASE_COLOR_FOCUSED      0xc9effeff
+    #define DEFAULT_TEXT_COLOR_FOCUSED      0x6c9bbcff
+    #define DEFAULT_BORDER_COLOR_PRESSED    0x048cc7ff
+    #define DEFAULT_BASE_COLOR_PRESSED      0x7ceafeff
+    #define DEFAULT_TEXT_COLOR_PRESSED      0x0480b5ff
+    #define DEFAULT_BORDER_COLOR_DISABLED   0xb1b1b1ff
+    #define DEFAULT_BASE_COLOR_DISABLED     0xfafafaff
+    #define DEFAULT_TEXT_COLOR_DISABLED     0xc8c8c8ff
+
+#elif defined(RAYGUI_STYLE_DEFAULT_DARK)
+
+    #define DEFAULT_BACKGROUND_COLOR        0xf5f5f5ff
+    #define DEFAULT_LINES_COLOR             0x90abb5ff
+    #define DEFAULT_TEXT_FONT               0
+    #define DEFAULT_TEXT_SIZE               10
+    #define DEFAULT_BORDER_WIDTH            1
+
+    #define DEFAULT_BORDER_COLOR_NORMAL     0x828282ff
+    #define DEFAULT_BASE_COLOR_NORMAL       0xc8c8c8ff
+    #define DEFAULT_TEXT_COLOR_NORMAL       0x686868ff
+    #define DEFAULT_BORDER_COLOR_FOCUSED    0x7bb0d6ff
+    #define DEFAULT_BASE_COLOR_FOCUSED      0xc9effeff
+    #define DEFAULT_TEXT_COLOR_FOCUSED      0x6c9bbcff
+    #define DEFAULT_BORDER_COLOR_PRESSED    0x048cc7ff
+    #define DEFAULT_BASE_COLOR_PRESSED      0x7ceafeff
+    #define DEFAULT_TEXT_COLOR_PRESSED      0x0480b5ff
+    #define DEFAULT_BORDER_COLOR_DISABLED   0xb1b1b1ff
+    #define DEFAULT_BASE_COLOR_DISABLED     0xfafafaff
+    #define DEFAULT_TEXT_COLOR_DISABLED     0xc8c8c8ff
+
+#endif
 
 // Current GUI style (default light)
 static int style[NUM_PROPERTIES] = {
     DEFAULT_TEXT_COLOR_NORMAL,          // LABEL_TEXT_COLOR_NORMAL,
     DEFAULT_TEXT_COLOR_FOCUSED,         // LABEL_TEXT_COLOR_FOCUSED,
     DEFAULT_TEXT_COLOR_PRESSED,         // LABEL_TEXT_COLOR_PRESSED,
-    2,                                  // BUTTON_BORDER_WIDTH,
+    DEFAULT_BORDER_WIDTH*2,             // BUTTON_BORDER_WIDTH,
     DEFAULT_BORDER_COLOR_NORMAL,        // BUTTON_BORDER_COLOR_NORMAL,
     DEFAULT_BASE_COLOR_NORMAL,          // BUTTON_BASE_COLOR_NORMAL,
     DEFAULT_TEXT_COLOR_NORMAL,          // BUTTON_TEXT_COLOR_NORMAL,
@@ -355,7 +379,7 @@ static int style[NUM_PROPERTIES] = {
     DEFAULT_BORDER_COLOR_PRESSED,       // BUTTON_BORDER_COLOR_PRESSED,
     DEFAULT_BASE_COLOR_PRESSED,         // BUTTON_BASE_COLOR_PRESSED,
     DEFAULT_TEXT_COLOR_PRESSED,         // BUTTON_TEXT_COLOR_PRESSED,
-    1,                                  // TOGGLE_BORDER_WIDTH,
+    DEFAULT_BORDER_WIDTH,               // TOGGLE_BORDER_WIDTH,
     DEFAULT_BORDER_COLOR_NORMAL,        // TOGGLE_BORDER_COLOR_NORMAL,
     DEFAULT_BASE_COLOR_NORMAL,          // TOGGLE_BASE_COLOR_NORMAL,
     DEFAULT_TEXT_COLOR_NORMAL,          // TOGGLE_TEXT_COLOR_NORMAL,
@@ -366,14 +390,14 @@ static int style[NUM_PROPERTIES] = {
     DEFAULT_BASE_COLOR_PRESSED,         // TOGGLE_BASE_COLOR_PRESSED,
     DEFAULT_TEXT_COLOR_PRESSED,         // TOGGLE_TEXT_COLOR_PRESSED,
     2,                                  // TOGGLEGROUP_PADDING,
-    1,                                  // SLIDERBAR_BORDER_WIDTH,
+    DEFAULT_BORDER_WIDTH,               // SLIDERBAR_BORDER_WIDTH,
     DEFAULT_BORDER_COLOR_NORMAL,        // SLIDERBAR_BORDER_COLOR_NORMAL,
     DEFAULT_BASE_COLOR_NORMAL,          // SLIDERBAR_BASE_COLOR_NORMAL,
     DEFAULT_BORDER_COLOR_FOCUSED,       // SLIDERBAR_BORDER_COLOR_FOCUSED,
     DEFAULT_BASE_COLOR_NORMAL,          // SLIDERBAR_BASE_COLOR_FOCUSED,
     DEFAULT_BORDER_COLOR_PRESSED,       // SLIDERBAR_BORDER_COLOR_PRESSED,
     DEFAULT_BASE_COLOR_NORMAL,          // SLIDERBAR_BASE_COLOR_PRESSED,
-    1,                                  // PROGRESSBAR_BORDER_WIDTH,
+    DEFAULT_BORDER_WIDTH,               // PROGRESSBAR_BORDER_WIDTH,
     DEFAULT_BORDER_COLOR_NORMAL,        // PROGRESSBAR_BORDER_COLOR_NORMAL,
     DEFAULT_BASE_COLOR_NORMAL,          // PROGRESSBAR_BASE_COLOR_NORMAL,
     DEFAULT_BASE_COLOR_FOCUSED,         // PROGRESSBAR_FRONT_COLOR_NORMAL,
@@ -387,7 +411,7 @@ static int style[NUM_PROPERTIES] = {
     DEFAULT_BORDER_COLOR_PRESSED,       // SPINNER_BORDER_COLOR_PRESSED,
     DEFAULT_BASE_COLOR_PRESSED,         // SPINNER_BASE_COLOR_PRESSED,
     DEFAULT_TEXT_COLOR_PRESSED,         // SPINNER_TEXT_COLOR_PRESSED,
-    1,                                  // COMBOBOX_BORDER_WIDTH,
+    DEFAULT_BORDER_WIDTH,               // COMBOBOX_BORDER_WIDTH,
     2,                                  // COMBOBOX_BUTTON_PADDING,
     DEFAULT_BORDER_COLOR_NORMAL,        // COMBOBOX_BORDER_COLOR_NORMAL,
     DEFAULT_BASE_COLOR_NORMAL,          // COMBOBOX_BASE_COLOR_NORMAL,
@@ -398,7 +422,7 @@ static int style[NUM_PROPERTIES] = {
     DEFAULT_BORDER_COLOR_PRESSED,       // COMBOBOX_BORDER_COLOR_PRESSED,
     DEFAULT_BASE_COLOR_PRESSED,         // COMBOBOX_BASE_COLOR_PRESSED,
     DEFAULT_TEXT_COLOR_PRESSED,         // COMBOBOX_TEXT_COLOR_PRESSED,
-    1,                                  // CHECKBOX_BORDER_WIDTH,
+    DEFAULT_BORDER_WIDTH,               // CHECKBOX_BORDER_WIDTH,
     1,                                  // CHECKBOX_INNER_PADDING,
     DEFAULT_BORDER_COLOR_NORMAL,        // CHECKBOX_BORDER_COLOR_NORMAL,
     DEFAULT_BACKGROUND_COLOR,           // CHECKBOX_BASE_COLOR_NORMAL,
@@ -406,7 +430,7 @@ static int style[NUM_PROPERTIES] = {
     DEFAULT_BASE_COLOR_FOCUSED,         // CHECKBOX_BASE_COLOR_FOCUSED,
     DEFAULT_BORDER_COLOR_PRESSED,       // CHECKBOX_BORDER_COLOR_PRESSED,
     DEFAULT_BASE_COLOR_PRESSED,         // CHECKBOX_BASE_COLOR_PRESSED,
-    1,                                  // TEXTBOX_BORDER_WIDTH,
+    DEFAULT_BORDER_WIDTH,               // TEXTBOX_BORDER_WIDTH,
     DEFAULT_BORDER_COLOR_NORMAL,        // TEXTBOX_BORDER_COLOR_NORMAL,
     DEFAULT_BACKGROUND_COLOR,           // TEXTBOX_BASE_COLOR_NORMAL,
     DEFAULT_TEXT_COLOR_NORMAL,          // TEXTBOX_TEXT_COLOR_NORMAL,
@@ -417,12 +441,6 @@ static int style[NUM_PROPERTIES] = {
     DEFAULT_BASE_COLOR_PRESSED,         // TEXTBOX_BASE_COLOR_PRESSED,
     DEFAULT_TEXT_COLOR_PRESSED,         // TEXTBOX_TEXT_COLOR_PRESSED,
 };
-#elif defined(RAYGUI_STYLE_DEFAULT_DARK)
-// Current GUI style (default dark)
-static int style[NUM_PROPERTIES] = {
-    0x00
-};
-#endif
 
 #if !defined(RAYGUI_NO_STYLE_SAVE_LOAD)
 // GUI property names (to read/write style text files)