diff --git a/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c b/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c
index c0a9d8e8c8..679720f82d 100644
--- a/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/boardsource/technik_o/keymaps/sadekbaroudi/keymap.c
@@ -37,7 +37,7 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        _______, K01,            K02,            K03,            K04,                    K05,                      K06,                   K07,                   LT(_WINNAV,K08),  K09,            K0A,             _______, \
+        _______, K01,            K02,            K03,            LT(_FUNCTION, K04),     K05,                      K06,                   LT(_FUNCTION, K07),    LT(_WINNAV,K08),  K09,            K0A,             _______, \
         _______, LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),            K15,                      LT(_MOUSE, K16),       RSFT_T(K17),           RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),     _______, \
         _______, K21,            K22,            K23,            K24,                    K25,                      K26,                   K27,                   K28,              K29,            K2A,             _______, \
         _______, _______,        _______,        KC_DEL,         LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),     LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT,          _______,        _______,         _______ \
diff --git a/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c b/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c
index dba67c0087..6a119a29c7 100644
--- a/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/crkbd/keymaps/sadekbaroudi/keymap.c
@@ -39,9 +39,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        _______,         K01,            K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A,             _______, \
-        _______,         LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),     _______, \
-        _______,         K21,            K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A,             _______, \
+        _______,         K01,            K02,            K03,            LT(_FUNCTION, K04), K05,     K06,                LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A,             _______, \
+        _______,         LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),        K15,     LT(_MOUSE, K16),    RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),     _______, \
+        _______,         K21,            K22,            K23,            K24,                K25,     K26,                K27,                K28,              K29,            K2A,             _______, \
                                             KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),     LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
     )
 /* Re-pass though to allow templates to be used */
diff --git a/keyboards/draculad/keymaps/sadekbaroudi/keymap.c b/keyboards/draculad/keymaps/sadekbaroudi/keymap.c
index c0b2a962f3..8a5caff1b9 100644
--- a/keyboards/draculad/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/draculad/keymaps/sadekbaroudi/keymap.c
@@ -26,9 +26,9 @@ char wpm_as_str[8];
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        K01,            K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A, \
-        LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
-        K21,            K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A, \
+        K01,            K02,            K03,            LT(_FUNCTION, K04), K05,      K06,                LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A, \
+        LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),        K15,      LT(_MOUSE, K16),    RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
+        K21,            K22,            K23,            K24,                K25,      K26,                K27,                K28,              K29,            K2A, \
                   KC_MUTE,  KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),     LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT,  LCTL(KC_BSPC) \
     )
 
diff --git a/keyboards/preonic/keymaps/sadekbaroudi/keymap.c b/keyboards/preonic/keymaps/sadekbaroudi/keymap.c
index 95f69ec7a5..d7368bf830 100755
--- a/keyboards/preonic/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/preonic/keymaps/sadekbaroudi/keymap.c
@@ -31,7 +31,7 @@
   ) \
   LAYOUT_ortho_5x12_wrapper( \
         _______,        KC_1,           KC_2,           KC_3,           KC_4,                   KC_5,                 KC_6,                  KC_7,                  KC_8,              KC_9,           KC_0,            _______, \
-        _______,        K01,            K02,            K03,            K04,                    K05,                  K06,                   K07,                   LT(_WINNAV,K08),   K09,            K0A,             _______, \
+        _______,        K01,            K02,            K03,            LT(_FUNCTION, K04),     K05,                  K06,                   LT(_FUNCTION, K07),    LT(_WINNAV,K08),   K09,            K0A,             _______, \
         _______,        LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),            K15,                  LT(_MOUSE, K16),       RSFT_T(K17),           RALT_T(K18),       RGUI_T(K19),    RCTL_T(K1A),     _______, \
         _______,        K21,            K22,            K23,            K24,                    K25,                  K26,                   K27,                   K28,               K29,            K2A,             _______, \
         _______,        _______,        _______,        KC_DEL,         LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB), LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT,           _______,        _______,         _______ \
diff --git a/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c b/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c
index 9d61a4bcbe..69b085e3dd 100755
--- a/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/reviung39/keymaps/sadekbaroudi/keymap.c
@@ -37,9 +37,9 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        _______,         K01,            K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A,             _______, \
-        KC_TAB,          LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),     KC_QUOT, \
-        KC_DEL,          K21,            K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A,             _______, \
+        _______,         K01,            K02,            K03,            LT(_FUNCTION, K04), K05,                K06,                LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A,             _______, \
+        KC_TAB,          LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),        K15,                LT(_MOUSE, K16),    RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),     _______, \
+        _______,         K21,            K22,            K23,            K24,                K25,                K26,                K27,                K28,              K29,            K2A,             _______, \
                                                             LT(_NAVIGATION,KC_ENT),       LT(_FUNCTION,KC_BSPC),             LT(_SYMBOLS,KC_SPACE) \
     )
 /* Re-pass though to allow templates to be used */
diff --git a/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c b/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c
index 84a1f583c2..e2b7f4894d 100755
--- a/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/reviung41/keymaps/sadekbaroudi/keymap.c
@@ -37,10 +37,10 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        _______,         K01,            K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A,             _______, \
-        KC_TAB,          LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),     _______, \
-        _______,         K21,            K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A,             _______, \
-                                             KC_DEL,          LT(_NAVIGATION,KC_ENT),       LT(_FUNCTION,KC_BSPC),       LT(_SYMBOLS,KC_SPACE),     KC_QUOT  \
+        _______,         K01,            K02,            K03,            LT(_FUNCTION, K04), K05,                K06,                LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A,             _______, \
+        KC_TAB,          LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),        K15,                LT(_MOUSE, K16),    RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A),     _______, \
+        _______,         K21,            K22,            K23,            K24,                K25,                K26,                K27,                K28,              K29,            K2A,             _______, \
+                                                KC_DEL,          LT(_NAVIGATION,KC_ENT),       LT(_FUNCTION,KC_BSPC),       LT(_SYMBOLS,KC_SPACE),     KC_QUOT  \
     )
 /* Re-pass though to allow templates to be used */
 #define LAYOUT_reviung41_base_wrapper(...)       LAYOUT_reviung41_base(__VA_ARGS__)
diff --git a/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c
index 025a7bc6c9..27e027f3e3 100644
--- a/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/xoiviox/barobord/keymaps/sadekbaroudi/keymap.c
@@ -40,7 +40,7 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        K01,            K02,            K03,            K04,                    K05,                      K06,                   K07,                   LT(_WINNAV,K08),  K09,            K0A, \
+        K01,            K02,            K03,            LT(_FUNCTION, K04),     K05,                      K06,                   LT(_FUNCTION, K07),    LT(_WINNAV,K08),  K09,            K0A, \
         LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),            K15,                      LT(_MOUSE, K16),       RSFT_T(K17),           RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
         K21,            K22,            K23,            K24,                    K25,                      K26,                   K27,                   K28,              K29,            K2A, \
         _______,        _______,        KC_DEL,        LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),      LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT,          _______,        _______, \
diff --git a/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c
index 36aea43f77..0827896088 100644
--- a/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/xoiviox/euclid36/keymaps/sadekbaroudi/keymap.c
@@ -44,9 +44,9 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        K01,            K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A, \
-        LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
-        K21,            K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A, \
+        K01,            K02,            K03,            LT(_FUNCTION, K04), K05,                K06,                LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A, \
+        LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),        K15,                LT(_MOUSE, K16),    RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
+        K21,            K22,            K23,            K24,                K25,                K26,                K27,                K28,              K29,            K2A, \
                        KC_MUTE,  KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),     LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT,  LCTL(KC_BSPC) \
     )
 
diff --git a/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c
index ec016de70e..e8a61e5c43 100644
--- a/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/xoiviox/euclid36proto/keymaps/sadekbaroudi/keymap.c
@@ -37,9 +37,9 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        K01,            K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A, \
-        LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
-        K21,            K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A, \
+        K01,            K02,            K03,            LT(_FUNCTION, K04), K05,                K06,                LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A, \
+        LCTL_T(K11),    LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),        K15,                LT(_MOUSE, K16),    RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
+        K21,            K22,            K23,            K24,                K25,                K26,                K27,                K28,              K29,            K2A, \
                              KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),     LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
     )
 
diff --git a/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c
index 01d729f91d..fdc5843eac 100644
--- a/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/xoiviox/handwired/barobordhw/keymaps/sadekbaroudi/keymap.c
@@ -37,9 +37,9 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        K01,             K02,            K03,            K04,                    K05,                      K06,             K07,            LT(_WINNAV,K08),  K09,            K0A, \
-        LCTL_T(K11),     LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),            K15,                      LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
-        K21,             K22,            K23,            K24,                    K25,                      K26,             K27,            K28,              K29,            K2A, \
+        K01,             K02,            K03,            LT(_FUNCTION, K04),     K05,                      K06,                   LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A, \
+        LCTL_T(K11),     LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),            K15,                      LT(_MOUSE, K16),       RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
+        K21,             K22,            K23,            K24,                    K25,                      K26,                   K27,                K28,              K29,            K2A, \
         _______,         _______,        KC_DEL,        LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),     LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT, _______, _______ \
     )
 
diff --git a/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c
index 0d6671247d..7b567dab93 100644
--- a/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/xoiviox/handwired/enigma36/keymaps/sadekbaroudi/keymap.c
@@ -37,10 +37,10 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        K01,             K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A, \
-        LCTL_T(K11),     LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
-        K21,             K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A, \
-                            KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),     LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
+        K01,             K02,            K03,            LT(_FUNCTION, K04),  K05,            K06,                 LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A, \
+        LCTL_T(K11),     LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),         K15,            LT(_MOUSE, K16),     RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
+        K21,             K22,            K23,            K24,                 K25,            K26,                 K27,                K28,              K29,            K2A, \
+                            KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),           LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
     )
 
 /* Re-pass though to allow templates to be used */
diff --git a/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c b/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c
index 55c3177f76..071f9d2316 100644
--- a/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/xoiviox/handwired/pteron38/keymaps/sadekbaroudi/keymap.c
@@ -37,9 +37,9 @@
     K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
   ) \
   LAYOUT_wrapper( \
-        K01,             K02,            K03,            K04,            K05,                K06,             K07,            LT(_WINNAV,K08),  K09,            K0A, \
-        LCTL_T(K11),     LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),    K15,                LT(_MOUSE, K16), RSFT_T(K17),    RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
-        K21,             K22,            K23,            K24,            K25,                K26,             K27,            K28,              K29,            K2A, \
+        K01,             K02,            K03,            LT(_FUNCTION, K04), K05,    K06,                LT(_FUNCTION, K07), LT(_WINNAV,K08),  K09,            K0A, \
+        LCTL_T(K11),     LGUI_T(K12),    LALT_T(K13),    LSFT_T(K14),        K15,    LT(_MOUSE, K16),    RSFT_T(K17),        RALT_T(K18),      RGUI_T(K19),    RCTL_T(K1A), \
+        K21,             K22,            K23,            K24,                K25,    K26,                K27,                K28,              K29,            K2A, \
                    KC_DEL, LT(_NAVIGATION,KC_ENT), LT(_FUNCTION,KC_TAB),   _______,  _______,   LT(_FUNCTION,KC_BSPC), LT(_SYMBOLS,KC_SPACE), KC_QUOT \
     )