diff --git a/keyboards/electronlab/klor/config.h b/keyboards/electronlab/klor/config.h
index d1531175136..1b396aeda15 100644
--- a/keyboards/electronlab/klor/config.h
+++ b/keyboards/electronlab/klor/config.h
@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # define OLED_DISPLAY_128X64
 # define SPLIT_OLED_ENABLE
-# define OLED_FONT_H  "./glcdfont.c"
+# define OLED_FONT_H  "./lib/glcdfont.c"
 
 #define AUDIO_PWM_DRIVER PWMD4
 #define AUDIO_PWM_CHANNEL RP2040_PWM_CHANNEL_B
diff --git a/keyboards/electronlab/klor/keymaps/electronlab/keymap.c b/keyboards/electronlab/klor/keymaps/electronlab/keymap.c
index c697f70337e..e8bd01fb537 100644
--- a/keyboards/electronlab/klor/keymaps/electronlab/keymap.c
+++ b/keyboards/electronlab/klor/keymaps/electronlab/keymap.c
@@ -121,10 +121,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
    [_QWERTY] = LAYOUT_polydactyl(
  //╷         ╷         ╷         ╷         ╷         ╷         ╷         ╷╷         ╷         ╷         ╷         ╷         ╷         ╷         ╷
-               KC_Q,    KC_W,      KC_E,       KC_R,    KC_T,                          KC_Y,    KC_U,      KC_I,     KC_O,    KC_P,
-      KC_TAB,  KC_A,    KC_S,      KC_D,       KC_F,    KC_G,                          KC_H,    KC_J,      KC_K,     KC_L,    KC_SCLN,  KC_QUOT,
-      KC_LCTL, KC_Z,    KC_X,      KC_C,       KC_V,    KC_B,     KC_MUTE,   KC_MPLY,  KC_N,    KC_M,      KC_COMM,  KC_DOT,  KC_SLSH,  KC_BSLS,
-                                   KC_LALT,    LOWER,   KC_RALT,  KC_SPC,    KC_BSPC,  KC_ENT,  RAISE,     KC_DEL
+                 KC_Q,    KC_W,    KC_E,     KC_R,      KC_T,                          KC_Y,    KC_U,      KC_I,     KC_O,    KC_P,
+LSFT_T(KC_TAB),  KC_A,    KC_S,    KC_D,   LSFT_T(KC_F),KC_G,                          KC_H, RSFT_T(KC_J), KC_K,     KC_L,    KC_SCLN,  KC_QUOT,
+        KC_LCTL, KC_Z,    KC_X,    KC_C,     KC_V,      KC_B,     KC_MUTE,   KC_MPLY,  KC_N,    KC_M,      KC_COMM,  KC_DOT,  KC_SLSH,  KC_BSLS,
+                                   KC_LALT,  LOWER,     KC_RALT,  KC_SPC,    KC_BSPC,  KC_ENT,  RAISE,     KC_DEL
  ),
 
 /*
diff --git a/keyboards/electronlab/klor/glcdfont.c b/keyboards/electronlab/klor/lib/glcdfont.c
similarity index 93%
rename from keyboards/electronlab/klor/glcdfont.c
rename to keyboards/electronlab/klor/lib/glcdfont.c
index c97aa15e542..187ffd4a74e 100644
--- a/keyboards/electronlab/klor/glcdfont.c
+++ b/keyboards/electronlab/klor/lib/glcdfont.c
@@ -1,19 +1,5 @@
-/*
-Copyright 2024 ElectronLab
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
 
 #pragma once