--- a/cbrpager-maemo/branches/MAEMO_0_9_20/src/interface.c
+++ b/cbrpager-maemo/branches/MAEMO_0_9_20/src/interface.c
@@ -67,14 +67,10 @@
   GtkWidget *conf_1page_rbtn;
   GSList *conf_1page_rbtn_group = NULL;
   GtkWidget *conf_2page_rbtn;
-  GtkWidget *label24;
   GtkWidget *label25;
   GtkWidget *manga_mode;
-  GtkWidget *auto_rotate;
+  GtkWidget *label39;
   GtkWidget *scrollbars_fullscreen;
-  GtkWidget *label29;
-  GtkWidget *rotate_ccw;
-  GtkWidget *label31;
   GtkWidget *hseparator3;
   GtkWidget *table1;
   GtkWidget *label2;
@@ -121,6 +117,12 @@
   GtkWidget *conf_goto_rbtn;
   GtkWidget *conf_goto_entry;
   GtkWidget *hseparator2;
+  GtkWidget *vbox9;
+  GtkWidget *rotate_ccw;
+  GtkWidget *auto_rotate;
+  GtkWidget *label40;
+  GtkWidget *label41;
+  GtkWidget *sort_order;
   GtkWidget *label4;
   GtkWidget *label19;
   GtkWidget *frame5;
@@ -156,14 +158,14 @@
   gtk_widget_show (vbox4);
   gtk_container_add (GTK_CONTAINER (frame3), vbox4);
 
-  table4 = gtk_table_new (5, 2, FALSE);
+  table4 = gtk_table_new (3, 2, FALSE);
   gtk_widget_show (table4);
   gtk_box_pack_start (GTK_BOX (vbox4), table4, FALSE, TRUE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (table4), 4);
   gtk_table_set_row_spacings (GTK_TABLE (table4), 2);
   gtk_table_set_col_spacings (GTK_TABLE (table4), 8);
 
-  label14 = gtk_label_new (_("Size:"));
+  label14 = gtk_label_new (_("Page mode:"));
   gtk_widget_show (label14);
   gtk_table_attach (GTK_TABLE (table4), label14, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
@@ -187,14 +189,7 @@
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (conf_2page_rbtn), conf_1page_rbtn_group);
   conf_1page_rbtn_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (conf_2page_rbtn));
 
-  label24 = gtk_label_new (_("Misc:"));
-  gtk_widget_show (label24);
-  gtk_table_attach (GTK_TABLE (table4), label24, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label24), 0, 0.5);
-
-  label25 = gtk_label_new ("");
+  label25 = gtk_label_new (_("Scrollbars:"));
   gtk_widget_show (label25);
   gtk_table_attach (GTK_TABLE (table4), label25, 0, 1, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
@@ -207,37 +202,18 @@
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
-  auto_rotate = gtk_check_button_new_with_mnemonic (_("Auto rotate"));
-  gtk_widget_show (auto_rotate);
-  gtk_table_attach (GTK_TABLE (table4), auto_rotate, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
+  label39 = gtk_label_new ("");
+  gtk_widget_show (label39);
+  gtk_table_attach (GTK_TABLE (table4), label39, 0, 1, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label39), 0, 0.5);
 
   scrollbars_fullscreen = gtk_check_button_new_with_mnemonic (_("Show scrollbars when fullscreen"));
   gtk_widget_show (scrollbars_fullscreen);
-  gtk_table_attach (GTK_TABLE (table4), scrollbars_fullscreen, 1, 2, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label29 = gtk_label_new ("");
-  gtk_widget_show (label29);
-  gtk_table_attach (GTK_TABLE (table4), label29, 0, 1, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label29), 0, 0.5);
-
-  rotate_ccw = gtk_check_button_new_with_mnemonic (_("Rotate counter-clockwise"));
-  gtk_widget_show (rotate_ccw);
-  gtk_table_attach (GTK_TABLE (table4), rotate_ccw, 1, 2, 4, 5,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label31 = gtk_label_new ("");
-  gtk_widget_show (label31);
-  gtk_table_attach (GTK_TABLE (table4), label31, 0, 1, 4, 5,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label31), 0, 0.5);
+  gtk_table_attach (GTK_TABLE (table4), scrollbars_fullscreen, 1, 2, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
 
   hseparator3 = gtk_hseparator_new ();
   gtk_widget_show (hseparator3);
@@ -421,7 +397,7 @@
   gtk_container_add (GTK_CONTAINER (notebook1), frame2);
   gtk_container_set_border_width (GTK_CONTAINER (frame2), 4);
 
-  table2 = gtk_table_new (3, 2, FALSE);
+  table2 = gtk_table_new (5, 2, FALSE);
   gtk_widget_show (table2);
   gtk_container_add (GTK_CONTAINER (frame2), table2);
   gtk_container_set_border_width (GTK_CONTAINER (table2), 4);
@@ -435,7 +411,7 @@
                     (GtkAttachOptions) (0), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
 
-  label8 = gtk_label_new (_("Directory:"));
+  label8 = gtk_label_new (_("Startup \ndirectory:"));
   gtk_widget_show (label8);
   gtk_table_attach (GTK_TABLE (table2), label8, 0, 1, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
@@ -501,12 +477,50 @@
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
+  vbox9 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox9);
+  gtk_table_attach (GTK_TABLE (table2), vbox9, 1, 2, 3, 4,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0);
+
+  rotate_ccw = gtk_check_button_new_with_mnemonic (_("Rotate counter-clockwise"));
+  gtk_widget_show (rotate_ccw);
+  gtk_box_pack_start (GTK_BOX (vbox9), rotate_ccw, FALSE, FALSE, 0);
+
+  auto_rotate = gtk_check_button_new_with_mnemonic (_("Auto rotate"));
+  gtk_widget_show (auto_rotate);
+  gtk_box_pack_start (GTK_BOX (vbox9), auto_rotate, FALSE, FALSE, 0);
+
+  label40 = gtk_label_new (_("Rotation:"));
+  gtk_widget_show (label40);
+  gtk_table_attach (GTK_TABLE (table2), label40, 0, 1, 3, 4,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label40), 0, 0);
+  gtk_label_set_width_chars (GTK_LABEL (label40), 0);
+
+  label41 = gtk_label_new (_("Sorting:"));
+  gtk_widget_show (label41);
+  gtk_table_attach (GTK_TABLE (table2), label41, 0, 1, 4, 5,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label41), 0, 0.5);
+
+  sort_order = gtk_combo_box_new_text ();
+  gtk_widget_show (sort_order);
+  gtk_table_attach (GTK_TABLE (table2), sort_order, 1, 2, 4, 5,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+  gtk_combo_box_append_text (GTK_COMBO_BOX (sort_order), _("ASCII"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (sort_order), _("Case-insensitive"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (sort_order), _("Natural"));
+
   label4 = gtk_label_new ("");
   gtk_widget_show (label4);
   gtk_frame_set_label_widget (GTK_FRAME (frame2), label4);
   gtk_label_set_use_markup (GTK_LABEL (label4), TRUE);
 
-  label19 = gtk_label_new (_("Program startup"));
+  label19 = gtk_label_new (_("Behavior"));
   gtk_widget_show (label19);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label19);
 
@@ -588,14 +602,10 @@
   GLADE_HOOKUP_OBJECT (config_window, hbox5, "hbox5");
   GLADE_HOOKUP_OBJECT (config_window, conf_1page_rbtn, "conf_1page_rbtn");
   GLADE_HOOKUP_OBJECT (config_window, conf_2page_rbtn, "conf_2page_rbtn");
-  GLADE_HOOKUP_OBJECT (config_window, label24, "label24");
   GLADE_HOOKUP_OBJECT (config_window, label25, "label25");
   GLADE_HOOKUP_OBJECT (config_window, manga_mode, "manga_mode");
-  GLADE_HOOKUP_OBJECT (config_window, auto_rotate, "auto_rotate");
+  GLADE_HOOKUP_OBJECT (config_window, label39, "label39");
   GLADE_HOOKUP_OBJECT (config_window, scrollbars_fullscreen, "scrollbars_fullscreen");
-  GLADE_HOOKUP_OBJECT (config_window, label29, "label29");
-  GLADE_HOOKUP_OBJECT (config_window, rotate_ccw, "rotate_ccw");
-  GLADE_HOOKUP_OBJECT (config_window, label31, "label31");
   GLADE_HOOKUP_OBJECT (config_window, hseparator3, "hseparator3");
   GLADE_HOOKUP_OBJECT (config_window, table1, "table1");
   GLADE_HOOKUP_OBJECT (config_window, label2, "label2");
@@ -637,6 +647,12 @@
   GLADE_HOOKUP_OBJECT (config_window, conf_goto_rbtn, "conf_goto_rbtn");
   GLADE_HOOKUP_OBJECT (config_window, conf_goto_entry, "conf_goto_entry");
   GLADE_HOOKUP_OBJECT (config_window, hseparator2, "hseparator2");
+  GLADE_HOOKUP_OBJECT (config_window, vbox9, "vbox9");
+  GLADE_HOOKUP_OBJECT (config_window, rotate_ccw, "rotate_ccw");
+  GLADE_HOOKUP_OBJECT (config_window, auto_rotate, "auto_rotate");
+  GLADE_HOOKUP_OBJECT (config_window, label40, "label40");
+  GLADE_HOOKUP_OBJECT (config_window, label41, "label41");
+  GLADE_HOOKUP_OBJECT (config_window, sort_order, "sort_order");
   GLADE_HOOKUP_OBJECT (config_window, label4, "label4");
   GLADE_HOOKUP_OBJECT (config_window, label19, "label19");
   GLADE_HOOKUP_OBJECT (config_window, frame5, "frame5");
@@ -668,14 +684,10 @@
   GtkWidget *conf_1page_rbtn;
   GSList *conf_1page_rbtn_group = NULL;
   GtkWidget *conf_2page_rbtn;
-  GtkWidget *label26;
-  GtkWidget *label27;
   GtkWidget *manga_mode;
-  GtkWidget *auto_rotate;
+  GtkWidget *label37;
   GtkWidget *scrollbars_fullscreen;
-  GtkWidget *label30;
-  GtkWidget *rotate_ccw;
-  GtkWidget *label32;
+  GtkWidget *label38;
   GtkWidget *hseparator3;
   GtkWidget *table1;
   GtkWidget *label2;
@@ -706,6 +718,12 @@
   GtkWidget *conf_goto_rbtn;
   GtkWidget *conf_goto_entry;
   GtkWidget *hseparator2;
+  GtkWidget *label35;
+  GtkWidget *label36;
+  GtkWidget *sort_order;
+  GtkWidget *vbox8;
+  GtkWidget *rotate_ccw;
+  GtkWidget *auto_rotate;
   GtkWidget *label4;
   GtkWidget *label19;
   GtkWidget *frame5;
@@ -748,18 +766,19 @@
   gtk_widget_show (vbox4);
   gtk_container_add (GTK_CONTAINER (frame3), vbox4);
 
-  table4 = gtk_table_new (5, 2, FALSE);
+  table4 = gtk_table_new (3, 2, FALSE);
   gtk_widget_show (table4);
   gtk_box_pack_start (GTK_BOX (vbox4), table4, FALSE, TRUE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (table4), 4);
   gtk_table_set_row_spacings (GTK_TABLE (table4), 2);
   gtk_table_set_col_spacings (GTK_TABLE (table4), 8);
 
-  label14 = gtk_label_new (_("Size:"));
+  label14 = gtk_label_new (_("Page mode:"));
   gtk_widget_show (label14);
   gtk_table_attach (GTK_TABLE (table4), label14, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label14), 0, 0.5);
 
   hbox5 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox5);
@@ -779,57 +798,31 @@
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (conf_2page_rbtn), conf_1page_rbtn_group);
   conf_1page_rbtn_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (conf_2page_rbtn));
 
-  label26 = gtk_label_new (_("Misc:"));
-  gtk_widget_show (label26);
-  gtk_table_attach (GTK_TABLE (table4), label26, 0, 1, 1, 2,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label26), 0, 0.5);
-
-  label27 = gtk_label_new ("");
-  gtk_widget_show (label27);
-  gtk_table_attach (GTK_TABLE (table4), label27, 0, 1, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label27), 0, 0.5);
-
   manga_mode = gtk_check_button_new_with_mnemonic (_("Manga mode"));
   gtk_widget_show (manga_mode);
   gtk_table_attach (GTK_TABLE (table4), manga_mode, 1, 2, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
 
-  auto_rotate = gtk_check_button_new_with_mnemonic (_("Auto rotate"));
-  gtk_widget_show (auto_rotate);
-  gtk_table_attach (GTK_TABLE (table4), auto_rotate, 1, 2, 2, 3,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
+  label37 = gtk_label_new ("");
+  gtk_widget_show (label37);
+  gtk_table_attach (GTK_TABLE (table4), label37, 0, 1, 1, 2,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label37), 0, 0.5);
 
   scrollbars_fullscreen = gtk_check_button_new_with_mnemonic (_("Show scrollbars when fullscreen"));
   gtk_widget_show (scrollbars_fullscreen);
-  gtk_table_attach (GTK_TABLE (table4), scrollbars_fullscreen, 1, 2, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label30 = gtk_label_new ("");
-  gtk_widget_show (label30);
-  gtk_table_attach (GTK_TABLE (table4), label30, 0, 1, 3, 4,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label30), 0, 0.5);
-
-  rotate_ccw = gtk_check_button_new_with_mnemonic (_("Rotate counter-clockwise"));
-  gtk_widget_show (rotate_ccw);
-  gtk_table_attach (GTK_TABLE (table4), rotate_ccw, 1, 2, 4, 5,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-
-  label32 = gtk_label_new ("");
-  gtk_widget_show (label32);
-  gtk_table_attach (GTK_TABLE (table4), label32, 0, 1, 4, 5,
-                    (GtkAttachOptions) (GTK_FILL),
-                    (GtkAttachOptions) (0), 0, 0);
-  gtk_misc_set_alignment (GTK_MISC (label32), 0, 0.5);
+  gtk_table_attach (GTK_TABLE (table4), scrollbars_fullscreen, 1, 2, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+
+  label38 = gtk_label_new (_("Scrollbars:"));
+  gtk_widget_show (label38);
+  gtk_table_attach (GTK_TABLE (table4), label38, 0, 1, 2, 3,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label38), 0, 0.5);
 
   hseparator3 = gtk_hseparator_new ();
   gtk_widget_show (hseparator3);
@@ -915,9 +908,9 @@
   frame2 = gtk_frame_new (NULL);
   gtk_widget_show (frame2);
   gtk_container_add (GTK_CONTAINER (notebook1), frame2);
-  gtk_container_set_border_width (GTK_CONTAINER (frame2), 4);
-
-  table2 = gtk_table_new (3, 2, FALSE);
+  gtk_container_set_border_width (GTK_CONTAINER (frame2), 5);
+
+  table2 = gtk_table_new (5, 2, FALSE);
   gtk_widget_show (table2);
   gtk_container_add (GTK_CONTAINER (frame2), table2);
   gtk_container_set_border_width (GTK_CONTAINER (table2), 4);
@@ -931,7 +924,7 @@
                     (GtkAttachOptions) (0), 0, 0);
   gtk_misc_set_alignment (GTK_MISC (label5), 0, 0.5);
 
-  label8 = gtk_label_new (_("Directory:"));
+  label8 = gtk_label_new (_("Startup\ndirectory:"));
   gtk_widget_show (label8);
   gtk_table_attach (GTK_TABLE (table2), label8, 0, 1, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
@@ -997,12 +990,49 @@
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (GTK_FILL), 0, 0);
 
+  label35 = gtk_label_new (_("Rotation:"));
+  gtk_widget_show (label35);
+  gtk_table_attach (GTK_TABLE (table2), label35, 0, 1, 3, 4,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label35), 0, 0);
+
+  label36 = gtk_label_new (_("Sorting:"));
+  gtk_widget_show (label36);
+  gtk_table_attach (GTK_TABLE (table2), label36, 0, 1, 4, 5,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+  gtk_misc_set_alignment (GTK_MISC (label36), 0, 0.5);
+
+  sort_order = gtk_combo_box_new_text ();
+  gtk_widget_show (sort_order);
+  gtk_table_attach (GTK_TABLE (table2), sort_order, 1, 2, 4, 5,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+  gtk_combo_box_append_text (GTK_COMBO_BOX (sort_order), _("ASCII"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (sort_order), _("Case-insensitive"));
+  gtk_combo_box_append_text (GTK_COMBO_BOX (sort_order), _("Natural"));
+
+  vbox8 = gtk_vbox_new (FALSE, 0);
+  gtk_widget_show (vbox8);
+  gtk_table_attach (GTK_TABLE (table2), vbox8, 1, 2, 3, 4,
+                    (GtkAttachOptions) (GTK_FILL),
+                    (GtkAttachOptions) (GTK_FILL), 0, 0);
+
+  rotate_ccw = gtk_check_button_new_with_mnemonic (_("Rotate counter-clockwise"));
+  gtk_widget_show (rotate_ccw);
+  gtk_box_pack_start (GTK_BOX (vbox8), rotate_ccw, FALSE, FALSE, 0);
+
+  auto_rotate = gtk_check_button_new_with_mnemonic (_("Auto rotate"));
+  gtk_widget_show (auto_rotate);
+  gtk_box_pack_start (GTK_BOX (vbox8), auto_rotate, FALSE, FALSE, 0);
+
   label4 = gtk_label_new ("");
   gtk_widget_show (label4);
   gtk_frame_set_label_widget (GTK_FRAME (frame2), label4);
   gtk_label_set_use_markup (GTK_LABEL (label4), TRUE);
 
-  label19 = gtk_label_new (_("Program startup"));
+  label19 = gtk_label_new (_("Behavior"));
   gtk_widget_show (label19);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label19);
 
@@ -1123,14 +1153,10 @@
   GLADE_HOOKUP_OBJECT (config_window_maemo, hbox5, "hbox5");
   GLADE_HOOKUP_OBJECT (config_window_maemo, conf_1page_rbtn, "conf_1page_rbtn");
   GLADE_HOOKUP_OBJECT (config_window_maemo, conf_2page_rbtn, "conf_2page_rbtn");
-  GLADE_HOOKUP_OBJECT (config_window_maemo, label26, "label26");
-  GLADE_HOOKUP_OBJECT (config_window_maemo, label27, "label27");
   GLADE_HOOKUP_OBJECT (config_window_maemo, manga_mode, "manga_mode");
-  GLADE_HOOKUP_OBJECT (config_window_maemo, auto_rotate, "auto_rotate");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, label37, "label37");
   GLADE_HOOKUP_OBJECT (config_window_maemo, scrollbars_fullscreen, "scrollbars_fullscreen");
-  GLADE_HOOKUP_OBJECT (config_window_maemo, label30, "label30");
-  GLADE_HOOKUP_OBJECT (config_window_maemo, rotate_ccw, "rotate_ccw");
-  GLADE_HOOKUP_OBJECT (config_window_maemo, label32, "label32");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, label38, "label38");
   GLADE_HOOKUP_OBJECT (config_window_maemo, hseparator3, "hseparator3");
   GLADE_HOOKUP_OBJECT (config_window_maemo, table1, "table1");
   GLADE_HOOKUP_OBJECT (config_window_maemo, label2, "label2");
@@ -1158,6 +1184,12 @@
   GLADE_HOOKUP_OBJECT (config_window_maemo, conf_goto_rbtn, "conf_goto_rbtn");
   GLADE_HOOKUP_OBJECT (config_window_maemo, conf_goto_entry, "conf_goto_entry");
   GLADE_HOOKUP_OBJECT (config_window_maemo, hseparator2, "hseparator2");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, label35, "label35");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, label36, "label36");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, sort_order, "sort_order");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, vbox8, "vbox8");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, rotate_ccw, "rotate_ccw");
+  GLADE_HOOKUP_OBJECT (config_window_maemo, auto_rotate, "auto_rotate");
   GLADE_HOOKUP_OBJECT (config_window_maemo, label4, "label4");
   GLADE_HOOKUP_OBJECT (config_window_maemo, label19, "label19");
   GLADE_HOOKUP_OBJECT (config_window_maemo, frame5, "frame5");