diff --git a/keyboards/sawnsprojects/satxri6key/keyboard.json b/keyboards/sawnsprojects/satxri6key/keyboard.json
index 30f1ec3fd14..100d92325b3 100644
--- a/keyboards/sawnsprojects/satxri6key/keyboard.json
+++ b/keyboards/sawnsprojects/satxri6key/keyboard.json
@@ -92,7 +92,7 @@
         "bootmagic": true,
         "extrakey": true,
         "mousekey": true,
-        "nkro": false
+        "rgblight": true
     },
     "matrix_pins": {
         "cols": ["F1", "F4", "F5"],
@@ -101,8 +101,12 @@
     "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "community_layouts": ["ortho_2x3"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_2x3"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_2x3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/sawnsprojects/satxri6key/keymaps/default/keymap.c b/keyboards/sawnsprojects/satxri6key/keymaps/default/keymap.c
index b44effb84de..a38b1adfc9c 100644
--- a/keyboards/sawnsprojects/satxri6key/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/satxri6key/keymaps/default/keymap.c
@@ -1,34 +1,15 @@
-/* Copyright 2021 SawnsProjects
- *
- * 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/>.
- */
-
+// Copyright 2021 SawnsProjects
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-        
+    [0] = LAYOUT_ortho_2x3(
         KC_ESC,  KC_GRV,  TO(1),
-        KC_Z,  KC_X,  KC_C      ),
-
-    [1] = LAYOUT(
-        
-        KC_TRNS, KC_TRNS, TO(0),
-        KC_TRNS, KC_TRNS, KC_TRNS      ),
-
-
+        KC_Z,    KC_X,    KC_C
+    ),
+    [1] = LAYOUT_ortho_2x3(
+        _______, _______, TO(0),
+        _______, _______, _______
+    )
 };
-
diff --git a/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk b/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk
index 3d821b064a3..1a840036e2a 100644
--- a/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk
+++ b/keyboards/sawnsprojects/satxri6key/keymaps/default/rules.mk
@@ -1,4 +1,2 @@
-VIA_ENABLE = no
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = ws2812