diff --git a/dot_xkb/symbols/us-escape-grave b/dot_xkb/symbols/us-escape-grave
new file mode 100644
index 0000000..2fb6781
--- /dev/null
+++ b/dot_xkb/symbols/us-escape-grave
@@ -0,0 +1,10 @@
+// Custom US layout with Caps Lock as Escape and Escape as Grave (`)
+
+xkb_symbols "basic" {
+	include "us(altgr-intl)"
+
+    name[Group1]="The best keyboard layout ever";
+
+    key <CAPS> { [ Escape ] };  // Remap Caps Lock to Escape
+    key <ESC>  { [ grave ] };   // Remap Escape to Grave (`)
+};
diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config
index 51e3b9e..f8c1c4c 100644
--- a/private_dot_config/sway/config
+++ b/private_dot_config/sway/config
@@ -88,7 +88,7 @@ scale 0.85
 #
 # or input <identifier>
 input "type:keyboard" {
-	xkb_layout us,ara
+	xkb_layout us-escape-grave,ara
 	xkb_variant ,ergoarabic
 	xkb_options grp:alt_shift_toggle,compose:ralt,caps:escape
 }