diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/CommandShortcutKey.cs b/CSharp/Libraries/UniversalEditor.UserInterface/CommandShortcutKey.cs
index 5dc64fca..b8b86ad6 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/CommandShortcutKey.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/CommandShortcutKey.cs
@@ -18,7 +18,81 @@ namespace UniversalEditor.UserInterface
 	public enum CommandShortcutKeyValue
 	{
 		None = 0,
-		TopRow0,
+
+		//
+		// Summary:
+		//     The SPACEBAR key.
+		Space = 32,
+		//
+		// Summary:
+		//     The PAGE UP key.
+		Prior = 33,
+		//
+		// Summary:
+		//     The PAGE UP key.
+		PageUp = 33,
+		//
+		// Summary:
+		//     The PAGE DOWN key.
+		Next = 34,
+		//
+		// Summary:
+		//     The PAGE DOWN key.
+		PageDown = 34,
+		//
+		// Summary:
+		//     The END key.
+		End = 35,
+		//
+		// Summary:
+		//     The HOME key.
+		Home = 36,
+		//
+		// Summary:
+		//     The LEFT ARROW key.
+		Left = 37,
+		//
+		// Summary:
+		//     The UP ARROW key.
+		Up = 38,
+		//
+		// Summary:
+		//     The RIGHT ARROW key.
+		Right = 39,
+		//
+		// Summary:
+		//     The DOWN ARROW key.
+		Down = 40,
+		//
+		// Summary:
+		//     The SELECT key.
+		Select = 41,
+		//
+		// Summary:
+		//     The PRINT key.
+		Print = 42,
+		//
+		// Summary:
+		//     The EXECUTE key.
+		Execute = 43,
+		//
+		// Summary:
+		//     The PRINT SCREEN key.
+		PrintScreen = 44,
+		//
+		// Summary:
+		//     The INS key.
+		Insert = 45,
+		//
+		// Summary:
+		//     The DEL key.
+		Delete = 46,
+		//
+		// Summary:
+		//     The HELP key.
+		Help = 47,
+
+		TopRow0 = 48,
 		TopRow1,
 		TopRow2,
 		TopRow3,
@@ -28,7 +102,8 @@ namespace UniversalEditor.UserInterface
 		TopRow7,
 		TopRow8,
 		TopRow9,
-		A,
+
+		A = 65,
 		B,
 		C,
 		D,
@@ -54,7 +129,8 @@ namespace UniversalEditor.UserInterface
 		X,
 		Y,
 		Z,
-		NumPad0,
+
+		NumPad0 = 96,
 		NumPad1,
 		NumPad2,
 		NumPad3,
@@ -63,7 +139,20 @@ namespace UniversalEditor.UserInterface
 		NumPad6,
 		NumPad7,
 		NumPad8,
-		NumPad9
+		NumPad9,
+
+		F1 = 112,
+		F2,
+		F3,
+		F4,
+		F5,
+		F6,
+		F7,
+		F8,
+		F9,
+		F10,
+		F11,
+		F12
 	}
 	public class CommandShortcutKey
 	{
@@ -73,6 +162,10 @@ namespace UniversalEditor.UserInterface
 		private CommandShortcutKeyValue mvarValue = CommandShortcutKeyValue.None;
 		public CommandShortcutKeyValue Value { get { return mvarValue; } set { mvarValue = value; } }
 
+		public CommandShortcutKey()
+			: this(CommandShortcutKeyValue.None, CommandShortcutKeyModifiers.None)
+		{
+		}
 		public CommandShortcutKey(CommandShortcutKeyValue value, CommandShortcutKeyModifiers modifiers = CommandShortcutKeyModifiers.None)
 		{
 			mvarValue = value;