diff --git a/eek/eek-keysym.c b/eek/eek-keysym.c
index 510ffe73..c093b73c 100644
--- a/eek/eek-keysym.c
+++ b/eek/eek-keysym.c
@@ -59,7 +59,7 @@ find_keysym (guint              keysym,
              const gchar      **label,
              EekKeysymCategory *category)
 {
-    EekKeysymCategory bsearch_key, *bsearch_val;
+    struct eek_keysym_label bsearch_key, *bsearch_val;
 
     /* First, search special keysyms. */
     bsearch_key.keysym = keysym;
diff --git a/eek/special-keysym-labels.txt b/eek/special-keysym-labels.txt
index af61bb04..7947de4a 100644
--- a/eek/special-keysym-labels.txt
+++ b/eek/special-keysym-labels.txt
@@ -1,31 +1,31 @@
-0x20 "" EEK_KEYSYM_LETTER
-0x8A3 "horiz\nconn" EEK_KEYSYM_LETTER
-0xFE50 "ˋ" EEK_KEYSYM_LETTER
-0xFE51 "ˊ" EEK_KEYSYM_LETTER
-0xFE52 "ˆ" EEK_KEYSYM_LETTER
-0xFE53 "~" EEK_KEYSYM_LETTER
-0xFE54 "ˉ" EEK_KEYSYM_LETTER
-0xFE55 "˘" EEK_KEYSYM_LETTER
-0xFE56 "˙" EEK_KEYSYM_LETTER
-0xFE57 "¨" EEK_KEYSYM_LETTER
-0xFE58 "˚" EEK_KEYSYM_LETTER
-0xFE59 "˝" EEK_KEYSYM_LETTER
-0xFE5A "ˇ" EEK_KEYSYM_LETTER
-0xFE5B "¸" EEK_KEYSYM_LETTER
-0xFE5C "˛" EEK_KEYSYM_LETTER
-0xFF14 "Scroll\nLock" EEK_KEYSYM_FUNCTION
-0xFF20 "Compose" EEK_KEYSYM_FUNCTION
-0xFF55 "Page\nUp" EEK_KEYSYM_FUNCTION
-0xFF56 "Page\nDown" EEK_KEYSYM_FUNCTION
-0xFF7E "AltGr" EEK_KEYSYM_MODIFIER
-0xFF7F "Num\nLock" EEK_KEYSYM_MODIFIER
-0xFF8D "Enter" EEK_KEYSYM_FUNCTION
-0xFF95 "Home" EEK_KEYSYM_FUNCTION
-0xFF96 "Left" EEK_KEYSYM_FUNCTION
-0xFF97 "Up" EEK_KEYSYM_FUNCTION
-0xFF98 "Right" EEK_KEYSYM_FUNCTION
-0xFF99 "Down" EEK_KEYSYM_FUNCTION
-0xFF9C "End" EEK_KEYSYM_FUNCTION
-0xFF9D "Begin" EEK_KEYSYM_FUNCTION
-0xFF9E "Ins" EEK_KEYSYM_FUNCTION
-0xFF9F "Del" EEK_KEYSYM_FUNCTION
+0x20 "" EEK_KEYSYM_CATEGORY_LETTER
+0x8A3 "horiz\nconn" EEK_KEYSYM_CATEGORY_LETTER
+0xFE50 "ˋ" EEK_KEYSYM_CATEGORY_LETTER
+0xFE51 "ˊ" EEK_KEYSYM_CATEGORY_LETTER
+0xFE52 "ˆ" EEK_KEYSYM_CATEGORY_LETTER
+0xFE53 "~" EEK_KEYSYM_CATEGORY_LETTER
+0xFE54 "ˉ" EEK_KEYSYM_CATEGORY_LETTER
+0xFE55 "˘" EEK_KEYSYM_CATEGORY_LETTER
+0xFE56 "˙" EEK_KEYSYM_CATEGORY_LETTER
+0xFE57 "¨" EEK_KEYSYM_CATEGORY_LETTER
+0xFE58 "˚" EEK_KEYSYM_CATEGORY_LETTER
+0xFE59 "˝" EEK_KEYSYM_CATEGORY_LETTER
+0xFE5A "ˇ" EEK_KEYSYM_CATEGORY_LETTER
+0xFE5B "¸" EEK_KEYSYM_CATEGORY_LETTER
+0xFE5C "˛" EEK_KEYSYM_CATEGORY_LETTER
+0xFF14 "Scroll\nLock" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF20 "Compose" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF55 "Page\nUp" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF56 "Page\nDown" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF7E "AltGr" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF7F "Num\nLock" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF8D "Enter" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF95 "Home" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF96 "Left" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF97 "Up" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF98 "Right" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF99 "Down" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF9C "End" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF9D "Begin" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF9E "Ins" EEK_KEYSYM_CATEGORY_FUNCTION
+0xFF9F "Del" EEK_KEYSYM_CATEGORY_FUNCTION