diff --git a/better_exposed_filters.theme b/better_exposed_filters.theme
old mode 100644
new mode 100755
index 8b59d99..bc3a1eb
--- a/better_exposed_filters.theme
+++ b/better_exposed_filters.theme
@@ -505,6 +505,9 @@ function theme_select_as_links($vars) {
 
   // Go through each filter option and build the appropriate link or plain text.
   foreach ($element['#options'] as $option => $elem) {
+    if (!empty($element['#hidden_options'][$option])) {
+      continue;
+    }
     // Check for Taxonomy-based filters.
     if (is_object($elem)) {
       $slice = array_slice($elem->option, 0, 1, TRUE);
@@ -532,6 +535,7 @@ function theme_select_as_links($vars) {
     }
 
     foreach ($element_set as $key => $value) {
+      $element_output = '';
       // Custom ID for each link based on the <select>'s original ID.
       $id = drupal_html_id($element['#id'] . '-' . $key);
       $elem = array(
@@ -542,13 +546,27 @@ function theme_select_as_links($vars) {
       );
       if (array_search($key, $selected_options) === FALSE) {
         $elem['#children'] = l($value, bef_replace_query_string_arg($name, $key, $multiple, FALSE, $path));
-        $output .= theme('form_element', array('element' => $elem));
-      }
-      else {
+        //$output .= theme('form_element', array('element' => $elem));
+        $element_output = theme('form_element', array('element' => $elem));
+
+          if ($element['#name'] == 'sort_bef_combine' && !empty($element['#settings']['toggle_links'])) {
+            $sort_pair = explode(' ', $key);
+            if (count($sort_pair) == 2) {
+              // Highlight the link if it is the selected sort_by (can be either
+              // asc or desc, it doesn't matter).
+             if (strpos($selected_options[0], $sort_pair[0]) === 0) {
+                $element_output = str_replace('form-item', 'form-item selected', $element_output);
+              }
+            }
+          }
+        } else {
         $elem['#children'] = l($value, bef_replace_query_string_arg($name, $key, $multiple, TRUE, $path));
         _form_set_class($elem, array('bef-select-as-links-selected'));
-        $output .= str_replace('form-item', 'form-item selected', theme('form_element', array('element' => $elem)));
+        //$output .= str_replace('form-item', 'form-item selected', theme('form_element', array('element' => $elem)));
+        $element_output = str_replace('form-item', 'form-item selected', theme('form_element', array('element' => $elem)));
       }
+      $output .= $element_output;
+      
     }
   }
 
diff --git a/better_exposed_filters_exposed_form_plugin.inc b/better_exposed_filters_exposed_form_plugin.inc
old mode 100644
new mode 100755
index ecdb144..0d7b753
--- a/better_exposed_filters_exposed_form_plugin.inc
+++ b/better_exposed_filters_exposed_form_plugin.inc
@@ -77,6 +77,7 @@ class better_exposed_filters_exposed_form_plugin extends views_plugin_exposed_fo
           'default' => t('Default select list'),
           'bef' => t('Radio Buttons'),
           'bef_links' => t('Links'),
+          'bef_toggle_links' => t('Toggle Links'),
         ),
         '#description' => t('Select a format for the exposed sort options.'),
       );
@@ -622,6 +623,9 @@ Title Desc|Z -> A</pre> Leave the replacement value blank to remove an option al
           '#title' => $form['sort_by']['#title'],
         );
         $options = array();
+        // If using the bef_toggle_links format, determine which links should
+        // not be shown.
+        $hidden_options = array();
 
         // Add reset sort option at the top of the list.
         if ($settings['sort']['advanced']['reset']) {
@@ -632,6 +636,7 @@ Title Desc|Z -> A</pre> Leave the replacement value blank to remove an option al
         }
 
         $selected = '';
+        $used_sort_keys = array();
         foreach ($form['sort_by']['#options'] as $by_key => $by_val) {
           foreach ($form['sort_order']['#options'] as $order_key => $order_val) {
             // Use a space to separate the two keys, we'll unpack them in our
@@ -643,6 +648,17 @@ Title Desc|Z -> A</pre> Leave the replacement value blank to remove an option al
               // will be the first one if there are multiple sort criteria.
               $selected = "$by_key $order_key";
             }
+           if ($settings['sort']['bef_format'] == 'bef_toggle_links') {
+             if (isset($used_sort_keys[$by_key])
+               || (!empty($form_state['input']['sort_bef_combine']) && $form_state['input']['sort_bef_combine'] == "$by_key $order_key")
+               || (empty($form_state['input']['sort_bef_combine']) && $selected == "$by_key $order_key")
+             ) {
+                $hidden_options["$by_key $order_key"] = "$by_val $order_val";
+             }
+             else {
+                $used_sort_keys[$by_key] = $order_key;
+             }
+            }
           }
         }
 
@@ -675,6 +691,10 @@ Title Desc|Z -> A</pre> Leave the replacement value blank to remove an option al
         $form['sort_bef_combine'] = array(
           '#type' => 'radios',
           '#options' => $options,
+          '#hidden_options' => $hidden_options,
+          '#settings' => array(
+            'toggle_links' => ($settings['sort']['bef_format'] == 'bef_toggle_links'),
+           ),
           '#default_value' => $selected,
           // Already sanitized by Views.
           '#title' => $form['sort_by']['#title'],
@@ -688,6 +708,7 @@ Title Desc|Z -> A</pre> Leave the replacement value blank to remove an option al
             break;
 
           case 'bef_links':
+          case 'bef_toggle_links':
             $form['sort_bef_combine']['#theme'] = 'select_as_links';
 
             // Exposed form displayed as blocks can appear on pages other than