Changes keyboard layout

The biggest change comes from the fact that I have removed the number
row on the first screen.

I have also re arranged the second screen.

layout.colemak.h

@@ -1,20 +1,5 @@
-static Key keys[58] = { NULL };
-static Key keys_en[58] = {
-	{ "Esc", XK_Escape, 1 },
-	{ "1!", XK_1, 1 },
-	{ "2\"", XK_2, 1 },
-	{ "3£", XK_3, 1 },
-	{ "4$", XK_4, 1 },
-	{ "5%", XK_5, 1 },
-	{ "6^", XK_6, 1 },
-	{ "7&", XK_7, 1 },
-	{ "8*", XK_8, 1 },
-	{ "9(", XK_9, 1 },
-	{ "0)", XK_0, 1 },
-	{ "-_", XK_minus, 1 },
-	{ "=+", XK_plus, 1 },
-	{ "←", XK_BackSpace, 1 },
-	{ 0 }, /* New row */
+static Key keys[46] = { NULL };
+static Key keys_en[46] = {
 	{ "→|", XK_Tab, 1 },
 	{ 0, XK_q, 1 },
 	{ 0, XK_w, 1 },
@@ -28,9 +13,10 @@ static Key keys_en[58] = {
 	{ ";:", XK_semicolon, 1 },
 	//{ "[", XK_bracketleft, 1 },
 	//{ "]", XK_bracketright, 1 },
-	{ "#", XK_numbersign, 1 },
+	{ "#~", XK_numbersign, 1 },
 	{ 0 }, /* New row */
 	//{ 0, XK_Caps_Lock, 2 },
+	{ "↺", XK_Cancel, 1 },
 	{ 0, XK_a, 1 },
 	{ 0, XK_r, 1 },
 	{ 0, XK_s, 1 },
@@ -41,7 +27,7 @@ static Key keys_en[58] = {
 	{ 0, XK_e, 1 },
 	{ 0, XK_i, 1 },
 	{ 0, XK_o, 1 },
-	{ "⏎", XK_Return, 1 },
+	{ "\'@", XK_apostrophe, 1 },
 	{ 0 }, /* New row */
 	{ "↑", XK_Shift_L, 1 },
 	{ 0, XK_z, 1 },
@@ -54,19 +40,21 @@ static Key keys_en[58] = {
 	{ ",", XK_colon, 1 },
 	{ ".", XK_period, 1 },
 	{ "/?", XK_slash, 1 },
-	{ "\'", XK_apostrophe, 1 },
+	{ "⏎", XK_Return, 1 },
 	{ 0 }, /* New row */
 	{ "Ctrl", XK_Control_L, 1 },
     { "", XK_Super_L, 1 },
 	{ "Alt", XK_Alt_L, 1 },
 	{ "", XK_space, 5 },
-	{ "↺", XK_Cancel, 1 }
+	{ "Esc", XK_Escape, 1 },
+	{ "⇍", XK_BackSpace, 1 },
+	{ "⏎", XK_Return, 1 }
 };
 
-static Key keys_symbols[58] = {
+static Key keys_symbols[46] = {
 	{ "1!", XK_1, 1 },
-  { "2@", XK_2, 1 },
-  { "3#", XK_3, 1 },
+	{ "2\"", XK_2, 1 },
+	{ "3£", XK_3, 1 },
 	{ "4$", XK_4, 1 },
 	{ "5%", XK_5, 1 },
 	{ "6^", XK_6, 1 },
@@ -74,13 +62,14 @@ static Key keys_symbols[58] = {
 	{ "8*", XK_8, 1 },
 	{ "9(", XK_9, 1 },
 	{ "0)", XK_0, 1 },
+	{ "-_", XK_minus, 1 },
+	{ "=+", XK_plus, 1 },
 
 	{ 0 }, /* New row */
 
-  { "'\"", XK_apostrophe, 1 },
-  { "`~", XK_grave, 1 },
-  { "-_", XK_minus, 1 },
-  { "=+", XK_plus, 1 },
+	{ "↺", XK_Cancel, 1 },
+	{ "'@", XK_apostrophe, 1 },
+	{ "`¬", XK_grave, 1 },
 	{ "[{", XK_bracketleft, 1 },
 	{ "]}", XK_bracketright, 1 },
 	{ ",<", XK_comma, 1 },
@@ -90,28 +79,23 @@ static Key keys_symbols[58] = {
 
 	{ 0 }, /* New row */
 
-  { "", XK_Shift_L|XK_bar, 1 },
 	{ "⇤", XK_Home, 1 },
 	{ "←", XK_Left, 1 },
+	{ "↑", XK_Up, 1 },
+	{ "↓", XK_Down, 1 },
 	{ "→", XK_Right, 1 },
 	{ "⇥", XK_End, 1 },
-  { "⇊", XK_Next, 1 },
-  { "⇈", XK_Prior, 1 },
-  { "Tab", XK_Tab, 1 },
-  { "⇍ Bksp", XK_BackSpace, 2 },
+
 
 	{ 0 }, /* New row */
-  { "↺", XK_Cancel, 1},
-  { "↑", XK_Shift_L, 1 },
-  /*{ "L", XK_Left, 1 },*/
-  { "↓", XK_Down, 1 },
-  { "↑", XK_Up, 1 },
-  /*{ "R", XK_Right, 1 },*/
+
+	{ "Ctrl", XK_Control_L, 1 },
+    { "", XK_Super_L, 1 },
+	{ "Alt", XK_Alt_L, 1 },
 	{ "", XK_space, 5 },
 	{ "Esc", XK_Escape, 1 },
-  { "Ctrl", XK_Control_L, 1 },
-  /*{ "Alt", XK_Alt_L, 1 },*/
-  { "⏎", XK_Return, 2 }
+	{ "←", XK_BackSpace, 1 },
+	{ "⏎", XK_Return, 1 }
 };
 
 Buttonmod buttonmods[] = {