diff --git a/PS2Keyboard.cpp b/PS2Keyboard.cpp
index f6c8150..09da096 100644
--- a/PS2Keyboard.cpp
+++ b/PS2Keyboard.cpp
@@ -357,7 +357,7 @@ const PROGMEM PS2Keymap_t PS2Keymap_Italian = {
 		 0, 'N', 'B', 'H', 'G', 'Y', '&', 0,
 		 0, 0, 'M', 'J', 'U', '/', '(', 0,
 		 0, ';', 'K', 'I', 'O', '=', ')', 0,
-		 0, ':', '_', 'L', PS2_c_CEDILLA, 0, '?', 0,
+		 0, ':', '_', 'L', PS2_c_CEDILLA, 'P', '?', 0,
 		 0, 0, PS2_DEGREE_SIGN, 0, PS2_e_ACUTE, '^', 0, 0,
 		 0 /*CapsLock*/, 0 /*Rshift*/, PS2_ENTER /*Enter*/, '*', 0, PS2_SECTION_SIGN, 0, 0,
 		 0, '>', 0, 0, 0, 0, PS2_BACKSPACE, 0,
@@ -369,16 +369,16 @@ const PROGMEM PS2Keymap_t PS2Keymap_Italian = {
 		// with altgr
 		{0, PS2_F9, 0, PS2_F5, PS2_F3, PS2_F1, PS2_F2, PS2_F12,
 		 0, PS2_F10, PS2_F8, PS2_F6, PS2_F4, PS2_TAB, PS2_NOT_SIGN, 0,
-		 0, 0 /*Lalt*/, 0 /*Lshift*/, 0, 0 /*Lctrl*/, 'q', PS2_SUPERSCRIPT_ONE, 0,
-		 0, 0, 'z', 's', 'a', 'w', PS2_SUPERSCRIPT_TWO, 0,
-		 0, 'c', 'x', 'd', PS2_EURO_SIGN, PS2_FRACTION_ONE_QUARTER, PS2_SUPERSCRIPT_THREE, 0,
-		 0, ' ', 'v', 'f', 't', 'r', PS2_FRACTION_ONE_HALF, 0,
-		 0, 'n', 'b', 'h', 'g', 'y', PS2_NOT_SIGN, 0,
-		 0, 0, 'm', 'j', 'u', '{', '[', 0,
-		 0, ',', 'k', 'i', 'o', '}', ']', 0,
-		 0, '.', '-', 'l', '@', 'p', '\'', 0,
+		 0, 0 /*Lalt*/, 0 /*Lshift*/, 0, 0 /*Lctrl*/, '@', PS2_SUPERSCRIPT_ONE, 0,
+		 0, 0, PS2_LEFT_DOUBLE_ANGLE_QUOTE, PS2_SHARP_S, PS2_ae, 0/*l with stroke*/, PS2_SUPERSCRIPT_TWO, 0,
+		 0, PS2_CENT_SIGN, PS2_RIGHT_DOUBLE_ANGLE_QUOTE, PS2_eth, PS2_EURO_SIGN, PS2_FRACTION_ONE_QUARTER, PS2_SUPERSCRIPT_THREE, 0,
+		 0, ' ', 0/*quotation mark*/, 0/*crossed d*/, 0/*crossed t*/, PS2_PILCROW_SIGN, PS2_FRACTION_ONE_HALF, 0,
+		 0, PS2_n_TILDE, 0/*quotation mark*/, 0/*h with bar*/, 0/*engma*/, 0/*arrow left*/, PS2_NOT_SIGN, 0,
+		 0, 0, PS2_MICRO_SIGN, 0/*?*/, 0/*arrow down*/, '{', '}', 0,
+		 0, 0/*two times is acute accent*/, 0/*kra*/, 0/*right arrow*/, PS2_o_STROKE, '}', ']', 0,
+		 0, PS2_MIDDLE_DOT, 0/*two times is macron*/, 0/*l with stroke*/, '@', PS2_thorn, '`', 0,
 		 0, 0, '#', 0, '[', '~', 0, 0,
-		 0 /*CapsLock*/, 0 /*Rshift*/, PS2_ENTER /*Enter*/, ']', 0, 0, 0, 0,
+		 0 /*CapsLock*/, 0 /*Rshift*/, PS2_ENTER /*Enter*/, ']', 0, 0/*two times is backtick*/, 0, 0,
 		 0, PS2_LEFT_DOUBLE_ANGLE_QUOTE, 0, 0, 0, 0, PS2_BACKSPACE, 0,
 		 0, '1', 0, '4', '7', 0, 0, 0,
 		 '0', '.', '2', '5', '6', '8', PS2_ESC, 0 /*NumLock*/,
@@ -408,10 +408,10 @@ const PROGMEM PS2Keymap_t PS2Keymap_UK = {
 	0, 0, 0, PS2_F7 },
   // with shift
 	{0, PS2_F9, 0, PS2_F5, PS2_F3, PS2_F1, PS2_F2, PS2_F12,
-	0, PS2_F10, PS2_F8, PS2_F6, PS2_F4, PS2_TAB, 172 /* ¬ */, 0,
+	0, PS2_F10, PS2_F8, PS2_F6, PS2_F4, PS2_TAB, PS2_NOT_SIGN /* ¬ */, 0,
 	0, 0 /*Lalt*/, 0 /*Lshift*/, 0, 0 /*Lctrl*/, 'Q', '!', 0,
 	0, 0, 'Z', 'S', 'A', 'W', '"', 0,
-	0, 'C', 'X', 'D', 'E', '$', 163 /* £ */, 0,
+	0, 'C', 'X', 'D', 'E', '$', PS2_POUND_SIGN /* £ */, 0,
 	0, ' ', 'V', 'F', 'T', 'R', '%', 0,
 	0, 'N', 'B', 'H', 'G', 'Y', '^', 0,
 	0, 0, 'M', 'J', 'U', '&', '*', 0,