diff --git a/include/apple2/keydef.a02 b/include/apple2/keydef.a02
new file mode 100644
index 0000000..edbbd11
--- /dev/null
+++ b/include/apple2/keydef.a02
@@ -0,0 +1,42 @@
+;Apple II Key Code Definitions
+;Undefined Keys hae value $00
+
+;Key Definitions (Struct Key Codes)
+;            Chr  NAME    Description
+KEYS:   BYTE $08 ;BCKSPC  Backspace
+        BYTE $00 ;BREAK   Break
+        BYTE $00 ;CLEAR   Clear
+        BYTE $00 ;COPY    Copy 
+        BYTE $7F ;DELETE  Delete
+        BYTE $0S ;DOWN    Cursor Down (Line Feed)
+        BYTE $1B ;ESCAPE  Escape
+        BYTE $00 ;FN1     F1
+        BYTE $00 ;FN2     F2
+        BYTE $00 ;FN3     F3
+        BYTE $00 ;FN4     F4
+        BYTE $00 ;FN5     F5
+        BYTE $00 ;FN6     F6
+        BYTE $00 ;FN7     F7
+        BYTE $00 ;FN8     F8
+        BYTE $00 ;FN9     F9
+        BYTE $00 ;FN10    F10
+        BYTE $00 ;FN11    F11
+        BYTE $00 ;FN12    F12
+        BYTE $00 ;HELP    Help 
+        BYTE $00 ;HOME    Home
+        BYTE $00 ;INSERT  Insert
+        BYTE $08 ;LEFT    Cursor Left (Backspace) 
+        BYTE $00 ;LNFD    Line Feed
+        BYTE $15 ;RIGHT   Cursor Right
+        BYTE $0D ;RETURN  Return
+        BYTE $00 ;SHFRTN  Shift-Return
+        BYTE $00 ;RUN     Run 
+        BYTE $00 ;RVSOFF  Reverse Off
+        BYTE $00 ;RVSON   Reverse On 
+        BYTE $00 ;SHFSPC  Shifted Space
+        BYTE $09 ;TAB     Tab
+        BYTE $00 ;SHFTAB  Shift-Tab
+        BYTE $0B ;UP      Cursor Up 
+
+;System Key Names
+KNAMES  BYTE "<-",0,"ESC",0,"RETURN",0
diff --git a/include/apple2/keydef.h02 b/include/apple2/keydef.h02
new file mode 100644
index 0000000..e30de12
--- /dev/null
+++ b/include/apple2/keydef.h02
@@ -0,0 +1,48 @@
+/* Apple II Key Code Definitions *
+ * Undefined Keys have value $00       *
+   
+/* Structure for Key Definitions */
+struct keydef {
+  char bckspc;  //Backspace
+  char break;   //Break 
+  char clear;   //Clear 
+  char copy;    //Copy 
+  char delete;  //Delete
+  char down;    //Cursor Down
+  char escape;  //Escape
+  char fn1;     //F1 
+  char fn2;     //F2 
+  char fn3;     //F3 
+  char fn4;     //F4 
+  char fn5;     //F5 
+  char fn6;     //F6 
+  char fn7;     //F7 
+  char fn8;     //F8 
+  char fn9;     //F9 
+  char fn10;    //F10
+  char fn11;    //F11
+  char fn12;    //F12
+  char help;    //Help 
+  char home;    //Home 
+  char insert;  //Insert 
+  char left;    //Cursor Left
+  char lnfd;    //Line Feed 
+  char right;   //Cursor Right
+  char return;  //Return
+  char shfrtn;  //Shift-Return
+  char run;     //Run 
+  char rvsoff;  //Reverse Off
+  char rvson;   //Reverse On
+  char shfspc;  //Shifted Space
+  char tab;     //Tab
+  char shftab;  //Shift-Tab 
+  char up;      //Cursor Up
+};
+
+/* Actual Key Definitions */
+const struct keydef keys;
+
+/* Structure for Key Names */
+struct kname {char delete[2], escape[3], return[6];};
+const struct kname knames;
+
diff --git a/include/c64/keydef.a02 b/include/c64/keydef.a02
index f0a6d17..29091ba 100644
--- a/include/c64/keydef.a02
+++ b/include/c64/keydef.a02
@@ -1,39 +1,42 @@
 ;PETSCII Key Code Definitions
-;for Commmodore 64 Computer
+;for Commodore 64 Computer
 
-KEYS:   ;Key Definitions (Struct Key Codes)
-;NAME         Chr  Description              VICE x64 
-.BCKSPC  BYTE $00 ;Backspace [N/A]          
-.BREAK   BYTE $03 ;Break (RUN/STOP)         Escape, Caps Lock, or Tab-C
-.CLEAR   BYTE $93 ;Clear (Shift-CLR/HOME)   Shift-Home
-.COPY    BYTE $00 ;Copy [N/A]
-.DELETE  BYTE $14 ;Delete                   Backspace, Delete, or Tab-T 
-.DOWN    BYTE $11 ;Cursor Down              Cursor Down or Tab-Q
-.ESCAPE  BYTE $00 ;Escape [N/A]             
-.FN1     BYTE $85 ;F1 (F1/F2)               F1
-.FN2     BYTE $89 ;F2 (Shift-F1/F2)         F2 or Shift-F1
-.FN3     BYTE $86 ;F3 (F3/F4)               F3
-.FN4     BYTE $8A ;F4 (Shift-F3/F4)         F4 or Shift-F3
-.FN5     BYTE $87 ;F5 (F5/F6)               F5
-.FN6     BYTE $8B ;F6 (Shift-F5/F6)         F6 or Shift-F5
-.FN7     BYTE $88 ;F7 (F7/F8)               F7
-.FN8     BYTE $8C ;F8 (Shift-F7/F8)         F8 or Shift-F7
-.FN9     BYTE $00 ;F9  [N/A]                
-.FN10    BYTE $00 ;F10 [N/A]                
-.FN11    BYTE $00 ;F11 [N/A]                
-.FN12    BYTE $00 ;F12 [N/A]                
-.HELP    BYTE $84 ;Help [N/A]               
-.HOME    BYTE $13 ;Home (CLR/HOME)          Home or Tab-S
-.INSERT  BYTE $94 ;Insert (Shift-INS/DEL)   Insert or Shift-Back
-.LEFT    BYTE $9D ;Cursor Left              Cursor Left
-.LNFD    BYTE $00 ;Line Feed [N/A]
-.RIGHT   BYTE $1D ;Cursor Right             Cursor Right
-.RETURN  BYTE $0D ;Return                   Enter or Tab-M
-.SHFRTN  BYTE $8D ;Shift-Return             Shift-Enter
-.RUN     BYTE $83 ;Run (Shift-RUN/STOP)     Shift-Escape
-.RVSOFF  BYTE $92 ;Reverse Off              Tab-0
-.RVSON   BYTE $12 ;Reverse On               Tab-9 or Tab-R
-.SHFSPC  BYTE $A0 ;Shift-Space              Shift-Space
-.TAB     BYTE $00 ;Tab                      
-.SHFTAB  BYTE $00 ;Shift-Tab [N/A]          
-.UP      BYTE $91 ;Cursor Up                Cursor Up
+;Key Definitions (Struct Key Codes)
+;            Chr  NAME    Description              VICE x64 
+KEYS:   BYTE $00 ;BCKSPC  Backspace [N/A]          
+        BYTE $03 ;BREAK   Break (RUN/STOP)         Escape, Caps Lock, or Tab-C
+        BYTE $93 ;CLEAR   Clear (Shift-CLR/HOME)   Shift-Home
+        BYTE $00 ;COPY    Copy [N/A]
+        BYTE $14 ;DELETE  Delete                   Backspace, Delete, or Tab-T 
+        BYTE $11 ;DOWN    Cursor Down              Cursor Down or Tab-Q
+        BYTE $00 ;ESCAPE  Escape [N/A]             
+        BYTE $85 ;FN1     F1 (F1/F2)               F1
+        BYTE $89 ;FN2     F2 (Shift-F1/F2)         F2 or Shift-F1
+        BYTE $86 ;FN3     F3 (F3/F4)               F3
+        BYTE $8A ;FN4     F4 (Shift-F3/F4)         F4 or Shift-F3
+        BYTE $87 ;FN5     F5 (F5/F6)               F5
+        BYTE $8B ;FN6     F6 (Shift-F5/F6)         F6 or Shift-F5
+        BYTE $88 ;FN7     F7 (F7/F8)               F7
+        BYTE $8C ;FN8     F8 (Shift-F7/F8)         F8 or Shift-F7
+        BYTE $00 ;FN9     F9  [N/A]                
+        BYTE $00 ;FN10    F10 [N/A]                
+        BYTE $00 ;FN11    F11 [N/A]                
+        BYTE $00 ;FN12    F12 [N/A]                
+        BYTE $84 ;HELP    Help [N/A]               
+        BYTE $13 ;HOME    Home (CLR/HOME)          Home or Tab-S
+        BYTE $94 ;INSERT  Insert (Shift-INS/DEL)   Insert or Shift-Back
+        BYTE $9D ;LEFT    Cursor Left              Cursor Left
+        BYTE $00 ;LNFD    Line Feed [N/A]
+        BYTE $1D ;RIGHT   Cursor Right             Cursor Right
+        BYTE $0D ;RETURN  Return                   Enter or Tab-M
+        BYTE $8D ;SHFRTN  Shift-Return             Shift-Enter
+        BYTE $83 ;RUN     Run (Shift-RUN/STOP)     Shift-Escape
+        BYTE $92 ;RVSOFF  Reverse Off              Tab-0
+        BYTE $12 ;RVSON   Reverse On               Tab-9 or Tab-R
+        BYTE $A0 ;SHFSPC  Shift-Space              Shift-Space
+        BYTE $00 ;TAB     Tab                      
+        BYTE $00 ;SHFTAB  Shift-Tab [N/A]          
+        BYTE $91 ;UP      Cursor Up                Cursor Up
+
+;System Key Names
+KNAMES  BYTE "DEL",0,"STOP",0,"RETURN",0
diff --git a/include/c64/keydef.h02 b/include/c64/keydef.h02
index a771549..b49cb56 100644
--- a/include/c64/keydef.h02
+++ b/include/c64/keydef.h02
@@ -41,3 +41,7 @@ struct keydef {
 
 /* Actual Key Definitions */
 const struct keydef keys;
+
+/* Structure for Key Names */
+struct kname {char delete[3], escape[4], return[6];};
+const struct kname knames;
diff --git a/include/cbm/keydef.a02 b/include/cbm/keydef.a02
index 500d76d..37d237f 100644
--- a/include/cbm/keydef.a02
+++ b/include/cbm/keydef.a02
@@ -1,39 +1,42 @@
 ;PETSCII Key Code Definitions
 ;Common to All PET/CBM Computers
 
-KEYS:   ;Key Definitions (Struct Key Codes)
-;NAME         Chr  Description
-.BCKSPC  BYTE $00 ;Backspace [N/A]
-.BREAK   BYTE $03 ;Break (RUN/STOP)
-.CLEAR   BYTE $93 ;Clear (Shift-CLR/HOME)
-.COPY    BYTE $00 ;Copy [N/A]
-.DELETE  BYTE $14 ;Delete
-.DOWN    BYTE $11 ;Cursor Down
-.ESCAPE  BYTE $00 ;Escape [C128/C65]
-.FN1     BYTE $85 ;F1 [VIC20/C64/C16/C128/C65]
-.FN2     BYTE $89 ;F2 [VIC20/C64/C16/C128/C65]
-.FN3     BYTE $86 ;F3 [VIC20/C64/C16/C128/C65]
-.FN4     BYTE $8A ;F4 [VIC20/C64/C16/C128/C65]
-.FN5     BYTE $87 ;F5 [VIC20/C64/C16/C128/C65]
-.FN6     BYTE $8B ;F6 [VIC20/C64/C16/C128/C65]
-.FN7     BYTE $88 ;F7 [VIC20/C64/C16/C128/C65]
-.FN8     BYTE $8C ;F8 [VIC20/C64/C128/C65] [HELP on C16]
-.FN9     BYTE $00 ;F9  [C65]
-.FN10    BYTE $00 ;F10 [C65]
-.FN11    BYTE $00 ;F11 [C65]
-.FN12    BYTE $00 ;F12 [C65]
-.HELP    BYTE $84 ;Help [C128/xC65]
-.HOME    BYTE $13 ;Home (CLR/HOME)
-.INSERT  BYTE $94 ;Insert (Shift-INS/DEL)
-.LEFT    BYTE $9D ;Cursor Left
-.LNFD    BYTE $00 ;Line Feed [C128]
-.RIGHT   BYTE $1D ;Cursor Right
-.RETURN  BYTE $0D ;Return
-.SHFRTN  BYTE $8D ;Shift-Return
-.RUN     BYTE $00 ;Run (Shift-RUN/STOP)
-.RVSOFF  BYTE $92 ;Reverse Off
-.RVSON   BYTE $12 ;Reverse On
-.SHFSPC  BYTE $A0 ;Shifted Space
-.TAB     BYTE $09 ;Tab
-.SHFTAB  BYTE $00 ;Shift-Tab [C128/C65]
-.UP      BYTE $91 ;Cursor Up
+;Key Definitions (Struct Key Codes)
+;            Chr  Name    Description
+KEYS:   BYTE $00 ;BCKSPC  Backspace [N/A]
+        BYTE $03 ;BREAK   Break (RUN/STOP)
+        BYTE $93 ;CLEAR   Clear (Shift-CLR/HOME)
+        BYTE $00 ;COPY    Copy [N/A]
+        BYTE $14 ;DELETE  Delete
+        BYTE $11 ;DOWN    Cursor Down
+        BYTE $00 ;ESCAPE  Escape [C128/C65]
+        BYTE $85 ;FN1     F1 [VIC20/C64/C16/C128/C65]
+        BYTE $89 ;FN2     F2 [VIC20/C64/C16/C128/C65]
+        BYTE $86 ;FN3     F3 [VIC20/C64/C16/C128/C65]
+        BYTE $8A ;FN4     F4 [VIC20/C64/C16/C128/C65]
+        BYTE $87 ;FN5     F5 [VIC20/C64/C16/C128/C65]
+        BYTE $8B ;FN6     F6 [VIC20/C64/C16/C128/C65]
+        BYTE $88 ;FN7     F7 [VIC20/C64/C16/C128/C65]
+        BYTE $8C ;FN8     F8 [VIC20/C64/C128/C65] [HELP on C16]
+        BYTE $00 ;FN9     F9  [C65]
+        BYTE $00 ;FN10    F10 [C65]
+        BYTE $00 ;FN11    F11 [C65]
+        BYTE $00 ;FN12    F12 [C65]
+        BYTE $84 ;HELP    Help [C128/xC65]
+        BYTE $13 ;HOME    Home (CLR/HOME)
+        BYTE $94 ;INSERT  Insert (Shift-INS/DEL)
+        BYTE $9D ;LEFT    Cursor Left
+        BYTE $00 ;LNFD    Line Feed [C128]
+        BYTE $1D ;RIGHT   Cursor Right
+        BYTE $0D ;RETURN  Return
+        BYTE $8D ;SHFRTN  Shift-Return
+        BYTE $00 ;RUN     Run (Shift-RUN/STOP)
+        BYTE $92 ;RVSOFF  Reverse Off
+        BYTE $12 ;RVSON   Reverse On
+        BYTE $A0 ;SHFSPC  Shifted Space
+        BYTE $09 ;TAB     Tab
+        BYTE $00 ;SHFTAB  Shift-Tab [C128/C65]
+        BYTE $91 ;UP      Cursor Up
+
+;System Key Names
+KNAMES  BYTE "DEL",0,"STOP",0,"RETURN",0
diff --git a/include/cbm/keydef.h02 b/include/cbm/keydef.h02
index 2fd312f..ce69c38 100644
--- a/include/cbm/keydef.h02
+++ b/include/cbm/keydef.h02
@@ -11,7 +11,7 @@ struct keydef {
   char down;    $11 //Cursor Down
   char escape;  $00 //Escape (N/A)
   char fn1;     $00 //F1  (N/A)
-  char fn2;     $00 //F2 (N/A)
+  char fn2;     $00 //F2  (N/A)
   char fn3;     $00 //F3  (N/A)
   char fn4;     $00 //F4  (N/A)
   char fn5;     $00 //F5  (N/A)
@@ -41,3 +41,7 @@ struct keydef {
 
 /* Actual Key Definitions */
 const struct keydef keys;
+
+/* Structure for Key Names */
+struct kname {char delete[3], escape[4], return[6];};
+const struct kname knames;
diff --git a/include/keydef.a02 b/include/keydef.a02
index 4953328..b8b049b 100644
--- a/include/keydef.a02
+++ b/include/keydef.a02
@@ -1,39 +1,42 @@
 ;Standard ASCII Key Code Definitions
 ;Undefined Keys hae value $00
 
-KEYS:   ;Key Definitions (Struct Key Codes)
-;NAME         Chr  Description
-.BCKSPC  BYTE $08 ;Backspace
-.BREAK   BYTE $03 ;Break
-.CLEAR   BYTE $00 ;Clear
-.COPY    BYTE $00 ;Copy [Acorn Atom]
-.DELETE  BYTE $7F ;Delete
-.DOWN    BYTE $00 ;Cursor Down
-.ESCAPE  BYTE $1B ;Escape
-.FN1     BYTE $00 ;F1
-.FN2     BYTE $00 ;F2
-.FN3     BYTE $00 ;F3
-.FN4     BYTE $00 ;F4
-.FN5     BYTE $00 ;F5
-.FN6     BYTE $00 ;F6
-.FN7     BYTE $00 ;F7
-.FN8     BYTE $00 ;F8
-.FN9     BYTE $00 ;F9
-.FN10    BYTE $00 ;F10
-.FN11    BYTE $00 ;F11
-.FN12    BYTE $00 ;F12
-.HELP    BYTE $00 ;Help [C128/C65]
-.HOME    BYTE $00 ;Home
-.INSERT  BYTE $00 ;Insert
-.LEFT    BYTE $00 ;Cursor Left 
-.LNFD    BYTE $0A ;;Line Feed [C128]
-.RIGHT   BYTE $00 ;Cursor Right
-.RETURN  BYTE $0D ;Return
-.SHFRTN  BYTE $80 ;Shift-Return
-.RUN     BYTE $00 ;Run [PET/CBM]
-.RVSOFF  BYTE $92 ;Reverse OffCtrl-0
-.RVSON   BYTE $12 ;Reverse On Ctrl-9
-.SHFSPC  BYTE $00 ;Shifted Space
-.TAB     BYTE $09 ;Tab
-.SHFTAB  BYTE $00 ;Shift-Tab
-.UP      BYTE $00 ;Cursor Up 
+;Key Definitions (Struct Key Codes)
+;            Chr  NAME    Description
+KEYS:   BYTE $08 ;BCKSPC  Backspace
+        BYTE $03 ;BREAK   Break
+        BYTE $00 ;CLEAR   Clear
+        BYTE $00 ;COPY    Copy [Acorn Atom]
+        BYTE $7F ;DELETE  Delete
+        BYTE $00 ;DOWN    Cursor Down
+        BYTE $1B ;ESCAPE  Escape
+        BYTE $00 ;FN1     F1
+        BYTE $00 ;FN2     F2
+        BYTE $00 ;FN3     F3
+        BYTE $00 ;FN4     F4
+        BYTE $00 ;FN5     F5
+        BYTE $00 ;FN6     F6
+        BYTE $00 ;FN7     F7
+        BYTE $00 ;FN8     F8
+        BYTE $00 ;FN9     F9
+        BYTE $00 ;FN10    F10
+        BYTE $00 ;FN11    F11
+        BYTE $00 ;FN12    F12
+        BYTE $00 ;HELP    Help [C128/C65]
+        BYTE $00 ;HOME    Home
+        BYTE $00 ;INSERT  Insert
+        BYTE $00 ;LEFT    Cursor Left 
+        BYTE $0A ;LNFD    ;Line Feed [C128]
+        BYTE $00 ;RIGHT   Cursor Right
+        BYTE $0D ;RETURN  Return
+        BYTE $80 ;SHFRTN  Shift-Return
+        BYTE $00 ;RUN     Run [PET/CBM]
+        BYTE $92 ;RVSOFF  Reverse OffCtrl-0
+        BYTE $12 ;RVSON   Reverse On Ctrl-9
+        BYTE $00 ;SHFSPC  Shifted Space
+        BYTE $09 ;TAB     Tab
+        BYTE $00 ;SHFTAB  Shift-Tab
+        BYTE $00 ;UP      Cursor Up 
+
+;System Key Names
+KNAMES  BYTE "DELETE",0,"ESCAPE",0,"RETURN",0
diff --git a/include/keydef.h02 b/include/keydef.h02
index 0a9ea5c..9d44fed 100644
--- a/include/keydef.h02
+++ b/include/keydef.h02
@@ -41,3 +41,8 @@ struct keydef {
 
 /* Actual Key Definitions */
 const struct keydef keys;
+
+/* Structure for Key Names */
+struct kname {char delete[6], escape[6], return[6];};
+const struct kname knames;
+
diff --git a/include/run6502/keydef.a02 b/include/run6502/keydef.a02
new file mode 100644
index 0000000..43a0f7c
--- /dev/null
+++ b/include/run6502/keydef.a02
@@ -0,0 +1,42 @@
+  ;Standard ASCII Key Code Definitions
+;Undefined Keys hae value $00
+
+;Key Definitions (Struct Key Codes)
+;            Chr  NAME    Description
+KEYS:   BYTE $00 ;BCKSPC  Backspace
+        BYTE $00 ;BREAK   Break
+        BYTE $00 ;CLEAR   Clear
+        BYTE $00 ;COPY    Copy [Acorn Atom]
+        BYTE $00 ;DELETE  Delete
+        BYTE $00 ;DOWN    Cursor Down
+        BYTE $00 ;ESCAPE  Escape
+        BYTE $00 ;FN1     F1
+        BYTE $00 ;FN2     F2
+        BYTE $00 ;FN3     F3
+        BYTE $00 ;FN4     F4
+        BYTE $00 ;FN5     F5
+        BYTE $00 ;FN6     F6
+        BYTE $00 ;FN7     F7
+        BYTE $00 ;FN8     F8
+        BYTE $00 ;FN9     F9
+        BYTE $00 ;FN10    F10
+        BYTE $00 ;FN11    F11
+        BYTE $00 ;FN12    F12
+        BYTE $00 ;HELP    Help 
+        BYTE $00 ;HOME    Home
+        BYTE $00 ;INSERT  Insert
+        BYTE $00 ;LEFT    Cursor Left 
+        BYTE $00 ;LNFD    Line Feed
+        BYTE $00 ;RIGHT   Cursor Right
+        BYTE $0A ;RETURN  Return
+        BYTE $00 ;SHFRTN  Shift-Return
+        BYTE $00 ;RUN     Run 
+        BYTE $00 ;RVSOFF  Reverse Off
+        BYTE $00 ;RVSON   Reverse On 
+        BYTE $00 ;SHFSPC  Shifted Space
+        BYTE $09 ;TAB     Tab
+        BYTE $00 ;SHFTAB  Shift-Tab
+        BYTE $00 ;UP      Cursor Up 
+
+;System Key Names Structure
+KNAMES  BYTE "BACKSPACE",0,"^X",0,"ENTER",0
diff --git a/include/run6502/keydef.h02 b/include/run6502/keydef.h02
new file mode 100644
index 0000000..dc093c4
--- /dev/null
+++ b/include/run6502/keydef.h02
@@ -0,0 +1,47 @@
+/* Standard ASCII Key Code Definitions *
+ * Undefined Keys have value $00       *
+   
+/* Structure for Key Definitions */
+struct keydef {
+  char bckspc;  //Backspace
+  char break;   //Break 
+  char clear;   //Clear 
+  char copy;    //Copy 
+  char delete;  //Delete
+  char down;    //Cursor Down
+  char escape;  //Escape
+  char fn1;     //F1 
+  char fn2;     //F2 
+  char fn3;     //F3 
+  char fn4;     //F4 
+  char fn5;     //F5 
+  char fn6;     //F6 
+  char fn7;     //F7 
+  char fn8;     //F8 
+  char fn9;     //F9 
+  char fn10;    //F10
+  char fn11;    //F11
+  char fn12;    //F12
+  char help;    //Help 
+  char home;    //Home 
+  char insert;  //Insert 
+  char left;    //Cursor Left
+  char lnfd;    //Line Feed 
+  char right;   //Cursor Right
+  char return;  //Return
+  char shfrtn;  //Shift-Return
+  char run;     //Run 
+  char rvsoff;  //Reverse Off
+  char rvson;   //Reverse On
+  char shfspc;  //Shifted Space
+  char tab;     //Tab
+  char shftab;  //Shift-Tab 
+  char up;      //Cursor Up
+};
+
+/* Actual Key Definitions */
+const struct keydef keys;
+
+/* Structure for Key Names */
+struct kname {char delete[9], escape[2], return[5];};
+const struct kname knames;
diff --git a/include/vic/keydef.a02 b/include/vic/keydef.a02
index c1f8674..c79fc4a 100644
--- a/include/vic/keydef.a02
+++ b/include/vic/keydef.a02
@@ -2,38 +2,41 @@
 ;for Commmodore 64 Computer
 
 KEYS:   ;Key Definitions (Struct Key Codes)
-;NAME         Chr  Description              VICE xvic
-.BCKSPC  BYTE $00 ;Backspace [N/A]          
-.BREAK   BYTE $03 ;Break (RUN/STOP)         Escape or Caps Lock
-.CLEAR   BYTE $93 ;Clear (Shift-CLR/HOME)   Shift-Home
-.COPY    BYTE $00 ;Copy [N/A]
-.DELETE  BYTE $14 ;Delete                   Backspace
-.DOWN    BYTE $11 ;Cursor Down              Cursor Down
-.ESCAPE  BYTE $00 ;Escape [N/A]             
-.FN1     BYTE $85 ;F1 (F1/F2)               F1
-.FN2     BYTE $89 ;F2 (Shift-F1/F2)         F2 or Shift-F1
-.FN3     BYTE $86 ;F3 (F3/F4)               F3
-.FN4     BYTE $8A ;F4 (Shift-F3/F4)         F4 or Shift-F3
-.FN5     BYTE $87 ;F5 (F5/F6)               F5
-.FN6     BYTE $8B ;F6 (Shift-F5/F6)         F6 or Shift-F5
-.FN7     BYTE $88 ;F7 (F7/F8)               F7
-.FN8     BYTE $8C ;F8 (Shift-F7/F8)         F8 or Shift-F7
-.FN9     BYTE $00 ;F9  [N/A]                
-.FN10    BYTE $00 ;F10 [N/A]                
-.FN11    BYTE $00 ;F11 [N/A]                
-.FN12    BYTE $00 ;F12 [N/A]                
-.HELP    BYTE $84 ;Help [N/A]               
-.HOME    BYTE $13 ;Home (CLR/HOME)          Home
-.INSERT  BYTE $94 ;Insert (Shift-INS/DEL)   Shift-Backspace
-.LEFT    BYTE $9D ;Cursor Left              Cursor Left
-.LNFD    BYTE $00 ;Line Feed [N/A]          
-.RIGHT   BYTE $1D ;Cursor Right             Cursor Right
-.RETURN  BYTE $0D ;Return                   Enter
-.SHFRTN  BYTE $8D ;Shift-Return             Shift-Enter
-.RUN     BYTE $83 ;Run (Shift-RUN/STOP)     Shift-Escape
-.RVSOFF  BYTE $92 ;Reverse Off              Tab-0
-.RVSON   BYTE $12 ;Reverse On               Tab-9
-.SHFSPC  BYTE $A0 ;Shifted Space            Shift-Space
-.TAB     BYTE $00 ;Tab                      
-.SHFTAB  BYTE $00 ;Shift-Tab [N/A]          
-.UP      BYTE $91 ;Cursor Up                Cursor Up
+            ;Chr  Name    Description              VICE xvic
+        BYTE $00 ;BCKSPC  Backspace [N/A]          
+        BYTE $03 ;BREAK   Break (RUN/STOP)         Escape or Caps Lock
+        BYTE $93 ;CLEAR   Clear (Shift-CLR/HOME)   Shift-Home
+        BYTE $00 ;COPY    Copy [N/A]
+        BYTE $14 ;DELETE  Delete                   Backspace
+        BYTE $11 ;DOWN    Cursor Down              Cursor Down
+        BYTE $00 ;ESCAPE  Escape [N/A]             
+        BYTE $85 ;FN1     F1 (F1/F2)               F1
+        BYTE $89 ;FN2     F2 (Shift-F1/F2)         F2 or Shift-F1
+        BYTE $86 ;FN3     F3 (F3/F4)               F3
+        BYTE $8A ;FN4     F4 (Shift-F3/F4)         F4 or Shift-F3
+        BYTE $87 ;FN5     F5 (F5/F6)               F5
+        BYTE $8B ;FN6     F6 (Shift-F5/F6)         F6 or Shift-F5
+        BYTE $88 ;FN7     F7 (F7/F8)               F7
+        BYTE $8C ;FN8     F8 (Shift-F7/F8)         F8 or Shift-F7
+        BYTE $00 ;FN9     F9  [N/A]                
+        BYTE $00 ;FN10    F10 [N/A]                
+        BYTE $00 ;FN11    F11 [N/A]                
+        BYTE $00 ;FN12    F12 [N/A]                
+        BYTE $84 ;HELP    Help [N/A]               
+        BYTE $13 ;HOME    Home (CLR/HOME)          Home
+        BYTE $94 ;INSERT  Insert (Shift-INS/DEL)   Shift-Backspace
+        BYTE $9D ;LEFT    Cursor Left              Cursor Left
+        BYTE $00 ;LNFD    Line Feed [N/A]          
+        BYTE $1D ;RIGHT   Cursor Right             Cursor Right
+        BYTE $0D ;RETURN  Return                   Enter
+        BYTE $8D ;SHFRTN  Shift-Return             Shift-Enter
+        BYTE $83 ;RUN     Run (Shift-RUN/STOP)     Shift-Escape
+        BYTE $92 ;RVSOFF  Reverse Off              Tab-0
+        BYTE $12 ;RVSON   Reverse On               Tab-9
+        BYTE $A0 ;SHFSPC  Shifted Space            Shift-Space
+        BYTE $00 ;TAB     Tab                      
+        BYTE $00 ;SHFTAB  Shift-Tab [N/A]          
+        BYTE $91 ;UP      Cursor Up                Cursor Up
+
+;System Key Names
+KNAMES  BYTE "DEL",0,"STOP",0,"RETURN",0
diff --git a/include/vic/keydef.h02 b/include/vic/keydef.h02
index 443fe0c..f52dd57 100644
--- a/include/vic/keydef.h02
+++ b/include/vic/keydef.h02
@@ -41,3 +41,7 @@ struct keydef {
 
 /* Actual Key Definitions */
 const struct keydef keys;
+
+/* Structure for Key Names */
+struct kname {char delete[3], escape[4], return[6];};
+const struct kname knames;
diff --git a/test/siotest.c02 b/test/siotest.c02
index aec8756..4b28da6 100644
--- a/test/siotest.c02
+++ b/test/siotest.c02
@@ -1,10 +1,11 @@
-/**********************************************
- * TESTIO - Test Library stdio.h for py65mon *
- **********************************************/
+/**************************************
+ * SIOTEST - Test/Demo module stdio.h *
+ **************************************/
  
 //Specify System Header using -H option
 #include <stddef.h02>
 #include <stdio.h02>
+#include <keydef.h02>
 
 char key;      //Key read from keyboard
 char len;      //Length of input output string
@@ -16,8 +17,9 @@ main:
   key = getc();       //Wait for key press
   newlin();           //Advance cursor to next line
 
-  putln("TYPE LINES, END WITH RETURN");
-  putln("PRESS ESCAPE KEY TO END");
+  puts("TYPE LINES, END WITH "); putln(knames.return);
+  puts("PRESS "); puts(knames.delete); puts(" TO DELETE, ");
+  puts(knames.escape); putln(" TO END");
 
   while () {
     putc('>');