diff --git a/ka/doskrnl.k b/ka/doskrnl.k
index 0b4bb30..19290a8 100644
--- a/ka/doskrnl.k
+++ b/ka/doskrnl.k
@@ -9,9 +9,9 @@ start:
     xor rbp, rbp
 
     call main
-    call CMD.builtins.dir
 
-    hlt
+    ;call CMD.builtins.dir
+    ;hlt
 
     ; Wait for and print input indefinitely
 .1:
diff --git a/vm/pc/keybd.c b/vm/pc/keybd.c
index 1f0dd12..4cc79c1 100644
--- a/vm/pc/keybd.c
+++ b/vm/pc/keybd.c
@@ -61,13 +61,23 @@ void console_handle_input(ctx_t *ctx, SDL_Keycode key)
         return;
     }
 
-    if (key <= '0' && key >= '9')
-        console_addkey(ctx, key);
+#define QKEY(key, c, cshift, cmode, calt, cgui)                             \
+_QKEY(SDLK_##key, c, cshift, cmode, calt, cgui)
+
+#define _QKEY(key, c, cshift, cmode, calt, cgui)                            \
+        case key:                                                           \
+            if (__builtin_expect((mod &                                     \
+                    (KMOD_SHIFT|KMOD_ALT|KMOD_MODE|KMOD_GUI)) == 0, 1))     \
+                 code = c;                                                  \
+            else if ((mod & KMOD_SHIFT)) code = cshift;                     \
+            else if ((mod & KMOD_LALT)) code = calt;                        \
+            else if ((mod & KMOD_RALT)) code = cmode;                       \
+            else if ((mod & KMOD_GUI)) code = cgui;                         \
+            break;
 
     switch (key)
     {
         case SDLK_SPACE:        code = ' ';     break;
-        case SDLK_BACKSLASH:    code = '\\';    break;
         case SDLK_BACKSPACE:    code = '\b';    break;
 
         case SDLK_RETURN:
@@ -75,10 +85,83 @@ void console_handle_input(ctx_t *ctx, SDL_Keycode key)
             code = '\n';
             break;
 
+        case SDLK_TAB:          code = '\t';    break;
+
+        // AZERTY
+
+        QKEY(EXCLAIM,       '!',  0,    0,  0,  0);
+        QKEY(DOLLAR,        '$',  0,    0,  0,  0);
+        QKEY(ASTERISK,      '*',  0,    0,  0,  0);
+        QKEY(COLON,         ':', '/',   0,  0,  0);
+        QKEY(LESS,          '<', '>',   0,  0,  0);
+        QKEY(CARET,         '^',  0,    0,  0,  0);
+
+        QKEY(AMPERSAND,     '&', '1',  0,   0,  0);
+        QKEY(QUOTEDBL,      '"', '3', '#',  0,  0);
+        QKEY(LEFTPAREN,     '(', '5', '[',  0,  0);
+        QKEY(UNDERSCORE,    '_', '8', '\\', 0,  0);
+        QKEY(RIGHTPAREN,    ')',  0,  ']',  0,  0);
+
+        // QWERTY
+
+        QKEY(BACKSLASH,     '\\', '|',  0,  0,  0);
+        QKEY(PERIOD,        '.', '>',   0,  0,  0);
+        QKEY(SLASH,         '/', '?',   0,  0,  0);
+        QKEY(1,             '1', '!',   0,  0,  0);
+        QKEY(2,             '2', '@',   0,  0,  0);
+        QKEY(3,             '3', '#',   0,  0,  0);
+        QKEY(4,             '4', '$',   0,  0,  0);
+        QKEY(5,             '5', '%',   0,  0,  0);
+        QKEY(6,             '6', '^',   0,  0,  0);
+        QKEY(7,             '7', '&',   0,  0,  0);
+        QKEY(8,             '8', '*',   0,  0,  0);
+        QKEY(9,             '9', '(',   0,  0,  0);
+        QKEY(0,             '0', ')',   0,  0,  0);
+        QKEY(LEFTBRACKET,   '[', '{',   0,  0,  0);
+        QKEY(RIGHTBRACKET,  ']', '}',   0,  0,  0);
+        QKEY(BACKQUOTE,     '`', '~',   0,  0,  0);
+
+        // MIXED
+
+#ifdef QWERTY
+
+        QKEY(QUOTE,         '\'', '"',  0,  0,  0);
+        QKEY(COMMA,         ',', '<',   0,  0,  0);
+        QKEY(SEMICOLON,     ';', ':',   0,  0,  0);
+        QKEY(EQUALS,        '=', '+',   0,  0,  0);
+        QKEY(MINUS,         '-', '_',   0,  0,  0);
+
+#else
+
+        QKEY(QUOTE,         '\'', '4', '{', 0,  0);
+        QKEY(COMMA,         ',', '?',  0,  0,  0);
+        QKEY(SEMICOLON,     ';', '.',  0,  0,  0);
+        QKEY(EQUALS,        '=', '+', '}', 0,  0);
+        QKEY(MINUS,         '-', '6', '|', 0,  0);  
+
+#endif
+
+        // Other
+        
+        QKEY(HASH,          '#', 0, 0, 0, 0);
+        QKEY(PERCENT,       '%', 0, 0, 0, 0);
+        QKEY(PLUS,          '+', 0, 0, 0, 0);
+        QKEY(GREATER,       '>', 0, 0, 0, 0);
+        QKEY(QUESTION,      '?', 0, 0, 0, 0);
+        QKEY(AT,            '@', 0, 0, 0, 0);
+
+        // Found experimentally
+        _QKEY(231,           0, '0', '@', 0, 0);
+        _QKEY(232,           0, '7', '`', 0, 0);
+        _QKEY(233,           0, '2', '~', 0, 0);
+        _QKEY(249,           0, '%',  0,  0, 0);
+
         default:
+            trace("??%d!!\n", key);
             return;
     }
 
-    console_addkey(ctx, code);
+    if (code != 0)
+        console_addkey(ctx, code);
 }