diff --git a/twander.py b/twander.py
index 1201b1f..01a9924 100755
--- a/twander.py
+++ b/twander.py
@@ -6,7 +6,7 @@
 # Program Information
 
 PROGNAME = "twander"
-RCSID    = "$Id: twander.py,v 3.124 2003/03/04 00:13:31 tundra Exp $"
+RCSID    = "$Id: twander.py,v 3.125 2003/03/04 00:31:54 tundra Exp $"
 VERSION  = RCSID.split()[2]
 
 # Copyright Information
@@ -175,16 +175,16 @@
 
 # Sorting Keys
 
-SORTBY0     = '<Shift-F10>'               # Select sorting paramters
-SORTBY1     = '<Shift-F1>'
-SORTBY2     = '<Shift-F2>'
-SORTBY3     = '<Shift-F3>'
-SORTBY4     = '<Shift-F4>'
-SORTBY5     = '<Shift-F5>'
-SORTBY6     = '<Shift-F6>'
-SORTBY7     = '<Shift-F7>'
-SORTREV     = '<Shift-F11>'
-SORTSEP     = '<Shift-F12>'
+SORTBYNONE   = '<Shift-F10>'             # Select sorting paramters
+SORTBYPERMS  = '<Shift-F1>'
+SORTBYLINKS  = '<Shift-F2>'
+SORTBYOWNER  = '<Shift-F3>'
+SORTBYGROUP  = '<Shift-F4>'
+SORTBYLENGTH = '<Shift-F5>'
+SORTBYTIME   = '<Shift-F6>'
+SORTBYNAME   = '<Shift-F7>'
+SORTREV      = '<Shift-F11>'
+SORTSEP      = '<Shift-F12>'
 
 #####
 # GUI Defaults
@@ -976,14 +976,14 @@
                       "MEMSET10":MEMSET10,
                       "MEMSET11":MEMSET11,
                       "MEMSET12":MEMSET12,
-                      "SORTBY0":SORTBY0,
-                      "SORTBY1":SORTBY1,
-                      "SORTBY2":SORTBY2,
-                      "SORTBY3":SORTBY3,
-                      "SORTBY4":SORTBY4,
-                      "SORTBY5":SORTBY5,
-                      "SORTBY6":SORTBY6,
-                      "SORTBY7":SORTBY7,
+                      "SORTBYNONE":SORTBYNONE,
+                      "SORTBYPERMS":SORTBYPERMS,
+                      "SORTBYLINKS":SORTBYLINKS,
+                      "SORTBYOWNER":SORTBYOWNER,
+                      "SORTBYGROUP":SORTBYGROUP,
+                      "SORTBYLENGTH":SORTBYLENGTH,
+                      "SORTBYTIME":SORTBYTIME,
+                      "SORTBYNAME":SORTBYNAME,
                       "SORTREV":SORTREV,
                       "SORTSEP":SORTSEP,
                       }
@@ -1887,14 +1887,14 @@
         # Sort Selection Keys - All Bound To A Common Handler
         ###
 
-        self.DirList.bind(self.KeyBindings["SORTBY0"], lambda event : KeySetSortParm(parm=fNONE))
-        self.DirList.bind(self.KeyBindings["SORTBY1"], lambda event : KeySetSortParm(parm=fPERMISSIONS))
-        self.DirList.bind(self.KeyBindings["SORTBY2"], lambda event : KeySetSortParm(parm=fLINKS))
-        self.DirList.bind(self.KeyBindings["SORTBY3"], lambda event : KeySetSortParm(parm=fOWNER))
-        self.DirList.bind(self.KeyBindings["SORTBY4"], lambda event : KeySetSortParm(parm=fGROUP))
-        self.DirList.bind(self.KeyBindings["SORTBY5"], lambda event : KeySetSortParm(parm=fLENGTH))
-        self.DirList.bind(self.KeyBindings["SORTBY6"], lambda event : KeySetSortParm(parm=fDATE))
-        self.DirList.bind(self.KeyBindings["SORTBY7"], lambda event : KeySetSortParm(parm=fNAME))
+        self.DirList.bind(self.KeyBindings["SORTBYNONE"], lambda event : KeySetSortParm(parm=fNONE))
+        self.DirList.bind(self.KeyBindings["SORTBYPERMS"], lambda event : KeySetSortParm(parm=fPERMISSIONS))
+        self.DirList.bind(self.KeyBindings["SORTBYLINKS"], lambda event : KeySetSortParm(parm=fLINKS))
+        self.DirList.bind(self.KeyBindings["SORTBYOWNER"], lambda event : KeySetSortParm(parm=fOWNER))
+        self.DirList.bind(self.KeyBindings["SORTBYGROUP"], lambda event : KeySetSortParm(parm=fGROUP))
+        self.DirList.bind(self.KeyBindings["SORTBYLENGTH"], lambda event : KeySetSortParm(parm=fLENGTH))
+        self.DirList.bind(self.KeyBindings["SORTBYTIME"], lambda event : KeySetSortParm(parm=fDATE))
+        self.DirList.bind(self.KeyBindings["SORTBYNAME"], lambda event : KeySetSortParm(parm=fNAME))
         self.DirList.bind(self.KeyBindings["SORTREV"], lambda event : KeySetSortParm(parm=fREVERSE))
         self.DirList.bind(self.KeyBindings["SORTSEP"], lambda event : KeySetSortParm(parm=fSEPARATE))