From c5c27c487ec408f564cc7824012f2b03a41b292c Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Mon, 15 May 2023 22:07:25 +0200
Subject: [PATCH] Update layout

---
 layers-left.ron  | 41 +++++++++++++++++++++++++++++++++++------
 layers-right.ron | 44 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/layers-left.ron b/layers-left.ron
index d459c0e..aa444be 100644
--- a/layers-left.ron
+++ b/layers-left.ron
@@ -2,7 +2,7 @@
 	Layer(
 		buttons: [
 			// Row 1
-			Key(Apostrophe),
+			Key(Escape),
 			Key(Comma),
 			Key(Period),
 			Key(P),
@@ -31,11 +31,11 @@
 	Layer(
 		buttons: [
 			// Row 1
-			Key(D1),
-			Key(D2),
-			Key(D3),
-			Key(D4),
-			Key(D5),
+			Key(Apostrophe),
+			Key(Slash),
+			Key(Equal),
+			Key(Accent),
+			Key(Period),
 
 			// Row 2
 			ModTap(BackslashPipe, LMod),
@@ -44,6 +44,35 @@
 			ModTap(RBracket, LCtrl),
 			Key(Tab),
 
+			// Row 3
+			None,
+			Key(Mute),
+			Key(VolumeDown),
+			Key(VolumeUp),
+			None,
+
+			// Thumbpad
+			Key(Backspace),
+			Key(Space),
+			NextLayer,
+		],
+	),
+	Layer(
+		buttons: [
+			// Row 1
+			None,
+			Key(Mute),
+			Key(VolumeDown),
+			Key(VolumeUp),
+			None,
+
+			// Row 2
+			Mod(LMod),
+			Mod(LAlt),
+			Mod(LShift),
+			Mod(LCtrl),
+			None,
+
 			// Row 3
 			None,
 			None,
diff --git a/layers-right.ron b/layers-right.ron
index 7a70ce1..88bf978 100644
--- a/layers-right.ron
+++ b/layers-right.ron
@@ -31,18 +31,48 @@
 	Layer(
 		buttons: [
 			// Row 1
-			Key(D6),
+			None,
 			Key(D7),
 			Key(D8),
 			Key(D9),
-			Key(D0),
+			Key(PrintScreen),
 
 			// Row 2
-			Key(Apostrophe),
-			ModTap(Slash, RCtrl),
-			ModTap(Equal, RShift),
-			ModTap(Accent, RAlt),
-			ModTap(Pound, RMod),
+			Key(D0),
+			ModTap(D4, RCtrl),
+			ModTap(D5, RShift),
+			ModTap(D6, RAlt),
+			//ModTap(, RMod),
+			Mod(RMod),
+
+			// Row 3
+			None,
+			Key(D1),
+			Key(D2),
+			Key(D3),
+			None,
+
+			// Thumbpad
+			PrevLayer,
+			Key(Return),
+			Key(Delete),
+		],
+	),
+	Layer(
+		buttons: [
+			// Row 1
+			None,
+			None,
+			None,
+			None,
+			None,
+
+			// Row 2
+			None,
+			Mod(RCtrl),
+			Mod(RShift),
+			Mod(RAlt),
+			Mod(RMod),
 
 			// Row 3
 			None,