diff --git a/arch-user/config/sway/config.tmpl b/arch-user/config/sway/config.tmpl
index e353c90..047c1ff 100644
--- a/arch-user/config/sway/config.tmpl
+++ b/arch-user/config/sway/config.tmpl
@@ -8,7 +8,7 @@ set $right o
 
 ################ inputs ####################
 input "type:keyboard" {
-	xkb_layout us(colemak_yz),us(basic),ru
+	xkb_layout us(yz),ru(yz)
 }
 bindsym --to-code ISO_Level3_Shift+Shift input "type:keyboard" xkb_switch_layout next
 input "type:touchpad" {
diff --git a/arch-user/config/xkb/symbols/ru b/arch-user/config/xkb/symbols/ru
new file mode 100644
index 0000000..b4da06e
--- /dev/null
+++ b/arch-user/config/xkb/symbols/ru
@@ -0,0 +1,31 @@
+xkb_symbols "yz" {
+	
+	include "ru(common)"
+	
+	# functional
+	key.type = "ONE_LEVEL";
+	replace key <CAPS> { [ BackSpace ] };
+	replace key <RALT> { [ Escape ] };
+	
+	# modifiers
+	key.type = "ONE_LEVEL";
+	replace key <RTSH> { [ Control_L ] };
+	modifier_map Control { <RTSH> };
+	replace key <LCTL> { [ Super_L ] };
+	modifier_map Mod4 { <LCTL> };
+	replace key <LALT> { [ ISO_Level3_Shift ] };
+	modifier_map Mod3 { <LALT> };
+	replace key <RCTL> { [ Alt_L ] };
+	modifier_map Mod1 { <RCTL> };
+	
+	# layer3
+	# TODO: migrate to type=ALPHANUMERIC
+	# This would fix caps lock which i dont use anyway
+	key.type = "FOUR_LEVEL";
+	# navigation
+	key <AC07> { [		Cyrillic_o,		Cyrillic_O,		Left,		eacute] };
+	key <AC08> { [		Cyrillic_el,		Cyrillic_EL,		Up,		eacute ] };
+	key <AC09> { [		Cyrillic_de,		Cyrillic_DE,		Down,		iacute ] };
+	key <AC10> { [		Cyrillic_zhe,		Cyrillic_ZHE,		Right,		oacute ] };
+
+};
diff --git a/arch-user/config/xkb/symbols/us b/arch-user/config/xkb/symbols/us
index ce3ace4..56daf4f 100644
--- a/arch-user/config/xkb/symbols/us
+++ b/arch-user/config/xkb/symbols/us
@@ -1,4 +1,4 @@
-xkb_symbols "colemak_yz" {
+xkb_symbols "yz" {
 	
 	include "us(colemak_dh)"