6 files changed, 10 insertions, 68 deletions
diff --git a/keyboards/winry/winry25tc/keymaps/default/keymap.c b/keyboards/winry/winry25tc/keymaps/default/keymap.c
index 7e741c604c..e261a8160c 100644
--- a/keyboards/winry/winry25tc/keymaps/default/keymap.c
+++ b/keyboards/winry/winry25tc/keymaps/default/keymap.c
@@ -24,8 +24,8 @@ enum my_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_FIRST_LAYER] = LAYOUT(
         KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS, KC_ESC,
-        KC_P7,   KC_P8,   KC_P9,   KC_PPLS, RGB_TOG,
-        KC_P4,   KC_P5,   KC_P6,   KC_PENT, RGB_MOD,
+        KC_P7,   KC_P8,   KC_P9,   KC_PPLS, UG_TOGG,
+        KC_P4,   KC_P5,   KC_P6,   KC_PENT, UG_NEXT,
         KC_P1,   KC_P2,   KC_P3,   KC_UP,   MO(_SECOND_LAYER),
         KC_P0,   KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
     ),
diff --git a/keyboards/winry/winry315/keymaps/via/config.h b/keyboards/winry/winry315/keymaps/via/config.h
deleted file mode 100644
index de1f70c160..0000000000
--- a/keyboards/winry/winry315/keymaps/via/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2022 Sergey Vlasov (@sigprof)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 8
diff --git a/keyboards/winry/winry315/keymaps/via/keymap.c b/keyboards/winry/winry315/keymaps/via/keymap.c
deleted file mode 100644
index 0641fbfd03..0000000000
--- a/keyboards/winry/winry315/keymaps/via/keymap.c
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2022 Sergey Vlasov (@sigprof)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// clang-format off
-
-#define U_LTESC LT(1, KC_ESC)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_top(
-            KC_HOME,           KC_MUTE,           KC_MPLY,
-             KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
-             U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
-    ),
-    [1] = LAYOUT_top(
-            RGB_M_P,           RGB_M_B,           RGB_M_R,
-             RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
-             RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
-             KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
-    ),
-    [2 ... 7] = LAYOUT_top(
-            KC_TRNS,           KC_TRNS,           KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-};
-
-// clang-format on
-
-#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
-    [0] =        { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT) },
-    [1] =        { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
-    [2 ... 7] =  { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) }
-};
-#endif
diff --git a/keyboards/winry/winry315/keymaps/via/rules.mk b/keyboards/winry/winry315/keymaps/via/rules.mk
deleted file mode 100644
index 1189f4ad19..0000000000
--- a/keyboards/winry/winry315/keymaps/via/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/winry/winry315/winry315.c b/keyboards/winry/winry315/winry315.c
index e7901a2e00..03621d3e3f 100644
--- a/keyboards/winry/winry315/winry315.c
+++ b/keyboards/winry/winry315/winry315.c
@@ -3,13 +3,11 @@
 
 #include "winry315.h"
 
-#include "via.h"
-
 #if !defined(WINRY315_DEFAULT_ORIENTATION)
 #    define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_TOP
 #endif
 
-#if !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)
 #    ifndef MEDIA_KEY_DELAY
 #        define MEDIA_KEY_DELAY 10
 #    endif
@@ -41,7 +39,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return true;
 }
-#endif // !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+#endif // defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)
 
 #if defined(RGB_MATRIX_ENABLE)
 
@@ -200,9 +198,3 @@ void winry315_set_orientation(uint8_t orientation) {
     }
 #endif // defined(RGB_MATRIX_ENABLE)
 }
-
-#if defined(VIA_ENABLE)
-void via_set_layout_options_kb(uint32_t value) {
-    winry315_set_orientation(value & 0x03);
-}
-#endif // defined(VIA_ENABLE)
diff --git a/keyboards/winry/winry315/winry315.h b/keyboards/winry/winry315/winry315.h
index 8129c9d6e0..ea7b4120e2 100644
--- a/keyboards/winry/winry315/winry315.h
+++ b/keyboards/winry/winry315/winry315.h
@@ -5,8 +5,7 @@
 
 #include "quantum.h"
 
-// Supported orientations of the board.  The enum values must match the layout
-// option values used by VIA.
+// Supported orientations of the board.
 enum winry315_orientation {
     WINRY315_ORIENTATION_TOP,   // Encoders at the top side (default)
     WINRY315_ORIENTATION_LEFT,  // Encoders at the left side
@@ -17,10 +16,9 @@ enum winry315_orientation {
 // Set the orientation of the board (changes the RGB Matrix effect behavior to
 // match the new orientation).
 //
-// This function is intended to be used in the `via` keymap, where the board
-// orientation is configured dynamically using a VIA layout option.  If you are
-// making a custom keymap for one specific orientation, it is better to set the
-// orientation in config.h (e.g., `#define WINRY315_DEFAULT_ORIENTATION
-// WINRY315_ORIENTATION_LEFT`) instead of adding custom code that calls this
-// function.
+// This function is intended to be used to configure the orientation
+// dynamically. If you are making a custom keymap for one specific orientation,
+// it is better to set the orientation in config.h
+// (e.g., `#define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_LEFT`)
+// instead of adding custom code that calls this function.
 void winry315_set_orientation(uint8_t orientation);