diff --git a/src/core/emu_main.c b/src/core/emu_main.c
index 41f4ad4..49edb13 100644
--- a/src/core/emu_main.c
+++ b/src/core/emu_main.c
@@ -163,9 +163,9 @@ int32_t emu_main(options_config *config, ui_scale *scale) {
                                     (GetScreenHeight() - scale->window_height) / 2, scale->window_width,
                                     scale->window_height}, (Vector2) {0, 0}, 0, WHITE);
 
-        DrawRectangleLines(((GetScreenWidth() - scale->window_width) / 2),
-                           (((GetScreenHeight() - scale->window_height) / 2)), scale->window_width,
-                           scale->window_height, DARKGRAY);
+        DrawRectangleLines(((GetScreenWidth() - scale->window_width) / 2) - 1,
+                           (((GetScreenHeight() - scale->window_height) / 2)) - 1, scale->window_width + 2,
+                           scale->window_height + 2, DARKGRAY);
 
         if (config->show_fps) {
             DrawText(TextFormat("%dhz", GetFPS() + 1), (int32_t) config->display_scaling,
diff --git a/src/gui/options_window.c b/src/gui/options_window.c
index 6a43648..88f4997 100644
--- a/src/gui/options_window.c
+++ b/src/gui/options_window.c
@@ -77,9 +77,9 @@ void load_settings(options_config *config) {
             switch (i) {
                 case 0:
                     for (int32_t j = 0; line[j] != ';'; ++j) {
-                        if (isnumber(line[j]) && color[counter] > 0) {
+                        if (isdigit(line[j]) && color[counter] > 0) {
                             color[counter] = (color[counter] * 10) + line[j] - '0';
-                        } else if (isnumber(line[j])) {
+                        } else if (isdigit(line[j])) {
                             color[counter] = line[j] - '0';
                         }
                         if (line[j] == ',') {
@@ -91,9 +91,9 @@ void load_settings(options_config *config) {
 
                 case 1:
                     for (int32_t j = 0; line[j] != ';'; ++j) {
-                        if (isnumber(line[j]) && color[counter] > 0) {
+                        if (isdigit(line[j]) && color[counter] > 0) {
                             color[counter] = (color[counter] * 10) + line[j] - '0';
-                        } else if (isnumber(line[j])) {
+                        } else if (isdigit(line[j])) {
                             color[counter] = line[j] - '0';
                         }
                         if (line[j] == ',') {
@@ -105,9 +105,9 @@ void load_settings(options_config *config) {
 
                 case 2:
                     for (int32_t j = 0; line[j] != ';'; ++j) {
-                        if (isnumber(line[j]) && color[0] > 0) {
+                        if (isdigit(line[j]) && color[0] > 0) {
                             color[0] = (color[0] * 10) + line[j] - '0';
-                        } else if (isnumber(line[j])) {
+                        } else if (isdigit(line[j])) {
                             color[0] = line[j] - '0';
                         }
                     }