Imported Upstream version 3.13.4.2upstream/3.13.4.2

110 files changed, 35423 insertions, 29912 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 845ca06..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pc
diff --git a/Makefile.in b/Makefile.in
index 6891d72..de88b6f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,6 +264,8 @@ VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/NEWS b/NEWS
index 38b0f8a..7b969ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,31 @@
+Overview of changes in simple-scan 3.13.4.2
+
+  * Fix scan menu not working in toolbar
+  * Fix warning about button that was trying to set both a label and an image
+  * Stop warning when no autosave information
+
+Overview of changes in simple-scan 3.13.4.1
+
+  * Don't access a variable after ownership is transferred - was breaking scans
+  * Fix some UI objects not being accessed since GtkTemplate changes
+  * Correct method signature for delete-event
+
+Overview of changes in simple-scan 3.13.4
+
+  * Stop configure if vala not found
+  * Make conditions where traditional menubar is shown more contrained so it
+    shows in elementary
+  * Use GtkTemplate (requires Vala 0.22)
+
+Overview of changes in simple-scan 3.13.3
+
+  * Use GtkHeaderbar on systems that support it
+
+Overview of changes in simple-scan 3.13.1
+
+  * Correct generation of PDF trailer to conform to the PDF standard
+  * Add options to reorder pages
+
 Overview of changes in simple-scan 3.12.0
 
   * Updated translations
diff --git a/README.md b/README.md
index ac771d9..416f0f7 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ sudo apt-get install bzr
 bzr branch lp:simple-scan simple-scan && cd simple-scan
 sudo apt-get build-dep simple-scan
 sudo apt-get install libsqlite3-dev
-sudo apt-get install valac-0.16 vala-0.16
-sudo update-alternatives --config valac # select vala-0.16
+sudo apt-get install valac-0.22 vala-0.22
+sudo update-alternatives --config valac # select vala-0.22
 
 # one of the follwing
 ./autogen.sh                           # system-wide installation
diff --git a/aclocal.m4 b/aclocal.m4
index 205cdaf..540cfe3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -568,14 +568,85 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
+
+# PKG_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable pkgconfigdir as the location where a module
+# should install pkg-config .pc files. By default the directory is
+# $libdir/pkgconfig, but the default can be changed by passing
+# DIRECTORY. The user can override through the --with-pkgconfigdir
+# parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_INSTALLDIR
+
+
+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
+# -------------------------
+# Substitutes the variable noarch_pkgconfigdir as the location where a
+# module should install arch-independent pkg-config .pc files. By
+# default the directory is $datadir/pkgconfig, but the default can be
+# changed by passing DIRECTORY. The user can override through the
+# --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+]) dnl PKG_NOARCH_INSTALLDIR
+
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
 AC_DEFUN([YELP_HELP_INIT],
 [
 AC_REQUIRE([AC_PROG_LN_S])
 m4_pattern_allow([AM_V_at])
 m4_pattern_allow([AM_V_GEN])
 m4_pattern_allow([AM_DEFAULT_VERBOSITY])
+
+YELP_LC_MEDIA_LINKS=true
+YELP_LC_DIST=true
+
+for yelpopt in [$1]; do
+  case $yelpopt in
+    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
+    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
+    lc-dist)           YELP_LC_DIST=true ;;
+    no-lc-dist)        YELP_LC_DIST= ;;
+    *) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;;
+  esac
+done;
+AC_SUBST([YELP_LC_MEDIA_LINKS])
+AC_SUBST([YELP_LC_DIST])
+
 AC_ARG_WITH([help-dir],
-            AC_HELP_STRING([--with-help-dir=DIR],
+            AS_HELP_STRING([--with-help-dir=DIR],
                            [path where help files are installed]),,
             [with_help_dir='${datadir}/help'])
 HELP_DIR="$with_help_dir"
@@ -668,13 +739,13 @@ clean-help:
 
 EXTRA_DIST ?=
 EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)
+EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
 EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
 EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
 
 distdir: distdir-help-files
 distdir-help-files:
-	@for lc in C $(HELP_LINGUAS); do \
+	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
 	  $(MKDIR_P) "$(distdir)/$$lc"; \
 	  for file in $(HELP_FILES); do \
 	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
@@ -732,8 +803,10 @@ install-help:
 	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
 	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
 	    elif test "x$$lc" != "xC"; then \
-	      echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	      $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
+	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
+	        $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	      fi; \
 	    fi; \
 	  done; \
 	done
diff --git a/configure b/configure
index 30c81e2..1838a67 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for simple-scan 3.12.0.
+# Generated by GNU Autoconf 2.69 for simple-scan 3.13.4.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='simple-scan'
 PACKAGE_TARNAME='simple-scan'
-PACKAGE_VERSION='3.12.0'
-PACKAGE_STRING='simple-scan 3.12.0'
+PACKAGE_VERSION='3.13.4.2'
+PACKAGE_STRING='simple-scan 3.13.4.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -723,6 +723,8 @@ YELP_HELP_RULES
 XMLLINT
 ITSTOOL
 HELP_DIR
+YELP_LC_DIST
+YELP_LC_MEDIA_LINKS
 LN_S
 EGREP
 GREP
@@ -1396,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures simple-scan 3.12.0 to adapt to many kinds of systems.
+\`configure' configures simple-scan 3.13.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1462,7 +1464,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of simple-scan 3.12.0:";;
+     short | recursive ) echo "Configuration of simple-scan 3.13.4.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1580,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-simple-scan configure 3.12.0
+simple-scan configure 3.13.4.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1943,7 +1945,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by simple-scan $as_me 3.12.0, which was
+It was created by simple-scan $as_me 3.13.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2806,7 +2808,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='simple-scan'
- VERSION='3.12.0'
+ VERSION='3.13.4.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3015,11 +3017,11 @@ $as_echo "no" >&6; }
 fi
 
 
-   if test "$VALAC" != valac && test -n "0.16.0"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $VALAC is at least version 0.16.0" >&5
-$as_echo_n "checking whether $VALAC is at least version 0.16.0... " >&6; }
+   if test "$VALAC" != valac && test -n "0.22.0"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $VALAC is at least version 0.22.0" >&5
+$as_echo_n "checking whether $VALAC is at least version 0.22.0... " >&6; }
        am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
-       as_arg_v1=0.16.0
+       as_arg_v1=0.22.0
 as_arg_v2="$am__vala_version"
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(
@@ -3038,10 +3040,7 @@ $as_echo "no" >&6; }
 esac
 fi
     if test "$VALAC" = valac; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no proper vala compiler found" >&5
-$as_echo "$as_me: WARNING: no proper vala compiler found" >&2;}
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: you will not be able to compile vala source files" >&5
-$as_echo "$as_me: WARNING: you will not be able to compile vala source files" >&2;}
+      as_fn_error $? "Vala compiler not found" "$LINENO" 5
     else
       :
     fi
@@ -5075,6 +5074,22 @@ fi
 
 
 
+YELP_LC_MEDIA_LINKS=true
+YELP_LC_DIST=true
+
+for yelpopt in ; do
+  case $yelpopt in
+    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
+    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
+    lc-dist)           YELP_LC_DIST=true ;;
+    no-lc-dist)        YELP_LC_DIST= ;;
+    *) as_fn_error $? "Unrecognized YELP_HELP_INIT option $yelpopt\"" "$LINENO" 5 ;;
+  esac
+done;
+
+
+
+
 # Check whether --with-help-dir was given.
 if test "${with_help_dir+set}" = set; then :
   withval=$with_help_dir;
@@ -5244,13 +5259,13 @@ clean-help:
 
 EXTRA_DIST ?=
 EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
-EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)
+EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
 EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
 EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
 
 distdir: distdir-help-files
 distdir-help-files:
-	@for lc in C $(HELP_LINGUAS); do \
+	@for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
 	  $(MKDIR_P) "$(distdir)/$$lc"; \
 	  for file in $(HELP_FILES); do \
 	    if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
@@ -5308,8 +5323,10 @@ install-help:
 	      echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
 	      $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
 	    elif test "x$$lc" != "xC"; then \
-	      echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
-	      $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	      if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
+	        echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
+	        $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+	      fi; \
 	    fi; \
 	  done; \
 	done
@@ -6504,7 +6521,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by simple-scan $as_me 3.12.0, which was
+This file was extended by simple-scan $as_me 3.13.4.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6561,7 +6578,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-simple-scan config.status 3.12.0
+simple-scan config.status 3.13.4.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index aa1a2e5..8b6c498 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(simple-scan, 3.12.0)
+AC_INIT(simple-scan, 3.13.4.2)
 AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 
-AM_PROG_VALAC([0.16.0])
+AM_PROG_VALAC([0.22.0], [], [AC_MSG_ERROR([Vala compiler not found])])
 AM_PROG_CC_C_O
 
 GLIB_GSETTINGS
diff --git a/data/Makefile.am b/data/Makefile.am
index e737488..b436f12 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,6 @@ dist_man1_MANS = simple-scan.1
 EXTRA_DIST = simple-scan.desktop.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
-             simple-scan-menu.ui \
              simple-scan.gresource.xml
 
 DISTCLEANFILES = \
diff --git a/data/Makefile.in b/data/Makefile.in
index b7b43b8..100a61c 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -278,6 +278,8 @@ VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -333,7 +335,6 @@ dist_man1_MANS = simple-scan.1
 EXTRA_DIST = simple-scan.desktop.in \
              org.gnome.SimpleScan.gschema.xml.in \
              simple-scan.ui \
-             simple-scan-menu.ui \
              simple-scan.gresource.xml
 
 DISTCLEANFILES = \
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index 659daaf..cc1b06b 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -183,6 +183,8 @@ VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/simple-scan-menu.ui b/data/simple-scan-menu.ui
deleted file mode 100644
index ee5e7ea..0000000
--- a/data/simple-scan-menu.ui
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <!-- interface-requires gtk+ 3.8 -->
-  <menu id="appmenu">
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">New Document</attribute>
-        <attribute name="action">app.new_document</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>N]]></attribute>
-      </item>
-    </section>
-    <section>
-      <submenu>
-        <attribute name="label" translatable="yes">Document</attribute>
-        <section>
-          <item>
-            <attribute name="label" translatable="yes">Save</attribute>
-            <attribute name="action">app.save</attribute>
-            <attribute name="accel"><![CDATA[<Ctrl>S]]></attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Save As...</attribute>
-            <attribute name="action">app.save_as</attribute>
-            <attribute name="accel"><![CDATA[<Shift><Ctrl>S]]></attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Email...</attribute>
-            <attribute name="action">app.email</attribute>
-            <attribute name="accel"><![CDATA[<Ctrl>E]]></attribute>
-          </item>
-          <item>
-            <attribute name="label" translatable="yes">Print...</attribute>
-            <attribute name="action">app.print</attribute>
-            <attribute name="accel"><![CDATA[<Ctrl>P]]></attribute>
-          </item>
-        </section>
-      </submenu>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Preferences</attribute>
-        <attribute name="action">app.preferences</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">Help</attribute>
-        <attribute name="action">app.help</attribute>
-        <attribute name="accel"><![CDATA[F1]]></attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">About</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">Quit</attribute>
-        <attribute name="action">app.quit</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>Q]]></attribute>
-      </item>
-    </section>
-  </menu>
-</interface>
diff --git a/data/simple-scan.gresource.xml b/data/simple-scan.gresource.xml
index 7aa3b12..b6fe6a6 100644
--- a/data/simple-scan.gresource.xml
+++ b/data/simple-scan.gresource.xml
@@ -2,6 +2,5 @@
 <gresources>
   <gresource prefix="/org/gnome/SimpleScan">
     <file preprocess="xml-stripblanks">simple-scan.ui</file>
-    <file preprocess="xml-stripblanks">simple-scan-menu.ui</file>
   </gresource>
 </gresources>
diff --git a/data/simple-scan.ui b/data/simple-scan.ui
index eba3c72..d610c2e 100644
--- a/data/simple-scan.ui
+++ b/data/simple-scan.ui
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Nov 19 13:50:35 2013 -->
 <interface>
-  <!-- interface-requires gtk+ 3.8 -->
+  <!-- interface-requires gtk+ 3.10 -->
   <object class="GtkDialog" id="authorize_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
@@ -9,7 +8,6 @@
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <property name="urgency_hint">True</property>
-    <property name="transient_for">simple_scan_window</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -159,7 +157,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkListStore" id="device_store">
+  <object class="GtkListStore" id="device_model">
     <columns>
       <!-- column-name device_name -->
       <column type="gchararray"/>
@@ -177,25 +175,7 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-help</property>
   </object>
-  <object class="GtkListStore" id="mode_store">
-    <columns>
-      <!-- column-name mode -->
-      <column type="gchararray"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">text</col>
-        <col id="1" translatable="yes" comments="Combo box label for text scan mode">Text</col>
-      </row>
-      <row>
-        <col id="0">photo</col>
-        <col id="1" translatable="yes" comments="Combo box label for photo scan mode">Photo</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="page_side_store">
+  <object class="GtkListStore" id="page_side_model">
     <columns>
       <!-- column-name side -->
       <column type="gint"/>
@@ -217,7 +197,7 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="paper_size_store">
+  <object class="GtkListStore" id="paper_size_model">
     <columns>
       <!-- column-name width -->
       <column type="gint"/>
@@ -227,7 +207,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="photo_dpi_store">
+  <object class="GtkListStore" id="photo_dpi_model">
     <columns>
       <!-- column-name dpi -->
       <column type="gint"/>
@@ -240,7 +220,7 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
-  <object class="GtkApplicationWindow" id="simple_scan_window">
+  <template class="UserInterface" parent="GtkApplicationWindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
     <property name="icon_name">scanner</property>
@@ -254,7 +234,7 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="menubar">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="document_menuitem">
@@ -352,6 +332,15 @@
                       </object>
                     </child>
                     <child>
+                      <object class="GtkMenuItem" id="reorder_menuitem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes" comments="Menu item to reorder pages">Reorder Pages</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="reorder_menuitem_activate_cb" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkImageMenuItem" id="save_menuitem">
                         <property name="label">gtk-save</property>
                         <property name="visible">True</property>
@@ -543,7 +532,7 @@
                               </object>
                             </child>
                             <child>
-                              <object class="GtkRadioMenuItem" id="4x6_menuitem">
+                              <object class="GtkRadioMenuItem" id="four_by_six_menuitem">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes" comments="Radio button for cropping page to 4x6 inch">4×6</property>
@@ -674,8 +663,8 @@
           </packing>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar1">
-            <property name="visible">True</property>
+          <object class="GtkToolbar" id="toolbar">
+            <property name="visible">False</property>
             <property name="can_focus">False</property>
             <style>
               <class name="primary-toolbar"/>
@@ -704,7 +693,7 @@
                 <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
                 <property name="use_underline">True</property>
                 <property name="icon_name">scanner</property>
-                <property name="menu">scan_toolbutton_menu</property>
+                <property name="menu">scan_button_menu</property>
                 <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -813,8 +802,190 @@
         </child>
       </object>
     </child>
-  </object>
-  <object class="GtkListStore" id="text_dpi_store">
+    <child type="titlebar">
+      <object class="GtkHeaderBar" id="headerbar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="vexpand">True</property>
+        <property name="show_close_button">True</property>
+        <property name="title" translatable="yes" comments="Title of scan window">Simple Scan</property>
+        <style>
+          <class name="titlebar"/>
+        </style>
+        <child>
+          <object class="GtkBox" id="open_box">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton" id="stop_button">
+                <property name="visible">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for stop button">Stop the current scan</property>
+                <property name="label" translatable="yes">Stop</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="stop_scan_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton" id="scan_button">
+                <property name="visible">True</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for scan toolbar button">Scan a single page from the scanner</property>
+                <property name="label" translatable="yes" comments="Label on scan toolbar item">Scan</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="scan_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuButton" id="open_button">
+                <property name="visible">True</property>
+                <property name="popup">scan_button_hb_menu</property>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="save_button">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for save toolbar button">Save document to a file</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="save_file_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="save_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-save-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="new_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes" comments="Tooltip for new document button">Start a new document</property>
+            <property name="use_underline">True</property>
+            <signal name="clicked" handler="new_button_clicked_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="new_image">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">document-new-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="rotate_box">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="valign">center</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton" id="rotate_right_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate right (clockwise) button">Rotate the page to the right (clockwise)</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="rotate_right_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="objectrotateright-button">
+                    <property name="visible">True</property>
+                    <property name="icon_size">1</property>
+                    <property name="icon_name">object-rotate-right-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="rotate_left_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes" comments="Tooltip for rotate left (counter-clockwise) button">Rotate the page to the left (counter-clockwise)</property>
+                <property name="use_underline">True</property>
+                <signal name="clicked" handler="rotate_left_button_clicked_cb" swapped="no"/>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage" id="objectrotateleft-button">
+                    <property name="visible">True</property>
+                    <property name="icon_size">1</property>
+                    <property name="icon_name">object-rotate-left-symbolic</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="pack_type">end</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="crop_button">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">Crop the selected page</property>
+            <property name="use_underline">True</property>
+            <signal name="toggled" handler="crop_button_toggled_cb" swapped="no"/>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="objectcrop-button">
+                <property name="visible">True</property>
+                <property name="icon_size">1</property>
+                <property name="icon_name">edit-cut-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+      </packing>
+    </child>
+  </template>
+  <object class="GtkListStore" id="text_dpi_model">
     <columns>
       <!-- column-name dpi -->
       <column type="gint"/>
@@ -829,7 +1000,6 @@
     <property name="resizable">False</property>
     <property name="icon_name">scanner</property>
     <property name="type_hint">normal</property>
-    <property name="transient_for">simple_scan_window</property>
     <signal name="delete-event" handler="preferences_dialog_delete_event_cb" swapped="no"/>
     <signal name="response" handler="preferences_dialog_response_cb" swapped="no"/>
     <child internal-child="vbox">
@@ -893,8 +1063,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">device_store</property>
-                <property name="button_sensitivity">on</property>
+                <property name="model">device_model</property>
                 <signal name="changed" handler="device_combo_changed_cb" swapped="no"/>
               </object>
               <packing>
@@ -941,7 +1110,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">text_dpi_store</property>
+                <property name="model">text_dpi_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -955,7 +1124,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">photo_dpi_store</property>
+                <property name="model">photo_dpi_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -985,7 +1154,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">page_side_store</property>
+                <property name="model">page_side_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -1015,7 +1184,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="model">paper_size_store</property>
+                <property name="model">paper_size_model</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -1129,11 +1298,11 @@
       <action-widget response="1">preferences_close_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkMenu" id="scan_toolbutton_menu">
+  <object class="GtkMenu" id="scan_button_menu">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkMenuItem" id="scan_single_toolbutton_menuitem">
+      <object class="GtkMenuItem" id="scan_single_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
@@ -1142,7 +1311,7 @@
       </object>
     </child>
     <child>
-      <object class="GtkMenuItem" id="scan_all_toolbutton_menuitem">
+      <object class="GtkMenuItem" id="scan_all_button_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
@@ -1157,7 +1326,57 @@
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="text_toolbutton_menuitem">
+      <object class="GtkRadioMenuItem" id="text_button_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Text</property>
+        <property name="use_underline">True</property>
+        <property name="draw_as_radio">True</property>
+        <signal name="toggled" handler="text_menuitem_toggled_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="photo_button_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Photo</property>
+        <property name="use_underline">True</property>
+        <property name="active">True</property>
+        <property name="draw_as_radio">True</property>
+        <property name="group">text_button_menuitem</property>
+        <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
+      </object>
+    </child>
+  </object>
+  <object class="GtkMenu" id="scan_button_hb_menu">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkMenuItem" id="scan_single_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan a single page from the scanner">Single _Page</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="scan_button_clicked_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkMenuItem" id="scan_all_button_hb_menuitem">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes" comments="Toolbar scan menu item to scan all pages from a document feeder">All Pages From _Feeder</property>
+        <property name="use_underline">True</property>
+        <signal name="activate" handler="continuous_scan_button_clicked_cb" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="menuitem3">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+    </child>
+    <child>
+      <object class="GtkRadioMenuItem" id="text_button_hb_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Text</property>
@@ -1167,14 +1386,14 @@
       </object>
     </child>
     <child>
-      <object class="GtkRadioMenuItem" id="photo_toolbutton_menuitem">
+      <object class="GtkRadioMenuItem" id="photo_button_hb_menuitem">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">Photo</property>
         <property name="use_underline">True</property>
         <property name="active">True</property>
         <property name="draw_as_radio">True</property>
-        <property name="group">text_toolbutton_menuitem</property>
+        <property name="group">text_button_hb_menuitem</property>
         <signal name="toggled" handler="photo_menuitem_toggled_cb" swapped="no"/>
       </object>
     </child>
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index e31993c..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,332 +0,0 @@
-simple-scan (3.12.0-1) unstable; urgency=low
-
-  * QA upload.
-  * Set Maintainer to Debian QA Group.
-  * New upstream release.
-  * Refresh patches.
-  * Drop build dependency on sqlite3, no longer needed.
-
- -- Alessio Treglia <alessio@debian.org>  Thu, 10 Apr 2014 15:39:34 +0100
-
-simple-scan (3.10.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Refresh patches.
-  * Build-depend on libsqlite3-dev.
-  * Update debian/watch as latest release is being published as XZ file.
-
- -- Alessio Treglia <alessio@debian.org>  Sat, 05 Oct 2013 15:33:01 +0100
-
-simple-scan (3.6.1-1) unstable; urgency=low
-
-  * Upload to unstable.
-  * New upstream release:
-    - Fix scan no longer working after an ADF scan completes.
-    - Fix erroneous warning about failing to set ADF source.
-
- -- Alessio Treglia <alessio@debian.org>  Mon, 13 May 2013 08:59:05 +0100
-
-simple-scan (3.6.0-2) experimental; urgency=low
-
-  * Drop build-depend on gconf2. (Closes: #698251)
-  * Use dh_autoreconf instead of calling autoreconf before the configure.
-  * Properly purge the symlink to gnome-doc-utils.make once the build's
-    completed.
-
- -- Alessio Treglia <alessio@debian.org>  Wed, 16 Jan 2013 00:03:37 +0000
-
-simple-scan (3.6.0-1) experimental; urgency=low
-
-  * New upstream release.
-  * Add -DBG package. (Closes: #687213)
-  * Fix Vcs tags.
-  * Bump debhelper compatibility.
-  * Bump Standards.
-
- -- Alessio Treglia <alessio@debian.org>  Tue, 15 Jan 2013 00:51:40 +0000
-
-simple-scan (3.4.2-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-  * Remove 02-file-filter-labels.patch, applied upstream.
-  * Generate with Vala 0.16. (Closes: #675664)
-  * Enable hardening flags.
-
- -- Alessio Treglia <alessio@debian.org>  Sun, 03 Jun 2012 01:01:58 +0200
-
-simple-scan (3.4.1-3) unstable; urgency=low
-
-  * Drop 20-lpi.patch as launchpad-integration has been removed from Ubuntu.
-    Thanks to Jeremy Bicha for the great work. (Closes: #673780)
-
- -- Alessio Treglia <alessio@debian.org>  Mon, 21 May 2012 14:48:40 +0200
-
-simple-scan (3.4.1-2) unstable; urgency=low
-
-  * Fix save dialog filter incorrect names. Thanks to Jeremy Bicha
-    for reporting this. (Closes: #673593) (LP: #876135)
-
- -- Alessio Treglia <alessio@debian.org>  Mon, 21 May 2012 01:33:47 +0200
-
-simple-scan (3.4.1-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-  * Install apport file on Debian systems too.
-
- -- Alessio Treglia <alessio@debian.org>  Fri, 20 Apr 2012 12:08:03 +0200
-
-simple-scan (3.4.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Refresh patches.
-  * Build-dep on libcolord-dev.
-  * Replace gnome-doc-utils build-dependency with yelp-tool.
-  * Update debian/watch.
-  * Refresh debian/copyright.
-  * Bump Standards.
-
- -- Alessio Treglia <alessio@debian.org>  Wed, 04 Apr 2012 21:14:45 +0200
-
-simple-scan (3.2.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Alessio Treglia <alessio@debian.org>  Wed, 07 Dec 2011 12:49:05 +0100
-
-simple-scan (3.2.0-1) unstable; urgency=low
-
-  * Upload to unstable.
-  * New upstream release
-  * Fix watch file.
-
- -- Alessio Treglia <alessio@debian.org>  Fri, 07 Oct 2011 18:14:05 +0200
-
-simple-scan (3.1.5-1) experimental; urgency=low
-
-  * New upstream release:
-    - Fix compile warnings
-    - Port to Vala
-    - Port to GTK3
-    - Port to GDBus
-    - Port to GSettings
-    - Port to colord
-  * debian/control:
-    - Port build-deps to Vala.
-  * Refresh patches.
-  * debian/watch: Look for *.bz2 tarballs.
-
- -- Alessio Treglia <alessio@debian.org>  Tue, 30 Aug 2011 12:58:27 +0200
-
-simple-scan (2.32.0.2-2) unstable; urgency=low
-
-  * Build-depend on libjpeg-dev instead of libjpeg62-dev (Closes: #634633).
-  * Bump Standards.
-
- -- Alessio Treglia <alessio@debian.org>  Tue, 19 Jul 2011 13:14:46 +0200
-
-simple-scan (2.32.0.2-1) unstable; urgency=low
-
-  * New upstream release:
-    - Add binary comment as recommended in PDF spec.
-    - Add comments about other PDF/A features.
-    - Update translations.
-  * debian/gbp.conf: Set compression to bzip2.
-  * Add debian/source/local-options file.
-
- -- Alessio Treglia <alessio@debian.org>  Thu, 21 Apr 2011 16:38:02 +0200
-
-simple-scan (2.32.0.1-2) unstable; urgency=low
-
-  * Upload to unstable.
-  * Set 3.0 (quilt) as packaging definitive format.
-  * Handle distribution specific patches.
-  * Revert previous changes in debian/rules,
-    Ubuntu-specific patches are now properly handled.
-  * Build with scour for SVG optimization.
-  * Build-depend on autotools-dev.
-  * On Ubuntu, install the apport package hook.
-
- -- Alessio Treglia <alessio@debian.org>  Wed, 16 Mar 2011 12:50:20 +0100
-
-simple-scan (2.32.0.1-1) experimental; urgency=low
-
-  * New upstream release.
-  * Update debian/gbp.conf.
-
- -- Alessio Treglia <alessio@debian.org>  Tue, 26 Oct 2010 17:18:13 +0200
-
-simple-scan (2.32.0-1) experimental; urgency=low
-
-  * New upstream release.
-  * Add Vcs-Bzr field to make Robert Ancell happy.
-  * Switch back to format 1.0
-  * Change tarball compression.
-
- -- Alessio Treglia <alessio@debian.org>  Thu, 30 Sep 2010 11:21:17 +0200
-
-simple-scan (2.31.91-1) experimental; urgency=low
-
-  * Imported Upstream version 2.31.91
-  * Refresh 01_lpi.patch.
-
- -- Alessio Treglia <alessio@debian.org>  Tue, 31 Aug 2010 01:03:07 +0200
-
-simple-scan (2.31.90.2-1) unstable; urgency=low
-
-  * New upstream bugfix release.
-
- -- Alessio Treglia <alessio@debian.org>  Tue, 17 Aug 2010 11:02:56 +0200
-
-simple-scan (2.31.90.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Remove DMUA field.
-  * Update Standards to 3.9.1.
-  * Drop Recommends on imagemagick.
-  * Build-Depends on zlib2g-dev, libjpeg62-dev.
-  * Update watch file.
-  * Refresh 01_lpi.patch patch.
-  * Switch to 3.0 (quilt) format.
-  * Add debian/gbp.conf,.gitignore files.
-  * Update changelog.
-  * Fix debian/control.
-  * Install gnome-doc-utils.make.
-  * Add zlib patch.
-  * debian/gbp.conf: Set tarball compression to bzip2.
-  * Change my email address.
-
- -- Alessio Treglia <alessio@debian.org>  Sun, 15 Aug 2010 12:45:16 +0200
-
-simple-scan (2.31.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * All patches have been applied upstream.
-  * debian/source_simple-scan.py: Sync with Ubuntu.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 13 May 2010 20:42:09 +0200
-
-simple-scan (1.0.3-1) unstable; urgency=low
-
-  * New upstream release.
-    - Set resolution on ImageMagick generated PDFs (LP: #564106).
-  * debian/patches/10-set_supported_flags.patch:
-    - Set duplex and batch-scan flags if supported by driver (LP: #566759).
-  * Set format to 1.0.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 22 Apr 2010 15:18:11 +0200
-
-simple-scan (1.0.2-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Fri, 16 Apr 2010 17:45:41 +0200
-
-simple-scan (1.0.0-2) unstable; urgency=low
-
-  * debian/control: Revert last change of Build-Depends field, the previous
-    situation was preferable and even correct (Closes: #577821).
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 14 Apr 2010 23:55:43 +0200
-
-simple-scan (1.0.0-1) unstable; urgency=low
-
-  * New upstream stable release.
-  * debian/rules:
-    - Call intltool-update to generate a PO template (LP: #551470).
-  * Drop debian/patches/11_thunderbird_workaround.patch patch, applied
-    upstream.
-  * Refresh 01_lpi.patch patch.
-  * debian/control:
-    - udev is not available on kfreebsd-*,hurd architectures.
-    - Add Vcs-{Git,Browser} tags.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 14 Apr 2010 12:54:33 +0200
-
-simple-scan (0.9.10-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/control:
-    - Build-depend on libdbus-glib-1-dev.
-    - Recommend imagemagick.
-  * debian/patches/11_thunderbird_workaround.patch:
-    - Workaround Thunderbird/Icedove mail bug.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Fri, 09 Apr 2010 12:41:39 +0200
-
-simple-scan (0.9.9-1) unstable; urgency=low
-
-  * New upstream release.
-  * Refresh patches.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 15 Mar 2010 17:32:51 +0100
-
-simple-scan (0.9.7-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Tue, 09 Mar 2010 07:25:04 +0100
-
-simple-scan (0.9.6-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/rules: Call autoreconf before calling the configure script.
-  * Bump versioned build-dep on debhelper.
-  * Remove 99_autotools.patch.
-  * Build-Depends on gnome-common.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 08 Mar 2010 14:58:35 +0100
-
-simple-scan (0.9.5-1) unstable; urgency=low
-
-  * New upstream release.
-  * Include apport hook without installing it in order to mimize the delta
-    between Debian and Ubuntu.
-  * Add README.source to document how-to patch the sources.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 18 Feb 2010 11:38:37 +0100
-
-simple-scan (0.9.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bump standards.
-  * Build-depend on libgudev-1.0-dev,gnome-doc-utils.
-  * Drop manpages from the packaging, upstream now provides them.
-  * Add quilt support.
-  * Provide ubuntu-specific patches without applying them in order to
-    minimze the delta.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Tue, 16 Feb 2010 00:46:46 +0100
-
-simple-scan (0.8.1-3) unstable; urgency=low
-
-  * Append --as-needed to LDFLAGS to avoid excessive dependencies;
-    thanks to Martin Pitt for reporting this (LP: #512048).
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 25 Jan 2010 00:49:34 +0100
-
-simple-scan (0.8.1-2) unstable; urgency=low
-
-  * Update debian/copyright.
-  * debian/control:
-    - No need to build-depend on debhelper >= 7.0.50.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 20 Jan 2010 11:26:17 +0100
-
-simple-scan (0.8.1-1) unstable; urgency=low
-
-  * New upstream release.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 20 Jan 2010 10:59:36 +0100
-
-simple-scan (0.8.0-1) unstable; urgency=low
-
-  * New upstream release.
-  * Allow DM uploads.
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 23 Dec 2009 11:26:30 +0100
-
-simple-scan (0.7.6-1) unstable; urgency=low
-
-  * Initial release (Closes: #561790).
-
- -- Alessio Treglia <quadrispro@ubuntu.com>  Mon, 21 Dec 2009 00:31:16 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 95313a7..0000000
--- a/debian/control
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: simple-scan
-Section: gnome
-Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.9.4
-Build-Depends:
- debhelper (>= 9~),
- dh-autoreconf,
- gnome-common,
- gnome-pkg-tools (>= 0.10),
- intltool,
- libcairo2-dev,
- libcolord-dev,
- libdbus-glib-1-dev,
- libglib2.0-dev,
- libgtk-3-dev,
- libgudev-1.0-dev,
- libjpeg-dev,
- libsane-dev,
- lsb-release,
- python-scour,
- valac-0.16 | valac (>= 0.14.0),
- yelp-tools,
- zlib1g-dev
-Homepage: https://launchpad.net/simple-scan
-Vcs-Git: git://anonscm.debian.org/collab-maint/simple-scan.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/simple-scan.git
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/simple-scan/ubuntu
-
-Package: simple-scan
-Architecture: any
-Depends:
- gnome-icon-theme,
- xdg-utils,
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Simple Scanning Utility
- Simple Scan is an easy-to-use application, designed to let users
- connect their scanner and quickly have the image/document in an
- appropriate format.
- .
- Simple Scan is basically a frontend for SANE - which is the same
- backend as XSANE uses. This means that all existing scanners will
- work and the interface is well tested.
-
-Package: simple-scan-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends:
- simple-scan (= ${binary:Version}),
- ${misc:Depends}
-Description: Simple Scanning Utility - debugging symbols
- Simple Scan is an easy-to-use application, designed to let users
- connect their scanner and quickly have the image/document in an
- appropriate format.
- .
- This package provides the debugging symbols for simple-scan.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index bfb882f..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,31 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Simple Scan
-Upstream-Contact: Robert Ancell <robert.ancell@canonical.com>
-Source: https://launchpad.net/simple-scan/+download
-
-Files: *
-Copyright: 2009-2011 Canonical Ltd
-License: GPL-3+
-
-Files: debian/*
-Copyright:
- 2009-2012, Alessio Treglia <alessio@debian.org>
- 2009, Robert Ancell <robert.ancell@canonical.com>
-License: GPL-3+
-
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-Comment:
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-3’.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index d0c1355..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-compression = xz
diff --git a/debian/patches/01-zlib.patch b/debian/patches/01-zlib.patch
deleted file mode 100644
index 2014c82..0000000
--- a/debian/patches/01-zlib.patch
+++ /dev/null
@@ -1,25 +0,0 @@
----
- configure.ac    |    1 +
- src/Makefile.am |    1 +
- 2 files changed, 2 insertions(+)
-
---- simple-scan.orig/configure.ac
-+++ simple-scan/configure.ac
-@@ -38,6 +38,7 @@ AM_CONDITIONAL(HAVE_COLORD, test $have_c
- 
- AC_CHECK_HEADERS([sane/sane.h],[],[AC_MSG_ERROR([SANE not found])])
- AC_CHECK_HEADERS([sane/saneopts.h],[],[AC_MSG_ERROR([SANE not found])])
-+AC_CHECK_HEADERS([zlib.h],[],[AC_MSG_ERROR([ZLib not found])])
- 
- dnl ###########################################################################
- dnl Documentation
---- simple-scan.orig/src/Makefile.am
-+++ simple-scan/src/Makefile.am
-@@ -46,6 +46,7 @@ simple_scan_LDADD = \
- 	$(SIMPLE_SCAN_LIBS) \
- 	$(COLORD_LIBS) \
- 	-lsane \
-+	-lz \
- 	-lm
- 
- CLEANFILES = \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f505775..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-zlib.patch
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 7abb6da..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/make -f 
-
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-LDFLAGS+=-Wl,--as-needed
-
-%:
-	dh $@ --with=autoreconf,scour
-
-# Fixes FTBFS
-override_dh_auto_test:
-
-# Autoreconf due to 01_lpi.patch
-override_dh_autoreconf:
-	[ -e gnome-doc-utils.make ] || \
-	ln -s /usr/share/gnome-doc-utils/gnome-doc-utils.make
-	dh_autoreconf
-
-override_dh_auto_clean:
-	dh_auto_clean
-	[ ! -h gnome-doc-utils.make ] || \
-	rm gnome-doc-utils.make
-
-override_dh_auto_build:
-	cd po; intltool-update -p
-	dh_auto_build
-
-override_dh_strip:
-	dh_strip -psimple-scan --dbg-package=simple-scan-dbg
-
-override_dh_installdocs:
-	dh_installdocs --link-doc=simple-scan
diff --git a/debian/simple-scan.install b/debian/simple-scan.install
deleted file mode 100644
index b7d9a09..0000000
--- a/debian/simple-scan.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/source_simple-scan.py usr/share/apport/package-hooks/
-usr/bin
-usr/share
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes
diff --git a/debian/source_simple-scan.py b/debian/source_simple-scan.py
deleted file mode 100644
index 6fab46c..0000000
--- a/debian/source_simple-scan.py
+++ /dev/null
@@ -1,23 +0,0 @@
-'''apport package hook for simple-scan
-
-(c) 2010 Canonical Ltd.
-Author: Robert Ancell <robert.ancell@canonical.com>
-'''
-
-import os.path
-from apport.hookutils import *
-
-LOG_FILE = os.path.expanduser('~/.cache/simple-scan/simple-scan.log')
-driver_packages = ['libsane', 'libsane-extras', 'hplip', 'hpoj']
-
-def add_info(report):
-    attach_hardware(report)
-    versions = ''
-    for package in driver_packages:
-        try:
-            version = packaging.get_version(package)
-        except ValueError:
-            version = 'N/A'
-        versions += '%s %s\n' % (package, version)
-    report['DriverPackageVersions'] = versions
-    attach_file_if_exists(report, LOG_FILE, 'SimpleScanLog')
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index 9d546c6..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-https://launchpad.net/simple-scan/+download .*/simple-scan-([0-9.]+)\.tar\.xz
diff --git a/help/Makefile.in b/help/Makefile.in
index 59db376..b3798e7 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -183,6 +183,8 @@ VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f1e46ea..93a99e0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@
 [encoding: UTF-8]
 [type: gettext/glade]data/simple-scan.ui
 data/simple-scan.desktop.in
-data/simple-scan-menu.ui
 data/org.gnome.SimpleScan.gschema.xml.in
 src/book.vala
 src/book-view.vala
diff --git a/po/af.po b/po/af.po
index 77725a3..14f3443 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-09-03 08:13+0000\n"
 "Last-Translator: Dawid de Jager <dawid.dejager@gmail.com>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Alle Bladsye Vanaf _Voerder"
 msgid "_Stop Scan"
 msgstr "_Staak skandering"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-pos"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Bladsy"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Roteer _linksom"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Roteer _regsom"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Insny"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter (VSA)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal (VSA)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Pasmaak"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Roteer Insnit"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Beweeg na regs"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Begin 'n nuwe dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nuwe"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Skandeer 'n enkelbladsy vanaf die skandeerder"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skandeer"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Stoor dokument na 'n lêer"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Stoor"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Staak huidige skandering"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roteer die bladsy na links (anti-kloksgewys)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Roteer linksom"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roteer die bladsy na regs (kloksgewys)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Roteer regsom"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Snoei die gekose bladsy"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Insny"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Voorkeure"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Skandeer B_ron"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Teks resolusie"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Foto resolusie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skandeer Kant:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Bladsy grootte:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -437,120 +443,140 @@ msgid "Scanned Document"
 msgstr "Geskandeerde dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Geskandeerde dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Stoor as..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Beeldlêers"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Alle lêers"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Kon nie die leêr stoor nie"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -567,16 +593,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Aangaande Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -589,88 +615,106 @@ msgstr ""
 "  Willem van der Colff https://launchpad.net/~wilalla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (verstek resolusie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoë resolusie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Kontrolleer asseblief u installasie"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Verander _skandeerder"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -695,6 +739,9 @@ msgstr ""
 #~ msgid "Window height in pixels"
 #~ msgstr "Venster hoogte in pixels"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Kontrolleer asseblief u installasie"
+
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
diff --git a/po/ar.po b/po/ar.po
index eef9e4c..ded776e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 08:56+0000\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "كل الصفحات من  _المغذّي"
 msgid "_Stop Scan"
 msgstr "أو_قف المسح"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_بريد إلكتروني"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_صفحة"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "أدر  ي_سارًا"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "أدر ي_مينًا"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "ا_قتصاص"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "لا _شيء"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_خطاب"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "_قانوني"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_مخصص"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "أ_در الاقتصاص"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "تحرك لليسار"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "تحرك لليمين"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_مساعدة"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "ال_محتويات"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "ابدأ مستندا جديدا"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "جديد"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "امسح صفحة مفردة من الماسحة"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "امسح"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "احفظ المستند في ملف"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "احفظ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "أوقف المسح الحالي"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "أوقف"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "أدر الصفحة لليسار (عكس عقارب الساعة)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "أدر يسارا"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "أدر الصفحة لليمين (مع عقارب الساعة)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "أدر يمينا"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "اقتص الصفحة المحددة"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "اقتصاص"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "التفضيلات"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "م_صدر المسح:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "ميز ال_نص"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "ميز ال_صورة:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "جهة المسح:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "حجم الصفحة:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -433,120 +439,140 @@ msgid "Scanned Document"
 msgstr "مستند ممسوح"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[جهاز...] - أداة مسح ضوئي"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "نفّذ '%s --help' لعرض القائمة الكاملة لخيارات سطر الأوامر المُتاحة."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "مستند ممسوح.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "اسم مستخدم وكلمة سر مطلوبين للنفاذ إلى '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "لم يُعثر على أي ماسحة"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "يرجى التحقق من أنّ الماسحة متصلة وتعمل"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "احفظ كـ..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "ملفات الصور"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "كل الملفات"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "اختر _نوع الملف"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF‏ (مستند متعدد الصفحات)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "‏JPEG (مضغوط)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "‏PNG (غير فقود)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "فشل حفظ الملف"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ستضيع جميع التغييرات للأبد إذا لم تحفظ."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "أأحفظ المستند الحالي؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "ارفض التغيرات"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "تعذّر حفظ الصورة للمعاينة"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "تعذر فتح معاين الصور"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "تعذّر فتح ملف المساعدة"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -573,16 +599,16 @@ msgstr ""
 "إذا لم يحدث هذا فانظر <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "عن \"الماسحة الضوئية\""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "أداة بسيطة لمسح المستندات"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -598,88 +624,106 @@ msgstr ""
 "  rashed alhazimi https://launchpad.net/~linex"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "هل ترغب بحفظ المستند قبل الخروج؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "أُخرج دون حفظ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d نقطة\\بوصة (مبدئي)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d نقطة\\بوصة (مسودة)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d نقطة\\بوصة (دقة عالية)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d نقطة\\بوصة"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "ملفات مفقودة"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "من فضلك تحقق من تثبيتك"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "غيّر _الماسحة"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "يحفظ المستند..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "يحفظ الصفحة %d من أصل %d"
@@ -733,6 +777,12 @@ msgstr "يحفظ الصفحة %d من أصل %d"
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "عرض الصورة الممسوحة بالبكسل."
 
+#~ msgid "Files missing"
+#~ msgstr "ملفات مفقودة"
+
+#~ msgid "Please check your installation"
+#~ msgstr "من فضلك تحقق من تثبيتك"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "الميز بالنقطة في البوصة للصورة الممسوحة سابقا."
 
diff --git a/po/ast.po b/po/ast.po
index 6525cf5..c9e8d78 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Asturian <ast@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Tol_es páxines dende l'alimentador"
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Voltiar a la e_squierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Voltiar a la _Drecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Dengún"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Lle_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizáu"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Voltiar recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Ayuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferencies"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Escan_ear:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brillu:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Calidá:"
 
@@ -433,122 +439,142 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PRESÉU...] - Utilidá d'escanéu"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executa '%s --help' pa ver una llista completa de les opciones disponibles "
 "na llinia de comandos."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Documentu Escaneáu.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Zarrar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requierse nome d'usuariu y contraseña p'acceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nun se deteutó dengún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor comprueba que l'escáner ta coneutáu y activáu"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Encaboxar"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Falló al guardar el ficheru"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nun pudo guardase la imaxe de previsualización"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -577,16 +603,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Tocante a Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Una cenciella ferramienta pa escanear documentos"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -596,88 +622,106 @@ msgstr ""
 "  ivarela https://launchpad.net/~ivarela"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Ficheros non alcontraos"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Por favor, comprueba la instalación"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Más escuru"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Más claru"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mínimu"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Máximu"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Guardando documentu..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la páxina %d de %d"
@@ -716,5 +760,11 @@ msgstr "Guardando la páxina %d de %d"
 #~ "  --gtk-module=MÓDULOS            Cargar módulos GTK+ adicionales\n"
 #~ "  --g-fatal-warnings              Facer que tolos avisos seyan fatales"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Por favor, comprueba la instalación"
+
+#~ msgid "Files missing"
+#~ msgstr "Ficheros non alcontraos"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direición del escáner a traviés de la páxina escaneada."
diff --git a/po/az.po b/po/az.po
index d061d59..f7b68ac 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Azerbaijani <az@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "_AvtoYükləmədəki bütün səhifələr"
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Seçilmiş səhifəni kəs"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Kəs"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,104 +587,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Emin Mastizada https://launchpad.net/~emin25"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index b7050a6..b21aa17 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-12-01 09:04+0000\n"
 "Last-Translator: Svetoslav Stefanov <svetlisashkov@yahoo.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Всички страници от _подавача"
 msgid "_Stop Scan"
 msgstr "_Спири сканирането"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "Изпрати по _имейл"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Завърти _наляво"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Завърти на_дясно"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Изрежи"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Нищо"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Персонализирано"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Завърти изрязаното"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Премести наляво"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Премести надясно"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Помощ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Съдържание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Създай нов документ"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Нов"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Сканиране на една страница със скенера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Сканирай"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Съхрани документа като файл"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Съхрани"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Спри текущото сканиране"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Спри"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Завърти страницата на ляво (обратно на часовниковата стрелка)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Завърти наляво"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Завърти страницата на дясно (по часовниковата стрелка)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Завърти надясно"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Изрежи избраната страница"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Изрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Изт_очник на сканиране:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Резолюция на текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Резолюция на снимката:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Избор на страна за сканиране:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Размер на листа:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Яркост:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Контраст:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Качество:"
 
@@ -437,121 +443,141 @@ msgid "Scanned Document"
 msgstr "Сканиран документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Инструмент за сканиране"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Изпълнете „%s --help“, за да видите списъка с всички опции на командния ред."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Сканиран документ.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Затвори"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Необходими са потребителско име и парола за достъп до '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Не са открити скенери"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Моля проверете дали скенерът ви е свързан и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Съхрани като..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Отмени"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Съхрани"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Файлове с изображения"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Всички файлове"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Избор на _тип файл"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (документ с много страници)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (компресирани)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (без загуби на качеството)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Неусшно съхраняване на файла"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ако не запазите, промените ще бъдат изгубени."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Да съхраним ли текущия документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Откажи промените"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Изображението не може да бъде запазено за предварителен преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Невъзможно е отварянето на приложение за преглед на изображението"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Помощния файл не може да бъде отворен"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -582,111 +608,129 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "За програмата"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Инструмент за опростено сканиране на документи"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Atanas Kovachki https://launchpad.net/~zdar\n"
 "  Boyan Sotirov https://launchpad.net/~lz1dsb\n"
 "  Krasimir Chonov https://launchpad.net/~kchonov\n"
-"  Miroslav E. Hadzhiev (Хаджиев) https://launchpad.net/~extigyro\n"
+"  Miroslav E. Hadzhiev (Хаджиев) https://launchpad.net/~xtigyro\n"
 "  Svetoslav Stefanov https://launchpad.net/~svetlisashkov\n"
 "  Tora Shiro https://launchpad.net/~tora-shiro\n"
 "  i.raynov https://launchpad.net/~ivaylo-raynov\n"
 "  Филип Андонов https://launchpad.net/~vonodna"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Да съхраня ли документа, преди да затворите програмата?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Излез без запазване"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по подразбиране)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (чернова)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (висока разделителна способност)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Липсващи файлове"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Моля, проверете дали правилно сте инсталирали програмата"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Смени _скенера"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Тъмно"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Светло"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Малко"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Много"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Минимално"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Максимално"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Съхраняване на документа..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Съхраняване на страница %d от %d"
@@ -694,6 +738,9 @@ msgstr "Съхраняване на страница %d от %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Липсващи файлове"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -800,3 +847,6 @@ msgstr "Съхраняване на страница %d от %d"
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Резолюция на последното сканирано изображение"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Моля, проверете дали правилно сте инсталирали програмата"
diff --git a/po/bo.po b/po/bo.po
index f0479bc..8cb667a 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Tibetan <bo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "སྤྲོད་མཁན་ནས་བྱུང་བའི་ཤོ
 msgid "_Stop Scan"
 msgstr "པར་ལེན་མཚམས་བཞག_S"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "གློག་འཕྲིན_E"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "ཤོག་ལེབ_P"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "གཡོན་སྐོར _L"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "གཡས་སྐོར་ _R"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "གཅོད_C"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "ཅི་མེད་པ_N"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "འཕྲིན་ཡིག_L"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "ཁྲིམས་མཐུན_g"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "སྲོལ་རྒྱུན_C"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "དྲས་གཅོད་སྐོར་བ_R"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "གཡོན་ལ་སྤོར"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "གཡས་ལ་སྤོར"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "རོགས་རམ_H"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "ནང་གསེས_C"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "ཡིག་གེ་གསར་འཛུགས"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "གསར་པ"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "པར་བཤུ་ཆས་ནས་བྱུང་བའི་ཤོག་བུ་རྐང་ཅིག་དེ་པར་བཤུ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "པར་བཤུ"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "ཡི་གེ་ཡིག་ཆའི་ནང་གསོག་ཉར"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "གསོག་ཉར"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "པར་བཤུ་བྱེད་བཞིན་པ་དེ་མཚམས་བཞག"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "མཚམས་བཞག"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ཤོག་ལེབ་གཡོན་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "གཡོན་སྐོར"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ཤོག་ལེབ་གཡས་སྐོར་རྒྱག་པ"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "གཡས་སྐོར"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "བདམས་ཟིན་པའི་ཤོག་ལེབ་གཅད་བཟོ"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "གཅད"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "རང་མོས་སྒྲིག་བཟོ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "པར་བཤུ་གཏེར་མཛོད_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "ཡི་གེའི་སྤུས་ཚད_T"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "པར་གྱི་སྤྭུས་ཚད"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "ཟུར་པར་བཤུ"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "ཤོག་ལེབ་ཞེང་ཚད"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -433,120 +439,140 @@ msgid "Scanned Document"
 msgstr "པར་བཤུ་ཚར་བའི་ཡི་གེ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "པར་བཤུས་ཡིག་ཆ.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s'མཁོ་སྤྱོད་བྱེད་པར་སྤྱོད་མཁན་མིང་དང་གསང་གྲངས་དགོས་པ"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "པར་བཤུ་ཆས་རྙེད་མ་བྱུང་"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "ཁྱོད་ཀྱི་པར་བཤུ་ཆས་སྦྲེལ་ཡོད་པ་དང་གློག་བཏང་ཡོད་པར་དག་བཤེར་བྱེད་རོགས"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "ཉར་སྟངས་་་"
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "གཟུགས་བརྙན་ཡིག་ཆ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "ཡིག་ཆ་ཡོངས་རྫོགས"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "ཡིག་ཆའི་རིགས་གདམ་པ_T"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF(ཤོག་ལེབ་མང་པོའི་ཡིག་ཆ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (བསྡུ་འཇུག)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (བོར་བརླག་མ་ཤོར་བ)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "ཡིག་ཆ་གསོག་འཇོག་བྱེད་མ་ཐུབ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ཁྱོད་ཀྱིས་གསོག་འཇོག་མ་བྱས་ན་བཟོ་བཅོས་རྣམས་ནམ་ཡང་བརླགས་འགྲོ་ངེས"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "དང་ཐོག་གི་ཡིག་ཆ་ཉར་ཚགས"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "བཟོ་བཅོས་རྣམས་འདོར་བ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "སྔོན་ལྟ་ཉེར་སྤྱོད་ཁ་ཕྱེ་མ་ཐུབ་པ"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "རོགས་འདེགས་ཡིག་ཆ་ཁ་ཕྱེ་མ་ཐུབ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -575,104 +601,122 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "པར་བཤུ་བ་དཀྱུས་མའི་སྐོར"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "ཡིག་ཆ་པར་བཤུ་ཆས་དཀྱུས་མ"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Tennom https://launchpad.net/~tennomyathog"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "ཕྱིར་འཐེན་མ་བྱས་གོང་གསོག་འཇོག་བྱེད་པ"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "གསོག་འཇོག་མ་བྱས་པར་ཕྱིར་འཐེན"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (སྔོན་འཛུགས)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ཟིན་བྲིས)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (སྤུས་ཚད་མཐོན་པོ)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "ཡིག་ཆ་བརླགས་ཚར་འདུག"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "ཁྱོད་ཀྱི་སྒྲིག་འཇུག་ཞིབ་བཤེར་གནང་རོགས"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "པར་བཤུ་ཆས་བརྗེ་བ_S"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "ར་ང་འགུལ་ངང"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -768,3 +812,9 @@ msgstr ""
 #~ "  --sync                          Make X calls synchronous\n"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
+
+#~ msgid "Files missing"
+#~ msgstr "ཡིག་ཆ་བརླགས་ཚར་འདུག"
+
+#~ msgid "Please check your installation"
+#~ msgstr "ཁྱོད་ཀྱི་སྒྲིག་འཇུག་ཞིབ་བཤེར་གནང་རོགས"
diff --git a/po/ca.po b/po/ca.po
index 7089933..5ca5994 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 08:57+0000\n"
 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Totes les pàgines de l'a_limentador"
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Escaneja una sola pàgina de l'escàner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Desa el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Desa"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Atura l'escaneig actual"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Atura"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualitat:"
 
@@ -440,122 +446,142 @@ msgid "Scanned Document"
 msgstr "Document escanejat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordres."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Tanca"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Anomena i desa..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "De_sa"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "No s'ha pogut desar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho deseu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut desar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -587,20 +613,20 @@ msgstr ""
 "juntament amb aquest programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Adolfo Jayme https://launchpad.net/~fitoschido\n"
+"  Adolfo Jayme https://launchpad.net/~fitojb\n"
 "  David Planella https://launchpad.net/~dpm\n"
 "  J. https://launchpad.net/~jose-manuel-rodriguez-moreno\n"
 "  J. Gregpori Raya https://launchpad.net/~gregori\n"
@@ -611,88 +637,106 @@ msgstr ""
 "  pancake https://launchpad.net/~pancake"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Voleu desar el document abans de sortir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Surt sense desar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Manquen fitxers"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Comproveu la vostra instal·lació"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Més fosc"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Més clar"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Menys"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Més"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mínim"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Màxim"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "S'està desant la pàgina %d de %d"
@@ -730,6 +774,12 @@ msgstr "S'està desant la pàgina %d de %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Comproveu la vostra instal·lació"
+
+#~ msgid "Files missing"
+#~ msgstr "Manquen fitxers"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Alçada de la imatge escanejada en píxels"
 
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 46ca615..a5a410f 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan (Valencian) <ca@valencia@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,205 +87,211 @@ msgstr "Totes les pàgines de l'a_limentador"
 msgid "_Stop Scan"
 msgstr "_Atura l'escaneig"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Envia per correu"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Pàgina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Gira a l'_esquerra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Gira a la _dreta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Escapçament"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Carta EUA"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal EUA"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalitzat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Gira l'escapçament"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mou a l'esquerra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mou a la dreta"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "C_ontingut"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Comença un document nou"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Escaneja una sola pàgina de l'escàner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Escaneja"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Alça el document en un fitxer"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Alça"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
-msgstr "Para l'escaneig actual"
+msgstr "Atura l'escaneig actual"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
-msgstr "Para"
+msgstr "Atura"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Gireu la pàgina cap a l'esquerra (en sentit antihorari)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Gira a l'esquerra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Gireu la pàgina cap a la dreta (en sentit horari)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Gira a la dreta"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Escapça la pàgina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Escapça"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferències"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Font d'_escaneig:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Resolució de text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Resolució fotogràfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Cara a escanejar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Mida de la pàgina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
-msgstr ""
+msgstr "Brillantor:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
-msgstr ""
+msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
-msgstr ""
+msgstr "Qualitat:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
@@ -337,19 +343,19 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Brillantor de l'escaneig"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "L'ajustament de la brillantor, de -100 a 100 (on 0 significa cap)"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Contrast de l'escaneig"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "L'ajustament del contrast, de -100 a 100 (on 0 significa cap)"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
@@ -388,11 +394,11 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Valor de la qualitat a utilitzar per la compressió JPEG."
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
@@ -412,7 +418,7 @@ msgstr "No s'ha pogut iniciar l'escaneig"
 #. Error displayed when communication with scanner broken
 #: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
-msgstr "S'ha produït un error en comunicar-s'amb l'escàner"
+msgstr "S'ha produït un error en comunicar-se amb l'escàner"
 
 #. Help string for command line --version flag
 #: ../src/simple-scan.vala:21
@@ -440,122 +446,142 @@ msgid "Scanned Document"
 msgstr "Document escanejat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIU...] - Utilitat d'escaneig"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Executeu «%s --help» per veure la llista completa d'opcions disponibles de "
 "la línia d'ordes."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document escanejat.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
-msgstr ""
+msgstr "_Tanca"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Cal un usuari i contrasenya per a accedir a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "No s'ha detectat cap escàner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Comproveu que l'escàner està connectat i engegat"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Anomena i alça..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel·la"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
-msgstr ""
+msgstr "Al_ça"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Fitxers d'imatge"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Tots els fitxers"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Seleccioneu el _tipus de fitxer"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipàgina)."
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimit)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sense pèrdua)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "No s'ha pogut alçar el fitxer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Si no ho alceu, els canvis es perdran per sempre més."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Voleu alçar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Descarta els canvis"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "No s'ha pogut alçar la imatge per previsualitzar-la"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "No s'ha pogut obrir l'aplicació de previsualització d'imatges"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "No s'ha pogut obrir el fitxer d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -587,16 +613,16 @@ msgstr ""
 "juntament amb este programa. Si no, mireu <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Quant a l'escaneig senzill"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Eina senzilla d'escaneig de documents"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -604,91 +630,109 @@ msgstr ""
 "  Joan Duran https://launchpad.net/~jodufi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Voleu alçar el document abans d'eixir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Ix sense alçar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminat)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (esborrany)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolució)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Manquen fitxers"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Comproveu la vostra instal·lació"
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Canvia l'e_scàner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
-msgstr ""
+msgstr "Més fosc"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
-msgstr ""
+msgstr "Més clar"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
-msgstr ""
+msgstr "Menys"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
-msgstr ""
+msgstr "Més"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
-msgstr ""
+msgstr "Mínim"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
-msgstr ""
+msgstr "Màxim"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
-msgstr "S'està alçant el document..."
+msgstr "S'està desant el document..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr "S'està alçant la pàgina %d de %d"
+msgstr "S'està desant la pàgina %d de %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
@@ -715,13 +759,6 @@ msgstr "S'està alçant la pàgina %d de %d"
 #~ "esquerra)."
 
 #~ msgid ""
-#~ "The height of scanned image in pixels. This value is updated to what the "
-#~ "last scanned page was."
-#~ msgstr ""
-#~ "L'alçada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
-#~ "que tenia l'última pàgina escanejada."
-
-#~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
 #~ "El costat de la pàgina a escanejar. Pot ser un dels següents: «both» "
@@ -731,13 +768,6 @@ msgstr "S'està alçant la pàgina %d de %d"
 #~ msgstr ""
 #~ "La resolució en punts per polzada de la imatge prèviament escanejada."
 
-#~ msgid ""
-#~ "The width of scanned image in pixels. This value is updated to what the last "
-#~ "scanned page was."
-#~ msgstr ""
-#~ "L'amplada de la imatge escanejada en píxels. Este valor s'ha actualitzat al "
-#~ "que tenia l'última pàgina escanejada."
-
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Amplada de la imatge escanejada en píxels"
 
@@ -771,6 +801,12 @@ msgstr "S'està alçant la pàgina %d de %d"
 #~ "  --help-all                      Mostra l'ajuda de totes les opcions\n"
 #~ "  --help-gtk                      Mostra l'ajuda de les opcions de la GTK+"
 
+#~ msgid "Files missing"
+#~ msgstr "Manquen fitxers"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Comproveu la vostra instal·lació"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direcció de l'escànner a través de la pàgina escanejada."
 
@@ -804,3 +840,17 @@ msgstr "S'està alçant la pàgina %d de %d"
 #~ "Tipus de document a escanejar. «text» per documents de text o «photo» per "
 #~ "fotos. Aquest paràmetre decideix la resolució de l'escaneig, els colors i el "
 #~ "postprocessament."
+
+#~ msgid ""
+#~ "The height of scanned image in pixels. This value is updated to what the "
+#~ "last scanned page was."
+#~ msgstr ""
+#~ "L'alçada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat al "
+#~ "que tenia l'última pàgina escanejada."
+
+#~ msgid ""
+#~ "The width of scanned image in pixels. This value is updated to what the last "
+#~ "scanned page was."
+#~ msgstr ""
+#~ "L'amplada de la imatge escanejada en píxels. Aquest valor s'ha actualitzat "
+#~ "al que tenia l'última pàgina escanejada."
diff --git a/po/cs.po b/po/cs.po
index a2df49f..43710fd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2013-12-18 12:25+0000\n"
 "Last-Translator: Tadeáš Pařík <tadeas.parik@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Všechny stránky z _podavače"
 msgid "_Stop Scan"
 msgstr "_Zastavit skenování"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Oříznout"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "Žád_né"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Vlastní"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Otočit ořez"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Posunout doleva"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Posunout doprava"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Nápověda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Obsah"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Vytvořit nový dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Naskenovat jednu stránku ze skeneru"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skenovat"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Uložit dokument do souboru"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Uložit"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Zastavit probíhající skenování"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Zastavit"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Otočit stránku doleva (proti směru hodinových ručiček)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Otočit doleva"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Otočit stránku doprava (po směru hodinových ručiček)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Otočit doprava"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Oříznout vybranou stránku"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Oříznout"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Předvolby"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Zdroj skenování:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Rozlišení textu:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Rozlišení fotografie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skenovat stranu:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Velikost stránky:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Jas:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -438,122 +444,142 @@ msgid "Scanned Document"
 msgstr "Skenovaný dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZAŘÍZENÍ...] - Nástroj pro skenování"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Spustit příkaz „%s --help“ k zobrazení úplného seznamu dostupných přepínačů "
 "příkazové řádky."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "Z_avřít"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Pro přístup k '%s' je vyžadováno uživatelské jméno a heslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nenalezen žádný skener"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Zkontrolujte prosím, že je váš skener připojen a zapnut"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Uložit"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Soubory obrázků"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Všechny soubory"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Zvolit _typ souboru"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (vícestránkový dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimovaný)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (bezeztrátový)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Uložení souboru selhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Pokud neuložíte, změny budou nenávratně ztraceny."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Uložit stávající dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Zahodit změny"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nezdařilo se uložit obrázek pro náhled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Nelze otevřít aplikaci s náhledem obrázku"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Nelze otevřít soubor s nápovědou"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -583,16 +609,16 @@ msgstr ""
 "Pokud ne, přečtěte si ji na stránce <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "O aplikaci Jednoduché skenování"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Jednoduchý nástroj pro skenování dokumentů"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -608,88 +634,106 @@ msgstr ""
 "  la_serpe https://launchpad.net/~tom-mil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Uložit dokument před ukončením?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Ukončit bez uložení"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (výchozí)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (náčrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (vysoké rozlišení)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Soubory chybí"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Zkontrolujte prosím svoji instalaci"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Změnit _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Tmavší"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Světlejší"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Méně"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Více"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Ukládání dokumentu..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukládání strany %d z %d"
@@ -697,6 +741,12 @@ msgstr "Ukládání strany %d z %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Zkontrolujte prosím svoji instalaci"
+
+#~ msgid "Files missing"
+#~ msgstr "Soubory chybí"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Výška skenovaného obrázku v pixelech"
 
diff --git a/po/da.po b/po/da.po
index ebe03b3..18fc77e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-10-10 12:13+0000\n"
 "Last-Translator: AJenbo <anders@jenbo.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Alle sider fra _arkføderen"
 msgid "_Stop Scan"
 msgstr "_Stop skanning"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Send med e-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rotér mod _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rotér mod _højre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Beskær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Brugertilpasset"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotér beskæring"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Flyt til venstre"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Flyt til højre"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Hjælp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Indhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Start et nyt dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nyt"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Skan en enkelt side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Gem dokument som en fil"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Gem"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Stop den igangværende skanning"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotér siden mod venstre (mod uret)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rotér mod venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotér siden mod højre (med uret)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rotér mod højre"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Beskær den markerede side"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Beskær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Indstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Skanner_kilde:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Tekstopløsning:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Billedopløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skan side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -438,122 +444,142 @@ msgid "Scanned Document"
 msgstr "Skannet dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHED...] - Skanningsredskab"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Udfør \"%s --help\" for at se den fulde liste af tilgængelige "
 "kommandolinjetilvalg."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Skannet dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
-msgstr ""
+msgstr "_Luk"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Brugernavn og adgangskode er krævet for at tilgå \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Ingen skannere fundet"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollér venligst at skanneren er tændt og sluttet til"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annullér"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
-msgstr ""
+msgstr "_Gem"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Billedfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Alle filer"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Vælg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidet dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimeret)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (tabsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Kunne ikke gemme fil"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke gemmer, vil ændringer gå permanent tabt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Gem nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Kassér ændringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Kan ikke gemme billede for forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Kunne ikke åbne programmet til forhåndsvisning af billeder"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Kan ikke åbne hjælpefil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -582,16 +608,16 @@ msgstr ""
 "sammen med dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Om Simpel skanning"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Simpelt dokumentskanningsværktøj"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -608,88 +634,106 @@ msgstr ""
 "  Torben Gundtofte-Bruun https://launchpad.net/~torbengb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Gem dokumentet før der afsluttes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Afslut uden at gemme"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (udkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høj opløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Filer mangler"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Kontrollér venligst din installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Skift _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Mere"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Gemmer dokument ..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gemmer side %d ud af %d"
@@ -697,6 +741,12 @@ msgstr "Gemmer side %d ud af %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Kontrollér venligst din installation"
+
+#~ msgid "Files missing"
+#~ msgstr "Filer mangler"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Skanneretning"
 
diff --git a/po/de.po b/po/de.po
index 871d145..c0556bd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: Daniel Schury <das.surst@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Alle Seiten aus dem _Papiereinzug"
 msgid "_Stop Scan"
 msgstr "_Scanvorgang anhalten"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Seiten umsortieren"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-Mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Seite"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "_Links herum drehen"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "_Rechts herum drehen"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Zuschneiden"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Nicht zuschneiden"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4\" × 6\""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Benutzerdefiniert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Zuschneideauswahl _drehen"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Nach links schieben"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Nach rechts schieben"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Hilfe"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "I_nhalt"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Neues Dokument erstellen"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Neu"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Eine einzelne Seite vom Scanner einscannen"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Als Datei speichern"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Speichern"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Aktuellen Scanvorgang unterbrechen"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Anhalten"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Die Seite links herum drehen (Gegen den Uhrzeigersinn)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Links herum drehen"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Die Seite rechts herum drehen (Im Uhrzeigersinn)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rechts herum drehen"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Die gewählte Seite zurechtschneiden"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Zuschneiden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Scan-_Quelle:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Text-Auflösung:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Foto-_Auflösung:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Zu scannende Seite:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Seitengröße:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Helligkeit:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualität:"
 
@@ -439,125 +445,145 @@ msgid "Scanned Document"
 msgstr "Gescanntes Dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[GERÄT …] - Scan-Werkzeug"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Rufen Sie »%s --help« auf, um eine vollständige Liste der verfügbaren "
 "Befehlszeileoptionen zu erhalten."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Gescanntes Dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "S_chließen"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 "Für den Zugriff auf »%s« werden ein Benutzername und ein Passwort benötigt"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Kein Scanner gefunden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Bitte überprüfen Sie, ob Ihr Scanner angeschlossen und eingeschaltet ist"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Speichern unter …"
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Speichern"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Bilddateien"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Alle Dateitypen"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Datei-_Typ auswählen"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (Mehrseitiges Dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (Verlustbehaftet)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (Verlustfrei)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Datei konnte nicht gespeichert werden"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Änderungen verwerfen"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Vorschaubild kann nicht gespeichert werden"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Bildvorschauanwendung konnte nicht gestartet werden"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Vertauschen"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Unverändert lassen"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Die Hilfedatei konnte nicht geöffnet werden"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -591,20 +617,21 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Über Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Einfaches Werkzeug zum Scannen von Dokumenten"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  .daniel. https://launchpad.net/~faessje\n"
+"  Alexander Wilms https://launchpad.net/~alexander-wilms\n"
 "  Alvaro Aleman https://launchpad.net/~alvaroaleman\n"
 "  Charon https://launchpad.net/~markus-lobedann\n"
 "  Daniel Schury https://launchpad.net/~surst\n"
@@ -633,6 +660,7 @@ msgstr ""
 "  Stefan Buchholz https://launchpad.net/~stef-buchholz\n"
 "  Steve G. https://launchpad.net/~sgo.ger\n"
 "  Thomas Heidrich https://launchpad.net/~gnuheidix\n"
+"  Tobias Bannert https://launchpad.net/~toba\n"
 "  Webschiff https://launchpad.net/~webschiff\n"
 "  William Glover https://launchpad.net/~williamglover\n"
 "  simon danner https://launchpad.net/~simondanner\n"
@@ -640,88 +668,106 @@ msgstr ""
 "  tlue https://launchpad.net/~tlueber"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Dokument vor dem Beenden speichern?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Beenden ohne zu speichern"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (Vorgabe)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (Entwurf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (Hohe Auflösung)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Dateien nicht gefunden"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Bitte überprüfen Sie Ihre Installation"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "_Scanner wechseln"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Dunkler"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Heller"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Weniger"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Dokument wird gespeichert …"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Seite %d von %d wird gespeichert"
@@ -729,6 +775,9 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Dateien nicht gefunden"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -751,6 +800,9 @@ msgstr "Seite %d von %d wird gespeichert"
 #~ "  --gtk-module=MODULE            Zusätzliche GTK+-Module laden\n"
 #~ "  --g-fatal-warnings              All Warnungen werden zu fatalen"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Bitte überprüfen Sie Ihre Installation"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Fensterhöhe in Pixel"
 
diff --git a/po/el.po b/po/el.po
index 04cd926..45d3cf4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2013-07-03 07:45+0000\n"
 "Last-Translator: John Pag <ioanpagges@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Όλες τις σελίδες από την _τροφοδοσία"
 msgid "_Stop Scan"
 msgstr "_Διακοπή σάρωσης"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Σελίδα"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Περιστροφή _αριστερά"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Περιστροφή _δεξιά"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Περικοπή"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Κανένα"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6 ίντσες"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Προσαρμοσμένο"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Περιστροφή περικοπής"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Μετακίνηση αριστερά"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Μετακίνηση δεξιά"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Βοήθεια"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Δημιουργία νέου εγγράφου"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Νέο"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Σάρωση μίας σελίδας από τον σαρωτή"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Σάρωση"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Αποθήκευση"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Διακοπή τρέχουσας σάρωσης"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Διακοπή"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Περιστροφή της σελίδας αριστερά"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Περιστροφή αριστερά"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Περιστροφή της σελίδας δεξιά"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Περιστροφή δεξιά"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Περικοπή της επιλεγμένης σελίδας"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Περικοπή"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Πηγή σάρωσης:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Ανάλυση _κειμένου:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Ανάλυση _φωτογραφίας:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Πλευρά σάρωσης"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Μέγεθος σελίδας:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Φωτεινότητα:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Αντίθεση:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Ποιότητα:"
 
@@ -444,124 +450,144 @@ msgid "Scanned Document"
 msgstr "Σαρωμένο"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ΣΥΣΚΕΥΗ…] - Εφαρμογή σάρωσης"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Εκτελέστε «%s --help» για να δείτε την πλήρη λίστα των διαθέσιμων επιλογών "
 "εντολής γραμμής."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Σαρωμένο.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Απαιτείται όνομα χρήστη και κωδικός για την πρόσβαση στο '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Δεν ανιχνεύθηκαν σαρωτές"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Παρακαλούμε βεβαιωθείτε ότι ο σαρωτής σας είναι συνδεδεμένος και σε "
 "λειτουργία"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "Απο_θήκευση"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Αρχεία εικόνων"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Όλα τα αρχεία"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Επιλογή _τύπου αρχείου"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (έγγραφο πολλαπλών σελίδων)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (συμπιεσμένο)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (δίχως συμπίεση)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Αποτυχία αποθήκευσης του αρχείου"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές θα χαθούν μόνιμα."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Αποθήκευση του τρέχοντος εγγράφου;"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Απόρριψη αλλαγών"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Αδυναμία αποθήκευσης σελίδας για προεπισκόπηση"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Αδύνατο το άνοιγμα της εφαρμογής προβολής εικόνων"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -593,16 +619,16 @@ msgstr ""
 "εδώ: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Περί Σάρωσης"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Απλό εργαλείο σάρωσης εγγράφων"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -621,88 +647,106 @@ msgstr ""
 "  trix https://launchpad.net/~panelc"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Αποθήκευση του εγγράφου πριν την έξοδο;"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Έξοδος χωρίς Αποθήκευση"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (προεπιλογή)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (πρόχειρο)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (υψηλή ανάλυση)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Λείπουν αρχεία"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Παρακαλούμε ελέγξτε την εγκατάσταση σας"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Αλλαγή _σαρωτή"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Σκοτεινότερο"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Φωτεινότερο"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Λιγότερο"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Περισσότερο"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Ελάχιστο"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Μέγιστο"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Αποθήκευση εγγράφου..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Αποθήκευση σελίδας %d από %d"
@@ -778,6 +822,12 @@ msgstr "Αποθήκευση σελίδας %d από %d"
 #~ "  --help-all Εμφάνιση όλων των επιλογών βοήθειας\n"
 #~ "  --help-gtk Εμφάνιση επιλογών GTK+"
 
+#~ msgid "Files missing"
+#~ msgstr "Λείπουν αρχεία"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Παρακαλούμε ελέγξτε την εγκατάσταση σας"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
diff --git a/po/en_GB.po b/po/en_GB.po
index 572cd3e..7ce3e3a 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 08:58+0000\n"
 "Last-Translator: James Thorrold <jameslin@inbox.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "All Pages From _Feeder"
 msgid "_Stop Scan"
 msgstr "_Stop Scan"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Reorder Pages"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rotate _Left"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rotate _Right"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_None"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Move Left"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Move Right"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Help"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Contents"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Start a new document"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "New"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Scan a single page from the scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Save document to a file"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Save"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Stop the current scan"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Stop"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotate the page to the left (anti-clockwise)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rotate Left"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotate the page to the right (clockwise)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rotate Right"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Crop the selected page"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Crop"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Photo Resolution:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Page Size:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brightness:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -437,121 +443,141 @@ msgid "Scanned Document"
 msgstr "Scanned Document"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Close"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Username and password required to access '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "No scanners detected"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Please check your scanner is connected and powered on"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Save"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "All Files"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Select File _Type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Failed to save file"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "If you don't save, changes will be permanently lost."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Save current document?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Unable to save image for preview"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Combine sides"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Combine sides (reverse)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Reverse"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Keep unchanged"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Unable to open help file"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -580,114 +606,130 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "About Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Denvir https://launchpad.net/~coldfff\n"
 "  Andi Chandler https://launchpad.net/~bing\n"
 "  Anthony Harrington https://launchpad.net/~untaintableangel\n"
-"  Anthony Scarth https://launchpad.net/~maroubal2\n"
 "  GeorgeB https://launchpad.net/~solar.george\n"
 "  James Thorrold https://launchpad.net/~jthorrold\n"
 "  Jonathon Hodges https://launchpad.net/~jonblondie\n"
 "  Kaustav Das Modak https://launchpad.net/~kaustav-dasmodak\n"
 "  Malcolm Parsons https://launchpad.net/~malcolm-parsons\n"
-"  Robert Readman https://launchpad.net/~robert-readman\n"
 "  Tomasz Chabowski https://launchpad.net/~tomasz-chabowski-googlemail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Save document before quitting?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Quit without Saving"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Please check your installation"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Darker"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Lighter"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Less"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "More"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Saving document..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saving page %d out of %d"
@@ -695,6 +737,12 @@ msgstr "Saving page %d out of %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Please check your installation"
+
+#~ msgid "Files missing"
+#~ msgstr "Files missing"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
diff --git a/po/eo.po b/po/eo.po
index dbe3b71..0e4aeea 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-08-16 11:04+0000\n"
 "Last-Translator: Michael Moroni <michael.moroni@mailoo.org>\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 "Language: eo\n"
 
 #. Button to submit authorization dialog
@@ -88,203 +88,209 @@ msgstr "Ĉiuj paĝoj el _papero-metilo"
 msgid "_Stop Scan"
 msgstr "Haltigi _skani"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "R_etpoŝto"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Paĝo"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Turni _maldekstren"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Turni _dekstren"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "Stu_ci"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Neniu"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Propre"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotacii la stoco-lokon"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Movi maldekstren"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Movi dekstren"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Helpo"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Enhavo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Komenci novan dokumenton"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nova"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Skani unuopan paĝon el la skanilo"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skani"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Konservi dokumenton en dosiero"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Konservi"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Haltigi la aktualan skanon"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Haltigi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotacii la paĝon maldekstren (maldekstrume)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Turni maldekstren"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotacci la paĝon dekstren (dekstrume)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Turni dekstren"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Stuci la elektitan paĝon"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Stuci"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Agordoj"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Skano-f_onto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Teksta distingivo"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Fotaĵa distingivo:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skano-flanko:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Paĝo-grando:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -438,121 +444,141 @@ msgid "Scanned Document"
 msgstr "Skanita Dokumento"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APARATO...] - Skanutilaĵo"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Lanĉu '%s --help' por vidi plenan liston da disponeblaj komandliniaj opcioj."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Skanita Dokumento.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Salutnomo kaj pasvorto estas necesa aliri '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Neniuj skaniloj eltrovis"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Bonvolu kontrolas ke via skanilo estas kenekta kaj kurentŝalta"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Konservi kiel..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Bildo-dosieroj"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Ĉiuj dosieroj"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Elekti speco de dosieron"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (multpaĝa dokumento)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (densigita)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (senperda)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Ne sukcesis konservi la dosieron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se vi ne konservas, ŝanĝoj estos perditaj permanente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Konservi la nunan dokumenton?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Forlasi Ŝanĝojn"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Ne eblas konservi bildon por antaŭrigardo"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Ne eblis malfermi bild-dosieron"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Ne eblis malfermi help-dosieron"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -582,16 +608,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Pri simpla skani"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Simpla ilo por skanantaj dokumentoj"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -604,88 +630,106 @@ msgstr ""
 "  Tiffany Antopolski https://launchpad.net/~mimico-tiffany"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Konservi dokumenton antaŭe ĉesanta?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Fini sen konservanta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d punktoj en colo (defaŭlto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d punktoj en colo (malneto)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d punktoj en colo (alta distingivo)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d punktoj en colo"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Dosieroj estas perdiĝantoj"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Bonvolu kontroli vian instalaĵon"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Ŝanĝi _Skanilo"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Aŭtomata"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Konservado de dokumento..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Konservado de paĝo %d el %d"
@@ -799,5 +843,11 @@ msgstr "Konservado de paĝo %d el %d"
 #~ "  --gtk-module=MODULAJ            Ŝargi suplementaj GTK+ moduloj\n"
 #~ "  --g-fatal-warnings              Fari ĉiujn avertojn neripareblaj"
 
+#~ msgid "Files missing"
+#~ msgstr "Dosieroj estas perdiĝantoj"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Bonvolu kontroli vian instalaĵon"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "La direkto de la skanilo trans la skanota paĝo"
diff --git a/po/es.po b/po/es.po
index 92cd27b..0a46d2e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
-"PO-Revision-Date: 2012-07-23 08:59+0000\n"
-"Last-Translator: Monkey <monkey.libre@gmail.com>\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
+"PO-Revision-Date: 2014-07-08 02:59+0000\n"
+"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -55,7 +55,7 @@ msgstr "Anverso"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Back"
-msgstr "Atrás"
+msgstr "Reverso"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
@@ -87,203 +87,209 @@ msgstr "Todas las páginas del _alimentador"
 msgid "_Stop Scan"
 msgstr "D_etener escaneado"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Correo"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Girar a la i_zquierda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Girar a la _derecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ninguno"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "_Oficio"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4 × 6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Girar recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mover a la izquierda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mover a la derecha"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "Ay_uda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
-msgstr "_Contenidos"
+msgstr "_Contenido"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Crear un documento nuevo"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nuevo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Escanear una sola página desde el escáner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Guardar documento a un archivo"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Detiene el escaneado actual"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Detener"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Girar la página a la izquierda (contrario a las agujas del reloj)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Girar a la izquierda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Girar la página a la derecha (sentido de las agujas del reloj)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Girar a la derecha"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Recortar la página seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Origen de escaneo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Resolución de _fotografía:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Tamaño de página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -439,122 +445,142 @@ msgid "Scanned Document"
 msgstr "Documento escaneado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO…] - Utilidad de escaneo"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
 "órdenes disponibles."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Documento.pdf escaneado"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Usuario y contraseña necesarios para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "No se detectó ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Compruebe que su escáner está encendido y conectado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Guardar como…"
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Guardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Archivos de imagen"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Todos los archivos"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Seleccione el _tipo de archivo"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multipágina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sin pérdida)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Falló al guardar el archivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Los cambios se perderán permanentemente si no los guarda."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "¿Guardar el documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Descartar cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "No se pudo guardar la imagen para previsualización"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "No se puede abrir la aplicación de previsualización de imágenes"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "No se pudo abrir el archivo de ayuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -583,21 +609,21 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Herramienta sencilla para escanear documentos"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A. Emmanuel Mendoza https://launchpad.net/~a.emmanuelmendoza\n"
-"  Adolfo Jayme https://launchpad.net/~fitoschido\n"
+"  Adolfo Jayme https://launchpad.net/~fitojb\n"
 "  Antonio Sánchez https://launchpad.net/~antoniosanchez\n"
 "  Carlos Alberto Ospina https://launchpad.net/~atah\n"
 "  Dante Díaz https://launchpad.net/~dante\n"
@@ -624,88 +650,106 @@ msgstr ""
 "  serrador https://launchpad.net/~fserrador"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "¿Guardar el documento antes de salir?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Salir sin guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminado)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Faltan archivos"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr "Documento nuevo"
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr "Documento"
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr "Imprimir…"
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Verifique su instalación"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr "Ayuda"
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Cambiar _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Más oscuro"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Más claro"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Más"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Guardando el documento…"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Guardando la página %d de %d"
@@ -736,6 +780,9 @@ msgstr "Guardando la página %d de %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Faltan archivos"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -744,6 +791,9 @@ msgstr "Guardando la página %d de %d"
 #~ "Uso:\n"
 #~ "  %s [DISPOSITIVO...] - utilidad de escaneo"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Verifique su instalación"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Dirección de escaneo"
 
diff --git a/po/et.po b/po/et.po
index 85bfd11..5d2219b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 08:59+0000\n"
 "Last-Translator: mahfiaz <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Kõik lehed _söötjast"
 msgid "_Stop Scan"
 msgstr "_Lõpeta skannimine"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Lehekülg"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Pööra _vasakule"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Pööra _paremale"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Kärbi"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Puudub"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US _Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Kohandatud"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Pööramisega kärbe"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "A_bi"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Sisu"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Uue dokumendi alustamine"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Uus"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Ühe lehekülje skannimine skannerist"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skanni"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Dokumendi salvestamine faili"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Salvesta"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Selle skannimise lõpetamine"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Lõpeta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Lehekülje pööramine vasakule (vastupäeva)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Vasakule pööramine"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Lehekülje pööramine paremale (päripäeva)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Paremale pööramine"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Valitud lehekülje kärpimine"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Kärbi"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Eelistused"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Skannimise _allikas:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Teksti eraldusvõime:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Foto eraldusvõime:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Slaidi skannimine:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Lehekülje suurus:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -434,120 +440,140 @@ msgid "Scanned Document"
 msgstr "Skannitud dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Käivita '%s --help', et näha kõiki käsurea valikuid."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Skannitud dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ligipääsuks on vajalik kasutajanimi ja parool"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Ühtegi skannerit ei tuvastatud"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrolli, kas skanner on ühendatud ja sisse lülitatud"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Salvesta kui..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Pildifailid"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Kõik failid"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Vali faili _tüüp"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (mitmeleheküljeline dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (tihendatud)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (kadudeta)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Faili salvestamine nurjus"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Kui sa ei salvesta, lähevad muudatused jäädavalt kaotsi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Kas salvestada see dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Tühista muudatused"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Eelvaate pildi salvestamine ebaõnnestus"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Pildi eelvaatluse rakendust ei suudetud käivitada"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Abiteabe faili pole võimalik avada"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -577,16 +603,16 @@ msgstr ""
 "<http://www.gnu.org/licences/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Lihtsast skannijast lähemalt"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Lihtne dokumendi skaneerimise tööriist"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -595,88 +621,106 @@ msgstr ""
 "  mahfiaz https://launchpad.net/~mahfiaz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Kas salvestada dokument enne väljumist?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Välju ilma salvestamata"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (vaikimisi)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (mustand)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (kõrge kvaliteet)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Puuduvad failid"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Palun kontrolli paigaldust"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "_Skanneri vahetamine"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Dokumendi salvestamine..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -783,6 +827,12 @@ msgstr ""
 #~ "  --gtk-module=MOODULID     Täiendavate GTK+ moodulite laadimine\n"
 #~ "  --g-fatal-warnings        Kõikide hoiatuste muutmine saatuslikuks"
 
+#~ msgid "Files missing"
+#~ msgstr "Puuduvad failid"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Palun kontrolli paigaldust"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/eu.po b/po/eu.po
index d03ba2a..1bf3db7 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2014-03-11 21:02+0000\n"
 "Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
 "Language-Team: Basque <eu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-12 05:03+0000\n"
-"X-Generator: Launchpad (build 16963)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "_Elikagailuko orri guztiak"
 msgid "_Stop Scan"
 msgstr "_Gelditu eskaneatzea"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Posta elektronikoa"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Orrialdea"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Biratu e_zkerrera"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Biratu e_skuinera"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Moztu"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Bat ere ez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "AEBetako gutuna"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "AEBetako le_gala"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Pertsonalizatua"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Biratu mozketa"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mugitu ezkerrera"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mugitu eskuinera"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Laguntza"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Edukiak"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Hasi dokumentu berria"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Berria"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Eskaneatu eskanerreko orrialde bakarra"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Eskaneatu"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Gorde dokumentua fitxategi batean"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Gorde"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Gelditu uneko eskaneatzea"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Gelditu"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Biratu orrialdea ezkerrera (erlojuaren kontrako noranzkoan)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Biratu ezkerrera"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Biratu orrialdea eskuinra (erlojuaren noranzkoan)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Biratu eskuinera"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Moztu hautatutako orrialdea"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Moztu"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Hobespenak"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Eskaneatze-_jatorria:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Testu-bereizmena:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Ar_gazki-bereizmena:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Eskaneatze-aldea:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Orrialde-tamaina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Distira:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrastea:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kalitatea:"
 
@@ -440,120 +446,140 @@ msgid "Scanned Document"
 msgstr "Eskaneatutako dokumentua"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Eskaneatze-aplikazioa"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Exekutatu '%s --help' komando-lerroko aukera guztiak zerrendatzeko."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Dokumentu.pdf eskaneatuta"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Itxi"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Erabiltzaile-izena eta pasahitza behar dira '%s' atzitzeko"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Ez da eskanerrik detektatu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Egiaztatu zure eskanerra konektatuta eta piztuta dagoela"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Gorde honela..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Gorde"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Irudi-fitxategiak"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Fitxategi guztiak"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Hautatu fit_xategi-mota"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (orrialde anitzeko dokumentua)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (konprimitua)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (galerarik gabea)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Ezin izan da fitxategia gorde"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Gordetzen ez baduzu, aldaketak betiko galduko dira."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Gorde uneko dokumentua?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Baztertu aldaketak"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Ezin izan da aurrebistarako irudia gorde"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Ezin izan da ireki irudiaren aurrebistarako aplikazioa"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Ezin izan da ireki laguntza-fitxategia"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -582,16 +608,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Simple Scan-i buruz"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Dokumentuak eskaneatzeko tresna sinplea"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -606,88 +632,106 @@ msgstr ""
 "  Xabier Isla Rodriguez https://launchpad.net/~xabier.isla"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Gorde dokumentua irten baino lehen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Irten gorde gabe"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (lehenetsia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (zirriborroa)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (bereizmen altua)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Fitxategiak falta dira"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Egiaztatu instalazioa"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Aldatu e_skanerra"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Ilunago"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Argiago"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Gutxiago"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimoa"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximoa"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Dokumentua gordetzen..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d orria (%d-etik) gordetzen"
@@ -695,6 +739,9 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Fitxategiak falta dira"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Eskaneatutako irudiaren altuera pixeletan"
 
@@ -709,6 +756,9 @@ msgstr "%d orria (%d-etik) gordetzen"
 #~ "Erabilera:\n"
 #~ "  %s [GAILUA...] - Eskaneatzeko utilitatea"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Egiaztatu instalazioa"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
diff --git a/po/fi.po b/po/fi.po
index 6aa3304..cf84f92 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2013-09-22 12:07+0000\n"
 "Last-Translator: Jiri Grönroos <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Kaikki sivut _laitteelta"
 msgid "_Stop Scan"
 msgstr "Py_säytä kuvanluku"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Järjestä sivut"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Sähköposti"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Sivu"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Kierrä _vasemmalle"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Kierrä _oikealle"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Rajaa"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ei mitään"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US Legal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Muu"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Kierr_ä rajausta"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Siirrä vasemmalle"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Siirrä oikealle"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "O_hje"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Sisältö"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Aloita uusi asiakirja"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Uusi"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Lue yksi sivu kuvanlukijalta"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Lue"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Tallenna asiakirja tiedostoon"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Tallenna"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Pysäytä kuvan lukeminen"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Pysäytä"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Kierrä sivua vasemmalle (vastapäivään)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Kierrä vasemmalle"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Kierrä sivua oikealle (myötäpäivään)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Kierrä oikealle"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Rajaa nykyistä sivua"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Rajaa"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Asetukset"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Lue lähtee_stä:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Tekstin tarkkuus:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Valokuvan tarkkuus:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Luettava puoli:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Sivun koko:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Kirkkaus:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Laatu:"
 
@@ -438,120 +444,140 @@ msgid "Scanned Document"
 msgstr "Kuvanlukuasiakirja"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[LAITE...] - Skannaus apuohjelma"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Näet kaikki komentorivivalitsimet komennolla \"%s --help\""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Asiakirja kuvanlukijasta.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Sulje"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Käyttäjänimi ja salasana vaaditaan laitteelle ”%s” pääsemiseksi"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Kuvanlukijoita ei havaittu"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Varmista että kuvanlukijasi on yhdistetty ja kytketty päälle"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Tallenna"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Kuvatiedostot"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Valitse tiedosto_tyyppi"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (monisivuinen asiakirja)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (pakattu)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (häviötön)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Tiedoston tallennus epäonnistui"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jos et tallenna, muutokset katoavat pysyvästi."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Tallennetaanko nykyinen asiakirja?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Hylkää muutokset"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Esikatselun tallennus epäonnistui"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Esikatselusovelluksen avaus epäonnistui"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Yhdistä puolet"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Yhdistä puolet (käänteinen)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Käänteinen"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Säilytä muuttumattomana"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Ohjetiedostoa ei voi avata"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -582,16 +608,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Tietoja sovelluksesta"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Yksinkertainen asiakirjojen kuvanlukutyökalu"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -606,88 +632,106 @@ msgstr ""
 "  Ville Pilvio https://launchpad.net/~vpilvio"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Tallennetaanko asiakirja ennen sovelluksen sulkemista?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Sulje tallentamatta"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (oletus)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vedos)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (korkea tarkkuus)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Tiedostoja puuttuu"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Tarkista asennuksesi tila"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Muuta _kuvanlukijaa"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Tummempi"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Vaaleampi"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Vähemmän"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Enemmän"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Heikompi"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Parempi"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Tallennetaan asiakirjaa..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Tallennetaan sivua %d/%d"
@@ -718,6 +762,9 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ msgid "Direction of scan"
 #~ msgstr "Lukemisen suunta"
 
+#~ msgid "Files missing"
+#~ msgstr "Tiedostoja puuttuu"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Luetun kuvan korkeus pikseleissä"
 
@@ -730,6 +777,9 @@ msgstr "Tallennetaan sivua %d/%d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Ikkunan leveys pikseleinä"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Tarkista asennuksesi tila"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "Arvo TOSI, jos sovelluksen ikkuna on suurennettu"
 
diff --git a/po/fr.po b/po/fr.po
index e658044..3d4bd81 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-09-27 21:23+0000\n"
 "Last-Translator: 65GYgzf <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,204 +87,210 @@ msgstr "Toutes les pages du _bac"
 msgid "_Stop Scan"
 msgstr "_Arrêter la numérisation"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Réorganiser les pages"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Courriel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Page"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Pivoter vers la _gauche"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Pivoter vers la _droite"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "Re_cadrer"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "Aucu_n"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personnalisé"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Pivote_r la selection"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Déplacer à gauche"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Déplacer à droite"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Aide"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Contenus"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Créer un nouveau document"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nouveau"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Numériser une seule page depuis le scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Numériser"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Enregistrer le document dans un fichier"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Enregistrer"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Arrêter la numérisation en cours"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Arrêter"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 "Pivoter la page vers la gauche (sens inverse des aiguilles d'une montre)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Pivoter vers la gauche"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pivoter la page vers la droite (sens des aiguilles d'une montre)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Pivoter vers la droite"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Recadrer la page sélectionnée"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Recadrer"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Préférences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "S_ource de numérisation :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Résolution pour le _texte :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Résolution pour la _photo :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Face à numériser :"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Taille de page :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Luminosité :"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualité :"
 
@@ -446,123 +452,143 @@ msgid "Scanned Document"
 msgstr "Document numérisé"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Outil de numérisation"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Exécutez « %s --help » pour voir la liste complète des options disponibles "
 "en ligne de commande."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numérisé"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Fermer"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilisateur et mot de passe nécessaires pour accéder à « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Aucun scanner n'a été détecté."
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Veuillez vérifier que votre scanner est connecté et sous tension."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Enregistrer sous…"
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Sauvegarder"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Fichiers images"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Tous les fichiers"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Sélectionnez le _type de fichier"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multi-pages)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressé)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sans perte)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrer le fichier"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Si vous n'enregistrez pas, les modifications seront définitivement perdues."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Abandonner les modifications"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrer l'image pour la prévisualiser"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Impossible d'ouvrir l'aperçu de l'image"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Inverser"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Maintenir inchangé"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Impossible d'ouvrir le fichier d'aide"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -592,16 +618,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "À propos de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Numériser simplement vos documents"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -620,6 +646,7 @@ msgstr ""
 "  François Tissandier https://launchpad.net/~baloo\n"
 "  Grégoire Seux https://launchpad.net/~kamaradclimber\n"
 "  Guillaume Lanquepin-Chesnais https://launchpad.net/~guyomel\n"
+"  Jean Marc https://launchpad.net/~m-balthazar\n"
 "  Jörg BUCHMANN https://launchpad.net/~jorg-buchmann\n"
 "  Kaïs Bejaoui https://launchpad.net/~kais\n"
 "  Manuel Berrocal https://launchpad.net/~manu-berrocal\n"
@@ -633,7 +660,6 @@ msgstr ""
 "  Simon THOBY https://launchpad.net/~simonthoby\n"
 "  Stanislas Michalak https://launchpad.net/~stanislas-michalak\n"
 "  Sylvie Gallet https://launchpad.net/~sylvie-gallet\n"
-"  Xavier Guillot https://launchpad.net/~valeryan-24\n"
 "  Xavier Verne https://launchpad.net/~xavier-verne\n"
 "  YannUbuntu https://launchpad.net/~yannubuntu\n"
 "  beudbeud https://launchpad.net/~beudbeud\n"
@@ -643,92 +669,116 @@ msgstr ""
 "  torglut https://launchpad.net/~torglut"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Quitter sans enregistrer"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (par défaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (brouillon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (haute résolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Fichiers manquants"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Veuillez vérifier votre installation"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Changer de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Plus foncé"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Plus clair"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Moins"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Plus"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Enregistrement du document…"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrement de la page %d sur %d"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Veuillez vérifier votre installation"
+
+#~ msgid "Files missing"
+#~ msgstr "Fichiers manquants"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
diff --git a/po/gd.po b/po/gd.po
index 9544a15..ba14604 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Gaelic; Scottish <gd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Gach duilleag a tha san _bhiathadair"
 msgid "_Stop Scan"
 msgstr "Cuir _stad air an sganadh"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Post-d"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Duilleag"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Cuairtich gu _tuathail"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Cuairtich gu _deiseil"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Bearr"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "Cha_n eil gin"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Litir"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Gnàthaichte"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Cuairtich an raon bearraidh"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Gluais gun taobh chlì"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Gluais gun taobh deas"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Cobhair"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Clàr-innse"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Tòisich air sgrìobhainn ùr"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Ùr"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Sganaich duilleag shingilte on sganair"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Sganaich"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Sàbhail an sgrìobhainn mar fhaidhle"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Sàbhail"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Cuir stad air an sganadh làithreach"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Stad"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Cuairtich an duilleag gu tuathail"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Cuairtich gu tuathail"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Cuairtich an duilleag gu deiseil"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Bearr an duilleag a thagh thu"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Bearr"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Roghainnean"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Tùs an _sganaidh:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an teacsa:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Dùmhlachd-bhreacaidh an deilbh:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Sganaich taobh:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Meud na duilleige:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Soilleireachd:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Iomsgaradh:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Càileachd:"
 
@@ -449,28 +455,28 @@ msgid "Scanned Document"
 msgstr "Sgrìobhainn sganaichte"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Goireas sganaidh"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ruith \"%s --help\" airson liosta shlàn dhe na roghainnean command line a "
 "tha ri làimh fhaicinn."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Sgrìobhainn sganaichte.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Dùin"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
@@ -478,96 +484,116 @@ msgstr ""
 "\"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Cha deach sganair sam bith a lorg"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Dèan cinnteach gu bheil sganair ceangailte ris agus gu bheil e air"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Sàbhail mar..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Sàbhail"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Faidhlichean deilbh"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Na h-uile faidhle"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Tagh _seòrsa an fhaidhle"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF {sgrìobhainn ioma-dhuilleagach}"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (dùmhlaichte)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (gun chall càileachd)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Cha b' urrainn dhuinn a shàbhaladh ann am faidhle"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "Mur an sàbhail thu e, thèid atharrachadh sam bith a rinn thu air chall."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "A bheil thu airson an sgrìobhainn làithreach a shàbhaladh?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Tilg air falbh na h-atharraichean"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Cha ghabh an ìomhaigh a shàbhaladh airson a ro-shealladh"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Chan urrainn dhuinn an aplacaid fhosgladh a ro-sheallas an ìomhaigh"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Chan urrainn dhuinn faidhle na cobharach fhosgladh"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -596,16 +622,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Mu dhèidhinn gleus simplidh nan sgana"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Inneal simplidh airson sganadh sgrìobhainnean"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -613,88 +639,106 @@ msgstr ""
 "  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "A bheil thu airson an sgrìobhainn a shàbhaladh mus dèan sinn fàgail?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Fàg gun a shàbhaladh"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (bun-roghainn)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (dreachd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (dùmhlachd-bhreacaidh àrd)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Tha faidhlichean a dhìth"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Thoir sùil air an stàladh agad"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Atharraich an _sganair"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Gu fèin-obrachail"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Nas duirche"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Nas soilleire"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Nas lugha"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Barrrachd"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "As lugha"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "As motha"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "A' sàbhaladh na sgrìobhainn..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A' sàbhaladh duilleag %d a-mach à %d"
@@ -745,3 +789,9 @@ msgstr "A' sàbhaladh duilleag %d a-mach à %d"
 #~ msgid "Resolution of last scanned image"
 #~ msgstr ""
 #~ "Dùmhlachd-bhreacaidh na h-ìomhaighe a chaidh a sganadh turas mu dheireadh"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Thoir sùil air an stàladh agad"
+
+#~ msgid "Files missing"
+#~ msgstr "Tha faidhlichean a dhìth"
diff --git a/po/gl.po b/po/gl.po
index feaf024..2c3d2df 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2013-10-05 07:56+0000\n"
 "Last-Translator: Fran Diéguez <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Todas as páxinas do _alimentador"
 msgid "_Stop Scan"
 msgstr "_Deter o escaneado"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Reordenar as páxinas"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "Correo-_e"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Páxina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rotar á _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rotar á _dereita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Recortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ningún"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizado"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotar o recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mover á esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mover á dereita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Axuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Contidos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Iniciar un novo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Escanear unha única páxina desde o escaner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Escanear"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Gardar o documento nun ficheiro"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Gardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Deter o escaneo actual"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Deter"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Xirar a páxina á esquerda (sentido contrario ao reloxo)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rotar á esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Xirar a páxina á dereita (sentido do reloxo)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rotar á dereita"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Recortar a páxina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Orixe de escaneo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Resolución de _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Resolución _fotográfica:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Cara a escanear:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Tamaño da páxina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brillo:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Calidade:"
 
@@ -439,122 +445,142 @@ msgid "Scanned Document"
 msgstr "Documento escaneado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilidade de escaneado"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Ejecute «%s --help» para ver unha lista completa das opcións de liña de "
 "ordes dispoñíbeis."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf escaneado"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Pechar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Requírese o nome de usuario e o contrasinal para acceder a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Non se detectou ningún escáner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique que o seu escáner está conectado e aceso"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Gardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Ficheiros de imaxes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Elixa o _tipo de ficheiro"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento de múltiples páxinas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sen perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Produciuse un fallo ao gardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Rexeitar os cambios"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Non foi posíbel gardar a imaxe da miniatura"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Non se pode abrir o aplicativo de vista previa da imaxe"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Combinar lados"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Combinar lados (inverso)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Inverter"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Manter sen cambios"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Non é posíbel abrir o ficheiro de axuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -583,16 +609,16 @@ msgstr ""
 "con este programa. Si no fuera así, vea <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Acerca de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Ferramenta sinxela de escaneado de documentos"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -603,88 +629,106 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Gardar o documento antes de saír?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Saír sen gardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (predeterminada)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrador)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (alta resolución)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Faltan ficheiros"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Comprobe a súa instalación"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Cambiar o _escáner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Máis escuro"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Máis claro"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Máis"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Gardando o documento..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Gardando páxina %d de %d"
@@ -700,6 +744,12 @@ msgstr "Gardando páxina %d de %d"
 #~ "Uso:\n"
 #~ "  %s [DISPOSITIVO...] - Utilidade de escaneo"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Comprobe a súa instalación"
+
+#~ msgid "Files missing"
+#~ msgstr "Faltan ficheiros"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Dirección de escaneado"
 
diff --git a/po/he.po b/po/he.po
index 4005eff..806b490 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "כל הדפים מהמ_זין"
 msgid "_Stop Scan"
 msgstr "ע_צירת הסריקה"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_דוא״ל"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_עמוד"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "סיבוב _שמאלה"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "סיבוב _ימינה"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_חיתוך"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_ללא"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_מכתב"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "_פוליו"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "ה_תאמה אישית"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_סיבוב חיתוך"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "ע_זרה"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_תוכן"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "התחלת מסמך חדש"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "חדש"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "סריקת עמוד בודד מהסורק"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "סריקה"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "שמירת המסמך לקובץ"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "שמירה"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "עצירת הסריקה הנוכחית"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "עצירה"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "סיבוב העמוד לשמאל (נגד כיוון השעון)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "סיבוב שמאלה"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "סיבוב העמוד לימין (עם כיוון השעון)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "סיבוב ימינה"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "חיתוך העמוד שנבחר"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "חיתוך"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "העדפות"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_מקור הסריקה:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "ר_זולוציית הטקסט:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_רזולוציית התמונה:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "הצד הנסרק:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "מידות הדף:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "בהירות:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "ניגודיות:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "איכות:"
 
@@ -438,121 +444,141 @@ msgid "Scanned Document"
 msgstr "מסמך שנסרק"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Run '%s --help' to see a full list of available command line options."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "מסמך סרוק.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "ס_גירה"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "נדרשים שם משתמש וססמה כדי לגשת אל '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "לא נמצאו סורקים"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "יש לבדוק כי הסורק מחובר ומופעל"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "שמירה בשם..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_שמירה"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "קובצי תמונה"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "כל הקבצים"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "בחירת _סוג הקובץ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (מסמך מרובה עמודים)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (דחוס)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (ללא אבדן נתונים)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "שמירת הקובץ נכשלה"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ללא שמירה, השינויים יאבדו לעד."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "האם לשמור את המסמך הנוכחי?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "התעלמות מהשינויים"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "לא ניתן לשמור את התמונה לתצוגה מקדימה"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "לא ניתן לפתוח את היישום להצגה מקדימה של תמונות"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "לא ניתן לפתוח את קובץ העזרה"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -579,16 +605,16 @@ msgstr ""
 "ניתן לעיין ב־<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "על אודות Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "כלי פשוט לסריקת מסמכים"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -601,88 +627,106 @@ msgstr ""
 "  Yaron https://launchpad.net/~sh-yaron"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "האם לשמור את המסמך בטרם היציאה?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "לצאת ללא שמירה"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (בררת מחדל)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (טיוטה)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (רזולוציה גבוהה)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "חסרים קבצים"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "יש לבדוק את ההתקנה"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "ב_חירה בסורק אחר"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "כהה יותר"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "בהיר יותר"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "פחות"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "יותר"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "מזערי"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "מרבי"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "המסמך נשמר...‏"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "נשמר העמוד %d מתוך %d"
@@ -720,6 +764,12 @@ msgstr "נשמר העמוד %d מתוך %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Please check your installation"
+#~ msgstr "יש לבדוק את ההתקנה"
+
+#~ msgid "Files missing"
+#~ msgstr "חסרים קבצים"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Height of scanned image in pixels"
 
diff --git a/po/hr.po b/po/hr.po
index 4d542d6..43abc97 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Sve stranice iz _uvlakača"
 msgid "_Stop Scan"
 msgstr "_Zaustavi skeniranje"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Stranica"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rotiraj _lijevo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rotiraj _desno"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Izreži"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ništa"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Prilagođeno"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotiraj isječak"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Pomakni ulijevo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Pomakni udesno"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Pomoć"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Sadržaj"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Započni novi dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Skeniraj jednu stranicu sa skenera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skeniraj"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Spremi dokument u datoteku"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Spremi"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Prekini trenutno skeniranje"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Zaokreni stranicu ulijevo (obrnuto od kazaljke na satu)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Zaokreni ulijevo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Zaokreni stranicu udesno (u smjeru kazaljke na satu)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Zaokreni udesno"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Izreži odabranu stranicu"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Izreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Osobitosti"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Izvor skeniranja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Rezolucija teksta:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Rezolucija slike"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Stranica skeniranja:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Veličina stranice:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -441,122 +447,142 @@ msgid "Scanned Document"
 msgstr "Skenirani dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[UREĐAJ...] - Alat za skeniranje"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Pokrenite '%s --help'  kako biste vidjeli potpunu listu dostupnih mogućnosti "
 "naredbenog retka."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Skenirani dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Korisničko ime i lozinka su potrebni za pristup '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Niti jedan skener nije otkriven"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Molim provjerite je li skener spojen i uključen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Spremi kao..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Sve datoteke"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Odaberite _vrstu datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument od više stranica)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimirano)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (bez gubitaka)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Neuspjelo pohranjivanje datoteke"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ako ne spremite, promjene će biti trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Pohraniti trenutni dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Odbaci promjene"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Spremanje slike za pretpregled nije uspjelo"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Nije moguće otvoriti program za pregled slike"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Nije moguće otvoriti datoteku pomoći"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -585,16 +611,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "O jednostavnom skeniranju"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Alat za jednostavno skeniranje"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -607,88 +633,106 @@ msgstr ""
 "  student4 https://launchpad.net/~iputnik-msn"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Pohraniti dokument prije prekida rada?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Prekini bez spremanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (zadano)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (nacrt)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (visoka rezolucija)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Nedostaju datoteke"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Molim provjerite vašu instalaciju"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Promjeni _Skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatski"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -794,6 +838,12 @@ msgstr ""
 #~ "  --gtk-module=MODULES Učitavanje dodatnih GTK+ modula\n"
 #~ "  -g-fatal-warnings Učinite sva upozorenja kobnima"
 
+#~ msgid "Files missing"
+#~ msgstr "Nedostaju datoteke"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Molim provjerite vašu instalaciju"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr "Strana lista za skeniranje. Može biti: 'obje' 'prednja' 'stražnja'"
diff --git a/po/hu.po b/po/hu.po
index 4268c80..b194046 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2014-02-18 14:14+0000\n"
-"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
+"Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Minden oldal az _adagolóból"
 msgid "_Stop Scan"
 msgstr "_Szkennelés megállítása"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Oldal"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Forgatás b_alra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Forgatás _jobbra"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Vágás"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Nincs vágás"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Egyéni"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Vágott rész fo_rgatása"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mozgatás balra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mozgatás jobbra"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Súgó"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Tartalom"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Új dokumentum létrehozása"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Új"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Egy oldal szkennelése az eszközről"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Szkennelés"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Dokumentum fájlba mentése"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Mentés"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "A jelenlegi szkennelés leállítása"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Leállít"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Az oldal elforgatása balra (az óra járásával ellentétesen)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Forgatás balra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Az oldal elforgatása jobbra (az óra járásával egyezően)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Forgatás jobbra"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "A kiválasztott oldal vágása"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Vágás"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Beállítások"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Szkennelés _forrása:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Szöveg felbontása:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Fotó felbontása:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Oldal szkennelése:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Oldalméret:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Fényerő:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontraszt:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Minőség:"
 
@@ -437,122 +443,142 @@ msgid "Scanned Document"
 msgstr "Beszkennelt dokumentum"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ESZKÖZ…] – Szkennelő segédprogram"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Futtassa a(z) „%s --help” parancsot a parancssori kapcsolók listájáért."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Szkennelt dokumentum.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Bezárás"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "A(z) „%s” eléréséhez felhasználónév és jelszó szükséges"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nem található szkenner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ellenőrizze, hogy a szkenner csatlakoztatva van, és be van-e kapcsolva"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Mentés másként…"
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Mentés"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Képfájlok"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Minden fájl"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Válasszon fájl_típust"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (többoldalas dokumentum)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (tömörített)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (veszteségmentes)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "A fájl mentése sikertelen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Módosítások eldobása"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "A képfájlt nem lehet elmenteni előnézethez"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Nem nyitható meg az előnézetet megjelenítő alkalmazás"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Fordított"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Maradjon változatlan"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "A súgófájl nem nyitható meg"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -580,16 +606,16 @@ msgstr ""
 "meg, itt elolvashatja: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Simple Scan névjegye"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Egyszerű dokumentumszkennelés"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -606,88 +632,106 @@ msgstr ""
 "  Úr Balázs https://launchpad.net/~urbalazs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Menti a dokumentumot kilépés előtt?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Kilépés mentés nélkül"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (alapértelmezett)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (vázlat)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (nagy felbontás)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Hiányzó fájl"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Ellenőrizze a telepítést"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "_Szkennerváltás"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Sötétebb"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Világosabb"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Kevesebb"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Több"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Dokumentum mentése..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%d. oldal mentése, összesen %d"
@@ -695,6 +739,9 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Hiányzó fájl"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -703,6 +750,9 @@ msgstr "%d. oldal mentése, összesen %d"
 #~ "Használat:\n"
 #~ "  %s [ESZKÖZ...] - Szkennelő segédprogram"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Ellenőrizze a telepítést"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
diff --git a/po/hy.po b/po/hy.po
index be981c2..822effc 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Armenian <hy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,104 +587,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Serj Safarian https://launchpad.net/~safarian"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 5d61bc0..1a176e8 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2014-01-18 00:43+0000\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Semua Halaman Dari _Feeder"
 msgid "_Stop Scan"
 msgstr "Berhenti _Memindai"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "Sur_el"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Nihil"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Ubahan"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Puta_r dan Potong"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Pindah Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Pindah Ke Kanan"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Isi"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Pindai"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Putar halaman ke kiri (berlawanan arah jarum jam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Putar halaman ke kanan (searah jarum jam)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferensi"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Sumber Pindai:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontras:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kualitas:"
 
@@ -437,121 +443,141 @@ msgid "Scanned Document"
 msgstr "Dokumen Terpindai"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[PERANGKAT...] - Utilitas pemindaian"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Jalankan '%s --help' untuk daftar lengkap opsi yang tersedia."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Hasil Pindai.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Tutup"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata sandi dibutuhkan untuk mengakses '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Tidak ada pemindai yang terdeteksi"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Mohon periksa apakah pemindai Anda terhubung dan dalam keadaan menyala"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Berkas Citra"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Semua Berkas"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Pilih _Tipe Berkas"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen multi-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (terkompresi)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Gagal menyimpan berkas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika Anda tidak menyimpan, perubahan akan hilang secara permanen."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Simpan dokumen saat ini?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Buang Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Tak dapat menyimpan gambar untuk pratinjau"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Tidak dapat membuka aplikasi pratinjau gambar"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Tak dapat membuka berkas bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -579,16 +605,16 @@ msgstr ""
 "bersama program ini. Bila tidak, lihat <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Tentang Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Alat pemindai dokumen sederhana"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -609,92 +635,113 @@ msgstr ""
 "  jemmy surya https://launchpad.net/~jemmy"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Keluar tanpa menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Berkas hilang"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Mohon periksa instalasi Anda"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Ganti _Pemindai"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Lebih Terang"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Lebih"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d dari %d"
 
+#~ msgid "Files missing"
+#~ msgstr "Berkas hilang"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Resolusi pemindaian terakhir"
 
@@ -735,3 +782,6 @@ msgstr "Menyimpan halaman %d dari %d"
 
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "Lebar gambar terpindai dalam piksel"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Mohon periksa instalasi Anda"
diff --git a/po/it.po b/po/it.po
index fdcc2d9..d4709cc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-08-22 07:09+0000\n"
 "Last-Translator: Leonardo Corato <leocor@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "_Tutte le pagine dal caricatore"
 msgid "_Stop Scan"
 msgstr "Ferma l'acqui_sizione"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Riordina pagine"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Ruota a _sinistra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Ruota a _destra"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Ritaglio"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Nessuno"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizzato"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Ruota ritaglio"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Sposta a sinistra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Sposta a destra"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "A_iuto"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Sommario"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Crea un nuovo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nuovo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Acquisisce una pagina singola dallo scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Acquisisci"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Salva documento in un file"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Salva"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Interrompe l'acquisizione in corso"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Ferma"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Ruota la pagina a sinistra (senso antiorario)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Ruota la pagina a destra (senso orario)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Ritaglia la pagina selezionata"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Ritaglia"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferenze"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "S_orgente di acquisizione:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Risoluzione _testo:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Risoluzione foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Lato acquisizione:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Dimensione pagina:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Luminosità:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contrasto:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualità:"
 
@@ -441,123 +447,143 @@ msgid "Scanned Document"
 msgstr "Documento acquisito"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Strumento per l'acquisizione"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Eseguire \"%s --help\" per l'elenco completo delle opzioni disponibili a "
 "riga di comando."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Documento-acquisito.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sono richiesti nome utente e password per accedere a «%s»"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nessuno scanner rilevato"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controllare che lo scanner sia collegato e acceso"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "A_nnulla"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Salva"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "File immagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Tutti i file"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Seziona il _tipo di file"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-pagina)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (compresso)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (senza perdita di qualità)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Salvataggio file non riuscito"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se non si salva le modifiche andranno perse per sempre."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Salvare il documento corrente?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Scarta le modifiche"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Impossibile salvare l'immagine per l'anteprima"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 "Impossibile aprire l'applicazione per la visualizzazione delle anteprime"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Unisci lati"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Unisci lati (inverso)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Inverso"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Mantieni non modificato"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Impossibile aprire il file di aiuto"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -588,16 +614,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Informazioni su Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Semplice strumento per l'acquisizione di documenti"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -624,88 +650,106 @@ msgstr ""
 "  phede92 https://launchpad.net/~phede92"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Salvare il documento prima di uscire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Esci senza salvare"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinita)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (bozza)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta risoluzione)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "File mancanti"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Verificare l'installazione"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Cambia _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Più scura"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Più chiara"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Minore"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Maggiore"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minima"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Massima"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Salvataggio del documento..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvataggio pagina %d di %d"
@@ -713,6 +757,9 @@ msgstr "Salvataggio pagina %d di %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "File mancanti"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Altezza della finestra in pixel"
 
@@ -806,6 +853,9 @@ msgstr "Salvataggio pagina %d di %d"
 #~ "  --gtk-module=MODULES            Carica moduli GTK+ aggiuntivi\n"
 #~ "  --g-fatal-warnings              Rende fatali tutti gli avvertimenti"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Verificare l'installazione"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/ja.po b/po/ja.po
index af327a2..78ef3b8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:03+0000\n"
 "Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "フィーダより全てのページ(_F)"
 msgid "_Stop Scan"
 msgstr "スキャン停止(_S)"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "電子メール(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "ページ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "左へ回転(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "右へ回転(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "切り抜き(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "なし(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US レター(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US リーガル(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "カスタム(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "切り抜きを回転(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "コンテンツ(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "新規ドキュメントの作成"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "新規"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "一枚のページをスキャンします"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "スキャン"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "ドキュメントをファイルに保存"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "スキャンを停止します"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ページを左回転 (反時計回り)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "左へ回転"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ページを右回転 (時計回り)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "右へ回転"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "選択した範囲の切り抜き"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "切り抜き"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "設定"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "スキャンする対象(_O):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "テキストの画素数(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "写真の画素数(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "スキャン面:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "ページサイズ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "明るさ:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "コントラスト:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "品質:"
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[デバイス...] - スキャンユーティリティ"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "'%s --help' を実行すると利用可能なすべてのコマンドラインオプションの一覧が表示されます"
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "スキャンされたドキュメント.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' にアクセスするにはユーザ名とパスワードが必要です"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "スキャナが検出されていません"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "スキャナが接続されて電源が入っているか確認してください"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "名前を付けて保存..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "保存(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "ファイルの保存に失敗しました"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "プレビュー用の画像を保存できません"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,16 +587,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Simple Scan について"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "ドキュメントのスキャンを行うシンプルなツールです"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -586,88 +612,106 @@ msgstr ""
 "  Tosiki Iga https://launchpad.net/~tosiki-iga"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "ファイルが見つかりません"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "インストールされているか確認してください"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "スキャナを変更(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "暗く"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "明るく"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "弱く"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "強く"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "ドキュメントを保存しています..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "%2$dページ中%1$dページを保存しています"
@@ -675,6 +719,12 @@ msgstr "%2$dページ中%1$dページを保存しています"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "ファイルが見つかりません"
+
+#~ msgid "Please check your installation"
+#~ msgstr "インストールされているか確認してください"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
diff --git a/po/kk.po b/po/kk.po
index f54fbdf..78b2ab9 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "_Солға бұру"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "_Оңға бұру"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ешнәрсе"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Көмек"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "Құра_масы"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Жаңа"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Іздеу"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Сақтау"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Тоқтау"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Солға бұру"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Оңға бұру"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Қиып жіберу"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Баптаулары"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Қалайша сақтау..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Бүкіл файлдар"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Сақтамасаңыз, өзгерістер қайтпастай жоғалады."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Өзгерістерді ысырып тастау"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Көмек ақпараты файлын ашу мүмкін емес"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,16 +587,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -578,88 +604,106 @@ msgstr ""
 "  jmb_kz https://launchpad.net/~jmb-kz"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Авто"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index e5bfc0e..80cf646 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "ទំព័រ​ទាំងអស់​ពី​កម្មវិធ
 msgid "_Stop Scan"
 msgstr "ឈប់​ស្កេន"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "អ៊ីមែល"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "ទំព័រ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "បង្វិល​ស្ដាំ"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "ច្រឹប"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "គ្មាន"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "សំបុត្រ"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "ស្រប​ច្បាប់"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "ផ្ទាល់ខ្លួន"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "បង្វិល​ការ​ច្រឹប"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "ផ្លាស់ទី​ទៅ​ឆ្វេង"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "ផ្លាស់ទី​ទៅ​ស្ដាំ"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "ជំនួយ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "មាតិកា"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "ចាប់ផ្ដើម​ឯកសារ​ថ្មី"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "ថ្មី"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "ស្កេន​ទំព័រ​ទោល​ពី​ម៉ាស៊ីន​ស្កេន"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "ស្កេន"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "រក្សាទុក​ឯកសារ​ទៅ​ឯកសារ"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "រក្សាទុក"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "បញ្ឈប់​ការ​ស្កេន​បច្ចុប្បន្ន"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "ឈប់"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ឆ្វេង (ច្រាស​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "បង្វិល​ឆ្វេង"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "បង្វិល​ទំព័រ​ទៅ​ស្ដាំ (ស្រប​ទ្រនិច​នាឡិកា)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "បង្វិល​ស្ដាំ"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "ច្រឹប​ទំព័រ​ដែល​បាន​ជ្រើស"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "ច្រឹប"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "ចំណូលចិត្ត"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "ស្កេន​ប្រភព ៖"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "គុណភាព​បង្ហាញ​អត្ថបទ ៖"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "គុណភាព​បង្ហាញ​រូបថត ៖"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "ស្កេន​ចំហៀង ៖"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "ទំហំ​ទំព័រ ៖"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "ពន្លឺ ៖"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "កម្រិត​ពណ៌ ៖"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "គុណភាព ៖"
 
@@ -441,125 +447,145 @@ msgid "Scanned Document"
 msgstr "ឯកសារ​ដែល​បាន​ស្កេន"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ឧបករណ៍...] - ការ​ស្កេន​ឧបករណ៍​ប្រើប្រាស់"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "ដំណើរការ '%s --help' ដើម្បី​មើល​បញ្ជី​ពេញលេញ​នៃ​បន្ទាត់​បញ្ជា​ដែល​មាន ។"
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf ដែល​បាន​ស្កេន"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "បិទ"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ទាមទារ​ឈ្មោះ​អ្នកប្រើ និង​ពាក្យសម្ងាត់​ដើម្បី​ចូលដំណើរការ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "រក​មិន​ឃើញ​ម៉ាស៊ីន​ស្កេន"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "សូម​ពិនិត្យមើល​ម៉ាស៊ីន​ស្កេន​របស់​អ្នក​ថា​តើ​បាន​តភ្ជាប់ "
 "និង​បើក​កុងតាក់​ហើយ​ឬនៅ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "រក្សាទុក​ជា..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "បោះបង់"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "រក្សាទុក"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "ឯកសារ​រូបភាព"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "ឯកសារ​ទាំងអស់"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "ជ្រើស​ប្រភេទ​ឯកសារ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (ឯកសារ​ច្រើន​ទំព័រ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (បាន​បង្ហាប់)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (គ្មាន​ការ​បាត់បង់)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​រក្សាទុក​ឯកសារ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 "ប្រសិនបើ​អ្នក​មិន​រក្សាទុក​ទេ "
 "ការ​ផ្លាស់ប្ដូរ​ទាំងឡាយ​និង​ត្រូវ​បាន​បាត់បង់​ជា​អចិន្ត្រៃយ៍ ។"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "រក្សាទុក​ឯកសារ​បច្ចុប្បន្ន ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "បោះបង់​ការ​ផ្លាស់ប្ដូរ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "មិន​អាច​រក្សាទុក​រូបភាព​សម្រាប់​ការ​មើល​ជាមុន​បាន​ទេ"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "មិន​អាច​បើក​កម្មវិធី​មើល​រូបភាព​ជាមុន​បាន​ទេ"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "មិន​អាច​បើក​ឯកសារ​ជំនួយ​បាន​ទេ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -589,16 +615,16 @@ msgstr ""
 "សូម​មើល<http://www.gnu.org/licenses/> ។"
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "អំពី​ការ​ស្កេន​ធម្មតា"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "ឧបករណ៍​ស្កេន​ធម្មតា"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -607,88 +633,106 @@ msgstr ""
 "  Seng Sutha https://launchpad.net/~sutha"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "រក្សាទុក​ឯកសារ​មុន​ពេល​បិទ​ឬ ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "បិទ​ដោយ​មិន​រក្សាទុក"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (លំនាំដើម)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ពង្រាង)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (គុណភាព​បង្ហាញ​ខ្ពស់)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "បាត់​ឯកសារ"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "សូម​ពិនិត្យមើល​ការ​ដំឡើង​របស់​អ្នក"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "ប្ដូរ​ម៉ាស៊ីន​ស្កេន"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "ស្វ័យប្រវត្តិ"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "ងងឹត"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "ស្រាល"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "តិចជាង"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "ផ្សេងទៀត"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "អប្បបរមា"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "អតិបរមា"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "កំពុង​រក្សាទុក​ឯកសារ..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %d"
@@ -739,3 +783,9 @@ msgstr "រក្សាទុក​ទំព័រ %d ផុត​សម័យ %
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr ""
 #~ "គុណភាព​បង្ហាញ​គិតជា​ចំណុច​ក្នុង​មួយ​អ៊ិន្ឈ៍ នៃ​រូបភាព​ដែល​បាន​ស្កេន​មុន ។"
+
+#~ msgid "Files missing"
+#~ msgstr "បាត់​ឯកសារ"
+
+#~ msgid "Please check your installation"
+#~ msgstr "សូម​ពិនិត្យមើល​ការ​ដំឡើង​របស់​អ្នក"
diff --git a/po/ky.po b/po/ky.po
index bb22de5..c9b82d8 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Kirghiz <ky@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,104 +587,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Saltanat Osmonova https://launchpad.net/~salta007"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index c6381de..3b1c0c1 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Perkelti kairėn"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Perkelti dešinėn"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Skaitymo š_altinis:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Skaistis:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrastas:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kokybė:"
 
@@ -435,121 +441,141 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ĮTAISAS...] - skaitymo paslaugų programa"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Norėdami pamatyti komandų eilutės parametrų sąrašą, paleiskite „%s --help“."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
-msgstr ""
+msgstr "_Užverti"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
-msgstr ""
+msgstr "_Atsisakyti"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
-msgstr ""
+msgstr "Į_rašyti"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jeigu neišsaugosite, pakeitimai bus nesugrąžinamai prarasti."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Išsaugoti šį dokumentą?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Atmesti pakeitimus"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nepavyko išsaugoti paveikslo peržiūrai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -566,16 +592,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -588,88 +614,106 @@ msgstr ""
 "  romasg https://launchpad.net/~romasg"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Išsaugoti dokumentą prieš išeinant iš programos?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Išeiti neišsaugant"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatinis"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Tamsesnis"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Šviesesnis"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Mažiau"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Daugiau"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mažiausia"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Didžiausia"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Saugomas dokumentas..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saugomas puslapis %d iš %d"
diff --git a/po/lv.po b/po/lv.po
index a93f10f..4f7c84c 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-10-07 21:28+0000\n"
 "Last-Translator: Rūdolfs Mazurs <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Visas lapas no _padeves"
 msgid "_Stop Scan"
 msgstr "Apturēt _skenēšanu"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-pasts"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "La_pa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Pagriezt pa _kreisi"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Pag_riezt pa labi"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "Ap_cirst"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Bez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Pielāgots"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Pag_riezt apciršanu"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Pārvietot pa kreisi"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Pārvietot pa labi"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Palīdzība"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Saturs"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Sākt jaunu dokumentu"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Jauns"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Ieskenēt vienu lapu no skenera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skenēt"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Saglabāt dokumentu datnē"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Saglabāt"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Apturēt pašreizējo skenēšanu"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Apturēt"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Pagriezt lapu pa kreisi (pretēji pulksteņa rādītāja virzienam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Pagriezt pa kreisi"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pagriezt lapu pa labi (pulksteņa rādītāja virzienā)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Pagriezt pa labi"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Apcirst izvēlēto lapu"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Apcirst"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Iestatījumi"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Skenēšanas av_ots:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Teksta izšķirtspēja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Fotogrāfijas izšķirts_pēja:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skenējamā puse:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Lapas izmērs:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Gaišums:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrasts:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kvalitāte:"
 
@@ -438,122 +444,142 @@ msgid "Scanned Document"
 msgstr "Skenēts dokuments"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[IERĪCE...] - skenēšanas utilītprogramma"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Palaidiet “%s --help”, lai redzētu pilnu pieejamo komandrindas opciju "
 "sarakstu."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Ieskenēts Dokuments.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Aizvērt"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Lai piekļūtu “%s”, ir vajadzīgs lietotājvārds un parole"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nav atrasts neviens skeneris"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lūdzu, pārbaudiet, vai skeneris ir pievienots un ieslēgts"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Saglabāt kā..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "At_celt"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Saglabāt"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Attēlu datnes"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Visas datnes"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Norādīt datnes _tipu"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (vairāku lapu dokuments)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (saspiests)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (bez zudumiem)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Neizdevās saglabāt datni"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Ja nesaglabāsiet, izmaiņas neatgriezeniski pazudīs."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Saglabāt šo dokumentu?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Izmest izmaiņas"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nevar saglabāt attēlu priekšskatīšanai"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Neizdevās atvērt attēlu priekšskatīšanas lietotni"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Nevar atvērt palīdzības datni"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -579,16 +605,16 @@ msgstr ""
 "nesaņēmāt, skatiet <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Par Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Vienkāršs dokumentu skenēšanas rīks"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -598,88 +624,106 @@ msgstr ""
 "  Rūdolfs Mazurs https://launchpad.net/~rudolfs-mazurs"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Pirms iziešanas saglabāt dokumentu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Iziet nesaglabājot"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (noklusējuma)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (melraksts)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (augsta izšķirtspēja)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Pietrūkst datņu"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Lūdzu, pārbaudiet instalāciju"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Mainīt _skeneri"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Tumšāks"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Gaišāks"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Mazāk"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Vairāk"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimums"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maksimums"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Saglabā dokumentu..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Saglabā lapu %d no %d"
@@ -709,6 +753,9 @@ msgstr "Saglabā lapu %d no %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Loga platums pikseļos"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Lūdzu, pārbaudiet instalāciju"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "Pēdējā skenētā attēla izšķirtspēja"
 
@@ -727,3 +774,6 @@ msgstr "Saglabā lapu %d no %d"
 
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PATIESS, ja lietotnes logs ir maksimizēts"
+
+#~ msgid "Files missing"
+#~ msgstr "Pietrūkst datņu"
diff --git a/po/mhr.po b/po/mhr.po
index 44f4221..5ed5e1e 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Mari (Meadow) <mhr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 08:00+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Лаштык"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Лектыш"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Иктат"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Серыш"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Йӱла"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Шола"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Пурла"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Полышык"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Содержаний"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "У"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Аныклаш"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Шогалташ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Лектыш"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Келыштарымаш-влак"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Лаштыкын кугыт"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Ыштыш-кучыш:"
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr "Сканироватлыме документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,16 +587,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -578,88 +604,106 @@ msgstr ""
 "  Снежана https://launchpad.net/~snezhana-yandemerova-94"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Пычкемышрак"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index ddda89f..0dd3cbc 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Malay <ms@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Semua Halaman Dari _Suapan"
 msgid "_Stop Scan"
 msgstr "_Henti Imbas"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Tertib Semula Halaman"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Emel"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Halaman"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Putar Ke Ki_ri"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Putar Ke Ka_nan"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Crop"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Tiada"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Tersendiri"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Putar & Kerat"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Alih Ke Kiri"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "ALih Ke Kanan"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Bantuan"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Kandungan"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Mulakan dokumen baru"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Baru"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Imbas halaman tunggal dari pengimbas"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Imbas"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Simpan dokumen ke fail"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Simpan"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Hentikan Imbasan semasa"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Henti"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Putar halaman ke kiri (lawan-jam)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Putar Ke Kiri"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Putar halaman ke kanan (arah-jam)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Putar Ke Kanan"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Kerat halaman pilihan"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Kerat"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Keutamaan"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Imbas Su_mber:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Resolusi _Teks:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Resolusi _Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Imbas Sisi:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Saiz Halaman:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Kecerahan:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Beza Jelas:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kualiti:"
 
@@ -439,122 +445,142 @@ msgid "Scanned Document"
 msgstr "Dokumen Terimbas"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utiliti mengimbas"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Jalankan '%s --help' untuk melihat senarai penuh pilihan baris perintah yang "
 "ada."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Dokumen Diimbas.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Tutup"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nama pengguna dan kata laluan diperlukan untuk mencapai '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Tiada pengimbas dikesan"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Sila semak pengimbas anda sama ada ia bersambung dan dihidupkan"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Simpan Sebagai..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Simpan"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Fail Imej"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Semua Fail"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Pilih Jenis _Fail"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokumen berbilang-halaman)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (termampat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (tidak hilang)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Gagal menyimpan fail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Jika anda tidak simpan, semua perubahan akan hilang."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Simpan dokumen semasa"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Abai Perubahan"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Tidak boleh menyimpan imej untuk pratonton"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Tidak boleh membuka aplikasi partonton imej"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Gabung sisi"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Gabung sisi (songsang)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Songsang"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Kekal tidak berubah"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Tidak boleh membuka fail bantuan"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -583,16 +609,16 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Mengenai Pengimbas Ringkas"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Alat mengimbas dokumen mudah"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -603,88 +629,106 @@ msgstr ""
 "  ahmad akmal bin mohd idris https://launchpad.net/~mamahopsk87"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Simpan dokumen sebelum keluar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Keluar tanpa Menyimpan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (tersedia)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draf)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (resolusi tinggi)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Fail hilang"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Sila semak pemasangan anda"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Ubah _Pengimbas"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Lebih Gelap"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Lebih Cerah"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Kurang"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Lagi"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Menyimpan dokumen..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Menyimpan halaman %d daripada %d"
@@ -728,6 +772,12 @@ msgstr "Menyimpan halaman %d daripada %d"
 #~ "Penggunaan:\n"
 #~ "  %s [DEVICE...] - Utiliti pengimbasan"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Sila semak pemasangan anda"
+
+#~ msgid "Files missing"
+#~ msgstr "Fail hilang"
+
 #~ msgid ""
 #~ "The width of scanned image in pixels. This value is updated to what the last "
 #~ "scanned page was."
diff --git a/po/my.po b/po/my.po
index c211637..6310b29 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Burmese <my@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "_F Feeder မှ စာမျက်နှာအားလုံး"
 msgid "_Stop Scan"
 msgstr "_S Scan ရပ်မည်။"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Eအီးမေး"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Pစာမျက်နှာ"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "_L ဘယ်ဖက်လှည့်ပါ။"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "_R ညာဖက်သို့လှည့်မည်။"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_C ဖြတ်ပါ။"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Nဘာမှမဟုတ်"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_L စာ"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Custom"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotate Crop"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "ဘယ်ဖက်သို့ရွှေ့ပါ။"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "ညာဖက်သို့ရွှေ့ပါ။"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_H အကူအညီ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_  C ခေါင်းစဉ်"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "အသစ်စတင်ရန်"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "အသစ်"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Scanner ထဲမှ စာမျက်နှာ တစ်ရွက်တည်းကို Scan ဖတ်မည်။"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Scan"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "ဖိုင် တစ်ခုထဲသို့ စာရွက်စာတမ်း ကိုသိမ်းပါ။"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "သိမ်းဆည်းပါ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "ယခု Scan ဖတ်နေခြင်းကိုရပ်မည်။"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "ရပ်မည်"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "စာမျက်နှာကို ဘယ်ဖက်သို့လှည့်ပါ။(နာရီလက်တံပြောင်းပြန်)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "ဘယ်ဖက် လှည့်ပါ။"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "စာမျက်နှာကို ညာဖက်သို့လှည့်ပါ။ (နာရီလက်တံ)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "ညာဖက်လှည့်ပါ။"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "ရွေးချယ်ထားသောစာမျက်နှာကို ဖြတ်ပါ။"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "ဖြတ်ပါ။"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferences"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Scan S_ource:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Text Resolution:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Pဓာတ်ပုံ resolution-"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Scan Side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "စာရွက်အရွယ်အစား"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -438,122 +444,142 @@ msgid "Scanned Document"
 msgstr "Scan ဖတ်ပြီးသော စာရွက်စာတမ်း"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Scanning utility"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "အမိန့်ပေး စာရင်း အပြည့်အစုံမြင်ရရန်  '%s--help' ဖြင့် ခိုင်းပါ"
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Scanned Document.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ကိုသုံးရန်အတွက်သုံးစွဲသူအမည်နှင့် စကားဝှက်လိုအပ်ပါသည်။"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Scanner ရှာမတွေ့ပါ။"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "သင်၏ Scanner ကိုချိတ်ဆက်ပြီးကြောင်း၊ "
 "ပါဝါဖွင့်ထားကြောင်းသေချာအောင်ပြန်လည်စစ်ဆေးပါ။"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Image Files"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "ဖိုင်အလုံးစုံ"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "_T ဖိုင်အမျိုးအစားရွေးပါ။"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (multi-page document)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "ဖိုင်ကိုမသိမ်းဖြစ်ပါ။"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "မသိမ်းပါက၊ ပြောင်းလဲမူများသည် လုံးဝပျက်သွားပါလိမ့်မည်။"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "ယခုစာရွက်စာတမ်းကိုသိမ်းမလား။"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "ကြည့်ရူရန်အတွက် ပုံများကိုမသိမ်းနိုင်ပါ။"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Unable to open image preview application"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "အကူအညီဖိုင်ကို မဖွင့်နိုင်ပါ။"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -582,16 +608,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "ရိုးရှင်းစွာ Scan ဖတ်ခြင်းအကြောင်း"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Simple document scanning tool"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -599,88 +625,106 @@ msgstr ""
 "  Pyae Sone https://launchpad.net/~gipsyhnh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "မပိတ်ခင် စာရွက်စာတမ်းများကိုသိမ်းမလား။"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "မသိမ်းပဲနှင့်ထွက်မည်။"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (high resolution)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "ဖိုင်များပျောက်နေပါသည်။"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "သင်၏ စက်ထဲသို့သွင်းခြင်းကို ပြန်လည်စစ်ဆေးပါ။"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Change _Scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "အလိုအလျှောက်"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -728,3 +772,9 @@ msgstr ""
 
 #~ msgid "Window width in pixels"
 #~ msgstr "Window width in pixels"
+
+#~ msgid "Files missing"
+#~ msgstr "ဖိုင်များပျောက်နေပါသည်။"
+
+#~ msgid "Please check your installation"
+#~ msgstr "သင်၏ စက်ထဲသို့သွင်းခြင်းကို ပြန်လည်စစ်ဆေးပါ။"
diff --git a/po/nb.po b/po/nb.po
index 43c6fd2..f2587a6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Kjetil Birkeland Moe <kjetil@skifremme.no>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Alle sider fra papirmater"
 msgid "_Stop Scan"
 msgstr "_Stopp skanning"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Side"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Roter mot _venstre"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Roter mot _høyre"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Beskjær"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "E_gendefinert"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Roter beskjæringsområdet"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Hjelp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Innhold"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Begynn et nytt dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Ny"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Skann én enkel side fra skanneren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skann"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Lagre dokument til fil"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Lagre"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Stopp skanning"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Stopp"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Roter siden til venstre (mot urviseren)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Roter mot venstre"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Roter siden til høyre (med urviseren)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Roter mot høyre"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Beskjær valgt side"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Beskjær"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Innstillinger"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Hent fra:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Tekstoppløsning"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Bildeoppløsning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skann side:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Sidestørrelse:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Lysstyrke:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -438,121 +444,141 @@ msgid "Scanned Document"
 msgstr "Skannet dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Scanneutstyr"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kjør «%s --help» for å se en full liste over tilgjengelige kommandolinjevalg."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Skannet_dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Lukk"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Behøver brukernavn og passord for å få tilgang til '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Fant ingen skannere"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Undersøk om skanneren er riktig tilkoblet, og at den er slått på"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Lagre"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Bildefiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Alle Filer"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Velg fil_type"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidig dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimert)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (tapsfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Lagring av fil mislyktes"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Hvis du ikke lagrer vil endringene gå tapt."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Lagre gjeldende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Forkast endringer"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Kunne ikke lagre forhåndsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Åpning av forhåndsvisning mislyktes"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Kan ikke åpne hjelpfil"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -581,16 +607,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Om Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktøy for å skanne dokumenter"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -602,88 +628,106 @@ msgstr ""
 "  Åka Sikrom https://launchpad.net/~akrosikam"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Lagre dokumentet før du avslutter?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Avslutt uten å lagre"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (kladd)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (høy oppløsning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Manglende filer"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Vennligst undersøk installasjonen"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Bytt _skanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Mørkere"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Lysere"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Lagrer dokument …"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Lagrer side nr. %d av %d"
@@ -691,6 +735,9 @@ msgstr "Lagrer side nr. %d av %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Manglende filer"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Høyde på skannede bilder, i pixler"
 
@@ -790,6 +837,9 @@ msgstr "Lagrer side nr. %d av %d"
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Vennligst undersøk installasjonen"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 1bf6d58..c9cc3f3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:04+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Alle pagina's van in_voer"
 msgid "_Stop Scan"
 msgstr "Scan _stoppen"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-mailen"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "_Linksom draaien"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "_Rechtsom draaien"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Bijsnijden"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Geen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "VS _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "VS Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Aangepast"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Bijsnijden d_raaien"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Naar links verplaatsen"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Naar rechts verplaatsen"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Hulp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Inhoud"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Een nieuw document beginnen"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nieuw"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Een enkele pagina scannen"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Scannen"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Document naar een bestand opslaan"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Opslaan"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "De huidige scan stoppen"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Stoppen"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "De pagina linksom draaien (tegen de klok in)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Linksom draaien"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "De pagina rechtsom draaien (met de klok mee)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rechtsom draaien"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "De geselecteerde pagina bijsnijden"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Bijsnijden"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Voorkeuren"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Scanner:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Tekstresolutie:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Fotoresolutie:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Scangrootte:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Paginagrootte:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Helderheid:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kwaliteit:"
 
@@ -447,122 +453,142 @@ msgid "Scanned Document"
 msgstr "Gescand document"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[APPARAAT...] - Hulpmiddel voor scannen"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Voer ‘%s --help’ uit om een volledige lijst van alle opdrachtregelopties te "
 "zien."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Gescand document.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Sluiten"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Gebruikersnaam en wachtwoord vereist om toegang te krijgen tot  '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Geen scanners gevonden"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Controleer of uw scanner is aangesloten en is ingeschakeld"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Opslaan"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Afbeeldingsbestanden"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Alle bestanden"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Bestands_type selecteren"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (document met meerdere pagina's)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (gecomprimeerd)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Bestand opslaan mislukt"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Als u niet opslaat, zullen wijzigingen permanent verloren gaan."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Huidige document opslaan?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Wijzigingen negeren"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Opslaan van afbeelding voor voorvertoning mislukt"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Kan toepassing voor voorvertoning van afbeelding niet openen"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Kon hulpbestand niet openen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -593,16 +619,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Info over Scanhulpmiddel"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Eenvoudig hulpmiddel voor het scannen van documenten"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -623,88 +649,106 @@ msgstr ""
 "  rob https://launchpad.net/~rvdb"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Document opslaan voor afsluiten?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Afsluiten zonder opslaan"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standaard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (klad)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hoge resolutie)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Ontbrekende bestanden"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Controleer uw installatie"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "_Scanner wijzigen"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Donkerder"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Lichter"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Minder"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Meer"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Bezig met opslaan van document..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Bezig met opslaan van pagina %d van %d"
@@ -712,6 +756,9 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Ontbrekende bestanden"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -720,6 +767,9 @@ msgstr "Bezig met opslaan van pagina %d van %d"
 #~ "Gebruik:\n"
 #~ "  %s [APPARAAT...] - Hulpmiddel voor scannen"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Controleer uw installatie"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
diff --git a/po/oc.po b/po/oc.po
index 536299a..0cce475 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2013-10-15 16:43+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,204 +87,210 @@ msgstr "Totas las paginas del _nauc"
 msgid "_Stop Scan"
 msgstr "_Arrestar la numerizacion"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Corrièl"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Pagina"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Pivotar cap a es_quèrra"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Pivotar cap a _drecha"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "Re_quadrar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Pas cap"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter (US)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "_Legal (US)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Pivota_r la seleccion"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Se desplaçar cap a esquèrra"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Se desplaçar cap a drecha"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Ensenhador"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Crear un document novèl"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Novèl"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Numerizar una sola pagina dempuèi lo scanner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Numerizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Enregistrar lo document dins un fichièr"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Enregistrar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Arrestar la numerizacion en cors"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Arrèsta"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 "Pivotar la pagina cap a esquèrra (sens invèrse de las agulhas d'una mòstra)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rotacion a esquèrra"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Pivotar la pagina cap a drecha (sens de las agulhas d'una mòstra)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rotacion a drecha"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Requadrar la pagina seleccionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Requadrar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferéncias"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "F_ont de numerizacion :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Resolucion del _Tèxte :"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Resolucion de la _fòto :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Fàcia de numerizar :"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Talha de la pagina :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Luminositat :"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contraste :"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualitat :"
 
@@ -445,122 +451,142 @@ msgid "Scanned Document"
 msgstr "Document numerizat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Aisina de numerizacion"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Aviatz « %s --help » per veire la lista completa de opcions disponiblas en "
 "linha de comanda"
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document.pdf numerizat"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Tampar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Nom d'utilizaire e senhal necessaris per accedir a « %s »"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Cap de scanner es pas estat detectat"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificatz que vòstre scanner es connectat e jos tension"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Enregistrar jos..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "A_nullar"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Fichièrs imatges"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Totes los fichièrs"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Seleccionatz lo _tipe de fichièr"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (document multipaginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sens pèrda)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Impossible d'enregistrar lo fichièr"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "S'enregistratz pas, las modificacions seràn perdudas definitivament."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Enregistrar lo document actual ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Abandonar las modificacions"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Impossible d'enregistrar l'imatge per lo previsualizar"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Impossible de dobrir l'aplicacion de previsualizacion d'imatge"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Impossible de dobrir lo fichièr d'ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -590,16 +616,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "A prepaus de Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Numerizar simplament vòstres documents"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -607,88 +633,106 @@ msgstr ""
 "  Quentin Pagès https://launchpad.net/~kwentin"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Enregistrar lo document abans de quitar ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Quitar sens enregistrar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d ppp (per defaut)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d ppp (borrolhon)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d ppp (nauta resolucion)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Fichièrs mancants"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Verificatz vòstra installacion"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Cambiar de _scanner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Mai escur"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Mai clar"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Mens"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Mai"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Enregistrament del document..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Enregistrament de la pagina %d sus %d"
@@ -796,6 +840,12 @@ msgstr "Enregistrament de la pagina %d sus %d"
 #~ "  --gtk-module=MODULS Cargar de moduls GTK+ suplementaris\n"
 #~ "  --g-fatal-warnings Rendre totes los avertiments fatals"
 
+#~ msgid "Files missing"
+#~ msgstr "Fichièrs mancants"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Verificatz vòstra installacion"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/pa.po b/po/pa.po
index e359547..63a01e1 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Punjabi <pa@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "ਫੀਡਰ ਤੋਂ ਸਭ ਸਫ਼ੇ(_F)"
 msgid "_Stop Scan"
 msgstr "ਸਕੈਨ ਨੂੰ ਰੋਕੋ(_S)"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "ਈਮੇਲ(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "ਸਫ਼ਾ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "ਕਰੋਪ ਕਰੋ(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "ਕੁਝ ਨਹੀਂ(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "ਪੱਤਰ(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "ਲੀਗਲ(_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "ਕਸਟਮ(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "ਕਰੋਪ ਨੂੰ ਘੁੰਮਾਓ(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "ਸਮੱਗਰੀ(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "ਨਵਾਂ ਡੌਕੂਮੈਂਟ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "ਨਵਾਂ"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "ਸਕੈਨਰ ਤੋਂ ਇੱਕਲਾ ਸਫ਼ਾ ਸਕੈਨ ਕਰੋ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "ਸਕੈਨ"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "ਡੌਕੂਮੈਂਟ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "ਮੌਜੂਦਾ ਸਕੈਨ ਰੋਕੋ"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "ਰੋਕੋ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ਸਫ਼ੇ ਨੂੰ ਖੱਬੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਉਲਟ ਦਿਸ਼ਾ ਵਿੱਚ)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "ਖੱਬੇ ਘੁੰਮਾਓ"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "ਸਫ਼ੇ ਨੂੰ ਸੱਜੇ ਘੁੰਮਾਉ (ਘੜੀ ਦੀ ਦਿਸ਼ਾ ਵਿੱਚ)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "ਸੱਜੇ ਘੁੰਮਾਓ"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "ਚੁਣੇ ਸਫ਼ੇ ਨੂੰ ਕਰੋਪ ਕਰੋ"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "ਕਰੋਪ ਕਰੋ"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "ਮੇਰੀ ਪਸੰਦ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "ਸਕੈਨ ਸਰੋਤ(_o):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "ਟੈਕਸਟ ਰੈਜ਼ੋਲੂਸ਼ਨ(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "ਫੋਟੋ ਰੈਜ਼ੋਲੂਸ਼ਨ(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "ਸਕੈਨ ਸਾਈਡ"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "ਸਫਾ ਆਕਾਰ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -433,120 +439,140 @@ msgid "Scanned Document"
 msgstr "ਸਕੈਨ ਕੀਤੇ ਡੌਕੂਮੈਂਟ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "ਸਕੈਨ ਕੀਤਾ ਡੌਕੂਮੈਂਟ.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' ਵਰਤਣ ਲਈ ਯੂਜ਼ਰ-ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "ਕੋਈ ਸਕੈਨਰ ਨਹੀਂ ਮਿਲਿਆ"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "ਆਪਣੇ ਜੁੜ ਹੋਏ ਸਕੈਨਰ ਨੂੰ ਚੈੱਕ ਕਰੋ ਅਤੇ ਚਾਲੂ ਕਰੋ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "ਇੰਝ ਸੰਭਾਲੋ..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "ਚਿੱਤਰ ਫਾਇਲਾਂ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "ਫਾਇਲ ਕਿਸਮ ਚੁਣੋ(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (ਬਹੁ-ਸਫ਼ਾ ਡੌਕੂਮੈਂਟ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (compressed)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ਜੇ ਤੁਸੀਂ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ ਸਭ ਬਦਲਾਅ ਖਤਮ ਹੋ ਜਾਣਗੇ।"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "ਮੌਜੂਦਾ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "ਬਦਲਾਅ ਅਣਡਿੱਠੇ"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "ਚਿੱਤਰ ਝਲਕ ਐਪਲੀਕੇਸ਼ਨ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "ਮੱਦਦ ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -563,104 +589,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "ਸੈਂਪਲ ਸਕੈਨ ਬਾਰੇ"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "ਸੈਂਪਲ ਡੌਕੂਮੈਂਟ ਸਕੈਨਿੰਗ ਟੂਲ"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  A S Alam https://launchpad.net/~aalam-users"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡੌਕੂਮੈਂਟ ਸੰਭਾਲਣਾ ਹੈ?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰਨਾ ਹੈ"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ਡਿਫਾਲਟ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (draft)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ਵੱਧ ਰੈਜ਼ੋਲੂਸ਼ਨ)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "ਸਕੈਨਰ ਬਦਲੋ(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "ਆਟੋਮੈਟਿਕ"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -679,5 +723,8 @@ msgstr ""
 #~ "ਵਰਤੋਂ:\n"
 #~ "  %s [DEVICE...] - Scanning utility"
 
+#~ msgid "Please check your installation"
+#~ msgstr "ਆਪਣੀ ਇੰਸਟਾਲੇਸ਼ਨ ਚੈੱਕ ਕਰੋ ਜੀ"
+
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ਆਖਰੀ ਸਕੈਨ ਕੀਤੇ ਚਿੱਤਰ ਦਾ ਰੈਜ਼ੋਲੂਸ਼ਨ"
diff --git a/po/pl.po b/po/pl.po
index 770b8f3..b46b5fd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
-"PO-Revision-Date: 2014-01-25 19:21+0000\n"
-"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
+"PO-Revision-Date: 2014-07-06 15:24+0000\n"
+"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "_Wszystkie strony z podajnika"
 msgid "_Stop Scan"
 msgstr "Zatrzymaj _skanowanie"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Zmień kolejność stron"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Strona"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Przytnij"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Brak"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Własny"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Ob_róć obszar przycięcia"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Przesuń w lewo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Przesuń w prawo"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "Pomo_c"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Spis treści"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Tworzy nowy dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nowy"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Skanuje pojedynczą stronę ze skanera"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skanuj"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Zapisuje dokument do pliku"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Zapisz"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Zatrzymuje bieżące skanowanie"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Zatrzymaj"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "Obraca stronę w lewo (przeciwnie do wskazówek zegara)"
+msgstr "Obraca stronę w lewo (przeciwnie do ruchu wskazówek zegara)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Obróć w lewo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
-msgstr "Obraca stronę w prawo (zgodnie ze wskazówkami zegara)"
+msgstr "Obraca stronę w prawo (zgodnie z ruchem wskazówek zegara)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Obróć w prawo"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Przycina wybraną stronę"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Przytnij"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferencje"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Źródło skan_owania:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Rozdzielczość tekstu:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Rozdzielczość z_djęcia:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skanowanie stron:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Rozmiar strony:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Jasność:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Jakość:"
 
@@ -358,7 +364,7 @@ msgstr "Rozdzielczość skanowanego tekstu"
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
 msgstr ""
-"Rozdzielczość do użycia podczas skanowania tekstu w punktach na cal (dpi)."
+"Rozdzielczość do użycia podczas skanowania tekstu w punktach na cal (DPI)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
@@ -367,7 +373,7 @@ msgstr "Rozdzielczość skanowanych zdjęć"
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
 msgstr ""
-"Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (dpi)."
+"Rozdzielczość do użycia podczas skanowania zdjęć w punktach na cal (DPI)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
@@ -404,7 +410,7 @@ msgstr "Brak dostępnych skanerów. Proszę podłączyć skaner."
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
-msgstr "Nie można połączyć się ze skanerem"
+msgstr "Nie można połączyć ze skanerem"
 
 #. Error display when unable to start scan
 #: ../src/scanner.vala:1219
@@ -419,12 +425,12 @@ msgstr "Błąd podczas komunikacji ze skanerem"
 #. Help string for command line --version flag
 #: ../src/simple-scan.vala:21
 msgid "Show release version"
-msgstr "Wypisuje inforamacje o wersji"
+msgstr "Wyświetla informacje o wersji"
 
 #. Help string for command line --debug flag
 #: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
-msgstr "Wypisuje komunikaty diagnozowania błędów"
+msgstr "Wyświetla komunikaty diagnozowania błędów"
 
 #: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
@@ -441,120 +447,142 @@ msgid "Scanned Document"
 msgstr "Zeskanowany dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[URZĄDZENIE] - Narzędzie do skanowania"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
-msgstr "Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy."
+msgstr ""
+"Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji "
+"wiersza poleceń."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Zeskanowany dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "Za_mknij"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Uzyskanie dostępu do \"%s\" wymaga podania nazwy użytkownika i hasła"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nie wykryto żadnego skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Proszę sprawdzić, czy skaner jest podłączony i włączony"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Zapisz"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Pliki obrazów"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Wszystkie pliki"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Proszę wybrać _typ pliku"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument wielostronicowy)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (skompresowany)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (bezstratny)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Zapisanie pliku się nie powiodło"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Zmiany zostaną bezpowrotnie utracone, jeśli nie zostaną zapisane."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Zapisać bieżący dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Odrzuć zmiany"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nie można zapisać podglądu obrazu"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Nie można otworzyć programu podglądu obrazów"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Połącz strony"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Połącz strony (odwrotnie)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Odwrotnie"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Bez zmiany"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Nie można otworzyć pliku pomocy"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -586,20 +614,19 @@ msgstr ""
 "- proszę odwiedzić stronę internetową <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "O programie"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Proste narzędzie do skanowania dokumentów"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
-"  Andrzej Książkiewicz https://launchpad.net/~ksiaze\n"
 "  Arkadiusz Błasiak https://launchpad.net/~ares1112\n"
 "  GTriderXC https://launchpad.net/~gtriderxc\n"
 "  Kuba Mędrek https://launchpad.net/~kubix-medrek\n"
@@ -615,92 +642,109 @@ msgstr ""
 "  Szymon Waliczek https://launchpad.net/~majster-pl\n"
 "  Tomasz 'Zen' Napierala https://launchpad.net/~tzn\n"
 "  Tomasz Dominikowski https://launchpad.net/~dominikowski\n"
-"  Wiatrak https://launchpad.net/~wiatrak.\n"
-"  tomko222 https://launchpad.net/~tomko222"
+"  Wiatrak https://launchpad.net/~wiatrak."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Zapisać dokument przed zakończeniem programu?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Zakończ bez zapisywania"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
-msgstr "%d dpi (domyślnie)"
+msgstr "%d DPI (domyślnie)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
-msgstr "%d dpi (szkic)"
+msgstr "%d DPI (szkic)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
-msgstr "%d dpi (wysoka rozdzielczość)"
+msgstr "%d DPI (wysoka rozdzielczość)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
-msgstr "%d dpi"
+msgstr "%d DPI"
+
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr "Nowy dokument"
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr "Dokument"
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr "E-mail..."
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Nie można odnaleźć plików"
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr "Wydrukuj..."
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Proszę sprawdzić poprawność instalacji"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr "Pomoc"
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr "O programie"
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr "Zakończ"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Zmień _skaner"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatyczny"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Ciemniej"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Jaśniej"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Mniejszy"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Większy"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimalnie"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maksymalnie"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Zapisywanie dokumentu..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Zapisywanie strony %d z %d"
@@ -708,6 +752,9 @@ msgstr "Zapisywanie strony %d z %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4x6\""
 
+#~ msgid "Files missing"
+#~ msgstr "Nie można odnaleźć plików"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -788,6 +835,9 @@ msgstr "Zapisywanie strony %d z %d"
 #~ "  --help-all                      Wyświetla wszystkie opcje pomocy\n"
 #~ "  --help-gtk                      Wyświetla opcje GTK+"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Proszę sprawdzić poprawność instalacji"
+
 #~ msgid ""
 #~ "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 #~ msgstr ""
diff --git a/po/pt.po b/po/pt.po
index e33dcac..f443c2e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-08-28 14:11+0000\n"
 "Last-Translator: Gusrubin <gusrubin@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Todas as páginas a partir do _Alimentador"
 msgid "_Stop Scan"
 msgstr "_Parar Digitalização"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Re-organizar páginas"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rodar para a _Esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rodar para a _Direita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Cortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rodar Recorte"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mover para a Esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mover para a Direita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Ajuda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Conteúdos"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Digitalizar uma página no digitalizador"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Guardar documento num ficheiro"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Guardar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Parar a digitalização actual"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rodar a página para a esquerda (contra ponteiros do relógio)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rodar para a Esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rodar a página para a direita (ponteiros do relógio)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rodar para a Direita"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Cortar a página selecionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Origem da Digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Resolução do _Texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Resolução da Foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Lado da digitalização"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Tamanho da Página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualidade:"
 
@@ -440,122 +446,142 @@ msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Execute '%s --help' para consultar uma lista completa das opções de linha de "
 "comando disponíveis."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Documento Digitalizado.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "Fechar"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário utilizador e palavra-passe para aceder a '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nenhum scanner detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verifique se o seu scanner está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Guardar Como..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "Cancelar"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "Guardar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Ficheiros de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Seleccionar _Tipo de ficheiro"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento multi-página)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Falhou ao guardar o ficheiro"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se não guardar, as alteração serão perdidas permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Guardar documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Descartar Alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Incapaz de gravar imagem para pré-visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir a aplicação de visualização de imagem"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Combinar lados"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Combinar Lados (inverso)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Inverter"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Manter inalterado"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o ficheiro da ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -585,16 +611,16 @@ msgstr ""
 "este programa. Caso contrário, veja <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Acerca do Digitalização Simples (Simple Scan)"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -612,6 +638,7 @@ msgstr ""
 "  Flavio https://launchpad.net/~flaviocarpin\n"
 "  Gusrubin https://launchpad.net/~gusrubin\n"
 "  Hélder Portela https://launchpad.net/~helderp666\n"
+"  IvoGuerreiro https://launchpad.net/~ivoguerreiro\n"
 "  Jaime Pereira https://launchpad.net/~jaimepereira\n"
 "  Jose Almeida https://launchpad.net/~josealmeida\n"
 "  Luis Pratas https://launchpad.net/~luispratas\n"
@@ -626,92 +653,116 @@ msgstr ""
 "  styluss https://launchpad.net/~styluss"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Guardar documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Sair SEM Guardar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (predefinido)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta-resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Ficheiros em falta"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Por favor, verifique a sua instalação"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Escurecer"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Clarear"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mínimo"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Máximo"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "A guardar o documento..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "A guardar a página %d de %d"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Por favor, verifique a sua instalação"
+
+#~ msgid "Files missing"
+#~ msgstr "Ficheiros em falta"
+
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 284cf17..bc7eb69 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2013-04-16 12:21+0000\n"
 "Last-Translator: Neliton Pereira Jr. <nelitonpjr@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Todas as páginas do ali_mentador"
 msgid "_Stop Scan"
 msgstr "Par_ar digitalização"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-mail"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Página"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Girar à _esquerda"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Girar à di_reita"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "Re_cortar"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Nenhum"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Carta"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "_Ofício"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizar"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "Gira_r área recortada"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mover para a esquerda"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mover para a direita"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "A_juda"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Conteúdo"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Iniciar um novo documento"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Digitalizar uma página no digitalizador"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Digitalizar"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Salvar documento em arquivo"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Salvar"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Parar a digitalização atual"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Parar"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Girar a página à esquerda (sentido anti-horário)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Girar à esquerda"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Girar a página à direita (sentido horário)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Girar à direita"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Recortar a página selecionada"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Recortar"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Origem da digitalizaçã_o:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Resolução do _texto:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Resolução da _foto:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Lado a digitalizar:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Tamanho da página:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Brilho:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Contraste:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Qualidade:"
 
@@ -442,122 +448,142 @@ msgid "Scanned Document"
 msgstr "Documento digitalizado"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DISPOSITIVO...] - Utilitário de digitalização"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Execute '%s --help' para ver a lista completa de opções disponíveis para "
 "linha de comando."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Documento digitalizado.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "Fe_char"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "É necessário o nome de usuário e senha para acessar '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nenhum digitalizador detectado"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Por favor verifique se o seu digitalizador está conectado e ligado"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Salvar"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Arquivos de imagem"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Todos os arquivos"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Selecionar _tipo de arquivo"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (documento com múltiplas páginas)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimido)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (sem perdas)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Falha ao salvar o arquivo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Se você não salvar, as alterações serão permanentemente perdidas."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Salvar documento atual?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Descartar alterações"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Não é possível salvar imagem para visualização"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Não foi possível abrir o aplicativo de visualização de imagem"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Não foi possível abrir o arquivo de ajuda"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -587,16 +613,16 @@ msgstr ""
 "este programa. Caso contrário, acesse <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Sobre o Digitalizador simples"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Ferramenta simples para digitalizar documentos"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -607,7 +633,8 @@ msgstr ""
 "  Celio Ricardo Quaio Goetten https://launchpad.net/~celioric\n"
 "  Celso H. L. S. Junior https://launchpad.net/~celsojunior\n"
 "  Fábio Nogueira https://launchpad.net/~fnogueira\n"
-"  Matheus Pacheco de Andrade https://launchpad.net/~matheusp-andrade\n"
+"  Matheus Pacheco de Andrade https://launchpad.net/~matheusp-andrade-"
+"deactivatedaccount\n"
 "  Neliton Pereira Jr. https://launchpad.net/~nelitonpjr\n"
 "  Pablo Diego Moço https://launchpad.net/~pablodm89\n"
 "  Paulo José https://launchpad.net/~pauloup\n"
@@ -622,88 +649,106 @@ msgstr ""
 "  millemiglia https://launchpad.net/~dnieper650"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Salvar o documento antes de sair?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Sair sem salvar"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (padrão)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (rascunho)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (alta resolução)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d ppp"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Arquivos faltando"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Por favor verifique a sua instalação"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Alterar _digitalizador"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Mais escuro"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Mais claro"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Menos"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Mais"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Mínima"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Máxima"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Salvando documento..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Salvando página %d de %d"
@@ -711,6 +756,9 @@ msgstr "Salvando página %d de %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Por favor verifique a sua instalação"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
@@ -733,6 +781,9 @@ msgstr "Salvando página %d de %d"
 #~ "  --gtk-module=MODULES            Carrega módulos adicionais do GTK+\n"
 #~ "  --g-fatal-warnings              Torna todos os avisos fatais"
 
+#~ msgid "Files missing"
+#~ msgstr "Arquivos faltando"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
diff --git a/po/ro.po b/po/ro.po
index eb99bc2..d161935 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-09-11 18:43+0000\n"
 "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 "Language: ro\n"
 
 #. Button to submit authorization dialog
@@ -88,205 +88,211 @@ msgstr "Toate paginile de la tava cu _foi de hârtie"
 msgid "_Stop Scan"
 msgstr "Oprește _scanarea"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Pagină"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rotește la _stânga"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rotește la _dreapta"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "De_cupează"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Niciunul"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Scrisoare"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Personalizat"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotește zona decupată"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Mută la stânga"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Mută la dreapta"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Ajutor"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Cuprins"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Începeți un document nou"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nou"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Scanați o singură pagină din scaner"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Scanează"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Salvează documentul ca fișier"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Salvează"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Oprește scanarea curentă"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Oprește"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotește pagina la stânga (în sens invers acelor de ceasornic)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rotește la stânga"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotește pagina la dreapta (în sensul acelor de ceasornic)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Decupează pagina selectată"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Decupează"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Preferințe"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "S_ursă scanare:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Rezoluție _text:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Rezoluție _foto :"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Partea scanată:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Dimensiunea paginii:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
-msgstr ""
+msgstr "Luminozitate:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
-msgstr ""
+msgstr "Contrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
-msgstr ""
+msgstr "Calitate:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
@@ -337,19 +343,19 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:9
 msgid "Brightness of scan"
-msgstr ""
+msgstr "Luminozitate scanare"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Reglare luminozitate de la -100 la 100 (0 fiind nimic)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "Contrast scanare"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "Reglare contrast de la -100 la 100 (0 fiind nimic)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
@@ -388,11 +394,11 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Valoare calitate pentru compresia JPEG"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Valoare calitate pentru compresia JPEG"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
@@ -441,122 +447,142 @@ msgid "Scanned Document"
 msgstr "Document scanat"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "DISPOZITIV...] - Utilitar pentru scanare"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Rulați „%s --help” pentru a consulta lista completă a opțiunilor pentru "
 "comenzile mediului text."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Document scanat.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
-msgstr ""
+msgstr "Înc_hide"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Sunt necesare numele de utilizator și parola pentru a accesa „%s”"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nu a fost detectat niciun scaner"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Verificați dacă scanerul este conectat și pornit"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Salvează ca..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
-msgstr ""
+msgstr "_Anulare"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
-msgstr ""
+msgstr "_Salvează"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Fișiere imagine"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Toate fișierele"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Alegeți _tipul de fișier"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (document cu mai multe pagini)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (comprimat)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (fără pierderi)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Salvarea fișierului a eșuat"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Dacă nu salvați, modificările vor fi pierdute definitiv."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Salvați documentul curent?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Renunță la modificări"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nu se poate salva imaginea pentru a prezenta o previzualizare"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Nu s-a putut deschide aplicația de previzualizare a imaginilor"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Nu se poate deschide fișierul de ajutor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -588,16 +614,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Despre „Scanare simplă”"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Utilitar pentru scanarea simplă a documentelor"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -610,95 +636,116 @@ msgstr ""
 "  sfantu https://launchpad.net/~sfantus1"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Salvați documentul înainte de ieșire?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Închide fără a salva"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (implicit)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ciornă)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezoluție înaltă)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Lipsesc fișierele"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Verificați instalarea"
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Schimbă _scanerul"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
-msgstr ""
+msgstr "Mai întunecat"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
-msgstr ""
+msgstr "Mai luminos"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
-msgstr ""
+msgstr "Mai puțin"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
-msgstr ""
+msgstr "Mai mult"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
-msgstr ""
+msgstr "Minim"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
-msgstr ""
+msgstr "Maxim"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
-msgstr ""
+msgstr "Se salvează documentul..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
-msgstr ""
+msgstr "Se salvează pagina %d din %d"
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Verificați instalarea"
+
 #, c-format
 #~ msgid ""
 #~ "Usage:\n"
@@ -805,5 +852,8 @@ msgstr ""
 #~ "  --gtk-module=MODULE             Încarcă module GTK+ adiționale\n"
 #~ "  --g-fatal-warnings              Consideră toate avertismentele fatale"
 
+#~ msgid "Files missing"
+#~ msgstr "Lipsesc fișierele"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Direcția scanerului față de pagina scanată."
diff --git a/po/ru.po b/po/ru.po
index bb47635..ce22d2b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
-"PO-Revision-Date: 2012-07-23 09:07+0000\n"
-"Last-Translator: Dr Gregory House <housegregory299@gmail.com>\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
+"PO-Revision-Date: 2014-07-10 05:43+0000\n"
+"Last-Translator: Jay ZDLin <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Все страницы из _автоподатчика"
 msgid "_Stop Scan"
 msgstr "_Остановить сканирование"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Организация страниц"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "Отправить по _электронной почте"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Повернуть в_лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Повернуть в_право"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Обрезать"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Нет"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US _Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Другое..."
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Повернуть выбранное"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
-msgstr ""
+msgstr "Переместить влево"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
-msgstr ""
+msgstr "Переместить вправо"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Справка"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Содержание"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Создать новый документ"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Создать"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Отсканировать одну страницу со сканера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Отсканировать"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Сохранить документ в файл"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Сохранить"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Прервать выполняемое сканирование"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Завершить"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Повернуть страницу влево (против часовой стрелки)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Повернуть влево"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Повернуть страницу вправо (по часовой стрелке)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Повернуть вправо"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Обрезать выбранную страницу"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Обрезать"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Параметры"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Ист_очник сканирования:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Р_азрешение текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Разрешение фотографии:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Сканируемая сторона:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Размер листа:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Яркость:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Контрастность:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Качество:"
 
@@ -434,120 +440,140 @@ msgid "Scanned Document"
 msgstr "Отсканированный документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] — Устройство сканирования"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Выполните '%s --help', чтобы вывести полный список доступных опций."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Сканированный документ.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Закрыть"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступа к '%s' нужны имя пользователя и пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Сканеры не обнаружены"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Пожалуйста, проверьте, что сканер подсоединён и включен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Отменить"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "Со_хранить"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Файлы изображений"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Все файлы"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Выберите _тип файла"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (многостраничный документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (сжатый)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (без потерь в качестве)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Не удалось сохранить файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Если не выполнить сохранение, все изменения будут утеряны."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Отменить изменения"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Не удалось сохранить изображение для предварительного просмотра"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Невозможно открыть программу для просмотра изображений"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "Объединить стороны"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "Объединить стороны (в обратном порядке)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "В обратном порядке"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Оставить без изменений"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Не удалось открыть файл справки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -576,16 +602,16 @@ msgstr ""
 "пройдите по ссылке: <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "О программе"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Простой инструмент для сканирования документов"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -607,6 +633,7 @@ msgstr ""
 "  Igor Zubarev https://launchpad.net/~igor.zubarev\n"
 "  Int https://launchpad.net/~howrudoin\n"
 "  Ivan Bulychev https://launchpad.net/~vanyok\n"
+"  Jay ZDLin https://launchpad.net/~black-buddha666\n"
 "  KEIII https://launchpad.net/~cashagent\n"
 "  Net4Hack https://launchpad.net/~networkforhackers\n"
 "  Novichkov Alexander https://launchpad.net/~berkut\n"
@@ -624,88 +651,106 @@ msgstr ""
 "  Илья Калитко https://launchpad.net/~kalitko-ilya007"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Сохранить документ перед выходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Выйти без сохранения"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (по умолчанию)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (черновик)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (высокое разрешение)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Файлы отсутствуют"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr "Новый документ"
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr "Документ"
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr "Отправить..."
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr "Печать..."
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr "Справка"
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Пожалуйста, проверьте правильность установки программы"
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr "О программе"
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr "Завершить"
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Сменить _сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Выбрать автоматически"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Темнее"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Светлее"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Меньше"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Больше"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Мин."
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Макс."
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Сохранение документа..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Сохранение страницы %d из %d"
@@ -741,6 +786,12 @@ msgstr "Сохранение страницы %d из %d"
 #~ "  --gtk-module=МОДУЛИ             Загрузить дополнительные модули GTK+\n"
 #~ "  --g-fatal-warnings              Сделать все предупреждения фатальными"
 
+#~ msgid "Files missing"
+#~ msgstr "Файлы отсутствуют"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Пожалуйста, проверьте правильность установки программы"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Высота отсканированного изображения в пикселах"
 
diff --git a/po/sd.po b/po/sd.po
index 21d72b3..7dc4da3 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Sindhi <sd@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr "اسڪين _روڪيو"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_ايميل"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_صفحو"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "_کاٻي ڦيرايو"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "_ساڄي ڦيرايو"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_ڪاٽيو"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_ڪوبه نه"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_مرضي مطابق"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "کاٻي چوريو"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "ساڄي چوريو"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_مدد"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_مواد"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "نئون دستاويز بنايو"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "نئون"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "اسڪينر مان هڪڙو صفحو اسڪين ڪريو"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "اسڪين"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "دستاويز کي فائل ۾ سانڍيو"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "سانڍيو"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "هلندڙ اسڪين روڪيو"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "روڪيو"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "کاٻي ڦيرايو"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "ساڄي ڦيرايو"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "چونڊيل صفحي کي ڪاٽيو"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "ڪاٽيو"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "ترجيحون"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "پاسو اسڪين ڪريو:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "صفحي جي ماپ:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr "اسڪين ٿيل دستاويز"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "اسڪين دستاويز.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "هينئن سانڍيو..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "شڪل فائلون"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "تمام فائلون"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "فائل جو _قسم چونڊيو"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "فائل سانڍڻ ۾ ناڪامي"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "هاڻوڪو دستاويز سانڍيو؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "تبديليون منسوخ ڪريو"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "سهڪاري فائل ڀرڻ ۾ ناڪام"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,107 +587,128 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "سادي اسڪين بابت"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "سادو دستاويز اسڪين ڪندڙ اوزار"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Abdul-Rahim Nizamani https://launchpad.net/~ghaffari"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "نڪرڻ کان پهرين دستاويز سانڍيو؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "سانڍڻ بغير نڪرو"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "فائلون وڃايل"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "اسڪينر _تبديل ڪريو"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "پاڻمرادو"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
 #~ msgid "Direction of scan"
 #~ msgstr "اسڪين جو رخ"
+
+#~ msgid "Files missing"
+#~ msgstr "فائلون وڃايل"
diff --git a/po/se.po b/po/se.po
index f6e76a3..8245b27 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-08-18 11:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Northern Sami <se@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-boasta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Čuohpa"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Sirdde olgešguvlui"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Veahkki"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Ođđa"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Oza"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Vurke"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Bisset"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Jorat olgešguvlui"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Oidimat"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Vurke nugo …"
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Buot fiillat"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,104 +587,122 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Simple Scan-dieđut"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Christopher Forster https://launchpad.net/~christopherforster"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automáhtalaš"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 0f30309..e552519 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Shan <shn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr ""
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr ""
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr ""
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,102 +587,120 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 8a00b34..2174423 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:07+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "_Všetky stránky zo zásobníka"
 msgid "_Stop Scan"
 msgstr "_Zastaviť skenovanie"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Stránka"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Otočiť _doľava"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Otočiť do_prava"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Orezanie"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "Žia_dne"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "US _List"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Vlastné"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Otočiť výrez"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Pomocník"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Vytvoriť nový dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nový"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Oskenovať jednu stránku zo skeneru"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skenovať"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Uložiť"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Otočiť doľava"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Otočiť doprava"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Orezanie"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Predvoľby"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Zdroj s_kenovania:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Jas:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -435,122 +441,142 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ZARIADENIE…] - Nástroj na skenovanie"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Zoznam všetkých dostupných volieb príkazového riadka zobrazíte spustením „%s "
 "--help“."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Naskenovaný dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Meno používateľa a heslo je vyžadované pre prístup k '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Žiadne skenery neboli nájdené"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Prosím skontrolujte či je skener pripojený a zapnutý"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Ukladanie súboru zlyhalo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nepodarilo sa uložiť obraz na náhľad"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -580,16 +606,16 @@ msgstr ""
 "licencie GNU. Ak sa tak nestalo, navštívte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "O programe Jednoduché skenovanie"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Nástroj na jednoduché skenovanie dokumentov"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -600,88 +626,106 @@ msgstr ""
 "  Robert Ancell https://launchpad.net/~robert-ancell"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Chýbajúce súbory"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Prosím skontrolujte vašu inštaláciu"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Zmeniť _skener"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Ukladá sa dokument…"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ukladá sa %d. strana z %d"
@@ -689,6 +733,12 @@ msgstr "Ukladá sa %d. strana z %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Prosím skontrolujte vašu inštaláciu"
+
+#~ msgid "Files missing"
+#~ msgstr "Chýbajúce súbory"
+
 #~ msgid ""
 #~ "The direction of the scanner across the scanned page. It can be one of the "
 #~ "following: 'top-to-bottom' 'bottom-to-top' 'left-to-right' 'right-to-left'"
diff --git a/po/sl.po b/po/sl.po
index 0a2c447..1ecc319 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:19+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Vse strani iz _podajalnika"
 msgid "_Stop Scan"
 msgstr "_Zaustavi optično branje"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Elektronska pošta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Stran"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Zavrti _levo"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Zavrti _desno"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Obreži"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Brez"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Pismo"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Velikost ZDA Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Po meri"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Zavrti obrezovano območje"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Premakni levo"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Premakni desno"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "Pomo_č"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Vsebina"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Začni nov dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Novo"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Optično branje ene strani iz optičnega bralnika"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Optično branje"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Shrani dokument v datoteko"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Shrani"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Zaustavi trenutno optično branje"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Zaustavi"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Obrni stran v levo (nasprotna smer urinega kazalca)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Zavrti levo"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Obrni stran v desno (smer urinega kazalca)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Zavrti desno"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Obreži izbrano stran"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Obreži"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Možnosti"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Vir optičnega branja:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Ločljivost besedila:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Ločljivost fotografij:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Stran optičnega branja:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Velikost strani:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Svetlost:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kakovost:"
 
@@ -438,120 +444,140 @@ msgid "Scanned Document"
 msgstr "Optično bran dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[NAPRAVA ...] - pripomoček optičnega branja"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Optično bran dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Zapri"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Za dostop do '%s' je zahtevano uporabniško ime in geslo"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Optičnega bralnika ni mogoče zaznati"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Preverite, če je vaš optični bralnik povezan in vklopljen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Shrani"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Slikovne datoteke"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Vse datoteke"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Izberite _vrsto datoteke"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (večstranski dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (stisnjen)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (brez izgub)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Shranjevanje datoteke je spodletelo"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Naj bo trenutni dokument shranjen?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Zavrzi vse spremembe"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Ni bilo mogoče shraniti slike za predogled"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Ni mogoče odpreti programa predogleda slik"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Ni mogoče odpreti datoteke pomoči"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -583,16 +609,16 @@ msgstr ""
 "v primeru, da kopije niste prejeli si oglejte <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "O programu"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Preprosto orodje za optično branje dokumentov"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -604,88 +630,106 @@ msgstr ""
 "  grofaty https://launchpad.net/~grofaty"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Ali naj bo dokument pred končanjem programa shranjen?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Končaj brez shranjevanja"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d točk na palec (privzeto)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d točk na palec (osnutek)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d točk na palec (visoka ločljivost)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d točk na palec"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Datoteke manjkajo"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Preverite svojo namestitev"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Spremeni _optični bralnik"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Temenjše"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Svetlejše"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Manj"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Več"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Najmanj"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Največ"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Shranjevanje dokumenta ..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Shranjevanje strani %d od %d"
@@ -693,6 +737,9 @@ msgstr "Shranjevanje strani %d od %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Files missing"
+#~ msgstr "Datoteke manjkajo"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "PRAV, če je okno programa razpeto"
 
@@ -798,5 +845,8 @@ msgstr "Shranjevanje strani %d od %d"
 #~ "  --gtk-module=MODULES Naloži dodatnemodule GTK+\n"
 #~ "  --g-fatal-warnings Naredi vsa opozorila usodna"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Preverite svojo namestitev"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Smer optičnega bralnika na optično brani strani."
diff --git a/po/sq.po b/po/sq.po
index 2a43f34..442c05f 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Alket Rexhepi <alketii@gmail.com>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:29+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Të Gjitha Faqet Nga _Ushqyesi"
 msgid "_Stop Scan"
 msgstr "_Ndalo Skanimin"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Faqe"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rrotullo _Majtas"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rrotullo _Djathtas"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "Preje"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Asnjë"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Shkronjë"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Sipas përdoruesit"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Prerje me Rrotullim"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Lëvize Majtas"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Lëvize Djathtas"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Ndihmë"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Përmbajtje"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Filloje një dokument të ri"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "I ri"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Skanoje një faqe të thjeshtë prej skanerit"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skanim"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Ruaje dokumentin tek një fajll"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Ruaj"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Ndaloje skanimin e tanishëm"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Ndalo"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rrotulloje faqen majtas (kundër akrepave të orës)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rrotullo Majtas"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rrotullo faqen në të djathtë"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rrotullo Djathtas"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Preje faqen e përzgjedhur"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Prej"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Parapëlqimet"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Skanoje b_urimin"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Rezolucioni i Tekstit:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Rezolucioni i Fotos:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Skanoje anën"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Përmasa e Faqes:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Ndriçimi:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrasti:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Cilësia:"
 
@@ -439,123 +445,143 @@ msgid "Scanned Document"
 msgstr "Dokumenti i Skanuar"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Mjet i skanimit"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Nis '%s --ndihmë' për të parë një listë të plotë të linjave të disponueshme "
 "të komandës."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Dokumenti i Skanuar.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Mbylle"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Emri i përdoruesit dhe skanimi kërkohet për të hyrë në '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Nuk u dalluan skanera"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "Ju lutemi të kontrolloni nëse skaneri juaj është i lidhur dhe i ndezur"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Ruaje Si..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Anullo"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Ruaje"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Kartela Pamje"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Të Gjithë Skedarët"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Zgjidh Llojin e _Skedarit"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (dokument shumë faqësh)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (i ngjeshur)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (pa humbje)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Dështuam në ruajtjen e skedarit"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Nëse nuk  ruani, ndryshimet do të humbasin përgjithmonë."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Ta ruaj dokumentin e tanishëm?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Anullo Ndryshimet"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Nuk jemi në gjendje ta ruajmë imazhin për parapamje"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Nuk jam në gjendje të hap programin për parapamjen e imazhit"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "E pamundur hapja e file të ndihmës"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -584,16 +610,16 @@ msgstr ""
 "me këtë program. Nëse jo, shikoni <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Rreth Skanimit të Thjeshtë"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Mjet i thjeshtë për skanimin e dokumenteve"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -602,88 +628,106 @@ msgstr ""
 "  Vilson Gjeci https://launchpad.net/~vilsongjeci"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Ta ruaj dokumentin para daljes?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Dil pa e ruajtur"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (e parazgjedhur)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (i thjeshtë)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (rezolucion i lartë)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Skedarët mungojnë"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Ju lutemi të kontrolloni instalimin tuaj"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Ndrysho _Skanerin"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Më e Errët"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Më e lehtë"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Më Pak"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Më tepër"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Maksimum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Ruajtje e dokumentit..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Ruajtja e faqes %d nga %d"
@@ -733,6 +777,12 @@ msgstr "Ruajtja e faqes %d nga %d"
 #~ "Përdorimi:\n"
 #~ "  %s [DEVICE...] - Mjeti skanues"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Ju lutemi të kontrolloni instalimin tuaj"
+
+#~ msgid "Files missing"
+#~ msgstr "Skedarët mungojnë"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "E VËRTETË nëse dritarja e programit është maksimizuar"
 
diff --git a/po/sr.po b/po/sr.po
index 0622431..3c07a66 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,15 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2014-02-28 14:28+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian translators\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 "Language: sr\n"
 
 #. Button to submit authorization dialog
@@ -87,203 +87,209 @@ msgstr "Све странице из _фиоке"
 msgid "_Stop Scan"
 msgstr "_Заустави скенирање"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Ел. пошта"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Страница"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Окрени на _лево"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Окрени на _десно"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Опсеци"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ништа"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "А_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "А_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "А_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Америчко писмо"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "_Легал"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Произвољно"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Заокрени опсечено"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Помери улево"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Помери удесно"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "По_моћ"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Садржај"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Покрените нови документ"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Ново"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Скенирајте једну страницу са скенера"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Скенирај"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Сачувајте документ у датотеку"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Сачувај"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Зауставите текуће скенирање"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Заустави"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Окрените страну на лево (супротно смеру казаљке на сату)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Окрени на лево"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Окрените страну на десно (у смеру казаљке на сату)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Окрени на десно"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Одрежите изабрану страну"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Одрежи"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Поставке"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Извор _скенирања:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Резолуција _текста:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Ре_золуција слике:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Странице за скенирање:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Величина странице:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Освјетљај:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Контраст:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Квалитет:"
 
@@ -444,121 +450,141 @@ msgid "Scanned Document"
 msgstr "Скенирани документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[УРЕЂАЈ...] — алатка за скенирање"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Покрените „%s --help“ за потпуни списак свих опција из командне линије."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Скенирани документ.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Затвори"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Корисничко име и лозинка су обавезни за приступ „%s“"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Нема откривених скенера"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Проверите да ли је скенер повезан и укључен"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Сачувај као..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Сачувај"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Датотеке слика"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Све датотеке"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "_Изабери врсту датотеке"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "ПДФ (документ са више страна)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "ЈПЕГ (сажето)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "ПНГ (без губитака)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Нисам успео да сачувам датотеку"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Уколико не сачувате, измене ће бити трајно изгубљене."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Да сачувам текући документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Одбаци измене"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Не могу да сачувам слику за преглед"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Не могу да отворим програм за приказивање слика"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Не могу да отворим датотеку помоћи"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -588,16 +614,16 @@ msgstr ""
 "http://www.gnu.org/licenses/."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "О Једноставном скенирању"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Једноставна алатка за скенирање докумената"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -609,88 +635,106 @@ msgstr ""
 "  Мирослав Николић https://launchpad.net/~lipek"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Да сачувам документ пре него што изађем?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Изађи без чувања"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d тпи (основно)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d тпи (нацрт)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d тпи (висока резолуција)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d тпи"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Недостају датотеке"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Проверите вашу инсталацију"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Промени _скенер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Тамније"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Светлије"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Мање"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Више"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Најмање"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Највише"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Чувам документ..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Чувам %d. страницу од укупно %d"
@@ -698,6 +742,12 @@ msgstr "Чувам %d. страницу од укупно %d"
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Проверите вашу инсталацију"
+
+#~ msgid "Files missing"
+#~ msgstr "Недостају датотеке"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Правац скенирања"
 
diff --git a/po/sv.po b/po/sv.po
index bda74a5..7780e26 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,205 +87,211 @@ msgstr "Alla sidor från _matare"
 msgid "_Stop Scan"
 msgstr "_Stoppa inläsning"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Ändra sidordning"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_E-post"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Sida"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Rotera åt _vänster"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Rotera åt _höger"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Beskär"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Ingen"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4x6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "An_passad"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Rotera beskär"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Hjälp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Innehåll"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Starta ett nytt dokument"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Nytt"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Läs in en enstaka sida från bildläsaren"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Läs in"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Spara dokument till en fil"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Spara"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Stoppa den aktuella bildinläsningen"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Stoppa"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Rotera sidan åt vänster (motsols)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Rotera sidan åt höger (medsols)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Beskär den valda sidan"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Beskär"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Inläsnings_källa:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Textupplösning:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Fotoupplösning:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Inläsningssida:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Sidstorlek:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Ljusstyrka:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Kontrast:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
-msgstr ""
+msgstr "Kvalitet:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
@@ -388,11 +394,11 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "Kvalitets värde i JPEG kompression"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "Kvalitets värde i JPEG kompression"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
@@ -439,122 +445,142 @@ msgid "Scanned Document"
 msgstr "Inläst dokument"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ENHET...] - Bildinläsningsverktyg"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kör \"%s --help\" för en komplett lista över tillgängliga "
 "kommandoradsflaggor."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Inläst dokument.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
-msgstr ""
+msgstr "_Stäng"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Användarnamn och lösenord krävs för åtkomst till \"%s\""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Inga bildinläsare hittades"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Kontrollera att din bildläsare är ansluten och påslagen"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
-msgstr ""
+msgstr "_Avbryt"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
-msgstr ""
+msgstr "_Spara"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Bildfiler"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Alla filer"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Välj fil_typ"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (flersidigt dokument)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (komprimerad)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (förlustfri)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Misslyckades med att spara filen"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Om du inte sparar så kommer ändringarna att gå förlorade."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Förkasta ändringar"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Kunde inte spara bild för förhandsvisning"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Kunde inte öppna förhandsvisningsprogrammet för bilder"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "Omvänt"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Behåll oförändrad"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Kunde inte öppna hjälpfilen"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -584,113 +610,131 @@ msgstr ""
 "med detta program. Om inte, se <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Om Enkel bildinläsning"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Enkelt verktyg för inläsning av dokument"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Anders Pamdal https://launchpad.net/~anders-pamdal\n"
 "  Arve Eriksson https://launchpad.net/~031299870-telia\n"
 "  Daniel Nylander https://launchpad.net/~yeager\n"
+"  Erik Hellberg https://launchpad.net/~erik-hellberg85\n"
 "  Jens Askengren https://launchpad.net/~jens-askengren\n"
 "  Peter Ahlgren https://launchpad.net/~peter.ahlgren\n"
 "  Simba https://launchpad.net/~the-funnyboy\n"
 "  Simon Hammarström https://launchpad.net/~simmeson\n"
 "  Teodor Jönsson https://launchpad.net/~teodor-jonsson-sogeti-"
-"deactivatedaccount\n"
-"  Zahirovic Mensur https://launchpad.net/~nookienoq"
+"deactivatedaccount"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Spara dokumment innan du avslutar?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Avsluta utan att spara"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (standard)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (utkast)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (hög upplösning)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Filer saknas"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Kontrollera din installation"
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "Byt _bildinläsare"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Mörkare"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Ljusare"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Mindre"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Mer"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
-msgstr ""
+msgstr "Minimum"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
-msgstr ""
+msgstr "Maximum"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Sparar dokument..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Sparar sida %d av %d"
@@ -709,6 +753,9 @@ msgstr "Sparar sida %d av %d"
 #~ "Användning:\n"
 #~ "  %s [ENHET...] - Inläsningsverktyg"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Kontrollera din installation"
+
 #~ msgid "Height of scanned image in pixels"
 #~ msgstr "Höjd för den inlästa bilden i bildpunkter"
 
@@ -724,6 +771,9 @@ msgstr "Sparar sida %d av %d"
 #~ msgid "Window width in pixels"
 #~ msgstr "Fönsterbredd i bildpunkter"
 
+#~ msgid "Files missing"
+#~ msgstr "Filer saknas"
+
 #~ msgid "TRUE if the application window is maximized"
 #~ msgstr "TRUE om programfönstret är maximerat"
 
diff --git a/po/te.po b/po/te.po
index eb39ab9..e2c3623 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "ఫీడర్ నుండి అన్ని పేజీలు(_F)"
 msgid "_Stop Scan"
 msgstr "స్కాన్ ఆపు(_S)"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "ఈమెయిల్(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "పేజీ(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "ఎడమవైపు తిప్పు (_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "కుడివైపు తిప్పు(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "క్రాప్ చేయి(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "ఏదీకాదు(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "లెటర్ (_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "లీగల్ (_g)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "మలచుకొను(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "క్రాప్‌చేసినదానిని తిప్పు(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "ఎడమకు జరుపు"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "కుడి వైపు జరుపు"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "సహాయం (_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "విషయసూచిక(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "ఒక కొత్త పత్రాన్ని ప్రాంరంభించు"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "కొత్త"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "స్కానర్ నుండి ఒకే ఒక పేజీ స్కాన్ చేయి"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "స్కాన్"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "పత్రాన్ని ఫైలులో దాచు"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "భద్రపరచు"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "ప్రస్తుత స్కాన్ ఆపు"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "ఆపు"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "ఎడమవైపుకు త్రిప్పు (అపసవ్య)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "ఎడమవైపు తిప్పు"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "కుడి వైపుకు త్రిప్పు (సవ్య)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "కుడివైపు తిప్పు"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "ఎంపికైన పెజీ అంచులుసవరించు"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "అంచులుసవరించు"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "స్కాన్ మూలం (_o):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "పాఠ విభాజకత (_T)"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "ఫొటో విభాజకత(_P)"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "స్కాన్ చేయు ప్రక్క:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "పేజీ పరిమాణం:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -437,121 +443,141 @@ msgid "Scanned Document"
 msgstr "స్కాన్‌చేయబడిన పత్రం"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "అందుబాటులో వున్న అదేశ వరుస ఐచ్చికముల కొరకు '%s --help' నడుపు."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "స్కాన్‌చేయబడిన పత్రం.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' వాడుటకు వాడుకరిపేరు మరియు సంకేతపదం కావాలి"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "ఏ స్కానర్‌లు కనిపెట్టబడలేదు"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 "మీ స్కానర్ విద్యుత్తుచే చేతనమై కంప్యూటర్‌కు అనుసంధానమైనదో లేదో చూడండి."
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "ఇలా దాచు..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "బొమ్మ ఫైళ్లు"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "ఫైల్ రకం ఎంచుకోండి( _T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (బహుళ-పేజి పత్రం)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (కుదించిన)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (నష్టంలేని)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "ఫైల్ దాచుటలో విఫలమైంది"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ఒకవేళ మీరు దాచకపోతే, మార్పులను శాశ్వతముగా కోల్పోతారు."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "ప్రస్తుత పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "మార్పులు వదలివేయి"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "మునుజూపు కొరకు బొమ్మను భద్రపరుచులేకపోతున్నది"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "బొమ్మ మునుజూపు అనువర్తనం తెరచుట వీలుకాలేదు"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "సహాయ ఫైలు తెరువలేకపోయింది"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -579,107 +605,125 @@ msgstr ""
 " లేనిచో చూడండి <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "సింపుల్ స్కాన్ గురించి"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "సులభంగా పత్ర స్కానింగ్‌చేయు సాధనం"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Launchpad Translations Administrators https://launchpad.net/~rosetta\n"
 "  Praveen Illa https://launchpad.net/~telugulinux\n"
 "  arjuna rao chavala https://launchpad.net/~arjunaraoc\n"
-"  వీవెన్ (Veeven) https://launchpad.net/~veeven"
+"  వీవెన్ https://launchpad.net/~veeven"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "నిష్క్రమించేముందు పత్రాన్ని దాచాలా?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "దాచకుండా నిష్క్రమించు"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (అప్రమేయ)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (చిత్తు)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ఉన్నత విభాజకత)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "కనబడని ఫైళ్లు"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "దయచేసి మీ స్థాపనని సరిచూసుకోండి"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "స్కానర్‌ను మార్చు(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "స్వయంచాలక"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -741,6 +785,12 @@ msgstr ""
 #~ msgid "Width of scanned image in pixels"
 #~ msgstr "స్కాన్‌చేయబడిన బొమ్మ వెడల్పు(పిక్సెళ్ళలో)"
 
+#~ msgid "Files missing"
+#~ msgstr "కనబడని ఫైళ్లు"
+
+#~ msgid "Please check your installation"
+#~ msgstr "దయచేసి మీ స్థాపనని సరిచూసుకోండి"
+
 #, c-format
 #~ msgid ""
 #~ "Help Options:\n"
diff --git a/po/th.po b/po/th.po
index 4a977b2..be69404 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: AnuchitChalothorn <anoochit@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "ทุกหน้าจาก_ตัวป้อนกระดาษ"
 msgid "_Stop Scan"
 msgstr "_หยุดสแกน:"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_อีเมล"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_หน้า"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "หมุน_ซ้าย"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "หมุน_ขวา"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_ตัด"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "ไ_ม่มี"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_จดหมาย"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_กำหนดเอง"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "หมุ_นภาพตัด"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "ย้ายไปทางซ้าย"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "ย้ายไปทางขวา"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_วิธีใช้"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "เ_นื้อหา"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "เริ่มเอกสารใหม่"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "สร้าง"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "สแกนหน้าเดียวจากเครื่องสแกน"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "สแกน"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "บันทึกเอกสารเป็นแฟ้ม"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "บันทึก"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "หยุดการสแกนขณะนี้"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "หยุด"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "หมุนหน้าไปทางซ้าย (ทวนเข็มนาฬิกา)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "หมุนซ้าย"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "หมุนหน้าไปทางขวา (ตามเข็มนาฬิกา)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "หมุนขวา"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "ตัดหน้าที่เลือก"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "ตัด"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "คุณสมบัติ"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "แ_หล่งสแกน:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "ความละเอียด_ข้อความ:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "ความละเอียด_ภาพถ่าย:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "สแกนด้าน:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "ขนาดกระดาษ :"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -436,120 +442,140 @@ msgid "Scanned Document"
 msgstr "เอกสารที่สแกนแล้ว"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - เครื่องมือกำลังสแกน"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "เรียก '%s --help' เพื่อดูตัวเลือกทั้งหมดที่มีของบรรทัดคำสั่ง"
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "สแกน Document.pdf แล้ว"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "ต้องการชื่อผู้ใช้และรหัสผ่านเพื่อเข้าใช้ '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "ไม่พบเครื่องสแกน"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "กรุณาตรวจสอบการเชื่อมต่อเครื่องสแกนของคุณและเปิดเครื่อง"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "บันทึกเป็น..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "แฟ้มภาพ"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "เลือก_ประเภทแฟ้ม"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (เอกสารหลายหน้า)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (บีบอัดแล้ว)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (lossless)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "การบันทึกแฟ้มล้มเหลว"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ถ้าคุณไม่บันทึกการแก้ไขทั้งหมดจะสูญหายอย่างถาวร"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "บันทึกเอกสารปัจจุบัน"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "ยกเลิกการเปลี่ยนแปลง"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "ไม่สามารถบัญทึกรูปภาพตัวอย่าง"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "ไม่สามารถเปิดโปรแกรมแสดงภาพได้"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "ไม่สามารถเปิดแฟ้มเอกสารวิธีใช้"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -578,16 +604,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "เกี่ยวกับ Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "เครื่องมือสแกนเอกสารอย่างง่าย"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -599,88 +625,106 @@ msgstr ""
 "  kijjaz https://launchpad.net/~kijjaz-gmail"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "บันทึกเอกสารก่อนปิดหรือไม่?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "ปิดโดยไม่บันทึก"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (ค่าปริยาย)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (ภาพร่าง)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (ความละเอียดสูง)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "ไม่พบแฟ้ม"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "กรุณาตรวจสอบการติดตั้งของคุณ"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "เ_ปลี่ยนเครื่องสแกน"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -791,5 +835,11 @@ msgstr ""
 #~ "  --g-fatal-warnings              ถือว่าคำเตือนต่างๆ "
 #~ "ที่เกิดขึ้นเป็นความผิดพลาดร้ายแรง"
 
+#~ msgid "Files missing"
+#~ msgstr "ไม่พบแฟ้ม"
+
+#~ msgid "Please check your installation"
+#~ msgstr "กรุณาตรวจสอบการติดตั้งของคุณ"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "ทิศทางของสแกนเนอร์ตอนสแกนผ่านหน้ากระดาษ"
diff --git a/po/tr.po b/po/tr.po
index 15d34d8..7e1b4b4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Kaynaktaki Tüm _Sayfalar"
 msgid "_Stop Scan"
 msgstr "_Taramayı Durdur"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Eposta"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Sayfa"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "_Sola Döndür"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Sa_ğa Çevir"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Kırp"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Hiçbiri"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Harf"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Ya_sal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Özel"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Kırpmayı Döndür"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Sola Taşı"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Sağa Taşı"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Yardım"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_İçindekiler"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Yeni bir belge başlat"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Yeni"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Tarayıcıdan tek bir sayfa tara"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Tara"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Belgeyi bir dosyaya kaydet"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Kaydet"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Geçerli taramayı durdur"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Durdur"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Sayfayı sola döndür (saat yönünün tersine)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Sola Döndür"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Sayfayı sağa döndür (saat yönünde)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Sağa Döndür"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Seçili sayfayı kırp"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Kırp"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Tercihler"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Ta_rama Kaynağı:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "_Metin Çözünürlüğü:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "_Fotoğraf Çözünürlüğü:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Taranacak taraf:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Sayfa Boyutu:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Parlaklık:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Karşıtlık:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -442,122 +448,142 @@ msgid "Scanned Document"
 msgstr "Taranmış Belge"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[AYGIT...] - Tarama uygulaması"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Kullanılabilir komut satırı seçeneklerinin tam listesini görmek için '%s --"
 "help' komutunu çalıştırın."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Taranan Belge.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "_Kapat"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "'%s' kaynağına erişmek için kullanıcı adı ve parola gerekiyor"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Tarayıcı bulunamadı"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Lütfen tarayıcınızın bağlı ve açık olduğundan emin olun"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Vazgeç"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "_Kaydet"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Resim Dosyaları"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Tüm Dosyalar"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Dosya _Türünü Seç"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (çok sayfalı belge)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (sıkıştırılmış)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (kayıpsız)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Dosya kaydedilemedi"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Eğer kaydetmezseniz, değişiklikler tamamen kaybedilecek."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Mevcut belgeyi kaydet?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Değişiklikleri Geri Al"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Görüntü, önizleme için kaydedilemiyor"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Görüntü ön izleme uygulaması açılamıyor"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Yardım dosyası açılamıyor"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -586,22 +612,21 @@ msgstr ""
 "Eğer almadıysanız bile şuraya bakınız: <http://www.gnu.org/licenses/>"
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Basit Tarama Hakkında"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Basit bir belge tarama aracı"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Angel Spy https://launchpad.net/~dilara.ekinci\n"
 "  Cihan Ersoy https://launchpad.net/~cihan.ersoy\n"
-"  Devrim Şahin https://launchpad.net/~room449\n"
 "  Efe Çiftci https://launchpad.net/~efeciftci\n"
 "  Erkut Tiryakioglu https://launchpad.net/~erkut-tiryakioglu\n"
 "  Fatih Bostancı https://launchpad.net/~fbostanci\n"
@@ -612,7 +637,6 @@ msgstr ""
 "  Mustafa Yılmaz https://launchpad.net/~apshalasha\n"
 "  Robert Ancell https://launchpad.net/~robert-ancell\n"
 "  Yalçın Can https://launchpad.net/~yalcin.can\n"
-"  Yiğit Ateş https://launchpad.net/~yigitates52\n"
 "  aries https://launchpad.net/~sonagirbas\n"
 "  kulkke https://launchpad.net/~kulkke\n"
 "  mandza https://launchpad.net/~filmovi\n"
@@ -620,88 +644,106 @@ msgstr ""
 "  İbrahim Çelik https://launchpad.net/~ibrahimcelik89"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Çıkmadan önce belgeyi kaydet?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Kaydetmeden Çık"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (varsayılan)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (taslak)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (yüksek çözünürlük)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Dosyalar eksik"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Lütfen kurulumunuzu denetleyiniz"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "_Tarayıcı Değiştir"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Daha Koyu"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "Daha Açık"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "Daha Az"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "Daha Fazla"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "En Az"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "En Çok"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Belge kaydediliyor..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Kaydedilen sayfa: %d / %d"
@@ -739,6 +781,12 @@ msgstr "Kaydedilen sayfa: %d / %d"
 #~ " --gtk-module=MODULLER          Tüm ek GTK+ modullerini yükler\n"
 #~ "  --g-fatal-warnings              Tüm uyarıları ölümcül yapar"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Lütfen kurulumunuzu denetleyiniz"
+
+#~ msgid "Files missing"
+#~ msgstr "Dosyalar eksik"
+
 #~ msgid "Window height in pixels"
 #~ msgstr "Pencerenin piksel cinsinden yüksekliği"
 
diff --git a/po/ug.po b/po/ug.po
index 6b291f8..4d28e6a 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-08-07 01:17+0000\n"
 "Last-Translator: Sahran <Unknown>\n"
 "Language-Team: Uyghur Computer Science Association <ubuntu-l10n-"
@@ -15,15 +15,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 "X-Poedit-Language: Uighur\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
 msgid "_Authorize"
-msgstr "دەلىللە(_A)"
+msgstr "كىملىك دەلىللە(_A)"
 
 #. Label beside username entry
 #: ../data/simple-scan.ui.h:4
@@ -38,7 +38,7 @@ msgstr "ئىم(_P):"
 #. Combo box label for text scan mode
 #: ../data/simple-scan.ui.h:8
 msgid "Text"
-msgstr "تېكست"
+msgstr "تېكىست"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:10
@@ -48,7 +48,7 @@ msgstr "سۈرەت"
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Front and Back"
-msgstr "ئالدى كەينى"
+msgstr "ئالدى-كەينى"
 
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:14
@@ -58,12 +58,12 @@ msgstr "ئالدى"
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Back"
-msgstr "قايتىش"
+msgstr "كەينى"
 
 #. Title of scan window
 #: ../data/simple-scan.ui.h:18 ../data/simple-scan.desktop.in.h:1
 msgid "Simple Scan"
-msgstr "Simple Scan"
+msgstr "ئاددىي شويلىلاش"
 
 #. Label on document menu (contains actions for this document, e.g. save, print)
 #: ../data/simple-scan.ui.h:20
@@ -73,246 +73,252 @@ msgstr "پۈتۈك(_D)"
 #. Scan menu item
 #: ../data/simple-scan.ui.h:22
 msgid "Sc_an"
-msgstr "تەسۋىر ياي(_A)"
+msgstr "شويلىلا(_A)"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:24
 msgid "Single _Page"
-msgstr "بىر تاللام بەت(_P)"
+msgstr "بىرلا بەت(_P)"
 
 #. Toolbar scan menu item to scan all pages from a document feeder
 #: ../data/simple-scan.ui.h:26
 msgid "All Pages From _Feeder"
-msgstr "كىرگۈزگۈچتىن ھەممە بەتلەر(_F)"
+msgstr "كىرگۈزۈلگەن ھەممە بەتلەر(_F)"
 
 #. Menu entry to stop current scan
 #: ../data/simple-scan.ui.h:28
 msgid "_Stop Scan"
-msgstr "تەسۋىر يېيىشنى توختات(_S)"
+msgstr "شويلىلاشنى توختات(_S)"
+
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
 
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "ئېلخەت(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "بەت(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "سولغا چۆرگىلەت(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "ئوڭغا چۆرگىلەت(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
-msgstr "قىرقىش(_C)"
+msgstr "قىرقى(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "يوق(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
-msgstr "لىپاپ(_L)"
+msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "US Legal(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "ئىختىيارى(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
-msgstr "كېسىش دائىرىسىنى ئايلاندۇر(_R)"
+msgstr "قىرقىغاننى چۆرگىلەت(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "ئوڭغا يۆتكە"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "مەزمۇنلار(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
-msgstr "يېڭى بىر پۈتۈك قۇرىدۇ"
+msgstr "يېڭى ھۆججەت قۇرىدۇ"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "يېڭى"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
-msgstr "شولالىغۇچتىن بىر بەتنىلا تەسۋىر يايىدۇ"
+msgstr "شويلىلىغۇچتىن پەقەت بىر بەتنىلا شويلىلايدۇ"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
-msgstr "تەسۋىر ياي"
+msgstr "شويلىلاش"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
-msgstr "پۈتۈكنى ھۆججەتكە ساقلا"
+msgstr "پۈتۈكنى ھۆججەتكە ساقلايدۇ"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "ساقلا"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
-msgstr "نۆۋەتتىكى تەسۋىر يېييشنى توختات"
+msgstr "نۆۋەتتىكى شويلىلاش باسقۇچىنى توختىتىدۇ"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "توختا"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
-msgstr "بەتنى سولغا ئايلاندۇر (سائەت يۆلىنىشىگە قارشى)"
+msgstr "بەتنى سولغا چۆرگىلىتىدۇ(سائەت يۆلىنىشىگە قارشى)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
-msgstr "سولغا چۆرگىلىتىش"
+msgstr "سولغا چۆرگىلەت"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
-msgstr "بەتنى ئوڭغا ئايلاندۇر (سائەت يۆلىنىشىدە)"
+msgstr "بەتنى ئوڭغا چۆرگىلىتىدۇ (سائەت يۆلىنىشىدە)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
-msgstr "ئوڭغا چۆرگىلىتىش"
+msgstr "ئوڭغا چۆرگىلەت"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
-msgstr "تاللانغان بەتنى كەس"
+msgstr "تاللانغان بەتنى قىرقىيدۇ"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
-msgstr "كەس"
+msgstr "قىرقى"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "مايىللىق"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
-msgstr "تەسۋىر يېيىش مەنبەسى(_O):"
+msgstr "شويلىلاش مەنبەسى(_O):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
-msgstr "تېكست ئېنىقلىقى(_T):"
+msgstr "تېكىست ئېنىقلىقى(_T):"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
-msgstr "–فوتو ئېنىقلىقى(_P):"
+msgstr "سۈرەت ئېنىقلىقى(_P):"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
-msgstr "ﺋﯩﺰﺩﯨﻠﺪﯨﻐﺎﻥ ﺑﻪﺕ"
+msgstr "شويلىلايدىغان يۈزى:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "قەغەز چوڭلۇقى:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
-msgstr "يورۇقلۇق:"
+msgstr "يورۇقلۇقى:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
-msgstr "سېلىشتۇرما دەرىجە:"
+msgstr "سېلىشتۇرما دەرىجىسى:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
-msgstr "سۈپەت:"
+msgstr "سۈپىتى:"
 
 #: ../data/simple-scan.desktop.in.h:2
 msgid "Scan Documents"
-msgstr "پۈتۈك شولىلاش"
+msgstr "پۈتۈك شويلىلاش"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:1
 msgid "Device to scan from"
-msgstr "تەسۋىر يېيىش ئۈسكۈنىسى"
+msgstr "شويلىلايدىغان ئۈسكۈنە"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:2
 msgid "SANE device to acquire images from."
-msgstr "SANE ئۈسكۈنىدىن سۈرەتكە ئېرىشىدۇ."
+msgstr "رەسىمگە ئېرىشىدىغان SANE ئۈسكۈنىسى."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:3
 msgid "Type of document being scanned"
-msgstr "تەسۋىر يايىدىغان پۈتۈكنىڭ تىپى"
+msgstr "شويلىلانغان پۈتۈكنىڭ تىپى"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:4
 msgid ""
 "Type of document being scanned. This setting decides on the scan resolution, "
 "colors and post-processing."
 msgstr ""
-"ھۆججەت تېپى تەكشۈرىلىۋاتىدۇ، بۇ تەڭشەك بولسا ئېنىقلىق دەرىجىسى، رەڭگى ۋە "
-"كىيىنكى بىرتەرەپ قىلىشنى بېكىتىدۇ."
+"ھۆججەت تىپى تەكشۈرۈلۈۋاتىدۇ، بۇ تەڭشەك بولسا ئېنىقلىق دەرىجىسى، رەڭگى ۋە "
+"كېيىنكى بىرتەرەپ قىلىشنى بېكىتىدۇ."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:5
 msgid "Width of paper in tenths of a mm"
@@ -328,7 +334,7 @@ msgstr ""
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:7
 msgid "Height of paper in tenths of a mm"
-msgstr "ﻗﻪﻏﻪﺯ ﺋﯩﮕﯩﺰﻟﯩﻜﻰ (mm 0.1 ﺋﯧﻨﯩﻘﻠﯩﻘﯩﺪﺍ)"
+msgstr "قەغەز ئېگىزلىكى (mm 0.1 ئېنىقلىقىدا)"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:8
 msgid ""
@@ -344,221 +350,240 @@ msgstr "شويلىلاش يورۇقلۇقى"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "يورۇقلۇق تەڭشىكى -100 دىن 100 گىچە(0 تەڭشەلمىگەن)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
-msgstr ""
+msgstr "شويلىلاش ئاق-قارىلىقى"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "ئاق-قارىلىق تەڭشىكى -100 دىن 100 گىچە(0 تەڭشەلمىگەن)."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
-msgstr "تېكىست تەسۋىر يېيىشنىڭ ئېنىقلىقى"
+msgstr "تېكىست شويلىلاشنىڭ ئېنىقلىقى"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:14
 msgid "The resolution in dots-per-inch to use when scanning text."
-msgstr "DPI (چېكىت ھەر دىيۇم) تېكستلارغا ئىشلىتىدىغان قىممەت"
+msgstr "DPI (چېكىت ھەر دىيۇيم) تېكىستلەرگە ئىشلىتىدىغان قىممەت"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:15
 msgid "Resolution for photo scans"
-msgstr "سۈرەت تەسۋىر يېيىشنىڭ ئېنىقلىقى"
+msgstr "سۈرەت شويلىلاشنىڭ ئېنىقلىقى"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:16
 msgid "The resolution in dots-per-inch to use when scanning photos."
-msgstr "DPI (چېكىت ھەر دىيۇم) رەسىملەرگە ئىشلىتىدىغان قىممەت"
+msgstr "DPI (چېكىت ھەر دىيۇيم) سۈرەتلەرگە ئىشلىتىدىغان قىممەت"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:17
 msgid "Page side to scan"
-msgstr "شولالايدىغان بەت يۈزى"
+msgstr "شويلىلايدىغان بەت يۈزى"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:18
 msgid "The page side to scan."
-msgstr "بەت گىرۋىكىنى تەسۋىرگە ئېلىش."
+msgstr "شويلىلايدىغان بەت يۈزى."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:19
 msgid "Directory to save files to"
-msgstr "ﺋﺎﺭﺧﯩﭙﻼﺭ ﺳﺎﻗﻠﯩﻨﺪﯨﻐﺎﻥ ﻣﯘﻧﺪﻩﺭﯨﺠﻪ"
+msgstr "ھۆججەتنى ساقلايدىغان مۇندەرىجە"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:20
 msgid ""
 "The directory to save files to. Defaults to the documents directory if unset."
 msgstr ""
-"ھۆججەتلەرنى ساقلايدىغان مۇندەرىجە. ئەگەر تەڭشەلمىگەن بولسا كۆڭۈلدىكى "
-"ئەھۋالدا پۈتۈكلىرىمگە ساقلايدۇ."
+"ھۆججەتنى ساقلايدىغان مۇندەرىجە. بەلگىلەنمىگەن ۋاقىتتا ئىشلىتىدىغان "
+"مۇندەرىجىدۇر."
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:21
 msgid "Quality value to use for JPEG compression"
-msgstr ""
+msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىممەت"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:22
 msgid "Quality value to use for JPEG compression."
-msgstr ""
+msgstr "JPEG پرېسىنىڭ سۈپىتىنى بەلگىلەيدىغان قىممىتى."
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.vala:840
 msgid "No scanners available.  Please connect a scanner."
-msgstr "شولالىغۇچ يوق، ئۇنى چېكىڭ."
+msgstr "شويلىلىغۇچ مەۋجۇت ئەمەس. شويلىلىغۇچنى چېتىڭ."
 
 #. Error displayed when cannot connect to scanner
 #: ../src/scanner.vala:870
 msgid "Unable to connect to scanner"
-msgstr "شولالىغۇچ بىلەن باغلىنالمىدى"
+msgstr "شويلىلىغۇچقا باغلانغىلى بولمىدى"
 
 #. Error display when unable to start scan
 #: ../src/scanner.vala:1219
 msgid "Unable to start scan"
-msgstr "تەسۋىر يېيىشنى باشلىيالمىدى"
+msgstr "شويلىلاشنى باشلىغىلى بولمىدى"
 
 #. Error displayed when communication with scanner broken
 #: ../src/scanner.vala:1232 ../src/scanner.vala:1329
 msgid "Error communicating with scanner"
-msgstr "شۇلالىغۇچ بىلەن ئالاقە قىلىۋاتقاندا خاتالىق كۆرۈلدى"
+msgstr "شويلىلىغۇچ بىلەن ئالاقە باغلاشتا خاتالىق كۆرۈلدى"
 
 #. Help string for command line --version flag
 #: ../src/simple-scan.vala:21
 msgid "Show release version"
-msgstr "نەشرىنى كۆرسىتىدۇ"
+msgstr "نەشرىنى كۆرسەت"
 
 #. Help string for command line --debug flag
 #: ../src/simple-scan.vala:24
 msgid "Print debugging messages"
-msgstr "سازلاش ئۇچۇرلىرىنى كۆرسىتىدۇ"
+msgstr "سازلاش ئۇچۇرلىرىنى كۆرسەت"
 
 #: ../src/simple-scan.vala:26
 msgid "Fix PDF files generated with older versions of Simple Scan"
 msgstr ""
-"كونا نەشىردىكى ئاددى تەسۋىرگە ئېلىش ئارقىلىق قىلىنغان PDF ھۆججىتىنى ئوڭشاش."
+"كونا نەشردىكى «ئاددىي شويلىلاش»  ئارقىلىق ياسالغان PDF ھۆججىتىنى ئوڭلاش"
 
 #. Title of error dialog when scan failed
 #: ../src/simple-scan.vala:297
 msgid "Failed to scan"
-msgstr "شولالىيالمىدى"
+msgstr "شويلىلاش مەغلۇپ بولدى"
 
 #. Default filename to use when saving document (and extension will be added, e.g. .jpg)
 #: ../src/simple-scan.vala:316
 msgid "Scanned Document"
-msgstr "شۇلالىغان پۈتۈك"
+msgstr "شويلىلانغان ھۆججەت"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
-msgstr "[ئۈسكىنە...] -تەسۋىرگە ئېلىش قورالى."
+msgstr "[ئۈسكۈنە...] - شويلىلاش قورالى."
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
-"«%s --help» كىرگۈزسىڭىز بۇيرۇق قۇرىدا ئىشلەتكىلى بولىدىغان بارلىق "
-"تاللانمىلارنى كۆرەلەيسىز."
+"'%s --help' ئىجرا قىلىنسا بۇيرۇق قۇرى تاللانمىسىنىڭ تولۇق تىزىمى كۆرۈنىدۇ."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
-msgstr "سكەنلىگەن ھۆججەت.pdf"
+msgstr "شويلىلانغان Document.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
-msgstr ""
+msgstr "ياپ(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "«%s» نى زىيارەت قىلىش ئۈچۈن ئىشلەتكۈچى ئاتى ۋە ئىم كېرەك"
+msgstr "‹%s› كىرىش ئۈچۈن ئىشلەتكۈچى نامى ۋە مەخپىي نومۇر كېرەك"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
-msgstr "شولالىغۇچ بايقالمىدى"
+msgstr "شويلىلىغۇچ تېپىلمىدى"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
-msgstr "شولالىغۇچنى چېتىپ توك مەنبەسىنى ئېچىڭ"
+msgstr "شويلىلىغۇچ چېتىلغانمۇ توكى ئۇلانغانمۇ تەكشۈرۈڭ"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "باشقا ئاتتا ساقلا…"
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
-msgstr ""
+msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
-msgstr ""
+msgstr "ساقلا(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
-msgstr "سۈرەت ھۆججەتلەر"
+msgstr "سۈرەت ھۆججەتلىرى"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
-msgstr "ھەممە ھۆججەتلەر"
+msgstr "بارلىق ھۆججەتلەر"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
-msgstr "ھۆججەت شەكلىنى تاللا(_T)"
+msgstr "ھۆججەت تىپىنى تاللا(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (كۆپ بەتلىك پۈتۈكلەر)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
-msgstr "JPEG (پىرىسلانغان)"
+msgstr "JPEG (پرېسلانغان)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (خورىماس)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
-msgstr "ھۆججەتنى ساقلىيالمىدى"
+msgstr "ھۆججەتكە ساقلىغىلى بولمىدى"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "ساقلانمىسا، ئۆزگەرتىشلەرنىڭ ھەممىسى مەڭگۈلۈككە يوقىلىدۇ"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "ئۆزگەرتىشنى تاشلىۋەت"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
-msgstr "كۆرۈنمە رەسىمنى ساقلىغىلى بولمىدى."
+msgstr "ئالدىن كۆرىدىغان رەسىمنى ساقلىغىلى بولمىدى."
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
-msgstr "رەسىمنى ئالدىن كۆزىتىدىغان ئەپنى ئاچالمىدى"
+msgstr "رەسىمنى ئالدىن كۆرۈش پروگراممىسىنى قوزغاتقىلى بولمىدى"
+
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
 
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "ياردەم ھۆججىتىنى ئاچقىلى بولمىدى"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -573,32 +598,32 @@ msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"بۇ بىر ئەركىن يۇمشاق دىتال، سىز بۇنى تارقاتسىڭىز ياكى\n"
-"ئۆزگەرتسىڭىز بۇلىدۇ، ئەمما Free Software Foundation \n"
+"بۇ بىر ئەركىن دېتال، سىز بۇنى تارقاتسىڭىز ياكى\n"
+"ئۆزگەرتسىڭىز بولىدۇ، ئەمما Free Software Foundation \n"
 "دىن بەلگىلەنگەن GNU General Public نىڭ قائىدىسىگە رىئايە\n"
 "قىلىشىڭىز لازىم: ئۈچىنچى نۇسخىسىدا ياكى ئۇنىڭ كەينىدىكى \n"
-"نۇسخىسدا.\n"
+"نۇسخىسىدا.\n"
 "بۇ پروگرامما ھېچقانداق بىر كاپالەتنى ئۈستىگە ئالمايدۇ،\n"
-"ھەم بۇنى سېتشقا كاپالەتلىك قىلمايدۇ، بۇ بىر سىزنىڭ \n"
-"ئشىلتىشىڭىز ئۈچۈن ياسالغان پروگگرام.\n"
+"ھەم بۇنى سېتىشقا كاپالەتلىك قىلمايدۇ، بۇ بىر سىزنىڭ \n"
+"ئىشلىتىشىڭىز ئۈچۈن ياسالغان پروگرامما.\n"
 "بۇ توغرىسىدىكى ئۇچۇرلارنى GNU General Public License \n"
 "دىن ئۇقۇڭ.\n"
 "\n"
-"سىز بۇ پىروگرامما بىلەن بىر GNU General Public License\n"
-"نىڭ كۆپەيتىلمىسىگە ئېرىشكەن بولۇشىڭىز مۇمكىن، بولمىسا ئۇنى \n"
+"سىز بۇ پروگرامما بىلەن بىر GNU General Public License\n"
+"نىڭ كۆچۈرمىسىگە ئېرىشكەن بۆلىشىڭىز مۇمكىن، بولمىسا ئۇنى \n"
 "<http://www.gnu.org/licenses/> دا تاپالايسىز."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
-msgstr "Simple Scan ھەققىدە"
+msgstr "«ئاددىي شويلىلاش» ھەققىدە"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
-msgstr "ئاددى بولغان پۈتۈك تەسۋىر يېيىش قورالى"
+msgstr "ئاددىي پۈتۈك شويلىلاش قورالى"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -612,88 +637,106 @@ msgstr ""
 "  umar tumur https://launchpad.net/~umar-tumur"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "ئاخىرلاشتۇرۇشتىن ئاۋۋال ھازىرقى پۈتۈكنى ساقلىسۇنمۇ؟"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "ساقلىماي ئاخىرلاشتۇر"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (كۆڭۈلدىكى)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (دەسلەپكى نۇسخا)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (يۇقىرى ئېنىقلىق)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "ھۆججەت تېپىلمىدى"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "ئورنىتىشىڭىزنى تەكشۈرۈپ بېقىڭ"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
-msgstr "شولالىغۇچ ئالماشتۇر(_S)"
+msgstr "شويلىلىغۇچنى ئالماشتۇرۇڭ(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "ئاپتوماتىك"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "قارىراق"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "يورۇقراق"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
-msgstr "تۆۋەن"
+msgstr "كىچىك"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "ئەڭ كىچىك"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "ئەڭ چوڭ"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "پۈتۈكنى ساقلاۋاتىدۇ…"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "ساقلاۋاتقىنى %d/%d - بەت"
@@ -762,6 +805,9 @@ msgstr "ساقلاۋاتقىنى %d/%d - بەت"
 #~ "--gtk-module باشقا بىر GTK+ Module نى قوزغىتىش\n"
 #~ "--g-fatal-warnigs ھەممە ئاگاھلاندۇرۇشلار خەتەرگە ئايلىندۇ"
 
+#~ msgid "Files missing"
+#~ msgstr "ھۆججەت تېپىلمىدى"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "تەسۋىر ئالغۇچ تەسۋىرگە ئېلىنىپ بولغان بەتتىن ئۆتىدۇ."
 
@@ -802,3 +848,6 @@ msgstr "ساقلاۋاتقىنى %d/%d - بەت"
 
 #~ msgid "Resolution of last scanned image"
 #~ msgstr "ئاخىرقى قېتىم تەسۋىر يايغان رەسىمنىڭ ئېنىقلىقى"
+
+#~ msgid "Please check your installation"
+#~ msgstr "ئورنىتىشنى تەكشۈرۈپ بېقىڭ"
diff --git a/po/uk.po b/po/uk.po
index c5db064..bd449e5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 11:28+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Всі сторінки з _лотка"
 msgid "_Stop Scan"
 msgstr "П_рипинити сканування"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr "Перевпорядкувати сторінки"
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Надіслати ел. поштою"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "С_торінка"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Обернути _ліворуч"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Обернути п_раворуч"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Обрізати"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Без обрізання"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "_Нетипові"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Обернути область обрізання"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "Пересунути ліворуч"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "Пересунути праворуч"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Довідка"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Вміст"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "Почати новий документ"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Створити"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "Сканувати одну сторінку"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Сканувати"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "Зберегти документ до файла"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Зберегти"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "Припинити поточне сканування"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Зупинити"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "Обертати сторінку ліворуч (проти годинникової стрілки)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Обернути ліворуч"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "Обертати сторінку праворуч (за годинниковою стрілкою)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "Обернути праворуч"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "Обрізати позначену сторінку"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Обрізати"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Налаштування"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "_Джерело даних сканування:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "Роздільна здатність _тексту:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "Роздільна здатність _фотографій:"
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "Бік сканування:"
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "Розмір сторінки:"
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Яскравість:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Контрастність:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Якість:"
 
@@ -440,122 +446,142 @@ msgid "Scanned Document"
 msgstr "Сканований документ"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[ПРИСТРІЙ...] — програма для сканування"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Виконайте « %s --help», щоб побачити повний перелік доступних параметрів "
 "командного рядка."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Сканований документ.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "За_крити"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Для доступу до «%s» слід вказати ім’я користувача та пароль"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Сканерів не виявлено"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Будь ласка, перевірте, чи з’єднано ваш сканер і чи увімкнено його"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Зберегти як..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "З_берегти"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "Файли зображень"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Всі файли"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "Вибрати _тип файла"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (багатосторінковий документ)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (стиснений)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (без втрат)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Не вдалося зберегти файл"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "Якщо ви не збережете внесені зміни, їх буде втрачено остаточно."
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "Зберегти поточний документ?"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "Відкинути зміни"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Не вдалося зберегти зображення для попереднього перегляду"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "Не вдалося запустити програму для перегляду зображення"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr "З’єднувати збоку"
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr "З’єднувати збоку (у зворотному порядку)"
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr "У зворотному порядку"
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr "Не змінювати"
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "Не вдалося відкрити файл довідки"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -584,16 +610,16 @@ msgstr ""
 "<http://www.gnu.org/licenses/>, щоб дізнатися про подальші дії."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Про «Просте сканування»"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Інструмент для спрощення сканування документів"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -603,88 +629,106 @@ msgstr ""
 "  passtas https://launchpad.net/~passtas"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "Зберегти документ перед виходом?"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Вийти без збереження"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d т/д (типова)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d т/д (чернетка)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d т/д (висока роздільність)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d т/д"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Не виявлено таких файлів"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Будь ласка, перевірте, чи належним чином встановлено програму"
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "З_мінити сканер"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "темніше"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "світліше"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "менше"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "більше"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "Мінімальна"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "Максимальна"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "Збереження документа…"
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "Зберігаємо сторінку %d з %d"
@@ -722,6 +766,12 @@ msgstr "Зберігаємо сторінку %d з %d"
 #~ "  --gtk-module=МОДУЛІ             Завантажити додаткові модулі GTK+\n"
 #~ "  --g-fatal-warnings              Завершувати роботу у разі появи попереджень"
 
+#~ msgid "Files missing"
+#~ msgstr "Не виявлено таких файлів"
+
+#~ msgid "Please check your installation"
+#~ msgstr "Будь ласка, перевірте, чи належним чином встановлено програму"
+
 #~ msgid "Direction of scan"
 #~ msgstr "Напрямок сканування"
 
diff --git a/po/ur.po b/po/ur.po
index ffd23b7..51e2846 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Urdu <ur@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr ""
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr ""
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr ""
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr ""
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr ""
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr ""
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "نیا"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "محفوظ کریں"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "رکیۓ"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "ترجیحات"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -561,16 +587,16 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr ""
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -579,88 +605,106 @@ msgstr ""
 "  Shoaib Mirza https://launchpad.net/~monymirza"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
 msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index 356a64e..a3bfa3b 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-04-17 06:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr ""
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "_Email"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr ""
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Chapga burish"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "_O'nga burish"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Kesish"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Yoʻq"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Xat"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr ""
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr ""
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr ""
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Yordam"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "_Tarkibi"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "Yangi"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "Skan qilish"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "Saqlash"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "Toʻxtatish"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "Chapga burish"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "O'nga burish"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "Kesish"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Мослашлар"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr ""
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr ""
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr ""
 
@@ -431,122 +437,142 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr ""
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Мавжуд буйруқлар ва мосламаларнинг тўлиқ рўйхатини кўриш учун '%s --help''ни "
 "ишга туширинг."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr ""
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr ""
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr ""
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr ""
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr ""
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "Hamma fayllar"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr ""
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -563,107 +589,128 @@ msgid ""
 msgstr ""
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Simple Scan haqida"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr ""
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Sardorbek Pulatov https://launchpad.net/~prockrammer"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "Saqlamasdan chiqib ketish"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (default)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Fayllar topilmadi"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
 msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "_Skaner almashrirish"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr ""
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
 
 #~ msgid "4&#xD7;6"
 #~ msgstr "4&#xD7;6"
+
+#~ msgid "Files missing"
+#~ msgstr "Fayllar topilmadi"
diff --git a/po/vi.po b/po/vi.po
index a655635..ff9c2f9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-07-23 09:09+0000\n"
 "Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "Tất cả trang từ _Khay (Feeder)"
 msgid "_Stop Scan"
 msgstr ""
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr ""
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "_Trang"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "Xoay _trái"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "Xoay _Phải"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "_Xén"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "_Không có"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "_Letter"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "Le_gal"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr ""
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "Tự _chọn"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "_Xoay phần Xén trên màn hình (_Rotate Crop)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr ""
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr ""
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "_Trợ giúp"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr ""
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr ""
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr ""
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr ""
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr ""
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr ""
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr ""
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr ""
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr ""
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr ""
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr ""
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "Tùy thích"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "Quét _Nguồn:"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr ""
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr ""
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr ""
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr ""
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "Độ sáng:"
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "Độ tương phản:"
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "Chất lượng:"
 
@@ -434,121 +440,141 @@ msgid "Scanned Document"
 msgstr ""
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[DEVICE...] - Công cụ quét hình"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr ""
 "Chạy lệnh '%s --help' để xem danh sách tất cả các tùy chọn dòng lệnh."
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "Tài liệu quét.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr ""
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "Tên đăng nhập và mật mã cần thiết để truy cập '%s'"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "Không phát hiện máy quét hình nào hết"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "Vui lòng kiểm tra đã cắm và bật máy quét hình chưa"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "Lưu thành..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr ""
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr ""
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr ""
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr ""
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr ""
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr ""
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr ""
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "Không lưu được tệp"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr ""
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr ""
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "Không lưu được ảnh cho xem trước"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr ""
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr ""
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -577,16 +603,16 @@ msgstr ""
 "along with this program.  If not, see <http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "Về Simple Scan"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "Công cụ đơn giản để quét tài liệu"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -595,88 +621,106 @@ msgstr ""
 "  Vu Do Quynh https://launchpad.net/~vu-do-quynh"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr ""
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr ""
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr ""
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr ""
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr ""
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr ""
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "Thiếu các tệp"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "Vui lòng kiểm tra lại việc cài đặt"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr ""
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr ""
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "Tối hơn"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr ""
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr ""
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr ""
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr ""
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr ""
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr ""
@@ -714,5 +758,11 @@ msgstr ""
 #~ "  --gtk-module=MODULES            Load additional GTK+ modules\n"
 #~ "  --g-fatal-warnings              Make all warnings fatal"
 
+#~ msgid "Please check your installation"
+#~ msgstr "Vui lòng kiểm tra lại việc cài đặt"
+
+#~ msgid "Files missing"
+#~ msgstr "Thiếu các tệp"
+
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "Hướng quét trang của máy quét hình"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index afd8b4e..46b5af3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-09-20 08:05+0000\n"
 "Last-Translator: Dennis Kuang <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "传送来的所有页面(_F)"
 msgid "_Stop Scan"
 msgstr "停止扫描(_S)"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "电子邮件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "页面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "向左旋转(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "向右旋转(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "剪裁(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "无(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "信件(_L)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "法定(_G)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
-msgstr ""
+msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "自定义(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "旋转剪裁(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "内容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "开始一个新的文档"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "新建"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "从扫描仪扫描一个单页"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "扫描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "将文档保存为文件"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "保存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "停止当前扫描"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "左旋页面 (逆时针)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "逆时针旋转"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "右旋页面 (顺时针)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "顺时针旋转"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "裁剪选中的页面"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "剪裁"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "首选项"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "扫描来源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "文字分辨率(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "图像分辨率(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "扫描页面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "页面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "对比度："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "质量："
 
@@ -335,7 +341,7 @@ msgstr "扫描亮度"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:10
 msgid "The brightness adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "从 -100 到 100 的亮度调节（0 为不作调节）"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:11
 msgid "Contrast of scan"
@@ -343,7 +349,7 @@ msgstr "扫描对比度"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:12
 msgid "The contrast adjustment from -100 to 100 (0 being none)."
-msgstr ""
+msgstr "从 -100 到 100 的对比度调节（0 为不作调节）"
 
 #: ../data/org.gnome.SimpleScan.gschema.xml.in.h:13
 msgid "Resolution for text scans"
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr "扫描的文档"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[设备...] - 扫描工具"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "运行“%s --help”来查看可用命令行选项的完整列表。"
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "扫描的文件.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
-msgstr ""
+msgstr "关闭(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "使用“%s”需要用户名和密码"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "没有发现扫描仪"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "请检查您的扫描仪已经连接并且打开"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "保存为..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
-msgstr ""
+msgstr "取消(_C)"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
-msgstr ""
+msgstr "保存(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "图像文件"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "所有文件"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "选择文件类型(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (多页文档)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (压缩)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (无损)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "保存文件错误"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不保存，变更将永久丢失。"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "放弃更改"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "无法保存用以预览的图像"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "无法打开图像预览软件"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "无法打开帮助文件"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -570,21 +596,22 @@ msgstr ""
 "<http://www.gnu.org/licenses/>."
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "关于扫描易"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "简易的文件扫描工具"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
 "  Aron Xu https://launchpad.net/~happyaron\n"
+"  Carlos Gong https://launchpad.net/~bfsugxy\n"
 "  David Gao https://launchpad.net/~davidgao1001\n"
 "  Dennis Kuang https://launchpad.net/~denniskrq\n"
 "  Dingyuan Wang https://launchpad.net/~abcdoyle888\n"
@@ -599,88 +626,106 @@ msgstr ""
 "  zixue.liu https://launchpad.net/~zixue"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "退出前保存文档？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "退出且不保存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (默认)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高分辨率)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "文件丢失"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
+
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "请检查您的安装"
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "更换扫描仪(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
-msgstr ""
+msgstr "较深"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
-msgstr ""
+msgstr "稍浅"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
-msgstr ""
+msgstr "较少"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
-msgstr ""
+msgstr "更多"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "最小值"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "最大值"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "正在保存文档..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在保存 %d/%d 页"
@@ -696,6 +741,12 @@ msgstr "正在保存 %d/%d 页"
 #~ "用法：\n"
 #~ "  %s [设备...] - 扫描工具"
 
+#~ msgid "Please check your installation"
+#~ msgstr "请检查您的安装"
+
+#~ msgid "Files missing"
+#~ msgstr "文件丢失"
+
 #, c-format
 #~ msgid ""
 #~ "GTK+ Options:\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0bc44a5..bbc8e8d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-03-04 11:26+1300\n"
+"POT-Creation-Date: 2014-07-21 13:00+1200\n"
 "PO-Revision-Date: 2012-10-25 09:21+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-04 07:59+0000\n"
-"X-Generator: Launchpad (build 16948)\n"
+"X-Launchpad-Export-Date: 2014-07-21 06:31+0000\n"
+"X-Generator: Launchpad (build 17114)\n"
 
 #. Button to submit authorization dialog
 #: ../data/simple-scan.ui.h:2
@@ -87,203 +87,209 @@ msgstr "來自進紙匣的所有頁面(_F)"
 msgid "_Stop Scan"
 msgstr "停止掃描(_S)"
 
+#. Menu item to reorder pages
+#. Title of dialog to reorder pages
+#: ../data/simple-scan.ui.h:30 ../src/ui.vala:1169 ../src/ui.vala:1682
+msgid "Reorder Pages"
+msgstr ""
+
 #. Label on email menu item
-#: ../data/simple-scan.ui.h:30
+#: ../data/simple-scan.ui.h:32
 msgid "_Email"
 msgstr "電子郵件(_E)"
 
 #. Page menu (contains action for each page, e.g. delete, crop)
-#: ../data/simple-scan.ui.h:32
+#: ../data/simple-scan.ui.h:34
 msgid "_Page"
 msgstr "頁面(_P)"
 
 #. Menu item to rotate page to left (anti-clockwise)
-#: ../data/simple-scan.ui.h:34
+#: ../data/simple-scan.ui.h:36
 msgid "Rotate _Left"
 msgstr "向左旋轉(_L)"
 
 #. Menu item to rotate page to right (clockwise)
-#: ../data/simple-scan.ui.h:36
+#: ../data/simple-scan.ui.h:38
 msgid "Rotate _Right"
 msgstr "向右旋轉(_R)"
 
 #. Label for page crop submenu
-#: ../data/simple-scan.ui.h:38
+#: ../data/simple-scan.ui.h:40
 msgid "_Crop"
 msgstr "裁切(_C)"
 
 #. Radio button for no crop
-#: ../data/simple-scan.ui.h:40
+#: ../data/simple-scan.ui.h:42
 msgid "_None"
 msgstr "無(_N)"
 
 #. Radio button for cropping page to A4 size
-#: ../data/simple-scan.ui.h:42
+#: ../data/simple-scan.ui.h:44
 msgid "A_4"
 msgstr "A_4"
 
 #. Radio button for cropping page to A5 size
-#: ../data/simple-scan.ui.h:44
+#: ../data/simple-scan.ui.h:46
 msgid "A_5"
 msgstr "A_5"
 
 #. Radio button for cropping page to A6 size
-#: ../data/simple-scan.ui.h:46
+#: ../data/simple-scan.ui.h:48
 msgid "A_6"
 msgstr "A_6"
 
 #. Radio button for cropping page to US letter size
-#: ../data/simple-scan.ui.h:48
+#: ../data/simple-scan.ui.h:50
 msgid "_Letter"
 msgstr "美規信紙 (_Letter)"
 
 #. Radio button for cropping to page to US legal size
-#: ../data/simple-scan.ui.h:50
+#: ../data/simple-scan.ui.h:52
 msgid "Le_gal"
 msgstr "美規長信紙 (Le_gal)"
 
 #. Radio button for cropping page to 4x6 inch
-#: ../data/simple-scan.ui.h:52
+#: ../data/simple-scan.ui.h:54
 msgid "4×6"
 msgstr "4×6"
 
 #. Radio button for cropping to custom page size
-#: ../data/simple-scan.ui.h:54
+#: ../data/simple-scan.ui.h:56
 msgid "_Custom"
 msgstr "自訂(_C)"
 
 #. Menu item to rotate the crop area
-#: ../data/simple-scan.ui.h:56
+#: ../data/simple-scan.ui.h:58
 msgid "_Rotate Crop"
 msgstr "旋轉裁切區域(_R)"
 
 #. Menu item to move the selected page to the left
-#: ../data/simple-scan.ui.h:58
+#: ../data/simple-scan.ui.h:60
 msgid "Move Left"
 msgstr "左移"
 
 #. Menu item to move the selected page to the right
-#: ../data/simple-scan.ui.h:60
+#: ../data/simple-scan.ui.h:62
 msgid "Move Right"
 msgstr "右移"
 
 #. Label on help menu
-#: ../data/simple-scan.ui.h:62
+#: ../data/simple-scan.ui.h:64
 msgid "_Help"
 msgstr "幫助(_H)"
 
 #. Help|Contents menu
-#: ../data/simple-scan.ui.h:64
+#: ../data/simple-scan.ui.h:66
 msgid "_Contents"
 msgstr "內容(_C)"
 
 #. Tooltip for new document button
-#: ../data/simple-scan.ui.h:66
+#: ../data/simple-scan.ui.h:68
 msgid "Start a new document"
 msgstr "起始一份新文件"
 
-#: ../data/simple-scan.ui.h:67
+#: ../data/simple-scan.ui.h:69
 msgid "New"
 msgstr "新增"
 
 #. Tooltip for scan toolbar button
-#: ../data/simple-scan.ui.h:69
+#: ../data/simple-scan.ui.h:71
 msgid "Scan a single page from the scanner"
 msgstr "從掃描器掃描單一頁面"
 
 #. Label on scan toolbar item
-#: ../data/simple-scan.ui.h:71
+#: ../data/simple-scan.ui.h:73
 msgid "Scan"
 msgstr "掃描"
 
 #. Tooltip for save toolbar button
-#: ../data/simple-scan.ui.h:73
+#: ../data/simple-scan.ui.h:75
 msgid "Save document to a file"
 msgstr "將文件儲存至檔案"
 
-#: ../data/simple-scan.ui.h:74
+#: ../data/simple-scan.ui.h:76 ../src/ui.vala:1683
 msgid "Save"
 msgstr "儲存"
 
 #. Tooltip for stop button
-#: ../data/simple-scan.ui.h:76
+#: ../data/simple-scan.ui.h:78
 msgid "Stop the current scan"
 msgstr "停止目前的掃描"
 
-#: ../data/simple-scan.ui.h:77
+#: ../data/simple-scan.ui.h:79
 msgid "Stop"
 msgstr "停止"
 
 #. Tooltip for rotate left (counter-clockwise) button
-#: ../data/simple-scan.ui.h:79
+#: ../data/simple-scan.ui.h:81
 msgid "Rotate the page to the left (counter-clockwise)"
 msgstr "將頁面向左旋轉 (逆時針方向)"
 
 #. Label on rotate page left (anti-clockwise) item
-#: ../data/simple-scan.ui.h:81
+#: ../data/simple-scan.ui.h:83
 msgid "Rotate Left"
 msgstr "向左旋轉"
 
 #. Tooltip for rotate right (clockwise) button
-#: ../data/simple-scan.ui.h:83
+#: ../data/simple-scan.ui.h:85
 msgid "Rotate the page to the right (clockwise)"
 msgstr "將頁面向右旋轉 (順時針方向)"
 
 #. Label on rotate page right (clockwise) item
-#: ../data/simple-scan.ui.h:85
+#: ../data/simple-scan.ui.h:87
 msgid "Rotate Right"
 msgstr "向右旋轉"
 
-#: ../data/simple-scan.ui.h:86
+#: ../data/simple-scan.ui.h:88
 msgid "Crop the selected page"
 msgstr "裁切所選的頁面"
 
-#: ../data/simple-scan.ui.h:87
+#: ../data/simple-scan.ui.h:89
 msgid "Crop"
 msgstr "裁切"
 
 #. Title of preferences dialog
-#: ../data/simple-scan.ui.h:89
+#: ../data/simple-scan.ui.h:91 ../src/ui.vala:1690
 msgid "Preferences"
 msgstr "偏好設定"
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:91
+#: ../data/simple-scan.ui.h:93
 msgid "Scan S_ource:"
 msgstr "掃描來源(_O)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:93
+#: ../data/simple-scan.ui.h:95
 msgid "_Text Resolution:"
 msgstr "文字解析度(_T)："
 
 #. Label beside scan source combo box
-#: ../data/simple-scan.ui.h:95
+#: ../data/simple-scan.ui.h:97
 msgid "_Photo Resolution:"
 msgstr "相片解析度(_P)："
 
 #. Label beside scan side combo box
-#: ../data/simple-scan.ui.h:97
+#: ../data/simple-scan.ui.h:99
 msgid "Scan Side:"
 msgstr "掃描面："
 
 #. Label beside page size combo box
-#: ../data/simple-scan.ui.h:99
+#: ../data/simple-scan.ui.h:101
 msgid "Page Size:"
 msgstr "頁面大小："
 
 #. Label beside brightness scale
-#: ../data/simple-scan.ui.h:101
+#: ../data/simple-scan.ui.h:103
 msgid "Brightness:"
 msgstr "亮度："
 
 #. Label beside contrast scale
-#: ../data/simple-scan.ui.h:103
+#: ../data/simple-scan.ui.h:105
 msgid "Contrast:"
 msgstr "反差："
 
 #. Label beside quality scale
-#: ../data/simple-scan.ui.h:105
+#: ../data/simple-scan.ui.h:107
 msgid "Quality:"
 msgstr "品質："
 
@@ -431,120 +437,140 @@ msgid "Scanned Document"
 msgstr "掃描的文件"
 
 #. Arguments and description for --help text
-#: ../src/simple-scan.vala:529
+#: ../src/simple-scan.vala:543
 msgid "[DEVICE...] - Scanning utility"
 msgstr "[裝置...] - 掃描公用程式"
 
 #. Text printed out when an unknown command-line argument provided
-#: ../src/simple-scan.vala:540
+#: ../src/simple-scan.vala:554
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options."
 msgstr "執行「%s --help」來查看所有命令列可用選項的完整清單。"
 
-#: ../src/ui.vala:118
+#: ../src/ui.vala:176
 msgid "Scanned Document.pdf"
 msgstr "掃描的文件.pdf"
 
-#: ../src/ui.vala:242 ../src/ui.vala:1519
+#: ../src/ui.vala:304 ../src/ui.vala:1734
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #. Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization
-#: ../src/ui.vala:250
+#: ../src/ui.vala:312
 #, c-format
 msgid "Username and password required to access '%s'"
 msgstr "要存取「%s」需要提供使用者名稱與密碼"
 
 #. Warning displayed when no scanners are detected
-#: ../src/ui.vala:295
+#: ../src/ui.vala:357
 msgid "No scanners detected"
 msgstr "沒有偵測到掃描器"
 
 #. Hint to user on why there are no scanners detected
-#: ../src/ui.vala:297
+#: ../src/ui.vala:359
 msgid "Please check your scanner is connected and powered on"
 msgstr "請檢查您的掃描器是否連接，並且是否開啟電源"
 
 #. Save dialog: Dialog title
-#: ../src/ui.vala:433
+#: ../src/ui.vala:495 ../src/ui.vala:1684
 msgid "Save As..."
 msgstr "另存為..."
 
-#: ../src/ui.vala:436 ../src/ui.vala:598
+#: ../src/ui.vala:498 ../src/ui.vala:660
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ui.vala:437 ../src/ui.vala:599
+#: ../src/ui.vala:499 ../src/ui.vala:661
 msgid "_Save"
 msgstr "儲存(_S)"
 
 #. Save dialog: Filter name to show only image files
-#: ../src/ui.vala:447
+#: ../src/ui.vala:509
 msgid "Image Files"
 msgstr "影像檔"
 
 #. Save dialog: Filter name to show all files
-#: ../src/ui.vala:453
+#: ../src/ui.vala:515
 msgid "All Files"
 msgstr "所有檔案"
 
 #. 
-#: ../src/ui.vala:458
+#: ../src/ui.vala:520
 msgid "Select File _Type"
 msgstr "選取檔案類型(_T)"
 
 #. Save dialog: Label for saving in PDF format
-#: ../src/ui.vala:472
+#: ../src/ui.vala:534
 msgid "PDF (multi-page document)"
 msgstr "PDF (多頁文件)"
 
 #. Save dialog: Label for saving in JPEG format
-#: ../src/ui.vala:478
+#: ../src/ui.vala:540
 msgid "JPEG (compressed)"
 msgstr "JPEG (壓縮)"
 
 #. Save dialog: Label for saving in PNG format
-#: ../src/ui.vala:484
+#: ../src/ui.vala:546
 msgid "PNG (lossless)"
 msgstr "PNG (無損)"
 
 #. Title of error dialog when save failed
-#: ../src/ui.vala:573
+#: ../src/ui.vala:635
 msgid "Failed to save file"
 msgstr "儲存檔案失敗"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:596
+#: ../src/ui.vala:658
 msgid "If you don't save, changes will be permanently lost."
 msgstr "如果您不儲存，變更將會永久消失。"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:632
+#: ../src/ui.vala:694
 msgid "Save current document?"
 msgstr "是否儲存目前文件？"
 
 #. Button in dialog to create new document and discard unsaved document
-#: ../src/ui.vala:634
+#: ../src/ui.vala:696
 msgid "Discard Changes"
 msgstr "放棄變更"
 
 #. Error message display when unable to save image for preview
-#: ../src/ui.vala:918
+#: ../src/ui.vala:978
 msgid "Unable to save image for preview"
 msgstr "無法儲存影像以供預覽"
 
 #. Error message display when unable to preview image
-#: ../src/ui.vala:930
+#: ../src/ui.vala:990
 msgid "Unable to open image preview application"
 msgstr "無法開啟影像預覽應用程式"
 
+#. Label on button for combining sides in reordering dialog
+#: ../src/ui.vala:1192
+msgid "Combine sides"
+msgstr ""
+
+#. Label on button for combining sides in reverse order in reordering dialog
+#: ../src/ui.vala:1202
+msgid "Combine sides (reverse)"
+msgstr ""
+
+#. Label on button for reversing in reordering dialog
+#: ../src/ui.vala:1212
+msgid "Reverse"
+msgstr ""
+
+#. Label on button for cancelling page reordering dialog
+#: ../src/ui.vala:1222
+msgid "Keep unchanged"
+msgstr ""
+
 #. Error message displayed when unable to launch help browser
-#: ../src/ui.vala:1201
+#: ../src/ui.vala:1437
 msgid "Unable to open help file"
 msgstr "無法開啟幫助文件檔案"
 
 #. The license this software is under (GPL3+)
-#: ../src/ui.vala:1222
+#: ../src/ui.vala:1458
 msgid ""
 "This program is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -567,16 +593,16 @@ msgstr ""
 "您應已收到附隨於本程式的 GNU 通用公眾授權的副本；如果沒有，請參照 <http://www.gnu.org/licenses/>。"
 
 #. Title of about dialog
-#: ../src/ui.vala:1225
+#: ../src/ui.vala:1461
 msgid "About Simple Scan"
 msgstr "關於「簡易掃描」"
 
 #. Description of program
-#: ../src/ui.vala:1228
+#: ../src/ui.vala:1464
 msgid "Simple document scanning tool"
 msgstr "簡易文件掃描工具"
 
-#: ../src/ui.vala:1237
+#: ../src/ui.vala:1473
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -589,88 +615,106 @@ msgstr ""
 "  nckuhuahua https://launchpad.net/~nckuhuahua"
 
 #. Text in dialog warning when a document is about to be lost
-#: ../src/ui.vala:1259
+#: ../src/ui.vala:1495
 msgid "Save document before quitting?"
 msgstr "在結束前要儲存文件嗎？"
 
 #. Button in dialog to quit and discard unsaved document
-#: ../src/ui.vala:1261
+#: ../src/ui.vala:1497
 msgid "Quit without Saving"
 msgstr "直接退出而不儲存"
 
 #. Preferences dialog: Label for default resolution in resolution list
-#: ../src/ui.vala:1380
+#: ../src/ui.vala:1621
 #, c-format
 msgid "%d dpi (default)"
 msgstr "%d dpi (預設)"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
-#: ../src/ui.vala:1383
+#: ../src/ui.vala:1624
 #, c-format
 msgid "%d dpi (draft)"
 msgstr "%d dpi (草稿)"
 
 #. Preferences dialog: Label for maximum resolution in resolution list
-#: ../src/ui.vala:1386
+#: ../src/ui.vala:1627
 #, c-format
 msgid "%d dpi (high resolution)"
 msgstr "%d dpi (高解析度)"
 
 #. Preferences dialog: Label for resolution value in resolution list (dpi = dots per inch)
-#: ../src/ui.vala:1389
+#: ../src/ui.vala:1630
 #, c-format
 msgid "%d dpi"
 msgstr "%d dpi"
 
-#. Title of dialog when cannot load required files
-#: ../src/ui.vala:1444
-msgid "Files missing"
-msgstr "缺少檔案"
+#: ../src/ui.vala:1676
+msgid "New Document"
+msgstr ""
 
-#. Description in dialog when cannot load required files
-#: ../src/ui.vala:1446
-msgid "Please check your installation"
-msgstr "請檢查您的安裝是否完整"
+#: ../src/ui.vala:1681
+msgid "Document"
+msgstr ""
+
+#: ../src/ui.vala:1685
+msgid "Email..."
+msgstr ""
+
+#: ../src/ui.vala:1686
+msgid "Print..."
+msgstr ""
+
+#: ../src/ui.vala:1694
+msgid "Help"
+msgstr ""
+
+#: ../src/ui.vala:1695
+msgid "About"
+msgstr ""
+
+#: ../src/ui.vala:1696
+msgid "Quit"
+msgstr ""
 
 #. Button in error infobar to open preferences dialog and change scanner
-#: ../src/ui.vala:1521
+#: ../src/ui.vala:1736
 msgid "Change _Scanner"
 msgstr "變更掃描器(_S)"
 
 #. Combo box value for automatic paper size
-#: ../src/ui.vala:1527
+#: ../src/ui.vala:1742
 msgid "Automatic"
 msgstr "自動"
 
-#: ../src/ui.vala:1577
+#: ../src/ui.vala:1792
 msgid "Darker"
 msgstr "較深"
 
-#: ../src/ui.vala:1579
+#: ../src/ui.vala:1794
 msgid "Lighter"
 msgstr "較淺"
 
-#: ../src/ui.vala:1587
+#: ../src/ui.vala:1802
 msgid "Less"
 msgstr "少"
 
-#: ../src/ui.vala:1589
+#: ../src/ui.vala:1804
 msgid "More"
 msgstr "多"
 
-#: ../src/ui.vala:1597
+#: ../src/ui.vala:1812
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/ui.vala:1599
+#: ../src/ui.vala:1814
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/ui.vala:1637
+#: ../src/ui.vala:1852
 msgid "Saving document..."
 msgstr "正在儲存文件..."
 
-#: ../src/ui.vala:1787
+#: ../src/ui.vala:2002
 #, c-format
 msgid "Saving page %d out of %d"
 msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
@@ -690,6 +734,9 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 #~ msgid "Window width in pixels"
 #~ msgstr "視窗寬度，單位為像素"
 
+#~ msgid "Please check your installation"
+#~ msgstr "請檢查您的安裝是否完整"
+
 #~ msgid "The resolution in dots-per-inch of the previously scanned image."
 #~ msgstr "之前掃描的影像其解析度，單位為 dpi。"
 
@@ -775,3 +822,6 @@ msgstr "正在儲存 %2$d 頁中的第 %1$d 頁"
 
 #~ msgid "The direction of the scanner across the scanned page."
 #~ msgstr "掃描器跨越掃描頁面的方向。"
+
+#~ msgid "Files missing"
+#~ msgstr "缺少檔案"
diff --git a/src/Makefile.am b/src/Makefile.am
index 5589f1a..d317e66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,9 @@ simple_scan_VALAFLAGS = \
 	--pkg=gudev-1.0 \
 	--pkg=gio-2.0 \
 	--pkg=gtk+-3.0 \
+	--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
 	--debug \
-	--target-glib 2.32
+	--target-glib 2.38
 
 if HAVE_COLORD
 simple_scan_VALAFLAGS += -D HAVE_COLORD
diff --git a/src/Makefile.in b/src/Makefile.in
index c099210..0c0a632 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -246,6 +246,8 @@ VALAC = @VALAC@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -306,7 +308,9 @@ simple_scan_SOURCES = \
 	resources.c
 
 simple_scan_VALAFLAGS = --pkg=zlib --pkg=gudev-1.0 --pkg=gio-2.0 \
-	--pkg=gtk+-3.0 --debug --target-glib 2.32 $(am__append_1)
+	--pkg=gtk+-3.0 \
+	--gresources=$(top_srcdir)/data/simple-scan.gresource.xml \
+	--debug --target-glib 2.38 $(am__append_1)
 simple_scan_CFLAGS = \
 	-w \
 	$(SIMPLE_SCAN_CFLAGS) \
diff --git a/src/autosave-manager.c b/src/autosave-manager.c
index 3cb458a..de3f9ca 100644
--- a/src/autosave-manager.c
+++ b/src/autosave-manager.c
@@ -1,4 +1,4 @@
-/* autosave-manager.c generated by valac 0.22.1, the Vala compiler
+/* autosave-manager.c generated by valac 0.24.0, the Vala compiler
  * generated from autosave-manager.vala, do not modify */
 
 /*
@@ -150,9 +150,9 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page);
 static void autosave_manager_save_pixels (AutosaveManager* self, Page* page);
 static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout);
 void autosave_manager_on_cleared (AutosaveManager* self);
-static gboolean ___lambda2_ (AutosaveManager* self);
+static gboolean ___lambda3_ (AutosaveManager* self);
 static void autosave_manager_real_save (AutosaveManager* self);
-static gboolean ____lambda2__gsource_func (gpointer self);
+static gboolean ____lambda3__gsource_func (gpointer self);
 guint book_get_n_pages (Book* self);
 Page* book_get_page (Book* self, gint page_number);
 gboolean page_get_has_data (Page* self);
@@ -227,7 +227,7 @@ AutosaveManager* autosave_manager_new (void) {
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self ? page_ref (self) : NULL;
 #line 233 "autosave-manager.c"
 }
@@ -240,11 +240,11 @@ void autosave_manager_load (AutosaveManager* self) {
 	GKeyFile* file = NULL;
 	GKeyFile* _tmp3_ = NULL;
 	gchar* pages = NULL;
-	GKeyFile* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
+	GKeyFile* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	gchar** _tmp12_ = NULL;
+	gchar** _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
@@ -277,29 +277,43 @@ void autosave_manager_load (AutosaveManager* self) {
 #line 72 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
 #line 280 "autosave-manager.c"
-			goto __catch28_g_error;
+			goto __catch27_g_error;
 		}
 	}
-	goto __finally28;
-	__catch28_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* e = NULL;
+		GError* _tmp6_ = NULL;
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
 #line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:76: Could not load autosave infomation; not rest" \
-"oring any autosaves");
+		_tmp6_ = e;
+#line 76 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		if (!g_error_matches (_tmp6_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+#line 297 "autosave-manager.c"
+			GError* _tmp7_ = NULL;
+			const gchar* _tmp8_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
+			_tmp7_ = e;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_key_file_unref0 (file);
+			_tmp8_ = _tmp7_->message;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			g_warning ("autosave-manager.vala:77: Could not load autosave infomation; not rest" \
+"oring any autosaves: %s", _tmp8_);
+#line 306 "autosave-manager.c"
+		}
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_key_file_unref0 (file);
+#line 78 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 300 "autosave-manager.c"
+#line 314 "autosave-manager.c"
 	}
-	__finally28:
+	__finally27:
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
@@ -310,771 +324,778 @@ void autosave_manager_load (AutosaveManager* self) {
 		g_clear_error (&_inner_error_);
 #line 70 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 313 "autosave-manager.c"
+#line 327 "autosave-manager.c"
 	}
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = file;
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp7_ = autosave_manager_get_value (self, _tmp6_, "simple-scan", "pages", "");
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	pages = _tmp7_;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp8_ = pages;
+	_tmp9_ = file;
+#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp10_ = autosave_manager_get_value (self, _tmp9_, "simple-scan", "pages", "");
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp10_ = _tmp9_ = g_strsplit (_tmp8_, " ", 0);
-#line 325 "autosave-manager.c"
+	pages = _tmp10_;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp11_ = pages;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp13_ = _tmp12_ = g_strsplit (_tmp11_, " ", 0);
+#line 339 "autosave-manager.c"
 	{
 		gchar** page_name_collection = NULL;
 		gint page_name_collection_length1 = 0;
 		gint _page_name_collection_size_ = 0;
 		gint page_name_it = 0;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_name_collection = _tmp10_;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		page_name_collection_length1 = _vala_array_length (_tmp9_);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		for (page_name_it = 0; page_name_it < _vala_array_length (_tmp9_); page_name_it = page_name_it + 1) {
-#line 337 "autosave-manager.c"
-			gchar* _tmp11_ = NULL;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_name_collection = _tmp13_;
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		page_name_collection_length1 = _vala_array_length (_tmp12_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		for (page_name_it = 0; page_name_it < _vala_array_length (_tmp12_); page_name_it = page_name_it + 1) {
+#line 351 "autosave-manager.c"
+			gchar* _tmp14_ = NULL;
 			gchar* page_name = NULL;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp11_ = g_strdup (page_name_collection[page_name_it]);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			page_name = _tmp11_;
-#line 344 "autosave-manager.c"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			_tmp14_ = g_strdup (page_name_collection[page_name_it]);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+			page_name = _tmp14_;
+#line 358 "autosave-manager.c"
 			{
-				const gchar* _tmp12_ = NULL;
+				const gchar* _tmp15_ = NULL;
 				gint scan_width = 0;
-				GKeyFile* _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gint scan_height = 0;
 				GKeyFile* _tmp16_ = NULL;
 				const gchar* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
-				gint rowstride = 0;
+				gint scan_height = 0;
 				GKeyFile* _tmp19_ = NULL;
 				const gchar* _tmp20_ = NULL;
 				gint _tmp21_ = 0;
-				gint n_channels = 0;
+				gint rowstride = 0;
 				GKeyFile* _tmp22_ = NULL;
 				const gchar* _tmp23_ = NULL;
 				gint _tmp24_ = 0;
-				gint depth = 0;
+				gint n_channels = 0;
 				GKeyFile* _tmp25_ = NULL;
 				const gchar* _tmp26_ = NULL;
 				gint _tmp27_ = 0;
-				gint dpi = 0;
+				gint depth = 0;
 				GKeyFile* _tmp28_ = NULL;
 				const gchar* _tmp29_ = NULL;
 				gint _tmp30_ = 0;
-				gchar* scan_direction_name = NULL;
+				gint dpi = 0;
 				GKeyFile* _tmp31_ = NULL;
 				const gchar* _tmp32_ = NULL;
-				gchar* _tmp33_ = NULL;
-				ScanDirection scan_direction = 0;
-				const gchar* _tmp34_ = NULL;
+				gint _tmp33_ = 0;
+				gchar* scan_direction_name = NULL;
+				GKeyFile* _tmp34_ = NULL;
 				const gchar* _tmp35_ = NULL;
-				GQuark _tmp37_ = 0U;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label0 = 0;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label1 = 0;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label2 = 0;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				static GQuark _tmp36_label3 = 0;
-#line 387 "autosave-manager.c"
+				gchar* _tmp36_ = NULL;
+				ScanDirection scan_direction = 0;
+				const gchar* _tmp37_ = NULL;
+				const gchar* _tmp38_ = NULL;
+				GQuark _tmp40_ = 0U;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label0 = 0;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label1 = 0;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label2 = 0;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				static GQuark _tmp39_label3 = 0;
+#line 401 "autosave-manager.c"
 				gchar* color_profile = NULL;
-				GKeyFile* _tmp38_ = NULL;
-				const gchar* _tmp39_ = NULL;
-				gchar* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
+				GKeyFile* _tmp41_ = NULL;
+				const gchar* _tmp42_ = NULL;
+				gchar* _tmp43_ = NULL;
+				const gchar* _tmp44_ = NULL;
 				gchar* pixels_filename = NULL;
-				GKeyFile* _tmp42_ = NULL;
-				const gchar* _tmp43_ = NULL;
-				gchar* _tmp44_ = NULL;
-				gboolean has_crop = FALSE;
 				GKeyFile* _tmp45_ = NULL;
 				const gchar* _tmp46_ = NULL;
-				gboolean _tmp47_ = FALSE;
-				gchar* crop_name = NULL;
+				gchar* _tmp47_ = NULL;
+				gboolean has_crop = FALSE;
 				GKeyFile* _tmp48_ = NULL;
 				const gchar* _tmp49_ = NULL;
-				gchar* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
+				gboolean _tmp50_ = FALSE;
+				gchar* crop_name = NULL;
+				GKeyFile* _tmp51_ = NULL;
+				const gchar* _tmp52_ = NULL;
+				gchar* _tmp53_ = NULL;
+				const gchar* _tmp54_ = NULL;
 				gint crop_x = 0;
-				GKeyFile* _tmp52_ = NULL;
-				const gchar* _tmp53_ = NULL;
-				gint _tmp54_ = 0;
-				gint crop_y = 0;
 				GKeyFile* _tmp55_ = NULL;
 				const gchar* _tmp56_ = NULL;
 				gint _tmp57_ = 0;
-				gint crop_width = 0;
+				gint crop_y = 0;
 				GKeyFile* _tmp58_ = NULL;
 				const gchar* _tmp59_ = NULL;
 				gint _tmp60_ = 0;
-				gint crop_height = 0;
+				gint crop_width = 0;
 				GKeyFile* _tmp61_ = NULL;
 				const gchar* _tmp62_ = NULL;
 				gint _tmp63_ = 0;
+				gint crop_height = 0;
+				GKeyFile* _tmp64_ = NULL;
+				const gchar* _tmp65_ = NULL;
+				gint _tmp66_ = 0;
 				guchar* pixels = NULL;
 				gint pixels_length1 = 0;
 				gint _pixels_size_ = 0;
-				const gchar* _tmp64_ = NULL;
+				const gchar* _tmp67_ = NULL;
 				Page* page = NULL;
-				gint _tmp73_ = 0;
-				gint _tmp74_ = 0;
-				gint _tmp75_ = 0;
 				gint _tmp76_ = 0;
 				gint _tmp77_ = 0;
 				gint _tmp78_ = 0;
-				ScanDirection _tmp79_ = 0;
-				const gchar* _tmp80_ = NULL;
-				guchar* _tmp81_ = NULL;
-				gint _tmp81__length1 = 0;
-				gboolean _tmp82_ = FALSE;
+				gint _tmp79_ = 0;
+				gint _tmp80_ = 0;
+				gint _tmp81_ = 0;
+				ScanDirection _tmp82_ = 0;
 				const gchar* _tmp83_ = NULL;
-				gint _tmp84_ = 0;
-				gint _tmp85_ = 0;
-				gint _tmp86_ = 0;
+				guchar* _tmp84_ = NULL;
+				gint _tmp84__length1 = 0;
+				gboolean _tmp85_ = FALSE;
+				const gchar* _tmp86_ = NULL;
 				gint _tmp87_ = 0;
-				Page* _tmp88_ = NULL;
-				GHashTable* _tmp89_ = NULL;
-				Page* _tmp90_ = NULL;
+				gint _tmp88_ = 0;
+				gint _tmp89_ = 0;
+				gint _tmp90_ = 0;
 				Page* _tmp91_ = NULL;
-				const gchar* _tmp92_ = NULL;
-				gchar* _tmp93_ = NULL;
-				Book* _tmp94_ = NULL;
-				Book* _tmp95_ = NULL;
-				Page* _tmp96_ = NULL;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp12_ = page_name;
-#line 82 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_debug ("autosave-manager.vala:82: Loading automatically saved page %s", _tmp12_);
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp13_ = file;
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp14_ = page_name;
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp15_ = autosave_manager_get_integer (self, _tmp13_, _tmp14_, "scan-width", 0);
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_width = _tmp15_;
+				GHashTable* _tmp92_ = NULL;
+				Page* _tmp93_ = NULL;
+				Page* _tmp94_ = NULL;
+				const gchar* _tmp95_ = NULL;
+				gchar* _tmp96_ = NULL;
+				Book* _tmp97_ = NULL;
+				Book* _tmp98_ = NULL;
+				Page* _tmp99_ = NULL;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp15_ = page_name;
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_debug ("autosave-manager.vala:83: Loading automatically saved page %s", _tmp15_);
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp16_ = file;
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp17_ = page_name;
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = autosave_manager_get_integer (self, _tmp16_, _tmp17_, "scan-height", 0);
+				_tmp18_ = autosave_manager_get_integer (self, _tmp16_, _tmp17_, "scan-width", 0);
 #line 85 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_height = _tmp18_;
+				scan_width = _tmp18_;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp19_ = file;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp20_ = page_name;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp21_ = autosave_manager_get_integer (self, _tmp19_, _tmp20_, "rowstride", 0);
+				_tmp21_ = autosave_manager_get_integer (self, _tmp19_, _tmp20_, "scan-height", 0);
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				rowstride = _tmp21_;
+				scan_height = _tmp21_;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp22_ = file;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp23_ = page_name;
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = autosave_manager_get_integer (self, _tmp22_, _tmp23_, "n-channels", 0);
+				_tmp24_ = autosave_manager_get_integer (self, _tmp22_, _tmp23_, "rowstride", 0);
 #line 87 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				n_channels = _tmp24_;
+				rowstride = _tmp24_;
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp25_ = file;
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp26_ = page_name;
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = autosave_manager_get_integer (self, _tmp25_, _tmp26_, "depth", 0);
+				_tmp27_ = autosave_manager_get_integer (self, _tmp25_, _tmp26_, "n-channels", 0);
 #line 88 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				depth = _tmp27_;
+				n_channels = _tmp27_;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp28_ = file;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp29_ = page_name;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = autosave_manager_get_integer (self, _tmp28_, _tmp29_, "dpi", 0);
+				_tmp30_ = autosave_manager_get_integer (self, _tmp28_, _tmp29_, "depth", 0);
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				dpi = _tmp30_;
+				depth = _tmp30_;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp31_ = file;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp32_ = page_name;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = autosave_manager_get_value (self, _tmp31_, _tmp32_, "scan-direction", "");
+				_tmp33_ = autosave_manager_get_integer (self, _tmp31_, _tmp32_, "dpi", 0);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_direction_name = _tmp33_;
+				dpi = _tmp33_;
 #line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = scan_direction_name;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = _tmp34_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp37_ = (NULL == _tmp35_) ? 0 : g_quark_from_string (_tmp35_);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp37_ == ((0 != _tmp36_label0) ? _tmp36_label0 : (_tmp36_label0 = g_quark_from_static_string ("TOP_TO_BOTTOM")))) {
+				_tmp34_ = file;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp35_ = page_name;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp36_ = autosave_manager_get_value (self, _tmp34_, _tmp35_, "scan-direction", "");
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_direction_name = _tmp36_;
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp37_ = scan_direction_name;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp38_ = _tmp37_;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp40_ = (NULL == _tmp38_) ? 0 : g_quark_from_string (_tmp38_);
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (_tmp40_ == ((0 != _tmp39_label0) ? _tmp39_label0 : (_tmp39_label0 = g_quark_from_static_string ("TOP_TO_BOTTOM")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 524 "autosave-manager.c"
+#line 538 "autosave-manager.c"
 						default:
 						{
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
 #line 96 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 531 "autosave-manager.c"
+#line 545 "autosave-manager.c"
 						}
 					}
-				} else if (_tmp37_ == ((0 != _tmp36_label1) ? _tmp36_label1 : (_tmp36_label1 = g_quark_from_static_string ("LEFT_TO_RIGHT")))) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				} else if (_tmp40_ == ((0 != _tmp39_label1) ? _tmp39_label1 : (_tmp39_label1 = g_quark_from_static_string ("LEFT_TO_RIGHT")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 537 "autosave-manager.c"
+#line 551 "autosave-manager.c"
 						default:
 						{
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
 #line 99 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 544 "autosave-manager.c"
+#line 558 "autosave-manager.c"
 						}
 					}
-				} else if (_tmp37_ == ((0 != _tmp36_label2) ? _tmp36_label2 : (_tmp36_label2 = g_quark_from_static_string ("BOTTOM_TO_TOP")))) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				} else if (_tmp40_ == ((0 != _tmp39_label2) ? _tmp39_label2 : (_tmp39_label2 = g_quark_from_static_string ("BOTTOM_TO_TOP")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 550 "autosave-manager.c"
+#line 564 "autosave-manager.c"
 						default:
 						{
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
 #line 102 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 557 "autosave-manager.c"
+#line 571 "autosave-manager.c"
 						}
 					}
-				} else if (_tmp37_ == ((0 != _tmp36_label3) ? _tmp36_label3 : (_tmp36_label3 = g_quark_from_static_string ("RIGHT_TO_LEFT")))) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				} else if (_tmp40_ == ((0 != _tmp39_label3) ? _tmp39_label3 : (_tmp39_label3 = g_quark_from_static_string ("RIGHT_TO_LEFT")))) {
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					switch (0) {
-#line 563 "autosave-manager.c"
+#line 577 "autosave-manager.c"
 						default:
 						{
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-							scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+							scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 							break;
-#line 570 "autosave-manager.c"
+#line 584 "autosave-manager.c"
 						}
 					}
 				}
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp38_ = file;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp39_ = page_name;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp40_ = autosave_manager_get_value (self, _tmp38_, _tmp39_, "color-profile", "");
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				color_profile = _tmp40_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp41_ = color_profile;
+				_tmp41_ = file;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp42_ = page_name;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp43_ = autosave_manager_get_value (self, _tmp41_, _tmp42_, "color-profile", "");
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp41_, "") == 0) {
+				color_profile = _tmp43_;
 #line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (color_profile);
+				_tmp44_ = color_profile;
 #line 109 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					color_profile = NULL;
-#line 590 "autosave-manager.c"
-				}
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp42_ = file;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp43_ = page_name;
+				if (g_strcmp0 (_tmp44_, "") == 0) {
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp44_ = autosave_manager_get_value (self, _tmp42_, _tmp43_, "pixels-filename", "");
+					_g_free0 (color_profile);
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels_filename = _tmp44_;
+					color_profile = NULL;
+#line 604 "autosave-manager.c"
+				}
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp45_ = file;
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp46_ = page_name;
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp47_ = autosave_manager_get_boolean (self, _tmp45_, _tmp46_, "has-crop", FALSE);
+				_tmp47_ = autosave_manager_get_value (self, _tmp45_, _tmp46_, "pixels-filename", "");
 #line 111 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				has_crop = _tmp47_;
+				pixels_filename = _tmp47_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp48_ = file;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp49_ = page_name;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp50_ = autosave_manager_get_value (self, _tmp48_, _tmp49_, "crop-name", "");
+				_tmp50_ = autosave_manager_get_boolean (self, _tmp48_, _tmp49_, "has-crop", FALSE);
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_name = _tmp50_;
+				has_crop = _tmp50_;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp51_ = file;
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp52_ = page_name;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp51_ = crop_name;
+				_tmp53_ = autosave_manager_get_value (self, _tmp51_, _tmp52_, "crop-name", "");
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp51_, "") == 0) {
+				crop_name = _tmp53_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (crop_name);
+				_tmp54_ = crop_name;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					crop_name = NULL;
-#line 624 "autosave-manager.c"
-				}
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp52_ = file;
+				if (g_strcmp0 (_tmp54_, "") == 0) {
 #line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp53_ = page_name;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp54_ = autosave_manager_get_integer (self, _tmp52_, _tmp53_, "crop-x", 0);
+					_g_free0 (crop_name);
 #line 115 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_x = _tmp54_;
+					crop_name = NULL;
+#line 638 "autosave-manager.c"
+				}
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp55_ = file;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp56_ = page_name;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp57_ = autosave_manager_get_integer (self, _tmp55_, _tmp56_, "crop-y", 0);
+				_tmp57_ = autosave_manager_get_integer (self, _tmp55_, _tmp56_, "crop-x", 0);
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_y = _tmp57_;
+				crop_x = _tmp57_;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp58_ = file;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp59_ = page_name;
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp60_ = autosave_manager_get_integer (self, _tmp58_, _tmp59_, "crop-width", 0);
+				_tmp60_ = autosave_manager_get_integer (self, _tmp58_, _tmp59_, "crop-y", 0);
 #line 117 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_width = _tmp60_;
+				crop_y = _tmp60_;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp61_ = file;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp62_ = page_name;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp63_ = autosave_manager_get_integer (self, _tmp61_, _tmp62_, "crop-height", 0);
+				_tmp63_ = autosave_manager_get_integer (self, _tmp61_, _tmp62_, "crop-width", 0);
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				crop_height = _tmp63_;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_width = _tmp63_;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp64_ = file;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp65_ = page_name;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp66_ = autosave_manager_get_integer (self, _tmp64_, _tmp65_, "crop-height", 0);
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				crop_height = _tmp66_;
+#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels = NULL;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				pixels_length1 = 0;
-#line 120 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_pixels_size_ = pixels_length1;
 #line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp64_ = pixels_filename;
+				pixels_length1 = 0;
 #line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp64_, "") != 0) {
-#line 668 "autosave-manager.c"
+				_pixels_size_ = pixels_length1;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp67_ = pixels_filename;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (g_strcmp0 (_tmp67_, "") != 0) {
+#line 682 "autosave-manager.c"
 					gchar* path = NULL;
-					const gchar* _tmp65_ = NULL;
-					const gchar* _tmp66_ = NULL;
-					gchar* _tmp67_ = NULL;
-					GFile* f = NULL;
 					const gchar* _tmp68_ = NULL;
-					GFile* _tmp69_ = NULL;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp65_ = autosave_manager_AUTOSAVE_DIR;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp66_ = pixels_filename;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp67_ = g_build_filename (_tmp65_, _tmp66_, NULL);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					path = _tmp67_;
+					const gchar* _tmp69_ = NULL;
+					gchar* _tmp70_ = NULL;
+					GFile* f = NULL;
+					const gchar* _tmp71_ = NULL;
+					GFile* _tmp72_ = NULL;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp68_ = autosave_manager_AUTOSAVE_DIR;
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp68_ = path;
+					_tmp69_ = pixels_filename;
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp69_ = g_file_new_for_path (_tmp68_);
+					_tmp70_ = g_build_filename (_tmp68_, _tmp69_, NULL);
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					f = _tmp69_;
-#line 690 "autosave-manager.c"
+					path = _tmp70_;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp71_ = path;
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp72_ = g_file_new_for_path (_tmp71_);
+#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					f = _tmp72_;
+#line 704 "autosave-manager.c"
 					{
-						GFile* _tmp70_ = NULL;
-						guint8* _tmp71_ = NULL;
-						gsize _tmp72_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp70_ = f;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_file_load_contents (_tmp70_, NULL, &_tmp71_, &_tmp72_, NULL, &_inner_error_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						GFile* _tmp73_ = NULL;
+						guint8* _tmp74_ = NULL;
+						gsize _tmp75_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp73_ = f;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_file_load_contents (_tmp73_, NULL, &_tmp74_, &_tmp75_, NULL, &_inner_error_);
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels = _tmp71_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						pixels_length1 = _tmp72_;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels = _tmp74_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						pixels_length1 = _tmp75_;
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_pixels_size_ = pixels_length1;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						if (_inner_error_ != NULL) {
-#line 709 "autosave-manager.c"
-							goto __catch29_g_error;
+#line 723 "autosave-manager.c"
+							goto __catch28_g_error;
 						}
 					}
-					goto __finally29;
-					__catch29_g_error:
+					goto __finally28;
+					__catch28_g_error:
 					{
 						GError* e = NULL;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						e = _inner_error_;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_inner_error_ = NULL;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_warning ("autosave-manager.vala:131: Failed to load pixel information");
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_warning ("autosave-manager.vala:132: Failed to load pixel information");
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_error_free0 (e);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (path);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (crop_name);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pixels_filename);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (color_profile);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (scan_direction_name);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (page_name);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						continue;
-#line 743 "autosave-manager.c"
+#line 757 "autosave-manager.c"
 					}
-					__finally29:
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					__finally28:
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					if (_inner_error_ != NULL) {
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_object_unref0 (f);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (path);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						pixels = (g_free (pixels), NULL);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (crop_name);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pixels_filename);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (color_profile);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (scan_direction_name);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (page_name);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_free0 (pages);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						_g_key_file_unref0 (file);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						g_clear_error (&_inner_error_);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						return;
-#line 776 "autosave-manager.c"
+#line 790 "autosave-manager.c"
 					}
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_object_unref0 (f);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_g_free0 (path);
-#line 782 "autosave-manager.c"
+#line 796 "autosave-manager.c"
 				}
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp73_ = scan_width;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp74_ = scan_height;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp75_ = rowstride;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp76_ = n_channels;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp77_ = depth;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp78_ = dpi;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp79_ = scan_direction;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp80_ = color_profile;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81_ = pixels;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81__length1 = pixels_length1;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp82_ = has_crop;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp83_ = crop_name;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp84_ = crop_x;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp85_ = crop_y;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp86_ = crop_width;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp87_ = crop_height;
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp88_ = page_new_from_data (_tmp73_, _tmp74_, _tmp75_, _tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp81__length1, _tmp82_, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp87_);
-#line 136 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp88_;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp89_ = self->priv->page_filenames;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp90_ = page;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp91_ = _page_ref0 (_tmp90_);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp92_ = pixels_filename;
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp93_ = g_strdup (_tmp92_);
-#line 151 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_hash_table_insert (_tmp89_, _tmp91_, _tmp93_);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp76_ = scan_width;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp77_ = scan_height;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp78_ = rowstride;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp79_ = n_channels;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp80_ = depth;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp81_ = dpi;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp82_ = scan_direction;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp83_ = color_profile;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84_ = pixels;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84__length1 = pixels_length1;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp85_ = has_crop;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp86_ = crop_name;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp87_ = crop_x;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp88_ = crop_y;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp89_ = crop_width;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp90_ = crop_height;
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp91_ = page_new_from_data (_tmp76_, _tmp77_, _tmp78_, _tmp79_, _tmp80_, _tmp81_, _tmp82_, _tmp83_, _tmp84_, _tmp84__length1, _tmp85_, _tmp86_, _tmp87_, _tmp88_, _tmp89_, _tmp90_);
+#line 137 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp91_;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp94_ = autosave_manager_get_book (self);
+				_tmp92_ = self->priv->page_filenames;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp95_ = _tmp94_;
+				_tmp93_ = page;
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp96_ = page;
+				_tmp94_ = _page_ref0 (_tmp93_);
 #line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				book_append_page (_tmp95_, _tmp96_);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp95_ = pixels_filename;
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp96_ = g_strdup (_tmp95_);
+#line 152 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_hash_table_insert (_tmp92_, _tmp94_, _tmp96_);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp97_ = autosave_manager_get_book (self);
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp98_ = _tmp97_;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp99_ = page;
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				book_append_page (_tmp98_, _tmp99_);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				pixels = (g_free (pixels), NULL);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (crop_name);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (pixels_filename);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (color_profile);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (scan_direction_name);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_name);
-#line 854 "autosave-manager.c"
+#line 868 "autosave-manager.c"
 			}
 		}
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		page_name_collection = (_vala_array_free (page_name_collection, page_name_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 859 "autosave-manager.c"
+#line 873 "autosave-manager.c"
 	}
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (pages);
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_key_file_unref0 (file);
-#line 865 "autosave-manager.c"
+#line 879 "autosave-manager.c"
 }
 
 
 static gchar* autosave_manager_get_value (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, const gchar* _default_) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 882 "autosave-manager.c"
+#line 896 "autosave-manager.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		gchar* _tmp5_ = NULL;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_value (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 901 "autosave-manager.c"
-			goto __catch30_g_error;
+#line 916 "autosave-manager.c"
+			goto __catch29_g_error;
 		}
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp0_;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = _tmp0_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp0_ = NULL;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp5_;
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp0_);
+#line 161 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 908 "autosave-manager.c"
+#line 929 "autosave-manager.c"
 	}
-	goto __finally30;
-	__catch30_g_error:
+	goto __finally29;
+	__catch29_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		const gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = _default_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = g_strdup (_tmp5_);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		result = _tmp6_;
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp6_ = _default_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp7_ = g_strdup (_tmp6_);
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		result = _tmp7_;
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 164 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 930 "autosave-manager.c"
+#line 951 "autosave-manager.c"
 	}
-	__finally30:
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally29:
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 939 "autosave-manager.c"
+#line 960 "autosave-manager.c"
 }
 
 
 static gint autosave_manager_get_integer (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gint _default_) {
 	gint result = 0;
 	GError * _inner_error_ = NULL;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, 0);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 954 "autosave-manager.c"
+#line 975 "autosave-manager.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 973 "autosave-manager.c"
-			goto __catch31_g_error;
+#line 994 "autosave-manager.c"
+			goto __catch30_g_error;
 		}
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 980 "autosave-manager.c"
+#line 1001 "autosave-manager.c"
 	}
-	goto __finally31;
-	__catch31_g_error:
+	goto __finally30;
+	__catch30_g_error:
 	{
 		GError* e = NULL;
 		gint _tmp5_ = 0;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _default_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp5_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 999 "autosave-manager.c"
+#line 1020 "autosave-manager.c"
 	}
-	__finally31:
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally30:
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return 0;
-#line 1008 "autosave-manager.c"
+#line 1029 "autosave-manager.c"
 }
 
 
 static gboolean autosave_manager_get_boolean (AutosaveManager* self, GKeyFile* file, const gchar* group_name, const gchar* key, gboolean _default_) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (file != NULL, FALSE);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 1023 "autosave-manager.c"
+#line 1044 "autosave-manager.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = file;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = group_name;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = key;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp4_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 1042 "autosave-manager.c"
-			goto __catch32_g_error;
+#line 1063 "autosave-manager.c"
+			goto __catch31_g_error;
 		}
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp0_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 1049 "autosave-manager.c"
+#line 1070 "autosave-manager.c"
 	}
-	goto __finally32;
-	__catch32_g_error:
+	goto __finally31;
+	__catch31_g_error:
 	{
 		GError* e = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp5_ = _default_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		result = _tmp5_;
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 188 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return result;
-#line 1068 "autosave-manager.c"
+#line 1089 "autosave-manager.c"
 	}
-	__finally32:
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally31:
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_clear_error (&_inner_error_);
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return FALSE;
-#line 1077 "autosave-manager.c"
+#line 1098 "autosave-manager.c"
 }
 
 
@@ -1082,168 +1103,175 @@ void autosave_manager_cleanup (AutosaveManager* self) {
 	guint _tmp0_ = 0U;
 	GDir* dir = NULL;
 	GError * _inner_error_ = NULL;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:194: Deleting autosave records");
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:195: Deleting autosave records");
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->update_timeout;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ > ((guint) 0)) {
-#line 1093 "autosave-manager.c"
+#line 1114 "autosave-manager.c"
 		guint _tmp1_ = 0U;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp1_ = self->priv->update_timeout;
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_source_remove (_tmp1_);
-#line 1099 "autosave-manager.c"
+#line 1120 "autosave-manager.c"
 	}
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 1103 "autosave-manager.c"
+#line 1124 "autosave-manager.c"
 	{
 		GDir* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		GDir* _tmp4_ = NULL;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GDir* _tmp5_ = NULL;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp3_ = autosave_manager_AUTOSAVE_DIR;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp4_ = g_dir_open (_tmp3_, (guint) 0, &_inner_error_);
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = _tmp4_;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 1116 "autosave-manager.c"
-			goto __catch33_g_error;
+#line 1138 "autosave-manager.c"
+			goto __catch32_g_error;
 		}
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp5_ = _tmp2_;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp2_ = NULL;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		dir = _tmp2_;
-#line 1123 "autosave-manager.c"
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		dir = _tmp5_;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_dir_close0 (_tmp2_);
+#line 1151 "autosave-manager.c"
 	}
-	goto __finally33;
-	__catch33_g_error:
+	goto __finally32;
+	__catch32_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GError* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = e;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp6_ = _tmp5_->message;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:207: Failed to delete autosaves: %s", _tmp6_);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_error_free0 (e);
+		_tmp6_ = e;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_dir_close0 (dir);
+		_tmp7_ = _tmp6_->message;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:208: Failed to delete autosaves: %s", _tmp7_);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_error_free0 (e);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_dir_close0 (dir);
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 1147 "autosave-manager.c"
+#line 1175 "autosave-manager.c"
 	}
-	__finally33:
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally32:
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_dir_close0 (dir);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 1160 "autosave-manager.c"
+#line 1188 "autosave-manager.c"
 	}
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	while (TRUE) {
-#line 1164 "autosave-manager.c"
+#line 1192 "autosave-manager.c"
 		gchar* filename = NULL;
-		GDir* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* path = NULL;
+		GDir* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+		gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
+		gchar* path = NULL;
 		const gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp7_ = dir;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp8_ = g_dir_read_name (_tmp7_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp9_ = g_strdup (_tmp8_);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		filename = _tmp9_;
+		const gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+		const gchar* _tmp15_ = NULL;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp8_ = dir;
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp9_ = g_dir_read_name (_tmp8_);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp10_ = filename;
+		_tmp10_ = g_strdup (_tmp9_);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		if (_tmp10_ == NULL) {
+		filename = _tmp10_;
 #line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_g_free0 (filename);
+		_tmp11_ = filename;
 #line 215 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			break;
-#line 1191 "autosave-manager.c"
-		}
+		if (_tmp11_ == NULL) {
 #line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp11_ = autosave_manager_AUTOSAVE_DIR;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = filename;
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp13_ = g_build_filename (_tmp11_, _tmp12_, NULL);
+			_g_free0 (filename);
 #line 216 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		path = _tmp13_;
+			break;
+#line 1219 "autosave-manager.c"
+		}
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp12_ = autosave_manager_AUTOSAVE_DIR;
+#line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp13_ = filename;
 #line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp14_ = path;
+		_tmp14_ = g_build_filename (_tmp12_, _tmp13_, NULL);
 #line 217 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_unlink (_tmp14_);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		path = _tmp14_;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp15_ = path;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_unlink (_tmp15_);
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (path);
-#line 211 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (filename);
-#line 1209 "autosave-manager.c"
+#line 1237 "autosave-manager.c"
 	}
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_dir_close0 (dir);
-#line 1213 "autosave-manager.c"
+#line 1241 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_scan_finished_page_scan_finished (Page* _sender, gpointer self) {
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_scan_finished (self, _sender);
-#line 1220 "autosave-manager.c"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_scan_finished ((AutosaveManager*) self, _sender);
+#line 1248 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_changed_page_crop_changed (Page* _sender, gpointer self) {
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_changed (self);
-#line 1227 "autosave-manager.c"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_on_changed ((AutosaveManager*) self);
+#line 1255 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_page_added (AutosaveManager* self, Page* page) {
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp0_, "scan-finished", (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_connect (_tmp0_, "scan-finished", (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = page;
-#line 224 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_connect (_tmp1_, "crop-changed", (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
-#line 1246 "autosave-manager.c"
+#line 1274 "autosave-manager.c"
 }
 
 
@@ -1260,179 +1288,176 @@ void autosave_manager_on_page_removed (AutosaveManager* self, Page* page) {
 	const gchar* _tmp8_ = NULL;
 	GHashTable* _tmp10_ = NULL;
 	Page* _tmp11_ = NULL;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_parse_name ("scan-finished", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
 #line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _autosave_manager_on_scan_finished_page_scan_finished, self);
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = page;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _autosave_manager_on_changed_page_crop_changed, self);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp4_ = self->priv->page_filenames;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = page;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	filename = _tmp7_;
 #line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	filename = _tmp7_;
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp8_ = filename;
-#line 233 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp8_ != NULL) {
-#line 1293 "autosave-manager.c"
+#line 1321 "autosave-manager.c"
 		const gchar* _tmp9_ = NULL;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp9_ = filename;
-#line 234 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_unlink (_tmp9_);
-#line 1299 "autosave-manager.c"
+#line 1327 "autosave-manager.c"
 	}
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp10_ = self->priv->page_filenames;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp11_ = page;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_remove (_tmp10_, _tmp11_);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (filename);
-#line 1309 "autosave-manager.c"
+#line 1337 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_scan_finished (AutosaveManager* self, Page* page) {
 	Page* _tmp0_ = NULL;
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 238 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 239 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = page;
-#line 240 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_save_pixels (self, _tmp0_);
 #line 241 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	autosave_manager_save_pixels (self, _tmp0_);
+#line 242 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, FALSE);
-#line 1325 "autosave-manager.c"
+#line 1353 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_changed (AutosaveManager* self) {
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 246 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, TRUE);
-#line 1334 "autosave-manager.c"
+#line 1362 "autosave-manager.c"
 }
 
 
 void autosave_manager_on_cleared (AutosaveManager* self) {
 	GHashTable* _tmp0_ = NULL;
-#line 249 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->page_filenames;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_hash_table_remove_all (_tmp0_);
 #line 252 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_hash_table_remove_all (_tmp0_);
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_save (self, TRUE);
-#line 1348 "autosave-manager.c"
+#line 1376 "autosave-manager.c"
 }
 
 
-static gboolean ___lambda2_ (AutosaveManager* self) {
+static gboolean ___lambda3_ (AutosaveManager* self) {
 	gboolean result = FALSE;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_real_save (self);
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->update_timeout = (guint) 0;
+	autosave_manager_real_save (self);
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	self->priv->update_timeout = (guint) 0;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	result = FALSE;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
-#line 1362 "autosave-manager.c"
+#line 1390 "autosave-manager.c"
 }
 
 
-static gboolean ____lambda2__gsource_func (gpointer self) {
+static gboolean ____lambda3__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda2_ (self);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	result = ___lambda3_ ((AutosaveManager*) self);
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
-#line 1371 "autosave-manager.c"
+#line 1399 "autosave-manager.c"
 }
 
 
 static void autosave_manager_save (AutosaveManager* self, gboolean do_timeout) {
 	gboolean _tmp0_ = FALSE;
 	guint _tmp1_ = 0U;
-	gboolean _tmp3_ = FALSE;
-	guint _tmp4_ = 0U;
-	gboolean _tmp6_ = FALSE;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	guint _tmp3_ = 0U;
+	gboolean _tmp5_ = FALSE;
+#line 256 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = self->priv->update_timeout;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp1_ == ((guint) 0)) {
-#line 1387 "autosave-manager.c"
+#line 1414 "autosave-manager.c"
 		gboolean _tmp2_ = FALSE;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp2_ = do_timeout;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = _tmp2_;
-#line 1393 "autosave-manager.c"
+#line 1420 "autosave-manager.c"
 	} else {
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp0_ = FALSE;
-#line 1397 "autosave-manager.c"
+#line 1424 "autosave-manager.c"
 	}
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp3_ = _tmp0_;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp3_) {
 #line 258 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_debug ("autosave-manager.vala:258: Waiting to autosave...");
-#line 1405 "autosave-manager.c"
+	if (_tmp0_) {
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_debug ("autosave-manager.vala:259: Waiting to autosave...");
+#line 1430 "autosave-manager.c"
 	}
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp4_ = self->priv->update_timeout;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp4_ > ((guint) 0)) {
-#line 1411 "autosave-manager.c"
-		guint _tmp5_ = 0U;
 #line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp5_ = self->priv->update_timeout;
+	_tmp3_ = self->priv->update_timeout;
 #line 262 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_source_remove (_tmp5_);
-#line 1417 "autosave-manager.c"
-	}
+	if (_tmp3_ > ((guint) 0)) {
+#line 1436 "autosave-manager.c"
+		guint _tmp4_ = 0U;
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp4_ = self->priv->update_timeout;
 #line 263 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_source_remove (_tmp4_);
+#line 1442 "autosave-manager.c"
+	}
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->priv->update_timeout = (guint) 0;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp6_ = do_timeout;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	if (_tmp6_) {
-#line 1425 "autosave-manager.c"
-		guint _tmp7_ = 0U;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp7_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda2__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		self->priv->update_timeout = _tmp7_;
-#line 1431 "autosave-manager.c"
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp5_ = do_timeout;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	if (_tmp5_) {
+#line 1450 "autosave-manager.c"
+		guint _tmp6_ = 0U;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp6_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda3__gsource_func, autosave_manager_ref (self), autosave_manager_unref);
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		self->priv->update_timeout = _tmp6_;
+#line 1456 "autosave-manager.c"
 	} else {
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_real_save (self);
-#line 1435 "autosave-manager.c"
+#line 1460 "autosave-manager.c"
 	}
 }
 
@@ -1442,626 +1467,572 @@ static void autosave_manager_real_save (AutosaveManager* self) {
 	GKeyFile* _tmp0_ = NULL;
 	gchar* page_names = NULL;
 	gchar* _tmp1_ = NULL;
-	GKeyFile* _tmp122_ = NULL;
-	const gchar* _tmp123_ = NULL;
+	GKeyFile* _tmp109_ = NULL;
+	const gchar* _tmp110_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 280 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:280: Autosaving book information");
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:281: Autosaving book information");
+#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_key_file_new ();
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	file = _tmp0_;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	file = _tmp0_;
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = g_strdup ("");
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	page_names = _tmp1_;
-#line 1460 "autosave-manager.c"
+#line 1485 "autosave-manager.c"
 	{
 		gint i = 0;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
-#line 1465 "autosave-manager.c"
+#line 1490 "autosave-manager.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			_tmp2_ = TRUE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
-#line 1472 "autosave-manager.c"
-				gboolean _tmp3_ = FALSE;
-				gint _tmp5_ = 0;
+#line 1497 "autosave-manager.c"
+				gint _tmp4_ = 0;
+				Book* _tmp5_ = NULL;
 				Book* _tmp6_ = NULL;
-				Book* _tmp7_ = NULL;
+				guint _tmp7_ = 0U;
 				guint _tmp8_ = 0U;
-				guint _tmp9_ = 0U;
 				Page* page = NULL;
+				Book* _tmp9_ = NULL;
 				Book* _tmp10_ = NULL;
-				Book* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
+				gint _tmp11_ = 0;
+				Page* _tmp12_ = NULL;
 				Page* _tmp13_ = NULL;
-				Page* _tmp14_ = NULL;
+				gboolean _tmp14_ = FALSE;
 				gboolean _tmp15_ = FALSE;
-				gboolean _tmp16_ = FALSE;
 				gchar* page_name = NULL;
-				gint _tmp17_ = 0;
-				gchar* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
+				gint _tmp16_ = 0;
+				gchar* _tmp17_ = NULL;
+				const gchar* _tmp18_ = NULL;
+				const gchar* _tmp21_ = NULL;
 				const gchar* _tmp22_ = NULL;
-				const gchar* _tmp23_ = NULL;
-				gchar* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
-				GKeyFile* _tmp26_ = NULL;
-				const gchar* _tmp27_ = NULL;
-				Page* _tmp28_ = NULL;
+				gchar* _tmp23_ = NULL;
+				const gchar* _tmp24_ = NULL;
+				GKeyFile* _tmp25_ = NULL;
+				const gchar* _tmp26_ = NULL;
+				Page* _tmp27_ = NULL;
+				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				GKeyFile* _tmp31_ = NULL;
-				const gchar* _tmp32_ = NULL;
-				Page* _tmp33_ = NULL;
+				GKeyFile* _tmp30_ = NULL;
+				const gchar* _tmp31_ = NULL;
+				Page* _tmp32_ = NULL;
+				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
-				gint _tmp35_ = 0;
-				GKeyFile* _tmp36_ = NULL;
-				const gchar* _tmp37_ = NULL;
-				Page* _tmp38_ = NULL;
+				GKeyFile* _tmp35_ = NULL;
+				const gchar* _tmp36_ = NULL;
+				Page* _tmp37_ = NULL;
+				gint _tmp38_ = 0;
 				gint _tmp39_ = 0;
-				gint _tmp40_ = 0;
-				GKeyFile* _tmp41_ = NULL;
-				const gchar* _tmp42_ = NULL;
-				Page* _tmp43_ = NULL;
+				GKeyFile* _tmp40_ = NULL;
+				const gchar* _tmp41_ = NULL;
+				Page* _tmp42_ = NULL;
+				gint _tmp43_ = 0;
 				gint _tmp44_ = 0;
-				gint _tmp45_ = 0;
-				GKeyFile* _tmp46_ = NULL;
-				const gchar* _tmp47_ = NULL;
-				Page* _tmp48_ = NULL;
+				GKeyFile* _tmp45_ = NULL;
+				const gchar* _tmp46_ = NULL;
+				Page* _tmp47_ = NULL;
+				gint _tmp48_ = 0;
 				gint _tmp49_ = 0;
-				gint _tmp50_ = 0;
-				GKeyFile* _tmp51_ = NULL;
-				const gchar* _tmp52_ = NULL;
-				Page* _tmp53_ = NULL;
+				GKeyFile* _tmp50_ = NULL;
+				const gchar* _tmp51_ = NULL;
+				Page* _tmp52_ = NULL;
+				gint _tmp53_ = 0;
 				gint _tmp54_ = 0;
-				gint _tmp55_ = 0;
-				Page* _tmp56_ = NULL;
+				Page* _tmp55_ = NULL;
+				ScanDirection _tmp56_ = 0;
 				ScanDirection _tmp57_ = 0;
-				ScanDirection _tmp58_ = 0;
-				gchar* _tmp67_ = NULL;
-				Page* _tmp68_ = NULL;
+				const gchar* _tmp66_ = NULL;
+				Page* _tmp67_ = NULL;
+				const gchar* _tmp68_ = NULL;
 				const gchar* _tmp69_ = NULL;
-				const gchar* _tmp70_ = NULL;
-				gchar* _tmp71_ = NULL;
+				GKeyFile* _tmp70_ = NULL;
+				const gchar* _tmp71_ = NULL;
 				const gchar* _tmp72_ = NULL;
-				GKeyFile* _tmp74_ = NULL;
-				const gchar* _tmp75_ = NULL;
-				const gchar* _tmp76_ = NULL;
-				gchar* _tmp77_ = NULL;
-				GHashTable* _tmp78_ = NULL;
-				Page* _tmp79_ = NULL;
-				gconstpointer _tmp80_ = NULL;
-				gchar* _tmp81_ = NULL;
-				const gchar* _tmp82_ = NULL;
-				GKeyFile* _tmp84_ = NULL;
+				GHashTable* _tmp73_ = NULL;
+				Page* _tmp74_ = NULL;
+				gconstpointer _tmp75_ = NULL;
+				GKeyFile* _tmp76_ = NULL;
+				const gchar* _tmp77_ = NULL;
+				GKeyFile* _tmp78_ = NULL;
+				const gchar* _tmp79_ = NULL;
+				Page* _tmp80_ = NULL;
+				gboolean _tmp81_ = FALSE;
+				gboolean _tmp82_ = FALSE;
+				const gchar* _tmp83_ = NULL;
+				Page* _tmp84_ = NULL;
 				const gchar* _tmp85_ = NULL;
 				const gchar* _tmp86_ = NULL;
 				GKeyFile* _tmp87_ = NULL;
 				const gchar* _tmp88_ = NULL;
-				Page* _tmp89_ = NULL;
-				gboolean _tmp90_ = FALSE;
-				gboolean _tmp91_ = FALSE;
-				gchar* _tmp92_ = NULL;
-				Page* _tmp93_ = NULL;
-				const gchar* _tmp94_ = NULL;
+				GKeyFile* _tmp89_ = NULL;
+				const gchar* _tmp90_ = NULL;
+				Page* _tmp91_ = NULL;
+				gint _tmp92_ = 0;
+				gint _tmp93_ = 0;
+				GKeyFile* _tmp94_ = NULL;
 				const gchar* _tmp95_ = NULL;
-				gchar* _tmp96_ = NULL;
-				const gchar* _tmp97_ = NULL;
+				Page* _tmp96_ = NULL;
+				gint _tmp97_ = 0;
+				gint _tmp98_ = 0;
 				GKeyFile* _tmp99_ = NULL;
 				const gchar* _tmp100_ = NULL;
-				const gchar* _tmp101_ = NULL;
-				GKeyFile* _tmp102_ = NULL;
-				const gchar* _tmp103_ = NULL;
-				Page* _tmp104_ = NULL;
-				gint _tmp105_ = 0;
-				gint _tmp106_ = 0;
-				GKeyFile* _tmp107_ = NULL;
-				const gchar* _tmp108_ = NULL;
-				Page* _tmp109_ = NULL;
-				gint _tmp110_ = 0;
-				gint _tmp111_ = 0;
-				GKeyFile* _tmp112_ = NULL;
-				const gchar* _tmp113_ = NULL;
-				Page* _tmp114_ = NULL;
-				gint _tmp115_ = 0;
-				gint _tmp116_ = 0;
-				GKeyFile* _tmp117_ = NULL;
-				const gchar* _tmp118_ = NULL;
-				Page* _tmp119_ = NULL;
-				gint _tmp120_ = 0;
-				gint _tmp121_ = 0;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp3_ = _tmp2_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp3_) {
-#line 1584 "autosave-manager.c"
-					gint _tmp4_ = 0;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp4_ = i;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp4_ + 1;
-#line 1590 "autosave-manager.c"
+				Page* _tmp101_ = NULL;
+				gint _tmp102_ = 0;
+				gint _tmp103_ = 0;
+				GKeyFile* _tmp104_ = NULL;
+				const gchar* _tmp105_ = NULL;
+				Page* _tmp106_ = NULL;
+				gint _tmp107_ = 0;
+				gint _tmp108_ = 0;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp2_) {
+#line 1597 "autosave-manager.c"
+					gint _tmp3_ = 0;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_tmp3_ = i;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					i = _tmp3_ + 1;
+#line 1603 "autosave-manager.c"
 				}
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp2_ = FALSE;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp5_ = i;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp6_ = autosave_manager_get_book (self);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp7_ = _tmp6_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp8_ = book_get_n_pages (_tmp7_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp9_ = _tmp8_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp5_) < _tmp9_)) {
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp4_ = i;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp5_ = autosave_manager_get_book (self);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp6_ = _tmp5_;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp7_ = book_get_n_pages (_tmp6_);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp8_ = _tmp7_;
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!(((guint) _tmp4_) < _tmp8_)) {
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 1608 "autosave-manager.c"
+#line 1621 "autosave-manager.c"
 				}
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp10_ = autosave_manager_get_book (self);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp11_ = _tmp10_;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp12_ = i;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp13_ = book_get_page (_tmp11_, _tmp12_);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp13_;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp14_ = page;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp15_ = page_get_has_data (_tmp14_);
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp16_ = _tmp15_;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp16_) {
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp9_ = autosave_manager_get_book (self);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp10_ = _tmp9_;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp11_ = i;
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp12_ = book_get_page (_tmp10_, _tmp11_);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page = _tmp12_;
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_page_unref0 (page);
+				_tmp13_ = page;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp14_ = page_get_has_data (_tmp13_);
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp15_ = _tmp14_;
+#line 290 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				if (!_tmp15_) {
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					_page_unref0 (page);
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					continue;
-#line 1632 "autosave-manager.c"
+#line 1645 "autosave-manager.c"
 				}
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp17_ = i;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp18_ = g_strdup_printf ("page-%d", _tmp17_);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page_name = _tmp18_;
 #line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp19_ = page_names;
+				_tmp16_ = i;
 #line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 1644 "autosave-manager.c"
-					const gchar* _tmp20_ = NULL;
-					gchar* _tmp21_ = NULL;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp20_ = page_names;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp21_ = g_strconcat (_tmp20_, " ", NULL);
+				_tmp17_ = g_strdup_printf ("page-%d", _tmp16_);
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page_name = _tmp17_;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (page_names);
+				_tmp18_ = page_names;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page_names = _tmp21_;
-#line 1655 "autosave-manager.c"
-				}
+				if (g_strcmp0 (_tmp18_, "") != 0) {
+#line 1657 "autosave-manager.c"
+					const gchar* _tmp19_ = NULL;
+					gchar* _tmp20_ = NULL;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp22_ = page_names;
+					_tmp19_ = page_names;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp23_ = page_name;
+					_tmp20_ = g_strconcat (_tmp19_, " ", NULL);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp24_ = g_strconcat (_tmp22_, _tmp23_, NULL);
+					_g_free0 (page_names);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+					page_names = _tmp20_;
+#line 1668 "autosave-manager.c"
+				}
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp21_ = page_names;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp22_ = page_name;
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp23_ = g_strconcat (_tmp21_, _tmp22_, NULL);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_names);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page_names = _tmp24_;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp25_ = page_name;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_debug ("autosave-manager.vala:297: Autosaving page %s", _tmp25_);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = file;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = page_name;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp28_ = page;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = page_get_scan_width (_tmp28_);
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = _tmp29_;
-#line 299 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp26_, _tmp27_, "scan-width", _tmp30_);
+#line 296 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				page_names = _tmp23_;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp24_ = page_name;
+#line 298 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_debug ("autosave-manager.vala:298: Autosaving page %s", _tmp24_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = file;
+				_tmp25_ = file;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = page_name;
+				_tmp26_ = page_name;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = page;
+				_tmp27_ = page;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = page_get_scan_height (_tmp33_);
+				_tmp28_ = page_get_scan_width (_tmp27_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = _tmp34_;
+				_tmp29_ = _tmp28_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp31_, _tmp32_, "scan-height", _tmp35_);
+				g_key_file_set_integer (_tmp25_, _tmp26_, "scan-width", _tmp29_);
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp36_ = file;
+				_tmp30_ = file;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp37_ = page_name;
+				_tmp31_ = page_name;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp38_ = page;
+				_tmp32_ = page;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp39_ = page_get_rowstride (_tmp38_);
+				_tmp33_ = page_get_scan_height (_tmp32_);
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp40_ = _tmp39_;
+				_tmp34_ = _tmp33_;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp36_, _tmp37_, "rowstride", _tmp40_);
+				g_key_file_set_integer (_tmp30_, _tmp31_, "scan-height", _tmp34_);
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp41_ = file;
+				_tmp35_ = file;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp42_ = page_name;
+				_tmp36_ = page_name;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp43_ = page;
+				_tmp37_ = page;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp44_ = page_get_n_channels (_tmp43_);
+				_tmp38_ = page_get_rowstride (_tmp37_);
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp45_ = _tmp44_;
+				_tmp39_ = _tmp38_;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp41_, _tmp42_, "n-channels", _tmp45_);
+				g_key_file_set_integer (_tmp35_, _tmp36_, "rowstride", _tmp39_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp46_ = file;
+				_tmp40_ = file;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp47_ = page_name;
+				_tmp41_ = page_name;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp48_ = page;
+				_tmp42_ = page;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp49_ = page_get_depth (_tmp48_);
+				_tmp43_ = page_get_n_channels (_tmp42_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp50_ = _tmp49_;
+				_tmp44_ = _tmp43_;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp46_, _tmp47_, "depth", _tmp50_);
+				g_key_file_set_integer (_tmp40_, _tmp41_, "n-channels", _tmp44_);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp51_ = file;
+				_tmp45_ = file;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp52_ = page_name;
+				_tmp46_ = page_name;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp53_ = page;
+				_tmp47_ = page;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp54_ = page_get_dpi (_tmp53_);
+				_tmp48_ = page_get_depth (_tmp47_);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp55_ = _tmp54_;
+				_tmp49_ = _tmp48_;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp51_, _tmp52_, "dpi", _tmp55_);
+				g_key_file_set_integer (_tmp45_, _tmp46_, "depth", _tmp49_);
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp50_ = file;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp56_ = page;
+				_tmp51_ = page_name;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp57_ = page_get_scan_direction (_tmp56_);
+				_tmp52_ = page;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp58_ = _tmp57_;
+				_tmp53_ = page_get_dpi (_tmp52_);
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				switch (_tmp58_) {
+				_tmp54_ = _tmp53_;
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp50_, _tmp51_, "dpi", _tmp54_);
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp55_ = page;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp56_ = page_get_scan_direction (_tmp55_);
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp57_ = _tmp56_;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				switch (_tmp57_) {
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1753 "autosave-manager.c"
+#line 1766 "autosave-manager.c"
 					{
-						GKeyFile* _tmp59_ = NULL;
-						const gchar* _tmp60_ = NULL;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp59_ = file;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp60_ = page_name;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp59_, _tmp60_, "scan-direction", "TOP_TO_BOTTOM");
+						GKeyFile* _tmp58_ = NULL;
+						const gchar* _tmp59_ = NULL;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp58_ = file;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp59_ = page_name;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp58_, _tmp59_, "scan-direction", "TOP_TO_BOTTOM");
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1765 "autosave-manager.c"
+#line 1778 "autosave-manager.c"
 					}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1769 "autosave-manager.c"
+#line 1782 "autosave-manager.c"
 					{
-						GKeyFile* _tmp61_ = NULL;
-						const gchar* _tmp62_ = NULL;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp61_ = file;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp62_ = page_name;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp61_, _tmp62_, "scan-direction", "LEFT_TO_RIGHT");
+						GKeyFile* _tmp60_ = NULL;
+						const gchar* _tmp61_ = NULL;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp60_ = file;
+#line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp61_ = page_name;
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp60_, _tmp61_, "scan-direction", "LEFT_TO_RIGHT");
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1781 "autosave-manager.c"
+#line 1794 "autosave-manager.c"
 					}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1785 "autosave-manager.c"
+#line 1798 "autosave-manager.c"
 					{
-						GKeyFile* _tmp63_ = NULL;
-						const gchar* _tmp64_ = NULL;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp63_ = file;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp64_ = page_name;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp63_, _tmp64_, "scan-direction", "BOTTOM_TO_TOP");
+						GKeyFile* _tmp62_ = NULL;
+						const gchar* _tmp63_ = NULL;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp62_ = file;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp63_ = page_name;
 #line 315 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp62_, _tmp63_, "scan-direction", "BOTTOM_TO_TOP");
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1797 "autosave-manager.c"
+#line 1810 "autosave-manager.c"
 					}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1801 "autosave-manager.c"
+#line 1814 "autosave-manager.c"
 					{
-						GKeyFile* _tmp65_ = NULL;
-						const gchar* _tmp66_ = NULL;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp65_ = file;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp66_ = page_name;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						g_key_file_set_value (_tmp65_, _tmp66_, "scan-direction", "RIGHT_TO_LEFT");
+						GKeyFile* _tmp64_ = NULL;
+						const gchar* _tmp65_ = NULL;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp64_ = file;
 #line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						_tmp65_ = page_name;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+						g_key_file_set_value (_tmp64_, _tmp65_, "scan-direction", "RIGHT_TO_LEFT");
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 1813 "autosave-manager.c"
+#line 1826 "autosave-manager.c"
 					}
 					default:
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 1818 "autosave-manager.c"
+#line 1831 "autosave-manager.c"
 				}
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp68_ = page;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp69_ = page_get_color_profile (_tmp68_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp70_ = _tmp69_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp71_ = g_strdup (_tmp70_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp67_ = _tmp71_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp72_ = _tmp67_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp72_ == NULL) {
-#line 1834 "autosave-manager.c"
-					gchar* _tmp73_ = NULL;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp73_ = g_strdup ("");
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp67_);
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp67_ = _tmp73_;
-#line 1842 "autosave-manager.c"
-				}
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp74_ = file;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp75_ = page_name;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp76_ = _tmp67_;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp74_, _tmp75_, "color-profile", _tmp76_);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp78_ = self->priv->page_filenames;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp79_ = page;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp80_ = g_hash_table_lookup (_tmp78_, _tmp79_);
+				_tmp67_ = page;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp81_ = g_strdup ((const gchar*) _tmp80_);
+				_tmp68_ = page_get_color_profile (_tmp67_);
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp77_ = _tmp81_;
+				_tmp69_ = _tmp68_;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp82_ = _tmp77_;
+				_tmp66_ = _tmp69_;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp82_ == NULL) {
-#line 1866 "autosave-manager.c"
-					gchar* _tmp83_ = NULL;
+				if (_tmp66_ == NULL) {
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp83_ = g_strdup ("");
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp77_);
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp77_ = _tmp83_;
-#line 1874 "autosave-manager.c"
+					_tmp66_ = "";
+#line 1845 "autosave-manager.c"
 				}
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp84_ = file;
+				_tmp70_ = file;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp85_ = page_name;
+				_tmp71_ = page_name;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp86_ = _tmp77_;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp84_, _tmp85_, "pixels-filename", _tmp86_);
+				g_key_file_set_value (_tmp70_, _tmp71_, "color-profile", _tmp66_);
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp87_ = file;
+				_tmp73_ = self->priv->page_filenames;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp88_ = page_name;
+				_tmp74_ = page;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp89_ = page;
+				_tmp75_ = g_hash_table_lookup (_tmp73_, _tmp74_);
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp90_ = page_get_has_crop (_tmp89_);
+				_tmp72_ = (const gchar*) _tmp75_;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp91_ = _tmp90_;
+				if (_tmp72_ == NULL) {
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_boolean (_tmp87_, _tmp88_, "has-crop", _tmp91_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp93_ = page;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp94_ = page_get_crop_name (_tmp93_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp95_ = _tmp94_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp96_ = g_strdup (_tmp95_);
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp92_ = _tmp96_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp97_ = _tmp92_;
+					_tmp72_ = "";
+#line 1865 "autosave-manager.c"
+				}
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp76_ = file;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp77_ = page_name;
+#line 322 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_value (_tmp76_, _tmp77_, "pixels-filename", _tmp72_);
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (_tmp97_ == NULL) {
-#line 1910 "autosave-manager.c"
-					gchar* _tmp98_ = NULL;
+				_tmp78_ = file;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp98_ = g_strdup ("");
+				_tmp79_ = page_name;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_g_free0 (_tmp92_);
+				_tmp80_ = page;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp92_ = _tmp98_;
-#line 1918 "autosave-manager.c"
-				}
+				_tmp81_ = page_get_has_crop (_tmp80_);
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp99_ = file;
+				_tmp82_ = _tmp81_;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp100_ = page_name;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp101_ = _tmp92_;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_value (_tmp99_, _tmp100_, "crop-name", _tmp101_);
+				g_key_file_set_boolean (_tmp78_, _tmp79_, "has-crop", _tmp82_);
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp84_ = page;
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp85_ = page_get_crop_name (_tmp84_);
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp102_ = file;
+				_tmp86_ = _tmp85_;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp103_ = page_name;
+				_tmp83_ = _tmp86_;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp104_ = page;
+				if (_tmp83_ == NULL) {
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp105_ = page_get_crop_x (_tmp104_);
+					_tmp83_ = "";
+#line 1897 "autosave-manager.c"
+				}
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp87_ = file;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp106_ = _tmp105_;
+				_tmp88_ = page_name;
 #line 324 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp102_, _tmp103_, "crop-x", _tmp106_);
+				g_key_file_set_value (_tmp87_, _tmp88_, "crop-name", _tmp83_);
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp107_ = file;
+				_tmp89_ = file;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp108_ = page_name;
+				_tmp90_ = page_name;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp109_ = page;
+				_tmp91_ = page;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp110_ = page_get_crop_y (_tmp109_);
+				_tmp92_ = page_get_crop_x (_tmp91_);
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp111_ = _tmp110_;
+				_tmp93_ = _tmp92_;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp107_, _tmp108_, "crop-y", _tmp111_);
+				g_key_file_set_integer (_tmp89_, _tmp90_, "crop-x", _tmp93_);
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp112_ = file;
+				_tmp94_ = file;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp113_ = page_name;
+				_tmp95_ = page_name;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp114_ = page;
+				_tmp96_ = page;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp115_ = page_get_crop_width (_tmp114_);
+				_tmp97_ = page_get_crop_y (_tmp96_);
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp116_ = _tmp115_;
+				_tmp98_ = _tmp97_;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp112_, _tmp113_, "crop-width", _tmp116_);
+				g_key_file_set_integer (_tmp94_, _tmp95_, "crop-y", _tmp98_);
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp117_ = file;
+				_tmp99_ = file;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp118_ = page_name;
+				_tmp100_ = page_name;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp119_ = page;
+				_tmp101_ = page;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp120_ = page_get_crop_height (_tmp119_);
+				_tmp102_ = page_get_crop_width (_tmp101_);
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp121_ = _tmp120_;
+				_tmp103_ = _tmp102_;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				g_key_file_set_integer (_tmp117_, _tmp118_, "crop-height", _tmp121_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (_tmp92_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (_tmp77_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_g_free0 (_tmp67_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp99_, _tmp100_, "crop-width", _tmp103_);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp104_ = file;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp105_ = page_name;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp106_ = page;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp107_ = page_get_crop_height (_tmp106_);
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				_tmp108_ = _tmp107_;
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+				g_key_file_set_integer (_tmp104_, _tmp105_, "crop-height", _tmp108_);
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_g_free0 (page_name);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 285 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 1986 "autosave-manager.c"
+#line 1957 "autosave-manager.c"
 			}
 		}
 	}
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp122_ = file;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp123_ = page_names;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_key_file_set_value (_tmp122_, "simple-scan", "pages", _tmp123_);
-#line 1996 "autosave-manager.c"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp109_ = file;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	_tmp110_ = page_names;
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_key_file_set_value (_tmp109_, "simple-scan", "pages", _tmp110_);
+#line 1967 "autosave-manager.c"
 	{
-		const gchar* _tmp124_ = NULL;
-		const gchar* _tmp125_ = NULL;
-		GKeyFile* _tmp126_ = NULL;
-		gchar* _tmp127_ = NULL;
-		gchar* _tmp128_ = NULL;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp124_ = autosave_manager_AUTOSAVE_DIR;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_mkdir_with_parents (_tmp124_, 0777);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp125_ = autosave_manager_AUTOSAVE_PATH;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp126_ = file;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp127_ = g_key_file_to_data (_tmp126_, NULL, NULL);
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp128_ = _tmp127_;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_file_set_contents (_tmp125_, _tmp128_, (gssize) (-1), &_inner_error_);
+		const gchar* _tmp111_ = NULL;
+		const gchar* _tmp112_ = NULL;
+		GKeyFile* _tmp113_ = NULL;
+		gchar* _tmp114_ = NULL;
+		gchar* _tmp115_ = NULL;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_g_free0 (_tmp128_);
+		_tmp111_ = autosave_manager_AUTOSAVE_DIR;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_mkdir_with_parents (_tmp111_, 0777);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp112_ = autosave_manager_AUTOSAVE_PATH;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp113_ = file;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp114_ = g_key_file_to_data (_tmp113_, NULL, NULL);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp115_ = _tmp114_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_file_set_contents (_tmp112_, _tmp115_, (gssize) (-1), &_inner_error_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_g_free0 (_tmp115_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 2021 "autosave-manager.c"
-			goto __catch34_g_error;
+#line 1992 "autosave-manager.c"
+			goto __catch33_g_error;
 		}
 	}
-	goto __finally34;
-	__catch34_g_error:
+	goto __finally33;
+	__catch33_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp129_ = NULL;
-		const gchar* _tmp130_ = NULL;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		GError* _tmp116_ = NULL;
+		const gchar* _tmp117_ = NULL;
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp129_ = e;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp130_ = _tmp129_->message;
-#line 338 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:338: Failed to write autosave: %s", _tmp130_);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp116_ = e;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		_tmp117_ = _tmp116_->message;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:339: Failed to write autosave: %s", _tmp117_);
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 2043 "autosave-manager.c"
+#line 2014 "autosave-manager.c"
 	}
-	__finally34:
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally33:
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (page_names);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_key_file_unref0 (file);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 2058 "autosave-manager.c"
+#line 2029 "autosave-manager.c"
 	}
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (page_names);
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 279 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_key_file_unref0 (file);
-#line 2064 "autosave-manager.c"
+#line 2035 "autosave-manager.c"
 }
 
 
@@ -2081,103 +2052,103 @@ static void autosave_manager_save_pixels (AutosaveManager* self, Page* page) {
 	GFile* file = NULL;
 	GFile* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (page != NULL);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = g_direct_hash;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp1_ = page;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp2_ = _tmp0_ (_tmp1_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp3_ = g_strdup_printf ("%u.pixels", _tmp2_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	filename = _tmp3_;
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	filename = _tmp3_;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp4_ = autosave_manager_AUTOSAVE_DIR;
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp5_ = g_build_filename (_tmp4_, filename, NULL);
-#line 345 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	path = _tmp5_;
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	path = _tmp5_;
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp6_ = self->priv->page_filenames;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp7_ = page;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp8_ = _page_ref0 (_tmp7_);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp9_ = g_strdup (filename);
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 347 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_hash_table_insert (_tmp6_, _tmp8_, _tmp9_);
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_debug ("autosave-manager.vala:348: Autosaving page pixels to %s", path);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 349 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	g_debug ("autosave-manager.vala:349: Autosaving page pixels to %s", path);
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp10_ = g_file_new_for_path (path);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	file = _tmp10_;
-#line 2120 "autosave-manager.c"
+#line 2091 "autosave-manager.c"
 	{
 		Page* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		guchar* _tmp13_ = NULL;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp11_ = page;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp13_ = page_get_pixels (_tmp11_, &_tmp12_);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_file_replace_contents (file, _tmp13_, (gsize) _tmp12_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, &_inner_error_);
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (_inner_error_ != NULL) {
-#line 2133 "autosave-manager.c"
-			goto __catch35_g_error;
+#line 2104 "autosave-manager.c"
+			goto __catch34_g_error;
 		}
 	}
-	goto __finally35;
-	__catch35_g_error:
+	goto __finally34;
+	__catch34_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		e = _inner_error_;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_inner_error_ = NULL;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp14_ = e;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_tmp15_ = _tmp14_->message;
-#line 357 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_warning ("autosave-manager.vala:357: Failed to autosave page contents: %s", _tmp15_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+		g_warning ("autosave-manager.vala:358: Failed to autosave page contents: %s", _tmp15_);
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_error_free0 (e);
-#line 2155 "autosave-manager.c"
+#line 2126 "autosave-manager.c"
 	}
-	__finally35:
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+	__finally34:
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_inner_error_ != NULL) {
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_object_unref0 (file);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (path);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		_g_free0 (filename);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_clear_error (&_inner_error_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return;
-#line 2172 "autosave-manager.c"
+#line 2143 "autosave-manager.c"
 	}
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_object_unref0 (file);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (path);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_g_free0 (filename);
-#line 2180 "autosave-manager.c"
+#line 2151 "autosave-manager.c"
 }
 
 
@@ -2192,252 +2163,246 @@ Book* autosave_manager_get_book (AutosaveManager* self) {
 	result = _tmp0_;
 #line 28 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return result;
-#line 2195 "autosave-manager.c"
+#line 2166 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_added_book_page_added (Book* _sender, Page* page, gpointer self) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_added (self, page);
-#line 2202 "autosave-manager.c"
+	autosave_manager_on_page_added ((AutosaveManager*) self, page);
+#line 2173 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_page_removed_book_page_removed (Book* _sender, Page* page, gpointer self) {
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_page_removed (self, page);
-#line 2209 "autosave-manager.c"
+	autosave_manager_on_page_removed ((AutosaveManager*) self, page);
+#line 2180 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_changed_book_reordered (Book* _sender, gpointer self) {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_changed (self);
-#line 2216 "autosave-manager.c"
+	autosave_manager_on_changed ((AutosaveManager*) self);
+#line 2187 "autosave-manager.c"
 }
 
 
 static void _autosave_manager_on_cleared_book_cleared (Book* _sender, gpointer self) {
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	autosave_manager_on_cleared (self);
-#line 2223 "autosave-manager.c"
+	autosave_manager_on_cleared ((AutosaveManager*) self);
+#line 2194 "autosave-manager.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return self ? book_ref (self) : NULL;
-#line 2230 "autosave-manager.c"
+#line 2201 "autosave-manager.c"
 }
 
 
 void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 	Book* _tmp0_ = NULL;
+	Book* _tmp19_ = NULL;
 	Book* _tmp20_ = NULL;
 	Book* _tmp21_ = NULL;
 	Book* _tmp22_ = NULL;
 	Book* _tmp23_ = NULL;
 	Book* _tmp24_ = NULL;
-	Book* _tmp25_ = NULL;
 #line 30 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	g_return_if_fail (self != NULL);
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_tmp0_ = self->priv->book_;
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (_tmp0_ != NULL) {
-#line 2248 "autosave-manager.c"
-		Book* _tmp12_ = NULL;
-		guint _tmp13_ = 0U;
-		Book* _tmp14_ = NULL;
-		guint _tmp15_ = 0U;
-		Book* _tmp16_ = NULL;
-		guint _tmp17_ = 0U;
-		Book* _tmp18_ = NULL;
-		guint _tmp19_ = 0U;
+#line 2219 "autosave-manager.c"
+		Book* _tmp11_ = NULL;
+		guint _tmp12_ = 0U;
+		Book* _tmp13_ = NULL;
+		guint _tmp14_ = 0U;
+		Book* _tmp15_ = NULL;
+		guint _tmp16_ = 0U;
+		Book* _tmp17_ = NULL;
+		guint _tmp18_ = 0U;
 		{
 			gint i = 0;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			i = 0;
-#line 2261 "autosave-manager.c"
+#line 2232 "autosave-manager.c"
 			{
 				gboolean _tmp1_ = FALSE;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_tmp1_ = TRUE;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				while (TRUE) {
-#line 2268 "autosave-manager.c"
-					gboolean _tmp2_ = FALSE;
-					gint _tmp4_ = 0;
-					Book* _tmp5_ = NULL;
+#line 2239 "autosave-manager.c"
+					gint _tmp3_ = 0;
+					Book* _tmp4_ = NULL;
+					guint _tmp5_ = 0U;
 					guint _tmp6_ = 0U;
-					guint _tmp7_ = 0U;
 					Page* page = NULL;
-					Book* _tmp8_ = NULL;
-					gint _tmp9_ = 0;
+					Book* _tmp7_ = NULL;
+					gint _tmp8_ = 0;
+					Page* _tmp9_ = NULL;
 					Page* _tmp10_ = NULL;
-					Page* _tmp11_ = NULL;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp2_ = _tmp1_;
+					if (!_tmp1_) {
+#line 2251 "autosave-manager.c"
+						gint _tmp2_ = 0;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!_tmp2_) {
-#line 2283 "autosave-manager.c"
-						gint _tmp3_ = 0;
+						_tmp2_ = i;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						_tmp3_ = i;
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-						i = _tmp3_ + 1;
-#line 2289 "autosave-manager.c"
+						i = _tmp2_ + 1;
+#line 2257 "autosave-manager.c"
 					}
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_tmp1_ = FALSE;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp4_ = i;
+					_tmp3_ = i;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp5_ = self->priv->book_;
+					_tmp4_ = self->priv->book_;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp6_ = book_get_n_pages (_tmp5_);
+					_tmp5_ = book_get_n_pages (_tmp4_);
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp7_ = _tmp6_;
+					_tmp6_ = _tmp5_;
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					if (!(((guint) _tmp4_) < _tmp7_)) {
+					if (!(((guint) _tmp3_) < _tmp6_)) {
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 						break;
-#line 2305 "autosave-manager.c"
+#line 2273 "autosave-manager.c"
 					}
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp8_ = self->priv->book_;
+					_tmp7_ = self->priv->book_;
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp9_ = i;
+					_tmp8_ = i;
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp10_ = book_get_page (_tmp8_, _tmp9_);
+					_tmp9_ = book_get_page (_tmp7_, _tmp8_);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					page = _tmp10_;
+					page = _tmp9_;
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp11_ = page;
+					_tmp10_ = page;
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					autosave_manager_on_page_removed (self, _tmp11_);
+					autosave_manager_on_page_removed (self, _tmp10_);
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					_page_unref0 (page);
-#line 2321 "autosave-manager.c"
+#line 2289 "autosave-manager.c"
 				}
 			}
 		}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp12_ = self->priv->book_;
+		_tmp11_ = self->priv->book_;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp13_, NULL, FALSE);
+		g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp12_, NULL, FALSE);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp12_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp13_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _autosave_manager_on_page_added_book_page_added, self);
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp14_ = self->priv->book_;
+		_tmp13_ = self->priv->book_;
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp15_, NULL, FALSE);
+		g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp14_, NULL, FALSE);
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+		g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp16_ = self->priv->book_;
+		_tmp15_ = self->priv->book_;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp17_, NULL, FALSE);
+		g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp16_, NULL, FALSE);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp16_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _autosave_manager_on_changed_book_reordered, self);
+		g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) _autosave_manager_on_changed_book_reordered, self);
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		_tmp18_ = self->priv->book_;
+		_tmp17_ = self->priv->book_;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp19_, NULL, FALSE);
+		g_signal_parse_name ("cleared", TYPE_BOOK, &_tmp18_, NULL, FALSE);
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-		g_signal_handlers_disconnect_matched (_tmp18_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp19_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
-#line 2349 "autosave-manager.c"
+		g_signal_handlers_disconnect_matched (_tmp17_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 2317 "autosave-manager.c"
 	}
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp20_ = value;
+	_tmp19_ = value;
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp21_ = _book_ref0 (_tmp20_);
+	_tmp20_ = _book_ref0 (_tmp19_);
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_book_unref0 (self->priv->book_);
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	self->priv->book_ = _tmp21_;
+	self->priv->book_ = _tmp20_;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp22_ = self->priv->book_;
+	_tmp21_ = self->priv->book_;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp22_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
+	g_signal_connect (_tmp21_, "page-added", (GCallback) _autosave_manager_on_page_added_book_page_added, self);
 #line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp23_ = self->priv->book_;
+	_tmp22_ = self->priv->book_;
 #line 46 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp23_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
+	g_signal_connect (_tmp22_, "page-removed", (GCallback) _autosave_manager_on_page_removed_book_page_removed, self);
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp24_ = self->priv->book_;
+	_tmp23_ = self->priv->book_;
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp24_, "reordered", (GCallback) _autosave_manager_on_changed_book_reordered, self);
+	g_signal_connect (_tmp23_, "reordered", (GCallback) _autosave_manager_on_changed_book_reordered, self);
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	_tmp25_ = self->priv->book_;
+	_tmp24_ = self->priv->book_;
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-	g_signal_connect (_tmp25_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
-#line 2375 "autosave-manager.c"
+	g_signal_connect (_tmp24_, "cleared", (GCallback) _autosave_manager_on_cleared_book_cleared, self);
+#line 2343 "autosave-manager.c"
 	{
 		gint i = 0;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		i = 0;
-#line 2380 "autosave-manager.c"
+#line 2348 "autosave-manager.c"
 		{
-			gboolean _tmp26_ = FALSE;
+			gboolean _tmp25_ = FALSE;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-			_tmp26_ = TRUE;
+			_tmp25_ = TRUE;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			while (TRUE) {
-#line 2387 "autosave-manager.c"
-				gboolean _tmp27_ = FALSE;
-				gint _tmp29_ = 0;
-				Book* _tmp30_ = NULL;
-				guint _tmp31_ = 0U;
-				guint _tmp32_ = 0U;
+#line 2355 "autosave-manager.c"
+				gint _tmp27_ = 0;
+				Book* _tmp28_ = NULL;
+				guint _tmp29_ = 0U;
+				guint _tmp30_ = 0U;
 				Page* page = NULL;
-				Book* _tmp33_ = NULL;
-				gint _tmp34_ = 0;
-				Page* _tmp35_ = NULL;
-				Page* _tmp36_ = NULL;
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp27_ = _tmp26_;
+				Book* _tmp31_ = NULL;
+				gint _tmp32_ = 0;
+				Page* _tmp33_ = NULL;
+				Page* _tmp34_ = NULL;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!_tmp27_) {
-#line 2402 "autosave-manager.c"
-					gint _tmp28_ = 0;
+				if (!_tmp25_) {
+#line 2367 "autosave-manager.c"
+					gint _tmp26_ = 0;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					_tmp28_ = i;
+					_tmp26_ = i;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-					i = _tmp28_ + 1;
-#line 2408 "autosave-manager.c"
+					i = _tmp26_ + 1;
+#line 2373 "autosave-manager.c"
 				}
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp26_ = FALSE;
+				_tmp25_ = FALSE;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp29_ = i;
+				_tmp27_ = i;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp30_ = self->priv->book_;
+				_tmp28_ = self->priv->book_;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp31_ = book_get_n_pages (_tmp30_);
+				_tmp29_ = book_get_n_pages (_tmp28_);
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp32_ = _tmp31_;
+				_tmp30_ = _tmp29_;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				if (!(((guint) _tmp29_) < _tmp32_)) {
+				if (!(((guint) _tmp27_) < _tmp30_)) {
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 					break;
-#line 2424 "autosave-manager.c"
+#line 2389 "autosave-manager.c"
 				}
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp33_ = self->priv->book_;
+				_tmp31_ = self->priv->book_;
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp34_ = i;
+				_tmp32_ = i;
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp35_ = book_get_page (_tmp33_, _tmp34_);
+				_tmp33_ = book_get_page (_tmp31_, _tmp32_);
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				page = _tmp35_;
+				page = _tmp33_;
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				_tmp36_ = page;
+				_tmp34_ = page;
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
-				autosave_manager_on_page_added (self, _tmp36_);
+				autosave_manager_on_page_added (self, _tmp34_);
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 				_page_unref0 (page);
-#line 2440 "autosave-manager.c"
+#line 2405 "autosave-manager.c"
 			}
 		}
 	}
@@ -2447,7 +2412,7 @@ void autosave_manager_set_book (AutosaveManager* self, Book* value) {
 static void value_autosave_manager_init (GValue* value) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	value->data[0].v_pointer = NULL;
-#line 2450 "autosave-manager.c"
+#line 2415 "autosave-manager.c"
 }
 
 
@@ -2456,7 +2421,7 @@ static void value_autosave_manager_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (value->data[0].v_pointer);
-#line 2459 "autosave-manager.c"
+#line 2424 "autosave-manager.c"
 	}
 }
 
@@ -2466,11 +2431,11 @@ static void value_autosave_manager_copy_value (const GValue* src_value, GValue*
 	if (src_value->data[0].v_pointer) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = autosave_manager_ref (src_value->data[0].v_pointer);
-#line 2469 "autosave-manager.c"
+#line 2434 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2473 "autosave-manager.c"
+#line 2438 "autosave-manager.c"
 	}
 }
 
@@ -2478,37 +2443,37 @@ static void value_autosave_manager_copy_value (const GValue* src_value, GValue*
 static gpointer value_autosave_manager_peek_pointer (const GValue* value) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
-#line 2481 "autosave-manager.c"
+#line 2446 "autosave-manager.c"
 }
 
 
 static gchar* value_autosave_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (collect_values[0].v_pointer) {
-#line 2488 "autosave-manager.c"
+#line 2453 "autosave-manager.c"
 		AutosaveManager* object;
 		object = collect_values[0].v_pointer;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2495 "autosave-manager.c"
+#line 2460 "autosave-manager.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2499 "autosave-manager.c"
+#line 2464 "autosave-manager.c"
 		}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = autosave_manager_ref (object);
-#line 2503 "autosave-manager.c"
+#line 2468 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 2507 "autosave-manager.c"
+#line 2472 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 2511 "autosave-manager.c"
+#line 2476 "autosave-manager.c"
 }
 
 
@@ -2519,25 +2484,25 @@ static gchar* value_autosave_manager_lcopy_value (const GValue* value, guint n_c
 	if (!object_p) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2522 "autosave-manager.c"
+#line 2487 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (!value->data[0].v_pointer) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = NULL;
-#line 2528 "autosave-manager.c"
+#line 2493 "autosave-manager.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2532 "autosave-manager.c"
+#line 2497 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		*object_p = autosave_manager_ref (value->data[0].v_pointer);
-#line 2536 "autosave-manager.c"
+#line 2501 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return NULL;
-#line 2540 "autosave-manager.c"
+#line 2505 "autosave-manager.c"
 }
 
 
@@ -2551,7 +2516,7 @@ GParamSpec* param_spec_autosave_manager (const gchar* name, const gchar* nick, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return G_PARAM_SPEC (spec);
-#line 2554 "autosave-manager.c"
+#line 2519 "autosave-manager.c"
 }
 
 
@@ -2560,7 +2525,7 @@ gpointer value_get_autosave_manager (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_AUTOSAVE_MANAGER), NULL);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return value->data[0].v_pointer;
-#line 2563 "autosave-manager.c"
+#line 2528 "autosave-manager.c"
 }
 
 
@@ -2580,17 +2545,17 @@ void value_set_autosave_manager (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_ref (value->data[0].v_pointer);
-#line 2583 "autosave-manager.c"
+#line 2548 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 2587 "autosave-manager.c"
+#line 2552 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
-#line 2593 "autosave-manager.c"
+#line 2558 "autosave-manager.c"
 	}
 }
 
@@ -2609,17 +2574,17 @@ void value_take_autosave_manager (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = v_object;
-#line 2612 "autosave-manager.c"
+#line 2577 "autosave-manager.c"
 	} else {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		value->data[0].v_pointer = NULL;
-#line 2616 "autosave-manager.c"
+#line 2581 "autosave-manager.c"
 	}
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	if (old) {
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		autosave_manager_unref (old);
-#line 2622 "autosave-manager.c"
+#line 2587 "autosave-manager.c"
 	}
 }
 
@@ -2655,7 +2620,7 @@ static void autosave_manager_class_init (AutosaveManagerClass * klass) {
 	_tmp5_ = g_build_filename (_tmp3_, _tmp4_, NULL);
 #line 17 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	autosave_manager_AUTOSAVE_PATH = _tmp5_;
-#line 2658 "autosave-manager.c"
+#line 2623 "autosave-manager.c"
 }
 
 
@@ -2668,7 +2633,7 @@ static void autosave_manager_instance_init (AutosaveManager * self) {
 	self->priv->book_ = NULL;
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	self->ref_count = 1;
-#line 2671 "autosave-manager.c"
+#line 2636 "autosave-manager.c"
 }
 
 
@@ -2680,7 +2645,7 @@ static void autosave_manager_finalize (AutosaveManager* obj) {
 	_g_hash_table_unref0 (self->priv->page_filenames);
 #line 23 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	_book_unref0 (self->priv->book_);
-#line 2683 "autosave-manager.c"
+#line 2648 "autosave-manager.c"
 }
 
 
@@ -2705,7 +2670,7 @@ gpointer autosave_manager_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 	return instance;
-#line 2708 "autosave-manager.c"
+#line 2673 "autosave-manager.c"
 }
 
 
@@ -2718,7 +2683,7 @@ void autosave_manager_unref (gpointer instance) {
 		AUTOSAVE_MANAGER_GET_CLASS (self)->finalize (self);
 #line 13 "/home/bob/bzr/simple-scan/trunk/src/autosave-manager.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2721 "autosave-manager.c"
+#line 2686 "autosave-manager.c"
 	}
 }
 
diff --git a/src/autosave-manager.vala b/src/autosave-manager.vala
index a9d3bf4..9ea79f1 100644
--- a/src/autosave-manager.vala
+++ b/src/autosave-manager.vala
@@ -73,7 +73,8 @@ public class AutosaveManager
         }
         catch (Error e)
         {
-            warning ("Could not load autosave infomation; not restoring any autosaves");
+            if (!(e is FileError.NOENT))
+                warning ("Could not load autosave infomation; not restoring any autosaves: %s", e.message);
             return;
         }
         var pages = get_value (file, "simple-scan", "pages");
diff --git a/src/book-view.c b/src/book-view.c
index d6cfdc9..4ae0fd2 100644
--- a/src/book-view.c
+++ b/src/book-view.c
@@ -1,4 +1,4 @@
-/* book-view.c generated by valac 0.22.1, the Vala compiler
+/* book-view.c generated by valac 0.24.0, the Vala compiler
  * generated from book-view.vala, do not modify */
 
 /*
@@ -180,8 +180,8 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 gint page_get_dpi (Page* self);
 gint page_get_width (Page* self);
 gint page_get_height (Page* self);
-void page_view_set_width (PageView* self, gint width);
-void page_view_set_height (PageView* self, gint height);
+void page_view_set_width (PageView* self, gint value);
+void page_view_set_height (PageView* self, gint value);
 gint page_view_get_height (PageView* self);
 void page_view_set_x_offset (PageView* self, gint value);
 void page_view_set_y_offset (PageView* self, gint value);
@@ -205,35 +205,35 @@ static void _vala_book_view_set_property (GObject * object, guint property_id, c
 
 static void _book_view_add_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
 #line 123 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_add_cb (self, _sender, page);
+	book_view_add_cb ((BookView*) self, _sender, page);
 #line 210 "book-view.c"
 }
 
 
 static void _book_view_remove_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_remove_cb (self, _sender, page);
+	book_view_remove_cb ((BookView*) self, _sender, page);
 #line 217 "book-view.c"
 }
 
 
 static void _book_view_reorder_cb_book_reordered (Book* _sender, gpointer self) {
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_reorder_cb (self, _sender);
+	book_view_reorder_cb ((BookView*) self, _sender);
 #line 224 "book-view.c"
 }
 
 
 static void _book_view_clear_cb_book_cleared (Book* _sender, gpointer self) {
 #line 126 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_clear_cb (self, _sender);
+	book_view_clear_cb ((BookView*) self, _sender);
 #line 231 "book-view.c"
 }
 
 
 static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) {
 	gboolean result;
-	result = book_view_configure_cb (self, _sender, event);
+	result = book_view_configure_cb ((BookView*) self, _sender, event);
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 240 "book-view.c"
@@ -242,7 +242,7 @@ static gboolean _book_view_configure_cb_gtk_widget_configure_event (GtkWidget* _
 
 static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t* cr, gpointer self) {
 	gboolean result;
-	result = book_view_draw_cb (self, _sender, cr);
+	result = book_view_draw_cb ((BookView*) self, _sender, cr);
 #line 128 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 249 "book-view.c"
@@ -251,7 +251,7 @@ static gboolean _book_view_draw_cb_gtk_widget_draw (GtkWidget* _sender, cairo_t*
 
 static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
 	gboolean result;
-	result = book_view_motion_cb (self, _sender, event);
+	result = book_view_motion_cb ((BookView*) self, _sender, event);
 #line 129 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 258 "book-view.c"
@@ -260,7 +260,7 @@ static gboolean _book_view_motion_cb_gtk_widget_motion_notify_event (GtkWidget*
 
 static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
-	result = book_view_key_cb (self, _sender, event);
+	result = book_view_key_cb ((BookView*) self, _sender, event);
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 267 "book-view.c"
@@ -269,7 +269,7 @@ static gboolean _book_view_key_cb_gtk_widget_key_press_event (GtkWidget* _sender
 
 static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
-	result = book_view_button_cb (self, _sender, event);
+	result = book_view_button_cb ((BookView*) self, _sender, event);
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 276 "book-view.c"
@@ -278,7 +278,7 @@ static gboolean _book_view_button_cb_gtk_widget_button_press_event (GtkWidget* _
 
 static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
-	result = book_view_button_cb (self, _sender, event);
+	result = book_view_button_cb ((BookView*) self, _sender, event);
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 285 "book-view.c"
@@ -287,7 +287,7 @@ static gboolean _book_view_button_cb_gtk_widget_button_release_event (GtkWidget*
 
 static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
-	result = book_view_focus_cb (self, _sender, event);
+	result = book_view_focus_cb ((BookView*) self, _sender, event);
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 294 "book-view.c"
@@ -296,7 +296,7 @@ static gboolean _book_view_focus_cb_gtk_widget_focus_in_event (GtkWidget* _sende
 
 static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
-	result = book_view_focus_cb (self, _sender, event);
+	result = book_view_focus_cb ((BookView*) self, _sender, event);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
 #line 303 "book-view.c"
@@ -305,7 +305,7 @@ static gboolean _book_view_focus_cb_gtk_widget_focus_out_event (GtkWidget* _send
 
 static void _book_view_scroll_cb_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_scroll_cb (self, _sender);
+	book_view_scroll_cb ((BookView*) self, _sender);
 #line 310 "book-view.c"
 }
 
@@ -334,23 +334,24 @@ static gpointer _g_object_ref0 (gpointer self) {
 BookView* book_view_construct (GType object_type, Book* book) {
 	BookView * self = NULL;
 	Book* _tmp0_ = NULL;
-	Book* _tmp13_ = NULL;
+	Book* _tmp12_ = NULL;
+	Page* _tmp13_ = NULL;
 	Page* _tmp14_ = NULL;
-	Page* _tmp15_ = NULL;
+	Book* _tmp15_ = NULL;
 	Book* _tmp16_ = NULL;
 	Book* _tmp17_ = NULL;
 	Book* _tmp18_ = NULL;
-	Book* _tmp19_ = NULL;
-	GHashFunc _tmp20_ = NULL;
-	GEqualFunc _tmp21_ = NULL;
-	GHashTable* _tmp22_ = NULL;
-	GtkDrawingArea* _tmp23_ = NULL;
+	GHashFunc _tmp19_ = NULL;
+	GEqualFunc _tmp20_ = NULL;
+	GHashTable* _tmp21_ = NULL;
+	GtkDrawingArea* _tmp22_ = NULL;
+	GtkWidget* _tmp23_ = NULL;
 	GtkWidget* _tmp24_ = NULL;
 	GtkWidget* _tmp25_ = NULL;
 	GtkWidget* _tmp26_ = NULL;
-	GtkWidget* _tmp27_ = NULL;
+	GtkScrollbar* _tmp27_ = NULL;
 	GtkScrollbar* _tmp28_ = NULL;
-	GtkScrollbar* _tmp29_ = NULL;
+	GtkAdjustment* _tmp29_ = NULL;
 	GtkAdjustment* _tmp30_ = NULL;
 	GtkAdjustment* _tmp31_ = NULL;
 	GtkScrollbar* _tmp32_ = NULL;
@@ -372,154 +373,153 @@ BookView* book_view_construct (GType object_type, Book* book) {
 	_tmp0_ = book;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_set_book (self, _tmp0_);
-#line 376 "book-view.c"
+#line 377 "book-view.c"
 	{
 		gint i = 0;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 381 "book-view.c"
+#line 382 "book-view.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp1_ = TRUE;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 388 "book-view.c"
-				gboolean _tmp2_ = FALSE;
-				gint _tmp4_ = 0;
-				Book* _tmp5_ = NULL;
+#line 389 "book-view.c"
+				gint _tmp3_ = 0;
+				Book* _tmp4_ = NULL;
+				guint _tmp5_ = 0U;
 				guint _tmp6_ = 0U;
-				guint _tmp7_ = 0U;
 				Page* page = NULL;
-				Book* _tmp8_ = NULL;
-				gint _tmp9_ = 0;
-				Page* _tmp10_ = NULL;
-				Book* _tmp11_ = NULL;
-				Page* _tmp12_ = NULL;
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp2_ = _tmp1_;
+				Book* _tmp7_ = NULL;
+				gint _tmp8_ = 0;
+				Page* _tmp9_ = NULL;
+				Book* _tmp10_ = NULL;
+				Page* _tmp11_ = NULL;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp2_) {
-#line 404 "book-view.c"
-					gint _tmp3_ = 0;
+				if (!_tmp1_) {
+#line 402 "book-view.c"
+					gint _tmp2_ = 0;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp3_ = i;
+					_tmp2_ = i;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp3_ + 1;
-#line 410 "book-view.c"
+					i = _tmp2_ + 1;
+#line 408 "book-view.c"
 				}
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = FALSE;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = i;
+				_tmp3_ = i;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = book;
+				_tmp4_ = book;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = book_get_n_pages (_tmp5_);
+				_tmp5_ = book_get_n_pages (_tmp4_);
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = _tmp6_;
+				_tmp6_ = _tmp5_;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp4_) < _tmp7_)) {
+				if (!(((guint) _tmp3_) < _tmp6_)) {
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 426 "book-view.c"
+#line 424 "book-view.c"
 				}
 #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = book;
+				_tmp7_ = book;
 #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = i;
+				_tmp8_ = i;
 #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = book_get_page (_tmp8_, _tmp9_);
+				_tmp9_ = book_get_page (_tmp7_, _tmp8_);
 #line 82 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp10_;
+				page = _tmp9_;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = book;
+				_tmp10_ = book;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = page;
+				_tmp11_ = page;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				book_view_add_cb (self, _tmp11_, _tmp12_);
+				book_view_add_cb (self, _tmp10_, _tmp11_);
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
-#line 444 "book-view.c"
+#line 442 "book-view.c"
 			}
 		}
 	}
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = book;
+	_tmp12_ = book;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = book_get_page (_tmp13_, 0);
+	_tmp13_ = book_get_page (_tmp12_, 0);
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_selected_page (self, _tmp15_);
+	book_view_set_selected_page (self, _tmp14_);
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_page_unref0 (_tmp15_);
+	_page_unref0 (_tmp14_);
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp16_ = book;
+	_tmp15_ = book;
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp16_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0);
+	g_signal_connect_object (_tmp15_, "page-added", (GCallback) _book_view_add_cb_book_page_added, self, 0);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp17_ = book;
+	_tmp16_ = book;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp17_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0);
+	g_signal_connect_object (_tmp16_, "page-removed", (GCallback) _book_view_remove_cb_book_page_removed, self, 0);
 #line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = book;
+	_tmp17_ = book;
 #line 91 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp18_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0);
+	g_signal_connect_object (_tmp17_, "reordered", (GCallback) _book_view_reorder_cb_book_reordered, self, 0);
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = book;
+	_tmp18_ = book;
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_signal_connect_object (_tmp19_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0);
+	g_signal_connect_object (_tmp18_, "cleared", (GCallback) _book_view_clear_cb_book_cleared, self, 0);
 #line 94 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = TRUE;
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp20_ = g_direct_hash;
+	_tmp19_ = g_direct_hash;
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp21_ = g_direct_equal;
+	_tmp20_ = g_direct_equal;
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp22_ = g_hash_table_new_full (_tmp20_, _tmp21_, _page_unref0_, _page_view_unref0_);
+	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _page_unref0_, _page_view_unref0_);
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_hash_table_unref0 (self->priv->page_data);
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->page_data = _tmp22_;
+	self->priv->page_data = _tmp21_;
 #line 96 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->cursor = GDK_ARROW;
 #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp23_ = (GtkDrawingArea*) gtk_drawing_area_new ();
+	_tmp22_ = (GtkDrawingArea*) gtk_drawing_area_new ();
 #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_ref_sink (_tmp23_);
+	g_object_ref_sink (_tmp22_);
 #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->drawing_area);
 #line 98 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->drawing_area = (GtkWidget*) _tmp23_;
+	self->priv->drawing_area = (GtkWidget*) _tmp22_;
 #line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp24_ = self->priv->drawing_area;
+	_tmp23_ = self->priv->drawing_area;
 #line 99 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_set_size_request (_tmp24_, 200, 100);
+	gtk_widget_set_size_request (_tmp23_, 200, 100);
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp25_ = self->priv->drawing_area;
+	_tmp24_ = self->priv->drawing_area;
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_set_can_focus (_tmp25_, TRUE);
+	g_object_set (_tmp24_, "can-focus", TRUE, NULL);
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp26_ = self->priv->drawing_area;
+	_tmp25_ = self->priv->drawing_area;
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_set_events (_tmp26_, (gint) (((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK));
+	gtk_widget_set_events (_tmp25_, ((((GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK) | GDK_BUTTON_RELEASE_MASK) | GDK_FOCUS_CHANGE_MASK) | GDK_STRUCTURE_MASK) | GDK_SCROLL_MASK);
 #line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp27_ = self->priv->drawing_area;
+	_tmp26_ = self->priv->drawing_area;
 #line 102 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_box_pack_start ((GtkBox*) self, _tmp27_, TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start ((GtkBox*) self, _tmp26_, TRUE, TRUE, (guint) 0);
 #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp28_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
+	_tmp27_ = (GtkScrollbar*) gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
 #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_ref_sink (_tmp28_);
+	g_object_ref_sink (_tmp27_);
 #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (self->priv->scroll);
 #line 104 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->scroll = _tmp28_;
+	self->priv->scroll = _tmp27_;
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp29_ = self->priv->scroll;
+	_tmp28_ = self->priv->scroll;
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp30_ = gtk_range_get_adjustment ((GtkRange*) _tmp29_);
+	_tmp29_ = gtk_range_get_adjustment ((GtkRange*) _tmp28_);
+#line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp30_ = _tmp29_;
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp31_ = _g_object_ref0 (_tmp30_);
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -569,7 +569,7 @@ BookView* book_view_construct (GType object_type, Book* book) {
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp42_ = self->priv->drawing_area;
 #line 118 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_show (_tmp42_);
+	gtk_widget_set_visible (_tmp42_, TRUE);
 #line 74 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self;
 #line 576 "book-view.c"
@@ -627,8 +627,8 @@ static PageView* book_view_get_nth_page (BookView* self, gint n) {
 
 static PageView* book_view_get_next_page (BookView* self, PageView* page) {
 	PageView* result = NULL;
+	PageView* _tmp18_ = NULL;
 	PageView* _tmp19_ = NULL;
-	PageView* _tmp20_ = NULL;
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -646,114 +646,111 @@ static PageView* book_view_get_next_page (BookView* self, PageView* page) {
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
 #line 649 "book-view.c"
-				gboolean _tmp1_ = FALSE;
 				Page* p = NULL;
-				Book* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
+				Book* _tmp2_ = NULL;
+				gint _tmp3_ = 0;
+				Page* _tmp4_ = NULL;
 				Page* _tmp5_ = NULL;
 				Page* _tmp6_ = NULL;
-				Page* _tmp7_ = NULL;
-				PageView* _tmp8_ = NULL;
+				PageView* _tmp7_ = NULL;
+				Page* _tmp8_ = NULL;
 				Page* _tmp9_ = NULL;
-				Page* _tmp10_ = NULL;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp1_ = _tmp0_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp1_) {
-#line 664 "book-view.c"
-					gint _tmp2_ = 0;
+				if (!_tmp0_) {
+#line 661 "book-view.c"
+					gint _tmp1_ = 0;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp2_ = i;
+					_tmp1_ = i;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp2_ + 1;
-#line 670 "book-view.c"
+					i = _tmp1_ + 1;
+#line 667 "book-view.c"
 				}
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = self->priv->_book;
+				_tmp2_ = self->priv->_book;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = i;
+				_tmp3_ = i;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = book_get_page (_tmp3_, _tmp4_);
+				_tmp4_ = book_get_page (_tmp2_, _tmp3_);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				p = _tmp5_;
+				p = _tmp4_;
 #line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = p;
+				_tmp5_ = p;
 #line 149 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp6_ == NULL) {
+				if (_tmp5_ == NULL) {
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 690 "book-view.c"
+#line 687 "book-view.c"
 				}
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = p;
+				_tmp6_ = p;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = page;
+				_tmp7_ = page;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = page_view_get_page (_tmp8_);
+				_tmp8_ = page_view_get_page (_tmp7_);
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = _tmp9_;
+				_tmp9_ = _tmp8_;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp7_ == _tmp10_) {
-#line 702 "book-view.c"
-					Book* _tmp11_ = NULL;
-					gint _tmp12_ = 0;
+				if (_tmp6_ == _tmp9_) {
+#line 699 "book-view.c"
+					Book* _tmp10_ = NULL;
+					gint _tmp11_ = 0;
+					Page* _tmp12_ = NULL;
 					Page* _tmp13_ = NULL;
-					Page* _tmp14_ = NULL;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp11_ = self->priv->_book;
+					_tmp10_ = self->priv->_book;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp12_ = i;
+					_tmp11_ = i;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp13_ = book_get_page (_tmp11_, _tmp12_ + 1);
+					_tmp12_ = book_get_page (_tmp10_, _tmp11_ + 1);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					p = _tmp13_;
+					p = _tmp12_;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp14_ = p;
+					_tmp13_ = p;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					if (_tmp14_ != NULL) {
-#line 721 "book-view.c"
-						GHashTable* _tmp15_ = NULL;
-						Page* _tmp16_ = NULL;
-						gconstpointer _tmp17_ = NULL;
-						PageView* _tmp18_ = NULL;
+					if (_tmp13_ != NULL) {
+#line 718 "book-view.c"
+						GHashTable* _tmp14_ = NULL;
+						Page* _tmp15_ = NULL;
+						gconstpointer _tmp16_ = NULL;
+						PageView* _tmp17_ = NULL;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp15_ = self->priv->page_data;
+						_tmp14_ = self->priv->page_data;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp16_ = p;
+						_tmp15_ = p;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp17_ = g_hash_table_lookup (_tmp15_, _tmp16_);
+						_tmp16_ = g_hash_table_lookup (_tmp14_, _tmp15_);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						_tmp18_ = _page_view_ref0 ((PageView*) _tmp17_);
+						_tmp17_ = _page_view_ref0 ((PageView*) _tmp16_);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-						result = _tmp18_;
+						result = _tmp17_;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						_page_unref0 (p);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						return result;
-#line 740 "book-view.c"
+#line 737 "book-view.c"
 					}
 				}
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
-#line 745 "book-view.c"
+#line 742 "book-view.c"
 			}
 		}
 	}
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp19_ = page;
+	_tmp18_ = page;
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp20_ = _page_view_ref0 (_tmp19_);
+	_tmp19_ = _page_view_ref0 (_tmp18_);
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp20_;
+	result = _tmp19_;
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 757 "book-view.c"
+#line 754 "book-view.c"
 }
 
 
@@ -762,8 +759,8 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
 	PageView* prev_page = NULL;
 	PageView* _tmp0_ = NULL;
 	PageView* _tmp1_ = NULL;
+	PageView* _tmp16_ = NULL;
 	PageView* _tmp17_ = NULL;
-	PageView* _tmp18_ = NULL;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, NULL);
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -774,112 +771,109 @@ static PageView* book_view_get_prev_page (BookView* self, PageView* page) {
 	_tmp1_ = _page_view_ref0 (_tmp0_);
 #line 164 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	prev_page = _tmp1_;
-#line 778 "book-view.c"
+#line 775 "book-view.c"
 	{
 		gint i = 0;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 783 "book-view.c"
+#line 780 "book-view.c"
 		{
 			gboolean _tmp2_ = FALSE;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp2_ = TRUE;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 790 "book-view.c"
-				gboolean _tmp3_ = FALSE;
+#line 787 "book-view.c"
 				Page* p = NULL;
-				Book* _tmp5_ = NULL;
-				gint _tmp6_ = 0;
+				Book* _tmp4_ = NULL;
+				gint _tmp5_ = 0;
+				Page* _tmp6_ = NULL;
 				Page* _tmp7_ = NULL;
 				Page* _tmp8_ = NULL;
-				Page* _tmp9_ = NULL;
-				PageView* _tmp10_ = NULL;
+				PageView* _tmp9_ = NULL;
+				Page* _tmp10_ = NULL;
 				Page* _tmp11_ = NULL;
-				Page* _tmp12_ = NULL;
-				GHashTable* _tmp13_ = NULL;
-				Page* _tmp14_ = NULL;
-				gconstpointer _tmp15_ = NULL;
-				PageView* _tmp16_ = NULL;
+				GHashTable* _tmp12_ = NULL;
+				Page* _tmp13_ = NULL;
+				gconstpointer _tmp14_ = NULL;
+				PageView* _tmp15_ = NULL;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = _tmp2_;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp3_) {
-#line 809 "book-view.c"
-					gint _tmp4_ = 0;
+				if (!_tmp2_) {
+#line 803 "book-view.c"
+					gint _tmp3_ = 0;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp4_ = i;
+					_tmp3_ = i;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp4_ + 1;
-#line 815 "book-view.c"
+					i = _tmp3_ + 1;
+#line 809 "book-view.c"
 				}
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp2_ = FALSE;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = self->priv->_book;
+				_tmp4_ = self->priv->_book;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = i;
+				_tmp5_ = i;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = book_get_page (_tmp5_, _tmp6_);
+				_tmp6_ = book_get_page (_tmp4_, _tmp5_);
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				p = _tmp7_;
+				p = _tmp6_;
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = p;
+				_tmp7_ = p;
 #line 168 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp8_ == NULL) {
+				if (_tmp7_ == NULL) {
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 835 "book-view.c"
+#line 829 "book-view.c"
 				}
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = p;
+				_tmp8_ = p;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page;
+				_tmp9_ = page;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = page_view_get_page (_tmp10_);
+				_tmp10_ = page_view_get_page (_tmp9_);
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = _tmp11_;
+				_tmp11_ = _tmp10_;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp9_ == _tmp12_) {
+				if (_tmp8_ == _tmp11_) {
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = prev_page;
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_unref0 (p);
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
-#line 853 "book-view.c"
+#line 847 "book-view.c"
 				}
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = self->priv->page_data;
+				_tmp12_ = self->priv->page_data;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = p;
+				_tmp13_ = p;
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = g_hash_table_lookup (_tmp13_, _tmp14_);
+				_tmp14_ = g_hash_table_lookup (_tmp12_, _tmp13_);
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = _page_view_ref0 ((PageView*) _tmp15_);
+				_tmp15_ = _page_view_ref0 ((PageView*) _tmp14_);
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (prev_page);
 #line 172 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				prev_page = _tmp16_;
+				prev_page = _tmp15_;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
-#line 869 "book-view.c"
+#line 863 "book-view.c"
 			}
 		}
 	}
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp17_ = page;
+	_tmp16_ = page;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp18_ = _page_view_ref0 (_tmp17_);
+	_tmp17_ = _page_view_ref0 (_tmp16_);
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	result = _tmp18_;
+	result = _tmp17_;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (prev_page);
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 883 "book-view.c"
+#line 877 "book-view.c"
 }
 
 
@@ -890,7 +884,7 @@ static void book_view_page_view_changed_cb (BookView* self, PageView* page) {
 	g_return_if_fail (page != NULL);
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 894 "book-view.c"
+#line 888 "book-view.c"
 }
 
 
@@ -903,28 +897,28 @@ static void book_view_page_view_size_changed_cb (BookView* self, PageView* page)
 	self->priv->need_layout = TRUE;
 #line 186 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 907 "book-view.c"
+#line 901 "book-view.c"
 }
 
 
 static void _book_view_page_view_changed_cb_page_view_changed (PageView* _sender, gpointer self) {
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_page_view_changed_cb (self, _sender);
-#line 914 "book-view.c"
+	book_view_page_view_changed_cb ((BookView*) self, _sender);
+#line 908 "book-view.c"
 }
 
 
 static void _book_view_page_view_size_changed_cb_page_view_size_changed (PageView* _sender, gpointer self) {
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_page_view_size_changed_cb (self, _sender);
-#line 921 "book-view.c"
+	book_view_page_view_size_changed_cb ((BookView*) self, _sender);
+#line 915 "book-view.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
 #line 194 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? page_ref (self) : NULL;
-#line 928 "book-view.c"
+#line 922 "book-view.c"
 }
 
 
@@ -968,27 +962,26 @@ static void book_view_add_cb (BookView* self, Book* book, Page* page) {
 	book_view_redraw (self);
 #line 189 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (page_view);
-#line 972 "book-view.c"
+#line 966 "book-view.c"
 }
 
 
 static void book_view_set_selected_page_view (BookView* self, PageView* page) {
 	gboolean _tmp0_ = FALSE;
 	PageView* _tmp1_ = NULL;
-	gboolean _tmp4_ = FALSE;
+	PageView* _tmp5_ = NULL;
 	PageView* _tmp6_ = NULL;
 	PageView* _tmp7_ = NULL;
-	PageView* _tmp8_ = NULL;
-	GtkWidget* _tmp9_ = NULL;
+	GtkWidget* _tmp8_ = NULL;
+	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
 #line 199 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp1_ = self->priv->selected_page_view;
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
-#line 992 "book-view.c"
+#line 985 "book-view.c"
 		PageView* _tmp2_ = NULL;
 		PageView* _tmp3_ = NULL;
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -997,62 +990,60 @@ static void book_view_set_selected_page_view (BookView* self, PageView* page) {
 		_tmp3_ = self->priv->selected_page_view;
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
-#line 1001 "book-view.c"
+#line 994 "book-view.c"
 	} else {
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
-#line 1005 "book-view.c"
+#line 998 "book-view.c"
 	}
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = _tmp0_;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp4_) {
-#line 1011 "book-view.c"
-		PageView* _tmp5_ = NULL;
+	if (_tmp0_) {
+#line 1002 "book-view.c"
+		PageView* _tmp4_ = NULL;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = self->priv->selected_page_view;
+		_tmp4_ = self->priv->selected_page_view;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_set_selected (_tmp5_, TRUE);
-#line 1017 "book-view.c"
+		page_view_set_selected (_tmp4_, TRUE);
+#line 1008 "book-view.c"
 	}
 #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp6_ = page;
+	_tmp5_ = page;
 #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp7_ = _page_view_ref0 (_tmp6_);
+	_tmp6_ = _page_view_ref0 (_tmp5_);
 #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (self->priv->selected_page_view);
 #line 205 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	self->priv->selected_page_view = _tmp7_;
+	self->priv->selected_page_view = _tmp6_;
 #line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = self->priv->selected_page_view;
+	_tmp7_ = self->priv->selected_page_view;
 #line 206 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp8_ == NULL) {
+	if (_tmp7_ == NULL) {
 #line 207 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 1033 "book-view.c"
+#line 1024 "book-view.c"
 	}
 #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp9_ = self->priv->drawing_area;
+	_tmp8_ = self->priv->drawing_area;
 #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	g_object_get (_tmp9_, "has-focus", &_tmp10_, NULL);
+	g_object_get (_tmp8_, "has-focus", &_tmp9_, NULL);
 #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 210 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (!_tmp11_) {
-#line 1043 "book-view.c"
-		PageView* _tmp12_ = NULL;
+	if (!_tmp10_) {
+#line 1034 "book-view.c"
+		PageView* _tmp11_ = NULL;
 #line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp12_ = self->priv->selected_page_view;
+		_tmp11_ = self->priv->selected_page_view;
 #line 211 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_set_selected (_tmp12_, FALSE);
-#line 1049 "book-view.c"
+		page_view_set_selected (_tmp11_, FALSE);
+#line 1040 "book-view.c"
 	} else {
-		PageView* _tmp13_ = NULL;
+		PageView* _tmp12_ = NULL;
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp13_ = self->priv->selected_page_view;
+		_tmp12_ = self->priv->selected_page_view;
 #line 213 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_set_selected (_tmp13_, TRUE);
-#line 1056 "book-view.c"
+		page_view_set_selected (_tmp12_, TRUE);
+#line 1047 "book-view.c"
 	}
 }
 
@@ -1060,19 +1051,19 @@ static void book_view_set_selected_page_view (BookView* self, PageView* page) {
 static void book_view_show_page_view (BookView* self, PageView* page) {
 	gboolean _tmp0_ = FALSE;
 	PageView* _tmp1_ = NULL;
-	gboolean _tmp4_ = FALSE;
 	GtkAllocation allocation = {0};
-	GtkWidget* _tmp5_ = NULL;
-	GtkAllocation _tmp6_ = {0};
+	GtkWidget* _tmp4_ = NULL;
+	GtkAllocation _tmp5_ = {0};
 	gint left_edge = 0;
-	PageView* _tmp7_ = NULL;
+	PageView* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
 	gint right_edge = 0;
-	PageView* _tmp10_ = NULL;
+	PageView* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
 	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	PageView* _tmp13_ = NULL;
+	PageView* _tmp12_ = NULL;
+	gint _tmp13_ = 0;
 	gint _tmp14_ = 0;
 	gint _tmp15_ = 0;
 	gint _tmp16_ = 0;
@@ -1085,7 +1076,7 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 	if (_tmp1_ == NULL) {
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = TRUE;
-#line 1089 "book-view.c"
+#line 1080 "book-view.c"
 	} else {
 		GtkScrollbar* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -1095,42 +1086,42 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 		_tmp3_ = gtk_widget_get_visible ((GtkWidget*) _tmp2_);
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = !_tmp3_;
-#line 1099 "book-view.c"
+#line 1090 "book-view.c"
 	}
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = _tmp0_;
-#line 218 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp4_) {
+	if (_tmp0_) {
 #line 219 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 1107 "book-view.c"
+#line 1096 "book-view.c"
 	}
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp5_ = self->priv->drawing_area;
+	_tmp4_ = self->priv->drawing_area;
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	gtk_widget_get_allocation (_tmp5_, &_tmp6_);
+	gtk_widget_get_allocation (_tmp4_, &_tmp5_);
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	allocation = _tmp6_;
+	allocation = _tmp5_;
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp7_ = page;
+	_tmp6_ = page;
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp8_ = page_view_get_x_offset (_tmp7_);
+	_tmp7_ = page_view_get_x_offset (_tmp6_);
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	left_edge = _tmp9_;
+	left_edge = _tmp8_;
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp10_ = page;
+	_tmp9_ = page;
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp11_ = page_view_get_x_offset (_tmp10_);
+	_tmp10_ = page_view_get_x_offset (_tmp9_);
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+	_tmp11_ = _tmp10_;
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp12_ = _tmp11_;
+	_tmp12_ = page;
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp13_ = page;
+	_tmp13_ = page_view_get_width (_tmp12_);
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = page_view_get_width (_tmp13_);
+	_tmp14_ = _tmp13_;
 #line 224 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	right_edge = _tmp12_ + _tmp14_;
+	right_edge = _tmp11_ + _tmp14_;
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp15_ = left_edge;
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -1139,13 +1130,13 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 	_tmp17_ = _tmp16_;
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if ((_tmp15_ - _tmp17_) < 0) {
-#line 1143 "book-view.c"
+#line 1134 "book-view.c"
 		gint _tmp18_ = 0;
 #line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp18_ = left_edge;
 #line 227 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_set_x_offset (self, _tmp18_);
-#line 1149 "book-view.c"
+#line 1140 "book-view.c"
 	} else {
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
@@ -1164,7 +1155,7 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 		_tmp23_ = _tmp22_.width;
 #line 228 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if ((_tmp19_ - _tmp21_) > _tmp23_) {
-#line 1168 "book-view.c"
+#line 1159 "book-view.c"
 			gint _tmp24_ = 0;
 			GtkAllocation _tmp25_ = {0};
 			gint _tmp26_ = 0;
@@ -1176,7 +1167,7 @@ static void book_view_show_page_view (BookView* self, PageView* page) {
 			_tmp26_ = _tmp25_.width;
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			book_view_set_x_offset (self, _tmp24_ - _tmp26_);
-#line 1180 "book-view.c"
+#line 1171 "book-view.c"
 		}
 	}
 }
@@ -1204,7 +1195,7 @@ static void book_view_select_page_view (BookView* self, PageView* page) {
 		_page_unref0 (p);
 #line 237 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 1208 "book-view.c"
+#line 1199 "book-view.c"
 	}
 #line 239 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = page;
@@ -1216,20 +1207,20 @@ static void book_view_select_page_view (BookView* self, PageView* page) {
 	if (_tmp3_) {
 #line 242 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		self->priv->show_selected_page = TRUE;
-#line 1220 "book-view.c"
+#line 1211 "book-view.c"
 	} else {
 		PageView* _tmp4_ = NULL;
 #line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp4_ = page;
 #line 244 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_show_page_view (self, _tmp4_);
-#line 1227 "book-view.c"
+#line 1218 "book-view.c"
 	}
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp5_ = page;
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp5_ != NULL) {
-#line 1233 "book-view.c"
+#line 1224 "book-view.c"
 		PageView* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		Page* _tmp8_ = NULL;
@@ -1246,7 +1237,7 @@ static void book_view_select_page_view (BookView* self, PageView* page) {
 		_page_unref0 (p);
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		p = _tmp9_;
-#line 1250 "book-view.c"
+#line 1241 "book-view.c"
 	}
 #line 248 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = p;
@@ -1254,7 +1245,7 @@ static void book_view_select_page_view (BookView* self, PageView* page) {
 	g_signal_emit_by_name (self, "page-selected", _tmp10_);
 #line 232 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_unref0 (p);
-#line 1258 "book-view.c"
+#line 1249 "book-view.c"
 }
 
 
@@ -1295,7 +1286,7 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
 	_tmp4_ = _tmp3_;
 #line 256 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp2_ == _tmp4_) {
-#line 1299 "book-view.c"
+#line 1290 "book-view.c"
 		PageView* _tmp5_ = NULL;
 		PageView* _tmp6_ = NULL;
 		PageView* _tmp7_ = NULL;
@@ -1314,7 +1305,7 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
 		_tmp8_ = self->priv->selected_page_view;
 #line 259 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp7_ == _tmp8_) {
-#line 1318 "book-view.c"
+#line 1309 "book-view.c"
 			PageView* _tmp9_ = NULL;
 			PageView* _tmp10_ = NULL;
 #line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -1325,13 +1316,13 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
 			_page_view_unref0 (new_selection);
 #line 260 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			new_selection = _tmp10_;
-#line 1329 "book-view.c"
+#line 1320 "book-view.c"
 		}
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (self->priv->selected_page_view);
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		self->priv->selected_page_view = NULL;
-#line 1335 "book-view.c"
+#line 1326 "book-view.c"
 	}
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp11_ = self->priv->page_data;
@@ -1369,7 +1360,7 @@ static void book_view_remove_cb (BookView* self, Book* book, Page* page) {
 	_page_view_unref0 (page_view);
 #line 251 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (new_selection);
-#line 1373 "book-view.c"
+#line 1364 "book-view.c"
 }
 
 
@@ -1382,7 +1373,7 @@ static void book_view_reorder_cb (BookView* self, Book* book) {
 	self->priv->need_layout = TRUE;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 1386 "book-view.c"
+#line 1377 "book-view.c"
 }
 
 
@@ -1406,7 +1397,7 @@ static void book_view_clear_cb (BookView* self, Book* book) {
 	self->priv->need_layout = TRUE;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_redraw (self);
-#line 1410 "book-view.c"
+#line 1401 "book-view.c"
 }
 
 
@@ -1424,7 +1415,7 @@ static gboolean book_view_configure_cb (BookView* self, GtkWidget* widget, GdkEv
 	result = FALSE;
 #line 293 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 1428 "book-view.c"
+#line 1419 "book-view.c"
 }
 
 
@@ -1435,106 +1426,103 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 	gint max_width = 0;
 	gint max_height = 0;
 	gdouble aspect = 0.0;
+	gint _tmp47_ = 0;
+	gint _tmp48_ = 0;
+	gdouble max_aspect = 0.0;
 	gint _tmp49_ = 0;
 	gint _tmp50_ = 0;
-	gdouble max_aspect = 0.0;
-	gint _tmp51_ = 0;
-	gint _tmp52_ = 0;
 	gint spacing = 0;
 	gint x_offset = 0;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
 #line 299 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_dpi = 0;
-#line 1450 "book-view.c"
+#line 1441 "book-view.c"
 	{
 		gint i = 0;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 1455 "book-view.c"
+#line 1446 "book-view.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp0_ = TRUE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 1462 "book-view.c"
-				gboolean _tmp1_ = FALSE;
-				gint _tmp3_ = 0;
-				Book* _tmp4_ = NULL;
+#line 1453 "book-view.c"
+				gint _tmp2_ = 0;
+				Book* _tmp3_ = NULL;
+				guint _tmp4_ = 0U;
 				guint _tmp5_ = 0U;
-				guint _tmp6_ = 0U;
 				Page* page = NULL;
-				Book* _tmp7_ = NULL;
-				gint _tmp8_ = 0;
+				Book* _tmp6_ = NULL;
+				gint _tmp7_ = 0;
+				Page* _tmp8_ = NULL;
 				Page* _tmp9_ = NULL;
-				Page* _tmp10_ = NULL;
+				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp1_ = _tmp0_;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp1_) {
-#line 1480 "book-view.c"
-					gint _tmp2_ = 0;
+				if (!_tmp0_) {
+#line 1468 "book-view.c"
+					gint _tmp1_ = 0;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp2_ = i;
+					_tmp1_ = i;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp2_ + 1;
-#line 1486 "book-view.c"
+					i = _tmp1_ + 1;
+#line 1474 "book-view.c"
 				}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp0_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp3_ = i;
+				_tmp2_ = i;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = self->priv->_book;
+				_tmp3_ = self->priv->_book;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = book_get_n_pages (_tmp4_);
+				_tmp4_ = book_get_n_pages (_tmp3_);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = _tmp5_;
+				_tmp5_ = _tmp4_;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp3_) < _tmp6_)) {
+				if (!(((guint) _tmp2_) < _tmp5_)) {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 1502 "book-view.c"
+#line 1490 "book-view.c"
 				}
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = self->priv->_book;
+				_tmp6_ = self->priv->_book;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = i;
+				_tmp7_ = i;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = book_get_page (_tmp7_, _tmp8_);
+				_tmp8_ = book_get_page (_tmp6_, _tmp7_);
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp9_;
+				page = _tmp8_;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page;
+				_tmp9_ = page;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = page_get_dpi (_tmp10_);
+				_tmp10_ = page_get_dpi (_tmp9_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = _tmp11_;
+				_tmp11_ = _tmp10_;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = max_dpi;
+				_tmp12_ = max_dpi;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp12_ > _tmp13_) {
-#line 1522 "book-view.c"
-					Page* _tmp14_ = NULL;
+				if (_tmp11_ > _tmp12_) {
+#line 1510 "book-view.c"
+					Page* _tmp13_ = NULL;
+					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
-					gint _tmp16_ = 0;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp14_ = page;
+					_tmp13_ = page;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp15_ = page_get_dpi (_tmp14_);
+					_tmp14_ = page_get_dpi (_tmp13_);
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp16_ = _tmp15_;
+					_tmp15_ = _tmp14_;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_dpi = _tmp16_;
-#line 1534 "book-view.c"
+					max_dpi = _tmp15_;
+#line 1522 "book-view.c"
 				}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
-#line 1538 "book-view.c"
+#line 1526 "book-view.c"
 			}
 		}
 	}
@@ -1542,493 +1530,496 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 	max_width = 0;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	max_height = 0;
-#line 1546 "book-view.c"
+#line 1534 "book-view.c"
 	{
 		gint i = 0;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 1551 "book-view.c"
+#line 1539 "book-view.c"
 		{
-			gboolean _tmp17_ = FALSE;
+			gboolean _tmp16_ = FALSE;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp17_ = TRUE;
+			_tmp16_ = TRUE;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 1558 "book-view.c"
-				gboolean _tmp18_ = FALSE;
-				gint _tmp20_ = 0;
-				Book* _tmp21_ = NULL;
-				guint _tmp22_ = 0U;
-				guint _tmp23_ = 0U;
+#line 1546 "book-view.c"
+				gint _tmp18_ = 0;
+				Book* _tmp19_ = NULL;
+				guint _tmp20_ = 0U;
+				guint _tmp21_ = 0U;
 				Page* page = NULL;
-				Book* _tmp24_ = NULL;
-				gint _tmp25_ = 0;
-				Page* _tmp26_ = NULL;
+				Book* _tmp22_ = NULL;
+				gint _tmp23_ = 0;
+				Page* _tmp24_ = NULL;
 				gint w = 0;
-				Page* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
+				Page* _tmp25_ = NULL;
+				gint _tmp26_ = 0;
+				gint _tmp27_ = 0;
 				gint h = 0;
-				Page* _tmp30_ = NULL;
+				Page* _tmp28_ = NULL;
+				gint _tmp29_ = 0;
+				gint _tmp30_ = 0;
 				gint _tmp31_ = 0;
 				gint _tmp32_ = 0;
-				gint _tmp33_ = 0;
+				Page* _tmp33_ = NULL;
 				gint _tmp34_ = 0;
-				Page* _tmp35_ = NULL;
+				gint _tmp35_ = 0;
 				gint _tmp36_ = 0;
 				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
+				Page* _tmp38_ = NULL;
 				gint _tmp39_ = 0;
-				Page* _tmp40_ = NULL;
+				gint _tmp40_ = 0;
 				gint _tmp41_ = 0;
 				gint _tmp42_ = 0;
-				gint _tmp43_ = 0;
 				gint _tmp44_ = 0;
-				gint _tmp46_ = 0;
-				gint _tmp47_ = 0;
+				gint _tmp45_ = 0;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = _tmp17_;
+				if (!_tmp16_) {
+#line 1579 "book-view.c"
+					gint _tmp17_ = 0;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp18_) {
-#line 1594 "book-view.c"
-					gint _tmp19_ = 0;
+					_tmp17_ = i;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp19_ = i;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp19_ + 1;
-#line 1600 "book-view.c"
+					i = _tmp17_ + 1;
+#line 1585 "book-view.c"
 				}
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = FALSE;
+				_tmp16_ = FALSE;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp20_ = i;
+				_tmp18_ = i;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp21_ = self->priv->_book;
+				_tmp19_ = self->priv->_book;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = book_get_n_pages (_tmp21_);
+				_tmp20_ = book_get_n_pages (_tmp19_);
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = _tmp22_;
+				_tmp21_ = _tmp20_;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp20_) < _tmp23_)) {
+				if (!(((guint) _tmp18_) < _tmp21_)) {
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 1616 "book-view.c"
+#line 1601 "book-view.c"
 				}
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = self->priv->_book;
+				_tmp22_ = self->priv->_book;
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = i;
+				_tmp23_ = i;
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = book_get_page (_tmp24_, _tmp25_);
+				_tmp24_ = book_get_page (_tmp22_, _tmp23_);
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp26_;
+				page = _tmp24_;
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp27_ = page;
+				_tmp25_ = page;
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp28_ = page_get_width (_tmp27_);
+				_tmp26_ = page_get_width (_tmp25_);
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp29_ = _tmp28_;
+				_tmp27_ = _tmp26_;
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				w = _tmp29_;
+				w = _tmp27_;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp30_ = page;
+				_tmp28_ = page;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp31_ = page_get_height (_tmp30_);
+				_tmp29_ = page_get_height (_tmp28_);
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp32_ = _tmp31_;
+				_tmp30_ = _tmp29_;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = _tmp32_;
+				h = _tmp30_;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp33_ = w;
+				_tmp31_ = w;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp34_ = max_dpi;
+				_tmp32_ = max_dpi;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp35_ = page;
+				_tmp33_ = page;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp36_ = page_get_dpi (_tmp35_);
+				_tmp34_ = page_get_dpi (_tmp33_);
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp37_ = _tmp36_;
+				_tmp35_ = _tmp34_;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				w = (gint) (((((gdouble) _tmp33_) * _tmp34_) / _tmp37_) + 0.5);
+				w = (gint) (((((gdouble) _tmp31_) * _tmp32_) / _tmp35_) + 0.5);
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp38_ = h;
+				_tmp36_ = h;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp39_ = max_dpi;
+				_tmp37_ = max_dpi;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp40_ = page;
+				_tmp38_ = page;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp41_ = page_get_dpi (_tmp40_);
+				_tmp39_ = page_get_dpi (_tmp38_);
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp42_ = _tmp41_;
+				_tmp40_ = _tmp39_;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = (gint) (((((gdouble) _tmp38_) * _tmp39_) / _tmp42_) + 0.5);
+				h = (gint) (((((gdouble) _tmp36_) * _tmp37_) / _tmp40_) + 0.5);
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp43_ = w;
+				_tmp41_ = w;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp44_ = max_width;
+				_tmp42_ = max_width;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp43_ > _tmp44_) {
-#line 1672 "book-view.c"
-					gint _tmp45_ = 0;
+				if (_tmp41_ > _tmp42_) {
+#line 1657 "book-view.c"
+					gint _tmp43_ = 0;
 #line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp45_ = w;
+					_tmp43_ = w;
 #line 320 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_width = _tmp45_;
-#line 1678 "book-view.c"
+					max_width = _tmp43_;
+#line 1663 "book-view.c"
 				}
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp46_ = h;
+				_tmp44_ = h;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp47_ = max_height;
+				_tmp45_ = max_height;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp46_ > _tmp47_) {
-#line 1686 "book-view.c"
-					gint _tmp48_ = 0;
+				if (_tmp44_ > _tmp45_) {
+#line 1671 "book-view.c"
+					gint _tmp46_ = 0;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp48_ = h;
+					_tmp46_ = h;
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					max_height = _tmp48_;
-#line 1692 "book-view.c"
+					max_height = _tmp46_;
+#line 1677 "book-view.c"
 				}
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (page);
-#line 1696 "book-view.c"
+#line 1681 "book-view.c"
 			}
 		}
 	}
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp49_ = width;
+	_tmp47_ = width;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp50_ = height;
+	_tmp48_ = height;
 #line 325 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	aspect = ((gdouble) _tmp49_) / _tmp50_;
+	aspect = ((gdouble) _tmp47_) / _tmp48_;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp51_ = max_width;
+	_tmp49_ = max_width;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp52_ = max_height;
+	_tmp50_ = max_height;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	max_aspect = ((gdouble) _tmp51_) / _tmp52_;
+	max_aspect = ((gdouble) _tmp49_) / _tmp50_;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	spacing = 12;
 #line 330 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_book_width = 0;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_book_height = 0;
-#line 1718 "book-view.c"
+#line 1703 "book-view.c"
 	{
 		gint i = 0;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 1723 "book-view.c"
+#line 1708 "book-view.c"
 		{
-			gboolean _tmp53_ = FALSE;
+			gboolean _tmp51_ = FALSE;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp53_ = TRUE;
+			_tmp51_ = TRUE;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 1730 "book-view.c"
-				gboolean _tmp54_ = FALSE;
-				gint _tmp56_ = 0;
-				Book* _tmp57_ = NULL;
-				guint _tmp58_ = 0U;
-				guint _tmp59_ = 0U;
+#line 1715 "book-view.c"
+				gint _tmp53_ = 0;
+				Book* _tmp54_ = NULL;
+				guint _tmp55_ = 0U;
+				guint _tmp56_ = 0U;
 				PageView* page = NULL;
-				gint _tmp60_ = 0;
-				PageView* _tmp61_ = NULL;
+				gint _tmp57_ = 0;
+				PageView* _tmp58_ = NULL;
 				Page* p = NULL;
-				PageView* _tmp62_ = NULL;
-				Page* _tmp63_ = NULL;
-				Page* _tmp64_ = NULL;
-				Page* _tmp65_ = NULL;
-				gdouble _tmp66_ = 0.0;
-				gdouble _tmp67_ = 0.0;
+				PageView* _tmp59_ = NULL;
+				Page* _tmp60_ = NULL;
+				Page* _tmp61_ = NULL;
+				Page* _tmp62_ = NULL;
+				gdouble _tmp63_ = 0.0;
+				gdouble _tmp64_ = 0.0;
 				gint h = 0;
-				PageView* _tmp90_ = NULL;
+				PageView* _tmp87_ = NULL;
+				gint _tmp88_ = 0;
+				gint _tmp89_ = 0;
+				gint _tmp90_ = 0;
 				gint _tmp91_ = 0;
-				gint _tmp92_ = 0;
 				gint _tmp93_ = 0;
+				PageView* _tmp94_ = NULL;
 				gint _tmp95_ = 0;
-				PageView* _tmp96_ = NULL;
+				gint _tmp96_ = 0;
 				gint _tmp97_ = 0;
-				gint _tmp98_ = 0;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp54_ = _tmp53_;
-#line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp54_) {
-#line 1759 "book-view.c"
-					gint _tmp55_ = 0;
+				if (!_tmp51_) {
+#line 1743 "book-view.c"
+					gint _tmp52_ = 0;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp55_ = i;
+					_tmp52_ = i;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp55_ + 1;
-#line 1765 "book-view.c"
+					i = _tmp52_ + 1;
+#line 1749 "book-view.c"
 				}
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp53_ = FALSE;
+				_tmp51_ = FALSE;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp56_ = i;
+				_tmp53_ = i;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp57_ = self->priv->_book;
+				_tmp54_ = self->priv->_book;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp58_ = book_get_n_pages (_tmp57_);
+				_tmp55_ = book_get_n_pages (_tmp54_);
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp59_ = _tmp58_;
+				_tmp56_ = _tmp55_;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp56_) < _tmp59_)) {
+				if (!(((guint) _tmp53_) < _tmp56_)) {
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 1781 "book-view.c"
+#line 1765 "book-view.c"
 				}
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp60_ = i;
+				_tmp57_ = i;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp61_ = book_view_get_nth_page (self, _tmp60_);
+				_tmp58_ = book_view_get_nth_page (self, _tmp57_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp61_;
+				page = _tmp58_;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp62_ = page;
+				_tmp59_ = page;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp63_ = page_view_get_page (_tmp62_);
+				_tmp60_ = page_view_get_page (_tmp59_);
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp64_ = _tmp63_;
+				_tmp61_ = _tmp60_;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp65_ = _page_ref0 (_tmp64_);
+				_tmp62_ = _page_ref0 (_tmp61_);
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				p = _tmp65_;
+				p = _tmp62_;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp66_ = max_aspect;
+				_tmp63_ = max_aspect;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp67_ = aspect;
+				_tmp64_ = aspect;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp66_ > _tmp67_) {
-#line 1805 "book-view.c"
+				if (_tmp63_ > _tmp64_) {
+#line 1789 "book-view.c"
 					gint w = 0;
-					Page* _tmp68_ = NULL;
+					Page* _tmp65_ = NULL;
+					gint _tmp66_ = 0;
+					gint _tmp67_ = 0;
+					gint _tmp68_ = 0;
 					gint _tmp69_ = 0;
-					gint _tmp70_ = 0;
+					Page* _tmp70_ = NULL;
 					gint _tmp71_ = 0;
 					gint _tmp72_ = 0;
-					Page* _tmp73_ = NULL;
-					gint _tmp74_ = 0;
+					gint _tmp73_ = 0;
+					PageView* _tmp74_ = NULL;
 					gint _tmp75_ = 0;
-					gint _tmp76_ = 0;
-					PageView* _tmp77_ = NULL;
-					gint _tmp78_ = 0;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp68_ = p;
+					_tmp65_ = p;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp69_ = page_get_width (_tmp68_);
+					_tmp66_ = page_get_width (_tmp65_);
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp70_ = _tmp69_;
+					_tmp67_ = _tmp66_;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp71_ = max_dpi;
+					_tmp68_ = max_dpi;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp72_ = width;
+					_tmp69_ = width;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp73_ = p;
+					_tmp70_ = p;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp74_ = page_get_dpi (_tmp73_);
+					_tmp71_ = page_get_dpi (_tmp70_);
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp75_ = _tmp74_;
+					_tmp72_ = _tmp71_;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp76_ = max_width;
+					_tmp73_ = max_width;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					w = (gint) (((((gdouble) _tmp70_) * _tmp71_) * _tmp72_) / (_tmp75_ * _tmp76_));
+					w = (gint) (((((gdouble) _tmp67_) * _tmp68_) * _tmp69_) / (_tmp72_ * _tmp73_));
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp77_ = page;
+					_tmp74_ = page;
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp78_ = w;
+					_tmp75_ = w;
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					page_view_set_width (_tmp77_, _tmp78_);
-#line 1844 "book-view.c"
+					page_view_set_width (_tmp74_, _tmp75_);
+#line 1828 "book-view.c"
 				} else {
 					gint h = 0;
-					Page* _tmp79_ = NULL;
+					Page* _tmp76_ = NULL;
+					gint _tmp77_ = 0;
+					gint _tmp78_ = 0;
+					gint _tmp79_ = 0;
 					gint _tmp80_ = 0;
-					gint _tmp81_ = 0;
+					Page* _tmp81_ = NULL;
 					gint _tmp82_ = 0;
 					gint _tmp83_ = 0;
-					Page* _tmp84_ = NULL;
-					gint _tmp85_ = 0;
+					gint _tmp84_ = 0;
+					PageView* _tmp85_ = NULL;
 					gint _tmp86_ = 0;
-					gint _tmp87_ = 0;
-					PageView* _tmp88_ = NULL;
-					gint _tmp89_ = 0;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp79_ = p;
+					_tmp76_ = p;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp80_ = page_get_height (_tmp79_);
+					_tmp77_ = page_get_height (_tmp76_);
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp81_ = _tmp80_;
+					_tmp78_ = _tmp77_;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp82_ = max_dpi;
+					_tmp79_ = max_dpi;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp83_ = height;
+					_tmp80_ = height;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp84_ = p;
+					_tmp81_ = p;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp85_ = page_get_dpi (_tmp84_);
+					_tmp82_ = page_get_dpi (_tmp81_);
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp86_ = _tmp85_;
+					_tmp83_ = _tmp82_;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp87_ = max_height;
+					_tmp84_ = max_height;
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					h = (gint) (((((gdouble) _tmp81_) * _tmp82_) * _tmp83_) / (_tmp86_ * _tmp87_));
+					h = (gint) (((((gdouble) _tmp78_) * _tmp79_) * _tmp80_) / (_tmp83_ * _tmp84_));
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp88_ = page;
+					_tmp85_ = page;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp89_ = h;
+					_tmp86_ = h;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					page_view_set_height (_tmp88_, _tmp89_);
-#line 1884 "book-view.c"
+					page_view_set_height (_tmp85_, _tmp86_);
+#line 1868 "book-view.c"
 				}
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp90_ = page;
+				_tmp87_ = page;
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp91_ = page_view_get_height (_tmp90_);
+				_tmp88_ = page_view_get_height (_tmp87_);
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				h = _tmp91_;
+				_tmp89_ = _tmp88_;
+#line 351 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				h = _tmp89_;
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp92_ = h;
+				_tmp90_ = h;
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp93_ = _vala_book_height;
+				_tmp91_ = _vala_book_height;
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp92_ > _tmp93_) {
-#line 1898 "book-view.c"
-					gint _tmp94_ = 0;
+				if (_tmp90_ > _tmp91_) {
+#line 1884 "book-view.c"
+					gint _tmp92_ = 0;
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp94_ = h;
+					_tmp92_ = h;
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_book_height = _tmp94_;
-#line 1904 "book-view.c"
+					_vala_book_height = _tmp92_;
+#line 1890 "book-view.c"
 				}
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp95_ = _vala_book_width;
+				_tmp93_ = _vala_book_width;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp96_ = page;
+				_tmp94_ = page;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp97_ = page_view_get_width (_tmp96_);
+				_tmp95_ = page_view_get_width (_tmp94_);
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_vala_book_width = _tmp95_ + _tmp97_;
+				_tmp96_ = _tmp95_;
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_vala_book_width = _tmp93_ + _tmp96_;
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp98_ = i;
+				_tmp97_ = i;
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp98_ != 0) {
-#line 1918 "book-view.c"
+				if (_tmp97_ != 0) {
+#line 1906 "book-view.c"
+					gint _tmp98_ = 0;
 					gint _tmp99_ = 0;
-					gint _tmp100_ = 0;
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp99_ = _vala_book_width;
+					_tmp98_ = _vala_book_width;
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp100_ = spacing;
+					_tmp99_ = spacing;
 #line 356 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_book_width = _tmp99_ + _tmp100_;
-#line 1927 "book-view.c"
+					_vala_book_width = _tmp98_ + _tmp99_;
+#line 1915 "book-view.c"
 				}
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_unref0 (p);
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 1933 "book-view.c"
+#line 1921 "book-view.c"
 			}
 		}
 	}
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	x_offset = 0;
-#line 1939 "book-view.c"
+#line 1927 "book-view.c"
 	{
 		gint i = 0;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 1944 "book-view.c"
+#line 1932 "book-view.c"
 		{
-			gboolean _tmp101_ = FALSE;
+			gboolean _tmp100_ = FALSE;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp101_ = TRUE;
+			_tmp100_ = TRUE;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 1951 "book-view.c"
-				gboolean _tmp102_ = FALSE;
-				gint _tmp104_ = 0;
-				Book* _tmp105_ = NULL;
-				guint _tmp106_ = 0U;
-				guint _tmp107_ = 0U;
+#line 1939 "book-view.c"
+				gint _tmp102_ = 0;
+				Book* _tmp103_ = NULL;
+				guint _tmp104_ = 0U;
+				guint _tmp105_ = 0U;
 				PageView* page = NULL;
-				gint _tmp108_ = 0;
-				PageView* _tmp109_ = NULL;
-				PageView* _tmp110_ = NULL;
-				gint _tmp111_ = 0;
+				gint _tmp106_ = 0;
+				PageView* _tmp107_ = NULL;
+				PageView* _tmp108_ = NULL;
+				gint _tmp109_ = 0;
+				gint _tmp110_ = 0;
+				PageView* _tmp111_ = NULL;
 				gint _tmp112_ = 0;
-				PageView* _tmp113_ = NULL;
+				gint _tmp113_ = 0;
 				gint _tmp114_ = 0;
-				gint _tmp115_ = 0;
-				PageView* _tmp116_ = NULL;
-				gint _tmp117_ = 0;
-				PageView* _tmp118_ = NULL;
+				PageView* _tmp115_ = NULL;
+				gint _tmp116_ = 0;
+				PageView* _tmp117_ = NULL;
+				gint _tmp118_ = 0;
 				gint _tmp119_ = 0;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp102_ = _tmp101_;
-#line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp102_) {
-#line 1974 "book-view.c"
-					gint _tmp103_ = 0;
+				if (!_tmp100_) {
+#line 1961 "book-view.c"
+					gint _tmp101_ = 0;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp103_ = i;
+					_tmp101_ = i;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp103_ + 1;
-#line 1980 "book-view.c"
+					i = _tmp101_ + 1;
+#line 1967 "book-view.c"
 				}
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp101_ = FALSE;
+				_tmp100_ = FALSE;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp104_ = i;
+				_tmp102_ = i;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp105_ = self->priv->_book;
+				_tmp103_ = self->priv->_book;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp106_ = book_get_n_pages (_tmp105_);
+				_tmp104_ = book_get_n_pages (_tmp103_);
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp107_ = _tmp106_;
+				_tmp105_ = _tmp104_;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp104_) < _tmp107_)) {
+				if (!(((guint) _tmp102_) < _tmp105_)) {
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 1996 "book-view.c"
+#line 1983 "book-view.c"
 				}
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp108_ = i;
+				_tmp106_ = i;
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp109_ = book_view_get_nth_page (self, _tmp108_);
+				_tmp107_ = book_view_get_nth_page (self, _tmp106_);
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp109_;
+				page = _tmp107_;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp110_ = page;
+				_tmp108_ = page;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp111_ = x_offset;
+				_tmp109_ = x_offset;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_set_x_offset (_tmp110_, _tmp111_);
+				page_view_set_x_offset (_tmp108_, _tmp109_);
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp112_ = x_offset;
+				_tmp110_ = x_offset;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp113_ = page;
+				_tmp111_ = page;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp114_ = page_view_get_width (_tmp113_);
+				_tmp112_ = page_view_get_width (_tmp111_);
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp115_ = spacing;
+				_tmp113_ = _tmp112_;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				x_offset = _tmp112_ + (_tmp114_ + _tmp115_);
+				_tmp114_ = spacing;
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				x_offset = _tmp110_ + (_tmp113_ + _tmp114_);
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp115_ = page;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp116_ = page;
+				_tmp116_ = height;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp117_ = height;
+				_tmp117_ = page;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp118_ = page;
+				_tmp118_ = page_view_get_height (_tmp117_);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp119_ = page_view_get_height (_tmp118_);
+				_tmp119_ = _tmp118_;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_set_y_offset (_tmp116_, (_tmp117_ - _tmp119_) / 2);
+				page_view_set_y_offset (_tmp115_, (_tmp116_ - _tmp119_) / 2);
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 2032 "book-view.c"
+#line 2023 "book-view.c"
 			}
 		}
 	}
@@ -2036,13 +2027,13 @@ static void book_view_layout_into (BookView* self, gint width, gint height, gint
 	if (book_width) {
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_width = _vala_book_width;
-#line 2040 "book-view.c"
+#line 2031 "book-view.c"
 	}
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (book_height) {
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*book_height = _vala_book_height;
-#line 2046 "book-view.c"
+#line 2037 "book-view.c"
 	}
 }
 
@@ -2077,7 +2068,7 @@ static void book_view_layout (BookView* self) {
 	gint _tmp19_ = 0;
 	GtkAllocation _tmp20_ = {0};
 	gint _tmp21_ = 0;
-	gboolean _tmp55_ = FALSE;
+	gboolean _tmp54_ = FALSE;
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_if_fail (self != NULL);
 #line 375 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -2086,7 +2077,7 @@ static void book_view_layout (BookView* self) {
 	if (!_tmp0_) {
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 2090 "book-view.c"
+#line 2081 "book-view.c"
 	}
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = TRUE;
@@ -2118,7 +2109,7 @@ static void book_view_layout (BookView* self) {
 	if (_tmp5_ < (_tmp7_ - _tmp9_)) {
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		right_aligned = FALSE;
-#line 2122 "book-view.c"
+#line 2113 "book-view.c"
 	}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp10_ = allocation;
@@ -2152,7 +2143,7 @@ static void book_view_layout (BookView* self) {
 	_tmp21_ = _tmp20_.width;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp19_ > _tmp21_) {
-#line 2156 "book-view.c"
+#line 2147 "book-view.c"
 		GtkAllocation _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
@@ -2171,8 +2162,7 @@ static void book_view_layout (BookView* self) {
 		gint _tmp36_ = 0;
 		gboolean _tmp37_ = FALSE;
 		gboolean _tmp38_ = FALSE;
-		gboolean _tmp42_ = FALSE;
-		GtkScrollbar* _tmp44_ = NULL;
+		GtkScrollbar* _tmp43_ = NULL;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp22_ = allocation;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -2221,7 +2211,7 @@ static void book_view_layout (BookView* self) {
 		if (_tmp38_) {
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = TRUE;
-#line 2225 "book-view.c"
+#line 2215 "book-view.c"
 		} else {
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
@@ -2234,82 +2224,80 @@ static void book_view_layout (BookView* self) {
 			_tmp41_ = max_offset;
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp37_ = _tmp40_ > _tmp41_;
-#line 2238 "book-view.c"
+#line 2228 "book-view.c"
 		}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp42_ = _tmp37_;
-#line 410 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp42_) {
-#line 2244 "book-view.c"
-			gint _tmp43_ = 0;
+		if (_tmp37_) {
+#line 2232 "book-view.c"
+			gint _tmp42_ = 0;
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp43_ = max_offset;
+			_tmp42_ = max_offset;
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			book_view_set_x_offset (self, _tmp43_);
-#line 2250 "book-view.c"
+			book_view_set_x_offset (self, _tmp42_);
+#line 2238 "book-view.c"
 		}
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp44_ = self->priv->scroll;
+		_tmp43_ = self->priv->scroll;
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_widget_show ((GtkWidget*) _tmp44_);
-#line 2256 "book-view.c"
+		gtk_widget_set_visible ((GtkWidget*) _tmp43_, TRUE);
+#line 2244 "book-view.c"
 	} else {
-		GtkScrollbar* _tmp45_ = NULL;
+		GtkScrollbar* _tmp44_ = NULL;
 		gint offset = 0;
-		gint _tmp46_ = 0;
-		GtkAllocation _tmp47_ = {0};
-		gint _tmp48_ = 0;
-		GtkAdjustment* _tmp49_ = NULL;
-		gint _tmp50_ = 0;
-		GtkAdjustment* _tmp51_ = NULL;
-		gint _tmp52_ = 0;
-		GtkAdjustment* _tmp53_ = NULL;
-		gint _tmp54_ = 0;
+		gint _tmp45_ = 0;
+		GtkAllocation _tmp46_ = {0};
+		gint _tmp47_ = 0;
+		GtkAdjustment* _tmp48_ = NULL;
+		gint _tmp49_ = 0;
+		GtkAdjustment* _tmp50_ = NULL;
+		gint _tmp51_ = 0;
+		GtkAdjustment* _tmp52_ = NULL;
+		gint _tmp53_ = 0;
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp45_ = self->priv->scroll;
+		_tmp44_ = self->priv->scroll;
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_widget_hide ((GtkWidget*) _tmp45_);
+		gtk_widget_set_visible ((GtkWidget*) _tmp44_, FALSE);
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp46_ = book_width;
+		_tmp45_ = book_width;
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp47_ = allocation;
+		_tmp46_ = allocation;
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp48_ = _tmp47_.width;
+		_tmp47_ = _tmp46_.width;
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		offset = (_tmp46_ - _tmp48_) / 2;
+		offset = (_tmp45_ - _tmp47_) / 2;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp49_ = self->priv->adjustment;
+		_tmp48_ = self->priv->adjustment;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp50_ = offset;
+		_tmp49_ = offset;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_lower (_tmp49_, (gdouble) _tmp50_);
+		gtk_adjustment_set_lower (_tmp48_, (gdouble) _tmp49_);
 #line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp51_ = self->priv->adjustment;
+		_tmp50_ = self->priv->adjustment;
 #line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp52_ = offset;
+		_tmp51_ = offset;
 #line 420 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_upper (_tmp51_, (gdouble) _tmp52_);
+		gtk_adjustment_set_upper (_tmp50_, (gdouble) _tmp51_);
 #line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp53_ = self->priv->adjustment;
+		_tmp52_ = self->priv->adjustment;
 #line 421 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		gtk_adjustment_set_page_size (_tmp53_, (gdouble) 0);
+		gtk_adjustment_set_page_size (_tmp52_, (gdouble) 0);
 #line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp54_ = offset;
+		_tmp53_ = offset;
 #line 422 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_set_x_offset (self, _tmp54_);
-#line 2301 "book-view.c"
+		book_view_set_x_offset (self, _tmp53_);
+#line 2289 "book-view.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp55_ = self->priv->show_selected_page;
+	_tmp54_ = self->priv->show_selected_page;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp55_) {
-#line 2307 "book-view.c"
-		PageView* _tmp56_ = NULL;
+	if (_tmp54_) {
+#line 2295 "book-view.c"
+		PageView* _tmp55_ = NULL;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp56_ = self->priv->selected_page_view;
+		_tmp55_ = self->priv->selected_page_view;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		book_view_show_page_view (self, _tmp56_);
-#line 2313 "book-view.c"
+		book_view_show_page_view (self, _tmp55_);
+#line 2301 "book-view.c"
 	}
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->need_layout = FALSE;
@@ -2317,7 +2305,7 @@ static void book_view_layout (BookView* self) {
 	self->priv->show_selected_page = FALSE;
 #line 430 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->laying_out = FALSE;
-#line 2321 "book-view.c"
+#line 2309 "book-view.c"
 }
 
 
@@ -2353,7 +2341,7 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 		result = FALSE;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 2357 "book-view.c"
+#line 2345 "book-view.c"
 	}
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	book_view_layout (self);
@@ -2369,117 +2357,116 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 	right = _tmp6_;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	bottom = _tmp7_;
-#line 2373 "book-view.c"
+#line 2361 "book-view.c"
 	{
 		gint i = 0;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 2378 "book-view.c"
+#line 2366 "book-view.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp8_ = TRUE;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 2385 "book-view.c"
-				gboolean _tmp9_ = FALSE;
-				gint _tmp11_ = 0;
-				Book* _tmp12_ = NULL;
+#line 2373 "book-view.c"
+				gint _tmp10_ = 0;
+				Book* _tmp11_ = NULL;
+				guint _tmp12_ = 0U;
 				guint _tmp13_ = 0U;
-				guint _tmp14_ = 0U;
 				PageView* page = NULL;
-				gint _tmp15_ = 0;
-				PageView* _tmp16_ = NULL;
+				gint _tmp14_ = 0;
+				PageView* _tmp15_ = NULL;
 				gint left_edge = 0;
-				PageView* _tmp17_ = NULL;
+				PageView* _tmp16_ = NULL;
+				gint _tmp17_ = 0;
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
-				gint _tmp21_ = 0;
 				gint right_edge = 0;
-				PageView* _tmp22_ = NULL;
+				PageView* _tmp21_ = NULL;
+				gint _tmp22_ = 0;
 				gint _tmp23_ = 0;
-				gint _tmp24_ = 0;
-				PageView* _tmp25_ = NULL;
+				PageView* _tmp24_ = NULL;
+				gint _tmp25_ = 0;
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
 				gint _tmp28_ = 0;
 				gboolean _tmp29_ = FALSE;
 				gint _tmp30_ = 0;
 				gdouble _tmp31_ = 0.0;
-				gboolean _tmp34_ = FALSE;
+				cairo_t* _tmp34_ = NULL;
 				cairo_t* _tmp35_ = NULL;
-				cairo_t* _tmp36_ = NULL;
+				gint _tmp36_ = 0;
 				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
-				PageView* _tmp39_ = NULL;
+				PageView* _tmp38_ = NULL;
+				cairo_t* _tmp39_ = NULL;
 				cairo_t* _tmp40_ = NULL;
-				cairo_t* _tmp41_ = NULL;
-				PageView* _tmp42_ = NULL;
+				PageView* _tmp41_ = NULL;
+				gboolean _tmp42_ = FALSE;
 				gboolean _tmp43_ = FALSE;
-				gboolean _tmp44_ = FALSE;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = _tmp8_;
+				if (!_tmp8_) {
+#line 2411 "book-view.c"
+					gint _tmp9_ = 0;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp9_) {
-#line 2426 "book-view.c"
-					gint _tmp10_ = 0;
+					_tmp9_ = i;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp10_ = i;
-#line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp10_ + 1;
-#line 2432 "book-view.c"
+					i = _tmp9_ + 1;
+#line 2417 "book-view.c"
 				}
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp8_ = FALSE;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = i;
+				_tmp10_ = i;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = self->priv->_book;
+				_tmp11_ = self->priv->_book;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = book_get_n_pages (_tmp12_);
+				_tmp12_ = book_get_n_pages (_tmp11_);
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = _tmp13_;
+				_tmp13_ = _tmp12_;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp11_) < _tmp14_)) {
+				if (!(((guint) _tmp10_) < _tmp13_)) {
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 2448 "book-view.c"
+#line 2433 "book-view.c"
 				}
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = i;
+				_tmp14_ = i;
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp16_ = book_view_get_nth_page (self, _tmp15_);
+				_tmp15_ = book_view_get_nth_page (self, _tmp14_);
 #line 446 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp16_;
+				page = _tmp15_;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp17_ = page;
+				_tmp16_ = page;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp18_ = page_view_get_x_offset (_tmp17_);
+				_tmp17_ = page_view_get_x_offset (_tmp16_);
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp19_ = _tmp18_;
+				_tmp18_ = _tmp17_;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp20_ = book_view_get_x_offset (self);
+				_tmp19_ = book_view_get_x_offset (self);
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp21_ = _tmp20_;
+				_tmp20_ = _tmp19_;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				left_edge = _tmp19_ - _tmp21_;
+				left_edge = _tmp18_ - _tmp20_;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp22_ = page;
+				_tmp21_ = page;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp23_ = page_view_get_x_offset (_tmp22_);
+				_tmp22_ = page_view_get_x_offset (_tmp21_);
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp24_ = _tmp23_;
+				_tmp23_ = _tmp22_;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = page;
+				_tmp24_ = page;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = page_view_get_width (_tmp25_);
+				_tmp25_ = page_view_get_width (_tmp24_);
+#line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				_tmp26_ = _tmp25_;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp27_ = book_view_get_x_offset (self);
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp28_ = _tmp27_;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				right_edge = (_tmp24_ + _tmp26_) - _tmp28_;
+				right_edge = (_tmp23_ + _tmp26_) - _tmp28_;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp30_ = right_edge;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -2488,7 +2475,7 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 				if (((gdouble) _tmp30_) < _tmp31_) {
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp29_ = TRUE;
-#line 2492 "book-view.c"
+#line 2479 "book-view.c"
 				} else {
 					gint _tmp32_ = 0;
 					gdouble _tmp33_ = 0.0;
@@ -2498,101 +2485,105 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 					_tmp33_ = right;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp29_ = ((gdouble) _tmp32_) > _tmp33_;
-#line 2502 "book-view.c"
+#line 2489 "book-view.c"
 				}
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp34_ = _tmp29_;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp34_) {
+				if (_tmp29_) {
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_page_view_unref0 (page);
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					continue;
-#line 2512 "book-view.c"
+#line 2497 "book-view.c"
 				}
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp35_ = context;
+				_tmp34_ = context;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_save (_tmp35_);
+				cairo_save (_tmp34_);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp36_ = context;
+				_tmp35_ = context;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp37_ = book_view_get_x_offset (self);
+				_tmp36_ = book_view_get_x_offset (self);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp38_ = _tmp37_;
+				_tmp37_ = _tmp36_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_translate (_tmp36_, (gdouble) (-_tmp38_), (gdouble) 0);
+				cairo_translate (_tmp35_, (gdouble) (-_tmp37_), (gdouble) 0);
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp39_ = page;
+				_tmp38_ = page;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp40_ = context;
+				_tmp39_ = context;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page_view_render (_tmp39_, _tmp40_);
+				page_view_render (_tmp38_, _tmp39_);
 #line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp41_ = context;
+				_tmp40_ = context;
 #line 457 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				cairo_restore (_tmp41_);
+				cairo_restore (_tmp40_);
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp42_ = page;
+				_tmp41_ = page;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp43_ = page_view_get_selected (_tmp42_);
+				_tmp42_ = page_view_get_selected (_tmp41_);
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp44_ = _tmp43_;
+				_tmp43_ = _tmp42_;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp44_) {
-#line 2544 "book-view.c"
-					GtkWidget* _tmp45_ = NULL;
-					GtkStyleContext* _tmp46_ = NULL;
-					cairo_t* _tmp47_ = NULL;
-					PageView* _tmp48_ = NULL;
+				if (_tmp43_) {
+#line 2529 "book-view.c"
+					GtkWidget* _tmp44_ = NULL;
+					GtkStyleContext* _tmp45_ = NULL;
+					cairo_t* _tmp46_ = NULL;
+					PageView* _tmp47_ = NULL;
+					gint _tmp48_ = 0;
 					gint _tmp49_ = 0;
 					gint _tmp50_ = 0;
 					gint _tmp51_ = 0;
-					gint _tmp52_ = 0;
-					PageView* _tmp53_ = NULL;
+					PageView* _tmp52_ = NULL;
+					gint _tmp53_ = 0;
 					gint _tmp54_ = 0;
-					gint _tmp55_ = 0;
-					PageView* _tmp56_ = NULL;
+					PageView* _tmp55_ = NULL;
+					gint _tmp56_ = 0;
 					gint _tmp57_ = 0;
 					PageView* _tmp58_ = NULL;
 					gint _tmp59_ = 0;
+					gint _tmp60_ = 0;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					_tmp44_ = self->priv->drawing_area;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp45_ = self->priv->drawing_area;
+					_tmp45_ = gtk_widget_get_style_context (_tmp44_);
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp46_ = gtk_widget_get_style_context (_tmp45_);
+					_tmp46_ = context;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp47_ = context;
+					_tmp47_ = page;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp48_ = page;
+					_tmp48_ = page_view_get_x_offset (_tmp47_);
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp49_ = page_view_get_x_offset (_tmp48_);
+					_tmp49_ = _tmp48_;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp50_ = _tmp49_;
+					_tmp50_ = book_view_get_x_offset (self);
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp51_ = book_view_get_x_offset (self);
+					_tmp51_ = _tmp50_;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp52_ = _tmp51_;
+					_tmp52_ = page;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp53_ = page;
+					_tmp53_ = page_view_get_y_offset (_tmp52_);
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp54_ = page_view_get_y_offset (_tmp53_);
+					_tmp54_ = _tmp53_;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp55_ = _tmp54_;
+					_tmp55_ = page;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp56_ = page;
+					_tmp56_ = page_view_get_width (_tmp55_);
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp57_ = page_view_get_width (_tmp56_);
+					_tmp57_ = _tmp56_;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp58_ = page;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp59_ = page_view_get_height (_tmp58_);
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					gtk_render_focus (_tmp46_, _tmp47_, (gdouble) (_tmp50_ - _tmp52_), (gdouble) _tmp55_, (gdouble) _tmp57_, (gdouble) _tmp59_);
-#line 2592 "book-view.c"
+					_tmp60_ = _tmp59_;
+#line 460 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+					gtk_render_focus (_tmp45_, _tmp46_, (gdouble) (_tmp49_ - _tmp51_), (gdouble) _tmp54_, (gdouble) _tmp57_, (gdouble) _tmp60_);
+#line 2583 "book-view.c"
 				}
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 2596 "book-view.c"
+#line 2587 "book-view.c"
 			}
 		}
 	}
@@ -2600,7 +2591,7 @@ static gboolean book_view_draw_cb (BookView* self, GtkWidget* widget, cairo_t* c
 	result = FALSE;
 #line 467 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 2604 "book-view.c"
+#line 2595 "book-view.c"
 }
 
 
@@ -2617,34 +2608,34 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 	_tmp0_ = _vala_y_;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_vala_x_ = _tmp0_;
-#line 2621 "book-view.c"
+#line 2612 "book-view.c"
 	{
 		gint i = 0;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		i = 0;
-#line 2626 "book-view.c"
+#line 2617 "book-view.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			_tmp1_ = TRUE;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			while (TRUE) {
-#line 2633 "book-view.c"
-				gboolean _tmp2_ = FALSE;
-				gint _tmp4_ = 0;
-				Book* _tmp5_ = NULL;
+#line 2624 "book-view.c"
+				gint _tmp3_ = 0;
+				Book* _tmp4_ = NULL;
+				guint _tmp5_ = 0U;
 				guint _tmp6_ = 0U;
-				guint _tmp7_ = 0U;
 				PageView* page = NULL;
-				gint _tmp8_ = 0;
-				PageView* _tmp9_ = NULL;
+				gint _tmp7_ = 0;
+				PageView* _tmp8_ = NULL;
 				gint left = 0;
-				PageView* _tmp10_ = NULL;
+				PageView* _tmp9_ = NULL;
+				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
 				gint right = 0;
-				gint _tmp13_ = 0;
-				PageView* _tmp14_ = NULL;
+				gint _tmp12_ = 0;
+				PageView* _tmp13_ = NULL;
+				gint _tmp14_ = 0;
 				gint _tmp15_ = 0;
 				gint top = 0;
 				PageView* _tmp16_ = NULL;
@@ -2654,64 +2645,62 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 				gint _tmp19_ = 0;
 				PageView* _tmp20_ = NULL;
 				gint _tmp21_ = 0;
-				gboolean _tmp22_ = FALSE;
+				gint _tmp22_ = 0;
 				gboolean _tmp23_ = FALSE;
 				gboolean _tmp24_ = FALSE;
-				gint _tmp25_ = 0;
+				gboolean _tmp25_ = FALSE;
 				gint _tmp26_ = 0;
-				gboolean _tmp29_ = FALSE;
-				gboolean _tmp32_ = FALSE;
-				gboolean _tmp35_ = FALSE;
-#line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp2_ = _tmp1_;
+				gint _tmp27_ = 0;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!_tmp2_) {
-#line 2670 "book-view.c"
-					gint _tmp3_ = 0;
+				if (!_tmp1_) {
+#line 2657 "book-view.c"
+					gint _tmp2_ = 0;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp3_ = i;
+					_tmp2_ = i;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					i = _tmp3_ + 1;
-#line 2676 "book-view.c"
+					i = _tmp2_ + 1;
+#line 2663 "book-view.c"
 				}
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp1_ = FALSE;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp4_ = i;
+				_tmp3_ = i;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp5_ = self->priv->_book;
+				_tmp4_ = self->priv->_book;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp6_ = book_get_n_pages (_tmp5_);
+				_tmp5_ = book_get_n_pages (_tmp4_);
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp7_ = _tmp6_;
+				_tmp6_ = _tmp5_;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (!(((guint) _tmp4_) < _tmp7_)) {
+				if (!(((guint) _tmp3_) < _tmp6_)) {
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					break;
-#line 2692 "book-view.c"
+#line 2679 "book-view.c"
 				}
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp8_ = i;
+				_tmp7_ = i;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp9_ = book_view_get_nth_page (self, _tmp8_);
+				_tmp8_ = book_view_get_nth_page (self, _tmp7_);
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				page = _tmp9_;
+				page = _tmp8_;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp10_ = page;
+				_tmp9_ = page;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp11_ = page_view_get_x_offset (_tmp10_);
+				_tmp10_ = page_view_get_x_offset (_tmp9_);
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp12_ = _tmp11_;
+				_tmp11_ = _tmp10_;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				left = _tmp12_;
+				left = _tmp11_;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp13_ = left;
+				_tmp12_ = left;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp14_ = page;
+				_tmp13_ = page;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp15_ = page_view_get_width (_tmp14_);
+				_tmp14_ = page_view_get_width (_tmp13_);
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				right = _tmp13_ + _tmp15_;
+				_tmp15_ = _tmp14_;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				right = _tmp12_ + _tmp15_;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp16_ = page;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -2727,33 +2716,33 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_tmp21_ = page_view_get_height (_tmp20_);
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				bottom = _tmp19_ + _tmp21_;
+				_tmp22_ = _tmp21_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
+				bottom = _tmp19_ + _tmp22_;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp25_ = x;
+				_tmp26_ = x;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = left;
+				_tmp27_ = left;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp25_ >= _tmp26_) {
-#line 2738 "book-view.c"
-					gint _tmp27_ = 0;
+				if (_tmp26_ >= _tmp27_) {
+#line 2729 "book-view.c"
 					gint _tmp28_ = 0;
+					gint _tmp29_ = 0;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp27_ = x;
+					_tmp28_ = x;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp28_ = right;
+					_tmp29_ = right;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp24_ = _tmp27_ <= _tmp28_;
-#line 2747 "book-view.c"
+					_tmp25_ = _tmp28_ <= _tmp29_;
+#line 2738 "book-view.c"
 				} else {
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp24_ = FALSE;
-#line 2751 "book-view.c"
+					_tmp25_ = FALSE;
+#line 2742 "book-view.c"
 				}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp29_ = _tmp24_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp29_) {
-#line 2757 "book-view.c"
+				if (_tmp25_) {
+#line 2746 "book-view.c"
 					gint _tmp30_ = 0;
 					gint _tmp31_ = 0;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -2761,74 +2750,70 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					_tmp31_ = top;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp23_ = _tmp30_ >= _tmp31_;
-#line 2766 "book-view.c"
+					_tmp24_ = _tmp30_ >= _tmp31_;
+#line 2755 "book-view.c"
 				} else {
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp23_ = FALSE;
-#line 2770 "book-view.c"
+					_tmp24_ = FALSE;
+#line 2759 "book-view.c"
 				}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp32_ = _tmp23_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp32_) {
-#line 2776 "book-view.c"
+				if (_tmp24_) {
+#line 2763 "book-view.c"
+					gint _tmp32_ = 0;
 					gint _tmp33_ = 0;
-					gint _tmp34_ = 0;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp33_ = y;
+					_tmp32_ = y;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp34_ = bottom;
+					_tmp33_ = bottom;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp22_ = _tmp33_ <= _tmp34_;
-#line 2785 "book-view.c"
+					_tmp23_ = _tmp32_ <= _tmp33_;
+#line 2772 "book-view.c"
 				} else {
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp22_ = FALSE;
-#line 2789 "book-view.c"
+					_tmp23_ = FALSE;
+#line 2776 "book-view.c"
 				}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp35_ = _tmp22_;
-#line 480 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				if (_tmp35_) {
-#line 2795 "book-view.c"
+				if (_tmp23_) {
+#line 2780 "book-view.c"
+					gint _tmp34_ = 0;
+					gint _tmp35_ = 0;
 					gint _tmp36_ = 0;
 					gint _tmp37_ = 0;
-					gint _tmp38_ = 0;
-					gint _tmp39_ = 0;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp36_ = x;
+					_tmp34_ = x;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp37_ = left;
+					_tmp35_ = left;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_x_ = _tmp36_ - _tmp37_;
+					_vala_x_ = _tmp34_ - _tmp35_;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp38_ = y;
+					_tmp36_ = y;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_tmp39_ = top;
+					_tmp37_ = top;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-					_vala_y_ = _tmp38_ - _tmp39_;
+					_vala_y_ = _tmp36_ - _tmp37_;
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					result = page;
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (x_) {
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*x_ = _vala_x_;
-#line 2818 "book-view.c"
+#line 2803 "book-view.c"
 					}
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					if (y_) {
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 						*y_ = _vala_y_;
-#line 2824 "book-view.c"
+#line 2809 "book-view.c"
 					}
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					return result;
-#line 2828 "book-view.c"
+#line 2813 "book-view.c"
 				}
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				_page_view_unref0 (page);
-#line 2832 "book-view.c"
+#line 2817 "book-view.c"
 			}
 		}
 	}
@@ -2838,17 +2823,17 @@ static PageView* book_view_get_page_at (BookView* self, gint x, gint y, gint* x_
 	if (x_) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*x_ = _vala_x_;
-#line 2842 "book-view.c"
+#line 2827 "book-view.c"
 	}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (y_) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		*y_ = _vala_y_;
-#line 2848 "book-view.c"
+#line 2833 "book-view.c"
 	}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 2852 "book-view.c"
+#line 2837 "book-view.c"
 }
 
 
@@ -2857,12 +2842,12 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 	GtkWidget* _tmp0_ = NULL;
 	gint x = 0;
 	gint y = 0;
-	GdkEventButton _tmp1_ = {0};
+	GdkEventButton* _tmp1_ = NULL;
 	GdkEventType _tmp2_ = 0;
 	PageView* _tmp13_ = NULL;
-	GdkEventButton _tmp14_ = {0};
+	GdkEventButton* _tmp14_ = NULL;
 	guint _tmp15_ = 0U;
-	GdkEventButton _tmp30_ = {0};
+	GdkEventButton* _tmp30_ = NULL;
 	guint _tmp31_ = 0U;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
@@ -2881,34 +2866,34 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	y = 0;
 #line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = *event;
+	_tmp1_ = event;
 #line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp2_ = _tmp1_.type;
+	_tmp2_ = _tmp1_->type;
 #line 498 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp2_ == GDK_BUTTON_PRESS) {
-#line 2890 "book-view.c"
-		GdkEventButton _tmp3_ = {0};
+#line 2875 "book-view.c"
+		GdkEventButton* _tmp3_ = NULL;
 		gdouble _tmp4_ = 0.0;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-		GdkEventButton _tmp7_ = {0};
+		GdkEventButton* _tmp7_ = NULL;
 		gdouble _tmp8_ = 0.0;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		PageView* _tmp11_ = NULL;
 		PageView* _tmp12_ = NULL;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = *event;
+		_tmp3_ = event;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp4_ = _tmp3_.x;
+		_tmp4_ = _tmp3_->x;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp5_ = book_view_get_x_offset (self);
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp6_ = _tmp5_;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = *event;
+		_tmp7_ = event;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = _tmp7_.y;
+		_tmp8_ = _tmp7_->y;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp11_ = book_view_get_page_at (self, (gint) (_tmp4_ + _tmp6_), (gint) _tmp8_, &_tmp9_, &_tmp10_);
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -2921,7 +2906,7 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 		book_view_select_page_view (self, _tmp12_);
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (_tmp12_);
-#line 2925 "book-view.c"
+#line 2910 "book-view.c"
 	}
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp13_ = self->priv->selected_page_view;
@@ -2931,24 +2916,24 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 		result = FALSE;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 2935 "book-view.c"
+#line 2920 "book-view.c"
 	}
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp14_ = *event;
+	_tmp14_ = event;
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp15_ = _tmp14_.button;
+	_tmp15_ = _tmp14_->button;
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp15_ == ((guint) 1)) {
-#line 2943 "book-view.c"
-		GdkEventButton _tmp16_ = {0};
+#line 2928 "book-view.c"
+		GdkEventButton* _tmp16_ = NULL;
 		GdkEventType _tmp17_ = 0;
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp16_ = *event;
+		_tmp16_ = event;
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp17_ = _tmp16_.type;
+		_tmp17_ = _tmp16_->type;
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		if (_tmp17_ == GDK_BUTTON_PRESS) {
-#line 2952 "book-view.c"
+#line 2937 "book-view.c"
 			PageView* _tmp18_ = NULL;
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
@@ -2960,17 +2945,17 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 			_tmp20_ = y;
 #line 508 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			page_view_button_press (_tmp18_, _tmp19_, _tmp20_);
-#line 2964 "book-view.c"
+#line 2949 "book-view.c"
 		} else {
-			GdkEventButton _tmp21_ = {0};
+			GdkEventButton* _tmp21_ = NULL;
 			GdkEventType _tmp22_ = 0;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp21_ = *event;
+			_tmp21_ = event;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp22_ = _tmp21_.type;
+			_tmp22_ = _tmp21_->type;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			if (_tmp22_ == GDK_BUTTON_RELEASE) {
-#line 2974 "book-view.c"
+#line 2959 "book-view.c"
 				PageView* _tmp23_ = NULL;
 				gint _tmp24_ = 0;
 				gint _tmp25_ = 0;
@@ -2982,17 +2967,17 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 				_tmp25_ = y;
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				page_view_button_release (_tmp23_, _tmp24_, _tmp25_);
-#line 2986 "book-view.c"
+#line 2971 "book-view.c"
 			} else {
-				GdkEventButton _tmp26_ = {0};
+				GdkEventButton* _tmp26_ = NULL;
 				GdkEventType _tmp27_ = 0;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp26_ = *event;
+				_tmp26_ = event;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-				_tmp27_ = _tmp26_.type;
+				_tmp27_ = _tmp26_->type;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 				if (_tmp27_ == GDK_2BUTTON_PRESS) {
-#line 2996 "book-view.c"
+#line 2981 "book-view.c"
 					Page* _tmp28_ = NULL;
 					Page* _tmp29_ = NULL;
 #line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -3001,26 +2986,26 @@ static gboolean book_view_button_cb (BookView* self, GtkWidget* widget, GdkEvent
 					_tmp29_ = _tmp28_;
 #line 512 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 					g_signal_emit_by_name (self, "show-page", _tmp29_);
-#line 3005 "book-view.c"
+#line 2990 "book-view.c"
 				}
 			}
 		}
 	}
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp30_ = *event;
+	_tmp30_ = event;
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp31_ = _tmp30_.button;
+	_tmp31_ = _tmp30_->button;
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp31_ == ((guint) 3)) {
 #line 517 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		g_signal_emit_by_name (self, "show-menu");
-#line 3018 "book-view.c"
+#line 3003 "book-view.c"
 	}
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3024 "book-view.c"
+#line 3009 "book-view.c"
 }
 
 
@@ -3046,7 +3031,7 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
 		_g_object_unref0 (c);
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 3050 "book-view.c"
+#line 3035 "book-view.c"
 	}
 #line 528 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp2_ = cursor;
@@ -3070,7 +3055,7 @@ static void book_view_set_cursor (BookView* self, GdkCursorType cursor) {
 	gdk_window_set_cursor (_tmp6_, _tmp7_);
 #line 522 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_g_object_unref0 (c);
-#line 3074 "book-view.c"
+#line 3059 "book-view.c"
 }
 
 
@@ -3079,8 +3064,7 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 	GdkCursorType cursor = 0;
 	gboolean _tmp0_ = FALSE;
 	PageView* _tmp1_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	GdkCursorType _tmp39_ = 0;
+	GdkCursorType _tmp38_ = 0;
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
 #line 534 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
@@ -3093,173 +3077,171 @@ static gboolean book_view_motion_cb (BookView* self, GtkWidget* widget, GdkEvent
 	_tmp1_ = self->priv->selected_page_view;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp1_ != NULL) {
-#line 3097 "book-view.c"
-		GdkEventMotion _tmp2_ = {0};
+#line 3081 "book-view.c"
+		GdkEventMotion* _tmp2_ = NULL;
 		GdkModifierType _tmp3_ = 0;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp2_ = *event;
+		_tmp2_ = event;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp3_ = _tmp2_.state;
+		_tmp3_ = _tmp2_->state;
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = (_tmp3_ & GDK_BUTTON1_MASK) != 0;
-#line 3106 "book-view.c"
+#line 3090 "book-view.c"
 	} else {
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_tmp0_ = FALSE;
-#line 3110 "book-view.c"
+#line 3094 "book-view.c"
 	}
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp4_ = _tmp0_;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	if (_tmp4_) {
-#line 3116 "book-view.c"
+	if (_tmp0_) {
+#line 3098 "book-view.c"
 		gint x = 0;
-		GdkEventMotion _tmp5_ = {0};
-		gdouble _tmp6_ = 0.0;
+		GdkEventMotion* _tmp4_ = NULL;
+		gdouble _tmp5_ = 0.0;
+		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-		PageView* _tmp9_ = NULL;
+		PageView* _tmp8_ = NULL;
+		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
 		gint y = 0;
-		GdkEventMotion _tmp12_ = {0};
-		gdouble _tmp13_ = 0.0;
-		PageView* _tmp14_ = NULL;
+		GdkEventMotion* _tmp11_ = NULL;
+		gdouble _tmp12_ = 0.0;
+		PageView* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		PageView* _tmp17_ = NULL;
+		PageView* _tmp16_ = NULL;
+		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
-		PageView* _tmp20_ = NULL;
+		PageView* _tmp19_ = NULL;
+		GdkCursorType _tmp20_ = 0;
 		GdkCursorType _tmp21_ = 0;
-		GdkCursorType _tmp22_ = 0;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp5_ = *event;
+		_tmp4_ = event;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp6_ = _tmp5_.x;
+		_tmp5_ = _tmp4_->x;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp7_ = book_view_get_x_offset (self);
+		_tmp6_ = book_view_get_x_offset (self);
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp9_ = self->priv->selected_page_view;
+		_tmp8_ = self->priv->selected_page_view;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp10_ = page_view_get_x_offset (_tmp9_);
+		_tmp9_ = page_view_get_x_offset (_tmp8_);
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = (gint) ((_tmp6_ + _tmp8_) - _tmp11_);
+		x = (gint) ((_tmp5_ + _tmp7_) - _tmp10_);
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp12_ = *event;
+		_tmp11_ = event;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp13_ = _tmp12_.y;
+		_tmp12_ = _tmp11_->y;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp14_ = self->priv->selected_page_view;
+		_tmp13_ = self->priv->selected_page_view;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp15_ = page_view_get_y_offset (_tmp14_);
+		_tmp14_ = page_view_get_y_offset (_tmp13_);
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = (gint) (_tmp13_ - _tmp16_);
+		y = (gint) (_tmp12_ - _tmp15_);
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp17_ = self->priv->selected_page_view;
+		_tmp16_ = self->priv->selected_page_view;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp18_ = x;
+		_tmp17_ = x;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp19_ = y;
+		_tmp18_ = y;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		page_view_motion (_tmp17_, _tmp18_, _tmp19_);
+		page_view_motion (_tmp16_, _tmp17_, _tmp18_);
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp20_ = self->priv->selected_page_view;
+		_tmp19_ = self->priv->selected_page_view;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp21_ = page_view_get_cursor (_tmp20_);
+		_tmp20_ = page_view_get_cursor (_tmp19_);
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp22_ = _tmp21_;
+		_tmp21_ = _tmp20_;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		cursor = _tmp22_;
-#line 3181 "book-view.c"
+		cursor = _tmp21_;
+#line 3163 "book-view.c"
 	} else {
 		gint x = 0;
 		gint y = 0;
 		PageView* over_page = NULL;
-		GdkEventMotion _tmp23_ = {0};
-		gdouble _tmp24_ = 0.0;
+		GdkEventMotion* _tmp22_ = NULL;
+		gdouble _tmp23_ = 0.0;
+		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
-		GdkEventMotion _tmp27_ = {0};
-		gdouble _tmp28_ = 0.0;
+		GdkEventMotion* _tmp26_ = NULL;
+		gdouble _tmp27_ = 0.0;
+		gint _tmp28_ = 0;
 		gint _tmp29_ = 0;
-		gint _tmp30_ = 0;
+		PageView* _tmp30_ = NULL;
 		PageView* _tmp31_ = NULL;
-		PageView* _tmp32_ = NULL;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp23_ = *event;
+		_tmp22_ = event;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp24_ = _tmp23_.x;
+		_tmp23_ = _tmp22_->x;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp25_ = book_view_get_x_offset (self);
+		_tmp24_ = book_view_get_x_offset (self);
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp26_ = _tmp25_;
+		_tmp25_ = _tmp24_;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp27_ = *event;
+		_tmp26_ = event;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp28_ = _tmp27_.y;
+		_tmp27_ = _tmp26_->y;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp31_ = book_view_get_page_at (self, (gint) (_tmp24_ + _tmp26_), (gint) _tmp28_, &_tmp29_, &_tmp30_);
+		_tmp30_ = book_view_get_page_at (self, (gint) (_tmp23_ + _tmp25_), (gint) _tmp27_, &_tmp28_, &_tmp29_);
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		x = _tmp29_;
+		x = _tmp28_;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		y = _tmp30_;
+		y = _tmp29_;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		over_page = _tmp31_;
+		over_page = _tmp30_;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		_tmp32_ = over_page;
+		_tmp31_ = over_page;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-		if (_tmp32_ != NULL) {
-#line 3220 "book-view.c"
-			PageView* _tmp33_ = NULL;
+		if (_tmp31_ != NULL) {
+#line 3202 "book-view.c"
+			PageView* _tmp32_ = NULL;
+			gint _tmp33_ = 0;
 			gint _tmp34_ = 0;
-			gint _tmp35_ = 0;
-			PageView* _tmp36_ = NULL;
+			PageView* _tmp35_ = NULL;
+			GdkCursorType _tmp36_ = 0;
 			GdkCursorType _tmp37_ = 0;
-			GdkCursorType _tmp38_ = 0;
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp33_ = over_page;
+			_tmp32_ = over_page;
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp34_ = x;
+			_tmp33_ = x;
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp35_ = y;
+			_tmp34_ = y;
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			page_view_motion (_tmp33_, _tmp34_, _tmp35_);
+			page_view_motion (_tmp32_, _tmp33_, _tmp34_);
 #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp36_ = over_page;
+			_tmp35_ = over_page;
 #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp37_ = page_view_get_cursor (_tmp36_);
+			_tmp36_ = page_view_get_cursor (_tmp35_);
 #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			_tmp38_ = _tmp37_;
+			_tmp37_ = _tmp36_;
 #line 553 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-			cursor = _tmp38_;
-#line 3243 "book-view.c"
+			cursor = _tmp37_;
+#line 3225 "book-view.c"
 		}
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		_page_view_unref0 (over_page);
-#line 3247 "book-view.c"
+#line 3229 "book-view.c"
 	}
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp39_ = cursor;
+	_tmp38_ = cursor;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	book_view_set_cursor (self, _tmp39_);
+	book_view_set_cursor (self, _tmp38_);
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	result = FALSE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3257 "book-view.c"
+#line 3239 "book-view.c"
 }
 
 
 static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey* event) {
 	gboolean result = FALSE;
-	GdkEventKey _tmp0_ = {0};
+	GdkEventKey* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
@@ -3268,14 +3250,14 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp0_ = *event;
+	_tmp0_ = event;
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
-	_tmp1_ = _tmp0_.keyval;
+	_tmp1_ = _tmp0_->keyval;
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	switch (_tmp1_) {
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff50:
-#line 3279 "book-view.c"
+#line 3261 "book-view.c"
 		{
 			Book* _tmp2_ = NULL;
 			Page* _tmp3_ = NULL;
@@ -3294,11 +3276,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 568 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3298 "book-view.c"
+#line 3280 "book-view.c"
 		}
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff51:
-#line 3302 "book-view.c"
+#line 3284 "book-view.c"
 		{
 			PageView* _tmp5_ = NULL;
 			PageView* _tmp6_ = NULL;
@@ -3317,11 +3299,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 571 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3321 "book-view.c"
+#line 3303 "book-view.c"
 		}
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xff53:
-#line 3325 "book-view.c"
+#line 3307 "book-view.c"
 		{
 			PageView* _tmp8_ = NULL;
 			PageView* _tmp9_ = NULL;
@@ -3340,11 +3322,11 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3344 "book-view.c"
+#line 3326 "book-view.c"
 		}
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		case 0xFF57:
-#line 3348 "book-view.c"
+#line 3330 "book-view.c"
 		{
 			Book* _tmp11_ = NULL;
 			Book* _tmp12_ = NULL;
@@ -3372,7 +3354,7 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = TRUE;
 #line 577 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3376 "book-view.c"
+#line 3358 "book-view.c"
 		}
 		default:
 		{
@@ -3380,7 +3362,7 @@ static gboolean book_view_key_cb (BookView* self, GtkWidget* widget, GdkEventKey
 			result = FALSE;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 			return result;
-#line 3384 "book-view.c"
+#line 3366 "book-view.c"
 		}
 	}
 }
@@ -3403,7 +3385,7 @@ static gboolean book_view_focus_cb (BookView* self, GtkWidget* widget, GdkEventF
 	result = FALSE;
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3407 "book-view.c"
+#line 3389 "book-view.c"
 }
 
 
@@ -3419,7 +3401,7 @@ static void book_view_scroll_cb (BookView* self, GtkAdjustment* adjustment) {
 	if (!_tmp0_) {
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_redraw (self);
-#line 3423 "book-view.c"
+#line 3405 "book-view.c"
 	}
 }
 
@@ -3432,7 +3414,7 @@ void book_view_redraw (BookView* self) {
 	_tmp0_ = self->priv->drawing_area;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	gtk_widget_queue_draw (_tmp0_);
-#line 3436 "book-view.c"
+#line 3418 "book-view.c"
 }
 
 
@@ -3452,7 +3434,7 @@ void book_view_select_next_page (BookView* self) {
 	book_view_select_page_view (self, _tmp2_);
 #line 603 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
-#line 3456 "book-view.c"
+#line 3438 "book-view.c"
 }
 
 
@@ -3472,7 +3454,7 @@ void book_view_select_prev_page (BookView* self) {
 	book_view_select_page_view (self, _tmp2_);
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_page_view_unref0 (_tmp2_);
-#line 3476 "book-view.c"
+#line 3458 "book-view.c"
 }
 
 
@@ -3487,14 +3469,14 @@ Book* book_view_get_book (BookView* self) {
 	result = _tmp0_;
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3491 "book-view.c"
+#line 3473 "book-view.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return self ? book_ref (self) : NULL;
-#line 3498 "book-view.c"
+#line 3480 "book-view.c"
 }
 
 
@@ -3513,7 +3495,7 @@ static void book_view_set_book (BookView* self, Book* value) {
 	self->priv->_book = _tmp1_;
 #line 18 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "book");
-#line 3517 "book-view.c"
+#line 3499 "book-view.c"
 }
 
 
@@ -3526,7 +3508,7 @@ Page* book_view_get_selected_page (BookView* self) {
 	_tmp0_ = self->priv->selected_page_view;
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp0_ != NULL) {
-#line 3530 "book-view.c"
+#line 3512 "book-view.c"
 		PageView* _tmp1_ = NULL;
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
@@ -3540,13 +3522,13 @@ Page* book_view_get_selected_page (BookView* self) {
 		result = _tmp3_;
 #line 33 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 3544 "book-view.c"
+#line 3526 "book-view.c"
 	} else {
 #line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		result = NULL;
 #line 35 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return result;
-#line 3550 "book-view.c"
+#line 3532 "book-view.c"
 	}
 }
 
@@ -3568,13 +3550,13 @@ void book_view_set_selected_page (BookView* self, Page* value) {
 	if (_tmp1_ == _tmp2_) {
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		return;
-#line 3572 "book-view.c"
+#line 3554 "book-view.c"
 	}
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	_tmp3_ = value;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	if (_tmp3_ != NULL) {
-#line 3578 "book-view.c"
+#line 3560 "book-view.c"
 		GHashTable* _tmp4_ = NULL;
 		Page* _tmp5_ = NULL;
 		gconstpointer _tmp6_ = NULL;
@@ -3586,15 +3568,15 @@ void book_view_set_selected_page (BookView* self, Page* value) {
 		_tmp6_ = g_hash_table_lookup (_tmp4_, _tmp5_);
 #line 43 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, (PageView*) _tmp6_);
-#line 3590 "book-view.c"
+#line 3572 "book-view.c"
 	} else {
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		book_view_select_page_view (self, NULL);
-#line 3594 "book-view.c"
+#line 3576 "book-view.c"
 	}
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "selected-page");
-#line 3598 "book-view.c"
+#line 3580 "book-view.c"
 }
 
 
@@ -3612,7 +3594,7 @@ gint book_view_get_x_offset (BookView* self) {
 	result = (gint) _tmp1_;
 #line 66 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	return result;
-#line 3616 "book-view.c"
+#line 3598 "book-view.c"
 }
 
 
@@ -3629,7 +3611,7 @@ void book_view_set_x_offset (BookView* self, gint value) {
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_object_notify ((GObject *) self, "x-offset");
-#line 3633 "book-view.c"
+#line 3615 "book-view.c"
 }
 
 
@@ -3648,19 +3630,19 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 		data1 = closure->data;
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3652 "book-view.c"
+#line 3634 "book-view.c"
 	} else {
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		data2 = closure->data;
-#line 3658 "book-view.c"
+#line 3640 "book-view.c"
 	}
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback);
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
-#line 3664 "book-view.c"
+#line 3646 "book-view.c"
 }
 
 
@@ -3687,7 +3669,7 @@ static void book_view_class_init (BookViewClass * klass) {
 	g_signal_new ("show_page", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__PAGE, G_TYPE_NONE, 1, TYPE_PAGE);
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	g_signal_new ("show_menu", TYPE_BOOK_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3691 "book-view.c"
+#line 3673 "book-view.c"
 }
 
 
@@ -3696,7 +3678,7 @@ static void book_view_instance_init (BookView * self) {
 	self->priv = BOOK_VIEW_GET_PRIVATE (self);
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	self->priv->selected_page_view = NULL;
-#line 3700 "book-view.c"
+#line 3682 "book-view.c"
 }
 
 
@@ -3822,7 +3804,7 @@ static void book_view_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->adjustment);
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 	G_OBJECT_CLASS (book_view_parent_class)->finalize (obj);
-#line 3826 "book-view.c"
+#line 3808 "book-view.c"
 }
 
 
@@ -3861,13 +3843,13 @@ static void _vala_book_view_get_property (GObject * object, guint property_id, G
 		g_value_set_int (value, book_view_get_x_offset (self));
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 3865 "book-view.c"
+#line 3847 "book-view.c"
 		default:
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 3871 "book-view.c"
+#line 3853 "book-view.c"
 	}
 }
 
@@ -3895,13 +3877,13 @@ static void _vala_book_view_set_property (GObject * object, guint property_id, c
 		book_view_set_x_offset (self, g_value_get_int (value));
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 3899 "book-view.c"
+#line 3881 "book-view.c"
 		default:
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 15 "/home/bob/bzr/simple-scan/trunk/src/book-view.vala"
 		break;
-#line 3905 "book-view.c"
+#line 3887 "book-view.c"
 	}
 }
 
diff --git a/src/book-view.vala b/src/book-view.vala
index 833e723..7e337f1 100644
--- a/src/book-view.vala
+++ b/src/book-view.vala
@@ -67,7 +67,7 @@ public class BookView : Gtk.Box
         }
         set
         {
-            adjustment.set_value (value);
+            adjustment.value = value;
         }
     }
 
@@ -97,12 +97,12 @@ public class BookView : Gtk.Box
 
         drawing_area = new Gtk.DrawingArea ();
         drawing_area.set_size_request (200, 100);
-        drawing_area.set_can_focus (true);
-        drawing_area.set_events (Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.FOCUS_CHANGE_MASK | Gdk.EventMask.STRUCTURE_MASK | Gdk.EventMask.SCROLL_MASK);
+        drawing_area.can_focus = true;
+        drawing_area.events = Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.FOCUS_CHANGE_MASK | Gdk.EventMask.STRUCTURE_MASK | Gdk.EventMask.SCROLL_MASK;
         pack_start (drawing_area, true, true, 0);
 
         scroll = new Gtk.Scrollbar (Gtk.Orientation.HORIZONTAL, null);
-        adjustment = scroll.get_adjustment ();
+        adjustment = scroll.adjustment;
         pack_start (scroll, false, true, 0);
 
         drawing_area.configure_event.connect (configure_cb);
@@ -115,7 +115,7 @@ public class BookView : Gtk.Box
         drawing_area.focus_out_event.connect_after (focus_cb);
         adjustment.value_changed.connect (scroll_cb);
 
-        drawing_area.show ();
+        drawing_area.visible = true;
     }
 
     ~BookView ()
@@ -221,7 +221,7 @@ public class BookView : Gtk.Box
         Gtk.Allocation allocation;
         drawing_area.get_allocation (out allocation);
         var left_edge = page.x_offset;
-        var right_edge = page.x_offset + page.get_width ();
+        var right_edge = page.x_offset + page.width;
 
         if (left_edge - x_offset < 0)
             x_offset = left_edge;
@@ -339,19 +339,19 @@ public class BookView : Gtk.Box
             {
                 /* Set width scaled on DPI and maximum width */
                 int w = (int) ((double)p.width * max_dpi * width / (p.dpi * max_width));
-                page.set_width (w);
+                page.width = w;
             }
             else
             {
                 /* Set height scaled on DPI and maximum height */
                 int h = (int) ((double)p.height * max_dpi * height / (p.dpi * max_height));
-                page.set_height (h);
+                page.height = h;
             }
 
-            var h = page.get_height ();
+            var h = page.height;
             if (h > book_height)
                 book_height = h;
-            book_width += page.get_width ();
+            book_width += page.width;
             if (i != 0)
                 book_width += spacing;
         }
@@ -363,10 +363,10 @@ public class BookView : Gtk.Box
 
             /* Layout pages left to right */
             page.x_offset = x_offset;
-            x_offset += page.get_width () + spacing;
+            x_offset += page.width + spacing;
 
             /* Centre page vertically */
-            page.y_offset = (height - page.get_height ()) / 2;
+            page.y_offset = (height - page.height) / 2;
         }
     }
 
@@ -401,24 +401,24 @@ public class BookView : Gtk.Box
             layout_into (width, height, out book_width, out book_height);
 
             /* Set scrollbar limits */
-            adjustment.set_lower (0);
-            adjustment.set_upper (book_width);
-            adjustment.set_page_size (allocation.width);
+            adjustment.lower = 0;
+            adjustment.upper = book_width;
+            adjustment.page_size = allocation.width;
 
             /* Keep right-aligned */
             var max_offset = book_width - allocation.width;
             if (right_aligned || x_offset > max_offset)
                 x_offset = max_offset;
 
-            scroll.show ();
+            scroll.visible = true;
         }
         else
         {
-            scroll.hide ();
+            scroll.visible = false;
             var offset = (book_width - allocation.width) / 2;
-            adjustment.set_lower (offset);
-            adjustment.set_upper (offset);
-            adjustment.set_page_size (0);
+            adjustment.lower = offset;
+            adjustment.upper = offset;
+            adjustment.page_size = 0;
             x_offset = offset;
         }
 
@@ -445,7 +445,7 @@ public class BookView : Gtk.Box
         {
             var page = get_nth_page (i);
             var left_edge = page.x_offset - x_offset;
-            var right_edge = page.x_offset + page.get_width () - x_offset;
+            var right_edge = page.x_offset + page.width - x_offset;
 
             /* Page not visible, don't render */
             if (right_edge < left || left_edge > right)
@@ -460,8 +460,8 @@ public class BookView : Gtk.Box
                 drawing_area.get_style_context ().render_focus (context,
                                                                 page.x_offset - x_offset,
                                                                 page.y_offset,
-                                                                page.get_width (),
-                                                                page.get_height ());
+                                                                page.width,
+                                                                page.height);
         }
 
         return false;
@@ -474,9 +474,9 @@ public class BookView : Gtk.Box
         {
             var page = get_nth_page (i);
             var left = page.x_offset;
-            var right = left + page.get_width ();
+            var right = left + page.width;
             var top = page.y_offset;
-            var bottom = top + page.get_height ();
+            var bottom = top + page.height;
             if (x >= left && x <= right && y >= top && y <= bottom)
             {
                 x_ = x - left;
diff --git a/src/book.c b/src/book.c
index def1bd0..45fd555 100644
--- a/src/book.c
+++ b/src/book.c
@@ -1,4 +1,4 @@
-/* book.c generated by valac 0.22.1, the Vala compiler
+/* book.c generated by valac 0.24.0, the Vala compiler
  * generated from book.vala, do not modify */
 
 /*
@@ -177,11 +177,14 @@ void book_clear (Book* self);
 void book_set_needs_saving (Book* self, gboolean value);
 void book_append_page (Book* self, Page* page);
 void book_move_page (Book* self, Page* page, guint location);
+void book_reverse (Book* self);
+void book_combine_sides (Book* self);
+guint book_get_n_pages (Book* self);
+void book_combine_sides_reverse (Book* self);
 void book_delete_page (Book* self, Page* page);
 Page* book_get_page (Book* self, gint page_number);
 guint book_get_page_index (Book* self, Page* page);
 static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i);
-guint book_get_n_pages (Book* self);
 static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error);
 void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkPixbuf* image, gdouble dpi);
@@ -240,28 +243,28 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static gpointer _page_ref0 (gpointer self) {
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? page_ref (self) : NULL;
-#line 244 "book.c"
+#line 247 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_page_changed_cb (self, _sender);
-#line 251 "book.c"
+	book_page_changed_cb ((Book*) self, _sender);
+#line 254 "book.c"
 }
 
 
 static void _book_page_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	book_page_changed_cb (self, _sender);
-#line 258 "book.c"
+	book_page_changed_cb ((Book*) self, _sender);
+#line 261 "book.c"
 }
 
 
 static void _page_unref0_ (gpointer var) {
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(var == NULL) ? NULL : (var = (page_unref (var), NULL));
-#line 265 "book.c"
+#line 268 "book.c"
 }
 
 
@@ -270,7 +273,7 @@ static void _g_list_free__page_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _page_unref0_, NULL);
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_list_free (self);
-#line 274 "book.c"
+#line 277 "book.c"
 }
 
 
@@ -284,14 +287,14 @@ Book* book_construct (GType object_type) {
 	self->priv->pages = NULL;
 #line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 288 "book.c"
+#line 291 "book.c"
 }
 
 
 Book* book_new (void) {
 #line 38 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return book_construct (TYPE_BOOK);
-#line 295 "book.c"
+#line 298 "book.c"
 }
 
 
@@ -301,7 +304,7 @@ void book_clear (Book* self) {
 	g_return_if_fail (self != NULL);
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 305 "book.c"
+#line 308 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
@@ -309,14 +312,14 @@ void book_clear (Book* self) {
 		page_collection = _tmp0_;
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 313 "book.c"
+#line 316 "book.c"
 			Page* _tmp1_ = NULL;
 			Page* page = NULL;
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
-#line 320 "book.c"
+#line 323 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -336,7 +339,7 @@ void book_clear (Book* self) {
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 340 "book.c"
+#line 343 "book.c"
 			}
 		}
 	}
@@ -346,7 +349,7 @@ void book_clear (Book* self) {
 	self->priv->pages = NULL;
 #line 60 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "cleared");
-#line 350 "book.c"
+#line 353 "book.c"
 }
 
 
@@ -357,7 +360,7 @@ static void book_page_changed_cb (Book* self, Page* page) {
 	g_return_if_fail (page != NULL);
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 361 "book.c"
+#line 364 "book.c"
 }
 
 
@@ -391,7 +394,7 @@ void book_append_page (Book* self, Page* page) {
 	g_signal_emit_by_name (self, "page-added", _tmp4_);
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 395 "book.c"
+#line 398 "book.c"
 }
 
 
@@ -420,7 +423,302 @@ void book_move_page (Book* self, Page* page, guint location) {
 	g_signal_emit_by_name (self, "reordered");
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 424 "book.c"
+#line 427 "book.c"
+}
+
+
+void book_reverse (Book* self) {
+	GList* new_pages = NULL;
+	GList* _tmp0_ = NULL;
+	GList* _tmp4_ = NULL;
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_if_fail (self != NULL);
+#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	new_pages = NULL;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = self->priv->pages;
+#line 441 "book.c"
+	{
+		GList* page_collection = NULL;
+		GList* page_it = NULL;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		page_collection = _tmp0_;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
+#line 449 "book.c"
+			Page* _tmp1_ = NULL;
+			Page* page = NULL;
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			_tmp1_ = _page_ref0 ((Page*) page_it->data);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			page = _tmp1_;
+#line 456 "book.c"
+			{
+				Page* _tmp2_ = NULL;
+				Page* _tmp3_ = NULL;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp2_ = page;
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp3_ = _page_ref0 (_tmp2_);
+#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				new_pages = g_list_prepend (new_pages, _tmp3_);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_page_unref0 (page);
+#line 468 "book.c"
+			}
+		}
+	}
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp4_ = new_pages;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	new_pages = NULL;
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	__g_list_free__page_unref0_0 (self->priv->pages);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->pages = _tmp4_;
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_emit_by_name (self, "reordered");
+#line 94 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	book_set_needs_saving (self, TRUE);
+#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	__g_list_free__page_unref0_0 (new_pages);
+#line 486 "book.c"
+}
+
+
+void book_combine_sides (Book* self) {
+	guint n_front = 0U;
+	guint _tmp0_ = 0U;
+	guint _tmp1_ = 0U;
+	guint _tmp2_ = 0U;
+	guint _tmp3_ = 0U;
+	GList* new_pages = NULL;
+	GList* _tmp19_ = NULL;
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_if_fail (self != NULL);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = book_get_n_pages (self);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp1_ = _tmp0_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp2_ = book_get_n_pages (self);
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp3_ = _tmp2_;
+#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	n_front = _tmp1_ - (_tmp3_ / 2);
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	new_pages = NULL;
+#line 512 "book.c"
+	{
+		gint i = 0;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		i = 0;
+#line 517 "book.c"
+		{
+			gboolean _tmp4_ = FALSE;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			_tmp4_ = TRUE;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			while (TRUE) {
+#line 524 "book.c"
+				gint _tmp6_ = 0;
+				guint _tmp7_ = 0U;
+				guint _tmp8_ = 0U;
+				gint _tmp9_ = 0;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp4_) {
+#line 531 "book.c"
+					gint _tmp5_ = 0;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp5_ = i;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp5_ + 1;
+#line 537 "book.c"
+				}
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp4_ = FALSE;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp6_ = i;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp7_ = book_get_n_pages (self);
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp8_ = _tmp7_;
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp6_) < _tmp8_)) {
+#line 101 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					break;
+#line 551 "book.c"
+				}
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp9_ = i;
+#line 103 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if ((_tmp9_ % 2) == 0) {
+#line 557 "book.c"
+					GList* _tmp10_ = NULL;
+					gint _tmp11_ = 0;
+					gconstpointer _tmp12_ = NULL;
+					Page* _tmp13_ = NULL;
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp10_ = self->priv->pages;
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp11_ = i;
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp12_ = g_list_nth_data (_tmp10_, (guint) (_tmp11_ / 2));
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp13_ = _page_ref0 ((Page*) _tmp12_);
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					new_pages = g_list_append (new_pages, _tmp13_);
+#line 572 "book.c"
+				} else {
+					GList* _tmp14_ = NULL;
+					guint _tmp15_ = 0U;
+					gint _tmp16_ = 0;
+					gconstpointer _tmp17_ = NULL;
+					Page* _tmp18_ = NULL;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp14_ = self->priv->pages;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp15_ = n_front;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp16_ = i;
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp17_ = g_list_nth_data (_tmp14_, _tmp15_ + (_tmp16_ / 2));
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp18_ = _page_ref0 ((Page*) _tmp17_);
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					new_pages = g_list_append (new_pages, _tmp18_);
+#line 591 "book.c"
+				}
+			}
+		}
+	}
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp19_ = new_pages;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	new_pages = NULL;
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	__g_list_free__page_unref0_0 (self->priv->pages);
+#line 108 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->pages = _tmp19_;
+#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_emit_by_name (self, "reordered");
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	book_set_needs_saving (self, TRUE);
+#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	__g_list_free__page_unref0_0 (new_pages);
+#line 610 "book.c"
+}
+
+
+void book_combine_sides_reverse (Book* self) {
+	GList* new_pages = NULL;
+	GList* _tmp16_ = NULL;
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_return_if_fail (self != NULL);
+#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	new_pages = NULL;
+#line 621 "book.c"
+	{
+		gint i = 0;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		i = 0;
+#line 626 "book.c"
+		{
+			gboolean _tmp0_ = FALSE;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			_tmp0_ = TRUE;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			while (TRUE) {
+#line 633 "book.c"
+				gint _tmp2_ = 0;
+				guint _tmp3_ = 0U;
+				guint _tmp4_ = 0U;
+				gint _tmp5_ = 0;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp0_) {
+#line 640 "book.c"
+					gint _tmp1_ = 0;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp1_ = i;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp1_ + 1;
+#line 646 "book.c"
+				}
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp0_ = FALSE;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp2_ = i;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp3_ = book_get_n_pages (self);
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp4_ = _tmp3_;
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp2_) < _tmp4_)) {
+#line 117 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					break;
+#line 660 "book.c"
+				}
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp5_ = i;
+#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if ((_tmp5_ % 2) == 0) {
+#line 666 "book.c"
+					GList* _tmp6_ = NULL;
+					gint _tmp7_ = 0;
+					gconstpointer _tmp8_ = NULL;
+					Page* _tmp9_ = NULL;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp6_ = self->priv->pages;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp7_ = i;
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp8_ = g_list_nth_data (_tmp6_, (guint) (_tmp7_ / 2));
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp9_ = _page_ref0 ((Page*) _tmp8_);
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					new_pages = g_list_append (new_pages, _tmp9_);
+#line 681 "book.c"
+				} else {
+					GList* _tmp10_ = NULL;
+					guint _tmp11_ = 0U;
+					guint _tmp12_ = 0U;
+					gint _tmp13_ = 0;
+					gconstpointer _tmp14_ = NULL;
+					Page* _tmp15_ = NULL;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp10_ = self->priv->pages;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp11_ = book_get_n_pages (self);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp12_ = _tmp11_;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp13_ = i;
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp14_ = g_list_nth_data (_tmp10_, (_tmp12_ - 1) - (_tmp13_ / 2));
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp15_ = _page_ref0 ((Page*) _tmp14_);
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					new_pages = g_list_append (new_pages, _tmp15_);
+#line 703 "book.c"
+				}
+			}
+		}
+	}
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp16_ = new_pages;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	new_pages = NULL;
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	__g_list_free__page_unref0_0 (self->priv->pages);
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->pages = _tmp16_;
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_emit_by_name (self, "reordered");
+#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	book_set_needs_saving (self, TRUE);
+#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	__g_list_free__page_unref0_0 (new_pages);
+#line 722 "book.c"
 }
 
 
@@ -431,33 +729,33 @@ void book_delete_page (Book* self, Page* page) {
 	guint _tmp3_ = 0U;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 86 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (page != NULL);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page;
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("pixels-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _book_page_changed_cb_page_pixels_changed, self);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = page;
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_parse_name ("crop-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = page;
-#line 90 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	g_signal_emit_by_name (self, "page-removed", _tmp4_);
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	self->priv->pages = g_list_remove (self->priv->pages, _tmp4_);
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page;
-#line 91 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	self->priv->pages = g_list_remove (self->priv->pages, _tmp5_);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 135 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	g_signal_emit_by_name (self, "page-removed", _tmp5_);
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	book_set_needs_saving (self, TRUE);
-#line 461 "book.c"
+#line 759 "book.c"
 }
 
 
@@ -468,39 +766,39 @@ Page* book_get_page (Book* self, gint page_number) {
 	gint _tmp5_ = 0;
 	gconstpointer _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
-#line 95 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = page_number;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp0_ < 0) {
-#line 478 "book.c"
+#line 776 "book.c"
 		GList* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		gint _tmp3_ = 0;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = self->priv->pages;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = g_list_length (_tmp1_);
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = page_number;
-#line 98 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		page_number = ((gint) _tmp2_) + _tmp3_;
-#line 490 "book.c"
+#line 788 "book.c"
 	}
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->priv->pages;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = page_number;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = g_list_nth_data (_tmp4_, (guint) _tmp5_);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = _page_ref0 ((Page*) _tmp6_);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp7_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 504 "book.c"
+#line 802 "book.c"
 }
 
 
@@ -509,21 +807,21 @@ guint book_get_page_index (Book* self, Page* page) {
 	GList* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 102 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (page != NULL, 0U);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = page;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_index (_tmp0_, _tmp1_);
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = (guint) _tmp2_;
-#line 104 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 527 "book.c"
+#line 825 "book.c"
 }
 
 
@@ -534,35 +832,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 928 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 552 "book.c"
+#line 850 "book.c"
 		gchar* _tmp4_ = NULL;
-#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 560 "book.c"
+#line 858 "book.c"
 	} else {
-#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = -1;
-#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 566 "book.c"
+#line 864 "book.c"
 	}
 }
 
@@ -577,118 +875,112 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gboolean _tmp8_ = FALSE;
 	glong _tmp9_ = 0L;
 	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	glong _tmp14_ = 0L;
-	gboolean _tmp17_ = FALSE;
+	glong _tmp13_ = 0L;
+	glong _tmp16_ = 0L;
+	glong _tmp17_ = 0L;
 	glong _tmp18_ = 0L;
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	glong _tmp22_ = 0L;
-	gchar* _tmp23_ = NULL;
-#line 1189 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+	gchar* _tmp21_ = NULL;
+#line 1226 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 602 "book.c"
+#line 898 "book.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 611 "book.c"
+#line 907 "book.c"
 	}
-#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 617 "book.c"
+#line 913 "book.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 626 "book.c"
+#line 922 "book.c"
 	}
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 632 "book.c"
+#line 928 "book.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 641 "book.c"
+#line 937 "book.c"
 	} else {
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 645 "book.c"
+#line 941 "book.c"
 	}
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp12_ = _tmp8_;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp14_ = end;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp14_ >= ((glong) 0)) {
-#line 655 "book.c"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp8_, NULL);
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp13_ = end;
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp13_ >= ((glong) 0)) {
+#line 949 "book.c"
+		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp15_ = end;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp16_ = string_length;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp13_ = _tmp15_ <= _tmp16_;
-#line 664 "book.c"
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp14_ = end;
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp12_ = _tmp14_ <= _tmp15_;
+#line 958 "book.c"
 	} else {
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp13_ = FALSE;
-#line 668 "book.c"
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp12_ = FALSE;
+#line 962 "book.c"
 	}
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp17_ = _tmp13_;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp17_, NULL);
-#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp12_, NULL);
+#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp16_ = start;
+#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp17_ = end;
+#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL);
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp21_ = end;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp22_ = start;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_));
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	result = _tmp23_;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	result = _tmp21_;
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 692 "book.c"
+#line 984 "book.c"
 }
 
 
@@ -734,56 +1026,56 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 	gchar* _tmp46_ = NULL;
 	const gchar* _tmp47_ = NULL;
 	GFile* _tmp48_ = NULL;
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 151 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = book_get_n_pages (self);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 153 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp1_ == ((guint) 1)) {
-#line 748 "book.c"
+#line 1040 "book.c"
 		const gchar* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = uri;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = g_file_new_for_uri (_tmp2_);
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp3_;
-#line 110 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 759 "book.c"
+#line 1051 "book.c"
 	}
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = uri;
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = g_path_get_basename (_tmp4_);
-#line 113 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	basename = _tmp5_;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = uri;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	prefix = _tmp7_;
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = g_strdup ("");
-#line 114 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	suffix = _tmp8_;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = basename;
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
-#line 115 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	extension_index = _tmp10_;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = extension_index;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp11_ >= 0) {
-#line 787 "book.c"
+#line 1079 "book.c"
 		const gchar* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
 		const gchar* _tmp14_ = NULL;
@@ -798,233 +1090,230 @@ static GFile* book_make_indexed_file (Book* self, const gchar* uri, gint i) {
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		gchar* _tmp25_ = NULL;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp12_ = basename;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp13_ = extension_index;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp14_ = basename;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp15_ = strlen (_tmp14_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp16_ = _tmp15_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp17_ = string_slice (_tmp12_, (glong) _tmp13_, (glong) _tmp16_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_free0 (suffix);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		suffix = _tmp17_;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp18_ = uri;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp19_ = uri;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp20_ = strlen (_tmp19_);
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp21_ = _tmp20_;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp22_ = suffix;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp23_ = strlen (_tmp22_);
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp24_ = _tmp23_;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp25_ = string_slice (_tmp18_, (glong) 0, (glong) (_tmp21_ - _tmp24_));
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_free0 (prefix);
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		prefix = _tmp25_;
-#line 838 "book.c"
+#line 1130 "book.c"
 	}
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp26_ = book_get_n_pages (self);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp27_ = _tmp26_;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp28_ = g_strdup_printf ("%u", _tmp27_);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp29_ = _tmp28_;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp30_ = strlen (_tmp29_);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp31_ = _tmp30_;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp32_ = _tmp31_;
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp29_);
-#line 121 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	width = _tmp32_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp33_ = width;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp34_ = g_strdup_printf ("%%0%dd", _tmp33_);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 166 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	number_format = _tmp34_;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp35_ = prefix;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp36_ = g_strconcat (_tmp35_, "-", NULL);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp37_ = _tmp36_;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp38_ = number_format;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp39_ = i;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp40_ = g_strdup_printf (_tmp38_, _tmp39_ + 1);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp41_ = _tmp40_;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp42_ = g_strconcat (_tmp37_, _tmp41_, NULL);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp43_ = _tmp42_;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp44_ = suffix;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp45_ = g_strconcat (_tmp43_, _tmp44_, NULL);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp46_ = _tmp45_;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp43_);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp41_);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp37_);
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	filename = _tmp46_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp47_ = filename;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp48_ = g_file_new_for_uri (_tmp47_);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp48_;
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (filename);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (number_format);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (suffix);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (prefix);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (basename);
-#line 124 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 914 "book.c"
+#line 1206 "book.c"
 }
 
 
 static void book_save_multi_file (Book* self, const gchar* type, gint quality, GFile* file, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 926 "book.c"
+#line 1218 "book.c"
 	{
 		gint i = 0;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 931 "book.c"
+#line 1223 "book.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp0_ = TRUE;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 938 "book.c"
-				gboolean _tmp1_ = FALSE;
-				gint _tmp3_ = 0;
+#line 1230 "book.c"
+				gint _tmp2_ = 0;
+				guint _tmp3_ = 0U;
 				guint _tmp4_ = 0U;
-				guint _tmp5_ = 0U;
 				Page* page = NULL;
-				gint _tmp6_ = 0;
+				gint _tmp5_ = 0;
+				Page* _tmp6_ = NULL;
 				Page* _tmp7_ = NULL;
-				Page* _tmp8_ = NULL;
-				const gchar* _tmp9_ = NULL;
-				gint _tmp10_ = 0;
-				GFile* _tmp11_ = NULL;
+				const gchar* _tmp8_ = NULL;
+				gint _tmp9_ = 0;
+				GFile* _tmp10_ = NULL;
+				gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
-				gchar* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
+				gint _tmp13_ = 0;
+				GFile* _tmp14_ = NULL;
 				GFile* _tmp15_ = NULL;
-				GFile* _tmp16_ = NULL;
-				gint _tmp17_ = 0;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp1_ = _tmp0_;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp1_) {
-#line 960 "book.c"
-					gint _tmp2_ = 0;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp2_ = i;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp2_ + 1;
-#line 966 "book.c"
+				gint _tmp16_ = 0;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp0_) {
+#line 1249 "book.c"
+					gint _tmp1_ = 0;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp1_ = i;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp1_ + 1;
+#line 1255 "book.c"
 				}
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp0_ = FALSE;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp3_ = i;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp4_ = book_get_n_pages (self);
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp5_ = _tmp4_;
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp3_) < _tmp5_)) {
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp2_ = i;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp3_ = book_get_n_pages (self);
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp4_ = _tmp3_;
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp2_) < _tmp4_)) {
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 980 "book.c"
+#line 1269 "book.c"
 				}
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp6_ = i;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = book_get_page (self, _tmp6_);
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp7_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp8_ = page;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = type;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp10_ = quality;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp11_ = file;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp12_ = g_file_get_uri (_tmp11_);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp13_ = _tmp12_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp14_ = i;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp15_ = book_make_indexed_file (self, _tmp13_, _tmp14_);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp16_ = _tmp15_;
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_save (_tmp8_, _tmp9_, _tmp10_, _tmp16_, &_inner_error_);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_object_unref0 (_tmp16_);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp13_);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp5_ = i;
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp6_ = book_get_page (self, _tmp5_);
+#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page = _tmp6_;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp7_ = page;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp8_ = type;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp9_ = quality;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp10_ = file;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp11_ = g_file_get_uri (_tmp10_);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp12_ = _tmp11_;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp13_ = i;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp14_ = book_make_indexed_file (self, _tmp12_, _tmp13_);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp15_ = _tmp14_;
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page_save (_tmp7_, _tmp8_, _tmp9_, _tmp15_, &_inner_error_);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_object_unref0 (_tmp15_);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp12_);
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_page_unref0 (page);
-#line 132 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 176 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 1020 "book.c"
+#line 1309 "book.c"
 				}
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp17_ = i;
-#line 133 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp17_);
-#line 129 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp16_ = i;
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp16_);
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 1028 "book.c"
+#line 1317 "book.c"
 			}
 		}
 	}
@@ -1039,44 +1328,44 @@ static void book_save_ps_pdf_surface (Book* self, cairo_surface_t* surface, GdkP
 	gdouble _tmp3_ = 0.0;
 	GdkPixbuf* _tmp4_ = NULL;
 	cairo_pattern_t* _tmp5_ = NULL;
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (surface != NULL);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (image != NULL);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = surface;
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = cairo_create (_tmp0_);
-#line 139 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 183 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	context = _tmp1_;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = dpi;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = dpi;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_scale (context, 72.0 / _tmp2_, 72.0 / _tmp3_);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = image;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 185 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	gdk_cairo_set_source_pixbuf (context, _tmp4_, (gdouble) 0, (gdouble) 0);
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = cairo_get_source (context);
-#line 142 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_pattern_set_filter (_tmp5_, CAIRO_FILTER_BEST);
-#line 143 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	cairo_paint (context);
-#line 137 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_destroy0 (context);
-#line 1073 "book.c"
+#line 1362 "book.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 1080 "book.c"
+#line 1369 "book.c"
 }
 
 
@@ -1091,61 +1380,61 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 	cairo_surface_t* _tmp4_ = NULL;
 	cairo_surface_t* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = file;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream = _tmp1_;
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
-#line 148 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 1111 "book.c"
+#line 1400 "book.c"
 	}
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = ps_writer_new (stream);
-#line 149 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	writer = _tmp2_;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = writer;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = _tmp3_->surface;
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = _cairo_surface_reference0 (_tmp4_);
-#line 150 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	surface = _tmp5_;
-#line 1125 "book.c"
+#line 1414 "book.c"
 	{
 		gint i = 0;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1130 "book.c"
+#line 1419 "book.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp6_ = TRUE;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 1137 "book.c"
-				gboolean _tmp7_ = FALSE;
-				gint _tmp9_ = 0;
+#line 1426 "book.c"
+				gint _tmp8_ = 0;
+				guint _tmp9_ = 0U;
 				guint _tmp10_ = 0U;
-				guint _tmp11_ = 0U;
 				Page* page = NULL;
-				gint _tmp12_ = 0;
-				Page* _tmp13_ = NULL;
+				gint _tmp11_ = 0;
+				Page* _tmp12_ = NULL;
 				GdkPixbuf* image = NULL;
-				Page* _tmp14_ = NULL;
-				GdkPixbuf* _tmp15_ = NULL;
+				Page* _tmp13_ = NULL;
+				GdkPixbuf* _tmp14_ = NULL;
 				gdouble width = 0.0;
-				GdkPixbuf* _tmp16_ = NULL;
+				GdkPixbuf* _tmp15_ = NULL;
+				gint _tmp16_ = 0;
 				gint _tmp17_ = 0;
 				Page* _tmp18_ = NULL;
 				gint _tmp19_ = 0;
@@ -1153,124 +1442,127 @@ static void book_save_ps (Book* self, GFile* file, GError** error) {
 				gdouble height = 0.0;
 				GdkPixbuf* _tmp21_ = NULL;
 				gint _tmp22_ = 0;
-				Page* _tmp23_ = NULL;
-				gint _tmp24_ = 0;
+				gint _tmp23_ = 0;
+				Page* _tmp24_ = NULL;
 				gint _tmp25_ = 0;
-				cairo_surface_t* _tmp26_ = NULL;
-				gdouble _tmp27_ = 0.0;
+				gint _tmp26_ = 0;
+				cairo_surface_t* _tmp27_ = NULL;
 				gdouble _tmp28_ = 0.0;
-				cairo_surface_t* _tmp29_ = NULL;
-				GdkPixbuf* _tmp30_ = NULL;
-				Page* _tmp31_ = NULL;
-				gint _tmp32_ = 0;
+				gdouble _tmp29_ = 0.0;
+				cairo_surface_t* _tmp30_ = NULL;
+				GdkPixbuf* _tmp31_ = NULL;
+				Page* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
-				cairo_surface_t* _tmp34_ = NULL;
-				gint _tmp35_ = 0;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp7_ = _tmp6_;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp7_) {
-#line 1174 "book.c"
-					gint _tmp8_ = 0;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp8_ = i;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp8_ + 1;
-#line 1180 "book.c"
+				gint _tmp34_ = 0;
+				cairo_surface_t* _tmp35_ = NULL;
+				gint _tmp36_ = 0;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp6_) {
+#line 1462 "book.c"
+					gint _tmp7_ = 0;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp7_ = i;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp7_ + 1;
+#line 1468 "book.c"
 				}
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = FALSE;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp9_ = i;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp10_ = book_get_n_pages (self);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp11_ = _tmp10_;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp9_) < _tmp11_)) {
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp8_ = i;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp9_ = book_get_n_pages (self);
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp10_ = _tmp9_;
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp8_) < _tmp10_)) {
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 1194 "book.c"
+#line 1482 "book.c"
 				}
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp12_ = i;
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp13_ = book_get_page (self, _tmp12_);
-#line 154 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp13_;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp14_ = page;
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp15_ = page_get_image (_tmp14_, TRUE);
-#line 155 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				image = _tmp15_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp16_ = image;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp17_ = gdk_pixbuf_get_width (_tmp16_);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp11_ = i;
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp12_ = book_get_page (self, _tmp11_);
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page = _tmp12_;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp13_ = page;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp14_ = page_get_image (_tmp13_, TRUE);
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				image = _tmp14_;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp15_ = image;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp16_ = gdk_pixbuf_get_width (_tmp15_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp17_ = _tmp16_;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp18_ = page;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp19_ = page_get_dpi (_tmp18_);
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp20_ = _tmp19_;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width = (_tmp17_ * 72.0) / _tmp20_;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp21_ = image;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp22_ = gdk_pixbuf_get_height (_tmp21_);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp23_ = page;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp24_ = page_get_dpi (_tmp23_);
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp25_ = _tmp24_;
-#line 157 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height = (_tmp22_ * 72.0) / _tmp25_;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp26_ = surface;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp27_ = width;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp28_ = height;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				cairo_ps_surface_set_size (_tmp26_, _tmp27_, _tmp28_);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp29_ = surface;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp30_ = image;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp31_ = page;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp32_ = page_get_dpi (_tmp31_);
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp33_ = _tmp32_;
-#line 159 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				book_save_ps_pdf_surface (self, _tmp29_, _tmp30_, (gdouble) _tmp33_);
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp34_ = surface;
-#line 160 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				cairo_surface_show_page (_tmp34_);
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp35_ = i;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp35_);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp23_ = _tmp22_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp24_ = page;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp25_ = page_get_dpi (_tmp24_);
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp26_ = _tmp25_;
+#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				height = (_tmp23_ * 72.0) / _tmp26_;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp27_ = surface;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp28_ = width;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp29_ = height;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				cairo_ps_surface_set_size (_tmp27_, _tmp28_, _tmp29_);
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp30_ = surface;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp31_ = image;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp32_ = page;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp33_ = page_get_dpi (_tmp32_);
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp34_ = _tmp33_;
+#line 203 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				book_save_ps_pdf_surface (self, _tmp30_, _tmp31_, (gdouble) _tmp34_);
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp35_ = surface;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				cairo_surface_show_page (_tmp35_);
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp36_ = i;
+#line 205 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp36_);
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_g_object_unref0 (image);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 1264 "book.c"
+#line 1556 "book.c"
 			}
 		}
 	}
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (surface);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_ps_writer_unref0 (writer);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 190 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
-#line 1274 "book.c"
+#line 1566 "book.c"
 }
 
 
@@ -1298,140 +1590,140 @@ static guint8* book_compress_zlib (Book* self, guint8* data, int data_length1, i
 	gint _tmp14_ = 0;
 	guint8* _tmp15_ = NULL;
 	gint _tmp15__length1 = 0;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 167 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 211 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateInit (&stream, (gint) Z_BEST_COMPRESSION);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = data;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0__length1 = data_length1;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_new0 (guint8, _tmp0__length1);
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = _tmp1_;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp0__length1;
-#line 168 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = out_data_length1;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = data;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2__length1 = data_length1;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_in = _tmp2_;
-#line 170 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 214 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_in = _tmp2__length1;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = out_data;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = out_data_length1;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.next_out = _tmp3_;
-#line 171 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	stream.avail_out = _tmp3__length1;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	while (TRUE) {
-#line 1336 "book.c"
+#line 1628 "book.c"
 		z_stream _tmp4_ = {0};
 		guint _tmp5_ = 0U;
 		gint _tmp6_ = 0;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp4_ = stream;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp5_ = _tmp4_.avail_in;
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (!(_tmp5_ > ((guint) 0))) {
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
-#line 1348 "book.c"
+#line 1640 "book.c"
 		}
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp6_ = deflate (&stream, (gint) Z_FINISH);
-#line 174 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_tmp6_ == ((gint) Z_STREAM_ERROR)) {
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			break;
-#line 1356 "book.c"
+#line 1648 "book.c"
 		}
 	}
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = stream;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = _tmp7_.avail_in;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_tmp8_ > ((guint) 0)) {
-#line 1365 "book.c"
+#line 1657 "book.c"
 		guint8* _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9_ = NULL;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp9__length1 = 0;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (result_length1) {
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			*result_length1 = _tmp9__length1;
-#line 1376 "book.c"
+#line 1668 "book.c"
 		}
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = _tmp9_;
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		out_data = (g_free (out_data), NULL);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		deflateEnd (&stream);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 223 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 1386 "book.c"
+#line 1678 "book.c"
 	}
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = data;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10__length1 = data_length1;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = stream;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = _tmp11_.avail_out;
-#line 181 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	n_written = _tmp10__length1 - _tmp12_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = n_written;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp14_ = (gint) _tmp13_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data = g_renew (guint8, out_data, (gint) _tmp13_);
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	(_tmp14_ > out_data_length1) ? memset (out_data + out_data_length1, 0, sizeof (guint8) * (_tmp14_ - out_data_length1)) : NULL;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	out_data_length1 = _tmp14_;
-#line 182 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_out_data_size_ = _tmp14_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = out_data;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15__length1 = out_data_length1;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (result_length1) {
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp15__length1;
-#line 1418 "book.c"
+#line 1710 "book.c"
 	}
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp15_;
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	deflateEnd (&stream);
-#line 184 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1426 "book.c"
+#line 1718 "book.c"
 }
 
 
 static gboolean _book_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
-	result = book_write_pixbuf_data (self, buf, buf_length1, error);
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	result = book_write_pixbuf_data ((Book*) self, buf, buf_length1, error);
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1435 "book.c"
+#line 1727 "book.c"
 }
 
 
@@ -1466,84 +1758,84 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	guint8* _tmp17_ = NULL;
 	gint _tmp17__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 233 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (image != NULL, NULL);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = g_byte_array_new ();
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 235 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->jpeg_data = _tmp0_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = g_strdup ("quality");
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_strdup ("density-unit");
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = g_strdup ("x-density");
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = g_strdup ("y-density");
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = g_new0 (gchar*, 5 + 1);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[0] = _tmp1_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[1] = _tmp2_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[2] = _tmp3_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[3] = _tmp4_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_[4] = NULL;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys = _tmp5_;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys_length1 = 5;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 236 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_keys_size_ = keys_length1;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp6_ = quality;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp7_ = g_strdup_printf ("%d", _tmp6_);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp8_ = g_strdup ("dots-per-inch");
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp9_ = dpi;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp10_ = g_strdup_printf ("%d", _tmp9_);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp11_ = dpi;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = g_strdup_printf ("%d", _tmp11_);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = g_new0 (gchar*, 5 + 1);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[0] = _tmp7_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[1] = _tmp8_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[2] = _tmp10_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[3] = _tmp12_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_[4] = NULL;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values = _tmp13_;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values_length1 = 5;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_values_size_ = values_length1;
-#line 1538 "book.c"
+#line 1830 "book.c"
 	{
 		GdkPixbuf* _tmp14_ = NULL;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp14_ = image;
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		gdk_pixbuf_save_to_callbackv (_tmp14_, _book_write_pixbuf_data_gdk_pixbuf_save_func, self, "jpeg", keys, values, &_inner_error_);
-#line 196 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 240 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-#line 1547 "book.c"
+#line 1839 "book.c"
 			goto __catch0_g_error;
 		}
 	}
@@ -1551,66 +1843,68 @@ static guint8* book_compress_jpeg (Book* self, GdkPixbuf* image, gint quality, g
 	__catch0_g_error:
 	{
 		GError* e = NULL;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 1561 "book.c"
+#line 1853 "book.c"
 	}
 	__finally0:
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 194 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return NULL;
-#line 1576 "book.c"
+#line 1868 "book.c"
 	}
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_ = self->priv->jpeg_data;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16_ = _tmp15_->data;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp16__length1 = _tmp15_->len;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp15_->data = NULL;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp15_->len = 0;
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	data = _tmp16_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	data_length1 = _tmp16__length1;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 245 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_data_size_ = data_length1;
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 202 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 246 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->jpeg_data = NULL;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17_ = data;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp17__length1 = data_length1;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (result_length1) {
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*result_length1 = _tmp17__length1;
-#line 1604 "book.c"
+#line 1898 "book.c"
 	}
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp17_;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1614 "book.c"
+#line 1908 "book.c"
 }
 
 
@@ -1619,65 +1913,57 @@ static gboolean book_write_pixbuf_data (Book* self, guint8* buf, int buf_length1
 	GByteArray* _tmp0_ = NULL;
 	guint8* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->jpeg_data;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = buf;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1__length1 = buf_length1;
-#line 209 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_byte_array_append (_tmp0_, _tmp1_, _tmp1__length1);
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = TRUE;
-#line 210 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 1637 "book.c"
+#line 1931 "book.c"
 }
 
 
 static guint8* _vala_array_dup1 (guint8* self, int length) {
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1644 "book.c"
+#line 1938 "book.c"
 }
 
 
 static guint8* _vala_array_dup2 (guint8* self, int length) {
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1651 "book.c"
+#line 1945 "book.c"
 }
 
 
 static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error) {
+	gchar* id = NULL;
+	gchar* _tmp0_ = NULL;
 	GFileOutputStream* stream = NULL;
-	GFile* _tmp0_ = NULL;
-	GFileOutputStream* _tmp1_ = NULL;
+	GFile* _tmp9_ = NULL;
+	GFileOutputStream* _tmp10_ = NULL;
 	PDFWriter* writer = NULL;
-	PDFWriter* _tmp2_ = NULL;
-	PDFWriter* _tmp3_ = NULL;
-	PDFWriter* _tmp4_ = NULL;
-	guint catalog_number = 0U;
-	PDFWriter* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	PDFWriter* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
 	PDFWriter* _tmp11_ = NULL;
 	PDFWriter* _tmp12_ = NULL;
 	PDFWriter* _tmp13_ = NULL;
-	guint _tmp14_ = 0U;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	PDFWriter* _tmp17_ = NULL;
-	PDFWriter* _tmp18_ = NULL;
-	PDFWriter* _tmp19_ = NULL;
-	guint pages_number = 0U;
+	guint catalog_number = 0U;
+	PDFWriter* _tmp14_ = NULL;
+	guint _tmp15_ = 0U;
+	PDFWriter* _tmp16_ = NULL;
+	guint _tmp17_ = 0U;
+	gchar* _tmp18_ = NULL;
+	gchar* _tmp19_ = NULL;
 	PDFWriter* _tmp20_ = NULL;
-	guint _tmp21_ = 0U;
+	PDFWriter* _tmp21_ = NULL;
 	PDFWriter* _tmp22_ = NULL;
 	guint _tmp23_ = 0U;
 	gchar* _tmp24_ = NULL;
@@ -1685,789 +1971,869 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 	PDFWriter* _tmp26_ = NULL;
 	PDFWriter* _tmp27_ = NULL;
 	PDFWriter* _tmp28_ = NULL;
-	PDFWriter* _tmp40_ = NULL;
-	PDFWriter* _tmp41_ = NULL;
-	guint _tmp42_ = 0U;
-	guint _tmp43_ = 0U;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	PDFWriter* _tmp46_ = NULL;
-	PDFWriter* _tmp47_ = NULL;
-	PDFWriter* _tmp361_ = NULL;
+	guint pages_number = 0U;
+	PDFWriter* _tmp29_ = NULL;
+	guint _tmp30_ = 0U;
+	PDFWriter* _tmp31_ = NULL;
+	guint _tmp32_ = 0U;
+	gchar* _tmp33_ = NULL;
+	gchar* _tmp34_ = NULL;
+	PDFWriter* _tmp35_ = NULL;
+	PDFWriter* _tmp36_ = NULL;
+	PDFWriter* _tmp37_ = NULL;
+	PDFWriter* _tmp48_ = NULL;
+	PDFWriter* _tmp49_ = NULL;
+	guint _tmp50_ = 0U;
+	guint _tmp51_ = 0U;
+	gchar* _tmp52_ = NULL;
+	gchar* _tmp53_ = NULL;
+	PDFWriter* _tmp54_ = NULL;
+	PDFWriter* _tmp55_ = NULL;
+	PDFWriter* _tmp366_ = NULL;
 	guint info_number = 0U;
-	PDFWriter* _tmp362_ = NULL;
-	guint _tmp363_ = 0U;
-	PDFWriter* _tmp364_ = NULL;
-	guint _tmp365_ = 0U;
-	gchar* _tmp366_ = NULL;
-	gchar* _tmp367_ = NULL;
-	PDFWriter* _tmp368_ = NULL;
+	PDFWriter* _tmp367_ = NULL;
+	guint _tmp368_ = 0U;
 	PDFWriter* _tmp369_ = NULL;
-	gchar* _tmp370_ = NULL;
+	guint _tmp370_ = 0U;
 	gchar* _tmp371_ = NULL;
-	PDFWriter* _tmp372_ = NULL;
+	gchar* _tmp372_ = NULL;
 	PDFWriter* _tmp373_ = NULL;
-	gsize xref_offset = 0UL;
 	PDFWriter* _tmp374_ = NULL;
-	gsize _tmp375_ = 0UL;
-	PDFWriter* _tmp376_ = NULL;
+	gchar* _tmp375_ = NULL;
+	gchar* _tmp376_ = NULL;
 	PDFWriter* _tmp377_ = NULL;
 	PDFWriter* _tmp378_ = NULL;
-	GList* _tmp379_ = NULL;
-	guint _tmp380_ = 0U;
-	gchar* _tmp381_ = NULL;
-	gchar* _tmp382_ = NULL;
+	PDFWriter* _tmp379_ = NULL;
+	gsize xref_offset = 0UL;
+	PDFWriter* _tmp380_ = NULL;
+	gsize _tmp381_ = 0UL;
+	PDFWriter* _tmp382_ = NULL;
 	PDFWriter* _tmp383_ = NULL;
-	GList* _tmp384_ = NULL;
+	PDFWriter* _tmp384_ = NULL;
+	GList* _tmp385_ = NULL;
+	guint _tmp386_ = 0U;
+	gchar* _tmp387_ = NULL;
+	gchar* _tmp388_ = NULL;
 	PDFWriter* _tmp389_ = NULL;
 	PDFWriter* _tmp390_ = NULL;
-	PDFWriter* _tmp391_ = NULL;
-	PDFWriter* _tmp392_ = NULL;
-	GList* _tmp393_ = NULL;
-	guint _tmp394_ = 0U;
-	gchar* _tmp395_ = NULL;
-	gchar* _tmp396_ = NULL;
+	GList* _tmp391_ = NULL;
+	PDFWriter* _tmp396_ = NULL;
 	PDFWriter* _tmp397_ = NULL;
-	guint _tmp398_ = 0U;
-	gchar* _tmp399_ = NULL;
-	gchar* _tmp400_ = NULL;
-	PDFWriter* _tmp401_ = NULL;
+	PDFWriter* _tmp398_ = NULL;
+	PDFWriter* _tmp399_ = NULL;
+	PDFWriter* _tmp400_ = NULL;
+	GList* _tmp401_ = NULL;
 	guint _tmp402_ = 0U;
 	gchar* _tmp403_ = NULL;
 	gchar* _tmp404_ = NULL;
 	PDFWriter* _tmp405_ = NULL;
-	PDFWriter* _tmp406_ = NULL;
-	PDFWriter* _tmp407_ = NULL;
-	gsize _tmp408_ = 0UL;
-	gchar* _tmp409_ = NULL;
-	gchar* _tmp410_ = NULL;
-	PDFWriter* _tmp411_ = NULL;
+	guint _tmp406_ = 0U;
+	gchar* _tmp407_ = NULL;
+	gchar* _tmp408_ = NULL;
+	PDFWriter* _tmp409_ = NULL;
+	guint _tmp410_ = 0U;
+	gchar* _tmp411_ = NULL;
+	gchar* _tmp412_ = NULL;
+	PDFWriter* _tmp413_ = NULL;
+	const gchar* _tmp414_ = NULL;
+	const gchar* _tmp415_ = NULL;
+	gchar* _tmp416_ = NULL;
+	gchar* _tmp417_ = NULL;
+	PDFWriter* _tmp418_ = NULL;
+	PDFWriter* _tmp419_ = NULL;
+	PDFWriter* _tmp420_ = NULL;
+	gsize _tmp421_ = 0UL;
+	gchar* _tmp422_ = NULL;
+	gchar* _tmp423_ = NULL;
+	PDFWriter* _tmp424_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp0_ = file;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp1_ = g_file_replace (_tmp0_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	stream = _tmp1_;
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp0_ = g_strdup ("");
+#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	id = _tmp0_;
+#line 2059 "book.c"
+	{
+		gint i = 0;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		i = 0;
+#line 2064 "book.c"
+		{
+			gboolean _tmp1_ = FALSE;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			_tmp1_ = TRUE;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			while (TRUE) {
+#line 2071 "book.c"
+				gint _tmp3_ = 0;
+				const gchar* _tmp4_ = NULL;
+				guint32 _tmp5_ = 0U;
+				gchar* _tmp6_ = NULL;
+				gchar* _tmp7_ = NULL;
+				gchar* _tmp8_ = NULL;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp1_) {
+#line 2080 "book.c"
+					gint _tmp2_ = 0;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp2_ = i;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp2_ + 1;
+#line 2086 "book.c"
+				}
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp1_ = FALSE;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp3_ = i;
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(_tmp3_ < 4)) {
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					break;
+#line 2096 "book.c"
+				}
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp4_ = id;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp5_ = g_random_int ();
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp6_ = g_strdup_printf ("%08x", (guint) _tmp5_);
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp7_ = _tmp6_;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp8_ = g_strconcat (_tmp4_, _tmp7_, NULL);
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (id);
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				id = _tmp8_;
+#line 262 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp7_);
+#line 2114 "book.c"
+			}
+		}
+	}
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp9_ = file;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp10_ = g_file_replace (_tmp9_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	stream = _tmp10_;
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_propagate_error (error, _inner_error_);
-#line 215 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		_g_free0 (id);
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 1763 "book.c"
+#line 2132 "book.c"
 	}
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp2_ = pdf_writer_new (stream);
-#line 216 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	writer = _tmp2_;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp3_ = writer;
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp3_, "%PDF-1.3\n");
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp4_ = writer;
-#line 222 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp4_, "%\xe2\xe3\xcf\xd3\n");
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp5_ = writer;
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp6_ = pdf_writer_start_object (_tmp5_);
-#line 225 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	catalog_number = _tmp6_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp7_ = writer;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp8_ = catalog_number;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp9_ = g_strdup_printf ("%u 0 obj\n", _tmp8_);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp10_ = _tmp9_;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp7_, _tmp10_);
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp10_);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp11_ = writer;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp11_, "<<\n");
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp11_ = pdf_writer_new (stream);
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	writer = _tmp11_;
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp12_ = writer;
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp12_, "/Type /Catalog\n");
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp12_, "%PDF-1.3\n");
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp13_ = writer;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp14_ = catalog_number;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp15_ = g_strdup_printf ("/Pages %u 0 R\n", _tmp14_ + 1);
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp16_ = _tmp15_;
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp13_, _tmp16_);
-#line 230 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp16_);
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp17_ = writer;
-#line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp17_, ">>\n");
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp18_ = writer;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp18_, "endobj\n");
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp19_ = writer;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp19_, "\n");
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp13_, "%\xe2\xe3\xcf\xd3\n");
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp14_ = writer;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp15_ = pdf_writer_start_object (_tmp14_);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	catalog_number = _tmp15_;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp16_ = writer;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp17_ = catalog_number;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp18_ = g_strdup_printf ("%u 0 obj\n", _tmp17_);
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp19_ = _tmp18_;
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp16_, _tmp19_);
+#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp19_);
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp20_ = writer;
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp21_ = pdf_writer_start_object (_tmp20_);
-#line 251 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pages_number = _tmp21_;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp20_, "<<\n");
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp21_ = writer;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp21_, "/Type /Catalog\n");
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp22_ = writer;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp23_ = pages_number;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp24_ = g_strdup_printf ("%u 0 obj\n", _tmp23_);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp23_ = catalog_number;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp24_ = g_strdup_printf ("/Pages %u 0 R\n", _tmp23_ + 1);
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp25_ = _tmp24_;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write_string (_tmp22_, _tmp25_);
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_free0 (_tmp25_);
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp26_ = writer;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp26_, "<<\n");
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp26_, ">>\n");
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp27_ = writer;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp27_, "/Type /Pages\n");
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp27_, "endobj\n");
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp28_ = writer;
-#line 255 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp28_, "/Kids [");
-#line 1857 "book.c"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp28_, "\n");
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp29_ = writer;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp30_ = pdf_writer_start_object (_tmp29_);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pages_number = _tmp30_;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp31_ = writer;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp32_ = pages_number;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp33_ = g_strdup_printf ("%u 0 obj\n", _tmp32_);
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp34_ = _tmp33_;
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp31_, _tmp34_);
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp34_);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp35_ = writer;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp35_, "<<\n");
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp36_ = writer;
+#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp36_, "/Type /Pages\n");
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp37_ = writer;
+#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp37_, "/Kids [");
+#line 2226 "book.c"
 	{
 		gint i = 0;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1862 "book.c"
+#line 2231 "book.c"
 		{
-			gboolean _tmp29_ = FALSE;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp29_ = TRUE;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			gboolean _tmp38_ = FALSE;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			_tmp38_ = TRUE;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 1869 "book.c"
-				gboolean _tmp30_ = FALSE;
-				gint _tmp32_ = 0;
-				guint _tmp33_ = 0U;
-				guint _tmp34_ = 0U;
-				PDFWriter* _tmp35_ = NULL;
-				guint _tmp36_ = 0U;
-				gint _tmp37_ = 0;
-				gchar* _tmp38_ = NULL;
-				gchar* _tmp39_ = NULL;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp30_ = _tmp29_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp30_) {
-#line 1883 "book.c"
-					gint _tmp31_ = 0;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp31_ = i;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp31_ + 1;
-#line 1889 "book.c"
+#line 2238 "book.c"
+				gint _tmp40_ = 0;
+				guint _tmp41_ = 0U;
+				guint _tmp42_ = 0U;
+				PDFWriter* _tmp43_ = NULL;
+				guint _tmp44_ = 0U;
+				gint _tmp45_ = 0;
+				gchar* _tmp46_ = NULL;
+				gchar* _tmp47_ = NULL;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp38_) {
+#line 2249 "book.c"
+					gint _tmp39_ = 0;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp39_ = i;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp39_ + 1;
+#line 2255 "book.c"
 				}
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp29_ = FALSE;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp32_ = i;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp33_ = book_get_n_pages (self);
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp34_ = _tmp33_;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp32_) < _tmp34_)) {
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp38_ = FALSE;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp40_ = i;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp41_ = book_get_n_pages (self);
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp42_ = _tmp41_;
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp40_) < _tmp42_)) {
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 1903 "book.c"
+#line 2269 "book.c"
 				}
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp35_ = writer;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp36_ = pages_number;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp37_ = i;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp38_ = g_strdup_printf (" %u 0 R", (_tmp36_ + 1) + (_tmp37_ * 3));
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp39_ = _tmp38_;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp35_, _tmp39_);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp39_);
-#line 1919 "book.c"
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp43_ = writer;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp44_ = pages_number;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp45_ = i;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp46_ = g_strdup_printf (" %u 0 R", (_tmp44_ + 1) + (_tmp45_ * 3));
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp47_ = _tmp46_;
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp43_, _tmp47_);
+#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp47_);
+#line 2285 "book.c"
 			}
 		}
 	}
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp40_ = writer;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp40_, " ]\n");
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp41_ = writer;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp42_ = book_get_n_pages (self);
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp43_ = _tmp42_;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp44_ = g_strdup_printf ("/Count %u\n", _tmp43_);
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp45_ = _tmp44_;
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp41_, _tmp45_);
-#line 259 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp45_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp46_ = writer;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp46_, ">>\n");
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp47_ = writer;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp47_, "endobj\n");
-#line 1949 "book.c"
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp48_ = writer;
+#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp48_, " ]\n");
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp49_ = writer;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp50_ = book_get_n_pages (self);
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp51_ = _tmp50_;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp52_ = g_strdup_printf ("/Count %u\n", _tmp51_);
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp53_ = _tmp52_;
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp49_, _tmp53_);
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp53_);
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp54_ = writer;
+#line 310 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp54_, ">>\n");
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp55_ = writer;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp55_, "endobj\n");
+#line 2315 "book.c"
 	{
 		gint i = 0;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		i = 0;
-#line 1954 "book.c"
+#line 2320 "book.c"
 		{
-			gboolean _tmp48_ = FALSE;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			_tmp48_ = TRUE;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			gboolean _tmp56_ = FALSE;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			_tmp56_ = TRUE;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			while (TRUE) {
-#line 1961 "book.c"
-				gboolean _tmp49_ = FALSE;
-				gint _tmp51_ = 0;
-				guint _tmp52_ = 0U;
-				guint _tmp53_ = 0U;
+#line 2327 "book.c"
+				gint _tmp58_ = 0;
+				guint _tmp59_ = 0U;
+				guint _tmp60_ = 0U;
 				Page* page = NULL;
-				gint _tmp54_ = 0;
-				Page* _tmp55_ = NULL;
+				gint _tmp61_ = 0;
+				Page* _tmp62_ = NULL;
 				GdkPixbuf* image = NULL;
-				Page* _tmp56_ = NULL;
-				GdkPixbuf* _tmp57_ = NULL;
+				Page* _tmp63_ = NULL;
+				GdkPixbuf* _tmp64_ = NULL;
 				gint width = 0;
-				GdkPixbuf* _tmp58_ = NULL;
-				gint _tmp59_ = 0;
+				GdkPixbuf* _tmp65_ = NULL;
+				gint _tmp66_ = 0;
+				gint _tmp67_ = 0;
 				gint height = 0;
-				GdkPixbuf* _tmp60_ = NULL;
-				gint _tmp61_ = 0;
+				GdkPixbuf* _tmp68_ = NULL;
+				gint _tmp69_ = 0;
+				gint _tmp70_ = 0;
 				guint8* pixels = NULL;
-				GdkPixbuf* _tmp62_ = NULL;
-				guint8* _tmp63_ = NULL;
+				GdkPixbuf* _tmp71_ = NULL;
+				guint8* _tmp72_ = NULL;
 				gint pixels_length1 = 0;
 				gint _pixels_size_ = 0;
 				gdouble page_width = 0.0;
-				gint _tmp64_ = 0;
-				Page* _tmp65_ = NULL;
-				gint _tmp66_ = 0;
-				gint _tmp67_ = 0;
+				gint _tmp73_ = 0;
+				Page* _tmp74_ = NULL;
+				gint _tmp75_ = 0;
+				gint _tmp76_ = 0;
 				gdouble page_height = 0.0;
-				gint _tmp68_ = 0;
-				Page* _tmp69_ = NULL;
-				gint _tmp70_ = 0;
-				gint _tmp71_ = 0;
+				gint _tmp77_ = 0;
+				Page* _tmp78_ = NULL;
+				gint _tmp79_ = 0;
+				gint _tmp80_ = 0;
 				gint depth = 0;
 				gchar* color_space = NULL;
-				gchar* _tmp72_ = NULL;
+				gchar* _tmp81_ = NULL;
 				gchar* filter = NULL;
 				gchar* width_buffer = NULL;
-				gchar* _tmp73_ = NULL;
+				gchar* _tmp82_ = NULL;
 				gint width_buffer_length1 = 0;
 				gint _width_buffer_size_ = 0;
 				gchar* height_buffer = NULL;
-				gchar* _tmp74_ = NULL;
+				gchar* _tmp83_ = NULL;
 				gint height_buffer_length1 = 0;
 				gint _height_buffer_size_ = 0;
 				guint8* data = NULL;
 				gint data_length1 = 0;
 				gint _data_size_ = 0;
-				Page* _tmp75_ = NULL;
-				gboolean _tmp76_ = FALSE;
-				gboolean _tmp77_ = FALSE;
+				Page* _tmp84_ = NULL;
+				gboolean _tmp85_ = FALSE;
+				gboolean _tmp86_ = FALSE;
 				guint8* compressed_data = NULL;
-				guint8* _tmp235_ = NULL;
-				gint _tmp235__length1 = 0;
-				gint _tmp236_ = 0;
-				guint8* _tmp237_ = NULL;
+				guint8* _tmp240_ = NULL;
+				gint _tmp240__length1 = 0;
+				gint _tmp241_ = 0;
+				guint8* _tmp242_ = NULL;
 				gint compressed_data_length1 = 0;
 				gint _compressed_data_size_ = 0;
-				guint8* _tmp238_ = NULL;
-				gint _tmp238__length1 = 0;
-				PDFWriter* _tmp256_ = NULL;
+				guint8* _tmp243_ = NULL;
+				gint _tmp243__length1 = 0;
+				PDFWriter* _tmp261_ = NULL;
 				guint number = 0U;
-				PDFWriter* _tmp257_ = NULL;
-				guint _tmp258_ = 0U;
-				PDFWriter* _tmp259_ = NULL;
-				guint _tmp260_ = 0U;
-				gchar* _tmp261_ = NULL;
-				gchar* _tmp262_ = NULL;
-				PDFWriter* _tmp263_ = NULL;
+				PDFWriter* _tmp262_ = NULL;
+				guint _tmp263_ = 0U;
 				PDFWriter* _tmp264_ = NULL;
-				PDFWriter* _tmp265_ = NULL;
-				guint _tmp266_ = 0U;
+				guint _tmp265_ = 0U;
+				gchar* _tmp266_ = NULL;
 				gchar* _tmp267_ = NULL;
-				gchar* _tmp268_ = NULL;
+				PDFWriter* _tmp268_ = NULL;
 				PDFWriter* _tmp269_ = NULL;
-				gint _tmp270_ = 0;
+				PDFWriter* _tmp270_ = NULL;
 				guint _tmp271_ = 0U;
 				gchar* _tmp272_ = NULL;
 				gchar* _tmp273_ = NULL;
 				PDFWriter* _tmp274_ = NULL;
-				gdouble _tmp275_ = 0.0;
-				gchar* _tmp276_ = NULL;
-				gint _tmp276__length1 = 0;
-				const gchar* _tmp277_ = NULL;
-				gdouble _tmp278_ = 0.0;
-				gchar* _tmp279_ = NULL;
-				gint _tmp279__length1 = 0;
-				const gchar* _tmp280_ = NULL;
+				gint _tmp275_ = 0;
+				guint _tmp276_ = 0U;
+				gchar* _tmp277_ = NULL;
+				gchar* _tmp278_ = NULL;
+				PDFWriter* _tmp279_ = NULL;
+				gdouble _tmp280_ = 0.0;
 				gchar* _tmp281_ = NULL;
-				gchar* _tmp282_ = NULL;
-				PDFWriter* _tmp283_ = NULL;
-				guint _tmp284_ = 0U;
-				gchar* _tmp285_ = NULL;
+				gint _tmp281__length1 = 0;
+				const gchar* _tmp282_ = NULL;
+				gdouble _tmp283_ = 0.0;
+				gchar* _tmp284_ = NULL;
+				gint _tmp284__length1 = 0;
+				const gchar* _tmp285_ = NULL;
 				gchar* _tmp286_ = NULL;
-				PDFWriter* _tmp287_ = NULL;
+				gchar* _tmp287_ = NULL;
 				PDFWriter* _tmp288_ = NULL;
-				PDFWriter* _tmp289_ = NULL;
-				PDFWriter* _tmp290_ = NULL;
-				guint _tmp291_ = 0U;
+				guint _tmp289_ = 0U;
+				gchar* _tmp290_ = NULL;
+				gchar* _tmp291_ = NULL;
 				PDFWriter* _tmp292_ = NULL;
-				guint _tmp293_ = 0U;
-				gchar* _tmp294_ = NULL;
-				gchar* _tmp295_ = NULL;
-				PDFWriter* _tmp296_ = NULL;
+				PDFWriter* _tmp293_ = NULL;
+				PDFWriter* _tmp294_ = NULL;
+				PDFWriter* _tmp295_ = NULL;
+				guint _tmp296_ = 0U;
 				PDFWriter* _tmp297_ = NULL;
-				PDFWriter* _tmp298_ = NULL;
-				PDFWriter* _tmp299_ = NULL;
-				gint _tmp300_ = 0;
-				gchar* _tmp301_ = NULL;
-				gchar* _tmp302_ = NULL;
+				guint _tmp298_ = 0U;
+				gchar* _tmp299_ = NULL;
+				gchar* _tmp300_ = NULL;
+				PDFWriter* _tmp301_ = NULL;
+				PDFWriter* _tmp302_ = NULL;
 				PDFWriter* _tmp303_ = NULL;
-				gint _tmp304_ = 0;
-				gchar* _tmp305_ = NULL;
+				PDFWriter* _tmp304_ = NULL;
+				gint _tmp305_ = 0;
 				gchar* _tmp306_ = NULL;
-				PDFWriter* _tmp307_ = NULL;
-				const gchar* _tmp308_ = NULL;
-				gchar* _tmp309_ = NULL;
+				gchar* _tmp307_ = NULL;
+				PDFWriter* _tmp308_ = NULL;
+				gint _tmp309_ = 0;
 				gchar* _tmp310_ = NULL;
-				PDFWriter* _tmp311_ = NULL;
-				gint _tmp312_ = 0;
-				gchar* _tmp313_ = NULL;
+				gchar* _tmp311_ = NULL;
+				PDFWriter* _tmp312_ = NULL;
+				const gchar* _tmp313_ = NULL;
 				gchar* _tmp314_ = NULL;
-				PDFWriter* _tmp315_ = NULL;
-				guint8* _tmp316_ = NULL;
-				gint _tmp316__length1 = 0;
-				gchar* _tmp317_ = NULL;
+				gchar* _tmp315_ = NULL;
+				PDFWriter* _tmp316_ = NULL;
+				gint _tmp317_ = 0;
 				gchar* _tmp318_ = NULL;
-				const gchar* _tmp319_ = NULL;
-				PDFWriter* _tmp324_ = NULL;
-				PDFWriter* _tmp325_ = NULL;
-				PDFWriter* _tmp326_ = NULL;
-				guint8* _tmp327_ = NULL;
-				gint _tmp327__length1 = 0;
-				PDFWriter* _tmp328_ = NULL;
+				gchar* _tmp319_ = NULL;
+				PDFWriter* _tmp320_ = NULL;
+				guint8* _tmp321_ = NULL;
+				gint _tmp321__length1 = 0;
+				gchar* _tmp322_ = NULL;
+				gchar* _tmp323_ = NULL;
+				const gchar* _tmp324_ = NULL;
 				PDFWriter* _tmp329_ = NULL;
 				PDFWriter* _tmp330_ = NULL;
-				gchar* command = NULL;
-				gdouble _tmp331_ = 0.0;
-				gchar* _tmp332_ = NULL;
+				PDFWriter* _tmp331_ = NULL;
+				guint8* _tmp332_ = NULL;
 				gint _tmp332__length1 = 0;
-				const gchar* _tmp333_ = NULL;
-				gdouble _tmp334_ = 0.0;
-				gchar* _tmp335_ = NULL;
-				gint _tmp335__length1 = 0;
-				const gchar* _tmp336_ = NULL;
-				gint _tmp337_ = 0;
-				gchar* _tmp338_ = NULL;
-				PDFWriter* _tmp339_ = NULL;
-				PDFWriter* _tmp340_ = NULL;
-				guint _tmp341_ = 0U;
-				PDFWriter* _tmp342_ = NULL;
-				guint _tmp343_ = 0U;
-				gchar* _tmp344_ = NULL;
-				gchar* _tmp345_ = NULL;
-				PDFWriter* _tmp346_ = NULL;
+				PDFWriter* _tmp333_ = NULL;
+				PDFWriter* _tmp334_ = NULL;
+				PDFWriter* _tmp335_ = NULL;
+				gchar* command = NULL;
+				gdouble _tmp336_ = 0.0;
+				gchar* _tmp337_ = NULL;
+				gint _tmp337__length1 = 0;
+				const gchar* _tmp338_ = NULL;
+				gdouble _tmp339_ = 0.0;
+				gchar* _tmp340_ = NULL;
+				gint _tmp340__length1 = 0;
+				const gchar* _tmp341_ = NULL;
+				gint _tmp342_ = 0;
+				gchar* _tmp343_ = NULL;
+				PDFWriter* _tmp344_ = NULL;
+				PDFWriter* _tmp345_ = NULL;
+				guint _tmp346_ = 0U;
 				PDFWriter* _tmp347_ = NULL;
-				const gchar* _tmp348_ = NULL;
-				gint _tmp349_ = 0;
-				gint _tmp350_ = 0;
-				gchar* _tmp351_ = NULL;
-				gchar* _tmp352_ = NULL;
-				PDFWriter* _tmp353_ = NULL;
-				PDFWriter* _tmp354_ = NULL;
-				PDFWriter* _tmp355_ = NULL;
-				const gchar* _tmp356_ = NULL;
-				PDFWriter* _tmp357_ = NULL;
+				guint _tmp348_ = 0U;
+				gchar* _tmp349_ = NULL;
+				gchar* _tmp350_ = NULL;
+				PDFWriter* _tmp351_ = NULL;
+				PDFWriter* _tmp352_ = NULL;
+				const gchar* _tmp353_ = NULL;
+				gint _tmp354_ = 0;
+				gint _tmp355_ = 0;
+				gchar* _tmp356_ = NULL;
+				gchar* _tmp357_ = NULL;
 				PDFWriter* _tmp358_ = NULL;
 				PDFWriter* _tmp359_ = NULL;
-				gint _tmp360_ = 0;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp49_ = _tmp48_;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!_tmp49_) {
-#line 2133 "book.c"
-					gint _tmp50_ = 0;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp50_ = i;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					i = _tmp50_ + 1;
-#line 2139 "book.c"
+				PDFWriter* _tmp360_ = NULL;
+				const gchar* _tmp361_ = NULL;
+				PDFWriter* _tmp362_ = NULL;
+				PDFWriter* _tmp363_ = NULL;
+				PDFWriter* _tmp364_ = NULL;
+				gint _tmp365_ = 0;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!_tmp56_) {
+#line 2498 "book.c"
+					gint _tmp57_ = 0;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp57_ = i;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					i = _tmp57_ + 1;
+#line 2504 "book.c"
 				}
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp48_ = FALSE;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp51_ = i;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp52_ = book_get_n_pages (self);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp53_ = _tmp52_;
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (!(((guint) _tmp51_) < _tmp53_)) {
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp56_ = FALSE;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp58_ = i;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp59_ = book_get_n_pages (self);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp60_ = _tmp59_;
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (!(((guint) _tmp58_) < _tmp60_)) {
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					break;
-#line 2153 "book.c"
+#line 2518 "book.c"
 				}
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp54_ = i;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp55_ = book_get_page (self, _tmp54_);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page = _tmp55_;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp56_ = page;
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp57_ = page_get_image (_tmp56_, TRUE);
-#line 266 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				image = _tmp57_;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp58_ = image;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp59_ = gdk_pixbuf_get_width (_tmp58_);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width = _tmp59_;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp60_ = image;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp61_ = gdk_pixbuf_get_height (_tmp60_);
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height = _tmp61_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp62_ = image;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp63_ = gdk_pixbuf_get_pixels (_tmp62_);
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pixels = _tmp63_;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp61_ = i;
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp62_ = book_get_page (self, _tmp61_);
+#line 315 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page = _tmp62_;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp63_ = page;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp64_ = page_get_image (_tmp63_, TRUE);
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				image = _tmp64_;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp65_ = image;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp67_ = _tmp66_;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				width = _tmp67_;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp68_ = image;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp69_ = gdk_pixbuf_get_height (_tmp68_);
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp70_ = _tmp69_;
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				height = _tmp70_;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp71_ = image;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp72_ = gdk_pixbuf_get_pixels (_tmp71_);
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pixels = _tmp72_;
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				pixels_length1 = -1;
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 319 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_pixels_size_ = pixels_length1;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp64_ = width;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp65_ = page;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp66_ = page_get_dpi (_tmp65_);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp67_ = _tmp66_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_width = (_tmp64_ * 72.0) / _tmp67_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp68_ = height;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp69_ = page;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp70_ = page_get_dpi (_tmp69_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp71_ = _tmp70_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				page_height = (_tmp68_ * 72.0) / _tmp71_;
-#line 273 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp73_ = width;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp74_ = page;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp75_ = page_get_dpi (_tmp74_);
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp76_ = _tmp75_;
+#line 320 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page_width = (_tmp73_ * 72.0) / _tmp76_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp77_ = height;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp78_ = page;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp79_ = page_get_dpi (_tmp78_);
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp80_ = _tmp79_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				page_height = (_tmp77_ * 72.0) / _tmp80_;
+#line 323 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				depth = 8;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp72_ = g_strdup ("DeviceRGB");
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				color_space = _tmp72_;
-#line 275 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp81_ = g_strdup ("DeviceRGB");
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				color_space = _tmp81_;
+#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				filter = NULL;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp73_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer = _tmp73_;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp82_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				width_buffer = _tmp82_;
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				width_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 276 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_width_buffer_size_ = width_buffer_length1;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp74_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer = _tmp74_;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp83_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				height_buffer = _tmp83_;
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				height_buffer_length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 277 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_height_buffer_size_ = height_buffer_length1;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp75_ = page;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp76_ = page_get_is_color (_tmp75_);
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp77_ = _tmp76_;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp77_) {
-#line 2241 "book.c"
-					gchar* _tmp78_ = NULL;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp84_ = page;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp85_ = page_get_is_color (_tmp84_);
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp86_ = _tmp85_;
+#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (_tmp86_) {
+#line 2610 "book.c"
+					gchar* _tmp87_ = NULL;
 					gint data_length = 0;
-					gint _tmp79_ = 0;
-					gint _tmp80_ = 0;
-					gint _tmp81_ = 0;
-					guint8* _tmp82_ = NULL;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					gint _tmp88_ = 0;
+					gint _tmp89_ = 0;
+					gint _tmp90_ = 0;
+					guint8* _tmp91_ = NULL;
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					depth = 8;
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp78_ = g_strdup ("DeviceRGB");
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp87_ = g_strdup ("DeviceRGB");
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_g_free0 (color_space);
-#line 282 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					color_space = _tmp78_;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp79_ = height;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp80_ = width;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length = (_tmp79_ * _tmp80_) * 3;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp81_ = data_length;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp82_ = g_new0 (guint8, _tmp81_);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					color_space = _tmp87_;
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp88_ = height;
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp89_ = width;
+#line 333 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					data_length = (_tmp88_ * _tmp89_) * 3;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp90_ = data_length;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp91_ = g_new0 (guint8, _tmp90_);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					data = (g_free (data), NULL);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data = _tmp82_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					data_length1 = _tmp81_;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					data = _tmp91_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					data_length1 = _tmp90_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					_data_size_ = data_length1;
-#line 2274 "book.c"
+#line 2643 "book.c"
 					{
 						gint row = 0;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						row = 0;
-#line 2279 "book.c"
+#line 2648 "book.c"
 						{
-							gboolean _tmp83_ = FALSE;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp83_ = TRUE;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							gboolean _tmp92_ = FALSE;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp92_ = TRUE;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							while (TRUE) {
-#line 2286 "book.c"
-								gboolean _tmp84_ = FALSE;
-								gint _tmp86_ = 0;
-								gint _tmp87_ = 0;
+#line 2655 "book.c"
+								gint _tmp94_ = 0;
+								gint _tmp95_ = 0;
 								gint in_offset = 0;
-								gint _tmp88_ = 0;
-								GdkPixbuf* _tmp89_ = NULL;
-								gint _tmp90_ = 0;
+								gint _tmp96_ = 0;
+								GdkPixbuf* _tmp97_ = NULL;
+								gint _tmp98_ = 0;
+								gint _tmp99_ = 0;
 								gint out_offset = 0;
-								gint _tmp91_ = 0;
-								gint _tmp92_ = 0;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp84_ = _tmp83_;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!_tmp84_) {
-#line 2301 "book.c"
-									gint _tmp85_ = 0;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp85_ = row;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									row = _tmp85_ + 1;
-#line 2307 "book.c"
+								gint _tmp100_ = 0;
+								gint _tmp101_ = 0;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								if (!_tmp92_) {
+#line 2668 "book.c"
+									gint _tmp93_ = 0;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp93_ = row;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									row = _tmp93_ + 1;
+#line 2674 "book.c"
 								}
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp83_ = FALSE;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp86_ = row;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp87_ = height;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								if (!(_tmp86_ < _tmp87_)) {
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp92_ = FALSE;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp94_ = row;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp95_ = height;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								if (!(_tmp94_ < _tmp95_)) {
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									break;
-#line 2319 "book.c"
+#line 2686 "book.c"
 								}
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp88_ = row;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp89_ = image;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp90_ = gdk_pixbuf_get_rowstride (_tmp89_);
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								in_offset = _tmp88_ * _tmp90_;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp91_ = row;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp92_ = width;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								out_offset = (_tmp91_ * _tmp92_) * 3;
-#line 2335 "book.c"
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp96_ = row;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp97_ = image;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp98_ = gdk_pixbuf_get_rowstride (_tmp97_);
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp99_ = _tmp98_;
+#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								in_offset = _tmp96_ * _tmp99_;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp100_ = row;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp101_ = width;
+#line 338 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								out_offset = (_tmp100_ * _tmp101_) * 3;
+#line 2704 "book.c"
 								{
 									gint x = 0;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									x = 0;
-#line 2340 "book.c"
+#line 2709 "book.c"
 									{
-										gboolean _tmp93_ = FALSE;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp93_ = TRUE;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										gboolean _tmp102_ = FALSE;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp102_ = TRUE;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										while (TRUE) {
-#line 2347 "book.c"
-											gboolean _tmp94_ = FALSE;
-											gint _tmp96_ = 0;
-											gint _tmp97_ = 0;
+#line 2716 "book.c"
+											gint _tmp104_ = 0;
+											gint _tmp105_ = 0;
 											gint in_o = 0;
-											gint _tmp98_ = 0;
-											gint _tmp99_ = 0;
+											gint _tmp106_ = 0;
+											gint _tmp107_ = 0;
 											gint out_o = 0;
-											gint _tmp100_ = 0;
-											gint _tmp101_ = 0;
-											guint8* _tmp102_ = NULL;
-											gint _tmp102__length1 = 0;
-											gint _tmp103_ = 0;
-											guint8* _tmp104_ = NULL;
-											gint _tmp104__length1 = 0;
-											gint _tmp105_ = 0;
-											guint8 _tmp106_ = 0U;
-											guint8 _tmp107_ = 0U;
-											guint8* _tmp108_ = NULL;
-											gint _tmp108__length1 = 0;
+											gint _tmp108_ = 0;
 											gint _tmp109_ = 0;
 											guint8* _tmp110_ = NULL;
 											gint _tmp110__length1 = 0;
 											gint _tmp111_ = 0;
-											guint8 _tmp112_ = 0U;
-											guint8 _tmp113_ = 0U;
-											guint8* _tmp114_ = NULL;
-											gint _tmp114__length1 = 0;
-											gint _tmp115_ = 0;
+											guint8* _tmp112_ = NULL;
+											gint _tmp112__length1 = 0;
+											gint _tmp113_ = 0;
+											guint8 _tmp114_ = 0U;
+											guint8 _tmp115_ = 0U;
 											guint8* _tmp116_ = NULL;
 											gint _tmp116__length1 = 0;
 											gint _tmp117_ = 0;
-											guint8 _tmp118_ = 0U;
-											guint8 _tmp119_ = 0U;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp94_ = _tmp93_;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!_tmp94_) {
-#line 2385 "book.c"
-												gint _tmp95_ = 0;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp95_ = x;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												x = _tmp95_ + 1;
-#line 2391 "book.c"
+											guint8* _tmp118_ = NULL;
+											gint _tmp118__length1 = 0;
+											gint _tmp119_ = 0;
+											guint8 _tmp120_ = 0U;
+											guint8 _tmp121_ = 0U;
+											guint8* _tmp122_ = NULL;
+											gint _tmp122__length1 = 0;
+											gint _tmp123_ = 0;
+											guint8* _tmp124_ = NULL;
+											gint _tmp124__length1 = 0;
+											gint _tmp125_ = 0;
+											guint8 _tmp126_ = 0U;
+											guint8 _tmp127_ = 0U;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											if (!_tmp102_) {
+#line 2751 "book.c"
+												gint _tmp103_ = 0;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp103_ = x;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												x = _tmp103_ + 1;
+#line 2757 "book.c"
 											}
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp93_ = FALSE;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp96_ = x;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp97_ = width;
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											if (!(_tmp96_ < _tmp97_)) {
-#line 289 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp102_ = FALSE;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp104_ = x;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp105_ = width;
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											if (!(_tmp104_ < _tmp105_)) {
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												break;
-#line 2403 "book.c"
+#line 2769 "book.c"
 											}
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp98_ = in_offset;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp99_ = x;
-#line 291 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											in_o = _tmp98_ + (_tmp99_ * 3);
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp100_ = out_offset;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp101_ = x;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											out_o = _tmp100_ + (_tmp101_ * 3);
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp102_ = data;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp102__length1 = data_length1;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp103_ = out_o;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp104_ = pixels;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp104__length1 = pixels_length1;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp105_ = in_o;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp106_ = _tmp104_[_tmp105_];
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp102_[_tmp103_] = _tmp106_;
-#line 294 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp107_ = _tmp102_[_tmp103_];
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp108_ = data;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp108__length1 = data_length1;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp109_ = out_o;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp110_ = pixels;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp110__length1 = pixels_length1;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp111_ = in_o;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp112_ = _tmp110_[_tmp111_ + 1];
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp108_[_tmp109_ + 1] = _tmp112_;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp113_ = _tmp108_[_tmp109_ + 1];
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp114_ = data;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp114__length1 = data_length1;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp115_ = out_o;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp116_ = pixels;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp116__length1 = pixels_length1;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp117_ = in_o;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp118_ = _tmp116_[_tmp117_ + 2];
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp114_[_tmp115_ + 2] = _tmp118_;
-#line 296 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp119_ = _tmp114_[_tmp115_ + 2];
-#line 2471 "book.c"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp106_ = in_offset;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp107_ = x;
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											in_o = _tmp106_ + (_tmp107_ * 3);
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp108_ = out_offset;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp109_ = x;
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											out_o = _tmp108_ + (_tmp109_ * 3);
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp110_ = data;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp110__length1 = data_length1;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp111_ = out_o;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp112_ = pixels;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp112__length1 = pixels_length1;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp113_ = in_o;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp114_ = _tmp112_[_tmp113_];
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp110_[_tmp111_] = _tmp114_;
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp115_ = _tmp110_[_tmp111_];
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp116_ = data;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp116__length1 = data_length1;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp117_ = out_o;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp118_ = pixels;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp118__length1 = pixels_length1;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp119_ = in_o;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp120_ = _tmp118_[_tmp119_ + 1];
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp116_[_tmp117_ + 1] = _tmp120_;
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp121_ = _tmp116_[_tmp117_ + 1];
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp122_ = data;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp122__length1 = data_length1;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp123_ = out_o;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp124_ = pixels;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp124__length1 = pixels_length1;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp125_ = in_o;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp126_ = _tmp124_[_tmp125_ + 2];
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp122_[_tmp123_ + 2] = _tmp126_;
+#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp127_ = _tmp122_[_tmp123_ + 2];
+#line 2837 "book.c"
 										}
 									}
 								}
@@ -2475,301 +2841,298 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 						}
 					}
 				} else {
-					Page* _tmp120_ = NULL;
-					gint _tmp121_ = 0;
-					gint _tmp122_ = 0;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp120_ = page;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp121_ = page_get_depth (_tmp120_);
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp122_ = _tmp121_;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp122_ == 2) {
-#line 2490 "book.c"
+					Page* _tmp128_ = NULL;
+					gint _tmp129_ = 0;
+					gint _tmp130_ = 0;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp128_ = page;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp129_ = page_get_depth (_tmp128_);
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp130_ = _tmp129_;
+#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					if (_tmp130_ == 2) {
+#line 2856 "book.c"
 						gint shift_count = 0;
-						gchar* _tmp123_ = NULL;
+						gchar* _tmp131_ = NULL;
 						gint data_length = 0;
-						gint _tmp124_ = 0;
-						gint _tmp125_ = 0;
-						gint _tmp126_ = 0;
-						guint8* _tmp127_ = NULL;
+						gint _tmp132_ = 0;
+						gint _tmp133_ = 0;
+						gint _tmp134_ = 0;
+						guint8* _tmp135_ = NULL;
 						gint offset = 0;
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						shift_count = 6;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						depth = 2;
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp123_ = g_strdup ("DeviceGray");
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp131_ = g_strdup ("DeviceGray");
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_g_free0 (color_space);
-#line 304 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						color_space = _tmp123_;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp124_ = height;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp125_ = width;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length = _tmp124_ * (((_tmp125_ * 2) + 7) / 8);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp126_ = data_length;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp127_ = g_new0 (guint8, _tmp126_);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 354 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						color_space = _tmp131_;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp132_ = height;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp133_ = width;
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data_length = _tmp132_ * (((_tmp133_ * 2) + 7) / 8);
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp134_ = data_length;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp135_ = g_new0 (guint8, _tmp134_);
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						data = (g_free (data), NULL);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp127_;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp126_;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data = _tmp135_;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data_length1 = _tmp134_;
+#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						_data_size_ = data_length1;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 						offset = 0;
-#line 2529 "book.c"
+#line 2895 "book.c"
 						{
 							gint row = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							row = 0;
-#line 2534 "book.c"
+#line 2900 "book.c"
 							{
-								gboolean _tmp128_ = FALSE;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-								_tmp128_ = TRUE;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								gboolean _tmp136_ = FALSE;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+								_tmp136_ = TRUE;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								while (TRUE) {
-#line 2541 "book.c"
-									gboolean _tmp129_ = FALSE;
-									gint _tmp131_ = 0;
-									gint _tmp132_ = 0;
-									gint _tmp133_ = 0;
+#line 2907 "book.c"
+									gint _tmp138_ = 0;
+									gint _tmp139_ = 0;
+									gint _tmp140_ = 0;
 									gint in_offset = 0;
-									gint _tmp135_ = 0;
-									GdkPixbuf* _tmp136_ = NULL;
-									gint _tmp137_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp129_ = _tmp128_;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!_tmp129_) {
-#line 2554 "book.c"
-										gint _tmp130_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp130_ = row;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										row = _tmp130_ + 1;
-#line 2560 "book.c"
+									gint _tmp142_ = 0;
+									GdkPixbuf* _tmp143_ = NULL;
+									gint _tmp144_ = 0;
+									gint _tmp145_ = 0;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									if (!_tmp136_) {
+#line 2918 "book.c"
+										gint _tmp137_ = 0;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp137_ = row;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										row = _tmp137_ + 1;
+#line 2924 "book.c"
 									}
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp128_ = FALSE;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp131_ = row;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp132_ = height;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (!(_tmp131_ < _tmp132_)) {
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp136_ = FALSE;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp138_ = row;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp139_ = height;
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									if (!(_tmp138_ < _tmp139_)) {
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										break;
-#line 2572 "book.c"
+#line 2936 "book.c"
 									}
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp133_ = shift_count;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									if (_tmp133_ != 6) {
-#line 2578 "book.c"
-										gint _tmp134_ = 0;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp134_ = offset;
-#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										offset = _tmp134_ + 1;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp140_ = shift_count;
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									if (_tmp140_ != 6) {
+#line 2942 "book.c"
+										gint _tmp141_ = 0;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp141_ = offset;
+#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										offset = _tmp141_ + 1;
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										shift_count = 6;
-#line 2586 "book.c"
+#line 2950 "book.c"
 									}
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp135_ = row;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp136_ = image;
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp137_ = gdk_pixbuf_get_rowstride (_tmp136_);
-#line 317 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									in_offset = _tmp135_ * _tmp137_;
-#line 2596 "book.c"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp142_ = row;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp143_ = image;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp144_ = gdk_pixbuf_get_rowstride (_tmp143_);
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp145_ = _tmp144_;
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									in_offset = _tmp142_ * _tmp145_;
+#line 2962 "book.c"
 									{
 										gint x = 0;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										x = 0;
-#line 2601 "book.c"
+#line 2967 "book.c"
 										{
-											gboolean _tmp138_ = FALSE;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp138_ = TRUE;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											gboolean _tmp146_ = FALSE;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp146_ = TRUE;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											while (TRUE) {
-#line 2608 "book.c"
-												gboolean _tmp139_ = FALSE;
-												gint _tmp141_ = 0;
-												gint _tmp142_ = 0;
-												gint _tmp143_ = 0;
-												guint8 p = 0U;
-												guint8* _tmp147_ = NULL;
-												gint _tmp147__length1 = 0;
+#line 2974 "book.c"
 												gint _tmp148_ = 0;
 												gint _tmp149_ = 0;
-												guint8 _tmp150_ = 0U;
-												guint8 _tmp151_ = 0U;
-												gint _tmp166_ = 0;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp139_ = _tmp138_;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!_tmp139_) {
-#line 2625 "book.c"
-													gint _tmp140_ = 0;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp140_ = x;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													x = _tmp140_ + 1;
-#line 2631 "book.c"
+												gint _tmp150_ = 0;
+												guint8 p = 0U;
+												guint8* _tmp154_ = NULL;
+												gint _tmp154__length1 = 0;
+												gint _tmp155_ = 0;
+												gint _tmp156_ = 0;
+												guint8 _tmp157_ = 0U;
+												guint8 _tmp158_ = 0U;
+												gint _tmp173_ = 0;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (!_tmp146_) {
+#line 2988 "book.c"
+													gint _tmp147_ = 0;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp147_ = x;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													x = _tmp147_ + 1;
+#line 2994 "book.c"
 												}
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp138_ = FALSE;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp141_ = x;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp142_ = width;
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (!(_tmp141_ < _tmp142_)) {
-#line 318 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp146_ = FALSE;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp148_ = x;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp149_ = width;
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (!(_tmp148_ < _tmp149_)) {
+#line 368 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													break;
-#line 2643 "book.c"
+#line 3006 "book.c"
 												}
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp143_ = shift_count;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp143_ == 6) {
-#line 2649 "book.c"
-													guint8* _tmp144_ = NULL;
-													gint _tmp144__length1 = 0;
-													gint _tmp145_ = 0;
-													guint8 _tmp146_ = 0U;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp144_ = data;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp144__length1 = data_length1;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp145_ = offset;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp144_[_tmp145_] = (guint8) 0;
-#line 322 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp146_ = _tmp144_[_tmp145_];
-#line 2664 "book.c"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp150_ = shift_count;
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (_tmp150_ == 6) {
+#line 3012 "book.c"
+													guint8* _tmp151_ = NULL;
+													gint _tmp151__length1 = 0;
+													gint _tmp152_ = 0;
+													guint8 _tmp153_ = 0U;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp151_ = data;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp151__length1 = data_length1;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp152_ = offset;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp151_[_tmp152_] = (guint8) 0;
+#line 372 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp153_ = _tmp151_[_tmp152_];
+#line 3027 "book.c"
 												}
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp147_ = pixels;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp147__length1 = pixels_length1;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp148_ = in_offset;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp149_ = x;
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp150_ = _tmp147_[_tmp148_ + (_tmp149_ * 3)];
-#line 325 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												p = _tmp150_;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp151_ = p;
-#line 326 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (((gint) _tmp151_) >= 192) {
-#line 2682 "book.c"
-													guint8* _tmp152_ = NULL;
-													gint _tmp152__length1 = 0;
-													gint _tmp153_ = 0;
-													gint _tmp154_ = 0;
-													guint8 _tmp155_ = 0U;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp152_ = data;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp152__length1 = data_length1;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp153_ = offset;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp154_ = shift_count;
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp152_[_tmp153_] |= (guint8) (3 << _tmp154_);
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp155_ = _tmp152_[_tmp153_];
-#line 2700 "book.c"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp154_ = pixels;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp154__length1 = pixels_length1;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp155_ = in_offset;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp156_ = x;
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp157_ = _tmp154_[_tmp155_ + (_tmp156_ * 3)];
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												p = _tmp157_;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp158_ = p;
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (((gint) _tmp158_) >= 192) {
+#line 3045 "book.c"
+													guint8* _tmp159_ = NULL;
+													gint _tmp159__length1 = 0;
+													gint _tmp160_ = 0;
+													gint _tmp161_ = 0;
+													guint8 _tmp162_ = 0U;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp159_ = data;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp159__length1 = data_length1;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp160_ = offset;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp161_ = shift_count;
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp159_[_tmp160_] |= (guint8) (3 << _tmp161_);
+#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp162_ = _tmp159_[_tmp160_];
+#line 3063 "book.c"
 												} else {
-													guint8 _tmp156_ = 0U;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp156_ = p;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp156_) >= 128) {
-#line 2707 "book.c"
-														guint8* _tmp157_ = NULL;
-														gint _tmp157__length1 = 0;
-														gint _tmp158_ = 0;
-														gint _tmp159_ = 0;
-														guint8 _tmp160_ = 0U;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp157_ = data;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp157__length1 = data_length1;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp158_ = offset;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp159_ = shift_count;
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp157_[_tmp158_] |= (guint8) (2 << _tmp159_);
-#line 329 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp160_ = _tmp157_[_tmp158_];
-#line 2725 "book.c"
+													guint8 _tmp163_ = 0U;
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp163_ = p;
+#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (((gint) _tmp163_) >= 128) {
+#line 3070 "book.c"
+														guint8* _tmp164_ = NULL;
+														gint _tmp164__length1 = 0;
+														gint _tmp165_ = 0;
+														gint _tmp166_ = 0;
+														guint8 _tmp167_ = 0U;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp164_ = data;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp164__length1 = data_length1;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp165_ = offset;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp166_ = shift_count;
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp164_[_tmp165_] |= (guint8) (2 << _tmp166_);
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp167_ = _tmp164_[_tmp165_];
+#line 3088 "book.c"
 													} else {
-														guint8 _tmp161_ = 0U;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp161_ = p;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														if (((gint) _tmp161_) >= 64) {
-#line 2732 "book.c"
-															guint8* _tmp162_ = NULL;
-															gint _tmp162__length1 = 0;
-															gint _tmp163_ = 0;
-															gint _tmp164_ = 0;
-															guint8 _tmp165_ = 0U;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp162_ = data;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp162__length1 = data_length1;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp163_ = offset;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp164_ = shift_count;
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp162_[_tmp163_] |= (guint8) (1 << _tmp164_);
-#line 331 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-															_tmp165_ = _tmp162_[_tmp163_];
-#line 2750 "book.c"
+														guint8 _tmp168_ = 0U;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp168_ = p;
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														if (((gint) _tmp168_) >= 64) {
+#line 3095 "book.c"
+															guint8* _tmp169_ = NULL;
+															gint _tmp169__length1 = 0;
+															gint _tmp170_ = 0;
+															gint _tmp171_ = 0;
+															guint8 _tmp172_ = 0U;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp169_ = data;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp169__length1 = data_length1;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp170_ = offset;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp171_ = shift_count;
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp169_[_tmp170_] |= (guint8) (1 << _tmp171_);
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+															_tmp172_ = _tmp169_[_tmp170_];
+#line 3113 "book.c"
 														}
 													}
 												}
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp166_ = shift_count;
-#line 334 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												if (_tmp166_ == 0) {
-#line 2758 "book.c"
-													gint _tmp167_ = 0;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp167_ = offset;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													offset = _tmp167_ + 1;
-#line 337 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp173_ = shift_count;
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												if (_tmp173_ == 0) {
+#line 3121 "book.c"
+													gint _tmp174_ = 0;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp174_ = offset;
+#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													offset = _tmp174_ + 1;
+#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 													shift_count = 6;
-#line 2766 "book.c"
+#line 3129 "book.c"
 												} else {
-													gint _tmp168_ = 0;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp168_ = shift_count;
-#line 340 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													shift_count = _tmp168_ - 2;
-#line 2773 "book.c"
+													gint _tmp175_ = 0;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp175_ = shift_count;
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													shift_count = _tmp175_ - 2;
+#line 3136 "book.c"
 												}
 											}
 										}
@@ -2778,241 +3141,238 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 							}
 						}
 					} else {
-						Page* _tmp169_ = NULL;
-						gint _tmp170_ = 0;
-						gint _tmp171_ = 0;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp169_ = page;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp170_ = page_get_depth (_tmp169_);
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp171_ = _tmp170_;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp171_ == 1) {
-#line 2793 "book.c"
+						Page* _tmp176_ = NULL;
+						gint _tmp177_ = 0;
+						gint _tmp178_ = 0;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp176_ = page;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp177_ = page_get_depth (_tmp176_);
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp178_ = _tmp177_;
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						if (_tmp178_ == 1) {
+#line 3156 "book.c"
 							gint mask = 0;
-							gchar* _tmp172_ = NULL;
+							gchar* _tmp179_ = NULL;
 							gint data_length = 0;
-							gint _tmp173_ = 0;
-							gint _tmp174_ = 0;
-							gint _tmp175_ = 0;
-							guint8* _tmp176_ = NULL;
+							gint _tmp180_ = 0;
+							gint _tmp181_ = 0;
+							gint _tmp182_ = 0;
+							guint8* _tmp183_ = NULL;
 							gint offset = 0;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 396 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							mask = 0x80;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							depth = 1;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp172_ = g_strdup ("DeviceGray");
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp179_ = g_strdup ("DeviceGray");
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (color_space);
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							color_space = _tmp172_;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp173_ = height;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp174_ = width;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp173_ * ((_tmp174_ + 7) / 8);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp175_ = data_length;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp176_ = g_new0 (guint8, _tmp175_);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							color_space = _tmp179_;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp180_ = height;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp181_ = width;
+#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length = _tmp180_ * ((_tmp181_ + 7) / 8);
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp182_ = data_length;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp183_ = g_new0 (guint8, _tmp182_);
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp176_;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp175_;
-#line 351 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data = _tmp183_;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length1 = _tmp182_;
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
-#line 352 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							offset = 0;
-#line 2832 "book.c"
+#line 3195 "book.c"
 							{
 								gint row = 0;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
-#line 2837 "book.c"
+#line 3200 "book.c"
 								{
-									gboolean _tmp177_ = FALSE;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp177_ = TRUE;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									gboolean _tmp184_ = FALSE;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp184_ = TRUE;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									while (TRUE) {
-#line 2844 "book.c"
-										gboolean _tmp178_ = FALSE;
-										gint _tmp180_ = 0;
-										gint _tmp181_ = 0;
-										gint _tmp182_ = 0;
-										gint in_offset = 0;
-										gint _tmp184_ = 0;
-										GdkPixbuf* _tmp185_ = NULL;
+#line 3207 "book.c"
 										gint _tmp186_ = 0;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp178_ = _tmp177_;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!_tmp178_) {
-#line 2857 "book.c"
-											gint _tmp179_ = 0;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp179_ = row;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp179_ + 1;
-#line 2863 "book.c"
+										gint _tmp187_ = 0;
+										gint _tmp188_ = 0;
+										gint in_offset = 0;
+										gint _tmp190_ = 0;
+										GdkPixbuf* _tmp191_ = NULL;
+										gint _tmp192_ = 0;
+										gint _tmp193_ = 0;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										if (!_tmp184_) {
+#line 3218 "book.c"
+											gint _tmp185_ = 0;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp185_ = row;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											row = _tmp185_ + 1;
+#line 3224 "book.c"
 										}
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp177_ = FALSE;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp180_ = row;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp181_ = height;
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp180_ < _tmp181_)) {
-#line 353 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp184_ = FALSE;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp186_ = row;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp187_ = height;
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										if (!(_tmp186_ < _tmp187_)) {
+#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											break;
-#line 2875 "book.c"
+#line 3236 "book.c"
 										}
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp182_ = mask;
-#line 356 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (_tmp182_ != 0x80) {
-#line 2881 "book.c"
-											gint _tmp183_ = 0;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp183_ = offset;
-#line 358 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											offset = _tmp183_ + 1;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp188_ = mask;
+#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										if (_tmp188_ != 0x80) {
+#line 3242 "book.c"
+											gint _tmp189_ = 0;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp189_ = offset;
+#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											offset = _tmp189_ + 1;
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											mask = 0x80;
-#line 2889 "book.c"
+#line 3250 "book.c"
 										}
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp184_ = row;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp185_ = image;
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp186_ = gdk_pixbuf_get_rowstride (_tmp185_);
-#line 362 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp184_ * _tmp186_;
-#line 2899 "book.c"
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp190_ = row;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp191_ = image;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp192_ = gdk_pixbuf_get_rowstride (_tmp191_);
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp193_ = _tmp192_;
+#line 412 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										in_offset = _tmp190_ * _tmp193_;
+#line 3262 "book.c"
 										{
 											gint x = 0;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 											x = 0;
-#line 2904 "book.c"
+#line 3267 "book.c"
 											{
-												gboolean _tmp187_ = FALSE;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp187_ = TRUE;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												gboolean _tmp194_ = FALSE;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp194_ = TRUE;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 												while (TRUE) {
-#line 2911 "book.c"
-													gboolean _tmp188_ = FALSE;
-													gint _tmp190_ = 0;
-													gint _tmp191_ = 0;
-													gint _tmp192_ = 0;
-													guint8* _tmp196_ = NULL;
-													gint _tmp196__length1 = 0;
+#line 3274 "book.c"
+													gint _tmp196_ = 0;
 													gint _tmp197_ = 0;
 													gint _tmp198_ = 0;
-													guint8 _tmp199_ = 0U;
+													guint8* _tmp202_ = NULL;
+													gint _tmp202__length1 = 0;
+													gint _tmp203_ = 0;
 													gint _tmp204_ = 0;
-													gint _tmp205_ = 0;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp188_ = _tmp187_;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp188_) {
-#line 2927 "book.c"
-														gint _tmp189_ = 0;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp189_ = x;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp189_ + 1;
-#line 2933 "book.c"
+													guint8 _tmp205_ = 0U;
+													gint _tmp210_ = 0;
+													gint _tmp211_ = 0;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (!_tmp194_) {
+#line 3287 "book.c"
+														gint _tmp195_ = 0;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp195_ = x;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														x = _tmp195_ + 1;
+#line 3293 "book.c"
 													}
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp187_ = FALSE;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp190_ = x;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp191_ = width;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!(_tmp190_ < _tmp191_)) {
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp194_ = FALSE;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp196_ = x;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp197_ = width;
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (!(_tmp196_ < _tmp197_)) {
+#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														break;
-#line 2945 "book.c"
+#line 3305 "book.c"
 													}
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp192_ = mask;
-#line 366 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp192_ == 0x80) {
-#line 2951 "book.c"
-														guint8* _tmp193_ = NULL;
-														gint _tmp193__length1 = 0;
-														gint _tmp194_ = 0;
-														guint8 _tmp195_ = 0U;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp193_ = data;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp193__length1 = data_length1;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp194_ = offset;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp193_[_tmp194_] = (guint8) 0;
-#line 367 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp195_ = _tmp193_[_tmp194_];
-#line 2966 "book.c"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp198_ = mask;
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (_tmp198_ == 0x80) {
+#line 3311 "book.c"
+														guint8* _tmp199_ = NULL;
+														gint _tmp199__length1 = 0;
+														gint _tmp200_ = 0;
+														guint8 _tmp201_ = 0U;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp199_ = data;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp199__length1 = data_length1;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp200_ = offset;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp199_[_tmp200_] = (guint8) 0;
+#line 417 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp201_ = _tmp199_[_tmp200_];
+#line 3326 "book.c"
 													}
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp196_ = pixels;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp196__length1 = pixels_length1;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp197_ = in_offset;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp198_ = x;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp199_ = _tmp196_[_tmp197_ + (_tmp198_ * 3)];
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (((gint) _tmp199_) != 0) {
-#line 2980 "book.c"
-														guint8* _tmp200_ = NULL;
-														gint _tmp200__length1 = 0;
-														gint _tmp201_ = 0;
-														gint _tmp202_ = 0;
-														guint8 _tmp203_ = 0U;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp200_ = data;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp200__length1 = data_length1;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp201_ = offset;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp202_ = mask;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp200_[_tmp201_] |= (guint8) _tmp202_;
-#line 371 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp203_ = _tmp200_[_tmp201_];
-#line 2998 "book.c"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp202_ = pixels;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp202__length1 = pixels_length1;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp203_ = in_offset;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp204_ = x;
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp205_ = _tmp202_[_tmp203_ + (_tmp204_ * 3)];
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (((gint) _tmp205_) != 0) {
+#line 3340 "book.c"
+														guint8* _tmp206_ = NULL;
+														gint _tmp206__length1 = 0;
+														gint _tmp207_ = 0;
+														gint _tmp208_ = 0;
+														guint8 _tmp209_ = 0U;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp206_ = data;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp206__length1 = data_length1;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp207_ = offset;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp208_ = mask;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp206_[_tmp207_] |= (guint8) _tmp208_;
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp209_ = _tmp206_[_tmp207_];
+#line 3358 "book.c"
 													}
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp204_ = mask;
-#line 374 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													mask = _tmp204_ >> 1;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp205_ = mask;
-#line 375 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (_tmp205_ == 0) {
-#line 3008 "book.c"
-														gint _tmp206_ = 0;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp206_ = offset;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														offset = _tmp206_ + 1;
-#line 378 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp210_ = mask;
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													mask = _tmp210_ >> 1;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp211_ = mask;
+#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (_tmp211_ == 0) {
+#line 3368 "book.c"
+														gint _tmp212_ = 0;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														_tmp212_ = offset;
+#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														offset = _tmp212_ + 1;
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 														mask = 0x80;
-#line 3016 "book.c"
+#line 3376 "book.c"
 													}
 												}
 											}
@@ -3021,868 +3381,893 @@ static void book_save_pdf (Book* self, GFile* file, gint quality, GError** error
 								}
 							}
 						} else {
-							gchar* _tmp207_ = NULL;
+							gchar* _tmp213_ = NULL;
 							gint data_length = 0;
-							gint _tmp208_ = 0;
-							gint _tmp209_ = 0;
-							gint _tmp210_ = 0;
-							guint8* _tmp211_ = NULL;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							gint _tmp214_ = 0;
+							gint _tmp215_ = 0;
+							gint _tmp216_ = 0;
+							guint8* _tmp217_ = NULL;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							depth = 8;
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp207_ = g_strdup ("DeviceGray");
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp213_ = g_strdup ("DeviceGray");
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_g_free0 (color_space);
-#line 386 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							color_space = _tmp207_;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp208_ = height;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp209_ = width;
-#line 387 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length = _tmp208_ * _tmp209_;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp210_ = data_length;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp211_ = g_new0 (guint8, _tmp210_);
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							color_space = _tmp213_;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp214_ = height;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp215_ = width;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length = _tmp214_ * _tmp215_;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp216_ = data_length;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp217_ = g_new0 (guint8, _tmp216_);
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							data = (g_free (data), NULL);
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp211_;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp210_;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data = _tmp217_;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length1 = _tmp216_;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 							_data_size_ = data_length1;
-#line 3057 "book.c"
+#line 3417 "book.c"
 							{
 								gint row = 0;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 								row = 0;
-#line 3062 "book.c"
+#line 3422 "book.c"
 								{
-									gboolean _tmp212_ = FALSE;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-									_tmp212_ = TRUE;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									gboolean _tmp218_ = FALSE;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+									_tmp218_ = TRUE;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 									while (TRUE) {
-#line 3069 "book.c"
-										gboolean _tmp213_ = FALSE;
-										gint _tmp215_ = 0;
-										gint _tmp216_ = 0;
-										gint in_offset = 0;
-										gint _tmp217_ = 0;
-										GdkPixbuf* _tmp218_ = NULL;
-										gint _tmp219_ = 0;
-										gint out_offset = 0;
+#line 3429 "book.c"
 										gint _tmp220_ = 0;
 										gint _tmp221_ = 0;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp213_ = _tmp212_;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!_tmp213_) {
-#line 3084 "book.c"
-											gint _tmp214_ = 0;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											_tmp214_ = row;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											row = _tmp214_ + 1;
-#line 3090 "book.c"
-										}
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp212_ = FALSE;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp215_ = row;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp216_ = height;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										if (!(_tmp215_ < _tmp216_)) {
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											break;
-#line 3102 "book.c"
+										gint in_offset = 0;
+										gint _tmp222_ = 0;
+										GdkPixbuf* _tmp223_ = NULL;
+										gint _tmp224_ = 0;
+										gint _tmp225_ = 0;
+										gint out_offset = 0;
+										gint _tmp226_ = 0;
+										gint _tmp227_ = 0;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										if (!_tmp218_) {
+#line 3442 "book.c"
+											gint _tmp219_ = 0;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											_tmp219_ = row;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											row = _tmp219_ + 1;
+#line 3448 "book.c"
 										}
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp217_ = row;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp218_ = image;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp219_ = gdk_pixbuf_get_rowstride (_tmp218_);
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										in_offset = _tmp217_ * _tmp219_;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+										_tmp218_ = FALSE;
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 										_tmp220_ = row;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										_tmp221_ = width;
-#line 392 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-										out_offset = _tmp220_ * _tmp221_;
-#line 3118 "book.c"
-										{
-											gint x = 0;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-											x = 0;
-#line 3123 "book.c"
-											{
-												gboolean _tmp222_ = FALSE;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												_tmp222_ = TRUE;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-												while (TRUE) {
-#line 3130 "book.c"
-													gboolean _tmp223_ = FALSE;
-													gint _tmp225_ = 0;
-													gint _tmp226_ = 0;
-													guint8* _tmp227_ = NULL;
-													gint _tmp227__length1 = 0;
-													gint _tmp228_ = 0;
-													gint _tmp229_ = 0;
-													guint8* _tmp230_ = NULL;
-													gint _tmp230__length1 = 0;
-													gint _tmp231_ = 0;
-													gint _tmp232_ = 0;
-													guint8 _tmp233_ = 0U;
-													guint8 _tmp234_ = 0U;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp223_ = _tmp222_;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!_tmp223_) {
-#line 3148 "book.c"
-														gint _tmp224_ = 0;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														_tmp224_ = x;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														x = _tmp224_ + 1;
-#line 3154 "book.c"
-													}
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp222_ = FALSE;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp225_ = x;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp226_ = width;
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													if (!(_tmp225_ < _tmp226_)) {
-#line 393 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-														break;
-#line 3166 "book.c"
-													}
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp227_ = data;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp227__length1 = data_length1;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp228_ = out_offset;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp229_ = x;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp230_ = pixels;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp230__length1 = pixels_length1;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp231_ = in_offset;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp232_ = x;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp233_ = _tmp230_[_tmp231_ + (_tmp232_ * 3)];
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp227_[_tmp228_ + _tmp229_] = _tmp233_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-													_tmp234_ = _tmp227_[_tmp228_ + _tmp229_];
-#line 3190 "book.c"
-												}
-											}
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp235_ = data;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp235__length1 = data_length1;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp237_ = book_compress_zlib (self, _tmp235_, _tmp235__length1, &_tmp236_);
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data = _tmp237_;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data_length1 = _tmp236_;
-#line 399 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_compressed_data_size_ = compressed_data_length1;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp238_ = compressed_data;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp238__length1 = compressed_data_length1;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp238_ != NULL) {
-#line 3218 "book.c"
-					gint _tmp239_ = 0;
-					const gchar* _tmp252_ = NULL;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp239_ = depth;
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp239_ > 1) {
-#line 3225 "book.c"
-						guint8* jpeg_data = NULL;
-						GdkPixbuf* _tmp240_ = NULL;
-						gint _tmp241_ = 0;
-						Page* _tmp242_ = NULL;
-						gint _tmp243_ = 0;
-						gint _tmp244_ = 0;
-						gint _tmp245_ = 0;
-						guint8* _tmp246_ = NULL;
-						gint jpeg_data_length1 = 0;
-						gint _jpeg_data_size_ = 0;
-						guint8* _tmp247_ = NULL;
-						gint _tmp247__length1 = 0;
-						guint8* _tmp248_ = NULL;
-						gint _tmp248__length1 = 0;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp240_ = image;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp241_ = quality;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp242_ = page;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp243_ = page_get_dpi (_tmp242_);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp244_ = _tmp243_;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp246_ = book_compress_jpeg (self, _tmp240_, _tmp241_, _tmp244_, &_tmp245_);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data = _tmp246_;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data_length1 = _tmp245_;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_jpeg_data_size_ = jpeg_data_length1;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp247_ = jpeg_data;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp247__length1 = jpeg_data_length1;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp248_ = compressed_data;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp248__length1 = compressed_data_length1;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						if (_tmp247__length1 < _tmp248__length1) {
-#line 3268 "book.c"
-							gchar* _tmp249_ = NULL;
-							guint8* _tmp250_ = NULL;
-							gint _tmp250__length1 = 0;
-							guint8* _tmp251_ = NULL;
-							gint _tmp251__length1 = 0;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp249_ = g_strdup ("DCTDecode");
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_g_free0 (filter);
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							filter = _tmp249_;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp250_ = jpeg_data;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp250__length1 = jpeg_data_length1;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp251_ = (_tmp250_ != NULL) ? _vala_array_dup1 (_tmp250_, _tmp250__length1) : ((gpointer) _tmp250_);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_tmp251__length1 = _tmp250__length1;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = (g_free (data), NULL);
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data = _tmp251_;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							data_length1 = _tmp251__length1;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-							_data_size_ = data_length1;
-#line 3296 "book.c"
-						}
-#line 403 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						jpeg_data = (g_free (jpeg_data), NULL);
-#line 3300 "book.c"
-					}
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp252_ = filter;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					if (_tmp252_ == NULL) {
-#line 3306 "book.c"
-						gchar* _tmp253_ = NULL;
-						guint8* _tmp254_ = NULL;
-						gint _tmp254__length1 = 0;
-						guint8* _tmp255_ = NULL;
-						gint _tmp255__length1 = 0;
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp253_ = g_strdup ("FlateDecode");
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_g_free0 (filter);
-#line 415 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						filter = _tmp253_;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp254_ = compressed_data;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp254__length1 = compressed_data_length1;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp255_ = (_tmp254_ != NULL) ? _vala_array_dup2 (_tmp254_, _tmp254__length1) : ((gpointer) _tmp254_);
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_tmp255__length1 = _tmp254__length1;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = (g_free (data), NULL);
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data = _tmp255_;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						data_length1 = _tmp255__length1;
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-						_data_size_ = data_length1;
-#line 3334 "book.c"
-					}
-				}
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp256_ = writer;
-#line 421 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp256_, "\n");
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp257_ = writer;
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp258_ = pdf_writer_start_object (_tmp257_);
-#line 422 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp258_;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp259_ = writer;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp260_ = number;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp261_ = g_strdup_printf ("%u 0 obj\n", _tmp260_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp262_ = _tmp261_;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp259_, _tmp262_);
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp262_);
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp263_ = writer;
-#line 424 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp263_, "<<\n");
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp264_ = writer;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp264_, "/Type /Page\n");
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp265_ = writer;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp266_ = pages_number;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp267_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp266_);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp268_ = _tmp267_;
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp265_, _tmp268_);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp268_);
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp269_ = writer;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp270_ = i;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp271_ = number;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp272_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp270_, _tmp271_ + 1);
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp273_ = _tmp272_;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp269_, _tmp273_);
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp273_);
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp274_ = writer;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp275_ = page_width;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp276_ = width_buffer;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp276__length1 = width_buffer_length1;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp277_ = g_ascii_formatd (_tmp276_, _tmp276__length1, "%.2f", _tmp275_);
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp278_ = page_height;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp279_ = height_buffer;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp279__length1 = height_buffer_length1;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp280_ = g_ascii_formatd (_tmp279_, _tmp279__length1, "%.2f", _tmp278_);
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp281_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp277_, _tmp280_);
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp282_ = _tmp281_;
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp274_, _tmp282_);
-#line 428 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp282_);
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp283_ = writer;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp284_ = number;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp285_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp284_ + 2);
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp286_ = _tmp285_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp283_, _tmp286_);
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp286_);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp287_ = writer;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp287_, ">>\n");
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp288_ = writer;
-#line 431 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp288_, "endobj\n");
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp289_ = writer;
-#line 434 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp289_, "\n");
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp290_ = writer;
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp291_ = pdf_writer_start_object (_tmp290_);
-#line 435 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp291_;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp292_ = writer;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp293_ = number;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp294_ = g_strdup_printf ("%u 0 obj\n", _tmp293_);
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp295_ = _tmp294_;
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp292_, _tmp295_);
-#line 436 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp295_);
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp296_ = writer;
-#line 437 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp296_, "<<\n");
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp297_ = writer;
-#line 438 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp297_, "/Type /XObject\n");
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp298_ = writer;
+										_tmp221_ = height;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp298_, "/Subtype /Image\n");
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp299_ = writer;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp300_ = width;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp301_ = g_strdup_printf ("/Width %d\n", _tmp300_);
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp302_ = _tmp301_;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp299_, _tmp302_);
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp302_);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp303_ = writer;
+										if (!(_tmp220_ < _tmp221_)) {
+#line 439 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											break;
+#line 3460 "book.c"
+										}
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp304_ = height;
+										_tmp222_ = row;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp305_ = g_strdup_printf ("/Height %d\n", _tmp304_);
+										_tmp223_ = image;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp306_ = _tmp305_;
+										_tmp224_ = gdk_pixbuf_get_rowstride (_tmp223_);
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp303_, _tmp306_);
+										_tmp225_ = _tmp224_;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp306_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp307_ = writer;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp308_ = color_space;
+										in_offset = _tmp222_ * _tmp225_;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp309_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp308_);
+										_tmp226_ = row;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp310_ = _tmp309_;
+										_tmp227_ = width;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp307_, _tmp310_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp310_);
+										out_offset = _tmp226_ * _tmp227_;
+#line 3478 "book.c"
+										{
+											gint x = 0;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+											x = 0;
+#line 3483 "book.c"
+											{
+												gboolean _tmp228_ = FALSE;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												_tmp228_ = TRUE;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+												while (TRUE) {
+#line 3490 "book.c"
+													gint _tmp230_ = 0;
+													gint _tmp231_ = 0;
+													guint8* _tmp232_ = NULL;
+													gint _tmp232__length1 = 0;
+													gint _tmp233_ = 0;
+													gint _tmp234_ = 0;
+													guint8* _tmp235_ = NULL;
+													gint _tmp235__length1 = 0;
+													gint _tmp236_ = 0;
+													gint _tmp237_ = 0;
+													guint8 _tmp238_ = 0U;
+													guint8 _tmp239_ = 0U;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													if (!_tmp228_) {
+#line 3505 "book.c"
+														gint _tmp229_ = 0;
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp311_ = writer;
+														_tmp229_ = x;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+														x = _tmp229_ + 1;
+#line 3511 "book.c"
+													}
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp312_ = depth;
+													_tmp228_ = FALSE;
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp313_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp312_);
+													_tmp230_ = x;
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp314_ = _tmp313_;
+													_tmp231_ = width;
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp311_, _tmp314_);
+													if (!(_tmp230_ < _tmp231_)) {
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp314_);
+														break;
+#line 3523 "book.c"
+													}
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp232_ = data;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp315_ = writer;
+													_tmp232__length1 = data_length1;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp316_ = data;
+													_tmp233_ = out_offset;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp316__length1 = data_length1;
+													_tmp234_ = x;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp317_ = g_strdup_printf ("/Length %d\n", _tmp316__length1);
+													_tmp235_ = pixels;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp318_ = _tmp317_;
+													_tmp235__length1 = pixels_length1;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp315_, _tmp318_);
+													_tmp236_ = in_offset;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp318_);
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp319_ = filter;
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				if (_tmp319_ != NULL) {
-#line 3539 "book.c"
-					PDFWriter* _tmp320_ = NULL;
-					const gchar* _tmp321_ = NULL;
-					gchar* _tmp322_ = NULL;
-					gchar* _tmp323_ = NULL;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp320_ = writer;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp321_ = filter;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp322_ = g_strdup_printf ("/Filter /%s\n", _tmp321_);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_tmp323_ = _tmp322_;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					pdf_writer_write_string (_tmp320_, _tmp323_);
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-					_g_free0 (_tmp323_);
-#line 3556 "book.c"
+													_tmp237_ = x;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp238_ = _tmp235_[_tmp236_ + (_tmp237_ * 3)];
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp232_[_tmp233_ + _tmp234_] = _tmp238_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+													_tmp239_ = _tmp232_[_tmp233_ + _tmp234_];
+#line 3547 "book.c"
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
 				}
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp324_ = writer;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp324_, ">>\n");
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp325_ = writer;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp325_, "stream\n");
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp326_ = writer;
+				_tmp240_ = data;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp240__length1 = data_length1;
+#line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp242_ = book_compress_zlib (self, _tmp240_, _tmp240__length1, &_tmp241_);
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp327_ = data;
+				compressed_data = _tmp242_;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp327__length1 = data_length1;
+				compressed_data_length1 = _tmp241_;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write (_tmp326_, _tmp327_, _tmp327__length1);
+				_compressed_data_size_ = compressed_data_length1;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp328_ = writer;
+				_tmp243_ = compressed_data;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp328_, "\n");
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp329_ = writer;
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp329_, "endstream\n");
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp330_ = writer;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp330_, "endobj\n");
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp331_ = page_width;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp332_ = width_buffer;
+				_tmp243__length1 = compressed_data_length1;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				if (_tmp243_ != NULL) {
+#line 3575 "book.c"
+					gint _tmp244_ = 0;
+					const gchar* _tmp257_ = NULL;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					_tmp244_ = depth;
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+					if (_tmp244_ > 1) {
+#line 3582 "book.c"
+						guint8* jpeg_data = NULL;
+						GdkPixbuf* _tmp245_ = NULL;
+						gint _tmp246_ = 0;
+						Page* _tmp247_ = NULL;
+						gint _tmp248_ = 0;
+						gint _tmp249_ = 0;
+						gint _tmp250_ = 0;
+						guint8* _tmp251_ = NULL;
+						gint jpeg_data_length1 = 0;
+						gint _jpeg_data_size_ = 0;
+						guint8* _tmp252_ = NULL;
+						gint _tmp252__length1 = 0;
+						guint8* _tmp253_ = NULL;
+						gint _tmp253__length1 = 0;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp332__length1 = width_buffer_length1;
+						_tmp245_ = image;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp333_ = g_ascii_formatd (_tmp332_, _tmp332__length1, "%f", _tmp331_);
+						_tmp246_ = quality;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp334_ = page_height;
+						_tmp247_ = page;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp335_ = height_buffer;
+						_tmp248_ = page_get_dpi (_tmp247_);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp335__length1 = height_buffer_length1;
+						_tmp249_ = _tmp248_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp336_ = g_ascii_formatd (_tmp335_, _tmp335__length1, "%f", _tmp334_);
+						_tmp251_ = book_compress_jpeg (self, _tmp245_, _tmp246_, _tmp249_, &_tmp250_);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp337_ = i;
+						jpeg_data = _tmp251_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp338_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp333_, _tmp336_, _tmp337_);
+						jpeg_data_length1 = _tmp250_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				command = _tmp338_;
+						_jpeg_data_size_ = jpeg_data_length1;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp339_ = writer;
+						_tmp252_ = jpeg_data;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp339_, "\n");
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp340_ = writer;
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp341_ = pdf_writer_start_object (_tmp340_);
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				number = _tmp341_;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp342_ = writer;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp343_ = number;
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp344_ = g_strdup_printf ("%u 0 obj\n", _tmp343_);
+						_tmp252__length1 = jpeg_data_length1;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp253_ = compressed_data;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp253__length1 = compressed_data_length1;
+#line 456 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						if (_tmp252__length1 < _tmp253__length1) {
+#line 3625 "book.c"
+							gchar* _tmp254_ = NULL;
+							guint8* _tmp255_ = NULL;
+							gint _tmp255__length1 = 0;
+							guint8* _tmp256_ = NULL;
+							gint _tmp256__length1 = 0;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp345_ = _tmp344_;
+							_tmp254_ = g_strdup ("DCTDecode");
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp342_, _tmp345_);
+							_g_free0 (filter);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp345_);
+							filter = _tmp254_;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp346_ = writer;
+							_tmp255_ = jpeg_data;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp346_, "<<\n");
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp347_ = writer;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp348_ = command;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp349_ = strlen (_tmp348_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp350_ = _tmp349_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp351_ = g_strdup_printf ("/Length %d\n", _tmp350_ + 1);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp352_ = _tmp351_;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp347_, _tmp352_);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp352_);
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp353_ = writer;
-#line 461 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp353_, ">>\n");
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp354_ = writer;
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp354_, "stream\n");
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp355_ = writer;
+							_tmp255__length1 = jpeg_data_length1;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp256_ = (_tmp255_ != NULL) ? _vala_array_dup1 (_tmp255_, _tmp255__length1) : ((gpointer) _tmp255_);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_tmp256__length1 = _tmp255__length1;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data = (g_free (data), NULL);
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data = _tmp256_;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							data_length1 = _tmp256__length1;
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+							_data_size_ = data_length1;
+#line 3653 "book.c"
+						}
+#line 453 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						jpeg_data = (g_free (jpeg_data), NULL);
+#line 3657 "book.c"
+					}
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp356_ = command;
+					_tmp257_ = filter;
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp355_, _tmp356_);
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp357_ = writer;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp357_, "\n");
+					if (_tmp257_ == NULL) {
+#line 3663 "book.c"
+						gchar* _tmp258_ = NULL;
+						guint8* _tmp259_ = NULL;
+						gint _tmp259__length1 = 0;
+						guint8* _tmp260_ = NULL;
+						gint _tmp260__length1 = 0;
 #line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp358_ = writer;
+						_tmp258_ = g_strdup ("FlateDecode");
 #line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp358_, "endstream\n");
+						_g_free0 (filter);
+#line 465 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						filter = _tmp258_;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp359_ = writer;
+						_tmp259_ = compressed_data;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp359_, "endobj\n");
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp360_ = i;
-#line 468 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				g_signal_emit_by_name (self, "saving", _tmp360_);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (command);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				compressed_data = (g_free (compressed_data), NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				data = (g_free (data), NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				height_buffer = (g_free (height_buffer), NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				width_buffer = (g_free (width_buffer), NULL);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (filter);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (color_space);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_object_unref0 (image);
-#line 263 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_page_unref0 (page);
-#line 3698 "book.c"
-			}
-		}
-	}
+						_tmp259__length1 = compressed_data_length1;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp260_ = (_tmp259_ != NULL) ? _vala_array_dup2 (_tmp259_, _tmp259__length1) : ((gpointer) _tmp259_);
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_tmp260__length1 = _tmp259__length1;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data = (g_free (data), NULL);
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data = _tmp260_;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						data_length1 = _tmp260__length1;
+#line 466 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+						_data_size_ = data_length1;
+#line 3691 "book.c"
+					}
+				}
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp261_ = writer;
+#line 471 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp261_, "\n");
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp262_ = writer;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp361_ = writer;
+				_tmp263_ = pdf_writer_start_object (_tmp262_);
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp361_, "\n");
+				number = _tmp263_;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp264_ = writer;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp362_ = writer;
+				_tmp265_ = number;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp363_ = pdf_writer_start_object (_tmp362_);
+				_tmp266_ = g_strdup_printf ("%u 0 obj\n", _tmp265_);
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	info_number = _tmp363_;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp364_ = writer;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp365_ = info_number;
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp366_ = g_strdup_printf ("%u 0 obj\n", _tmp365_);
-#line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp367_ = _tmp366_;
+				_tmp267_ = _tmp266_;
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp264_, _tmp267_);
+#line 473 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp267_);
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp364_, _tmp367_);
+				_tmp268_ = writer;
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp367_);
+				pdf_writer_write_string (_tmp268_, "<<\n");
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp368_ = writer;
+				_tmp269_ = writer;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp368_, "<<\n");
+				pdf_writer_write_string (_tmp269_, "/Type /Page\n");
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp369_ = writer;
+				_tmp270_ = writer;
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp271_ = pages_number;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp370_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
+				_tmp272_ = g_strdup_printf ("/Parent %u 0 R\n", _tmp271_);
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp371_ = _tmp370_;
+				_tmp273_ = _tmp272_;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp369_, _tmp371_);
+				pdf_writer_write_string (_tmp270_, _tmp273_);
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp371_);
+				_g_free0 (_tmp273_);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp274_ = writer;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp275_ = i;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp276_ = number;
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp277_ = g_strdup_printf ("/Resources << /XObject << /Im%d %u 0 R >> >>\n", _tmp275_, _tmp276_ + 1);
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp372_ = writer;
+				_tmp278_ = _tmp277_;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp372_, ">>\n");
+				pdf_writer_write_string (_tmp274_, _tmp278_);
+#line 477 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp278_);
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp373_ = writer;
+				_tmp279_ = writer;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp373_, "endobj\n");
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp374_ = writer;
+				_tmp280_ = page_width;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp281_ = width_buffer;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp281__length1 = width_buffer_length1;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp282_ = g_ascii_formatd (_tmp281_, _tmp281__length1, "%.2f", _tmp280_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp283_ = page_height;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp284_ = height_buffer;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp284__length1 = height_buffer_length1;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp285_ = g_ascii_formatd (_tmp284_, _tmp284__length1, "%.2f", _tmp283_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp286_ = g_strdup_printf ("/MediaBox [ 0 0 %s %s ]\n", _tmp282_, _tmp285_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp287_ = _tmp286_;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp279_, _tmp287_);
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp287_);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp288_ = writer;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp289_ = number;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp290_ = g_strdup_printf ("/Contents %u 0 R\n", _tmp289_ + 2);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp291_ = _tmp290_;
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp288_, _tmp291_);
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp291_);
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp292_ = writer;
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp292_, ">>\n");
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp375_ = _tmp374_->offset;
+				_tmp293_ = writer;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	xref_offset = _tmp375_;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp376_ = writer;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp376_, "xref\n");
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp377_ = writer;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp378_ = writer;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp379_ = _tmp378_->object_offsets;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp380_ = g_list_length (_tmp379_);
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp381_ = g_strdup_printf ("1 %zu\n", (gsize) _tmp380_);
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp382_ = _tmp381_;
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp377_, _tmp382_);
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp382_);
+				pdf_writer_write_string (_tmp293_, "endobj\n");
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp383_ = writer;
+				_tmp294_ = writer;
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp384_ = _tmp383_->object_offsets;
-#line 3776 "book.c"
-	{
-		GList* offset_collection = NULL;
-		GList* offset_it = NULL;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		offset_collection = _tmp384_;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		for (offset_it = offset_collection; offset_it != NULL; offset_it = offset_it->next) {
-#line 3784 "book.c"
-			guint offset = 0U;
-#line 484 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-			offset = (guint) ((guintptr) offset_it->data);
-#line 3788 "book.c"
-			{
-				PDFWriter* _tmp385_ = NULL;
-				guint _tmp386_ = 0U;
-				gchar* _tmp387_ = NULL;
-				gchar* _tmp388_ = NULL;
+				pdf_writer_write_string (_tmp294_, "\n");
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp385_ = writer;
+				_tmp295_ = writer;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp386_ = offset;
+				_tmp296_ = pdf_writer_start_object (_tmp295_);
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp387_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp386_);
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_tmp388_ = _tmp387_;
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				pdf_writer_write_string (_tmp385_, _tmp388_);
-#line 485 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-				_g_free0 (_tmp388_);
-#line 3806 "book.c"
-			}
-		}
-	}
+				number = _tmp296_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp297_ = writer;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp298_ = number;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp299_ = g_strdup_printf ("%u 0 obj\n", _tmp298_);
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp300_ = _tmp299_;
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp297_, _tmp300_);
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp300_);
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp301_ = writer;
+#line 487 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp301_, "<<\n");
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp389_ = writer;
+				_tmp302_ = writer;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp389_, "trailer\n");
+				pdf_writer_write_string (_tmp302_, "/Type /XObject\n");
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp390_ = writer;
+				_tmp303_ = writer;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp390_, "<<\n");
+				pdf_writer_write_string (_tmp303_, "/Subtype /Image\n");
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp391_ = writer;
+				_tmp304_ = writer;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp392_ = writer;
+				_tmp305_ = width;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp393_ = _tmp392_->object_offsets;
+				_tmp306_ = g_strdup_printf ("/Width %d\n", _tmp305_);
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp394_ = g_list_length (_tmp393_);
+				_tmp307_ = _tmp306_;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp395_ = g_strdup_printf ("/Size %zu\n", (gsize) _tmp394_);
+				pdf_writer_write_string (_tmp304_, _tmp307_);
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp396_ = _tmp395_;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp391_, _tmp396_);
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp396_);
+				_g_free0 (_tmp307_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp397_ = writer;
+				_tmp308_ = writer;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp398_ = info_number;
+				_tmp309_ = height;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp399_ = g_strdup_printf ("/Info %u 0 R\n", _tmp398_);
+				_tmp310_ = g_strdup_printf ("/Height %d\n", _tmp309_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp400_ = _tmp399_;
+				_tmp311_ = _tmp310_;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp397_, _tmp400_);
+				pdf_writer_write_string (_tmp308_, _tmp311_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp400_);
+				_g_free0 (_tmp311_);
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp401_ = writer;
+				_tmp312_ = writer;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp402_ = catalog_number;
+				_tmp313_ = color_space;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp403_ = g_strdup_printf ("/Root %u 0 R\n", _tmp402_);
+				_tmp314_ = g_strdup_printf ("/ColorSpace /%s\n", _tmp313_);
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp404_ = _tmp403_;
+				_tmp315_ = _tmp314_;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp401_, _tmp404_);
+				pdf_writer_write_string (_tmp312_, _tmp315_);
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp404_);
+				_g_free0 (_tmp315_);
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp316_ = writer;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp317_ = depth;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp318_ = g_strdup_printf ("/BitsPerComponent %d\n", _tmp317_);
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp319_ = _tmp318_;
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp316_, _tmp319_);
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp319_);
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp405_ = writer;
+				_tmp320_ = writer;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp321_ = data;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp321__length1 = data_length1;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp322_ = g_strdup_printf ("/Length %d\n", _tmp321__length1);
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp405_, ">>\n");
+				_tmp323_ = _tmp322_;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp320_, _tmp323_);
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp323_);
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp406_ = writer;
+				_tmp324_ = filter;
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp406_, "startxref\n");
+				if (_tmp324_ != NULL) {
+#line 3896 "book.c"
+					PDFWriter* _tmp325_ = NULL;
+					const gchar* _tmp326_ = NULL;
+					gchar* _tmp327_ = NULL;
+					gchar* _tmp328_ = NULL;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp407_ = writer;
+					_tmp325_ = writer;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp408_ = xref_offset;
+					_tmp326_ = filter;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp409_ = g_strdup_printf ("%zu\n", _tmp408_);
+					_tmp327_ = g_strdup_printf ("/Filter /%s\n", _tmp326_);
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp410_ = _tmp409_;
+					_tmp328_ = _tmp327_;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp407_, _tmp410_);
+					pdf_writer_write_string (_tmp325_, _tmp328_);
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_g_free0 (_tmp410_);
+					_g_free0 (_tmp328_);
+#line 3913 "book.c"
+				}
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	_tmp411_ = writer;
+				_tmp329_ = writer;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-	pdf_writer_write_string (_tmp411_, "%%EOF\n");
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp329_, ">>\n");
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp330_ = writer;
+#line 498 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp330_, "stream\n");
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp331_ = writer;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp332_ = data;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp332__length1 = data_length1;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write (_tmp331_, _tmp332_, _tmp332__length1);
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp333_ = writer;
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp333_, "\n");
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp334_ = writer;
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp334_, "endstream\n");
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp335_ = writer;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp335_, "endobj\n");
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp336_ = page_width;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp337_ = width_buffer;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp337__length1 = width_buffer_length1;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp338_ = g_ascii_formatd (_tmp337_, _tmp337__length1, "%f", _tmp336_);
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp339_ = page_height;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp340_ = height_buffer;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp340__length1 = height_buffer_length1;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp341_ = g_ascii_formatd (_tmp340_, _tmp340__length1, "%f", _tmp339_);
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp342_ = i;
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp343_ = g_strdup_printf ("q\n%s 0 0 %s 0 0 cm\n/Im%d Do\nQ", _tmp338_, _tmp341_, _tmp342_);
+#line 505 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				command = _tmp343_;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp344_ = writer;
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp344_, "\n");
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp345_ = writer;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp346_ = pdf_writer_start_object (_tmp345_);
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				number = _tmp346_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp347_ = writer;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp348_ = number;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp349_ = g_strdup_printf ("%u 0 obj\n", _tmp348_);
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp350_ = _tmp349_;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp347_, _tmp350_);
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp350_);
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp351_ = writer;
+#line 509 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp351_, "<<\n");
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp352_ = writer;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp353_ = command;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp354_ = strlen (_tmp353_);
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp355_ = _tmp354_;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp356_ = g_strdup_printf ("/Length %d\n", _tmp355_);
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp357_ = _tmp356_;
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp352_, _tmp357_);
+#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp357_);
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp358_ = writer;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp358_, ">>\n");
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp359_ = writer;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp359_, "stream\n");
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp360_ = writer;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp361_ = command;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp360_, _tmp361_);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp362_ = writer;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp362_, "\n");
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp363_ = writer;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp363_, "endstream\n");
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp364_ = writer;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp364_, "endobj\n");
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp365_ = i;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				g_signal_emit_by_name (self, "saving", _tmp365_);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (command);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				compressed_data = (g_free (compressed_data), NULL);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				data = (g_free (data), NULL);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				height_buffer = (g_free (height_buffer), NULL);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				width_buffer = (g_free (width_buffer), NULL);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (filter);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (color_space);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_object_unref0 (image);
+#line 313 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_page_unref0 (page);
+#line 4055 "book.c"
+			}
+		}
+	}
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp366_ = writer;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp366_, "\n");
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp367_ = writer;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp368_ = pdf_writer_start_object (_tmp367_);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	info_number = _tmp368_;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp369_ = writer;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp370_ = info_number;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp371_ = g_strdup_printf ("%u 0 obj\n", _tmp370_);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp372_ = _tmp371_;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp369_, _tmp372_);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp372_);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp373_ = writer;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp373_, "<<\n");
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp374_ = writer;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp375_ = g_strdup_printf ("/Creator (Simple Scan %s)\n", VERSION);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp376_ = _tmp375_;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp374_, _tmp376_);
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp376_);
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp377_ = writer;
+#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp377_, ">>\n");
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp378_ = writer;
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp378_, "endobj\n");
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp379_ = writer;
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp379_, "\n");
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp380_ = writer;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp381_ = _tmp380_->offset;
+#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	xref_offset = _tmp381_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp382_ = writer;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp382_, "xref\n");
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp383_ = writer;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp384_ = writer;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp385_ = _tmp384_->object_offsets;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp386_ = g_list_length (_tmp385_);
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp387_ = g_strdup_printf ("0 %zu\n", (gsize) (_tmp386_ + 1));
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp388_ = _tmp387_;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp383_, _tmp388_);
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp388_);
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp389_ = writer;
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp389_, "0000000000 65535 f \n");
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp390_ = writer;
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp391_ = _tmp390_->object_offsets;
+#line 4141 "book.c"
+	{
+		GList* offset_collection = NULL;
+		GList* offset_it = NULL;
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		offset_collection = _tmp391_;
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		for (offset_it = offset_collection; offset_it != NULL; offset_it = offset_it->next) {
+#line 4149 "book.c"
+			guint offset = 0U;
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+			offset = (guint) ((guintptr) offset_it->data);
+#line 4153 "book.c"
+			{
+				PDFWriter* _tmp392_ = NULL;
+				guint _tmp393_ = 0U;
+				gchar* _tmp394_ = NULL;
+				gchar* _tmp395_ = NULL;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp392_ = writer;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp393_ = offset;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp394_ = g_strdup_printf ("%010zu 00000 n \n", (gsize) _tmp393_);
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_tmp395_ = _tmp394_;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				pdf_writer_write_string (_tmp392_, _tmp395_);
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+				_g_free0 (_tmp395_);
+#line 4171 "book.c"
+			}
+		}
+	}
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp396_ = writer;
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp396_, "\n");
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp397_ = writer;
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp397_, "trailer\n");
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp398_ = writer;
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp398_, "<<\n");
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp399_ = writer;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp400_ = writer;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp401_ = _tmp400_->object_offsets;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp402_ = g_list_length (_tmp401_);
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp403_ = g_strdup_printf ("/Size %zu\n", (gsize) (_tmp402_ + 1));
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp404_ = _tmp403_;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp399_, _tmp404_);
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp404_);
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp405_ = writer;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp406_ = info_number;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp407_ = g_strdup_printf ("/Info %u 0 R\n", _tmp406_);
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp408_ = _tmp407_;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp405_, _tmp408_);
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp408_);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp409_ = writer;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp410_ = catalog_number;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp411_ = g_strdup_printf ("/Root %u 0 R\n", _tmp410_);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp412_ = _tmp411_;
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp409_, _tmp412_);
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp412_);
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp413_ = writer;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp414_ = id;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp415_ = id;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp416_ = g_strdup_printf ("/ID [<%s> <%s>]\n", _tmp414_, _tmp415_);
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp417_ = _tmp416_;
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp413_, _tmp417_);
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp417_);
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp418_ = writer;
+#line 547 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp418_, ">>\n");
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp419_ = writer;
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp419_, "startxref\n");
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp420_ = writer;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp421_ = xref_offset;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp422_ = g_strdup_printf ("%zu\n", _tmp421_);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp423_ = _tmp422_;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp420_, _tmp423_);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (_tmp423_);
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_tmp424_ = writer;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	pdf_writer_write_string (_tmp424_, "%%EOF\n");
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_pdf_writer_unref0 (writer);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (stream);
-#line 3886 "book.c"
+#line 257 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	_g_free0 (id);
+#line 4271 "book.c"
 }
 
 
@@ -3890,110 +4275,110 @@ void book_save (Book* self, const gchar* type, gint quality, GFile* file, GError
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label3 = 0;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	static GQuark _tmp2_label4 = 0;
-#line 3904 "book.c"
+#line 4289 "book.c"
 	GError * _inner_error_ = NULL;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (type != NULL);
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (file != NULL);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = type;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _tmp0_;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (((_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("jpeg")))) || (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("png"))))) || (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("tiff"))))) {
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 3922 "book.c"
+#line 4307 "book.c"
 			default:
 			{
 				const gchar* _tmp4_ = NULL;
 				gint _tmp5_ = 0;
 				GFile* _tmp6_ = NULL;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp4_ = type;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp5_ = quality;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp6_ = file;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_multi_file (self, _tmp4_, _tmp5_, _tmp6_, &_inner_error_);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 3942 "book.c"
+#line 4327 "book.c"
 				}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 3946 "book.c"
+#line 4331 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("ps")))) {
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 3952 "book.c"
+#line 4337 "book.c"
 			default:
 			{
 				GFile* _tmp7_ = NULL;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp7_ = file;
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_ps (self, _tmp7_, &_inner_error_);
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 510 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 3966 "book.c"
+#line 4351 "book.c"
 				}
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 3970 "book.c"
+#line 4355 "book.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("pdf")))) {
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		switch (0) {
-#line 3976 "book.c"
+#line 4361 "book.c"
 			default:
 			{
 				GFile* _tmp8_ = NULL;
 				gint _tmp9_ = 0;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp8_ = file;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_tmp9_ = quality;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				book_save_pdf (self, _tmp8_, _tmp9_, &_inner_error_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				if (_inner_error_ != NULL) {
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					g_propagate_error (error, _inner_error_);
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 					return;
-#line 3993 "book.c"
+#line 4378 "book.c"
 				}
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 567 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				break;
-#line 3997 "book.c"
+#line 4382 "book.c"
 			}
 		}
 	}
@@ -4014,7 +4399,7 @@ guint book_get_n_pages (Book* self) {
 	result = _tmp1_;
 #line 16 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4018 "book.c"
+#line 4403 "book.c"
 }
 
 
@@ -4029,7 +4414,7 @@ gboolean book_get_needs_saving (Book* self) {
 	result = _tmp0_;
 #line 21 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4033 "book.c"
+#line 4418 "book.c"
 }
 
 
@@ -4047,7 +4432,7 @@ void book_set_needs_saving (Book* self, gboolean value) {
 	if (_tmp0_ == _tmp1_) {
 #line 25 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 4051 "book.c"
+#line 4436 "book.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = value;
@@ -4055,7 +4440,7 @@ void book_set_needs_saving (Book* self, gboolean value) {
 	self->priv->needs_saving_ = _tmp2_;
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_emit_by_name (self, "needs-saving-changed");
-#line 4059 "book.c"
+#line 4444 "book.c"
 }
 
 
@@ -4074,26 +4459,26 @@ static void g_cclosure_user_marshal_VOID__PAGE (GClosure * closure, GValue * ret
 		data1 = closure->data;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4078 "book.c"
+#line 4463 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		data2 = closure->data;
-#line 4084 "book.c"
+#line 4469 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback = (GMarshalFunc_VOID__PAGE) (marshal_data ? marshal_data : cc->callback);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	callback (data1, value_get_page (param_values + 1), data2);
-#line 4090 "book.c"
+#line 4475 "book.c"
 }
 
 
 static void value_book_init (GValue* value) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 4097 "book.c"
+#line 4482 "book.c"
 }
 
 
@@ -4102,7 +4487,7 @@ static void value_book_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (value->data[0].v_pointer);
-#line 4106 "book.c"
+#line 4491 "book.c"
 	}
 }
 
@@ -4112,11 +4497,11 @@ static void value_book_copy_value (const GValue* src_value, GValue* dest_value)
 	if (src_value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = book_ref (src_value->data[0].v_pointer);
-#line 4116 "book.c"
+#line 4501 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4120 "book.c"
+#line 4505 "book.c"
 	}
 }
 
@@ -4124,37 +4509,37 @@ static void value_book_copy_value (const GValue* src_value, GValue* dest_value)
 static gpointer value_book_peek_pointer (const GValue* value) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4128 "book.c"
+#line 4513 "book.c"
 }
 
 
 static gchar* value_book_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 4135 "book.c"
+#line 4520 "book.c"
 		Book* object;
 		object = collect_values[0].v_pointer;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4142 "book.c"
+#line 4527 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4146 "book.c"
+#line 4531 "book.c"
 		}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = book_ref (object);
-#line 4150 "book.c"
+#line 4535 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4154 "book.c"
+#line 4539 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4158 "book.c"
+#line 4543 "book.c"
 }
 
 
@@ -4165,25 +4550,25 @@ static gchar* value_book_lcopy_value (const GValue* value, guint n_collect_value
 	if (!object_p) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4169 "book.c"
+#line 4554 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 4175 "book.c"
+#line 4560 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4179 "book.c"
+#line 4564 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = book_ref (value->data[0].v_pointer);
-#line 4183 "book.c"
+#line 4568 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4187 "book.c"
+#line 4572 "book.c"
 }
 
 
@@ -4197,7 +4582,7 @@ GParamSpec* param_spec_book (const gchar* name, const gchar* nick, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 4201 "book.c"
+#line 4586 "book.c"
 }
 
 
@@ -4206,7 +4591,7 @@ gpointer value_get_book (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_BOOK), NULL);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4210 "book.c"
+#line 4595 "book.c"
 }
 
 
@@ -4226,17 +4611,17 @@ void value_set_book (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_ref (value->data[0].v_pointer);
-#line 4230 "book.c"
+#line 4615 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4234 "book.c"
+#line 4619 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
-#line 4240 "book.c"
+#line 4625 "book.c"
 	}
 }
 
@@ -4255,17 +4640,17 @@ void value_take_book (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 4259 "book.c"
+#line 4644 "book.c"
 	} else {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4263 "book.c"
+#line 4648 "book.c"
 	}
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		book_unref (old);
-#line 4269 "book.c"
+#line 4654 "book.c"
 	}
 }
 
@@ -4289,7 +4674,7 @@ static void book_class_init (BookClass * klass) {
 	g_signal_new ("needs_saving_changed", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_signal_new ("saving", TYPE_BOOK, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-#line 4293 "book.c"
+#line 4678 "book.c"
 }
 
 
@@ -4298,7 +4683,7 @@ static void book_instance_init (Book * self) {
 	self->priv = BOOK_GET_PRIVATE (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 4302 "book.c"
+#line 4687 "book.c"
 }
 
 
@@ -4309,7 +4694,7 @@ static void book_finalize (Book* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_BOOK, Book);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->priv->pages;
-#line 4313 "book.c"
+#line 4698 "book.c"
 	{
 		GList* page_collection = NULL;
 		GList* page_it = NULL;
@@ -4317,14 +4702,14 @@ static void book_finalize (Book* obj) {
 		page_collection = _tmp0_;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		for (page_it = page_collection; page_it != NULL; page_it = page_it->next) {
-#line 4321 "book.c"
+#line 4706 "book.c"
 			Page* _tmp1_ = NULL;
 			Page* page = NULL;
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			_tmp1_ = _page_ref0 ((Page*) page_it->data);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			page = _tmp1_;
-#line 4328 "book.c"
+#line 4713 "book.c"
 			{
 				Page* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -4344,15 +4729,15 @@ static void book_finalize (Book* obj) {
 				g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _book_page_changed_cb_page_crop_changed, self);
 #line 45 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 				_page_unref0 (page);
-#line 4348 "book.c"
+#line 4733 "book.c"
 			}
 		}
 	}
 #line 14 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	__g_list_free__page_unref0_0 (self->priv->pages);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 231 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_byte_array_unref0 (self->priv->jpeg_data);
-#line 4356 "book.c"
+#line 4741 "book.c"
 }
 
 
@@ -4377,7 +4762,7 @@ gpointer book_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 4381 "book.c"
+#line 4766 "book.c"
 }
 
 
@@ -4390,15 +4775,15 @@ void book_unref (gpointer instance) {
 		BOOK_GET_CLASS (self)->finalize (self);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4394 "book.c"
+#line 4779 "book.c"
 	}
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 4402 "book.c"
+#line 4787 "book.c"
 }
 
 
@@ -4406,28 +4791,28 @@ PDFWriter* pdf_writer_construct (GType object_type, GFileOutputStream* stream) {
 	PDFWriter* self = NULL;
 	GFileOutputStream* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PDFWriter*) g_type_create_instance (object_type);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 527 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv->stream = _tmp1_;
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 4424 "book.c"
+#line 4809 "book.c"
 }
 
 
 PDFWriter* pdf_writer_new (GFileOutputStream* stream) {
-#line 525 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return pdf_writer_construct (TYPE_PDF_WRITER, stream);
-#line 4431 "book.c"
+#line 4816 "book.c"
 }
 
 
@@ -4436,24 +4821,24 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 	guint8* _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 4442 "book.c"
+#line 4827 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->priv->stream;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-#line 4457 "book.c"
+#line 4842 "book.c"
 			goto __catch1_g_error;
 		}
 	}
@@ -4463,40 +4848,40 @@ void pdf_writer_write (PDFWriter* self, guint8* data, int data_length1) {
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:538: Error writing PDF: %s", _tmp3_);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_warning ("book.vala:591: Error writing PDF: %s", _tmp3_);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 4479 "book.c"
+#line 4864 "book.c"
 	}
 	__finally1:
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return;
-#line 4490 "book.c"
+#line 4875 "book.c"
 	}
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp4_ = self->offset;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5_ = data;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp5__length1 = data_length1;
-#line 540 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = _tmp4_ + _tmp5__length1;
-#line 4500 "book.c"
+#line 4885 "book.c"
 }
 
 
@@ -4515,49 +4900,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1266 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
-#line 4555 "book.c"
+#line 4940 "book.c"
 	}
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 4561 "book.c"
+#line 4946 "book.c"
 }
 
 
@@ -4567,23 +4952,23 @@ void pdf_writer_write_string (PDFWriter* self, const gchar* text) {
 	gchar* _tmp2_ = NULL;
 	guint8* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (self != NULL);
-#line 543 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (text != NULL);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = text;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = string_to_utf8 (_tmp0_, &_tmp1_);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (guint8*) _tmp2_;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3__length1 = (_tmp1_ * sizeof (gchar)) / sizeof (guint8);
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_write (self, _tmp3_, (_tmp1_ * sizeof (gchar)) / sizeof (guint8));
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp3_ = (g_free (_tmp3_), NULL);
-#line 4587 "book.c"
+#line 4972 "book.c"
 }
 
 
@@ -4592,235 +4977,235 @@ guint pdf_writer_start_object (PDFWriter* self) {
 	gsize _tmp0_ = 0UL;
 	GList* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 601 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0U);
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = self->offset;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->object_offsets = g_list_append (self->object_offsets, (gpointer) ((guintptr) ((guint) _tmp0_)));
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = self->object_offsets;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = g_list_length (_tmp1_);
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = _tmp2_;
-#line 551 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 604 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4610 "book.c"
+#line 4995 "book.c"
 }
 
 
 static void value_pdf_writer_init (GValue* value) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 4617 "book.c"
+#line 5002 "book.c"
 }
 
 
 static void value_pdf_writer_free_value (GValue* value) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (value->data[0].v_pointer);
-#line 4626 "book.c"
+#line 5011 "book.c"
 	}
 }
 
 
 static void value_pdf_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = pdf_writer_ref (src_value->data[0].v_pointer);
-#line 4636 "book.c"
+#line 5021 "book.c"
 	} else {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4640 "book.c"
+#line 5025 "book.c"
 	}
 }
 
 
 static gpointer value_pdf_writer_peek_pointer (const GValue* value) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4648 "book.c"
+#line 5033 "book.c"
 }
 
 
 static gchar* value_pdf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 4655 "book.c"
+#line 5040 "book.c"
 		PDFWriter* object;
 		object = collect_values[0].v_pointer;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4662 "book.c"
+#line 5047 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4666 "book.c"
+#line 5051 "book.c"
 		}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = pdf_writer_ref (object);
-#line 4670 "book.c"
+#line 5055 "book.c"
 	} else {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4674 "book.c"
+#line 5059 "book.c"
 	}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4678 "book.c"
+#line 5063 "book.c"
 }
 
 
 static gchar* value_pdf_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PDFWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4689 "book.c"
+#line 5074 "book.c"
 	}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 4695 "book.c"
+#line 5080 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4699 "book.c"
+#line 5084 "book.c"
 	} else {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = pdf_writer_ref (value->data[0].v_pointer);
-#line 4703 "book.c"
+#line 5088 "book.c"
 	}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 4707 "book.c"
+#line 5092 "book.c"
 }
 
 
 GParamSpec* param_spec_pdf_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPDFWriter* spec;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PDF_WRITER), NULL);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 4721 "book.c"
+#line 5106 "book.c"
 }
 
 
 gpointer value_get_pdf_writer (const GValue* value) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER), NULL);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 4730 "book.c"
+#line 5115 "book.c"
 }
 
 
 void value_set_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_ref (value->data[0].v_pointer);
-#line 4750 "book.c"
+#line 5135 "book.c"
 	} else {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4754 "book.c"
+#line 5139 "book.c"
 	}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 4760 "book.c"
+#line 5145 "book.c"
 	}
 }
 
 
 void value_take_pdf_writer (GValue* value, gpointer v_object) {
 	PDFWriter* old;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PDF_WRITER));
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PDF_WRITER));
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 4779 "book.c"
+#line 5164 "book.c"
 	} else {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 4783 "book.c"
+#line 5168 "book.c"
 	}
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		pdf_writer_unref (old);
-#line 4789 "book.c"
+#line 5174 "book.c"
 	}
 }
 
 
 static void pdf_writer_class_init (PDFWriterClass * klass) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	pdf_writer_parent_class = g_type_class_peek_parent (klass);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	PDF_WRITER_CLASS (klass)->finalize = pdf_writer_finalize;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_type_class_add_private (klass, sizeof (PDFWriterPrivate));
-#line 4801 "book.c"
+#line 5186 "book.c"
 }
 
 
 static void pdf_writer_instance_init (PDFWriter * self) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->priv = PDF_WRITER_GET_PRIVATE (self);
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->offset = (gsize) 0;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 4812 "book.c"
+#line 5197 "book.c"
 }
 
 
 static void pdf_writer_finalize (PDFWriter* obj) {
 	PDFWriter * self;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PDF_WRITER, PDFWriter);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_list_free0 (self->object_offsets);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->priv->stream);
-#line 4824 "book.c"
+#line 5209 "book.c"
 }
 
 
@@ -4841,34 +5226,34 @@ GType pdf_writer_get_type (void) {
 gpointer pdf_writer_ref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 4849 "book.c"
+#line 5234 "book.c"
 }
 
 
 void pdf_writer_unref (gpointer instance) {
 	PDFWriter* self;
 	self = instance;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PDF_WRITER_GET_CLASS (self)->finalize (self);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 572 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4862 "book.c"
+#line 5247 "book.c"
 	}
 }
 
 
 static cairo_status_t _ps_writer_write_cairo_data_cairo_write_func_t (gpointer self, guchar* data, int data_length1) {
 	cairo_status_t result;
-	result = ps_writer_write_cairo_data (self, data, data_length1);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+	result = ps_writer_write_cairo_data ((PsWriter*) self, data, data_length1);
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4872 "book.c"
+#line 5257 "book.c"
 }
 
 
@@ -4877,58 +5262,58 @@ PsWriter* ps_writer_construct (GType object_type, GFileOutputStream* stream) {
 	GFileOutputStream* _tmp0_ = NULL;
 	GFileOutputStream* _tmp1_ = NULL;
 	cairo_surface_t* _tmp2_ = NULL;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (stream != NULL, NULL);
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = (PsWriter*) g_type_create_instance (object_type);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp0_ = stream;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->stream = _tmp1_;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_tmp2_ = cairo_ps_surface_create_for_stream (_ps_writer_write_cairo_data_cairo_write_func_t, self, (gdouble) 0, (gdouble) 0);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->surface = _tmp2_;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return self;
-#line 4901 "book.c"
+#line 5286 "book.c"
 }
 
 
 PsWriter* ps_writer_new (GFileOutputStream* stream) {
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 613 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return ps_writer_construct (TYPE_PS_WRITER, stream);
-#line 4908 "book.c"
+#line 5293 "book.c"
 }
 
 
 static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data, int data_length1) {
 	cairo_status_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 4917 "book.c"
+#line 5302 "book.c"
 	{
 		GFileOutputStream* _tmp0_ = NULL;
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp0_ = self->stream;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1_ = data;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp1__length1 = data_length1;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_output_stream_write_all ((GOutputStream*) _tmp0_, _tmp1_, (gsize) _tmp1__length1, NULL, NULL, &_inner_error_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 623 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (_inner_error_ != NULL) {
-#line 4932 "book.c"
+#line 5317 "book.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -4938,248 +5323,248 @@ static cairo_status_t ps_writer_write_cairo_data (PsWriter* self, guint8* data,
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		e = _inner_error_;
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_inner_error_ = NULL;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp2_ = e;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_tmp3_ = _tmp2_->message;
-#line 574 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
-		g_warning ("book.vala:574: Error writing data: %s", _tmp3_);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+		g_warning ("book.vala:627: Error writing data: %s", _tmp3_);
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		result = CAIRO_STATUS_WRITE_ERROR;
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		_g_error_free0 (e);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return result;
-#line 4958 "book.c"
+#line 5343 "book.c"
 	}
 	__finally2:
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (_inner_error_ != NULL) {
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_clear_error (&_inner_error_);
-#line 568 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 621 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return 0;
-#line 4969 "book.c"
+#line 5354 "book.c"
 	}
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	result = CAIRO_STATUS_SUCCESS;
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return result;
-#line 4975 "book.c"
+#line 5360 "book.c"
 }
 
 
 static void value_ps_writer_init (GValue* value) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	value->data[0].v_pointer = NULL;
-#line 4982 "book.c"
+#line 5367 "book.c"
 }
 
 
 static void value_ps_writer_free_value (GValue* value) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (value->data[0].v_pointer) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (value->data[0].v_pointer);
-#line 4991 "book.c"
+#line 5376 "book.c"
 	}
 }
 
 
 static void value_ps_writer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (src_value->data[0].v_pointer) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = ps_writer_ref (src_value->data[0].v_pointer);
-#line 5001 "book.c"
+#line 5386 "book.c"
 	} else {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5005 "book.c"
+#line 5390 "book.c"
 	}
 }
 
 
 static gpointer value_ps_writer_peek_pointer (const GValue* value) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5013 "book.c"
+#line 5398 "book.c"
 }
 
 
 static gchar* value_ps_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (collect_values[0].v_pointer) {
-#line 5020 "book.c"
+#line 5405 "book.c"
 		PsWriter* object;
 		object = collect_values[0].v_pointer;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5027 "book.c"
+#line 5412 "book.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5031 "book.c"
+#line 5416 "book.c"
 		}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = ps_writer_ref (object);
-#line 5035 "book.c"
+#line 5420 "book.c"
 	} else {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5039 "book.c"
+#line 5424 "book.c"
 	}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5043 "book.c"
+#line 5428 "book.c"
 }
 
 
 static gchar* value_ps_writer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PsWriter** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!object_p) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5054 "book.c"
+#line 5439 "book.c"
 	}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (!value->data[0].v_pointer) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = NULL;
-#line 5060 "book.c"
+#line 5445 "book.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5064 "book.c"
+#line 5449 "book.c"
 	} else {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		*object_p = ps_writer_ref (value->data[0].v_pointer);
-#line 5068 "book.c"
+#line 5453 "book.c"
 	}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return NULL;
-#line 5072 "book.c"
+#line 5457 "book.c"
 }
 
 
 GParamSpec* param_spec_ps_writer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPsWriter* spec;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PS_WRITER), NULL);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return G_PARAM_SPEC (spec);
-#line 5086 "book.c"
+#line 5471 "book.c"
 }
 
 
 gpointer value_get_ps_writer (const GValue* value) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER), NULL);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return value->data[0].v_pointer;
-#line 5095 "book.c"
+#line 5480 "book.c"
 }
 
 
 void value_set_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_ref (value->data[0].v_pointer);
-#line 5115 "book.c"
+#line 5500 "book.c"
 	} else {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5119 "book.c"
+#line 5504 "book.c"
 	}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5125 "book.c"
+#line 5510 "book.c"
 	}
 }
 
 
 void value_take_ps_writer (GValue* value, gpointer v_object) {
 	PsWriter* old;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PS_WRITER));
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	old = value->data[0].v_pointer;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (v_object) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PS_WRITER));
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = v_object;
-#line 5144 "book.c"
+#line 5529 "book.c"
 	} else {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		value->data[0].v_pointer = NULL;
-#line 5148 "book.c"
+#line 5533 "book.c"
 	}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (old) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		ps_writer_unref (old);
-#line 5154 "book.c"
+#line 5539 "book.c"
 	}
 }
 
 
 static void ps_writer_class_init (PsWriterClass * klass) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	ps_writer_parent_class = g_type_class_peek_parent (klass);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	PS_WRITER_CLASS (klass)->finalize = ps_writer_finalize;
-#line 5164 "book.c"
+#line 5549 "book.c"
 }
 
 
 static void ps_writer_instance_init (PsWriter * self) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self->ref_count = 1;
-#line 5171 "book.c"
+#line 5556 "book.c"
 }
 
 
 static void ps_writer_finalize (PsWriter* obj) {
 	PsWriter * self;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PS_WRITER, PsWriter);
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 610 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_cairo_surface_destroy0 (self->surface);
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 611 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	_g_object_unref0 (self->stream);
-#line 5183 "book.c"
+#line 5568 "book.c"
 }
 
 
@@ -5200,24 +5585,24 @@ GType ps_writer_get_type (void) {
 gpointer ps_writer_ref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	return instance;
-#line 5208 "book.c"
+#line 5593 "book.c"
 }
 
 
 void ps_writer_unref (gpointer instance) {
 	PsWriter* self;
 	self = instance;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		PS_WRITER_GET_CLASS (self)->finalize (self);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
+#line 608 "/home/bob/bzr/simple-scan/trunk/src/book.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5221 "book.c"
+#line 5606 "book.c"
 	}
 }
 
diff --git a/src/book.vala b/src/book.vala
index 97e49a8..db9be0b 100644
--- a/src/book.vala
+++ b/src/book.vala
@@ -83,12 +83,56 @@ public class Book
         needs_saving = true;
     }
 
+    public void reverse ()
+    {
+        var new_pages = new List<Page> ();
+        foreach (var page in pages)
+            new_pages.prepend (page);
+        pages = (owned) new_pages;
+
+        reordered ();
+        needs_saving = true;
+    }
+
+    public void combine_sides ()
+    {
+        var n_front = n_pages - n_pages / 2;
+        var new_pages = new List<Page> ();
+        for (var i = 0; i < n_pages; i++)
+        {
+            if (i % 2 == 0)
+                new_pages.append (pages.nth_data (i / 2));
+            else
+                new_pages.append (pages.nth_data (n_front + (i / 2)));
+        }
+        pages = (owned) new_pages;
+
+        reordered ();
+        needs_saving = true;
+    }
+
+    public void combine_sides_reverse ()
+    {
+        var new_pages = new List<Page> ();
+        for (var i = 0; i < n_pages; i++)
+        {
+            if (i % 2 == 0)
+                new_pages.append (pages.nth_data (i / 2));
+            else
+                new_pages.append (pages.nth_data (n_pages - 1 - (i / 2)));
+        }
+        pages = (owned) new_pages;
+
+        reordered ();
+        needs_saving = true;
+    }
+
     public void delete_page (Page page)
     {
         page.pixels_changed.disconnect (page_changed_cb);
         page.crop_changed.disconnect (page_changed_cb);
-        page_removed (page);
         pages.remove (page);
+        page_removed (page);
         needs_saving = true;
     }
 
@@ -153,8 +197,8 @@ public class Book
         {
             var page = get_page (i);
             var image = page.get_image (true);
-            var width = image.get_width () * 72.0 / page.dpi;
-            var height = image.get_height () * 72.0 / page.dpi;
+            var width = image.width * 72.0 / page.dpi;
+            var height = image.height * 72.0 / page.dpi;
             surface.set_size (width, height);
             save_ps_pdf_surface (surface, image, page.dpi);
             surface.show_page ();
@@ -212,6 +256,11 @@ public class Book
 
     private void save_pdf (File file, int quality) throws Error
     {
+        /* Generate a random ID for this file */
+        var id = "";
+        for (var i = 0; i < 4; i++)
+            id += "%08x".printf (Random.next_int ());
+
         var stream = file.replace (null, false, FileCreateFlags.NONE, null);
         var writer = new PDFWriter (stream);
 
@@ -227,6 +276,7 @@ public class Book
         writer.write_string ("<<\n");
         writer.write_string ("/Type /Catalog\n");
         //FIXMEwriter.write_string ("/Metadata %u 0 R\n".printf (catalog_number + 1));
+        //FIXMEwriter.write_string ("/MarkInfo << /Marked true >>");
         writer.write_string ("/Pages %u 0 R\n".printf (catalog_number + 1)); //+2
         writer.write_string (">>\n");
         writer.write_string ("endobj\n");
@@ -264,8 +314,8 @@ public class Book
         {
             var page = get_page (i);
             var image = page.get_image (true);
-            var width = image.get_width ();
-            var height = image.get_height ();
+            var width = image.width;
+            var height = image.height;
             unowned uint8[] pixels = image.get_pixels ();
             var page_width = width * 72.0 / page.dpi;
             var page_height = height * 72.0 / page.dpi;
@@ -284,7 +334,7 @@ public class Book
                 data = new uint8[data_length];
                 for (var row = 0; row < height; row++)
                 {
-                    var in_offset = row * image.get_rowstride ();
+                    var in_offset = row * image.rowstride;
                     var out_offset = row * width * 3;
                     for (var x = 0; x < width; x++)
                     {
@@ -314,7 +364,7 @@ public class Book
                         shift_count = 6;
                     }
 
-                    var in_offset = row * image.get_rowstride ();
+                    var in_offset = row * image.rowstride;
                     for (var x = 0; x < width; x++)
                     {
                         /* Clear byte */
@@ -359,7 +409,7 @@ public class Book
                         mask = 0x80;
                     }
 
-                    var in_offset = row * image.get_rowstride ();
+                    var in_offset = row * image.rowstride;
                     for (var x = 0; x < width; x++)
                     {
                         /* Clear byte */
@@ -388,7 +438,7 @@ public class Book
                 data = new uint8 [data_length];
                 for (var row = 0; row < height; row++)
                 {
-                    var in_offset = row * image.get_rowstride ();
+                    var in_offset = row * image.rowstride;
                     var out_offset = row * width;
                     for (var x = 0; x < width; x++)
                         data[out_offset+x] = pixels[in_offset+x*3];
@@ -457,7 +507,7 @@ public class Book
             number = writer.start_object ();
             writer.write_string ("%u 0 obj\n".printf (number));
             writer.write_string ("<<\n");
-            writer.write_string ("/Length %d\n".printf (command.length + 1));
+            writer.write_string ("/Length %d\n".printf (command.length));
             writer.write_string (">>\n");
             writer.write_string ("stream\n");
             writer.write_string (command);
@@ -478,19 +528,22 @@ public class Book
         writer.write_string ("endobj\n");
 
         /* Cross-reference table */
+        writer.write_string ("\n");
         var xref_offset = writer.offset;
         writer.write_string ("xref\n");
-        writer.write_string ("1 %zu\n".printf (writer.object_offsets.length ()));
+        writer.write_string ("0 %zu\n".printf (writer.object_offsets.length () + 1));
+        writer.write_string ("0000000000 65535 f \n");
         foreach (var offset in writer.object_offsets)
             writer.write_string ("%010zu 00000 n \n".printf (offset));
 
         /* Trailer */
+        writer.write_string ("\n");
         writer.write_string ("trailer\n");
         writer.write_string ("<<\n");
-        writer.write_string ("/Size %zu\n".printf (writer.object_offsets.length ()));
+        writer.write_string ("/Size %zu\n".printf (writer.object_offsets.length () + 1));
         writer.write_string ("/Info %u 0 R\n".printf (info_number));
         writer.write_string ("/Root %u 0 R\n".printf (catalog_number));
-        //FIXME: writer.write_string ("/ID [<...> <...>]\n");
+        writer.write_string ("/ID [<%s> <%s>]\n".printf (id, id));
         writer.write_string (">>\n");
         writer.write_string ("startxref\n");
         writer.write_string ("%zu\n".printf (xref_offset));
diff --git a/src/page-view.c b/src/page-view.c
index ebf261d..93a7130 100644
--- a/src/page-view.c
+++ b/src/page-view.c
@@ -1,4 +1,4 @@
-/* page-view.c generated by valac 0.22.1, the Vala compiler
+/* page-view.c generated by valac 0.24.0, the Vala compiler
  * generated from page-view.vala, do not modify */
 
 /*
@@ -92,8 +92,8 @@ struct _PageViewPrivate {
 	gboolean update_image;
 	ScanDirection scan_direction;
 	gint scan_line;
-	gint width;
-	gint height;
+	gint width_;
+	gint height_;
 	gint _x_offset;
 	gint _y_offset;
 	CropLocation crop_location;
@@ -191,15 +191,15 @@ static gboolean _page_view_animation_cb_gsource_func (gpointer self);
 void page_view_render (PageView* self, cairo_t* context);
 gint page_view_get_x_offset (PageView* self);
 gint page_view_get_y_offset (PageView* self);
-void page_view_set_width (PageView* self, gint width);
-void page_view_set_height (PageView* self, gint height);
-gint page_view_get_width (PageView* self);
-gint page_view_get_height (PageView* self);
 gboolean page_view_get_selected (PageView* self);
 void page_view_set_selected (PageView* self, gboolean value);
 void page_view_set_x_offset (PageView* self, gint value);
 void page_view_set_y_offset (PageView* self, gint value);
 GdkCursorType page_view_get_cursor (PageView* self);
+gint page_view_get_width (PageView* self);
+void page_view_set_width (PageView* self, gint value);
+gint page_view_get_height (PageView* self);
+void page_view_set_height (PageView* self, gint value);
 static void page_view_finalize (PageView* obj);
 
 
@@ -217,35 +217,35 @@ GType crop_location_get_type (void) {
 
 static void _page_view_page_pixels_changed_cb_page_pixels_changed (Page* _sender, gpointer self) {
 #line 97 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_pixels_changed_cb (self, _sender);
+	page_view_page_pixels_changed_cb ((PageView*) self, _sender);
 #line 222 "page-view.c"
 }
 
 
 static void _page_view_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
 #line 98 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_size_changed_cb (self, _sender);
+	page_view_page_size_changed_cb ((PageView*) self, _sender);
 #line 229 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_crop_changed (Page* _sender, gpointer self) {
 #line 99 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_overlay_changed_cb (self, _sender);
+	page_view_page_overlay_changed_cb ((PageView*) self, _sender);
 #line 236 "page-view.c"
 }
 
 
 static void _page_view_page_overlay_changed_cb_page_scan_line_changed (Page* _sender, gpointer self) {
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_page_overlay_changed_cb (self, _sender);
+	page_view_page_overlay_changed_cb ((PageView*) self, _sender);
 #line 243 "page-view.c"
 }
 
 
 static void _page_view_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
 #line 101 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_scan_direction_changed_cb (self, _sender);
+	page_view_scan_direction_changed_cb ((PageView*) self, _sender);
 #line 250 "page-view.c"
 }
 
@@ -336,40 +336,39 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 	gint _tmp35_ = 0;
 	gboolean _tmp36_ = FALSE;
 	gint _tmp37_ = 0;
-	gboolean _tmp39_ = FALSE;
-	guchar* _tmp110_ = NULL;
-	gint _tmp110__length1 = 0;
-	guchar* _tmp111_ = NULL;
-	gint _tmp111__length1 = 0;
-	gint _tmp112_ = 0;
-	gint _tmp113_ = 0;
-	gint _tmp114_ = 0;
-	gint _tmp115_ = 0;
+	guchar* _tmp105_ = NULL;
+	gint _tmp105__length1 = 0;
+	guchar* _tmp106_ = NULL;
+	gint _tmp106__length1 = 0;
+	gint _tmp107_ = 0;
+	gint _tmp108_ = 0;
+	gint _tmp109_ = 0;
+	gint _tmp110_ = 0;
+	gint _tmp111_ = 0;
+	guchar _tmp112_ = '\0';
+	guchar _tmp113_ = '\0';
+	guchar* _tmp114_ = NULL;
+	gint _tmp114__length1 = 0;
+	guchar* _tmp115_ = NULL;
+	gint _tmp115__length1 = 0;
 	gint _tmp116_ = 0;
-	guchar _tmp117_ = '\0';
-	guchar _tmp118_ = '\0';
-	guchar* _tmp119_ = NULL;
-	gint _tmp119__length1 = 0;
-	guchar* _tmp120_ = NULL;
-	gint _tmp120__length1 = 0;
-	gint _tmp121_ = 0;
-	gint _tmp122_ = 0;
-	gint _tmp123_ = 0;
-	gint _tmp124_ = 0;
+	gint _tmp117_ = 0;
+	gint _tmp118_ = 0;
+	gint _tmp119_ = 0;
+	gint _tmp120_ = 0;
+	guchar _tmp121_ = '\0';
+	guchar _tmp122_ = '\0';
+	guchar* _tmp123_ = NULL;
+	gint _tmp123__length1 = 0;
+	guchar* _tmp124_ = NULL;
+	gint _tmp124__length1 = 0;
 	gint _tmp125_ = 0;
-	guchar _tmp126_ = '\0';
-	guchar _tmp127_ = '\0';
-	guchar* _tmp128_ = NULL;
-	gint _tmp128__length1 = 0;
-	guchar* _tmp129_ = NULL;
-	gint _tmp129__length1 = 0;
-	gint _tmp130_ = 0;
-	gint _tmp131_ = 0;
-	gint _tmp132_ = 0;
-	gint _tmp133_ = 0;
-	gint _tmp134_ = 0;
-	guchar _tmp135_ = '\0';
-	guchar _tmp136_ = '\0';
+	gint _tmp126_ = 0;
+	gint _tmp127_ = 0;
+	gint _tmp128_ = 0;
+	gint _tmp129_ = 0;
+	guchar _tmp130_ = '\0';
+	guchar _tmp131_ = '\0';
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -384,15 +383,15 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 	switch (_tmp2_) {
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 388 "page-view.c"
+#line 387 "page-view.c"
 		{
 #line 115 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 392 "page-view.c"
+#line 391 "page-view.c"
 		}
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 396 "page-view.c"
+#line 395 "page-view.c"
 		{
 			Page* _tmp3_ = NULL;
 			gint _tmp4_ = 0;
@@ -424,11 +423,11 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			y = (_tmp9_ - _tmp10_) - 1;
 #line 119 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 428 "page-view.c"
+#line 427 "page-view.c"
 		}
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 432 "page-view.c"
+#line 431 "page-view.c"
 		{
 			gint t = 0;
 			gint _tmp11_ = 0;
@@ -457,11 +456,11 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			y = _tmp16_;
 #line 124 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 461 "page-view.c"
+#line 460 "page-view.c"
 		}
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 465 "page-view.c"
+#line 464 "page-view.c"
 		{
 			gint t = 0;
 			gint _tmp17_ = 0;
@@ -490,12 +489,12 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 			y = (_tmp21_ - _tmp22_) - 1;
 #line 129 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 494 "page-view.c"
+#line 493 "page-view.c"
 		}
 		default:
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		break;
-#line 499 "page-view.c"
+#line 498 "page-view.c"
 	}
 #line 132 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp23_ = page;
@@ -537,470 +536,456 @@ static void page_view_get_pixel (PageView* self, Page* page, gint x, gint y, guc
 	_tmp37_ = depth;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp37_ == 8) {
-#line 541 "page-view.c"
+#line 540 "page-view.c"
 		gint _tmp38_ = 0;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp38_ = n_channels;
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = _tmp38_ == 3;
-#line 547 "page-view.c"
+#line 546 "page-view.c"
 	} else {
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp36_ = FALSE;
-#line 551 "page-view.c"
+#line 550 "page-view.c"
 	}
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp39_ = _tmp36_;
-#line 138 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp39_) {
-#line 557 "page-view.c"
+	if (_tmp36_) {
+#line 554 "page-view.c"
 		gint o = 0;
+		gint _tmp39_ = 0;
 		gint _tmp40_ = 0;
 		gint _tmp41_ = 0;
-		gint _tmp42_ = 0;
+		guchar* _tmp42_ = NULL;
+		gint _tmp42__length1 = 0;
 		guchar* _tmp43_ = NULL;
 		gint _tmp43__length1 = 0;
-		guchar* _tmp44_ = NULL;
-		gint _tmp44__length1 = 0;
-		gint _tmp45_ = 0;
+		gint _tmp44_ = 0;
+		guchar _tmp45_ = '\0';
 		guchar _tmp46_ = '\0';
-		guchar _tmp47_ = '\0';
+		guchar* _tmp47_ = NULL;
+		gint _tmp47__length1 = 0;
 		guchar* _tmp48_ = NULL;
 		gint _tmp48__length1 = 0;
-		guchar* _tmp49_ = NULL;
-		gint _tmp49__length1 = 0;
-		gint _tmp50_ = 0;
+		gint _tmp49_ = 0;
+		guchar _tmp50_ = '\0';
 		guchar _tmp51_ = '\0';
-		guchar _tmp52_ = '\0';
+		guchar* _tmp52_ = NULL;
+		gint _tmp52__length1 = 0;
 		guchar* _tmp53_ = NULL;
 		gint _tmp53__length1 = 0;
-		guchar* _tmp54_ = NULL;
-		gint _tmp54__length1 = 0;
-		gint _tmp55_ = 0;
+		gint _tmp54_ = 0;
+		guchar _tmp55_ = '\0';
 		guchar _tmp56_ = '\0';
-		guchar _tmp57_ = '\0';
 #line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = offset;
+		_tmp39_ = offset;
 #line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = x;
+		_tmp40_ = x;
 #line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = n_channels;
+		_tmp41_ = n_channels;
 #line 140 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		o = _tmp40_ + (_tmp41_ * _tmp42_);
+		o = _tmp39_ + (_tmp40_ * _tmp41_);
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = pixel;
+		_tmp42_ = pixel;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43__length1 = pixel_length1;
+		_tmp42__length1 = pixel_length1;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = pixels;
+		_tmp43_ = pixels;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44__length1 = pixels_length1;
+		_tmp43__length1 = pixels_length1;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = o;
+		_tmp44_ = o;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = _tmp44_[_tmp45_];
+		_tmp45_ = _tmp43_[_tmp44_];
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_[0] = _tmp46_;
+		_tmp42_[0] = _tmp45_;
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_ = _tmp43_[0];
+		_tmp46_ = _tmp42_[0];
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48_ = pixel;
+		_tmp47_ = pixel;
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48__length1 = pixel_length1;
+		_tmp47__length1 = pixel_length1;
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49_ = pixels;
+		_tmp48_ = pixels;
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49__length1 = pixels_length1;
+		_tmp48__length1 = pixels_length1;
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp50_ = o;
+		_tmp49_ = o;
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp51_ = _tmp49_[_tmp50_ + 1];
+		_tmp50_ = _tmp48_[_tmp49_ + 1];
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp48_[1] = _tmp51_;
+		_tmp47_[1] = _tmp50_;
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52_ = _tmp48_[1];
+		_tmp51_ = _tmp47_[1];
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = pixel;
+		_tmp52_ = pixel;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53__length1 = pixel_length1;
+		_tmp52__length1 = pixel_length1;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp54_ = pixels;
+		_tmp53_ = pixels;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp54__length1 = pixels_length1;
+		_tmp53__length1 = pixels_length1;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp55_ = o;
+		_tmp54_ = o;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = _tmp54_[_tmp55_ + 2];
+		_tmp55_ = _tmp53_[_tmp54_ + 2];
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_[2] = _tmp56_;
+		_tmp52_[2] = _tmp55_;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp57_ = _tmp53_[2];
+		_tmp56_ = _tmp52_[2];
 #line 144 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 641 "page-view.c"
+#line 638 "page-view.c"
 	} else {
-		gboolean _tmp58_ = FALSE;
-		gint _tmp59_ = 0;
-		gboolean _tmp61_ = FALSE;
+		gboolean _tmp57_ = FALSE;
+		gint _tmp58_ = 0;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp59_ = depth;
+		_tmp58_ = depth;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp59_ == 8) {
-#line 650 "page-view.c"
-			gint _tmp60_ = 0;
+		if (_tmp58_ == 8) {
+#line 646 "page-view.c"
+			gint _tmp59_ = 0;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp60_ = n_channels;
+			_tmp59_ = n_channels;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp58_ = _tmp60_ == 1;
-#line 656 "page-view.c"
+			_tmp57_ = _tmp59_ == 1;
+#line 652 "page-view.c"
 		} else {
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp58_ = FALSE;
-#line 660 "page-view.c"
+			_tmp57_ = FALSE;
+#line 656 "page-view.c"
 		}
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp61_ = _tmp58_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp61_) {
-#line 666 "page-view.c"
+		if (_tmp57_) {
+#line 660 "page-view.c"
+			guchar* _tmp60_ = NULL;
+			gint _tmp60__length1 = 0;
+			guchar* _tmp61_ = NULL;
+			gint _tmp61__length1 = 0;
 			guchar* _tmp62_ = NULL;
 			gint _tmp62__length1 = 0;
 			guchar* _tmp63_ = NULL;
 			gint _tmp63__length1 = 0;
-			guchar* _tmp64_ = NULL;
-			gint _tmp64__length1 = 0;
-			guchar* _tmp65_ = NULL;
-			gint _tmp65__length1 = 0;
-			gint _tmp66_ = 0;
-			gint _tmp67_ = 0;
+			gint _tmp64_ = 0;
+			gint _tmp65_ = 0;
+			guchar _tmp66_ = '\0';
+			guchar _tmp67_ = '\0';
 			guchar _tmp68_ = '\0';
 			guchar _tmp69_ = '\0';
-			guchar _tmp70_ = '\0';
-			guchar _tmp71_ = '\0';
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62_ = pixel;
+			_tmp60_ = pixel;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62__length1 = pixel_length1;
+			_tmp60__length1 = pixel_length1;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63_ = pixel;
+			_tmp61_ = pixel;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63__length1 = pixel_length1;
+			_tmp61__length1 = pixel_length1;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp64_ = pixel;
+			_tmp62_ = pixel;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp64__length1 = pixel_length1;
+			_tmp62__length1 = pixel_length1;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp65_ = pixels;
+			_tmp63_ = pixels;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp65__length1 = pixels_length1;
+			_tmp63__length1 = pixels_length1;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp66_ = offset;
+			_tmp64_ = offset;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp67_ = x;
+			_tmp65_ = x;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp68_ = _tmp65_[_tmp66_ + _tmp67_];
+			_tmp66_ = _tmp63_[_tmp64_ + _tmp65_];
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp64_[2] = _tmp68_;
+			_tmp62_[2] = _tmp66_;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp69_ = _tmp64_[2];
+			_tmp67_ = _tmp62_[2];
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63_[1] = _tmp69_;
+			_tmp61_[1] = _tmp67_;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp70_ = _tmp63_[1];
+			_tmp68_ = _tmp61_[1];
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62_[0] = _tmp70_;
+			_tmp60_[0] = _tmp68_;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp71_ = _tmp62_[0];
+			_tmp69_ = _tmp60_[0];
 #line 149 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return;
-#line 717 "page-view.c"
+#line 711 "page-view.c"
 		} else {
-			gboolean _tmp72_ = FALSE;
-			gint _tmp73_ = 0;
-			gboolean _tmp75_ = FALSE;
+			gboolean _tmp70_ = FALSE;
+			gint _tmp71_ = 0;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp73_ = depth;
+			_tmp71_ = depth;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			if (_tmp73_ == 1) {
-#line 726 "page-view.c"
-				gint _tmp74_ = 0;
+			if (_tmp71_ == 1) {
+#line 719 "page-view.c"
+				gint _tmp72_ = 0;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp74_ = n_channels;
+				_tmp72_ = n_channels;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp72_ = _tmp74_ == 1;
-#line 732 "page-view.c"
+				_tmp70_ = _tmp72_ == 1;
+#line 725 "page-view.c"
 			} else {
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp72_ = FALSE;
-#line 736 "page-view.c"
+				_tmp70_ = FALSE;
+#line 729 "page-view.c"
 			}
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp75_ = _tmp72_;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			if (_tmp75_) {
-#line 742 "page-view.c"
+			if (_tmp70_) {
+#line 733 "page-view.c"
 				gint o = 0;
-				gint _tmp76_ = 0;
+				gint _tmp73_ = 0;
+				gint _tmp74_ = 0;
+				gint _tmp75_ = 0;
+				guchar* _tmp76_ = NULL;
+				gint _tmp76__length1 = 0;
 				gint _tmp77_ = 0;
-				gint _tmp78_ = 0;
-				guchar* _tmp79_ = NULL;
-				gint _tmp79__length1 = 0;
-				gint _tmp80_ = 0;
-				guchar _tmp81_ = '\0';
-				gint _tmp82_ = 0;
-				guchar* _tmp83_ = NULL;
-				gint _tmp83__length1 = 0;
-				guchar* _tmp84_ = NULL;
-				gint _tmp84__length1 = 0;
-				guchar* _tmp85_ = NULL;
-				gint _tmp85__length1 = 0;
-				gint _tmp86_ = 0;
-				guchar _tmp87_ = '\0';
-				guchar _tmp88_ = '\0';
-				guchar _tmp89_ = '\0';
+				guchar _tmp78_ = '\0';
+				gint _tmp79_ = 0;
+				guchar* _tmp80_ = NULL;
+				gint _tmp80__length1 = 0;
+				guchar* _tmp81_ = NULL;
+				gint _tmp81__length1 = 0;
+				guchar* _tmp82_ = NULL;
+				gint _tmp82__length1 = 0;
+				guchar _tmp83_ = '\0';
+				guchar _tmp84_ = '\0';
+				guchar _tmp85_ = '\0';
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp76_ = offset;
+				_tmp73_ = offset;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp77_ = x;
+				_tmp74_ = x;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				o = _tmp76_ + (_tmp77_ / 8);
+				o = _tmp73_ + (_tmp74_ / 8);
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp79_ = pixels;
+				_tmp76_ = pixels;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp79__length1 = pixels_length1;
+				_tmp76__length1 = pixels_length1;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp80_ = o;
+				_tmp77_ = o;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp81_ = _tmp79_[_tmp80_];
+				_tmp78_ = _tmp76_[_tmp77_];
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp82_ = x;
+				_tmp79_ = x;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (((gint) (_tmp81_ & (0x80 >> (_tmp82_ % 8)))) != 0) {
+				if (((gint) (_tmp78_ & (0x80 >> (_tmp79_ % 8)))) != 0) {
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp78_ = 0x00;
-#line 782 "page-view.c"
+					_tmp75_ = 0x00;
+#line 772 "page-view.c"
 				} else {
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp78_ = 0xFF;
-#line 786 "page-view.c"
+					_tmp75_ = 0xFF;
+#line 776 "page-view.c"
 				}
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83_ = pixel;
-#line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83__length1 = pixel_length1;
+				_tmp80_ = pixel;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp84_ = pixel;
+				_tmp80__length1 = pixel_length1;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp84__length1 = pixel_length1;
+				_tmp81_ = pixel;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp85_ = pixel;
+				_tmp81__length1 = pixel_length1;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp85__length1 = pixel_length1;
+				_tmp82_ = pixel;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp86_ = _tmp78_;
+				_tmp82__length1 = pixel_length1;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp85_[2] = (guchar) _tmp86_;
+				_tmp82_[2] = (guchar) _tmp75_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp87_ = _tmp85_[2];
+				_tmp83_ = _tmp82_[2];
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp84_[1] = _tmp87_;
+				_tmp81_[1] = _tmp83_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp88_ = _tmp84_[1];
+				_tmp84_ = _tmp81_[1];
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp83_[0] = _tmp88_;
+				_tmp80_[0] = _tmp84_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp89_ = _tmp83_[0];
+				_tmp85_ = _tmp80_[0];
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				return;
-#line 816 "page-view.c"
+#line 804 "page-view.c"
 			} else {
-				gboolean _tmp90_ = FALSE;
-				gint _tmp91_ = 0;
-				gboolean _tmp93_ = FALSE;
+				gboolean _tmp86_ = FALSE;
+				gint _tmp87_ = 0;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp91_ = depth;
+				_tmp87_ = depth;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp91_ == 2) {
-#line 825 "page-view.c"
-					gint _tmp92_ = 0;
+				if (_tmp87_ == 2) {
+#line 812 "page-view.c"
+					gint _tmp88_ = 0;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp92_ = n_channels;
+					_tmp88_ = n_channels;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp90_ = _tmp92_ == 1;
-#line 831 "page-view.c"
+					_tmp86_ = _tmp88_ == 1;
+#line 818 "page-view.c"
 				} else {
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp90_ = FALSE;
-#line 835 "page-view.c"
+					_tmp86_ = FALSE;
+#line 822 "page-view.c"
 				}
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp93_ = _tmp90_;
-#line 161 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp93_) {
-#line 841 "page-view.c"
+				if (_tmp86_) {
+#line 826 "page-view.c"
 					gint block_shift[4] = {0};
-					gint _tmp94_[4] = {0};
+					gint _tmp89_[4] = {0};
 					gint o = 0;
+					gint _tmp90_ = 0;
+					gint _tmp91_ = 0;
+					gint sample = 0;
+					guchar* _tmp92_ = NULL;
+					gint _tmp92__length1 = 0;
+					gint _tmp93_ = 0;
+					guchar _tmp94_ = '\0';
 					gint _tmp95_ = 0;
 					gint _tmp96_ = 0;
-					gint sample = 0;
-					guchar* _tmp97_ = NULL;
-					gint _tmp97__length1 = 0;
-					gint _tmp98_ = 0;
-					guchar _tmp99_ = '\0';
-					gint _tmp100_ = 0;
+					gint _tmp97_ = 0;
+					guchar* _tmp98_ = NULL;
+					gint _tmp98__length1 = 0;
+					guchar* _tmp99_ = NULL;
+					gint _tmp99__length1 = 0;
+					guchar* _tmp100_ = NULL;
+					gint _tmp100__length1 = 0;
 					gint _tmp101_ = 0;
-					gint _tmp102_ = 0;
-					guchar* _tmp103_ = NULL;
-					gint _tmp103__length1 = 0;
-					guchar* _tmp104_ = NULL;
-					gint _tmp104__length1 = 0;
-					guchar* _tmp105_ = NULL;
-					gint _tmp105__length1 = 0;
-					gint _tmp106_ = 0;
-					guchar _tmp107_ = '\0';
-					guchar _tmp108_ = '\0';
-					guchar _tmp109_ = '\0';
+					guchar _tmp102_ = '\0';
+					guchar _tmp103_ = '\0';
+					guchar _tmp104_ = '\0';
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp94_[0] = 6;
+					_tmp89_[0] = 6;
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp94_[1] = 4;
+					_tmp89_[1] = 4;
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp94_[2] = 2;
+					_tmp89_[2] = 2;
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp94_[3] = 0;
+					_tmp89_[3] = 0;
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					memcpy (block_shift, _tmp94_, 4 * sizeof (gint));
+					memcpy (block_shift, _tmp89_, 4 * sizeof (gint));
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp95_ = offset;
+					_tmp90_ = offset;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp96_ = x;
+					_tmp91_ = x;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					o = _tmp95_ + (_tmp96_ / 4);
+					o = _tmp90_ + (_tmp91_ / 4);
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp97_ = pixels;
+					_tmp92_ = pixels;
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp97__length1 = pixels_length1;
+					_tmp92__length1 = pixels_length1;
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp98_ = o;
+					_tmp93_ = o;
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp99_ = _tmp97_[_tmp98_];
+					_tmp94_ = _tmp92_[_tmp93_];
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp100_ = x;
+					_tmp95_ = x;
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp101_ = block_shift[_tmp100_ % 4];
+					_tmp96_ = block_shift[_tmp95_ % 4];
 #line 166 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					sample = (_tmp99_ >> _tmp101_) & 0x3;
+					sample = (_tmp94_ >> _tmp96_) & 0x3;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp102_ = sample;
+					_tmp97_ = sample;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					sample = (_tmp102_ * 255) / 3;
+					sample = (_tmp97_ * 255) / 3;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp103_ = pixel;
+					_tmp98_ = pixel;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp103__length1 = pixel_length1;
+					_tmp98__length1 = pixel_length1;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp104_ = pixel;
+					_tmp99_ = pixel;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp104__length1 = pixel_length1;
+					_tmp99__length1 = pixel_length1;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp105_ = pixel;
+					_tmp100_ = pixel;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp105__length1 = pixel_length1;
+					_tmp100__length1 = pixel_length1;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp106_ = sample;
+					_tmp101_ = sample;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp105_[2] = (guchar) _tmp106_;
+					_tmp100_[2] = (guchar) _tmp101_;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp107_ = _tmp105_[2];
+					_tmp102_ = _tmp100_[2];
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp104_[1] = _tmp107_;
+					_tmp99_[1] = _tmp102_;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp108_ = _tmp104_[1];
+					_tmp103_ = _tmp99_[1];
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp103_[0] = _tmp108_;
+					_tmp98_[0] = _tmp103_;
 #line 169 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp109_ = _tmp103_[0];
+					_tmp104_ = _tmp98_[0];
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					return;
-#line 927 "page-view.c"
+#line 912 "page-view.c"
 				}
 			}
 		}
 	}
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp110_ = pixel;
+	_tmp105_ = pixel;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp110__length1 = pixel_length1;
+	_tmp105__length1 = pixel_length1;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp111_ = pixels;
+	_tmp106_ = pixels;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp111__length1 = pixels_length1;
+	_tmp106__length1 = pixels_length1;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp112_ = offset;
+	_tmp107_ = offset;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp113_ = x;
+	_tmp108_ = x;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp114_ = depth;
+	_tmp109_ = depth;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp115_ = x;
+	_tmp110_ = x;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp116_ = n_channels;
+	_tmp111_ = n_channels;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp117_ = page_view_get_sample (self, _tmp111_, _tmp111__length1, _tmp112_, _tmp113_, _tmp114_, _tmp115_ * _tmp116_);
+	_tmp112_ = page_view_get_sample (self, _tmp106_, _tmp106__length1, _tmp107_, _tmp108_, _tmp109_, _tmp110_ * _tmp111_);
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp110_[0] = _tmp117_;
+	_tmp105_[0] = _tmp112_;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp118_ = _tmp110_[0];
+	_tmp113_ = _tmp105_[0];
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp119_ = pixel;
+	_tmp114_ = pixel;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp119__length1 = pixel_length1;
+	_tmp114__length1 = pixel_length1;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp120_ = pixels;
+	_tmp115_ = pixels;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp120__length1 = pixels_length1;
+	_tmp115__length1 = pixels_length1;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp121_ = offset;
+	_tmp116_ = offset;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp122_ = x;
+	_tmp117_ = x;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp123_ = depth;
+	_tmp118_ = depth;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp124_ = x;
+	_tmp119_ = x;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp125_ = n_channels;
+	_tmp120_ = n_channels;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp126_ = page_view_get_sample (self, _tmp120_, _tmp120__length1, _tmp121_, _tmp122_, _tmp123_, (_tmp124_ * _tmp125_) + 1);
+	_tmp121_ = page_view_get_sample (self, _tmp115_, _tmp115__length1, _tmp116_, _tmp117_, _tmp118_, (_tmp119_ * _tmp120_) + 1);
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp119_[1] = _tmp126_;
+	_tmp114_[1] = _tmp121_;
 #line 175 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp127_ = _tmp119_[1];
+	_tmp122_ = _tmp114_[1];
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp128_ = pixel;
+	_tmp123_ = pixel;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp128__length1 = pixel_length1;
+	_tmp123__length1 = pixel_length1;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp129_ = pixels;
+	_tmp124_ = pixels;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp129__length1 = pixels_length1;
+	_tmp124__length1 = pixels_length1;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp130_ = offset;
+	_tmp125_ = offset;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp131_ = x;
+	_tmp126_ = x;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp132_ = depth;
+	_tmp127_ = depth;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp133_ = x;
+	_tmp128_ = x;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp134_ = n_channels;
+	_tmp129_ = n_channels;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp135_ = page_view_get_sample (self, _tmp129_, _tmp129__length1, _tmp130_, _tmp131_, _tmp132_, (_tmp133_ * _tmp134_) + 2);
+	_tmp130_ = page_view_get_sample (self, _tmp124_, _tmp124__length1, _tmp125_, _tmp126_, _tmp127_, (_tmp128_ * _tmp129_) + 2);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp128_[2] = _tmp135_;
+	_tmp123_[2] = _tmp130_;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp136_ = _tmp128_[2];
-#line 1004 "page-view.c"
+	_tmp131_ = _tmp123_[2];
+#line 989 "page-view.c"
 }
 
 
@@ -1024,47 +1009,41 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	gboolean _tmp11_ = FALSE;
 	gdouble _tmp12_ = 0.0;
 	gdouble _tmp13_ = 0.0;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp23_ = FALSE;
-	gboolean _tmp293_ = FALSE;
-	gdouble _tmp294_ = 0.0;
-	gint _tmp295_ = 0;
-	gboolean _tmp298_ = FALSE;
-	gboolean _tmp320_ = FALSE;
-	gdouble _tmp321_ = 0.0;
-	gint _tmp322_ = 0;
-	gboolean _tmp325_ = FALSE;
-	gboolean _tmp347_ = FALSE;
-	gdouble _tmp348_ = 0.0;
-	gint _tmp349_ = 0;
-	gboolean _tmp352_ = FALSE;
-	gboolean _tmp374_ = FALSE;
-	gdouble _tmp375_ = 0.0;
-	gint _tmp376_ = 0;
-	gboolean _tmp379_ = FALSE;
+	gboolean _tmp283_ = FALSE;
+	gdouble _tmp284_ = 0.0;
+	gint _tmp285_ = 0;
+	gboolean _tmp309_ = FALSE;
+	gdouble _tmp310_ = 0.0;
+	gint _tmp311_ = 0;
+	gboolean _tmp335_ = FALSE;
+	gdouble _tmp336_ = 0.0;
+	gint _tmp337_ = 0;
+	gboolean _tmp361_ = FALSE;
+	gdouble _tmp362_ = 0.0;
+	gint _tmp363_ = 0;
 	gdouble scale = 0.0;
-	gdouble _tmp401_ = 0.0;
-	gdouble _tmp402_ = 0.0;
+	gdouble _tmp387_ = 0.0;
+	gdouble _tmp388_ = 0.0;
+	gdouble _tmp389_ = 0.0;
+	gdouble _tmp390_ = 0.0;
+	guchar* _tmp391_ = NULL;
+	gint _tmp391__length1 = 0;
+	gint _tmp392_ = 0;
+	gdouble _tmp393_ = 0.0;
+	gdouble _tmp394_ = 0.0;
+	guchar _tmp395_ = '\0';
+	guchar* _tmp396_ = NULL;
+	gint _tmp396__length1 = 0;
+	gint _tmp397_ = 0;
+	gdouble _tmp398_ = 0.0;
+	gdouble _tmp399_ = 0.0;
+	guchar _tmp400_ = '\0';
+	guchar* _tmp401_ = NULL;
+	gint _tmp401__length1 = 0;
+	gint _tmp402_ = 0;
 	gdouble _tmp403_ = 0.0;
 	gdouble _tmp404_ = 0.0;
-	guchar* _tmp405_ = NULL;
-	gint _tmp405__length1 = 0;
-	gint _tmp406_ = 0;
-	gdouble _tmp407_ = 0.0;
-	gdouble _tmp408_ = 0.0;
-	guchar _tmp409_ = '\0';
-	guchar* _tmp410_ = NULL;
-	gint _tmp410__length1 = 0;
-	gint _tmp411_ = 0;
-	gdouble _tmp412_ = 0.0;
-	gdouble _tmp413_ = 0.0;
-	guchar _tmp414_ = '\0';
-	guchar* _tmp415_ = NULL;
-	gint _tmp415__length1 = 0;
-	gint _tmp416_ = 0;
-	gdouble _tmp417_ = 0.0;
-	gdouble _tmp418_ = 0.0;
-	guchar _tmp419_ = '\0';
+	guchar _tmp405_ = '\0';
 #line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 179 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -1079,13 +1058,13 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	_tmp2_ = l;
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp1_) != _tmp2_) {
-#line 1083 "page-view.c"
+#line 1062 "page-view.c"
 		gint _tmp3_ = 0;
 #line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp3_ = L;
 #line 227 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = _tmp3_ + 1;
-#line 1089 "page-view.c"
+#line 1068 "page-view.c"
 	}
 #line 228 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = r;
@@ -1101,13 +1080,13 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	_tmp7_ = t;
 #line 230 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (((gdouble) _tmp6_) != _tmp7_) {
-#line 1105 "page-view.c"
+#line 1084 "page-view.c"
 		gint _tmp8_ = 0;
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp8_ = T;
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = _tmp8_ + 1;
-#line 1111 "page-view.c"
+#line 1090 "page-view.c"
 	}
 #line 232 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp9_ = b;
@@ -1125,7 +1104,7 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	_tmp13_ = l;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if ((_tmp12_ - _tmp13_) <= 1.0) {
-#line 1129 "page-view.c"
+#line 1108 "page-view.c"
 		gdouble _tmp14_ = 0.0;
 		gdouble _tmp15_ = 0.0;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -1134,114 +1113,109 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 		_tmp15_ = l;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = ((gint) _tmp14_) == ((gint) _tmp15_);
-#line 1138 "page-view.c"
+#line 1117 "page-view.c"
 	} else {
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = FALSE;
-#line 1142 "page-view.c"
+#line 1121 "page-view.c"
 	}
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = _tmp11_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp16_) {
+	if (_tmp11_) {
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp10_ = TRUE;
-#line 1150 "page-view.c"
+#line 1127 "page-view.c"
 	} else {
-		gboolean _tmp17_ = FALSE;
+		gboolean _tmp16_ = FALSE;
+		gdouble _tmp17_ = 0.0;
 		gdouble _tmp18_ = 0.0;
-		gdouble _tmp19_ = 0.0;
-		gboolean _tmp22_ = FALSE;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp18_ = b;
+		_tmp17_ = b;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp19_ = t;
+		_tmp18_ = t;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp18_ - _tmp19_) <= 1.0) {
-#line 1162 "page-view.c"
+		if ((_tmp17_ - _tmp18_) <= 1.0) {
+#line 1138 "page-view.c"
+			gdouble _tmp19_ = 0.0;
 			gdouble _tmp20_ = 0.0;
-			gdouble _tmp21_ = 0.0;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp20_ = b;
+			_tmp19_ = b;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp21_ = t;
+			_tmp20_ = t;
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp17_ = ((gint) _tmp20_) == ((gint) _tmp21_);
-#line 1171 "page-view.c"
+			_tmp16_ = ((gint) _tmp19_) == ((gint) _tmp20_);
+#line 1147 "page-view.c"
 		} else {
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp17_ = FALSE;
-#line 1175 "page-view.c"
+			_tmp16_ = FALSE;
+#line 1151 "page-view.c"
 		}
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp22_ = _tmp17_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = _tmp22_;
-#line 1181 "page-view.c"
+		_tmp10_ = _tmp16_;
+#line 1155 "page-view.c"
 	}
 #line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp23_ = _tmp10_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp23_) {
-#line 1187 "page-view.c"
-		gboolean _tmp24_ = FALSE;
-		gdouble _tmp25_ = 0.0;
-		gdouble _tmp26_ = 0.0;
-		gboolean _tmp29_ = FALSE;
-		gint _tmp45_ = 0;
-		gint _tmp46_ = 0;
+	if (_tmp10_) {
+#line 1159 "page-view.c"
+		gboolean _tmp21_ = FALSE;
+		gdouble _tmp22_ = 0.0;
+		gdouble _tmp23_ = 0.0;
+		gint _tmp41_ = 0;
+		gint _tmp42_ = 0;
 		gdouble scale = 0.0;
+		gdouble _tmp167_ = 0.0;
+		gdouble _tmp168_ = 0.0;
+		gdouble _tmp169_ = 0.0;
+		gdouble _tmp170_ = 0.0;
+		guchar* _tmp171_ = NULL;
+		gint _tmp171__length1 = 0;
+		gint _tmp172_ = 0;
 		gdouble _tmp173_ = 0.0;
 		gdouble _tmp174_ = 0.0;
-		gdouble _tmp175_ = 0.0;
-		gdouble _tmp176_ = 0.0;
-		guchar* _tmp177_ = NULL;
-		gint _tmp177__length1 = 0;
-		gint _tmp178_ = 0;
+		guchar _tmp175_ = '\0';
+		guchar* _tmp176_ = NULL;
+		gint _tmp176__length1 = 0;
+		gint _tmp177_ = 0;
+		gdouble _tmp178_ = 0.0;
 		gdouble _tmp179_ = 0.0;
-		gdouble _tmp180_ = 0.0;
-		guchar _tmp181_ = '\0';
-		guchar* _tmp182_ = NULL;
-		gint _tmp182__length1 = 0;
-		gint _tmp183_ = 0;
+		guchar _tmp180_ = '\0';
+		guchar* _tmp181_ = NULL;
+		gint _tmp181__length1 = 0;
+		gint _tmp182_ = 0;
+		gdouble _tmp183_ = 0.0;
 		gdouble _tmp184_ = 0.0;
-		gdouble _tmp185_ = 0.0;
-		guchar _tmp186_ = '\0';
-		guchar* _tmp187_ = NULL;
-		gint _tmp187__length1 = 0;
-		gint _tmp188_ = 0;
-		gdouble _tmp189_ = 0.0;
-		gdouble _tmp190_ = 0.0;
-		guchar _tmp191_ = '\0';
+		guchar _tmp185_ = '\0';
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp25_ = l;
+		_tmp22_ = l;
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp26_ = r;
+		_tmp23_ = r;
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((gint) _tmp25_) == ((gint) _tmp26_)) {
+		if (((gint) _tmp22_) == ((gint) _tmp23_)) {
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp24_ = TRUE;
-#line 1225 "page-view.c"
+			_tmp21_ = TRUE;
+#line 1196 "page-view.c"
 		} else {
-			gdouble _tmp27_ = 0.0;
-			gdouble _tmp28_ = 0.0;
+			gdouble _tmp24_ = 0.0;
+			gdouble _tmp25_ = 0.0;
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp27_ = t;
+			_tmp24_ = t;
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp28_ = b;
+			_tmp25_ = b;
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp24_ = ((gint) _tmp27_) == ((gint) _tmp28_);
-#line 1235 "page-view.c"
+			_tmp21_ = ((gint) _tmp24_) == ((gint) _tmp25_);
+#line 1206 "page-view.c"
 		}
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = _tmp24_;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp29_) {
-#line 1241 "page-view.c"
+		if (_tmp21_) {
+#line 1210 "page-view.c"
 			guchar p[3] = {0};
-			Page* _tmp30_ = NULL;
-			gdouble _tmp31_ = 0.0;
-			gdouble _tmp32_ = 0.0;
+			Page* _tmp26_ = NULL;
+			gdouble _tmp27_ = 0.0;
+			gdouble _tmp28_ = 0.0;
+			guchar* _tmp29_ = NULL;
+			gint _tmp29__length1 = 0;
+			gint _tmp30_ = 0;
+			guchar _tmp31_ = '\0';
+			guchar _tmp32_ = '\0';
 			guchar* _tmp33_ = NULL;
 			gint _tmp33__length1 = 0;
 			gint _tmp34_ = 0;
@@ -1252,335 +1226,333 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gint _tmp38_ = 0;
 			guchar _tmp39_ = '\0';
 			guchar _tmp40_ = '\0';
-			guchar* _tmp41_ = NULL;
-			gint _tmp41__length1 = 0;
-			gint _tmp42_ = 0;
-			guchar _tmp43_ = '\0';
-			guchar _tmp44_ = '\0';
 #line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp30_ = page;
+			_tmp26_ = page;
 #line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp31_ = l;
+			_tmp27_ = l;
 #line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp32_ = t;
+			_tmp28_ = t;
 #line 253 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp30_, (gint) _tmp31_, (gint) _tmp32_, p, 3);
+			page_view_get_pixel (self, _tmp26_, (gint) _tmp27_, (gint) _tmp28_, p, 3);
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33_ = output;
+			_tmp29_ = output;
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33__length1 = output_length1;
+			_tmp29__length1 = output_length1;
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp34_ = offset;
+			_tmp30_ = offset;
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp35_ = p[0];
+			_tmp31_ = p[0];
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33_[_tmp34_] = _tmp35_;
+			_tmp29_[_tmp30_] = _tmp31_;
 #line 254 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp36_ = _tmp33_[_tmp34_];
+			_tmp32_ = _tmp29_[_tmp30_];
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37_ = output;
+			_tmp33_ = output;
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37__length1 = output_length1;
+			_tmp33__length1 = output_length1;
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp38_ = offset;
+			_tmp34_ = offset;
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp39_ = p[1];
+			_tmp35_ = p[1];
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp37_[_tmp38_ + 1] = _tmp39_;
+			_tmp33_[_tmp34_ + 1] = _tmp35_;
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp40_ = _tmp37_[_tmp38_ + 1];
+			_tmp36_ = _tmp33_[_tmp34_ + 1];
 #line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp41_ = output;
+			_tmp37_ = output;
 #line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp41__length1 = output_length1;
+			_tmp37__length1 = output_length1;
 #line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp42_ = offset;
+			_tmp38_ = offset;
 #line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp43_ = p[2];
+			_tmp39_ = p[2];
 #line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp41_[_tmp42_ + 2] = _tmp43_;
+			_tmp37_[_tmp38_ + 2] = _tmp39_;
 #line 256 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp44_ = _tmp41_[_tmp42_ + 2];
+			_tmp40_ = _tmp37_[_tmp38_ + 2];
 #line 257 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return;
-#line 1307 "page-view.c"
+#line 1276 "page-view.c"
 		}
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = L;
+		_tmp41_ = L;
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = R;
+		_tmp42_ = R;
 #line 261 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp45_ > _tmp46_) {
-#line 1315 "page-view.c"
+		if (_tmp41_ > _tmp42_) {
+#line 1284 "page-view.c"
 			guchar p[3] = {0};
-			Page* _tmp47_ = NULL;
-			gint _tmp48_ = 0;
-			gint _tmp49_ = 0;
-			gdouble _tmp50_ = 0.0;
-			guchar _tmp51_ = '\0';
+			Page* _tmp43_ = NULL;
+			gint _tmp44_ = 0;
+			gint _tmp45_ = 0;
+			gdouble _tmp46_ = 0.0;
+			guchar _tmp47_ = '\0';
+			gdouble _tmp48_ = 0.0;
+			gdouble _tmp49_ = 0.0;
+			gint _tmp50_ = 0;
+			gdouble _tmp51_ = 0.0;
 			gdouble _tmp52_ = 0.0;
-			gdouble _tmp53_ = 0.0;
-			gint _tmp54_ = 0;
+			guchar _tmp53_ = '\0';
+			gdouble _tmp54_ = 0.0;
 			gdouble _tmp55_ = 0.0;
-			gdouble _tmp56_ = 0.0;
-			guchar _tmp57_ = '\0';
+			gint _tmp56_ = 0;
+			gdouble _tmp57_ = 0.0;
 			gdouble _tmp58_ = 0.0;
-			gdouble _tmp59_ = 0.0;
-			gint _tmp60_ = 0;
+			guchar _tmp59_ = '\0';
+			gdouble _tmp60_ = 0.0;
 			gdouble _tmp61_ = 0.0;
-			gdouble _tmp62_ = 0.0;
-			guchar _tmp63_ = '\0';
-			gdouble _tmp64_ = 0.0;
-			gdouble _tmp65_ = 0.0;
-			gint _tmp66_ = 0;
-			gdouble _tmp67_ = 0.0;
-			Page* _tmp89_ = NULL;
-			gint _tmp90_ = 0;
-			gint _tmp91_ = 0;
-			gdouble _tmp92_ = 0.0;
-			guchar _tmp93_ = '\0';
-			gdouble _tmp94_ = 0.0;
+			gint _tmp62_ = 0;
+			gdouble _tmp63_ = 0.0;
+			Page* _tmp84_ = NULL;
+			gint _tmp85_ = 0;
+			gint _tmp86_ = 0;
+			gdouble _tmp87_ = 0.0;
+			guchar _tmp88_ = '\0';
+			gdouble _tmp89_ = 0.0;
+			gdouble _tmp90_ = 0.0;
+			gdouble _tmp91_ = 0.0;
+			gint _tmp92_ = 0;
+			gdouble _tmp93_ = 0.0;
+			guchar _tmp94_ = '\0';
 			gdouble _tmp95_ = 0.0;
 			gdouble _tmp96_ = 0.0;
-			gint _tmp97_ = 0;
-			gdouble _tmp98_ = 0.0;
-			guchar _tmp99_ = '\0';
-			gdouble _tmp100_ = 0.0;
+			gdouble _tmp97_ = 0.0;
+			gint _tmp98_ = 0;
+			gdouble _tmp99_ = 0.0;
+			guchar _tmp100_ = '\0';
 			gdouble _tmp101_ = 0.0;
 			gdouble _tmp102_ = 0.0;
-			gint _tmp103_ = 0;
-			gdouble _tmp104_ = 0.0;
-			guchar _tmp105_ = '\0';
-			gdouble _tmp106_ = 0.0;
-			gdouble _tmp107_ = 0.0;
-			gdouble _tmp108_ = 0.0;
-			gint _tmp109_ = 0;
+			gdouble _tmp103_ = 0.0;
+			gint _tmp104_ = 0;
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp47_ = page;
+			_tmp43_ = page;
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp48_ = R;
+			_tmp44_ = R;
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp49_ = T;
+			_tmp45_ = T;
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp47_, _tmp48_, _tmp49_ - 1, p, 3);
+			page_view_get_pixel (self, _tmp43_, _tmp44_, _tmp45_ - 1, p, 3);
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp50_ = red;
+			_tmp46_ = red;
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp51_ = p[0];
+			_tmp47_ = p[0];
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp52_ = r;
+			_tmp48_ = r;
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp53_ = l;
+			_tmp49_ = l;
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp54_ = T;
+			_tmp50_ = T;
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp55_ = t;
+			_tmp51_ = t;
 #line 265 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp50_ + ((_tmp51_ * (_tmp52_ - _tmp53_)) * (_tmp54_ - _tmp55_));
+			red = _tmp46_ + ((_tmp47_ * (_tmp48_ - _tmp49_)) * (_tmp50_ - _tmp51_));
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp56_ = green;
+			_tmp52_ = green;
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp57_ = p[1];
+			_tmp53_ = p[1];
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp58_ = r;
+			_tmp54_ = r;
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp59_ = l;
+			_tmp55_ = l;
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp60_ = T;
+			_tmp56_ = T;
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp61_ = t;
+			_tmp57_ = t;
 #line 266 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp56_ + ((_tmp57_ * (_tmp58_ - _tmp59_)) * (_tmp60_ - _tmp61_));
+			green = _tmp52_ + ((_tmp53_ * (_tmp54_ - _tmp55_)) * (_tmp56_ - _tmp57_));
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp62_ = blue;
+			_tmp58_ = blue;
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp63_ = p[2];
+			_tmp59_ = p[2];
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp64_ = r;
+			_tmp60_ = r;
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp65_ = l;
+			_tmp61_ = l;
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp66_ = T;
+			_tmp62_ = T;
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp67_ = t;
+			_tmp63_ = t;
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp62_ + ((_tmp63_ * (_tmp64_ - _tmp65_)) * (_tmp66_ - _tmp67_));
-#line 1409 "page-view.c"
+			blue = _tmp58_ + ((_tmp59_ * (_tmp60_ - _tmp61_)) * (_tmp62_ - _tmp63_));
+#line 1378 "page-view.c"
 			{
 				gint y = 0;
-				gint _tmp68_ = 0;
+				gint _tmp64_ = 0;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp68_ = T;
+				_tmp64_ = T;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y = _tmp68_;
-#line 1417 "page-view.c"
+				y = _tmp64_;
+#line 1386 "page-view.c"
 				{
-					gboolean _tmp69_ = FALSE;
+					gboolean _tmp65_ = FALSE;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp69_ = TRUE;
+					_tmp65_ = TRUE;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
-#line 1424 "page-view.c"
-						gboolean _tmp70_ = FALSE;
-						gint _tmp72_ = 0;
-						gint _tmp73_ = 0;
-						Page* _tmp74_ = NULL;
-						gint _tmp75_ = 0;
-						gint _tmp76_ = 0;
-						gdouble _tmp77_ = 0.0;
-						guchar _tmp78_ = '\0';
+#line 1393 "page-view.c"
+						gint _tmp67_ = 0;
+						gint _tmp68_ = 0;
+						Page* _tmp69_ = NULL;
+						gint _tmp70_ = 0;
+						gint _tmp71_ = 0;
+						gdouble _tmp72_ = 0.0;
+						guchar _tmp73_ = '\0';
+						gdouble _tmp74_ = 0.0;
+						gdouble _tmp75_ = 0.0;
+						gdouble _tmp76_ = 0.0;
+						guchar _tmp77_ = '\0';
+						gdouble _tmp78_ = 0.0;
 						gdouble _tmp79_ = 0.0;
 						gdouble _tmp80_ = 0.0;
-						gdouble _tmp81_ = 0.0;
-						guchar _tmp82_ = '\0';
+						guchar _tmp81_ = '\0';
+						gdouble _tmp82_ = 0.0;
 						gdouble _tmp83_ = 0.0;
-						gdouble _tmp84_ = 0.0;
-						gdouble _tmp85_ = 0.0;
-						guchar _tmp86_ = '\0';
-						gdouble _tmp87_ = 0.0;
-						gdouble _tmp88_ = 0.0;
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp70_ = _tmp69_;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!_tmp70_) {
-#line 1447 "page-view.c"
-							gint _tmp71_ = 0;
+						if (!_tmp65_) {
+#line 1413 "page-view.c"
+							gint _tmp66_ = 0;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp71_ = y;
+							_tmp66_ = y;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							y = _tmp71_ + 1;
-#line 1453 "page-view.c"
+							y = _tmp66_ + 1;
+#line 1419 "page-view.c"
 						}
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp69_ = FALSE;
+						_tmp65_ = FALSE;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp72_ = y;
+						_tmp67_ = y;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp73_ = B;
+						_tmp68_ = B;
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!(_tmp72_ < _tmp73_)) {
+						if (!(_tmp67_ < _tmp68_)) {
 #line 268 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
-#line 1465 "page-view.c"
+#line 1431 "page-view.c"
 						}
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp74_ = page;
+						_tmp69_ = page;
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp75_ = R;
+						_tmp70_ = R;
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp76_ = y;
+						_tmp71_ = y;
 #line 270 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						page_view_get_pixel (self, _tmp74_, _tmp75_, _tmp76_, p, 3);
+						page_view_get_pixel (self, _tmp69_, _tmp70_, _tmp71_, p, 3);
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp77_ = red;
+						_tmp72_ = red;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp78_ = p[0];
+						_tmp73_ = p[0];
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp79_ = r;
+						_tmp74_ = r;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp80_ = l;
+						_tmp75_ = l;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						red = _tmp77_ + (_tmp78_ * (_tmp79_ - _tmp80_));
+						red = _tmp72_ + (_tmp73_ * (_tmp74_ - _tmp75_));
 #line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp81_ = green;
+						_tmp76_ = green;
 #line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp82_ = p[1];
+						_tmp77_ = p[1];
 #line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp83_ = r;
+						_tmp78_ = r;
 #line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp84_ = l;
+						_tmp79_ = l;
 #line 272 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						green = _tmp81_ + (_tmp82_ * (_tmp83_ - _tmp84_));
+						green = _tmp76_ + (_tmp77_ * (_tmp78_ - _tmp79_));
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp85_ = blue;
+						_tmp80_ = blue;
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp86_ = p[2];
+						_tmp81_ = p[2];
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp87_ = r;
+						_tmp82_ = r;
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp88_ = l;
+						_tmp83_ = l;
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						blue = _tmp85_ + (_tmp86_ * (_tmp87_ - _tmp88_));
-#line 1505 "page-view.c"
+						blue = _tmp80_ + (_tmp81_ * (_tmp82_ - _tmp83_));
+#line 1471 "page-view.c"
 					}
 				}
 			}
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp89_ = page;
+			_tmp84_ = page;
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp90_ = R;
+			_tmp85_ = R;
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp91_ = B;
+			_tmp86_ = B;
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp89_, _tmp90_, _tmp91_, p, 3);
+			page_view_get_pixel (self, _tmp84_, _tmp85_, _tmp86_, p, 3);
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp92_ = red;
+			_tmp87_ = red;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp93_ = p[0];
+			_tmp88_ = p[0];
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp94_ = r;
+			_tmp89_ = r;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp95_ = l;
+			_tmp90_ = l;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp96_ = b;
+			_tmp91_ = b;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp97_ = B;
+			_tmp92_ = B;
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp92_ + ((_tmp93_ * (_tmp94_ - _tmp95_)) * (_tmp96_ - _tmp97_));
+			red = _tmp87_ + ((_tmp88_ * (_tmp89_ - _tmp90_)) * (_tmp91_ - _tmp92_));
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp98_ = green;
+			_tmp93_ = green;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp99_ = p[1];
+			_tmp94_ = p[1];
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp100_ = r;
+			_tmp95_ = r;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp101_ = l;
+			_tmp96_ = l;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp102_ = b;
+			_tmp97_ = b;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp103_ = B;
+			_tmp98_ = B;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp98_ + ((_tmp99_ * (_tmp100_ - _tmp101_)) * (_tmp102_ - _tmp103_));
+			green = _tmp93_ + ((_tmp94_ * (_tmp95_ - _tmp96_)) * (_tmp97_ - _tmp98_));
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp104_ = blue;
+			_tmp99_ = blue;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp105_ = p[2];
+			_tmp100_ = p[2];
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp106_ = r;
+			_tmp101_ = r;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp107_ = l;
+			_tmp102_ = l;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp108_ = b;
+			_tmp103_ = b;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp109_ = B;
+			_tmp104_ = B;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp104_ + ((_tmp105_ * (_tmp106_ - _tmp107_)) * (_tmp108_ - _tmp109_));
-#line 1559 "page-view.c"
+			blue = _tmp99_ + ((_tmp100_ * (_tmp101_ - _tmp102_)) * (_tmp103_ - _tmp104_));
+#line 1525 "page-view.c"
 		} else {
 			guchar p[3] = {0};
-			Page* _tmp110_ = NULL;
-			gint _tmp111_ = 0;
+			Page* _tmp105_ = NULL;
+			gint _tmp106_ = 0;
+			gint _tmp107_ = 0;
+			gdouble _tmp108_ = 0.0;
+			guchar _tmp109_ = '\0';
+			gdouble _tmp110_ = 0.0;
+			gdouble _tmp111_ = 0.0;
 			gint _tmp112_ = 0;
 			gdouble _tmp113_ = 0.0;
-			guchar _tmp114_ = '\0';
-			gdouble _tmp115_ = 0.0;
+			gdouble _tmp114_ = 0.0;
+			guchar _tmp115_ = '\0';
 			gdouble _tmp116_ = 0.0;
-			gint _tmp117_ = 0;
-			gdouble _tmp118_ = 0.0;
+			gdouble _tmp117_ = 0.0;
+			gint _tmp118_ = 0;
 			gdouble _tmp119_ = 0.0;
-			guchar _tmp120_ = '\0';
-			gdouble _tmp121_ = 0.0;
+			gdouble _tmp120_ = 0.0;
+			guchar _tmp121_ = '\0';
 			gdouble _tmp122_ = 0.0;
-			gint _tmp123_ = 0;
-			gdouble _tmp124_ = 0.0;
+			gdouble _tmp123_ = 0.0;
+			gint _tmp124_ = 0;
 			gdouble _tmp125_ = 0.0;
-			guchar _tmp126_ = '\0';
-			gdouble _tmp127_ = 0.0;
-			gdouble _tmp128_ = 0.0;
-			gint _tmp129_ = 0;
-			gdouble _tmp130_ = 0.0;
-			Page* _tmp152_ = NULL;
-			gint _tmp153_ = 0;
+			Page* _tmp146_ = NULL;
+			gint _tmp147_ = 0;
+			gint _tmp148_ = 0;
+			gdouble _tmp149_ = 0.0;
+			guchar _tmp150_ = '\0';
+			gdouble _tmp151_ = 0.0;
+			gdouble _tmp152_ = 0.0;
+			gdouble _tmp153_ = 0.0;
 			gint _tmp154_ = 0;
 			gdouble _tmp155_ = 0.0;
 			guchar _tmp156_ = '\0';
@@ -1594,391 +1566,376 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 			gdouble _tmp164_ = 0.0;
 			gdouble _tmp165_ = 0.0;
 			gint _tmp166_ = 0;
-			gdouble _tmp167_ = 0.0;
-			guchar _tmp168_ = '\0';
-			gdouble _tmp169_ = 0.0;
-			gdouble _tmp170_ = 0.0;
-			gdouble _tmp171_ = 0.0;
-			gint _tmp172_ = 0;
 #line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp110_ = page;
+			_tmp105_ = page;
 #line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp111_ = L;
+			_tmp106_ = L;
 #line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp112_ = B;
+			_tmp107_ = B;
 #line 284 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp110_, _tmp111_ - 1, _tmp112_, p, 3);
+			page_view_get_pixel (self, _tmp105_, _tmp106_ - 1, _tmp107_, p, 3);
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp113_ = red;
+			_tmp108_ = red;
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp114_ = p[0];
+			_tmp109_ = p[0];
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp115_ = b;
+			_tmp110_ = b;
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp116_ = t;
+			_tmp111_ = t;
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp117_ = L;
+			_tmp112_ = L;
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp118_ = l;
+			_tmp113_ = l;
 #line 285 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp113_ + ((_tmp114_ * (_tmp115_ - _tmp116_)) * (_tmp117_ - _tmp118_));
+			red = _tmp108_ + ((_tmp109_ * (_tmp110_ - _tmp111_)) * (_tmp112_ - _tmp113_));
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp119_ = green;
+			_tmp114_ = green;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp120_ = p[1];
+			_tmp115_ = p[1];
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp121_ = b;
+			_tmp116_ = b;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp122_ = t;
+			_tmp117_ = t;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp123_ = L;
+			_tmp118_ = L;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp124_ = l;
+			_tmp119_ = l;
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp119_ + ((_tmp120_ * (_tmp121_ - _tmp122_)) * (_tmp123_ - _tmp124_));
+			green = _tmp114_ + ((_tmp115_ * (_tmp116_ - _tmp117_)) * (_tmp118_ - _tmp119_));
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp125_ = blue;
+			_tmp120_ = blue;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp126_ = p[2];
+			_tmp121_ = p[2];
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp127_ = b;
+			_tmp122_ = b;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp128_ = t;
+			_tmp123_ = t;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp129_ = L;
+			_tmp124_ = L;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp130_ = l;
+			_tmp125_ = l;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp125_ + ((_tmp126_ * (_tmp127_ - _tmp128_)) * (_tmp129_ - _tmp130_));
-#line 1654 "page-view.c"
+			blue = _tmp120_ + ((_tmp121_ * (_tmp122_ - _tmp123_)) * (_tmp124_ - _tmp125_));
+#line 1620 "page-view.c"
 			{
 				gint x = 0;
-				gint _tmp131_ = 0;
+				gint _tmp126_ = 0;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp131_ = L;
+				_tmp126_ = L;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x = _tmp131_;
-#line 1662 "page-view.c"
+				x = _tmp126_;
+#line 1628 "page-view.c"
 				{
-					gboolean _tmp132_ = FALSE;
+					gboolean _tmp127_ = FALSE;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp132_ = TRUE;
+					_tmp127_ = TRUE;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					while (TRUE) {
-#line 1669 "page-view.c"
-						gboolean _tmp133_ = FALSE;
-						gint _tmp135_ = 0;
-						gint _tmp136_ = 0;
-						Page* _tmp137_ = NULL;
-						gint _tmp138_ = 0;
-						gint _tmp139_ = 0;
+#line 1635 "page-view.c"
+						gint _tmp129_ = 0;
+						gint _tmp130_ = 0;
+						Page* _tmp131_ = NULL;
+						gint _tmp132_ = 0;
+						gint _tmp133_ = 0;
+						gdouble _tmp134_ = 0.0;
+						guchar _tmp135_ = '\0';
+						gdouble _tmp136_ = 0.0;
+						gdouble _tmp137_ = 0.0;
+						gdouble _tmp138_ = 0.0;
+						guchar _tmp139_ = '\0';
 						gdouble _tmp140_ = 0.0;
-						guchar _tmp141_ = '\0';
+						gdouble _tmp141_ = 0.0;
 						gdouble _tmp142_ = 0.0;
-						gdouble _tmp143_ = 0.0;
+						guchar _tmp143_ = '\0';
 						gdouble _tmp144_ = 0.0;
-						guchar _tmp145_ = '\0';
-						gdouble _tmp146_ = 0.0;
-						gdouble _tmp147_ = 0.0;
-						gdouble _tmp148_ = 0.0;
-						guchar _tmp149_ = '\0';
-						gdouble _tmp150_ = 0.0;
-						gdouble _tmp151_ = 0.0;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp133_ = _tmp132_;
+						gdouble _tmp145_ = 0.0;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!_tmp133_) {
-#line 1692 "page-view.c"
-							gint _tmp134_ = 0;
+						if (!_tmp127_) {
+#line 1655 "page-view.c"
+							gint _tmp128_ = 0;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp134_ = x;
+							_tmp128_ = x;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							x = _tmp134_ + 1;
-#line 1698 "page-view.c"
+							x = _tmp128_ + 1;
+#line 1661 "page-view.c"
 						}
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp132_ = FALSE;
+						_tmp127_ = FALSE;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp135_ = x;
+						_tmp129_ = x;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp136_ = R;
+						_tmp130_ = R;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						if (!(_tmp135_ < _tmp136_)) {
+						if (!(_tmp129_ < _tmp130_)) {
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							break;
-#line 1710 "page-view.c"
+#line 1673 "page-view.c"
 						}
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp137_ = page;
+						_tmp131_ = page;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp138_ = x;
+						_tmp132_ = x;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp139_ = B;
+						_tmp133_ = B;
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						page_view_get_pixel (self, _tmp137_, _tmp138_, _tmp139_, p, 3);
+						page_view_get_pixel (self, _tmp131_, _tmp132_, _tmp133_, p, 3);
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp140_ = red;
+						_tmp134_ = red;
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp141_ = p[0];
+						_tmp135_ = p[0];
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp142_ = b;
+						_tmp136_ = b;
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp143_ = t;
+						_tmp137_ = t;
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						red = _tmp140_ + (_tmp141_ * (_tmp142_ - _tmp143_));
+						red = _tmp134_ + (_tmp135_ * (_tmp136_ - _tmp137_));
 #line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp144_ = green;
+						_tmp138_ = green;
 #line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp145_ = p[1];
+						_tmp139_ = p[1];
 #line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp146_ = b;
+						_tmp140_ = b;
 #line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp147_ = t;
+						_tmp141_ = t;
 #line 291 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						green = _tmp144_ + (_tmp145_ * (_tmp146_ - _tmp147_));
+						green = _tmp138_ + (_tmp139_ * (_tmp140_ - _tmp141_));
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp148_ = blue;
+						_tmp142_ = blue;
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp149_ = p[2];
+						_tmp143_ = p[2];
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp150_ = b;
+						_tmp144_ = b;
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp151_ = t;
+						_tmp145_ = t;
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						blue = _tmp148_ + (_tmp149_ * (_tmp150_ - _tmp151_));
-#line 1750 "page-view.c"
+						blue = _tmp142_ + (_tmp143_ * (_tmp144_ - _tmp145_));
+#line 1713 "page-view.c"
 					}
 				}
 			}
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp152_ = page;
+			_tmp146_ = page;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp153_ = R;
+			_tmp147_ = R;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp154_ = B;
+			_tmp148_ = B;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			page_view_get_pixel (self, _tmp152_, _tmp153_, _tmp154_, p, 3);
+			page_view_get_pixel (self, _tmp146_, _tmp147_, _tmp148_, p, 3);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp155_ = red;
+			_tmp149_ = red;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp156_ = p[0];
+			_tmp150_ = p[0];
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp157_ = b;
+			_tmp151_ = b;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp158_ = t;
+			_tmp152_ = t;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp159_ = r;
+			_tmp153_ = r;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp160_ = R;
+			_tmp154_ = R;
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			red = _tmp155_ + ((_tmp156_ * (_tmp157_ - _tmp158_)) * (_tmp159_ - _tmp160_));
+			red = _tmp149_ + ((_tmp150_ * (_tmp151_ - _tmp152_)) * (_tmp153_ - _tmp154_));
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp161_ = green;
+			_tmp155_ = green;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp162_ = p[1];
+			_tmp156_ = p[1];
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp163_ = b;
+			_tmp157_ = b;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp164_ = t;
+			_tmp158_ = t;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp165_ = r;
+			_tmp159_ = r;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp166_ = R;
+			_tmp160_ = R;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			green = _tmp161_ + ((_tmp162_ * (_tmp163_ - _tmp164_)) * (_tmp165_ - _tmp166_));
+			green = _tmp155_ + ((_tmp156_ * (_tmp157_ - _tmp158_)) * (_tmp159_ - _tmp160_));
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp167_ = blue;
+			_tmp161_ = blue;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp168_ = p[2];
+			_tmp162_ = p[2];
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp169_ = b;
+			_tmp163_ = b;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp170_ = t;
+			_tmp164_ = t;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp171_ = r;
+			_tmp165_ = r;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp172_ = R;
+			_tmp166_ = R;
 #line 297 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			blue = _tmp167_ + ((_tmp168_ * (_tmp169_ - _tmp170_)) * (_tmp171_ - _tmp172_));
-#line 1804 "page-view.c"
+			blue = _tmp161_ + ((_tmp162_ * (_tmp163_ - _tmp164_)) * (_tmp165_ - _tmp166_));
+#line 1767 "page-view.c"
 		}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp173_ = r;
+		_tmp167_ = r;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp174_ = l;
+		_tmp168_ = l;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp175_ = b;
+		_tmp169_ = b;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp176_ = t;
+		_tmp170_ = t;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		scale = 1.0 / ((_tmp173_ - _tmp174_) * (_tmp175_ - _tmp176_));
+		scale = 1.0 / ((_tmp167_ - _tmp168_) * (_tmp169_ - _tmp170_));
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp177_ = output;
+		_tmp171_ = output;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp177__length1 = output_length1;
+		_tmp171__length1 = output_length1;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp178_ = offset;
+		_tmp172_ = offset;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp179_ = red;
+		_tmp173_ = red;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp180_ = scale;
+		_tmp174_ = scale;
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp177_[_tmp178_] = (guchar) ((_tmp179_ * _tmp180_) + 0.5);
+		_tmp171_[_tmp172_] = (guchar) ((_tmp173_ * _tmp174_) + 0.5);
 #line 301 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp181_ = _tmp177_[_tmp178_];
+		_tmp175_ = _tmp171_[_tmp172_];
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp182_ = output;
+		_tmp176_ = output;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp182__length1 = output_length1;
+		_tmp176__length1 = output_length1;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp183_ = offset;
+		_tmp177_ = offset;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp184_ = green;
+		_tmp178_ = green;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp185_ = scale;
+		_tmp179_ = scale;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp182_[_tmp183_ + 1] = (guchar) ((_tmp184_ * _tmp185_) + 0.5);
+		_tmp176_[_tmp177_ + 1] = (guchar) ((_tmp178_ * _tmp179_) + 0.5);
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp186_ = _tmp182_[_tmp183_ + 1];
+		_tmp180_ = _tmp176_[_tmp177_ + 1];
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp187_ = output;
+		_tmp181_ = output;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp187__length1 = output_length1;
+		_tmp181__length1 = output_length1;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp188_ = offset;
+		_tmp182_ = offset;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp189_ = blue;
+		_tmp183_ = blue;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp190_ = scale;
+		_tmp184_ = scale;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp187_[_tmp188_ + 2] = (guchar) ((_tmp189_ * _tmp190_) + 0.5);
+		_tmp181_[_tmp182_ + 2] = (guchar) ((_tmp183_ * _tmp184_) + 0.5);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp191_ = _tmp187_[_tmp188_ + 2];
+		_tmp185_ = _tmp181_[_tmp182_ + 2];
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 1860 "page-view.c"
+#line 1823 "page-view.c"
 	}
 	{
 		gint x = 0;
-		gint _tmp192_ = 0;
+		gint _tmp186_ = 0;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp192_ = L;
+		_tmp186_ = L;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp192_;
-#line 1869 "page-view.c"
+		x = _tmp186_;
+#line 1832 "page-view.c"
 		{
-			gboolean _tmp193_ = FALSE;
+			gboolean _tmp187_ = FALSE;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp193_ = TRUE;
+			_tmp187_ = TRUE;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 1876 "page-view.c"
-				gboolean _tmp194_ = FALSE;
-				gint _tmp196_ = 0;
-				gint _tmp197_ = 0;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp194_ = _tmp193_;
+#line 1839 "page-view.c"
+				gint _tmp189_ = 0;
+				gint _tmp190_ = 0;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp194_) {
-#line 1884 "page-view.c"
-					gint _tmp195_ = 0;
+				if (!_tmp187_) {
+#line 1844 "page-view.c"
+					gint _tmp188_ = 0;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp195_ = x;
+					_tmp188_ = x;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = _tmp195_ + 1;
-#line 1890 "page-view.c"
+					x = _tmp188_ + 1;
+#line 1850 "page-view.c"
 				}
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp193_ = FALSE;
+				_tmp187_ = FALSE;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp196_ = x;
+				_tmp189_ = x;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp197_ = R;
+				_tmp190_ = R;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp196_ < _tmp197_)) {
+				if (!(_tmp189_ < _tmp190_)) {
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 1902 "page-view.c"
+#line 1862 "page-view.c"
 				}
 				{
 					gint y = 0;
-					gint _tmp198_ = 0;
+					gint _tmp191_ = 0;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp198_ = T;
+					_tmp191_ = T;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = _tmp198_;
-#line 1911 "page-view.c"
+					y = _tmp191_;
+#line 1871 "page-view.c"
 					{
-						gboolean _tmp199_ = FALSE;
+						gboolean _tmp192_ = FALSE;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp199_ = TRUE;
+						_tmp192_ = TRUE;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
-#line 1918 "page-view.c"
-							gboolean _tmp200_ = FALSE;
-							gint _tmp202_ = 0;
-							gint _tmp203_ = 0;
+#line 1878 "page-view.c"
+							gint _tmp194_ = 0;
+							gint _tmp195_ = 0;
 							guchar p[3] = {0};
-							Page* _tmp204_ = NULL;
-							gint _tmp205_ = 0;
-							gint _tmp206_ = 0;
-							gdouble _tmp207_ = 0.0;
-							guchar _tmp208_ = '\0';
-							gdouble _tmp209_ = 0.0;
-							guchar _tmp210_ = '\0';
-							gdouble _tmp211_ = 0.0;
-							guchar _tmp212_ = '\0';
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp200_ = _tmp199_;
+							Page* _tmp196_ = NULL;
+							gint _tmp197_ = 0;
+							gint _tmp198_ = 0;
+							gdouble _tmp199_ = 0.0;
+							guchar _tmp200_ = '\0';
+							gdouble _tmp201_ = 0.0;
+							guchar _tmp202_ = '\0';
+							gdouble _tmp203_ = 0.0;
+							guchar _tmp204_ = '\0';
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!_tmp200_) {
-#line 1936 "page-view.c"
-								gint _tmp201_ = 0;
+							if (!_tmp192_) {
+#line 1893 "page-view.c"
+								gint _tmp193_ = 0;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp201_ = y;
+								_tmp193_ = y;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								y = _tmp201_ + 1;
-#line 1942 "page-view.c"
+								y = _tmp193_ + 1;
+#line 1899 "page-view.c"
 							}
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp199_ = FALSE;
+							_tmp192_ = FALSE;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp202_ = y;
+							_tmp194_ = y;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp203_ = B;
+							_tmp195_ = B;
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!(_tmp202_ < _tmp203_)) {
+							if (!(_tmp194_ < _tmp195_)) {
 #line 310 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
-#line 1954 "page-view.c"
+#line 1911 "page-view.c"
 							}
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp204_ = page;
+							_tmp196_ = page;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp205_ = x;
+							_tmp197_ = x;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp206_ = y;
+							_tmp198_ = y;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							page_view_get_pixel (self, _tmp204_, _tmp205_, _tmp206_, p, 3);
+							page_view_get_pixel (self, _tmp196_, _tmp197_, _tmp198_, p, 3);
 #line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp207_ = red;
+							_tmp199_ = red;
 #line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp208_ = p[0];
+							_tmp200_ = p[0];
 #line 314 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							red = _tmp207_ + _tmp208_;
+							red = _tmp199_ + _tmp200_;
 #line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp209_ = green;
+							_tmp201_ = green;
 #line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp210_ = p[1];
+							_tmp202_ = p[1];
 #line 315 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							green = _tmp209_ + _tmp210_;
+							green = _tmp201_ + _tmp202_;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp211_ = blue;
+							_tmp203_ = blue;
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp212_ = p[2];
+							_tmp204_ = p[2];
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							blue = _tmp211_ + _tmp212_;
-#line 1982 "page-view.c"
+							blue = _tmp203_ + _tmp204_;
+#line 1939 "page-view.c"
 						}
 					}
 				}
@@ -1987,807 +1944,793 @@ static void page_view_set_pixel (PageView* self, Page* page, gdouble l, gdouble
 	}
 	{
 		gint x = 0;
-		gint _tmp213_ = 0;
+		gint _tmp205_ = 0;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp213_ = L;
+		_tmp205_ = L;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp213_;
-#line 1996 "page-view.c"
+		x = _tmp205_;
+#line 1953 "page-view.c"
 		{
-			gboolean _tmp214_ = FALSE;
+			gboolean _tmp206_ = FALSE;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp214_ = TRUE;
+			_tmp206_ = TRUE;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 2003 "page-view.c"
-				gboolean _tmp215_ = FALSE;
-				gint _tmp217_ = 0;
-				gint _tmp218_ = 0;
-				gdouble _tmp219_ = 0.0;
-				gint _tmp220_ = 0;
-				gdouble _tmp236_ = 0.0;
-				gint _tmp237_ = 0;
+#line 1960 "page-view.c"
+				gint _tmp208_ = 0;
+				gint _tmp209_ = 0;
+				gdouble _tmp210_ = 0.0;
+				gint _tmp211_ = 0;
+				gdouble _tmp227_ = 0.0;
+				gint _tmp228_ = 0;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp215_ = _tmp214_;
+				if (!_tmp206_) {
+#line 1969 "page-view.c"
+					gint _tmp207_ = 0;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp215_) {
-#line 2015 "page-view.c"
-					gint _tmp216_ = 0;
+					_tmp207_ = x;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp216_ = x;
-#line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = _tmp216_ + 1;
-#line 2021 "page-view.c"
+					x = _tmp207_ + 1;
+#line 1975 "page-view.c"
 				}
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp214_ = FALSE;
+				_tmp206_ = FALSE;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp217_ = x;
+				_tmp208_ = x;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp218_ = R;
+				_tmp209_ = R;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp217_ < _tmp218_)) {
+				if (!(_tmp208_ < _tmp209_)) {
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 2033 "page-view.c"
+#line 1987 "page-view.c"
 				}
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp219_ = t;
+				_tmp210_ = t;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp220_ = T;
+				_tmp211_ = T;
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp219_ != ((gdouble) _tmp220_)) {
-#line 2041 "page-view.c"
+				if (_tmp210_ != ((gdouble) _tmp211_)) {
+#line 1995 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp221_ = NULL;
-					gint _tmp222_ = 0;
-					gint _tmp223_ = 0;
-					gdouble _tmp224_ = 0.0;
-					guchar _tmp225_ = '\0';
-					gint _tmp226_ = 0;
-					gdouble _tmp227_ = 0.0;
-					gdouble _tmp228_ = 0.0;
-					guchar _tmp229_ = '\0';
-					gint _tmp230_ = 0;
-					gdouble _tmp231_ = 0.0;
-					gdouble _tmp232_ = 0.0;
-					guchar _tmp233_ = '\0';
-					gint _tmp234_ = 0;
-					gdouble _tmp235_ = 0.0;
+					Page* _tmp212_ = NULL;
+					gint _tmp213_ = 0;
+					gint _tmp214_ = 0;
+					gdouble _tmp215_ = 0.0;
+					guchar _tmp216_ = '\0';
+					gint _tmp217_ = 0;
+					gdouble _tmp218_ = 0.0;
+					gdouble _tmp219_ = 0.0;
+					guchar _tmp220_ = '\0';
+					gint _tmp221_ = 0;
+					gdouble _tmp222_ = 0.0;
+					gdouble _tmp223_ = 0.0;
+					guchar _tmp224_ = '\0';
+					gint _tmp225_ = 0;
+					gdouble _tmp226_ = 0.0;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp221_ = page;
+					_tmp212_ = page;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp222_ = x;
+					_tmp213_ = x;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp223_ = T;
+					_tmp214_ = T;
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp221_, _tmp222_, _tmp223_ - 1, p, 3);
+					page_view_get_pixel (self, _tmp212_, _tmp213_, _tmp214_ - 1, p, 3);
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp224_ = red;
+					_tmp215_ = red;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp225_ = p[0];
+					_tmp216_ = p[0];
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp226_ = T;
+					_tmp217_ = T;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp227_ = t;
+					_tmp218_ = t;
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp224_ + (_tmp225_ * (_tmp226_ - _tmp227_));
+					red = _tmp215_ + (_tmp216_ * (_tmp217_ - _tmp218_));
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp228_ = green;
+					_tmp219_ = green;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp229_ = p[1];
+					_tmp220_ = p[1];
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp230_ = T;
+					_tmp221_ = T;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp231_ = t;
+					_tmp222_ = t;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp228_ + (_tmp229_ * (_tmp230_ - _tmp231_));
+					green = _tmp219_ + (_tmp220_ * (_tmp221_ - _tmp222_));
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp232_ = blue;
+					_tmp223_ = blue;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp233_ = p[2];
+					_tmp224_ = p[2];
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp234_ = T;
+					_tmp225_ = T;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp235_ = t;
+					_tmp226_ = t;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp232_ + (_tmp233_ * (_tmp234_ - _tmp235_));
-#line 2096 "page-view.c"
+					blue = _tmp223_ + (_tmp224_ * (_tmp225_ - _tmp226_));
+#line 2050 "page-view.c"
 				}
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp236_ = b;
+				_tmp227_ = b;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp237_ = B;
+				_tmp228_ = B;
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp236_ != ((gdouble) _tmp237_)) {
-#line 2104 "page-view.c"
+				if (_tmp227_ != ((gdouble) _tmp228_)) {
+#line 2058 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp238_ = NULL;
+					Page* _tmp229_ = NULL;
+					gint _tmp230_ = 0;
+					gint _tmp231_ = 0;
+					gdouble _tmp232_ = 0.0;
+					guchar _tmp233_ = '\0';
+					gdouble _tmp234_ = 0.0;
+					gint _tmp235_ = 0;
+					gdouble _tmp236_ = 0.0;
+					guchar _tmp237_ = '\0';
+					gdouble _tmp238_ = 0.0;
 					gint _tmp239_ = 0;
-					gint _tmp240_ = 0;
-					gdouble _tmp241_ = 0.0;
-					guchar _tmp242_ = '\0';
-					gdouble _tmp243_ = 0.0;
-					gint _tmp244_ = 0;
-					gdouble _tmp245_ = 0.0;
-					guchar _tmp246_ = '\0';
-					gdouble _tmp247_ = 0.0;
-					gint _tmp248_ = 0;
-					gdouble _tmp249_ = 0.0;
-					guchar _tmp250_ = '\0';
-					gdouble _tmp251_ = 0.0;
-					gint _tmp252_ = 0;
+					gdouble _tmp240_ = 0.0;
+					guchar _tmp241_ = '\0';
+					gdouble _tmp242_ = 0.0;
+					gint _tmp243_ = 0;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp238_ = page;
+					_tmp229_ = page;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp239_ = x;
+					_tmp230_ = x;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp240_ = B;
+					_tmp231_ = B;
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp238_, _tmp239_, _tmp240_, p, 3);
+					page_view_get_pixel (self, _tmp229_, _tmp230_, _tmp231_, p, 3);
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp241_ = red;
+					_tmp232_ = red;
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp242_ = p[0];
+					_tmp233_ = p[0];
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp243_ = b;
+					_tmp234_ = b;
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp244_ = B;
+					_tmp235_ = B;
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp241_ + (_tmp242_ * (_tmp243_ - _tmp244_));
+					red = _tmp232_ + (_tmp233_ * (_tmp234_ - _tmp235_));
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp245_ = green;
+					_tmp236_ = green;
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp246_ = p[1];
+					_tmp237_ = p[1];
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp247_ = b;
+					_tmp238_ = b;
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp248_ = B;
+					_tmp239_ = B;
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp245_ + (_tmp246_ * (_tmp247_ - _tmp248_));
+					green = _tmp236_ + (_tmp237_ * (_tmp238_ - _tmp239_));
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp249_ = blue;
+					_tmp240_ = blue;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp250_ = p[2];
+					_tmp241_ = p[2];
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp251_ = b;
+					_tmp242_ = b;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp252_ = B;
+					_tmp243_ = B;
 #line 338 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp249_ + (_tmp250_ * (_tmp251_ - _tmp252_));
-#line 2159 "page-view.c"
+					blue = _tmp240_ + (_tmp241_ * (_tmp242_ - _tmp243_));
+#line 2113 "page-view.c"
 				}
 			}
 		}
 	}
 	{
 		gint y = 0;
-		gint _tmp253_ = 0;
+		gint _tmp244_ = 0;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp253_ = T;
+		_tmp244_ = T;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp253_;
-#line 2171 "page-view.c"
+		y = _tmp244_;
+#line 2125 "page-view.c"
 		{
-			gboolean _tmp254_ = FALSE;
+			gboolean _tmp245_ = FALSE;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp254_ = TRUE;
+			_tmp245_ = TRUE;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 2178 "page-view.c"
-				gboolean _tmp255_ = FALSE;
-				gint _tmp257_ = 0;
-				gint _tmp258_ = 0;
-				gdouble _tmp259_ = 0.0;
-				gint _tmp260_ = 0;
-				gdouble _tmp276_ = 0.0;
-				gint _tmp277_ = 0;
+#line 2132 "page-view.c"
+				gint _tmp247_ = 0;
+				gint _tmp248_ = 0;
+				gdouble _tmp249_ = 0.0;
+				gint _tmp250_ = 0;
+				gdouble _tmp266_ = 0.0;
+				gint _tmp267_ = 0;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp255_ = _tmp254_;
+				if (!_tmp245_) {
+#line 2141 "page-view.c"
+					gint _tmp246_ = 0;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp255_) {
-#line 2190 "page-view.c"
-					gint _tmp256_ = 0;
-#line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp256_ = y;
+					_tmp246_ = y;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = _tmp256_ + 1;
-#line 2196 "page-view.c"
+					y = _tmp246_ + 1;
+#line 2147 "page-view.c"
 				}
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp254_ = FALSE;
+				_tmp245_ = FALSE;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp257_ = y;
+				_tmp247_ = y;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp258_ = B;
+				_tmp248_ = B;
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp257_ < _tmp258_)) {
+				if (!(_tmp247_ < _tmp248_)) {
 #line 343 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 2208 "page-view.c"
+#line 2159 "page-view.c"
 				}
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp259_ = l;
+				_tmp249_ = l;
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp260_ = L;
+				_tmp250_ = L;
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp259_ != ((gdouble) _tmp260_)) {
-#line 2216 "page-view.c"
+				if (_tmp249_ != ((gdouble) _tmp250_)) {
+#line 2167 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp261_ = NULL;
-					gint _tmp262_ = 0;
-					gint _tmp263_ = 0;
-					gdouble _tmp264_ = 0.0;
-					guchar _tmp265_ = '\0';
-					gint _tmp266_ = 0;
-					gdouble _tmp267_ = 0.0;
-					gdouble _tmp268_ = 0.0;
-					guchar _tmp269_ = '\0';
-					gint _tmp270_ = 0;
-					gdouble _tmp271_ = 0.0;
-					gdouble _tmp272_ = 0.0;
-					guchar _tmp273_ = '\0';
-					gint _tmp274_ = 0;
-					gdouble _tmp275_ = 0.0;
+					Page* _tmp251_ = NULL;
+					gint _tmp252_ = 0;
+					gint _tmp253_ = 0;
+					gdouble _tmp254_ = 0.0;
+					guchar _tmp255_ = '\0';
+					gint _tmp256_ = 0;
+					gdouble _tmp257_ = 0.0;
+					gdouble _tmp258_ = 0.0;
+					guchar _tmp259_ = '\0';
+					gint _tmp260_ = 0;
+					gdouble _tmp261_ = 0.0;
+					gdouble _tmp262_ = 0.0;
+					guchar _tmp263_ = '\0';
+					gint _tmp264_ = 0;
+					gdouble _tmp265_ = 0.0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp261_ = page;
+					_tmp251_ = page;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp262_ = L;
+					_tmp252_ = L;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp263_ = y;
+					_tmp253_ = y;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp261_, _tmp262_ - 1, _tmp263_, p, 3);
+					page_view_get_pixel (self, _tmp251_, _tmp252_ - 1, _tmp253_, p, 3);
 #line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp264_ = red;
+					_tmp254_ = red;
 #line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp265_ = p[0];
+					_tmp255_ = p[0];
 #line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp266_ = L;
+					_tmp256_ = L;
 #line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp267_ = l;
+					_tmp257_ = l;
 #line 349 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp264_ + (_tmp265_ * (_tmp266_ - _tmp267_));
+					red = _tmp254_ + (_tmp255_ * (_tmp256_ - _tmp257_));
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp268_ = green;
+					_tmp258_ = green;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp269_ = p[1];
+					_tmp259_ = p[1];
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp270_ = L;
+					_tmp260_ = L;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp271_ = l;
+					_tmp261_ = l;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp268_ + (_tmp269_ * (_tmp270_ - _tmp271_));
+					green = _tmp258_ + (_tmp259_ * (_tmp260_ - _tmp261_));
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp272_ = blue;
+					_tmp262_ = blue;
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp273_ = p[2];
+					_tmp263_ = p[2];
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp274_ = L;
+					_tmp264_ = L;
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp275_ = l;
+					_tmp265_ = l;
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp272_ + (_tmp273_ * (_tmp274_ - _tmp275_));
-#line 2271 "page-view.c"
+					blue = _tmp262_ + (_tmp263_ * (_tmp264_ - _tmp265_));
+#line 2222 "page-view.c"
 				}
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp276_ = r;
+				_tmp266_ = r;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp277_ = R;
+				_tmp267_ = R;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (_tmp276_ != ((gdouble) _tmp277_)) {
-#line 2279 "page-view.c"
+				if (_tmp266_ != ((gdouble) _tmp267_)) {
+#line 2230 "page-view.c"
 					guchar p[3] = {0};
-					Page* _tmp278_ = NULL;
-					gint _tmp279_ = 0;
-					gint _tmp280_ = 0;
+					Page* _tmp268_ = NULL;
+					gint _tmp269_ = 0;
+					gint _tmp270_ = 0;
+					gdouble _tmp271_ = 0.0;
+					guchar _tmp272_ = '\0';
+					gdouble _tmp273_ = 0.0;
+					gint _tmp274_ = 0;
+					gdouble _tmp275_ = 0.0;
+					guchar _tmp276_ = '\0';
+					gdouble _tmp277_ = 0.0;
+					gint _tmp278_ = 0;
+					gdouble _tmp279_ = 0.0;
+					guchar _tmp280_ = '\0';
 					gdouble _tmp281_ = 0.0;
-					guchar _tmp282_ = '\0';
-					gdouble _tmp283_ = 0.0;
-					gint _tmp284_ = 0;
-					gdouble _tmp285_ = 0.0;
-					guchar _tmp286_ = '\0';
-					gdouble _tmp287_ = 0.0;
-					gint _tmp288_ = 0;
-					gdouble _tmp289_ = 0.0;
-					guchar _tmp290_ = '\0';
-					gdouble _tmp291_ = 0.0;
-					gint _tmp292_ = 0;
+					gint _tmp282_ = 0;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp278_ = page;
+					_tmp268_ = page;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp279_ = R;
+					_tmp269_ = R;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp280_ = y;
+					_tmp270_ = y;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					page_view_get_pixel (self, _tmp278_, _tmp279_, _tmp280_, p, 3);
+					page_view_get_pixel (self, _tmp268_, _tmp269_, _tmp270_, p, 3);
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp281_ = red;
+					_tmp271_ = red;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp282_ = p[0];
+					_tmp272_ = p[0];
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp283_ = r;
+					_tmp273_ = r;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp284_ = R;
+					_tmp274_ = R;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					red = _tmp281_ + (_tmp282_ * (_tmp283_ - _tmp284_));
+					red = _tmp271_ + (_tmp272_ * (_tmp273_ - _tmp274_));
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp285_ = green;
+					_tmp275_ = green;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp286_ = p[1];
+					_tmp276_ = p[1];
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp287_ = r;
+					_tmp277_ = r;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp288_ = R;
+					_tmp278_ = R;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					green = _tmp285_ + (_tmp286_ * (_tmp287_ - _tmp288_));
+					green = _tmp275_ + (_tmp276_ * (_tmp277_ - _tmp278_));
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp289_ = blue;
+					_tmp279_ = blue;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp290_ = p[2];
+					_tmp280_ = p[2];
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp291_ = r;
+					_tmp281_ = r;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp292_ = R;
+					_tmp282_ = R;
 #line 360 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					blue = _tmp289_ + (_tmp290_ * (_tmp291_ - _tmp292_));
-#line 2334 "page-view.c"
+					blue = _tmp279_ + (_tmp280_ * (_tmp281_ - _tmp282_));
+#line 2285 "page-view.c"
 				}
 			}
 		}
 	}
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp294_ = l;
+	_tmp284_ = l;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp295_ = L;
+	_tmp285_ = L;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp294_ != ((gdouble) _tmp295_)) {
-#line 2345 "page-view.c"
-		gdouble _tmp296_ = 0.0;
-		gint _tmp297_ = 0;
+	if (_tmp284_ != ((gdouble) _tmp285_)) {
+#line 2296 "page-view.c"
+		gdouble _tmp286_ = 0.0;
+		gint _tmp287_ = 0;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp296_ = t;
+		_tmp286_ = t;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp297_ = T;
+		_tmp287_ = T;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp293_ = _tmp296_ != ((gdouble) _tmp297_);
-#line 2354 "page-view.c"
+		_tmp283_ = _tmp286_ != ((gdouble) _tmp287_);
+#line 2305 "page-view.c"
 	} else {
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp293_ = FALSE;
-#line 2358 "page-view.c"
+		_tmp283_ = FALSE;
+#line 2309 "page-view.c"
 	}
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp298_ = _tmp293_;
-#line 365 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp298_) {
-#line 2364 "page-view.c"
+	if (_tmp283_) {
+#line 2313 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp299_ = NULL;
-		gint _tmp300_ = 0;
+		Page* _tmp288_ = NULL;
+		gint _tmp289_ = 0;
+		gint _tmp290_ = 0;
+		gdouble _tmp291_ = 0.0;
+		guchar _tmp292_ = '\0';
+		gint _tmp293_ = 0;
+		gdouble _tmp294_ = 0.0;
+		gint _tmp295_ = 0;
+		gdouble _tmp296_ = 0.0;
+		gdouble _tmp297_ = 0.0;
+		guchar _tmp298_ = '\0';
+		gint _tmp299_ = 0;
+		gdouble _tmp300_ = 0.0;
 		gint _tmp301_ = 0;
 		gdouble _tmp302_ = 0.0;
-		guchar _tmp303_ = '\0';
-		gint _tmp304_ = 0;
-		gdouble _tmp305_ = 0.0;
-		gint _tmp306_ = 0;
-		gdouble _tmp307_ = 0.0;
+		gdouble _tmp303_ = 0.0;
+		guchar _tmp304_ = '\0';
+		gint _tmp305_ = 0;
+		gdouble _tmp306_ = 0.0;
+		gint _tmp307_ = 0;
 		gdouble _tmp308_ = 0.0;
-		guchar _tmp309_ = '\0';
-		gint _tmp310_ = 0;
-		gdouble _tmp311_ = 0.0;
-		gint _tmp312_ = 0;
-		gdouble _tmp313_ = 0.0;
-		gdouble _tmp314_ = 0.0;
-		guchar _tmp315_ = '\0';
-		gint _tmp316_ = 0;
-		gdouble _tmp317_ = 0.0;
-		gint _tmp318_ = 0;
-		gdouble _tmp319_ = 0.0;
 #line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp299_ = page;
+		_tmp288_ = page;
 #line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp300_ = L;
+		_tmp289_ = L;
 #line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp301_ = T;
+		_tmp290_ = T;
 #line 368 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp299_, _tmp300_ - 1, _tmp301_ - 1, p, 3);
+		page_view_get_pixel (self, _tmp288_, _tmp289_ - 1, _tmp290_ - 1, p, 3);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp302_ = red;
+		_tmp291_ = red;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp303_ = p[0];
+		_tmp292_ = p[0];
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp304_ = L;
+		_tmp293_ = L;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp305_ = l;
+		_tmp294_ = l;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp306_ = T;
+		_tmp295_ = T;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp307_ = t;
+		_tmp296_ = t;
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp302_ + ((_tmp303_ * (_tmp304_ - _tmp305_)) * (_tmp306_ - _tmp307_));
+		red = _tmp291_ + ((_tmp292_ * (_tmp293_ - _tmp294_)) * (_tmp295_ - _tmp296_));
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp308_ = green;
+		_tmp297_ = green;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp309_ = p[1];
+		_tmp298_ = p[1];
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp310_ = L;
+		_tmp299_ = L;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp311_ = l;
+		_tmp300_ = l;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp312_ = T;
+		_tmp301_ = T;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp313_ = t;
+		_tmp302_ = t;
 #line 370 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp308_ + ((_tmp309_ * (_tmp310_ - _tmp311_)) * (_tmp312_ - _tmp313_));
+		green = _tmp297_ + ((_tmp298_ * (_tmp299_ - _tmp300_)) * (_tmp301_ - _tmp302_));
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp314_ = blue;
+		_tmp303_ = blue;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp315_ = p[2];
+		_tmp304_ = p[2];
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp316_ = L;
+		_tmp305_ = L;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp317_ = l;
+		_tmp306_ = l;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp318_ = T;
+		_tmp307_ = T;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp319_ = t;
+		_tmp308_ = t;
 #line 371 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp314_ + ((_tmp315_ * (_tmp316_ - _tmp317_)) * (_tmp318_ - _tmp319_));
-#line 2437 "page-view.c"
+		blue = _tmp303_ + ((_tmp304_ * (_tmp305_ - _tmp306_)) * (_tmp307_ - _tmp308_));
+#line 2386 "page-view.c"
 	}
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp321_ = r;
+	_tmp310_ = r;
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp322_ = R;
+	_tmp311_ = R;
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp321_ != ((gdouble) _tmp322_)) {
-#line 2445 "page-view.c"
-		gdouble _tmp323_ = 0.0;
-		gint _tmp324_ = 0;
+	if (_tmp310_ != ((gdouble) _tmp311_)) {
+#line 2394 "page-view.c"
+		gdouble _tmp312_ = 0.0;
+		gint _tmp313_ = 0;
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp323_ = t;
+		_tmp312_ = t;
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp324_ = T;
+		_tmp313_ = T;
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp320_ = _tmp323_ != ((gdouble) _tmp324_);
-#line 2454 "page-view.c"
+		_tmp309_ = _tmp312_ != ((gdouble) _tmp313_);
+#line 2403 "page-view.c"
 	} else {
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp320_ = FALSE;
-#line 2458 "page-view.c"
+		_tmp309_ = FALSE;
+#line 2407 "page-view.c"
 	}
 #line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp325_ = _tmp320_;
-#line 373 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp325_) {
-#line 2464 "page-view.c"
+	if (_tmp309_) {
+#line 2411 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp326_ = NULL;
+		Page* _tmp314_ = NULL;
+		gint _tmp315_ = 0;
+		gint _tmp316_ = 0;
+		gdouble _tmp317_ = 0.0;
+		guchar _tmp318_ = '\0';
+		gdouble _tmp319_ = 0.0;
+		gint _tmp320_ = 0;
+		gint _tmp321_ = 0;
+		gdouble _tmp322_ = 0.0;
+		gdouble _tmp323_ = 0.0;
+		guchar _tmp324_ = '\0';
+		gdouble _tmp325_ = 0.0;
+		gint _tmp326_ = 0;
 		gint _tmp327_ = 0;
-		gint _tmp328_ = 0;
+		gdouble _tmp328_ = 0.0;
 		gdouble _tmp329_ = 0.0;
 		guchar _tmp330_ = '\0';
 		gdouble _tmp331_ = 0.0;
 		gint _tmp332_ = 0;
 		gint _tmp333_ = 0;
 		gdouble _tmp334_ = 0.0;
-		gdouble _tmp335_ = 0.0;
-		guchar _tmp336_ = '\0';
-		gdouble _tmp337_ = 0.0;
-		gint _tmp338_ = 0;
-		gint _tmp339_ = 0;
-		gdouble _tmp340_ = 0.0;
-		gdouble _tmp341_ = 0.0;
-		guchar _tmp342_ = '\0';
-		gdouble _tmp343_ = 0.0;
-		gint _tmp344_ = 0;
-		gint _tmp345_ = 0;
-		gdouble _tmp346_ = 0.0;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp326_ = page;
+		_tmp314_ = page;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp327_ = R;
+		_tmp315_ = R;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp328_ = T;
+		_tmp316_ = T;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp326_, _tmp327_, _tmp328_ - 1, p, 3);
+		page_view_get_pixel (self, _tmp314_, _tmp315_, _tmp316_ - 1, p, 3);
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp329_ = red;
+		_tmp317_ = red;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp330_ = p[0];
+		_tmp318_ = p[0];
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp331_ = r;
+		_tmp319_ = r;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp332_ = R;
+		_tmp320_ = R;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp333_ = T;
+		_tmp321_ = T;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp334_ = t;
+		_tmp322_ = t;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp329_ + ((_tmp330_ * (_tmp331_ - _tmp332_)) * (_tmp333_ - _tmp334_));
+		red = _tmp317_ + ((_tmp318_ * (_tmp319_ - _tmp320_)) * (_tmp321_ - _tmp322_));
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp335_ = green;
+		_tmp323_ = green;
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp336_ = p[1];
+		_tmp324_ = p[1];
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp337_ = r;
+		_tmp325_ = r;
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp338_ = R;
+		_tmp326_ = R;
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp339_ = T;
+		_tmp327_ = T;
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp340_ = t;
+		_tmp328_ = t;
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp335_ + ((_tmp336_ * (_tmp337_ - _tmp338_)) * (_tmp339_ - _tmp340_));
+		green = _tmp323_ + ((_tmp324_ * (_tmp325_ - _tmp326_)) * (_tmp327_ - _tmp328_));
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp341_ = blue;
+		_tmp329_ = blue;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp342_ = p[2];
+		_tmp330_ = p[2];
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp343_ = r;
+		_tmp331_ = r;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp344_ = R;
+		_tmp332_ = R;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp345_ = T;
+		_tmp333_ = T;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp346_ = t;
+		_tmp334_ = t;
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp341_ + ((_tmp342_ * (_tmp343_ - _tmp344_)) * (_tmp345_ - _tmp346_));
-#line 2537 "page-view.c"
+		blue = _tmp329_ + ((_tmp330_ * (_tmp331_ - _tmp332_)) * (_tmp333_ - _tmp334_));
+#line 2484 "page-view.c"
 	}
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp348_ = r;
+	_tmp336_ = r;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp349_ = R;
+	_tmp337_ = R;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp348_ != ((gdouble) _tmp349_)) {
-#line 2545 "page-view.c"
-		gdouble _tmp350_ = 0.0;
-		gint _tmp351_ = 0;
+	if (_tmp336_ != ((gdouble) _tmp337_)) {
+#line 2492 "page-view.c"
+		gdouble _tmp338_ = 0.0;
+		gint _tmp339_ = 0;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp350_ = b;
+		_tmp338_ = b;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp351_ = B;
+		_tmp339_ = B;
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp347_ = _tmp350_ != ((gdouble) _tmp351_);
-#line 2554 "page-view.c"
+		_tmp335_ = _tmp338_ != ((gdouble) _tmp339_);
+#line 2501 "page-view.c"
 	} else {
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp347_ = FALSE;
-#line 2558 "page-view.c"
+		_tmp335_ = FALSE;
+#line 2505 "page-view.c"
 	}
 #line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp352_ = _tmp347_;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp352_) {
-#line 2564 "page-view.c"
+	if (_tmp335_) {
+#line 2509 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp353_ = NULL;
+		Page* _tmp340_ = NULL;
+		gint _tmp341_ = 0;
+		gint _tmp342_ = 0;
+		gdouble _tmp343_ = 0.0;
+		guchar _tmp344_ = '\0';
+		gdouble _tmp345_ = 0.0;
+		gint _tmp346_ = 0;
+		gdouble _tmp347_ = 0.0;
+		gint _tmp348_ = 0;
+		gdouble _tmp349_ = 0.0;
+		guchar _tmp350_ = '\0';
+		gdouble _tmp351_ = 0.0;
+		gint _tmp352_ = 0;
+		gdouble _tmp353_ = 0.0;
 		gint _tmp354_ = 0;
-		gint _tmp355_ = 0;
-		gdouble _tmp356_ = 0.0;
-		guchar _tmp357_ = '\0';
-		gdouble _tmp358_ = 0.0;
-		gint _tmp359_ = 0;
-		gdouble _tmp360_ = 0.0;
-		gint _tmp361_ = 0;
-		gdouble _tmp362_ = 0.0;
-		guchar _tmp363_ = '\0';
-		gdouble _tmp364_ = 0.0;
-		gint _tmp365_ = 0;
-		gdouble _tmp366_ = 0.0;
-		gint _tmp367_ = 0;
-		gdouble _tmp368_ = 0.0;
-		guchar _tmp369_ = '\0';
-		gdouble _tmp370_ = 0.0;
-		gint _tmp371_ = 0;
-		gdouble _tmp372_ = 0.0;
-		gint _tmp373_ = 0;
+		gdouble _tmp355_ = 0.0;
+		guchar _tmp356_ = '\0';
+		gdouble _tmp357_ = 0.0;
+		gint _tmp358_ = 0;
+		gdouble _tmp359_ = 0.0;
+		gint _tmp360_ = 0;
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp353_ = page;
+		_tmp340_ = page;
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp354_ = R;
+		_tmp341_ = R;
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp355_ = B;
+		_tmp342_ = B;
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp353_, _tmp354_, _tmp355_, p, 3);
+		page_view_get_pixel (self, _tmp340_, _tmp341_, _tmp342_, p, 3);
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp356_ = red;
+		_tmp343_ = red;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp357_ = p[0];
+		_tmp344_ = p[0];
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp358_ = r;
+		_tmp345_ = r;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp359_ = R;
+		_tmp346_ = R;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp360_ = b;
+		_tmp347_ = b;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp361_ = B;
+		_tmp348_ = B;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp356_ + ((_tmp357_ * (_tmp358_ - _tmp359_)) * (_tmp360_ - _tmp361_));
+		red = _tmp343_ + ((_tmp344_ * (_tmp345_ - _tmp346_)) * (_tmp347_ - _tmp348_));
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp362_ = green;
+		_tmp349_ = green;
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp363_ = p[1];
+		_tmp350_ = p[1];
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp364_ = r;
+		_tmp351_ = r;
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp365_ = R;
+		_tmp352_ = R;
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp366_ = b;
+		_tmp353_ = b;
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp367_ = B;
+		_tmp354_ = B;
 #line 386 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp362_ + ((_tmp363_ * (_tmp364_ - _tmp365_)) * (_tmp366_ - _tmp367_));
+		green = _tmp349_ + ((_tmp350_ * (_tmp351_ - _tmp352_)) * (_tmp353_ - _tmp354_));
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp368_ = blue;
+		_tmp355_ = blue;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp369_ = p[2];
+		_tmp356_ = p[2];
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp370_ = r;
+		_tmp357_ = r;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp371_ = R;
+		_tmp358_ = R;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp372_ = b;
+		_tmp359_ = b;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp373_ = B;
+		_tmp360_ = B;
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp368_ + ((_tmp369_ * (_tmp370_ - _tmp371_)) * (_tmp372_ - _tmp373_));
-#line 2637 "page-view.c"
+		blue = _tmp355_ + ((_tmp356_ * (_tmp357_ - _tmp358_)) * (_tmp359_ - _tmp360_));
+#line 2582 "page-view.c"
 	}
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp375_ = l;
+	_tmp362_ = l;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp376_ = L;
+	_tmp363_ = L;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp375_ != ((gdouble) _tmp376_)) {
-#line 2645 "page-view.c"
-		gdouble _tmp377_ = 0.0;
-		gint _tmp378_ = 0;
+	if (_tmp362_ != ((gdouble) _tmp363_)) {
+#line 2590 "page-view.c"
+		gdouble _tmp364_ = 0.0;
+		gint _tmp365_ = 0;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp377_ = b;
+		_tmp364_ = b;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp378_ = B;
+		_tmp365_ = B;
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp374_ = _tmp377_ != ((gdouble) _tmp378_);
-#line 2654 "page-view.c"
+		_tmp361_ = _tmp364_ != ((gdouble) _tmp365_);
+#line 2599 "page-view.c"
 	} else {
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp374_ = FALSE;
-#line 2658 "page-view.c"
+		_tmp361_ = FALSE;
+#line 2603 "page-view.c"
 	}
 #line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp379_ = _tmp374_;
-#line 389 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp379_) {
-#line 2664 "page-view.c"
+	if (_tmp361_) {
+#line 2607 "page-view.c"
 		guchar p[3] = {0};
-		Page* _tmp380_ = NULL;
-		gint _tmp381_ = 0;
-		gint _tmp382_ = 0;
-		gdouble _tmp383_ = 0.0;
-		guchar _tmp384_ = '\0';
-		gint _tmp385_ = 0;
-		gdouble _tmp386_ = 0.0;
-		gdouble _tmp387_ = 0.0;
-		gint _tmp388_ = 0;
-		gdouble _tmp389_ = 0.0;
-		guchar _tmp390_ = '\0';
-		gint _tmp391_ = 0;
-		gdouble _tmp392_ = 0.0;
-		gdouble _tmp393_ = 0.0;
-		gint _tmp394_ = 0;
-		gdouble _tmp395_ = 0.0;
-		guchar _tmp396_ = '\0';
-		gint _tmp397_ = 0;
-		gdouble _tmp398_ = 0.0;
-		gdouble _tmp399_ = 0.0;
-		gint _tmp400_ = 0;
+		Page* _tmp366_ = NULL;
+		gint _tmp367_ = 0;
+		gint _tmp368_ = 0;
+		gdouble _tmp369_ = 0.0;
+		guchar _tmp370_ = '\0';
+		gint _tmp371_ = 0;
+		gdouble _tmp372_ = 0.0;
+		gdouble _tmp373_ = 0.0;
+		gint _tmp374_ = 0;
+		gdouble _tmp375_ = 0.0;
+		guchar _tmp376_ = '\0';
+		gint _tmp377_ = 0;
+		gdouble _tmp378_ = 0.0;
+		gdouble _tmp379_ = 0.0;
+		gint _tmp380_ = 0;
+		gdouble _tmp381_ = 0.0;
+		guchar _tmp382_ = '\0';
+		gint _tmp383_ = 0;
+		gdouble _tmp384_ = 0.0;
+		gdouble _tmp385_ = 0.0;
+		gint _tmp386_ = 0;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp380_ = page;
+		_tmp366_ = page;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp381_ = L;
+		_tmp367_ = L;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp382_ = B;
+		_tmp368_ = B;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_view_get_pixel (self, _tmp380_, _tmp381_ - 1, _tmp382_, p, 3);
+		page_view_get_pixel (self, _tmp366_, _tmp367_ - 1, _tmp368_, p, 3);
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp383_ = red;
+		_tmp369_ = red;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp384_ = p[0];
+		_tmp370_ = p[0];
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp385_ = L;
+		_tmp371_ = L;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp386_ = l;
+		_tmp372_ = l;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp387_ = b;
+		_tmp373_ = b;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp388_ = B;
+		_tmp374_ = B;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		red = _tmp383_ + ((_tmp384_ * (_tmp385_ - _tmp386_)) * (_tmp387_ - _tmp388_));
+		red = _tmp369_ + ((_tmp370_ * (_tmp371_ - _tmp372_)) * (_tmp373_ - _tmp374_));
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp389_ = green;
+		_tmp375_ = green;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp390_ = p[1];
+		_tmp376_ = p[1];
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp391_ = L;
+		_tmp377_ = L;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp392_ = l;
+		_tmp378_ = l;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp393_ = b;
+		_tmp379_ = b;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp394_ = B;
+		_tmp380_ = B;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		green = _tmp389_ + ((_tmp390_ * (_tmp391_ - _tmp392_)) * (_tmp393_ - _tmp394_));
+		green = _tmp375_ + ((_tmp376_ * (_tmp377_ - _tmp378_)) * (_tmp379_ - _tmp380_));
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp395_ = blue;
+		_tmp381_ = blue;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp396_ = p[2];
+		_tmp382_ = p[2];
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp397_ = L;
+		_tmp383_ = L;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp398_ = l;
+		_tmp384_ = l;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp399_ = b;
+		_tmp385_ = b;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp400_ = B;
+		_tmp386_ = B;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		blue = _tmp395_ + ((_tmp396_ * (_tmp397_ - _tmp398_)) * (_tmp399_ - _tmp400_));
-#line 2737 "page-view.c"
+		blue = _tmp381_ + ((_tmp382_ * (_tmp383_ - _tmp384_)) * (_tmp385_ - _tmp386_));
+#line 2680 "page-view.c"
 	}
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp401_ = r;
+	_tmp387_ = r;
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp402_ = l;
+	_tmp388_ = l;
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp403_ = b;
+	_tmp389_ = b;
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp404_ = t;
+	_tmp390_ = t;
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	scale = 1.0 / ((_tmp401_ - _tmp402_) * (_tmp403_ - _tmp404_));
+	scale = 1.0 / ((_tmp387_ - _tmp388_) * (_tmp389_ - _tmp390_));
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp405_ = output;
+	_tmp391_ = output;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp405__length1 = output_length1;
+	_tmp391__length1 = output_length1;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp406_ = offset;
+	_tmp392_ = offset;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp407_ = red;
+	_tmp393_ = red;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp408_ = scale;
+	_tmp394_ = scale;
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp405_[_tmp406_] = (guchar) ((_tmp407_ * _tmp408_) + 0.5);
+	_tmp391_[_tmp392_] = (guchar) ((_tmp393_ * _tmp394_) + 0.5);
 #line 400 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp409_ = _tmp405_[_tmp406_];
+	_tmp395_ = _tmp391_[_tmp392_];
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp410_ = output;
+	_tmp396_ = output;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp410__length1 = output_length1;
+	_tmp396__length1 = output_length1;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp411_ = offset;
+	_tmp397_ = offset;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp412_ = green;
+	_tmp398_ = green;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp413_ = scale;
+	_tmp399_ = scale;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp410_[_tmp411_ + 1] = (guchar) ((_tmp412_ * _tmp413_) + 0.5);
+	_tmp396_[_tmp397_ + 1] = (guchar) ((_tmp398_ * _tmp399_) + 0.5);
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp414_ = _tmp410_[_tmp411_ + 1];
+	_tmp400_ = _tmp396_[_tmp397_ + 1];
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp415_ = output;
+	_tmp401_ = output;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp415__length1 = output_length1;
+	_tmp401__length1 = output_length1;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp416_ = offset;
+	_tmp402_ = offset;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp417_ = blue;
+	_tmp403_ = blue;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp418_ = scale;
+	_tmp404_ = scale;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp415_[_tmp416_ + 2] = (guchar) ((_tmp417_ * _tmp418_) + 0.5);
+	_tmp401_[_tmp402_ + 2] = (guchar) ((_tmp403_ * _tmp404_) + 0.5);
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp419_ = _tmp415_[_tmp416_ + 2];
-#line 2791 "page-view.c"
+	_tmp405_ = _tmp401_[_tmp402_ + 2];
+#line 2734 "page-view.c"
 }
 
 
@@ -2807,34 +2750,33 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 	GdkPixbuf* _tmp8_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp18_ = FALSE;
-	gint _tmp60_ = 0;
+	gint _tmp58_ = 0;
+	gint _tmp59_ = 0;
 	gint _tmp61_ = 0;
-	gint _tmp63_ = 0;
+	gint _tmp62_ = 0;
 	gint _tmp64_ = 0;
+	gint _tmp65_ = 0;
 	gint _tmp66_ = 0;
 	gint _tmp67_ = 0;
 	gint _tmp68_ = 0;
 	gint _tmp69_ = 0;
-	gint _tmp70_ = 0;
-	gint _tmp71_ = 0;
-	GdkPixbuf* _tmp72_ = NULL;
+	GdkPixbuf* _tmp70_ = NULL;
 	guchar* output = NULL;
-	GdkPixbuf* _tmp73_ = NULL;
-	guint8* _tmp74_ = NULL;
+	GdkPixbuf* _tmp71_ = NULL;
+	guint8* _tmp72_ = NULL;
 	gint output_length1 = 0;
 	gint _output_size_ = 0;
 	gint output_rowstride = 0;
-	GdkPixbuf* _tmp75_ = NULL;
-	gint _tmp76_ = 0;
-	gint _tmp77_ = 0;
+	GdkPixbuf* _tmp73_ = NULL;
+	gint _tmp74_ = 0;
+	gint _tmp75_ = 0;
 	gint output_n_channels = 0;
-	GdkPixbuf* _tmp78_ = NULL;
-	gint _tmp79_ = 0;
-	Page* _tmp80_ = NULL;
+	GdkPixbuf* _tmp76_ = NULL;
+	gint _tmp77_ = 0;
+	gint _tmp78_ = 0;
+	Page* _tmp79_ = NULL;
+	gboolean _tmp80_ = FALSE;
 	gboolean _tmp81_ = FALSE;
-	gboolean _tmp82_ = FALSE;
 #line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 405 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -2861,7 +2803,7 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 	if (_tmp8_ == NULL) {
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = TRUE;
-#line 2865 "page-view.c"
+#line 2807 "page-view.c"
 	} else {
 		GdkPixbuf* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
@@ -2877,149 +2819,147 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 		_tmp12_ = output_width;
 #line 414 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp7_ = _tmp11_ != _tmp12_;
-#line 2881 "page-view.c"
+#line 2823 "page-view.c"
 	}
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = _tmp7_;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp13_) {
+	if (_tmp7_) {
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp6_ = TRUE;
-#line 2889 "page-view.c"
+#line 2829 "page-view.c"
 	} else {
-		GdkPixbuf* _tmp14_ = NULL;
+		GdkPixbuf* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
 		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp14_ = *output_image;
+		_tmp13_ = *output_image;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp15_ = gdk_pixbuf_get_height (_tmp14_);
+		_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp17_ = output_height;
+		_tmp16_ = output_height;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp6_ = _tmp16_ != _tmp17_;
-#line 2905 "page-view.c"
+		_tmp6_ = _tmp15_ != _tmp16_;
+#line 2845 "page-view.c"
 	}
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = _tmp6_;
-#line 413 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp18_) {
-#line 2911 "page-view.c"
-		gint _tmp19_ = 0;
+	if (_tmp6_) {
+#line 2849 "page-view.c"
+		gint _tmp17_ = 0;
+		gint _tmp18_ = 0;
+		GdkPixbuf* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
-		GdkPixbuf* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
+		gint _tmp21_ = 0;
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp19_ = output_width;
+		_tmp17_ = output_width;
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp20_ = output_height;
+		_tmp18_ = output_height;
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp21_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp19_, _tmp20_);
+		_tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp17_, _tmp18_);
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (*output_image);
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		*output_image = _tmp21_;
+		*output_image = _tmp19_;
 #line 424 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		L = 0;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp22_ = output_width;
+		_tmp20_ = output_width;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		R = _tmp22_ - 1;
+		R = _tmp20_ - 1;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		T = 0;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp23_ = output_height;
+		_tmp21_ = output_height;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		B = _tmp23_ - 1;
-#line 2939 "page-view.c"
+		B = _tmp21_ - 1;
+#line 2877 "page-view.c"
 	} else {
-		ScanDirection _tmp24_ = 0;
+		ScanDirection _tmp22_ = 0;
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp24_ = scan_direction;
+		_tmp22_ = scan_direction;
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		switch (_tmp24_) {
+		switch (_tmp22_) {
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 2948 "page-view.c"
+#line 2886 "page-view.c"
 			{
+				gint _tmp23_ = 0;
+				gint _tmp24_ = 0;
 				gint _tmp25_ = 0;
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
 				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
-				gint _tmp31_ = 0;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp25_ = output_width;
+				_tmp23_ = output_width;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp25_ - 1;
+				R = _tmp23_ - 1;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp26_ = old_scan_line;
+				_tmp24_ = old_scan_line;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp27_ = output_height;
+				_tmp25_ = output_height;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp28_ = input_height;
+				_tmp26_ = input_height;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = (gint) ((((gdouble) _tmp26_) * _tmp27_) / _tmp28_);
+				T = (gint) ((((gdouble) _tmp24_) * _tmp25_) / _tmp26_);
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp29_ = scan_line;
+				_tmp27_ = scan_line;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp30_ = output_height;
+				_tmp28_ = output_height;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp31_ = input_height;
+				_tmp29_ = input_height;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = (gint) (((((gdouble) _tmp29_) * _tmp30_) / _tmp31_) + 0.5);
+				B = (gint) (((((gdouble) _tmp27_) * _tmp28_) / _tmp29_) + 0.5);
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 2981 "page-view.c"
+#line 2919 "page-view.c"
 			}
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 2985 "page-view.c"
+#line 2923 "page-view.c"
 			{
+				gint _tmp30_ = 0;
+				gint _tmp31_ = 0;
 				gint _tmp32_ = 0;
 				gint _tmp33_ = 0;
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
 				gint _tmp36_ = 0;
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp32_ = old_scan_line;
+				_tmp30_ = old_scan_line;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp33_ = output_width;
+				_tmp31_ = output_width;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp34_ = input_width;
+				_tmp32_ = input_width;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = (gint) ((((gdouble) _tmp32_) * _tmp33_) / _tmp34_);
+				L = (gint) ((((gdouble) _tmp30_) * _tmp31_) / _tmp32_);
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp35_ = scan_line;
+				_tmp33_ = scan_line;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp36_ = output_width;
+				_tmp34_ = output_width;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp37_ = input_width;
+				_tmp35_ = input_width;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = (gint) (((((gdouble) _tmp35_) * _tmp36_) / _tmp37_) + 0.5);
+				R = (gint) (((((gdouble) _tmp33_) * _tmp34_) / _tmp35_) + 0.5);
 #line 443 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp38_ = output_height;
+				_tmp36_ = output_height;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp38_ - 1;
+				B = _tmp36_ - 1;
 #line 445 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3018 "page-view.c"
+#line 2956 "page-view.c"
 			}
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 3022 "page-view.c"
+#line 2960 "page-view.c"
 			{
+				gint _tmp37_ = 0;
+				gint _tmp38_ = 0;
 				gint _tmp39_ = 0;
 				gint _tmp40_ = 0;
 				gint _tmp41_ = 0;
@@ -3027,42 +2967,42 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp43_ = 0;
 				gint _tmp44_ = 0;
 				gint _tmp45_ = 0;
-				gint _tmp46_ = 0;
-				gint _tmp47_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				L = 0;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp39_ = output_width;
+				_tmp37_ = output_width;
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp39_ - 1;
+				R = _tmp37_ - 1;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp40_ = input_height;
+				_tmp38_ = input_height;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp41_ = scan_line;
+				_tmp39_ = scan_line;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp42_ = output_height;
+				_tmp40_ = output_height;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp43_ = input_height;
+				_tmp41_ = input_height;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				T = (gint) ((((gdouble) (_tmp40_ - _tmp41_)) * _tmp42_) / _tmp43_);
+				T = (gint) ((((gdouble) (_tmp38_ - _tmp39_)) * _tmp40_) / _tmp41_);
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp44_ = input_height;
+				_tmp42_ = input_height;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp45_ = old_scan_line;
+				_tmp43_ = old_scan_line;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp46_ = output_height;
+				_tmp44_ = output_height;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp47_ = input_height;
+				_tmp45_ = input_height;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = (gint) (((((gdouble) (_tmp44_ - _tmp45_)) * _tmp46_) / _tmp47_) + 0.5);
+				B = (gint) (((((gdouble) (_tmp42_ - _tmp43_)) * _tmp44_) / _tmp45_) + 0.5);
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3061 "page-view.c"
+#line 2999 "page-view.c"
 			}
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 3065 "page-view.c"
+#line 3003 "page-view.c"
 			{
+				gint _tmp46_ = 0;
+				gint _tmp47_ = 0;
 				gint _tmp48_ = 0;
 				gint _tmp49_ = 0;
 				gint _tmp50_ = 0;
@@ -3070,290 +3010,284 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 				gint _tmp52_ = 0;
 				gint _tmp53_ = 0;
 				gint _tmp54_ = 0;
-				gint _tmp55_ = 0;
-				gint _tmp56_ = 0;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp48_ = input_width;
+				_tmp46_ = input_width;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp49_ = scan_line;
+				_tmp47_ = scan_line;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp50_ = output_width;
+				_tmp48_ = output_width;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp51_ = input_width;
+				_tmp49_ = input_width;
 #line 453 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = (gint) ((((gdouble) (_tmp48_ - _tmp49_)) * _tmp50_) / _tmp51_);
+				L = (gint) ((((gdouble) (_tmp46_ - _tmp47_)) * _tmp48_) / _tmp49_);
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp52_ = input_width;
+				_tmp50_ = input_width;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp53_ = old_scan_line;
+				_tmp51_ = old_scan_line;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp54_ = output_width;
+				_tmp52_ = output_width;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp55_ = input_width;
+				_tmp53_ = input_width;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = (gint) (((((gdouble) (_tmp52_ - _tmp53_)) * _tmp54_) / _tmp55_) + 0.5);
+				R = (gint) (((((gdouble) (_tmp50_ - _tmp51_)) * _tmp52_) / _tmp53_) + 0.5);
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp56_ = output_height;
+				_tmp54_ = output_height;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp56_ - 1;
+				B = _tmp54_ - 1;
 #line 457 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3104 "page-view.c"
+#line 3042 "page-view.c"
 			}
 			default:
 			{
+				gint _tmp55_ = 0;
+				gint _tmp56_ = 0;
 				gint _tmp57_ = 0;
-				gint _tmp58_ = 0;
-				gint _tmp59_ = 0;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				T = 0;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp57_ = T;
+				_tmp55_ = T;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				B = _tmp57_;
+				B = _tmp55_;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp58_ = B;
+				_tmp56_ = B;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				R = _tmp58_;
+				R = _tmp56_;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp59_ = R;
+				_tmp57_ = R;
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				L = _tmp59_;
+				L = _tmp57_;
 #line 460 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 3127 "page-view.c"
+#line 3065 "page-view.c"
 			}
 		}
 	}
 #line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp60_ = R;
+	_tmp58_ = R;
 #line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp61_ = output_width;
+	_tmp59_ = output_width;
 #line 465 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp60_ >= _tmp61_) {
-#line 3137 "page-view.c"
-		gint _tmp62_ = 0;
+	if (_tmp58_ >= _tmp59_) {
+#line 3075 "page-view.c"
+		gint _tmp60_ = 0;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp62_ = output_width;
+		_tmp60_ = output_width;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		R = _tmp62_ - 1;
-#line 3143 "page-view.c"
+		R = _tmp60_ - 1;
+#line 3081 "page-view.c"
 	}
 #line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp63_ = B;
+	_tmp61_ = B;
 #line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp64_ = output_height;
+	_tmp62_ = output_height;
 #line 467 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp63_ >= _tmp64_) {
-#line 3151 "page-view.c"
-		gint _tmp65_ = 0;
+	if (_tmp61_ >= _tmp62_) {
+#line 3089 "page-view.c"
+		gint _tmp63_ = 0;
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp65_ = output_height;
+		_tmp63_ = output_height;
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		B = _tmp65_ - 1;
-#line 3157 "page-view.c"
+		B = _tmp63_ - 1;
+#line 3095 "page-view.c"
 	}
 #line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp66_ = L;
+	_tmp64_ = L;
 #line 470 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp66_ >= 0);
+	g_return_if_fail (_tmp64_ >= 0);
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp67_ = R;
+	_tmp65_ = R;
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp68_ = output_width;
+	_tmp66_ = output_width;
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp67_ < _tmp68_);
+	g_return_if_fail (_tmp65_ < _tmp66_);
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp69_ = T;
+	_tmp67_ = T;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp69_ >= 0);
+	g_return_if_fail (_tmp67_ >= 0);
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp70_ = B;
+	_tmp68_ = B;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = output_height;
+	_tmp69_ = output_height;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp70_ < _tmp71_);
+	g_return_if_fail (_tmp68_ < _tmp69_);
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = *output_image;
+	_tmp70_ = *output_image;
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (_tmp72_ != NULL);
+	g_return_if_fail (_tmp70_ != NULL);
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = *output_image;
+	_tmp71_ = *output_image;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp74_ = gdk_pixbuf_get_pixels (_tmp73_);
+	_tmp72_ = gdk_pixbuf_get_pixels (_tmp71_);
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output = _tmp74_;
+	output = _tmp72_;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	output_length1 = -1;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_output_size_ = output_length1;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp75_ = *output_image;
+	_tmp73_ = *output_image;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp76_ = gdk_pixbuf_get_rowstride (_tmp75_);
+	_tmp74_ = gdk_pixbuf_get_rowstride (_tmp73_);
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp77_ = _tmp76_;
+	_tmp75_ = _tmp74_;
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output_rowstride = _tmp77_;
+	output_rowstride = _tmp75_;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp78_ = *output_image;
+	_tmp76_ = *output_image;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp79_ = gdk_pixbuf_get_n_channels (_tmp78_);
+	_tmp77_ = gdk_pixbuf_get_n_channels (_tmp76_);
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	output_n_channels = _tmp79_;
+	_tmp78_ = _tmp77_;
+#line 478 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	output_n_channels = _tmp78_;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp80_ = page;
+	_tmp79_ = page;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp81_ = page_get_has_data (_tmp80_);
+	_tmp80_ = page_get_has_data (_tmp79_);
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp82_ = _tmp81_;
+	_tmp81_ = _tmp80_;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (!_tmp82_) {
-#line 3215 "page-view.c"
+	if (!_tmp81_) {
+#line 3155 "page-view.c"
 		{
 			gint x = 0;
-			gint _tmp83_ = 0;
+			gint _tmp82_ = 0;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp83_ = L;
+			_tmp82_ = L;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			x = _tmp83_;
-#line 3223 "page-view.c"
+			x = _tmp82_;
+#line 3163 "page-view.c"
 			{
-				gboolean _tmp84_ = FALSE;
+				gboolean _tmp83_ = FALSE;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp84_ = TRUE;
+				_tmp83_ = TRUE;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
-#line 3230 "page-view.c"
-					gboolean _tmp85_ = FALSE;
-					gint _tmp87_ = 0;
-					gint _tmp88_ = 0;
+#line 3170 "page-view.c"
+					gint _tmp85_ = 0;
+					gint _tmp86_ = 0;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp85_ = _tmp84_;
+					if (!_tmp83_) {
+#line 3175 "page-view.c"
+						gint _tmp84_ = 0;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!_tmp85_) {
-#line 3238 "page-view.c"
-						gint _tmp86_ = 0;
+						_tmp84_ = x;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp86_ = x;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						x = _tmp86_ + 1;
-#line 3244 "page-view.c"
+						x = _tmp84_ + 1;
+#line 3181 "page-view.c"
 					}
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp84_ = FALSE;
+					_tmp83_ = FALSE;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp87_ = x;
+					_tmp85_ = x;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp88_ = R;
+					_tmp86_ = R;
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!(_tmp87_ <= _tmp88_)) {
+					if (!(_tmp85_ <= _tmp86_)) {
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
-#line 3256 "page-view.c"
+#line 3193 "page-view.c"
 					}
 					{
 						gint y = 0;
-						gint _tmp89_ = 0;
+						gint _tmp87_ = 0;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp89_ = T;
+						_tmp87_ = T;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						y = _tmp89_;
-#line 3265 "page-view.c"
+						y = _tmp87_;
+#line 3202 "page-view.c"
 						{
-							gboolean _tmp90_ = FALSE;
+							gboolean _tmp88_ = FALSE;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp90_ = TRUE;
+							_tmp88_ = TRUE;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 							while (TRUE) {
-#line 3272 "page-view.c"
-								gboolean _tmp91_ = FALSE;
+#line 3209 "page-view.c"
+								gint _tmp90_ = 0;
+								gint _tmp91_ = 0;
+								gint o = 0;
+								gint _tmp92_ = 0;
 								gint _tmp93_ = 0;
 								gint _tmp94_ = 0;
-								gint o = 0;
 								gint _tmp95_ = 0;
-								gint _tmp96_ = 0;
+								guchar* _tmp96_ = NULL;
+								gint _tmp96__length1 = 0;
 								gint _tmp97_ = 0;
-								gint _tmp98_ = 0;
-								guchar* _tmp99_ = NULL;
-								gint _tmp99__length1 = 0;
-								gint _tmp100_ = 0;
-								guchar* _tmp101_ = NULL;
-								gint _tmp101__length1 = 0;
-								gint _tmp102_ = 0;
-								guchar* _tmp103_ = NULL;
-								gint _tmp103__length1 = 0;
-								gint _tmp104_ = 0;
-								guchar _tmp105_ = '\0';
-								guchar _tmp106_ = '\0';
-								guchar _tmp107_ = '\0';
-#line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp91_ = _tmp90_;
+								guchar* _tmp98_ = NULL;
+								gint _tmp98__length1 = 0;
+								gint _tmp99_ = 0;
+								guchar* _tmp100_ = NULL;
+								gint _tmp100__length1 = 0;
+								gint _tmp101_ = 0;
+								guchar _tmp102_ = '\0';
+								guchar _tmp103_ = '\0';
+								guchar _tmp104_ = '\0';
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								if (!_tmp91_) {
-#line 3297 "page-view.c"
-									gint _tmp92_ = 0;
+								if (!_tmp88_) {
+#line 3231 "page-view.c"
+									gint _tmp89_ = 0;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-									_tmp92_ = y;
+									_tmp89_ = y;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-									y = _tmp92_ + 1;
-#line 3303 "page-view.c"
+									y = _tmp89_ + 1;
+#line 3237 "page-view.c"
 								}
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp90_ = FALSE;
+								_tmp88_ = FALSE;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp93_ = y;
+								_tmp90_ = y;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp94_ = B;
+								_tmp91_ = B;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								if (!(_tmp93_ <= _tmp94_)) {
+								if (!(_tmp90_ <= _tmp91_)) {
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 									break;
-#line 3315 "page-view.c"
+#line 3249 "page-view.c"
 								}
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp95_ = output_rowstride;
+								_tmp92_ = output_rowstride;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp96_ = y;
+								_tmp93_ = y;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp97_ = x;
+								_tmp94_ = x;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp98_ = output_n_channels;
+								_tmp95_ = output_n_channels;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								o = (_tmp95_ * _tmp96_) + (_tmp97_ * _tmp98_);
+								o = (_tmp92_ * _tmp93_) + (_tmp94_ * _tmp95_);
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp99_ = output;
+								_tmp96_ = output;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp99__length1 = output_length1;
+								_tmp96__length1 = output_length1;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp100_ = o;
+								_tmp97_ = o;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp101_ = output;
+								_tmp98_ = output;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp101__length1 = output_length1;
+								_tmp98__length1 = output_length1;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp102_ = o;
+								_tmp99_ = o;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp103_ = output;
+								_tmp100_ = output;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp103__length1 = output_length1;
+								_tmp100__length1 = output_length1;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp104_ = o;
+								_tmp101_ = o;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp103_[_tmp104_ + 2] = (guchar) 0xFF;
+								_tmp100_[_tmp101_ + 2] = (guchar) 0xFF;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp105_ = _tmp103_[_tmp104_ + 2];
+								_tmp102_ = _tmp100_[_tmp101_ + 2];
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp101_[_tmp102_ + 1] = _tmp105_;
+								_tmp98_[_tmp99_ + 1] = _tmp102_;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp106_ = _tmp101_[_tmp102_ + 1];
+								_tmp103_ = _tmp98_[_tmp99_ + 1];
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp99_[_tmp100_] = _tmp106_;
+								_tmp96_[_tmp97_] = _tmp103_;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp107_ = _tmp99_[_tmp100_];
-#line 3357 "page-view.c"
+								_tmp104_ = _tmp96_[_tmp97_];
+#line 3291 "page-view.c"
 							}
 						}
 					}
@@ -3362,177 +3296,171 @@ static void page_view_update_preview (PageView* self, Page* page, GdkPixbuf** ou
 		}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 3366 "page-view.c"
+#line 3300 "page-view.c"
 	}
 	{
 		gint x = 0;
-		gint _tmp108_ = 0;
+		gint _tmp105_ = 0;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp108_ = L;
+		_tmp105_ = L;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp108_;
-#line 3375 "page-view.c"
+		x = _tmp105_;
+#line 3309 "page-view.c"
 		{
-			gboolean _tmp109_ = FALSE;
+			gboolean _tmp106_ = FALSE;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp109_ = TRUE;
+			_tmp106_ = TRUE;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			while (TRUE) {
-#line 3382 "page-view.c"
-				gboolean _tmp110_ = FALSE;
+#line 3316 "page-view.c"
+				gint _tmp108_ = 0;
+				gint _tmp109_ = 0;
+				gdouble l = 0.0;
+				gint _tmp110_ = 0;
+				gint _tmp111_ = 0;
 				gint _tmp112_ = 0;
+				gdouble r = 0.0;
 				gint _tmp113_ = 0;
-				gdouble l = 0.0;
 				gint _tmp114_ = 0;
 				gint _tmp115_ = 0;
-				gint _tmp116_ = 0;
-				gdouble r = 0.0;
-				gint _tmp117_ = 0;
-				gint _tmp118_ = 0;
-				gint _tmp119_ = 0;
-#line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp110_ = _tmp109_;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!_tmp110_) {
-#line 3398 "page-view.c"
-					gint _tmp111_ = 0;
+				if (!_tmp106_) {
+#line 3329 "page-view.c"
+					gint _tmp107_ = 0;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp111_ = x;
+					_tmp107_ = x;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = _tmp111_ + 1;
-#line 3404 "page-view.c"
+					x = _tmp107_ + 1;
+#line 3335 "page-view.c"
 				}
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp109_ = FALSE;
+				_tmp106_ = FALSE;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp112_ = x;
+				_tmp108_ = x;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp113_ = R;
+				_tmp109_ = R;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				if (!(_tmp112_ <= _tmp113_)) {
+				if (!(_tmp108_ <= _tmp109_)) {
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 					break;
-#line 3416 "page-view.c"
+#line 3347 "page-view.c"
 				}
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp114_ = x;
+				_tmp110_ = x;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp115_ = input_width;
+				_tmp111_ = input_width;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp116_ = output_width;
+				_tmp112_ = output_width;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				l = (((gdouble) _tmp114_) * _tmp115_) / _tmp116_;
+				l = (((gdouble) _tmp110_) * _tmp111_) / _tmp112_;
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp117_ = x;
+				_tmp113_ = x;
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp118_ = input_width;
+				_tmp114_ = input_width;
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp119_ = output_width;
+				_tmp115_ = output_width;
 #line 495 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				r = (((gdouble) (_tmp117_ + 1)) * _tmp118_) / _tmp119_;
-#line 3434 "page-view.c"
+				r = (((gdouble) (_tmp113_ + 1)) * _tmp114_) / _tmp115_;
+#line 3365 "page-view.c"
 				{
 					gint y = 0;
-					gint _tmp120_ = 0;
+					gint _tmp116_ = 0;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp120_ = T;
+					_tmp116_ = T;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = _tmp120_;
-#line 3442 "page-view.c"
+					y = _tmp116_;
+#line 3373 "page-view.c"
 					{
-						gboolean _tmp121_ = FALSE;
+						gboolean _tmp117_ = FALSE;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp121_ = TRUE;
+						_tmp117_ = TRUE;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						while (TRUE) {
-#line 3449 "page-view.c"
-							gboolean _tmp122_ = FALSE;
+#line 3380 "page-view.c"
+							gint _tmp119_ = 0;
+							gint _tmp120_ = 0;
+							gdouble t = 0.0;
+							gint _tmp121_ = 0;
+							gint _tmp122_ = 0;
+							gint _tmp123_ = 0;
+							gdouble b = 0.0;
 							gint _tmp124_ = 0;
 							gint _tmp125_ = 0;
-							gdouble t = 0.0;
 							gint _tmp126_ = 0;
-							gint _tmp127_ = 0;
-							gint _tmp128_ = 0;
-							gdouble b = 0.0;
-							gint _tmp129_ = 0;
-							gint _tmp130_ = 0;
-							gint _tmp131_ = 0;
-							Page* _tmp132_ = NULL;
-							gdouble _tmp133_ = 0.0;
-							gdouble _tmp134_ = 0.0;
-							gdouble _tmp135_ = 0.0;
-							gdouble _tmp136_ = 0.0;
-							guchar* _tmp137_ = NULL;
-							gint _tmp137__length1 = 0;
-							gint _tmp138_ = 0;
-							gint _tmp139_ = 0;
-							gint _tmp140_ = 0;
-							gint _tmp141_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp122_ = _tmp121_;
+							Page* _tmp127_ = NULL;
+							gdouble _tmp128_ = 0.0;
+							gdouble _tmp129_ = 0.0;
+							gdouble _tmp130_ = 0.0;
+							gdouble _tmp131_ = 0.0;
+							guchar* _tmp132_ = NULL;
+							gint _tmp132__length1 = 0;
+							gint _tmp133_ = 0;
+							gint _tmp134_ = 0;
+							gint _tmp135_ = 0;
+							gint _tmp136_ = 0;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!_tmp122_) {
-#line 3476 "page-view.c"
-								gint _tmp123_ = 0;
+							if (!_tmp117_) {
+#line 3404 "page-view.c"
+								gint _tmp118_ = 0;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								_tmp123_ = y;
+								_tmp118_ = y;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-								y = _tmp123_ + 1;
-#line 3482 "page-view.c"
+								y = _tmp118_ + 1;
+#line 3410 "page-view.c"
 							}
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp121_ = FALSE;
+							_tmp117_ = FALSE;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp124_ = y;
+							_tmp119_ = y;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp125_ = B;
+							_tmp120_ = B;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							if (!(_tmp124_ <= _tmp125_)) {
+							if (!(_tmp119_ <= _tmp120_)) {
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 								break;
-#line 3494 "page-view.c"
+#line 3422 "page-view.c"
 							}
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp126_ = y;
+							_tmp121_ = y;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp127_ = input_height;
+							_tmp122_ = input_height;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp128_ = output_height;
+							_tmp123_ = output_height;
 #line 499 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							t = (((gdouble) _tmp126_) * _tmp127_) / _tmp128_;
+							t = (((gdouble) _tmp121_) * _tmp122_) / _tmp123_;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp129_ = y;
+							_tmp124_ = y;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp130_ = input_height;
+							_tmp125_ = input_height;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp131_ = output_height;
+							_tmp126_ = output_height;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							b = (((gdouble) (_tmp129_ + 1)) * _tmp130_) / _tmp131_;
+							b = (((gdouble) (_tmp124_ + 1)) * _tmp125_) / _tmp126_;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp132_ = page;
+							_tmp127_ = page;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp133_ = l;
+							_tmp128_ = l;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp134_ = r;
+							_tmp129_ = r;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp135_ = t;
+							_tmp130_ = t;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp136_ = b;
+							_tmp131_ = b;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp137_ = output;
+							_tmp132_ = output;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp137__length1 = output_length1;
+							_tmp132__length1 = output_length1;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp138_ = output_rowstride;
+							_tmp133_ = output_rowstride;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp139_ = y;
+							_tmp134_ = y;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp140_ = x;
+							_tmp135_ = x;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							_tmp141_ = output_n_channels;
+							_tmp136_ = output_n_channels;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-							page_view_set_pixel (self, _tmp132_, _tmp133_, _tmp134_, _tmp135_, _tmp136_, _tmp137_, _tmp137__length1, (_tmp138_ * _tmp139_) + (_tmp140_ * _tmp141_));
-#line 3536 "page-view.c"
+							page_view_set_pixel (self, _tmp127_, _tmp128_, _tmp129_, _tmp130_, _tmp131_, _tmp132_, _tmp132__length1, (_tmp133_ * _tmp134_) + (_tmp135_ * _tmp136_));
+#line 3464 "page-view.c"
 						}
 					}
 				}
@@ -3549,14 +3477,14 @@ static gint page_view_get_preview_width (PageView* self) {
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->width;
+	_tmp0_ = self->priv->width_;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3560 "page-view.c"
+#line 3488 "page-view.c"
 }
 
 
@@ -3567,14 +3495,14 @@ static gint page_view_get_preview_height (PageView* self) {
 #line 514 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->height;
+	_tmp0_ = self->priv->height_;
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->border_width;
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = _tmp0_ - (_tmp1_ * 2);
 #line 516 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3578 "page-view.c"
+#line 3506 "page-view.c"
 }
 
 
@@ -3593,19 +3521,18 @@ static void page_view_update_page_view (PageView* self) {
 	ScanDirection _tmp8_ = 0;
 	gboolean _tmp9_ = FALSE;
 	ScanDirection _tmp10_ = 0;
-	gboolean _tmp12_ = FALSE;
-	Page* _tmp13_ = NULL;
+	Page* _tmp12_ = NULL;
+	ScanDirection _tmp13_ = 0;
 	ScanDirection _tmp14_ = 0;
-	ScanDirection _tmp15_ = 0;
-	Page* _tmp16_ = NULL;
+	Page* _tmp15_ = NULL;
+	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	Page* _tmp19_ = NULL;
+	Page* _tmp18_ = NULL;
+	ScanDirection _tmp19_ = 0;
 	ScanDirection _tmp20_ = 0;
-	ScanDirection _tmp21_ = 0;
+	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
 	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 521 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -3614,7 +3541,7 @@ static void page_view_update_page_view (PageView* self) {
 	if (!_tmp0_) {
 #line 522 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 3618 "page-view.c"
+#line 3545 "page-view.c"
 	}
 #line 524 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp1_ = self->priv->scan_line;
@@ -3642,61 +3569,59 @@ static void page_view_update_page_view (PageView* self) {
 	_tmp10_ = left_steps;
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp10_ != 0) {
-#line 3646 "page-view.c"
+#line 3573 "page-view.c"
 		GdkPixbuf* _tmp11_ = NULL;
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp11_ = self->priv->image;
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = _tmp11_ != NULL;
-#line 3652 "page-view.c"
+#line 3579 "page-view.c"
 	} else {
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp9_ = FALSE;
-#line 3656 "page-view.c"
+#line 3583 "page-view.c"
 	}
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = _tmp9_;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp12_) {
+	if (_tmp9_) {
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_object_unref0 (self->priv->image);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->image = NULL;
-#line 3666 "page-view.c"
+#line 3591 "page-view.c"
 	}
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = self->priv->_page;
+	_tmp12_ = self->priv->_page;
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = page_get_scan_direction (_tmp13_);
+	_tmp13_ = page_get_scan_direction (_tmp12_);
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 531 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->scan_direction = _tmp15_;
+	self->priv->scan_direction = _tmp14_;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp16_ = self->priv->_page;
+	_tmp15_ = self->priv->_page;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp17_ = page_view_get_preview_width (self);
+	_tmp16_ = page_view_get_preview_width (self);
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp18_ = page_view_get_preview_height (self);
+	_tmp17_ = page_view_get_preview_height (self);
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp19_ = self->priv->_page;
+	_tmp18_ = self->priv->_page;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp20_ = page_get_scan_direction (_tmp19_);
+	_tmp19_ = page_get_scan_direction (_tmp18_);
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp21_ = _tmp20_;
+	_tmp20_ = _tmp19_;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp22_ = old_scan_line;
+	_tmp21_ = old_scan_line;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp23_ = scan_line;
+	_tmp22_ = scan_line;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_update_preview (self, _tmp16_, &self->priv->image, _tmp17_, _tmp18_, _tmp21_, _tmp22_, _tmp23_);
+	page_view_update_preview (self, _tmp15_, &self->priv->image, _tmp16_, _tmp17_, _tmp20_, _tmp21_, _tmp22_);
 #line 539 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = FALSE;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp24_ = scan_line;
+	_tmp23_ = scan_line;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->scan_line = _tmp24_;
-#line 3700 "page-view.c"
+	self->priv->scan_line = _tmp23_;
+#line 3625 "page-view.c"
 }
 
 
@@ -3723,7 +3648,7 @@ static gint page_view_page_to_screen_x (PageView* self, gint x) {
 	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3727 "page-view.c"
+#line 3652 "page-view.c"
 }
 
 
@@ -3750,7 +3675,7 @@ static gint page_view_page_to_screen_y (PageView* self, gint y) {
 	result = (gint) (((((gdouble) _tmp0_) * _tmp1_) / _tmp4_) + 0.5);
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3754 "page-view.c"
+#line 3679 "page-view.c"
 }
 
 
@@ -3777,7 +3702,7 @@ static gint page_view_screen_to_page_x (PageView* self, gint x) {
 	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
 #line 555 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3781 "page-view.c"
+#line 3706 "page-view.c"
 }
 
 
@@ -3804,7 +3729,7 @@ static gint page_view_screen_to_page_y (PageView* self, gint y) {
 	result = (gint) (((((gdouble) _tmp0_) * _tmp3_) / _tmp4_) + 0.5);
 #line 560 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 3808 "page-view.c"
+#line 3733 "page-view.c"
 }
 
 
@@ -3851,48 +3776,41 @@ static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y)
 	gboolean _tmp28_ = FALSE;
 	gboolean _tmp29_ = FALSE;
 	gint _tmp30_ = 0;
-	gboolean _tmp33_ = FALSE;
-	gboolean _tmp35_ = FALSE;
-	gboolean _tmp38_ = FALSE;
 	gchar* name = NULL;
-	Page* _tmp39_ = NULL;
+	Page* _tmp36_ = NULL;
+	const gchar* _tmp37_ = NULL;
+	const gchar* _tmp38_ = NULL;
+	gchar* _tmp39_ = NULL;
 	const gchar* _tmp40_ = NULL;
-	const gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
 	gint crop_border = 0;
+	gint _tmp41_ = 0;
+	gint _tmp42_ = 0;
 	gint _tmp44_ = 0;
 	gint _tmp45_ = 0;
-	gint _tmp47_ = 0;
+	gboolean _tmp47_ = FALSE;
 	gint _tmp48_ = 0;
-	gboolean _tmp50_ = FALSE;
-	gint _tmp51_ = 0;
-	gint _tmp52_ = 0;
-	gboolean _tmp55_ = FALSE;
-	gboolean _tmp56_ = FALSE;
-	gint _tmp57_ = 0;
-	gint _tmp58_ = 0;
+	gint _tmp49_ = 0;
+	gboolean _tmp52_ = FALSE;
+	gint _tmp53_ = 0;
+	gint _tmp54_ = 0;
+	gint _tmp55_ = 0;
+	gboolean _tmp58_ = FALSE;
 	gint _tmp59_ = 0;
-	gboolean _tmp62_ = FALSE;
-	gboolean _tmp63_ = FALSE;
-	gint _tmp64_ = 0;
+	gint _tmp60_ = 0;
+	gboolean _tmp64_ = FALSE;
 	gint _tmp65_ = 0;
-	gboolean _tmp69_ = FALSE;
-	gboolean _tmp70_ = FALSE;
+	gint _tmp66_ = 0;
+	gint _tmp67_ = 0;
 	gint _tmp71_ = 0;
 	gint _tmp72_ = 0;
 	gint _tmp73_ = 0;
-	gboolean _tmp77_ = FALSE;
+	gint _tmp74_ = 0;
+	gint _tmp75_ = 0;
+	gint _tmp76_ = 0;
+	gint _tmp77_ = 0;
 	gint _tmp78_ = 0;
 	gint _tmp79_ = 0;
 	gint _tmp80_ = 0;
-	gint _tmp81_ = 0;
-	gint _tmp82_ = 0;
-	gint _tmp83_ = 0;
-	gint _tmp84_ = 0;
-	gint _tmp85_ = 0;
-	gint _tmp86_ = 0;
-	gint _tmp87_ = 0;
 #line 563 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -3907,7 +3825,7 @@ static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y)
 		result = 0;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 3911 "page-view.c"
+#line 3829 "page-view.c"
 	}
 #line 568 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp3_ = self->priv->_page;
@@ -3983,7 +3901,7 @@ static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y)
 	if (_tmp30_ < 0) {
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = TRUE;
-#line 3987 "page-view.c"
+#line 3905 "page-view.c"
 	} else {
 		gint _tmp31_ = 0;
 		gint _tmp32_ = 0;
@@ -3993,304 +3911,290 @@ static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y)
 		_tmp32_ = dw;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = _tmp31_ > _tmp32_;
-#line 3997 "page-view.c"
+#line 3915 "page-view.c"
 	}
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp33_ = _tmp29_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp33_) {
+	if (_tmp29_) {
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp28_ = TRUE;
-#line 4005 "page-view.c"
+#line 3921 "page-view.c"
 	} else {
-		gint _tmp34_ = 0;
+		gint _tmp33_ = 0;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = iy;
+		_tmp33_ = iy;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp28_ = _tmp34_ < 0;
-#line 4012 "page-view.c"
+		_tmp28_ = _tmp33_ < 0;
+#line 3928 "page-view.c"
 	}
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp35_ = _tmp28_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp35_) {
+	if (_tmp28_) {
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp27_ = TRUE;
-#line 4020 "page-view.c"
+#line 3934 "page-view.c"
 	} else {
-		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
+		gint _tmp34_ = 0;
+		gint _tmp35_ = 0;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = iy;
+		_tmp34_ = iy;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp37_ = dh;
+		_tmp35_ = dh;
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp27_ = _tmp36_ > _tmp37_;
-#line 4030 "page-view.c"
+		_tmp27_ = _tmp34_ > _tmp35_;
+#line 3944 "page-view.c"
 	}
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp38_ = _tmp27_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp38_) {
+	if (_tmp27_) {
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_NONE;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4040 "page-view.c"
+#line 3952 "page-view.c"
 	}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp39_ = self->priv->_page;
+	_tmp36_ = self->priv->_page;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp40_ = page_get_crop_name (_tmp39_);
+	_tmp37_ = page_get_crop_name (_tmp36_);
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp41_ = _tmp40_;
+	_tmp38_ = _tmp37_;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp42_ = g_strdup (_tmp41_);
+	_tmp39_ = g_strdup (_tmp38_);
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	name = _tmp42_;
+	name = _tmp39_;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp43_ = name;
+	_tmp40_ = name;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp43_ != NULL) {
+	if (_tmp40_ != NULL) {
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_MIDDLE;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4062 "page-view.c"
+#line 3974 "page-view.c"
 	}
 #line 588 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	crop_border = 20;
 #line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp44_ = dw;
+	_tmp41_ = dw;
 #line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp45_ = crop_border;
+	_tmp42_ = crop_border;
 #line 589 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp44_ < (_tmp45_ * 3)) {
-#line 4072 "page-view.c"
-		gint _tmp46_ = 0;
+	if (_tmp41_ < (_tmp42_ * 3)) {
+#line 3984 "page-view.c"
+		gint _tmp43_ = 0;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = dw;
+		_tmp43_ = dw;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_border = _tmp46_ / 3;
-#line 4078 "page-view.c"
+		crop_border = _tmp43_ / 3;
+#line 3990 "page-view.c"
 	}
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp47_ = dh;
+	_tmp44_ = dh;
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp48_ = crop_border;
+	_tmp45_ = crop_border;
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp47_ < (_tmp48_ * 3)) {
-#line 4086 "page-view.c"
-		gint _tmp49_ = 0;
+	if (_tmp44_ < (_tmp45_ * 3)) {
+#line 3998 "page-view.c"
+		gint _tmp46_ = 0;
 #line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49_ = dh;
+		_tmp46_ = dh;
 #line 592 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_border = _tmp49_ / 3;
-#line 4092 "page-view.c"
+		crop_border = _tmp46_ / 3;
+#line 4004 "page-view.c"
 	}
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp51_ = ix;
+	_tmp48_ = ix;
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp52_ = crop_border;
+	_tmp49_ = crop_border;
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp51_ < _tmp52_) {
-#line 4100 "page-view.c"
-		gint _tmp53_ = 0;
-		gint _tmp54_ = 0;
+	if (_tmp48_ < _tmp49_) {
+#line 4012 "page-view.c"
+		gint _tmp50_ = 0;
+		gint _tmp51_ = 0;
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = iy;
+		_tmp50_ = iy;
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp54_ = crop_border;
+		_tmp51_ = crop_border;
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp50_ = _tmp53_ < _tmp54_;
-#line 4109 "page-view.c"
+		_tmp47_ = _tmp50_ < _tmp51_;
+#line 4021 "page-view.c"
 	} else {
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp50_ = FALSE;
-#line 4113 "page-view.c"
+		_tmp47_ = FALSE;
+#line 4025 "page-view.c"
 	}
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp55_ = _tmp50_;
-#line 595 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp55_) {
+	if (_tmp47_) {
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_LEFT;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4125 "page-view.c"
+#line 4035 "page-view.c"
 	}
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp57_ = ix;
+	_tmp53_ = ix;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp58_ = dw;
+	_tmp54_ = dw;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp59_ = crop_border;
+	_tmp55_ = crop_border;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp57_ > (_tmp58_ - _tmp59_)) {
-#line 4135 "page-view.c"
-		gint _tmp60_ = 0;
-		gint _tmp61_ = 0;
+	if (_tmp53_ > (_tmp54_ - _tmp55_)) {
+#line 4045 "page-view.c"
+		gint _tmp56_ = 0;
+		gint _tmp57_ = 0;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp60_ = iy;
+		_tmp56_ = iy;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp61_ = crop_border;
+		_tmp57_ = crop_border;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = _tmp60_ < _tmp61_;
-#line 4144 "page-view.c"
+		_tmp52_ = _tmp56_ < _tmp57_;
+#line 4054 "page-view.c"
 	} else {
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = FALSE;
-#line 4148 "page-view.c"
+		_tmp52_ = FALSE;
+#line 4058 "page-view.c"
 	}
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp62_ = _tmp56_;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp62_) {
+	if (_tmp52_) {
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP_RIGHT;
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4160 "page-view.c"
+#line 4068 "page-view.c"
 	}
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp64_ = ix;
+	_tmp59_ = ix;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp65_ = crop_border;
+	_tmp60_ = crop_border;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp64_ < _tmp65_) {
-#line 4168 "page-view.c"
-		gint _tmp66_ = 0;
-		gint _tmp67_ = 0;
-		gint _tmp68_ = 0;
+	if (_tmp59_ < _tmp60_) {
+#line 4076 "page-view.c"
+		gint _tmp61_ = 0;
+		gint _tmp62_ = 0;
+		gint _tmp63_ = 0;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp66_ = iy;
+		_tmp61_ = iy;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp67_ = dh;
+		_tmp62_ = dh;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp68_ = crop_border;
+		_tmp63_ = crop_border;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp63_ = _tmp66_ > (_tmp67_ - _tmp68_);
-#line 4180 "page-view.c"
+		_tmp58_ = _tmp61_ > (_tmp62_ - _tmp63_);
+#line 4088 "page-view.c"
 	} else {
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp63_ = FALSE;
-#line 4184 "page-view.c"
+		_tmp58_ = FALSE;
+#line 4092 "page-view.c"
 	}
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp69_ = _tmp63_;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp69_) {
+	if (_tmp58_) {
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_LEFT;
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4196 "page-view.c"
+#line 4102 "page-view.c"
 	}
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp71_ = ix;
+	_tmp65_ = ix;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp72_ = dw;
+	_tmp66_ = dw;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = crop_border;
+	_tmp67_ = crop_border;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp71_ > (_tmp72_ - _tmp73_)) {
-#line 4206 "page-view.c"
-		gint _tmp74_ = 0;
-		gint _tmp75_ = 0;
-		gint _tmp76_ = 0;
+	if (_tmp65_ > (_tmp66_ - _tmp67_)) {
+#line 4112 "page-view.c"
+		gint _tmp68_ = 0;
+		gint _tmp69_ = 0;
+		gint _tmp70_ = 0;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp74_ = iy;
+		_tmp68_ = iy;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp75_ = dh;
+		_tmp69_ = dh;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp76_ = crop_border;
+		_tmp70_ = crop_border;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = _tmp74_ > (_tmp75_ - _tmp76_);
-#line 4218 "page-view.c"
+		_tmp64_ = _tmp68_ > (_tmp69_ - _tmp70_);
+#line 4124 "page-view.c"
 	} else {
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp70_ = FALSE;
-#line 4222 "page-view.c"
+		_tmp64_ = FALSE;
+#line 4128 "page-view.c"
 	}
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp77_ = _tmp70_;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp77_) {
+	if (_tmp64_) {
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM_RIGHT;
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4234 "page-view.c"
+#line 4138 "page-view.c"
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp78_ = ix;
+	_tmp71_ = ix;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp79_ = crop_border;
+	_tmp72_ = crop_border;
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp78_ < _tmp79_) {
+	if (_tmp71_ < _tmp72_) {
 #line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_LEFT;
 #line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 609 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4248 "page-view.c"
+#line 4152 "page-view.c"
 	}
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp80_ = ix;
+	_tmp73_ = ix;
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp81_ = dw;
+	_tmp74_ = dw;
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp82_ = crop_border;
+	_tmp75_ = crop_border;
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp80_ > (_tmp81_ - _tmp82_)) {
+	if (_tmp73_ > (_tmp74_ - _tmp75_)) {
 #line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_RIGHT;
 #line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 612 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4264 "page-view.c"
+#line 4168 "page-view.c"
 	}
 #line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp83_ = iy;
+	_tmp76_ = iy;
 #line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp84_ = crop_border;
+	_tmp77_ = crop_border;
 #line 614 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp83_ < _tmp84_) {
+	if (_tmp76_ < _tmp77_) {
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_TOP;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4278 "page-view.c"
+#line 4182 "page-view.c"
 	}
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp85_ = iy;
+	_tmp78_ = iy;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp86_ = dh;
+	_tmp79_ = dh;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp87_ = crop_border;
+	_tmp80_ = crop_border;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp85_ > (_tmp86_ - _tmp87_)) {
+	if (_tmp78_ > (_tmp79_ - _tmp80_)) {
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		result = CROP_LOCATION_BOTTOM;
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_g_free0 (name);
 #line 618 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return result;
-#line 4294 "page-view.c"
+#line 4198 "page-view.c"
 	}
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	result = CROP_LOCATION_MIDDLE;
@@ -4298,7 +4202,7 @@ static CropLocation page_view_get_crop_location (PageView* self, gint x, gint y)
 	_g_free0 (name);
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 4302 "page-view.c"
+#line 4206 "page-view.c"
 }
 
 
@@ -4322,7 +4226,7 @@ void page_view_button_press (PageView* self, gint x, gint y) {
 	_tmp3_ = location;
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_ != CROP_LOCATION_NONE) {
-#line 4326 "page-view.c"
+#line 4230 "page-view.c"
 		CropLocation _tmp4_ = 0;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
@@ -4382,7 +4286,7 @@ void page_view_button_press (PageView* self, gint x, gint y) {
 		_tmp18_ = _tmp17_;
 #line 636 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->selected_crop_h = _tmp18_;
-#line 4386 "page-view.c"
+#line 4290 "page-view.c"
 	}
 }
 
@@ -4432,52 +4336,35 @@ void page_view_motion (PageView* self, gint x, gint y) {
 	gboolean _tmp29_ = FALSE;
 	gboolean _tmp30_ = FALSE;
 	CropLocation _tmp31_ = 0;
-	gboolean _tmp33_ = FALSE;
-	gboolean _tmp35_ = FALSE;
-	gboolean _tmp44_ = FALSE;
-	gboolean _tmp45_ = FALSE;
-	CropLocation _tmp46_ = 0;
-	gboolean _tmp48_ = FALSE;
-	gboolean _tmp50_ = FALSE;
-	gboolean _tmp59_ = FALSE;
-	gboolean _tmp60_ = FALSE;
-	CropLocation _tmp61_ = 0;
-	gboolean _tmp63_ = FALSE;
-	gboolean _tmp65_ = FALSE;
-	gboolean _tmp78_ = FALSE;
-	gboolean _tmp79_ = FALSE;
-	CropLocation _tmp80_ = 0;
-	gboolean _tmp82_ = FALSE;
-	gboolean _tmp84_ = FALSE;
-	CropLocation _tmp97_ = 0;
-	CropLocation _tmp118_ = 0;
-	gboolean _tmp123_ = FALSE;
+	gboolean _tmp42_ = FALSE;
+	gboolean _tmp43_ = FALSE;
+	CropLocation _tmp44_ = 0;
+	gboolean _tmp55_ = FALSE;
+	gboolean _tmp56_ = FALSE;
+	CropLocation _tmp57_ = 0;
+	gboolean _tmp72_ = FALSE;
+	gboolean _tmp73_ = FALSE;
+	CropLocation _tmp74_ = 0;
+	CropLocation _tmp89_ = 0;
+	CropLocation _tmp110_ = 0;
+	gboolean _tmp115_ = FALSE;
+	gboolean _tmp116_ = FALSE;
+	CropLocation _tmp117_ = 0;
 	gboolean _tmp124_ = FALSE;
-	CropLocation _tmp125_ = 0;
-	gboolean _tmp127_ = FALSE;
-	gboolean _tmp129_ = FALSE;
+	gboolean _tmp125_ = FALSE;
+	CropLocation _tmp126_ = 0;
+	gboolean _tmp133_ = FALSE;
 	gboolean _tmp134_ = FALSE;
-	gboolean _tmp135_ = FALSE;
-	CropLocation _tmp136_ = 0;
-	gboolean _tmp138_ = FALSE;
+	CropLocation _tmp135_ = 0;
 	gboolean _tmp140_ = FALSE;
-	gboolean _tmp145_ = FALSE;
-	gboolean _tmp146_ = FALSE;
-	CropLocation _tmp147_ = 0;
-	gboolean _tmp149_ = FALSE;
-	gboolean _tmp151_ = FALSE;
-	gboolean _tmp154_ = FALSE;
-	gboolean _tmp155_ = FALSE;
-	CropLocation _tmp156_ = 0;
-	gboolean _tmp158_ = FALSE;
-	gboolean _tmp160_ = FALSE;
-	Page* _tmp163_ = NULL;
-	gint _tmp164_ = 0;
-	gint _tmp165_ = 0;
-	gboolean _tmp166_ = FALSE;
-	gint _tmp167_ = 0;
-	gint _tmp168_ = 0;
-	gboolean _tmp171_ = FALSE;
+	gboolean _tmp141_ = FALSE;
+	CropLocation _tmp142_ = 0;
+	Page* _tmp147_ = NULL;
+	gint _tmp148_ = 0;
+	gint _tmp149_ = 0;
+	gboolean _tmp150_ = FALSE;
+	gint _tmp151_ = 0;
+	gint _tmp152_ = 0;
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 642 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -4494,93 +4381,93 @@ void page_view_motion (PageView* self, gint x, gint y) {
 	switch (_tmp3_) {
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_MIDDLE:
-#line 4498 "page-view.c"
+#line 4385 "page-view.c"
 		{
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_HAND1;
 #line 648 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4504 "page-view.c"
+#line 4391 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP:
-#line 4508 "page-view.c"
+#line 4395 "page-view.c"
 		{
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_SIDE;
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4514 "page-view.c"
+#line 4401 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM:
-#line 4518 "page-view.c"
+#line 4405 "page-view.c"
 		{
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_SIDE;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4524 "page-view.c"
+#line 4411 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_LEFT:
-#line 4528 "page-view.c"
+#line 4415 "page-view.c"
 		{
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_LEFT_SIDE;
 #line 657 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4534 "page-view.c"
+#line 4421 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_RIGHT:
-#line 4538 "page-view.c"
+#line 4425 "page-view.c"
 		{
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_RIGHT_SIDE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4544 "page-view.c"
+#line 4431 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_LEFT:
-#line 4548 "page-view.c"
+#line 4435 "page-view.c"
 		{
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_LEFT_CORNER;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4554 "page-view.c"
+#line 4441 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_TOP_RIGHT:
-#line 4558 "page-view.c"
+#line 4445 "page-view.c"
 		{
 #line 665 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_TOP_RIGHT_CORNER;
 #line 666 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4564 "page-view.c"
+#line 4451 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_LEFT:
-#line 4568 "page-view.c"
+#line 4455 "page-view.c"
 		{
 #line 668 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_LEFT_CORNER;
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4574 "page-view.c"
+#line 4461 "page-view.c"
 		}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		case CROP_LOCATION_BOTTOM_RIGHT:
-#line 4578 "page-view.c"
+#line 4465 "page-view.c"
 		{
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			cursor = GDK_BOTTOM_RIGHT_CORNER;
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4584 "page-view.c"
+#line 4471 "page-view.c"
 		}
 		default:
 		{
@@ -4588,14 +4475,14 @@ void page_view_motion (PageView* self, gint x, gint y) {
 			cursor = GDK_ARROW;
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			break;
-#line 4592 "page-view.c"
+#line 4479 "page-view.c"
 		}
 	}
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp4_ = self->priv->crop_location;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp4_ == CROP_LOCATION_NONE) {
-#line 4599 "page-view.c"
+#line 4486 "page-view.c"
 		GdkCursorType _tmp5_ = 0;
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp5_ = cursor;
@@ -4603,7 +4490,7 @@ void page_view_motion (PageView* self, gint x, gint y) {
 		page_view_set_cursor (self, _tmp5_);
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 4607 "page-view.c"
+#line 4494 "page-view.c"
 	}
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp6_ = self->priv->_page;
@@ -4679,678 +4566,644 @@ void page_view_motion (PageView* self, gint x, gint y) {
 	if (_tmp31_ == CROP_LOCATION_TOP_LEFT) {
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp30_ = TRUE;
-#line 4683 "page-view.c"
+#line 4570 "page-view.c"
 	} else {
 		CropLocation _tmp32_ = 0;
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp32_ = self->priv->crop_location;
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp30_ = _tmp32_ == CROP_LOCATION_LEFT;
-#line 4690 "page-view.c"
+#line 4577 "page-view.c"
 	}
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp33_ = _tmp30_;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp33_) {
+	if (_tmp30_) {
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp29_ = TRUE;
-#line 4698 "page-view.c"
+#line 4583 "page-view.c"
 	} else {
-		CropLocation _tmp34_ = 0;
+		CropLocation _tmp33_ = 0;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp34_ = self->priv->crop_location;
+		_tmp33_ = self->priv->crop_location;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp29_ = _tmp34_ == CROP_LOCATION_BOTTOM_LEFT;
-#line 4705 "page-view.c"
+		_tmp29_ = _tmp33_ == CROP_LOCATION_BOTTOM_LEFT;
+#line 4590 "page-view.c"
 	}
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp35_ = _tmp29_;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp35_) {
-#line 4711 "page-view.c"
+	if (_tmp29_) {
+#line 4594 "page-view.c"
+		gint _tmp34_ = 0;
+		gint _tmp35_ = 0;
 		gint _tmp36_ = 0;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp41_ = 0;
-		gint _tmp42_ = 0;
+		gint _tmp39_ = 0;
+		gint _tmp40_ = 0;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = dx;
+		_tmp34_ = dx;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp37_ = new_w;
+		_tmp35_ = new_w;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp38_ = min_size;
+		_tmp36_ = min_size;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp36_ > (_tmp37_ - _tmp38_)) {
-#line 4725 "page-view.c"
-			gint _tmp39_ = 0;
-			gint _tmp40_ = 0;
+		if (_tmp34_ > (_tmp35_ - _tmp36_)) {
+#line 4608 "page-view.c"
+			gint _tmp37_ = 0;
+			gint _tmp38_ = 0;
 #line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp39_ = new_w;
+			_tmp37_ = new_w;
 #line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp40_ = min_size;
+			_tmp38_ = min_size;
 #line 705 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = _tmp39_ - _tmp40_;
-#line 4734 "page-view.c"
+			dx = _tmp37_ - _tmp38_;
+#line 4617 "page-view.c"
 		}
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = new_x;
+		_tmp39_ = new_x;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp42_ = dx;
+		_tmp40_ = dx;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp41_ + _tmp42_) < 0) {
-#line 4742 "page-view.c"
-			gint _tmp43_ = 0;
+		if ((_tmp39_ + _tmp40_) < 0) {
+#line 4625 "page-view.c"
+			gint _tmp41_ = 0;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp43_ = new_x;
+			_tmp41_ = new_x;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = -_tmp43_;
-#line 4748 "page-view.c"
+			dx = -_tmp41_;
+#line 4631 "page-view.c"
 		}
 	}
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp46_ = self->priv->crop_location;
+	_tmp44_ = self->priv->crop_location;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp46_ == CROP_LOCATION_TOP_LEFT) {
+	if (_tmp44_ == CROP_LOCATION_TOP_LEFT) {
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = TRUE;
-#line 4757 "page-view.c"
+		_tmp43_ = TRUE;
+#line 4640 "page-view.c"
 	} else {
-		CropLocation _tmp47_ = 0;
+		CropLocation _tmp45_ = 0;
 #line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp47_ = self->priv->crop_location;
+		_tmp45_ = self->priv->crop_location;
 #line 710 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = _tmp47_ == CROP_LOCATION_TOP;
-#line 4764 "page-view.c"
+		_tmp43_ = _tmp45_ == CROP_LOCATION_TOP;
+#line 4647 "page-view.c"
 	}
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp48_ = _tmp45_;
+	if (_tmp43_) {
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp48_) {
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = TRUE;
-#line 4772 "page-view.c"
+		_tmp42_ = TRUE;
+#line 4653 "page-view.c"
 	} else {
-		CropLocation _tmp49_ = 0;
+		CropLocation _tmp46_ = 0;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp49_ = self->priv->crop_location;
+		_tmp46_ = self->priv->crop_location;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp44_ = _tmp49_ == CROP_LOCATION_TOP_RIGHT;
-#line 4779 "page-view.c"
+		_tmp42_ = _tmp46_ == CROP_LOCATION_TOP_RIGHT;
+#line 4660 "page-view.c"
 	}
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp50_ = _tmp44_;
-#line 709 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp50_) {
-#line 4785 "page-view.c"
-		gint _tmp51_ = 0;
+	if (_tmp42_) {
+#line 4664 "page-view.c"
+		gint _tmp47_ = 0;
+		gint _tmp48_ = 0;
+		gint _tmp49_ = 0;
 		gint _tmp52_ = 0;
 		gint _tmp53_ = 0;
-		gint _tmp56_ = 0;
-		gint _tmp57_ = 0;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp51_ = dy;
+		_tmp47_ = dy;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp52_ = new_h;
+		_tmp48_ = new_h;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp53_ = min_size;
+		_tmp49_ = min_size;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp51_ > (_tmp52_ - _tmp53_)) {
-#line 4799 "page-view.c"
-			gint _tmp54_ = 0;
-			gint _tmp55_ = 0;
+		if (_tmp47_ > (_tmp48_ - _tmp49_)) {
+#line 4678 "page-view.c"
+			gint _tmp50_ = 0;
+			gint _tmp51_ = 0;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp54_ = new_h;
+			_tmp50_ = new_h;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp55_ = min_size;
+			_tmp51_ = min_size;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = _tmp54_ - _tmp55_;
-#line 4808 "page-view.c"
+			dy = _tmp50_ - _tmp51_;
+#line 4687 "page-view.c"
 		}
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp56_ = new_y;
+		_tmp52_ = new_y;
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp57_ = dy;
+		_tmp53_ = dy;
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp56_ + _tmp57_) < 0) {
-#line 4816 "page-view.c"
-			gint _tmp58_ = 0;
+		if ((_tmp52_ + _tmp53_) < 0) {
+#line 4695 "page-view.c"
+			gint _tmp54_ = 0;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp58_ = new_y;
+			_tmp54_ = new_y;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = -_tmp58_;
-#line 4822 "page-view.c"
+			dy = -_tmp54_;
+#line 4701 "page-view.c"
 		}
 	}
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp61_ = self->priv->crop_location;
+	_tmp57_ = self->priv->crop_location;
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp61_ == CROP_LOCATION_TOP_RIGHT) {
+	if (_tmp57_ == CROP_LOCATION_TOP_RIGHT) {
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp60_ = TRUE;
-#line 4831 "page-view.c"
+		_tmp56_ = TRUE;
+#line 4710 "page-view.c"
 	} else {
-		CropLocation _tmp62_ = 0;
+		CropLocation _tmp58_ = 0;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp62_ = self->priv->crop_location;
+		_tmp58_ = self->priv->crop_location;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp60_ = _tmp62_ == CROP_LOCATION_RIGHT;
-#line 4838 "page-view.c"
+		_tmp56_ = _tmp58_ == CROP_LOCATION_RIGHT;
+#line 4717 "page-view.c"
 	}
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp63_ = _tmp60_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp63_) {
+	if (_tmp56_) {
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp59_ = TRUE;
-#line 4846 "page-view.c"
+		_tmp55_ = TRUE;
+#line 4723 "page-view.c"
 	} else {
-		CropLocation _tmp64_ = 0;
+		CropLocation _tmp59_ = 0;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp64_ = self->priv->crop_location;
+		_tmp59_ = self->priv->crop_location;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp59_ = _tmp64_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 4853 "page-view.c"
+		_tmp55_ = _tmp59_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 4730 "page-view.c"
 	}
 #line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp65_ = _tmp59_;
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp65_) {
-#line 4859 "page-view.c"
+	if (_tmp55_) {
+#line 4734 "page-view.c"
+		gint _tmp60_ = 0;
+		gint _tmp61_ = 0;
+		gint _tmp62_ = 0;
+		gint _tmp65_ = 0;
 		gint _tmp66_ = 0;
 		gint _tmp67_ = 0;
 		gint _tmp68_ = 0;
-		gint _tmp71_ = 0;
-		gint _tmp72_ = 0;
-		gint _tmp73_ = 0;
-		gint _tmp74_ = 0;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp66_ = dx;
+		_tmp60_ = dx;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp67_ = min_size;
+		_tmp61_ = min_size;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp68_ = new_w;
+		_tmp62_ = new_w;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp66_ < (_tmp67_ - _tmp68_)) {
-#line 4875 "page-view.c"
-			gint _tmp69_ = 0;
-			gint _tmp70_ = 0;
+		if (_tmp60_ < (_tmp61_ - _tmp62_)) {
+#line 4750 "page-view.c"
+			gint _tmp63_ = 0;
+			gint _tmp64_ = 0;
 #line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp69_ = min_size;
+			_tmp63_ = min_size;
 #line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp70_ = new_w;
+			_tmp64_ = new_w;
 #line 724 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = _tmp69_ - _tmp70_;
-#line 4884 "page-view.c"
+			dx = _tmp63_ - _tmp64_;
+#line 4759 "page-view.c"
 		}
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp71_ = new_x;
+		_tmp65_ = new_x;
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp72_ = new_w;
+		_tmp66_ = new_w;
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp73_ = dx;
+		_tmp67_ = dx;
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp74_ = pw;
+		_tmp68_ = pw;
 #line 725 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp71_ + _tmp72_) + _tmp73_) > _tmp74_) {
-#line 4896 "page-view.c"
-			gint _tmp75_ = 0;
-			gint _tmp76_ = 0;
-			gint _tmp77_ = 0;
+		if (((_tmp65_ + _tmp66_) + _tmp67_) > _tmp68_) {
+#line 4771 "page-view.c"
+			gint _tmp69_ = 0;
+			gint _tmp70_ = 0;
+			gint _tmp71_ = 0;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp75_ = pw;
+			_tmp69_ = pw;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp76_ = new_x;
+			_tmp70_ = new_x;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp77_ = new_w;
+			_tmp71_ = new_w;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = (_tmp75_ - _tmp76_) - _tmp77_;
-#line 4908 "page-view.c"
+			dx = (_tmp69_ - _tmp70_) - _tmp71_;
+#line 4783 "page-view.c"
 		}
 	}
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp80_ = self->priv->crop_location;
+	_tmp74_ = self->priv->crop_location;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp80_ == CROP_LOCATION_BOTTOM_LEFT) {
+	if (_tmp74_ == CROP_LOCATION_BOTTOM_LEFT) {
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp79_ = TRUE;
-#line 4917 "page-view.c"
+		_tmp73_ = TRUE;
+#line 4792 "page-view.c"
 	} else {
-		CropLocation _tmp81_ = 0;
+		CropLocation _tmp75_ = 0;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp81_ = self->priv->crop_location;
+		_tmp75_ = self->priv->crop_location;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp79_ = _tmp81_ == CROP_LOCATION_BOTTOM;
-#line 4924 "page-view.c"
+		_tmp73_ = _tmp75_ == CROP_LOCATION_BOTTOM;
+#line 4799 "page-view.c"
 	}
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp82_ = _tmp79_;
+	if (_tmp73_) {
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp82_) {
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp78_ = TRUE;
-#line 4932 "page-view.c"
+		_tmp72_ = TRUE;
+#line 4805 "page-view.c"
 	} else {
-		CropLocation _tmp83_ = 0;
+		CropLocation _tmp76_ = 0;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp83_ = self->priv->crop_location;
+		_tmp76_ = self->priv->crop_location;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp78_ = _tmp83_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 4939 "page-view.c"
+		_tmp72_ = _tmp76_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 4812 "page-view.c"
 	}
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp84_ = _tmp78_;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp84_) {
-#line 4945 "page-view.c"
+	if (_tmp72_) {
+#line 4816 "page-view.c"
+		gint _tmp77_ = 0;
+		gint _tmp78_ = 0;
+		gint _tmp79_ = 0;
+		gint _tmp82_ = 0;
+		gint _tmp83_ = 0;
+		gint _tmp84_ = 0;
 		gint _tmp85_ = 0;
-		gint _tmp86_ = 0;
-		gint _tmp87_ = 0;
-		gint _tmp90_ = 0;
-		gint _tmp91_ = 0;
-		gint _tmp92_ = 0;
-		gint _tmp93_ = 0;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp85_ = dy;
+		_tmp77_ = dy;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp86_ = min_size;
+		_tmp78_ = min_size;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp87_ = new_h;
+		_tmp79_ = new_h;
 #line 732 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp85_ < (_tmp86_ - _tmp87_)) {
-#line 4961 "page-view.c"
-			gint _tmp88_ = 0;
-			gint _tmp89_ = 0;
+		if (_tmp77_ < (_tmp78_ - _tmp79_)) {
+#line 4832 "page-view.c"
+			gint _tmp80_ = 0;
+			gint _tmp81_ = 0;
 #line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp88_ = min_size;
+			_tmp80_ = min_size;
 #line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp89_ = new_h;
+			_tmp81_ = new_h;
 #line 733 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = _tmp88_ - _tmp89_;
-#line 4970 "page-view.c"
+			dy = _tmp80_ - _tmp81_;
+#line 4841 "page-view.c"
 		}
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp90_ = new_y;
+		_tmp82_ = new_y;
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp91_ = new_h;
+		_tmp83_ = new_h;
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp92_ = dy;
+		_tmp84_ = dy;
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp93_ = ph;
+		_tmp85_ = ph;
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp90_ + _tmp91_) + _tmp92_) > _tmp93_) {
-#line 4982 "page-view.c"
-			gint _tmp94_ = 0;
-			gint _tmp95_ = 0;
-			gint _tmp96_ = 0;
+		if (((_tmp82_ + _tmp83_) + _tmp84_) > _tmp85_) {
+#line 4853 "page-view.c"
+			gint _tmp86_ = 0;
+			gint _tmp87_ = 0;
+			gint _tmp88_ = 0;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp94_ = ph;
+			_tmp86_ = ph;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp95_ = new_y;
+			_tmp87_ = new_y;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp96_ = new_h;
+			_tmp88_ = new_h;
 #line 735 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = (_tmp94_ - _tmp95_) - _tmp96_;
-#line 4994 "page-view.c"
+			dy = (_tmp86_ - _tmp87_) - _tmp88_;
+#line 4865 "page-view.c"
 		}
 	}
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp97_ = self->priv->crop_location;
+	_tmp89_ = self->priv->crop_location;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp97_ == CROP_LOCATION_MIDDLE) {
-#line 5001 "page-view.c"
+	if (_tmp89_ == CROP_LOCATION_MIDDLE) {
+#line 4872 "page-view.c"
+		gint _tmp90_ = 0;
+		gint _tmp91_ = 0;
+		gint _tmp92_ = 0;
+		gint _tmp93_ = 0;
+		gint _tmp97_ = 0;
 		gint _tmp98_ = 0;
-		gint _tmp99_ = 0;
 		gint _tmp100_ = 0;
 		gint _tmp101_ = 0;
-		gint _tmp105_ = 0;
-		gint _tmp106_ = 0;
+		gint _tmp102_ = 0;
+		gint _tmp103_ = 0;
+		gint _tmp107_ = 0;
 		gint _tmp108_ = 0;
-		gint _tmp109_ = 0;
-		gint _tmp110_ = 0;
-		gint _tmp111_ = 0;
-		gint _tmp115_ = 0;
-		gint _tmp116_ = 0;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp98_ = new_x;
+		_tmp90_ = new_x;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp99_ = dx;
+		_tmp91_ = dx;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp100_ = new_w;
+		_tmp92_ = new_w;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp101_ = pw;
+		_tmp93_ = pw;
 #line 739 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp98_ + _tmp99_) + _tmp100_) > _tmp101_) {
-#line 5024 "page-view.c"
-			gint _tmp102_ = 0;
-			gint _tmp103_ = 0;
-			gint _tmp104_ = 0;
+		if (((_tmp90_ + _tmp91_) + _tmp92_) > _tmp93_) {
+#line 4895 "page-view.c"
+			gint _tmp94_ = 0;
+			gint _tmp95_ = 0;
+			gint _tmp96_ = 0;
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp102_ = pw;
+			_tmp94_ = pw;
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp103_ = new_x;
+			_tmp95_ = new_x;
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp104_ = new_w;
+			_tmp96_ = new_w;
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = (_tmp102_ - _tmp103_) - _tmp104_;
-#line 5036 "page-view.c"
+			dx = (_tmp94_ - _tmp95_) - _tmp96_;
+#line 4907 "page-view.c"
 		}
 #line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp105_ = new_x;
+		_tmp97_ = new_x;
 #line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp106_ = dx;
+		_tmp98_ = dx;
 #line 741 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp105_ + _tmp106_) < 0) {
-#line 5044 "page-view.c"
-			gint _tmp107_ = 0;
+		if ((_tmp97_ + _tmp98_) < 0) {
+#line 4915 "page-view.c"
+			gint _tmp99_ = 0;
 #line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp107_ = new_x;
+			_tmp99_ = new_x;
 #line 742 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dx = -_tmp107_;
-#line 5050 "page-view.c"
+			dx = -_tmp99_;
+#line 4921 "page-view.c"
 		}
 #line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp108_ = new_y;
+		_tmp100_ = new_y;
 #line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp109_ = dy;
+		_tmp101_ = dy;
 #line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp110_ = new_h;
+		_tmp102_ = new_h;
 #line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp111_ = ph;
+		_tmp103_ = ph;
 #line 743 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (((_tmp108_ + _tmp109_) + _tmp110_) > _tmp111_) {
-#line 5062 "page-view.c"
-			gint _tmp112_ = 0;
-			gint _tmp113_ = 0;
-			gint _tmp114_ = 0;
+		if (((_tmp100_ + _tmp101_) + _tmp102_) > _tmp103_) {
+#line 4933 "page-view.c"
+			gint _tmp104_ = 0;
+			gint _tmp105_ = 0;
+			gint _tmp106_ = 0;
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp112_ = ph;
+			_tmp104_ = ph;
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp113_ = new_y;
+			_tmp105_ = new_y;
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp114_ = new_h;
+			_tmp106_ = new_h;
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = (_tmp112_ - _tmp113_) - _tmp114_;
-#line 5074 "page-view.c"
+			dy = (_tmp104_ - _tmp105_) - _tmp106_;
+#line 4945 "page-view.c"
 		}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp115_ = new_y;
+		_tmp107_ = new_y;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp116_ = dy;
+		_tmp108_ = dy;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if ((_tmp115_ + _tmp116_) < 0) {
-#line 5082 "page-view.c"
-			gint _tmp117_ = 0;
+		if ((_tmp107_ + _tmp108_) < 0) {
+#line 4953 "page-view.c"
+			gint _tmp109_ = 0;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp117_ = new_y;
+			_tmp109_ = new_y;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			dy = -_tmp117_;
-#line 5088 "page-view.c"
+			dy = -_tmp109_;
+#line 4959 "page-view.c"
 		}
 	}
 #line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp118_ = self->priv->crop_location;
+	_tmp110_ = self->priv->crop_location;
 #line 750 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp118_ == CROP_LOCATION_MIDDLE) {
-#line 5095 "page-view.c"
-		gint _tmp119_ = 0;
-		gint _tmp120_ = 0;
-		gint _tmp121_ = 0;
-		gint _tmp122_ = 0;
+	if (_tmp110_ == CROP_LOCATION_MIDDLE) {
+#line 4966 "page-view.c"
+		gint _tmp111_ = 0;
+		gint _tmp112_ = 0;
+		gint _tmp113_ = 0;
+		gint _tmp114_ = 0;
 #line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp119_ = new_x;
+		_tmp111_ = new_x;
 #line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp120_ = dx;
+		_tmp112_ = dx;
 #line 752 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_x = _tmp119_ + _tmp120_;
+		new_x = _tmp111_ + _tmp112_;
 #line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp121_ = new_y;
+		_tmp113_ = new_y;
 #line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp122_ = dy;
+		_tmp114_ = dy;
 #line 753 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_y = _tmp121_ + _tmp122_;
-#line 5112 "page-view.c"
+		new_y = _tmp113_ + _tmp114_;
+#line 4983 "page-view.c"
 	}
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp125_ = self->priv->crop_location;
+	_tmp117_ = self->priv->crop_location;
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp125_ == CROP_LOCATION_TOP_LEFT) {
+	if (_tmp117_ == CROP_LOCATION_TOP_LEFT) {
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp124_ = TRUE;
-#line 5120 "page-view.c"
+		_tmp116_ = TRUE;
+#line 4991 "page-view.c"
 	} else {
-		CropLocation _tmp126_ = 0;
+		CropLocation _tmp118_ = 0;
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp126_ = self->priv->crop_location;
+		_tmp118_ = self->priv->crop_location;
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp124_ = _tmp126_ == CROP_LOCATION_LEFT;
-#line 5127 "page-view.c"
+		_tmp116_ = _tmp118_ == CROP_LOCATION_LEFT;
+#line 4998 "page-view.c"
 	}
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp127_ = _tmp124_;
+	if (_tmp116_) {
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp127_) {
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp123_ = TRUE;
-#line 5135 "page-view.c"
+		_tmp115_ = TRUE;
+#line 5004 "page-view.c"
 	} else {
-		CropLocation _tmp128_ = 0;
+		CropLocation _tmp119_ = 0;
 #line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp128_ = self->priv->crop_location;
+		_tmp119_ = self->priv->crop_location;
 #line 757 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp123_ = _tmp128_ == CROP_LOCATION_BOTTOM_LEFT;
-#line 5142 "page-view.c"
+		_tmp115_ = _tmp119_ == CROP_LOCATION_BOTTOM_LEFT;
+#line 5011 "page-view.c"
 	}
 #line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp129_ = _tmp123_;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp129_) {
-#line 5148 "page-view.c"
-		gint _tmp130_ = 0;
-		gint _tmp131_ = 0;
-		gint _tmp132_ = 0;
-		gint _tmp133_ = 0;
+	if (_tmp115_) {
+#line 5015 "page-view.c"
+		gint _tmp120_ = 0;
+		gint _tmp121_ = 0;
+		gint _tmp122_ = 0;
+		gint _tmp123_ = 0;
 #line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp130_ = new_x;
+		_tmp120_ = new_x;
 #line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp131_ = dx;
+		_tmp121_ = dx;
 #line 759 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_x = _tmp130_ + _tmp131_;
+		new_x = _tmp120_ + _tmp121_;
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp132_ = new_w;
+		_tmp122_ = new_w;
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp133_ = dx;
+		_tmp123_ = dx;
 #line 760 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_w = _tmp132_ - _tmp133_;
-#line 5165 "page-view.c"
+		new_w = _tmp122_ - _tmp123_;
+#line 5032 "page-view.c"
 	}
 #line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp136_ = self->priv->crop_location;
+	_tmp126_ = self->priv->crop_location;
 #line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp136_ == CROP_LOCATION_TOP_LEFT) {
+	if (_tmp126_ == CROP_LOCATION_TOP_LEFT) {
 #line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp135_ = TRUE;
-#line 5173 "page-view.c"
+		_tmp125_ = TRUE;
+#line 5040 "page-view.c"
 	} else {
-		CropLocation _tmp137_ = 0;
+		CropLocation _tmp127_ = 0;
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp137_ = self->priv->crop_location;
+		_tmp127_ = self->priv->crop_location;
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp135_ = _tmp137_ == CROP_LOCATION_TOP;
-#line 5180 "page-view.c"
+		_tmp125_ = _tmp127_ == CROP_LOCATION_TOP;
+#line 5047 "page-view.c"
 	}
 #line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp138_ = _tmp135_;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp138_) {
+	if (_tmp125_) {
 #line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = TRUE;
-#line 5188 "page-view.c"
+		_tmp124_ = TRUE;
+#line 5053 "page-view.c"
 	} else {
-		CropLocation _tmp139_ = 0;
+		CropLocation _tmp128_ = 0;
 #line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp139_ = self->priv->crop_location;
+		_tmp128_ = self->priv->crop_location;
 #line 764 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = _tmp139_ == CROP_LOCATION_TOP_RIGHT;
-#line 5195 "page-view.c"
+		_tmp124_ = _tmp128_ == CROP_LOCATION_TOP_RIGHT;
+#line 5060 "page-view.c"
 	}
 #line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp140_ = _tmp134_;
-#line 762 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp140_) {
-#line 5201 "page-view.c"
-		gint _tmp141_ = 0;
-		gint _tmp142_ = 0;
-		gint _tmp143_ = 0;
-		gint _tmp144_ = 0;
+	if (_tmp124_) {
+#line 5064 "page-view.c"
+		gint _tmp129_ = 0;
+		gint _tmp130_ = 0;
+		gint _tmp131_ = 0;
+		gint _tmp132_ = 0;
 #line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp141_ = new_y;
+		_tmp129_ = new_y;
 #line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp142_ = dy;
+		_tmp130_ = dy;
 #line 766 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_y = _tmp141_ + _tmp142_;
+		new_y = _tmp129_ + _tmp130_;
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp143_ = new_h;
+		_tmp131_ = new_h;
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp144_ = dy;
+		_tmp132_ = dy;
 #line 767 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_h = _tmp143_ - _tmp144_;
-#line 5218 "page-view.c"
+		new_h = _tmp131_ - _tmp132_;
+#line 5081 "page-view.c"
 	}
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp147_ = self->priv->crop_location;
+	_tmp135_ = self->priv->crop_location;
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp147_ == CROP_LOCATION_TOP_RIGHT) {
+	if (_tmp135_ == CROP_LOCATION_TOP_RIGHT) {
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp146_ = TRUE;
-#line 5226 "page-view.c"
+		_tmp134_ = TRUE;
+#line 5089 "page-view.c"
 	} else {
-		CropLocation _tmp148_ = 0;
+		CropLocation _tmp136_ = 0;
 #line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp148_ = self->priv->crop_location;
+		_tmp136_ = self->priv->crop_location;
 #line 771 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp146_ = _tmp148_ == CROP_LOCATION_RIGHT;
-#line 5233 "page-view.c"
+		_tmp134_ = _tmp136_ == CROP_LOCATION_RIGHT;
+#line 5096 "page-view.c"
 	}
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp149_ = _tmp146_;
+	if (_tmp134_) {
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp149_) {
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp145_ = TRUE;
-#line 5241 "page-view.c"
+		_tmp133_ = TRUE;
+#line 5102 "page-view.c"
 	} else {
-		CropLocation _tmp150_ = 0;
+		CropLocation _tmp137_ = 0;
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp150_ = self->priv->crop_location;
+		_tmp137_ = self->priv->crop_location;
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp145_ = _tmp150_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 5248 "page-view.c"
+		_tmp133_ = _tmp137_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 5109 "page-view.c"
 	}
 #line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp151_ = _tmp145_;
-#line 770 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp151_) {
-#line 5254 "page-view.c"
-		gint _tmp152_ = 0;
-		gint _tmp153_ = 0;
+	if (_tmp133_) {
+#line 5113 "page-view.c"
+		gint _tmp138_ = 0;
+		gint _tmp139_ = 0;
 #line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp152_ = new_w;
+		_tmp138_ = new_w;
 #line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp153_ = dx;
+		_tmp139_ = dx;
 #line 773 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_w = _tmp152_ + _tmp153_;
-#line 5263 "page-view.c"
+		new_w = _tmp138_ + _tmp139_;
+#line 5122 "page-view.c"
 	}
 #line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp156_ = self->priv->crop_location;
+	_tmp142_ = self->priv->crop_location;
 #line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp156_ == CROP_LOCATION_BOTTOM_LEFT) {
+	if (_tmp142_ == CROP_LOCATION_BOTTOM_LEFT) {
 #line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp155_ = TRUE;
-#line 5271 "page-view.c"
+		_tmp141_ = TRUE;
+#line 5130 "page-view.c"
 	} else {
-		CropLocation _tmp157_ = 0;
+		CropLocation _tmp143_ = 0;
 #line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp157_ = self->priv->crop_location;
+		_tmp143_ = self->priv->crop_location;
 #line 775 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp155_ = _tmp157_ == CROP_LOCATION_BOTTOM;
-#line 5278 "page-view.c"
+		_tmp141_ = _tmp143_ == CROP_LOCATION_BOTTOM;
+#line 5137 "page-view.c"
 	}
 #line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp158_ = _tmp155_;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp158_) {
+	if (_tmp141_) {
 #line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp154_ = TRUE;
-#line 5286 "page-view.c"
+		_tmp140_ = TRUE;
+#line 5143 "page-view.c"
 	} else {
-		CropLocation _tmp159_ = 0;
+		CropLocation _tmp144_ = 0;
 #line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp159_ = self->priv->crop_location;
+		_tmp144_ = self->priv->crop_location;
 #line 776 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp154_ = _tmp159_ == CROP_LOCATION_BOTTOM_RIGHT;
-#line 5293 "page-view.c"
+		_tmp140_ = _tmp144_ == CROP_LOCATION_BOTTOM_RIGHT;
+#line 5150 "page-view.c"
 	}
 #line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp160_ = _tmp154_;
-#line 774 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp160_) {
-#line 5299 "page-view.c"
-		gint _tmp161_ = 0;
-		gint _tmp162_ = 0;
+	if (_tmp140_) {
+#line 5154 "page-view.c"
+		gint _tmp145_ = 0;
+		gint _tmp146_ = 0;
 #line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp161_ = new_h;
+		_tmp145_ = new_h;
 #line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp162_ = dy;
+		_tmp146_ = dy;
 #line 777 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		new_h = _tmp161_ + _tmp162_;
-#line 5308 "page-view.c"
+		new_h = _tmp145_ + _tmp146_;
+#line 5163 "page-view.c"
 	}
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp163_ = self->priv->_page;
+	_tmp147_ = self->priv->_page;
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp164_ = new_x;
+	_tmp148_ = new_x;
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp165_ = new_y;
+	_tmp149_ = new_y;
 #line 779 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_move_crop (_tmp163_, _tmp164_, _tmp165_);
+	page_move_crop (_tmp147_, _tmp148_, _tmp149_);
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp167_ = new_w;
+	_tmp151_ = new_w;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp168_ = cw;
+	_tmp152_ = cw;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp167_ != _tmp168_) {
+	if (_tmp151_ != _tmp152_) {
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp166_ = TRUE;
-#line 5326 "page-view.c"
+		_tmp150_ = TRUE;
+#line 5181 "page-view.c"
 	} else {
-		gint _tmp169_ = 0;
-		gint _tmp170_ = 0;
+		gint _tmp153_ = 0;
+		gint _tmp154_ = 0;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp169_ = new_h;
+		_tmp153_ = new_h;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp170_ = ch;
+		_tmp154_ = ch;
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp166_ = _tmp169_ != _tmp170_;
-#line 5336 "page-view.c"
+		_tmp150_ = _tmp153_ != _tmp154_;
+#line 5191 "page-view.c"
 	}
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp171_ = _tmp166_;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp171_) {
-#line 5342 "page-view.c"
-		Page* _tmp172_ = NULL;
-		gint _tmp173_ = 0;
-		gint _tmp174_ = 0;
+	if (_tmp150_) {
+#line 5195 "page-view.c"
+		Page* _tmp155_ = NULL;
+		gint _tmp156_ = 0;
+		gint _tmp157_ = 0;
 #line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp172_ = self->priv->_page;
+		_tmp155_ = self->priv->_page;
 #line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp173_ = new_w;
+		_tmp156_ = new_w;
 #line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp174_ = new_h;
+		_tmp157_ = new_h;
 #line 783 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		page_set_custom_crop (_tmp172_, _tmp173_, _tmp174_);
-#line 5354 "page-view.c"
+		page_set_custom_crop (_tmp155_, _tmp156_, _tmp157_);
+#line 5207 "page-view.c"
 	}
 }
 
@@ -5362,7 +5215,7 @@ void page_view_button_release (PageView* self, gint x, gint y) {
 	self->priv->crop_location = CROP_LOCATION_NONE;
 #line 790 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 5366 "page-view.c"
+#line 5219 "page-view.c"
 }
 
 
@@ -5384,16 +5237,16 @@ static gboolean page_view_animation_cb (PageView* self) {
 	result = TRUE;
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 5388 "page-view.c"
+#line 5241 "page-view.c"
 }
 
 
 static gboolean _page_view_animation_cb_gsource_func (gpointer self) {
 	gboolean result;
-	result = page_view_animation_cb (self);
+	result = page_view_animation_cb ((PageView*) self);
 #line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 5397 "page-view.c"
+#line 5250 "page-view.c"
 }
 
 
@@ -5404,11 +5257,10 @@ static void page_view_update_animation (PageView* self) {
 	Page* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	gboolean _tmp7_ = FALSE;
-	guint _tmp8_ = 0U;
+	guint _tmp7_ = 0U;
+	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
-	gboolean _tmp11_ = FALSE;
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -5419,7 +5271,7 @@ static void page_view_update_animation (PageView* self) {
 	_tmp3_ = _tmp2_;
 #line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_) {
-#line 5423 "page-view.c"
+#line 5275 "page-view.c"
 		Page* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
@@ -5431,67 +5283,65 @@ static void page_view_update_animation (PageView* self) {
 		_tmp6_ = _tmp5_;
 #line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = !_tmp6_;
-#line 5435 "page-view.c"
+#line 5287 "page-view.c"
 	} else {
 #line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = FALSE;
-#line 5439 "page-view.c"
+#line 5291 "page-view.c"
 	}
 #line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp7_ = _tmp0_;
-#line 804 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	animate = _tmp7_;
+	animate = _tmp0_;
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->animate_timeout;
+	_tmp7_ = self->priv->animate_timeout;
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	is_animating = _tmp8_ != ((guint) 0);
+	is_animating = _tmp7_ != ((guint) 0);
 #line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = animate;
+	_tmp8_ = animate;
 #line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp10_ = is_animating;
+	_tmp9_ = is_animating;
 #line 806 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp9_ == _tmp10_) {
+	if (_tmp8_ == _tmp9_) {
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 5457 "page-view.c"
+#line 5307 "page-view.c"
 	}
 #line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp11_ = animate;
+	_tmp10_ = animate;
 #line 809 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp11_) {
-#line 5463 "page-view.c"
-		guint _tmp12_ = 0U;
+	if (_tmp10_) {
+#line 5313 "page-view.c"
+		guint _tmp11_ = 0U;
 #line 811 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_segment = 0;
 #line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp12_ = self->priv->animate_timeout;
+		_tmp11_ = self->priv->animate_timeout;
 #line 812 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp12_ == ((guint) 0)) {
-#line 5471 "page-view.c"
-			guint _tmp13_ = 0U;
+		if (_tmp11_ == ((guint) 0)) {
+#line 5321 "page-view.c"
+			guint _tmp12_ = 0U;
 #line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp13_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 150, _page_view_animation_cb_gsource_func, page_view_ref (self), page_view_unref);
+			_tmp12_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 150, _page_view_animation_cb_gsource_func, page_view_ref (self), page_view_unref);
 #line 813 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			self->priv->animate_timeout = _tmp13_;
-#line 5477 "page-view.c"
+			self->priv->animate_timeout = _tmp12_;
+#line 5327 "page-view.c"
 		}
 	} else {
-		guint _tmp14_ = 0U;
+		guint _tmp13_ = 0U;
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp14_ = self->priv->animate_timeout;
+		_tmp13_ = self->priv->animate_timeout;
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp14_ != ((guint) 0)) {
-#line 5485 "page-view.c"
-			guint _tmp15_ = 0U;
+		if (_tmp13_ != ((guint) 0)) {
+#line 5335 "page-view.c"
+			guint _tmp14_ = 0U;
 #line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp15_ = self->priv->animate_timeout;
+			_tmp14_ = self->priv->animate_timeout;
 #line 818 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			g_source_remove (_tmp15_);
-#line 5491 "page-view.c"
+			g_source_remove (_tmp14_);
+#line 5341 "page-view.c"
 		}
 #line 819 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		self->priv->animate_timeout = (guint) 0;
-#line 5495 "page-view.c"
+#line 5345 "page-view.c"
 	}
 }
 
@@ -5526,15 +5376,13 @@ void page_view_render (PageView* self, cairo_t* context) {
 	Page* _tmp24_ = NULL;
 	gboolean _tmp25_ = FALSE;
 	gboolean _tmp26_ = FALSE;
-	gboolean _tmp30_ = FALSE;
+	gboolean _tmp70_ = FALSE;
+	Page* _tmp71_ = NULL;
 	gboolean _tmp72_ = FALSE;
-	Page* _tmp73_ = NULL;
-	gboolean _tmp74_ = FALSE;
-	gboolean _tmp75_ = FALSE;
-	gboolean _tmp79_ = FALSE;
-	Page* _tmp121_ = NULL;
-	gboolean _tmp122_ = FALSE;
-	gboolean _tmp123_ = FALSE;
+	gboolean _tmp73_ = FALSE;
+	Page* _tmp118_ = NULL;
+	gboolean _tmp119_ = FALSE;
+	gboolean _tmp120_ = FALSE;
 #line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 823 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -5580,11 +5428,11 @@ void page_view_render (PageView* self, cairo_t* context) {
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp11_ = self->priv->border_width;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = self->priv->width;
+	_tmp12_ = self->priv->width_;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp13_ = self->priv->border_width;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = self->priv->height;
+	_tmp14_ = self->priv->height_;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_tmp15_ = self->priv->border_width;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -5619,7 +5467,7 @@ void page_view_render (PageView* self, cairo_t* context) {
 	_tmp26_ = _tmp25_;
 #line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp26_) {
-#line 5623 "page-view.c"
+#line 5471 "page-view.c"
 		Page* _tmp27_ = NULL;
 		gboolean _tmp28_ = FALSE;
 		gboolean _tmp29_ = FALSE;
@@ -5631,920 +5479,723 @@ void page_view_render (PageView* self, cairo_t* context) {
 		_tmp29_ = _tmp28_;
 #line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = !_tmp29_;
-#line 5635 "page-view.c"
+#line 5483 "page-view.c"
 	} else {
 #line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp23_ = FALSE;
-#line 5639 "page-view.c"
+#line 5487 "page-view.c"
 	}
 #line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp30_ = _tmp23_;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp30_) {
-#line 5645 "page-view.c"
+	if (_tmp23_) {
+#line 5491 "page-view.c"
 		gdouble outer_radius = 0.0;
+		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
-		gint _tmp32_ = 0;
 		gdouble arc = 0.0;
-		gint _tmp35_ = 0;
+		gint _tmp34_ = 0;
 		gdouble x = 0.0;
+		gdouble _tmp35_ = 0.0;
 		gdouble _tmp36_ = 0.0;
 		gdouble _tmp37_ = 0.0;
-		gdouble _tmp38_ = 0.0;
 		gdouble y = 0.0;
+		gdouble _tmp38_ = 0.0;
 		gdouble _tmp39_ = 0.0;
 		gdouble _tmp40_ = 0.0;
-		gdouble _tmp41_ = 0.0;
 		gdouble inner_radius = 0.0;
+		gdouble _tmp41_ = 0.0;
 		gdouble _tmp42_ = 0.0;
 		gdouble _tmp43_ = 0.0;
 		gdouble _tmp44_ = 0.0;
 		gdouble _tmp45_ = 0.0;
-		gdouble _tmp46_ = 0.0;
 		gdouble offset = 0.0;
 #line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp31_ = w;
+		_tmp30_ = w;
 #line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp32_ = h;
+		_tmp31_ = h;
 #line 852 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (_tmp31_ > _tmp32_) {
-#line 5672 "page-view.c"
-			gint _tmp33_ = 0;
+		if (_tmp30_ > _tmp31_) {
+#line 5518 "page-view.c"
+			gint _tmp32_ = 0;
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp33_ = w;
+			_tmp32_ = w;
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			outer_radius = 0.15 * _tmp33_;
-#line 5678 "page-view.c"
+			outer_radius = 0.15 * _tmp32_;
+#line 5524 "page-view.c"
 		} else {
-			gint _tmp34_ = 0;
+			gint _tmp33_ = 0;
 #line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp34_ = h;
+			_tmp33_ = h;
 #line 855 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			outer_radius = 0.15 * _tmp34_;
-#line 5685 "page-view.c"
+			outer_radius = 0.15 * _tmp33_;
+#line 5531 "page-view.c"
 		}
 #line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp35_ = self->priv->animate_n_segments;
+		_tmp34_ = self->priv->animate_n_segments;
 #line 856 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		arc = G_PI / _tmp35_;
+		arc = G_PI / _tmp34_;
 #line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp36_ = outer_radius;
+		_tmp35_ = outer_radius;
 #line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp37_ = arc;
+		_tmp36_ = arc;
 #line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp38_ = sin (_tmp37_);
+		_tmp37_ = sin (_tmp36_);
 #line 859 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp36_ * _tmp38_;
+		x = _tmp35_ * _tmp37_;
 #line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp39_ = outer_radius;
+		_tmp38_ = outer_radius;
 #line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp40_ = arc;
+		_tmp39_ = arc;
 #line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp41_ = cos (_tmp40_);
+		_tmp40_ = cos (_tmp39_);
 #line 860 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp39_ * (_tmp41_ - 1.0);
+		y = _tmp38_ * (_tmp40_ - 1.0);
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp41_ = x;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp42_ = x;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp43_ = x;
+		_tmp43_ = y;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp44_ = y;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp45_ = y;
+		_tmp45_ = sqrt ((_tmp41_ * _tmp42_) + (_tmp43_ * _tmp44_));
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp46_ = sqrt ((_tmp42_ * _tmp43_) + (_tmp44_ * _tmp45_));
-#line 861 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		inner_radius = 0.6 * _tmp46_;
+		inner_radius = 0.6 * _tmp45_;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		offset = 0.0;
-#line 5721 "page-view.c"
+#line 5567 "page-view.c"
 		{
 			gint i = 0;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			i = 0;
-#line 5726 "page-view.c"
+#line 5572 "page-view.c"
 			{
-				gboolean _tmp47_ = FALSE;
+				gboolean _tmp46_ = FALSE;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp47_ = TRUE;
+				_tmp46_ = TRUE;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				while (TRUE) {
-#line 5733 "page-view.c"
-					gboolean _tmp48_ = FALSE;
+#line 5579 "page-view.c"
+					gint _tmp50_ = 0;
+					gint _tmp51_ = 0;
 					gint _tmp52_ = 0;
-					gint _tmp53_ = 0;
-					gint _tmp54_ = 0;
+					gdouble _tmp53_ = 0.0;
+					gdouble _tmp54_ = 0.0;
 					gdouble _tmp55_ = 0.0;
-					gdouble _tmp56_ = 0.0;
+					gint _tmp56_ = 0;
 					gdouble _tmp57_ = 0.0;
-					gint _tmp58_ = 0;
+					gdouble _tmp58_ = 0.0;
 					gdouble _tmp59_ = 0.0;
-					gdouble _tmp60_ = 0.0;
+					cairo_t* _tmp60_ = NULL;
 					gdouble _tmp61_ = 0.0;
-					cairo_t* _tmp62_ = NULL;
+					gdouble _tmp62_ = 0.0;
 					gdouble _tmp63_ = 0.0;
-					gdouble _tmp64_ = 0.0;
-					gdouble _tmp65_ = 0.0;
-					gint _tmp66_ = 0;
-					gint _tmp67_ = 0;
-					cairo_t* _tmp70_ = NULL;
-					cairo_t* _tmp71_ = NULL;
-#line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp48_ = _tmp47_;
+					gint _tmp64_ = 0;
+					gint _tmp65_ = 0;
+					cairo_t* _tmp68_ = NULL;
+					cairo_t* _tmp69_ = NULL;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!_tmp48_) {
-#line 5757 "page-view.c"
-						gint _tmp49_ = 0;
-						gdouble _tmp50_ = 0.0;
-						gdouble _tmp51_ = 0.0;
+					if (!_tmp46_) {
+#line 5600 "page-view.c"
+						gint _tmp47_ = 0;
+						gdouble _tmp48_ = 0.0;
+						gdouble _tmp49_ = 0.0;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp49_ = i;
+						_tmp47_ = i;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						i = _tmp49_ + 1;
+						i = _tmp47_ + 1;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp50_ = offset;
+						_tmp48_ = offset;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp51_ = arc;
+						_tmp49_ = arc;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						offset = _tmp50_ + (_tmp51_ * 2);
-#line 5771 "page-view.c"
+						offset = _tmp48_ + (_tmp49_ * 2);
+#line 5614 "page-view.c"
 					}
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp47_ = FALSE;
+					_tmp46_ = FALSE;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp52_ = i;
+					_tmp50_ = i;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp53_ = self->priv->animate_n_segments;
+					_tmp51_ = self->priv->animate_n_segments;
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (!(_tmp52_ < _tmp53_)) {
+					if (!(_tmp50_ < _tmp51_)) {
 #line 864 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 						break;
-#line 5783 "page-view.c"
+#line 5626 "page-view.c"
 					}
 #line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp54_ = w;
+					_tmp52_ = w;
 #line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp55_ = outer_radius;
+					_tmp53_ = outer_radius;
 #line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp56_ = offset;
+					_tmp54_ = offset;
 #line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp57_ = sin (_tmp56_);
+					_tmp55_ = sin (_tmp54_);
 #line 866 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					x = (_tmp54_ / 2) + (_tmp55_ * _tmp57_);
+					x = (_tmp52_ / 2) + (_tmp53_ * _tmp55_);
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp58_ = h;
+					_tmp56_ = h;
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp59_ = outer_radius;
+					_tmp57_ = outer_radius;
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp60_ = offset;
+					_tmp58_ = offset;
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp61_ = cos (_tmp60_);
+					_tmp59_ = cos (_tmp58_);
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					y = (_tmp58_ / 2) - (_tmp59_ * _tmp61_);
+					y = (_tmp56_ / 2) - (_tmp57_ * _tmp59_);
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp62_ = context;
+					_tmp60_ = context;
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp63_ = x;
+					_tmp61_ = x;
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp64_ = y;
+					_tmp62_ = y;
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp65_ = inner_radius;
+					_tmp63_ = inner_radius;
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_arc (_tmp62_, _tmp63_, _tmp64_, _tmp65_, (gdouble) 0, 2 * G_PI);
+					cairo_arc (_tmp60_, _tmp61_, _tmp62_, _tmp63_, (gdouble) 0, 2 * G_PI);
 #line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp66_ = i;
+					_tmp64_ = i;
 #line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp67_ = self->priv->animate_segment;
+					_tmp65_ = self->priv->animate_segment;
 #line 870 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					if (_tmp66_ == _tmp67_) {
-#line 5821 "page-view.c"
-						cairo_t* _tmp68_ = NULL;
-						cairo_t* _tmp69_ = NULL;
+					if (_tmp64_ == _tmp65_) {
+#line 5664 "page-view.c"
+						cairo_t* _tmp66_ = NULL;
+						cairo_t* _tmp67_ = NULL;
 #line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp68_ = context;
+						_tmp66_ = context;
 #line 872 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						cairo_set_source_rgb (_tmp68_, 0.75, 0.75, 0.75);
+						cairo_set_source_rgb (_tmp66_, 0.75, 0.75, 0.75);
 #line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						_tmp69_ = context;
+						_tmp67_ = context;
 #line 873 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-						cairo_fill_preserve (_tmp69_);
-#line 5832 "page-view.c"
+						cairo_fill_preserve (_tmp67_);
+#line 5675 "page-view.c"
 					}
 #line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp70_ = context;
+					_tmp68_ = context;
 #line 876 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_set_source_rgb (_tmp70_, 0.5, 0.5, 0.5);
+					cairo_set_source_rgb (_tmp68_, 0.5, 0.5, 0.5);
 #line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					_tmp71_ = context;
+					_tmp69_ = context;
 #line 877 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-					cairo_stroke (_tmp71_);
-#line 5842 "page-view.c"
+					cairo_stroke (_tmp69_);
+#line 5685 "page-view.c"
 				}
 			}
 		}
 	}
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp73_ = self->priv->_page;
+	_tmp71_ = self->priv->_page;
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp74_ = page_get_is_scanning (_tmp73_);
+	_tmp72_ = page_get_is_scanning (_tmp71_);
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp75_ = _tmp74_;
+	_tmp73_ = _tmp72_;
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp75_) {
-#line 5855 "page-view.c"
-		Page* _tmp76_ = NULL;
-		gint _tmp77_ = 0;
-		gint _tmp78_ = 0;
+	if (_tmp73_) {
+#line 5698 "page-view.c"
+		Page* _tmp74_ = NULL;
+		gint _tmp75_ = 0;
+		gint _tmp76_ = 0;
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp76_ = self->priv->_page;
+		_tmp74_ = self->priv->_page;
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp77_ = page_get_scan_line (_tmp76_);
+		_tmp75_ = page_get_scan_line (_tmp74_);
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp78_ = _tmp77_;
+		_tmp76_ = _tmp75_;
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp72_ = _tmp78_ > 0;
-#line 5867 "page-view.c"
+		_tmp70_ = _tmp76_ > 0;
+#line 5710 "page-view.c"
 	} else {
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp72_ = FALSE;
-#line 5871 "page-view.c"
+		_tmp70_ = FALSE;
+#line 5714 "page-view.c"
 	}
 #line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp79_ = _tmp72_;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp79_) {
-#line 5877 "page-view.c"
+	if (_tmp70_) {
+#line 5718 "page-view.c"
 		gint scan_line = 0;
-		Page* _tmp80_ = NULL;
-		gint _tmp81_ = 0;
-		gint _tmp82_ = 0;
+		Page* _tmp77_ = NULL;
+		gint _tmp78_ = 0;
+		gint _tmp79_ = 0;
 		gdouble s = 0.0;
 		gdouble x1 = 0.0;
 		gdouble y1 = 0.0;
 		gdouble x2 = 0.0;
 		gdouble y2 = 0.0;
-		Page* _tmp83_ = NULL;
-		ScanDirection _tmp84_ = 0;
-		ScanDirection _tmp85_ = 0;
+		Page* _tmp80_ = NULL;
+		ScanDirection _tmp81_ = 0;
+		ScanDirection _tmp82_ = 0;
+		cairo_t* _tmp110_ = NULL;
+		gdouble _tmp111_ = 0.0;
+		gdouble _tmp112_ = 0.0;
 		cairo_t* _tmp113_ = NULL;
 		gdouble _tmp114_ = 0.0;
 		gdouble _tmp115_ = 0.0;
 		cairo_t* _tmp116_ = NULL;
-		gdouble _tmp117_ = 0.0;
-		gdouble _tmp118_ = 0.0;
-		cairo_t* _tmp119_ = NULL;
-		cairo_t* _tmp120_ = NULL;
+		cairo_t* _tmp117_ = NULL;
 #line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp80_ = self->priv->_page;
+		_tmp77_ = self->priv->_page;
 #line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp81_ = page_get_scan_line (_tmp80_);
+		_tmp78_ = page_get_scan_line (_tmp77_);
 #line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp82_ = _tmp81_;
+		_tmp79_ = _tmp78_;
 #line 884 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		scan_line = _tmp82_;
+		scan_line = _tmp79_;
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp83_ = self->priv->_page;
+		_tmp80_ = self->priv->_page;
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp84_ = page_get_scan_direction (_tmp83_);
+		_tmp81_ = page_get_scan_direction (_tmp80_);
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp85_ = _tmp84_;
+		_tmp82_ = _tmp81_;
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		switch (_tmp85_) {
+		switch (_tmp82_) {
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 5916 "page-view.c"
+#line 5757 "page-view.c"
 			{
+				gint _tmp83_ = 0;
+				gint _tmp84_ = 0;
+				gdouble _tmp85_ = 0.0;
 				gint _tmp86_ = 0;
-				gint _tmp87_ = 0;
-				gdouble _tmp88_ = 0.0;
-				gint _tmp89_ = 0;
-				gdouble _tmp90_ = 0.0;
+				gdouble _tmp87_ = 0.0;
 #line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp86_ = scan_line;
+				_tmp83_ = scan_line;
 #line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp87_ = page_view_page_to_screen_y (self, _tmp86_);
+				_tmp84_ = page_view_page_to_screen_y (self, _tmp83_);
 #line 891 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp87_;
+				s = (gdouble) _tmp84_;
 #line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (gdouble) 0;
 #line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp88_ = s;
+				_tmp85_ = s;
 #line 892 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = _tmp88_ + 0.5;
+				y1 = _tmp85_ + 0.5;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp89_ = w;
+				_tmp86_ = w;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (gdouble) _tmp89_;
+				x2 = (gdouble) _tmp86_;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp90_ = s;
+				_tmp87_ = s;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = _tmp90_ + 0.5;
+				y2 = _tmp87_ + 0.5;
 #line 894 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 5945 "page-view.c"
+#line 5786 "page-view.c"
 			}
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 5949 "page-view.c"
+#line 5790 "page-view.c"
 			{
-				gint _tmp91_ = 0;
+				gint _tmp88_ = 0;
+				gint _tmp89_ = 0;
+				gint _tmp90_ = 0;
+				gdouble _tmp91_ = 0.0;
 				gint _tmp92_ = 0;
 				gint _tmp93_ = 0;
 				gdouble _tmp94_ = 0.0;
-				gint _tmp95_ = 0;
-				gint _tmp96_ = 0;
-				gdouble _tmp97_ = 0.0;
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp91_ = scan_line;
+				_tmp88_ = scan_line;
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp92_ = page_view_page_to_screen_y (self, _tmp91_);
+				_tmp89_ = page_view_page_to_screen_y (self, _tmp88_);
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp92_;
+				s = (gdouble) _tmp89_;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				x1 = (gdouble) 0;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp93_ = h;
+				_tmp90_ = h;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp94_ = s;
+				_tmp91_ = s;
 #line 897 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = (_tmp93_ - _tmp94_) + 0.5;
+				y1 = (_tmp90_ - _tmp91_) + 0.5;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp95_ = w;
+				_tmp92_ = w;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (gdouble) _tmp95_;
+				x2 = (gdouble) _tmp92_;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp96_ = h;
+				_tmp93_ = h;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp97_ = s;
+				_tmp94_ = s;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (_tmp96_ - _tmp97_) + 0.5;
+				y2 = (_tmp93_ - _tmp94_) + 0.5;
 #line 899 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 5984 "page-view.c"
+#line 5825 "page-view.c"
 			}
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 5988 "page-view.c"
+#line 5829 "page-view.c"
 			{
-				gint _tmp98_ = 0;
+				gint _tmp95_ = 0;
+				gint _tmp96_ = 0;
+				gdouble _tmp97_ = 0.0;
+				gdouble _tmp98_ = 0.0;
 				gint _tmp99_ = 0;
-				gdouble _tmp100_ = 0.0;
-				gdouble _tmp101_ = 0.0;
-				gint _tmp102_ = 0;
 #line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp98_ = scan_line;
+				_tmp95_ = scan_line;
 #line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp99_ = page_view_page_to_screen_x (self, _tmp98_);
+				_tmp96_ = page_view_page_to_screen_x (self, _tmp95_);
 #line 901 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp99_;
+				s = (gdouble) _tmp96_;
 #line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp100_ = s;
+				_tmp97_ = s;
 #line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = _tmp100_ + 0.5;
+				x1 = _tmp97_ + 0.5;
 #line 902 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (gdouble) 0;
 #line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp101_ = s;
+				_tmp98_ = s;
 #line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = _tmp101_ + 0.5;
+				x2 = _tmp98_ + 0.5;
 #line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp102_ = h;
+				_tmp99_ = h;
 #line 903 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) _tmp102_;
+				y2 = (gdouble) _tmp99_;
 #line 904 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 6017 "page-view.c"
+#line 5858 "page-view.c"
 			}
 #line 888 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 6021 "page-view.c"
+#line 5862 "page-view.c"
 			{
-				gint _tmp103_ = 0;
+				gint _tmp100_ = 0;
+				gint _tmp101_ = 0;
+				gint _tmp102_ = 0;
+				gdouble _tmp103_ = 0.0;
 				gint _tmp104_ = 0;
-				gint _tmp105_ = 0;
-				gdouble _tmp106_ = 0.0;
-				gint _tmp107_ = 0;
-				gdouble _tmp108_ = 0.0;
-				gint _tmp109_ = 0;
+				gdouble _tmp105_ = 0.0;
+				gint _tmp106_ = 0;
 #line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp103_ = scan_line;
+				_tmp100_ = scan_line;
 #line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp104_ = page_view_page_to_screen_x (self, _tmp103_);
+				_tmp101_ = page_view_page_to_screen_x (self, _tmp100_);
 #line 906 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				s = (gdouble) _tmp104_;
+				s = (gdouble) _tmp101_;
 #line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp105_ = w;
+				_tmp102_ = w;
 #line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp106_ = s;
+				_tmp103_ = s;
 #line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = (_tmp105_ - _tmp106_) + 0.5;
+				x1 = (_tmp102_ - _tmp103_) + 0.5;
 #line 907 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y1 = (gdouble) 0;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp107_ = w;
+				_tmp104_ = w;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp108_ = s;
+				_tmp105_ = s;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = (_tmp107_ - _tmp108_) + 0.5;
+				x2 = (_tmp104_ - _tmp105_) + 0.5;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp109_ = h;
+				_tmp106_ = h;
 #line 908 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y2 = (gdouble) _tmp109_;
+				y2 = (gdouble) _tmp106_;
 #line 909 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 6056 "page-view.c"
+#line 5897 "page-view.c"
 			}
 			default:
 			{
-				gdouble _tmp110_ = 0.0;
-				gdouble _tmp111_ = 0.0;
-				gdouble _tmp112_ = 0.0;
+				gdouble _tmp107_ = 0.0;
+				gdouble _tmp108_ = 0.0;
+				gdouble _tmp109_ = 0.0;
 #line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				y2 = (gdouble) 0;
 #line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp110_ = y2;
+				_tmp107_ = y2;
 #line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x2 = _tmp110_;
+				x2 = _tmp107_;
 #line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp111_ = x2;
+				_tmp108_ = x2;
 #line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				y1 = _tmp111_;
+				y1 = _tmp108_;
 #line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				_tmp112_ = y1;
+				_tmp109_ = y1;
 #line 911 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-				x1 = _tmp112_;
+				x1 = _tmp109_;
 #line 912 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 				break;
-#line 6079 "page-view.c"
+#line 5920 "page-view.c"
 			}
 		}
 #line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp113_ = context;
+		_tmp110_ = context;
 #line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp114_ = x1;
+		_tmp111_ = x1;
 #line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp115_ = y1;
+		_tmp112_ = y1;
 #line 915 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_move_to (_tmp113_, _tmp114_, _tmp115_);
+		cairo_move_to (_tmp110_, _tmp111_, _tmp112_);
 #line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp116_ = context;
+		_tmp113_ = context;
 #line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp117_ = x2;
+		_tmp114_ = x2;
 #line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp118_ = y2;
+		_tmp115_ = y2;
 #line 916 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_line_to (_tmp116_, _tmp117_, _tmp118_);
+		cairo_line_to (_tmp113_, _tmp114_, _tmp115_);
 #line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp119_ = context;
+		_tmp116_ = context;
 #line 917 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp119_, 1.0, 0.0, 0.0);
+		cairo_set_source_rgb (_tmp116_, 1.0, 0.0, 0.0);
 #line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp120_ = context;
+		_tmp117_ = context;
 #line 918 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp120_);
-#line 6106 "page-view.c"
+		cairo_stroke (_tmp117_);
+#line 5947 "page-view.c"
 	}
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp121_ = self->priv->_page;
+	_tmp118_ = self->priv->_page;
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp122_ = page_get_has_crop (_tmp121_);
+	_tmp119_ = page_get_has_crop (_tmp118_);
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp123_ = _tmp122_;
+	_tmp120_ = _tmp119_;
 #line 922 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp123_) {
-#line 6116 "page-view.c"
+	if (_tmp120_) {
+#line 5957 "page-view.c"
 		gint x = 0;
+		Page* _tmp121_ = NULL;
+		gint _tmp122_ = 0;
+		gint _tmp123_ = 0;
+		gint y = 0;
 		Page* _tmp124_ = NULL;
 		gint _tmp125_ = 0;
 		gint _tmp126_ = 0;
-		gint y = 0;
+		gint crop_width = 0;
 		Page* _tmp127_ = NULL;
 		gint _tmp128_ = 0;
 		gint _tmp129_ = 0;
-		gint crop_width = 0;
+		gint crop_height = 0;
 		Page* _tmp130_ = NULL;
 		gint _tmp131_ = 0;
 		gint _tmp132_ = 0;
-		gint crop_height = 0;
-		Page* _tmp133_ = NULL;
+		gint dx = 0;
+		gint _tmp133_ = 0;
 		gint _tmp134_ = 0;
+		gint dy = 0;
 		gint _tmp135_ = 0;
-		gint dx = 0;
 		gint _tmp136_ = 0;
+		gint dw = 0;
 		gint _tmp137_ = 0;
-		gint dy = 0;
 		gint _tmp138_ = 0;
+		gint dh = 0;
 		gint _tmp139_ = 0;
-		gint dw = 0;
 		gint _tmp140_ = 0;
-		gint _tmp141_ = 0;
-		gint dh = 0;
+		cairo_t* _tmp141_ = NULL;
 		gint _tmp142_ = 0;
 		gint _tmp143_ = 0;
 		cairo_t* _tmp144_ = NULL;
-		gint _tmp145_ = 0;
+		cairo_t* _tmp145_ = NULL;
 		gint _tmp146_ = 0;
-		cairo_t* _tmp147_ = NULL;
-		cairo_t* _tmp148_ = NULL;
+		gint _tmp147_ = 0;
+		gint _tmp148_ = 0;
 		gint _tmp149_ = 0;
-		gint _tmp150_ = 0;
-		gint _tmp151_ = 0;
-		gint _tmp152_ = 0;
+		cairo_t* _tmp150_ = NULL;
+		cairo_t* _tmp151_ = NULL;
+		cairo_t* _tmp152_ = NULL;
 		cairo_t* _tmp153_ = NULL;
-		cairo_t* _tmp154_ = NULL;
-		cairo_t* _tmp155_ = NULL;
-		cairo_t* _tmp156_ = NULL;
+		gint _tmp154_ = 0;
+		gint _tmp155_ = 0;
+		gint _tmp156_ = 0;
 		gint _tmp157_ = 0;
-		gint _tmp158_ = 0;
-		gint _tmp159_ = 0;
-		gint _tmp160_ = 0;
-		cairo_t* _tmp161_ = NULL;
-		cairo_t* _tmp162_ = NULL;
-		cairo_t* _tmp163_ = NULL;
+		cairo_t* _tmp158_ = NULL;
+		cairo_t* _tmp159_ = NULL;
+		cairo_t* _tmp160_ = NULL;
+		gint _tmp161_ = 0;
+		gint _tmp162_ = 0;
+		gint _tmp163_ = 0;
 		gint _tmp164_ = 0;
-		gint _tmp165_ = 0;
-		gint _tmp166_ = 0;
-		gint _tmp167_ = 0;
-		cairo_t* _tmp168_ = NULL;
-		cairo_t* _tmp169_ = NULL;
+		cairo_t* _tmp165_ = NULL;
+		cairo_t* _tmp166_ = NULL;
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp124_ = self->priv->_page;
+		_tmp121_ = self->priv->_page;
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp125_ = page_get_crop_x (_tmp124_);
+		_tmp122_ = page_get_crop_x (_tmp121_);
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp126_ = _tmp125_;
+		_tmp123_ = _tmp122_;
 #line 924 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		x = _tmp126_;
+		x = _tmp123_;
 #line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp127_ = self->priv->_page;
+		_tmp124_ = self->priv->_page;
 #line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp128_ = page_get_crop_y (_tmp127_);
+		_tmp125_ = page_get_crop_y (_tmp124_);
 #line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp129_ = _tmp128_;
+		_tmp126_ = _tmp125_;
 #line 925 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		y = _tmp129_;
+		y = _tmp126_;
 #line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp130_ = self->priv->_page;
+		_tmp127_ = self->priv->_page;
 #line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp131_ = page_get_crop_width (_tmp130_);
+		_tmp128_ = page_get_crop_width (_tmp127_);
 #line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp132_ = _tmp131_;
+		_tmp129_ = _tmp128_;
 #line 926 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_width = _tmp132_;
+		crop_width = _tmp129_;
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp133_ = self->priv->_page;
+		_tmp130_ = self->priv->_page;
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp134_ = page_get_crop_height (_tmp133_);
+		_tmp131_ = page_get_crop_height (_tmp130_);
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp135_ = _tmp134_;
+		_tmp132_ = _tmp131_;
 #line 927 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		crop_height = _tmp135_;
+		crop_height = _tmp132_;
 #line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp136_ = x;
+		_tmp133_ = x;
 #line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp137_ = page_view_page_to_screen_x (self, _tmp136_);
+		_tmp134_ = page_view_page_to_screen_x (self, _tmp133_);
 #line 929 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dx = _tmp137_;
+		dx = _tmp134_;
 #line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp138_ = y;
+		_tmp135_ = y;
 #line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp139_ = page_view_page_to_screen_y (self, _tmp138_);
+		_tmp136_ = page_view_page_to_screen_y (self, _tmp135_);
 #line 930 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dy = _tmp139_;
+		dy = _tmp136_;
 #line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp140_ = crop_width;
+		_tmp137_ = crop_width;
 #line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp141_ = page_view_page_to_screen_x (self, _tmp140_);
+		_tmp138_ = page_view_page_to_screen_x (self, _tmp137_);
 #line 931 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dw = _tmp141_;
+		dw = _tmp138_;
 #line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp142_ = crop_height;
+		_tmp139_ = crop_height;
 #line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp143_ = page_view_page_to_screen_y (self, _tmp142_);
+		_tmp140_ = page_view_page_to_screen_y (self, _tmp139_);
 #line 932 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		dh = _tmp143_;
+		dh = _tmp140_;
 #line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp144_ = context;
+		_tmp141_ = context;
 #line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp145_ = w;
+		_tmp142_ = w;
 #line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp146_ = h;
+		_tmp143_ = h;
 #line 935 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp144_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp145_, (gdouble) _tmp146_);
+		cairo_rectangle (_tmp141_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp142_, (gdouble) _tmp143_);
 #line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp147_ = context;
+		_tmp144_ = context;
 #line 936 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_new_sub_path (_tmp147_);
+		cairo_new_sub_path (_tmp144_);
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp148_ = context;
+		_tmp145_ = context;
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp149_ = dx;
+		_tmp146_ = dx;
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp150_ = dy;
+		_tmp147_ = dy;
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp151_ = dw;
+		_tmp148_ = dw;
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp152_ = dh;
+		_tmp149_ = dh;
 #line 937 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp148_, (gdouble) _tmp149_, (gdouble) _tmp150_, (gdouble) _tmp151_, (gdouble) _tmp152_);
+		cairo_rectangle (_tmp145_, (gdouble) _tmp146_, (gdouble) _tmp147_, (gdouble) _tmp148_, (gdouble) _tmp149_);
 #line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp153_ = context;
+		_tmp150_ = context;
 #line 938 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_fill_rule (_tmp153_, CAIRO_FILL_RULE_EVEN_ODD);
+		cairo_set_fill_rule (_tmp150_, CAIRO_FILL_RULE_EVEN_ODD);
 #line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp154_ = context;
+		_tmp151_ = context;
 #line 939 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgba (_tmp154_, 0.25, 0.25, 0.25, 0.2);
+		cairo_set_source_rgba (_tmp151_, 0.25, 0.25, 0.25, 0.2);
 #line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp155_ = context;
+		_tmp152_ = context;
 #line 940 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_fill (_tmp155_);
+		cairo_fill (_tmp152_);
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp156_ = context;
+		_tmp153_ = context;
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp157_ = dx;
+		_tmp154_ = dx;
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp158_ = dy;
+		_tmp155_ = dy;
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp159_ = dw;
+		_tmp156_ = dw;
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp160_ = dh;
+		_tmp157_ = dh;
 #line 943 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp156_, _tmp157_ - 1.5, _tmp158_ - 1.5, (gdouble) (_tmp159_ + 3), (gdouble) (_tmp160_ + 3));
+		cairo_rectangle (_tmp153_, _tmp154_ - 1.5, _tmp155_ - 1.5, (gdouble) (_tmp156_ + 3), (gdouble) (_tmp157_ + 3));
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp161_ = context;
+		_tmp158_ = context;
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp161_, 1.0, 1.0, 1.0);
+		cairo_set_source_rgb (_tmp158_, 1.0, 1.0, 1.0);
 #line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp162_ = context;
+		_tmp159_ = context;
 #line 945 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp162_);
+		cairo_stroke (_tmp159_);
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp163_ = context;
+		_tmp160_ = context;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp164_ = dx;
+		_tmp161_ = dx;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp165_ = dy;
+		_tmp162_ = dy;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp166_ = dw;
+		_tmp163_ = dw;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp167_ = dh;
+		_tmp164_ = dh;
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_rectangle (_tmp163_, _tmp164_ - 0.5, _tmp165_ - 0.5, (gdouble) (_tmp166_ + 1), (gdouble) (_tmp167_ + 1));
+		cairo_rectangle (_tmp160_, _tmp161_ - 0.5, _tmp162_ - 0.5, (gdouble) (_tmp163_ + 1), (gdouble) (_tmp164_ + 1));
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp168_ = context;
+		_tmp165_ = context;
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_set_source_rgb (_tmp168_, 0.0, 0.0, 0.0);
+		cairo_set_source_rgb (_tmp165_, 0.0, 0.0, 0.0);
 #line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp169_ = context;
+		_tmp166_ = context;
 #line 948 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		cairo_stroke (_tmp169_);
-#line 6303 "page-view.c"
-	}
-}
-
-
-void page_view_set_width (PageView* self, gint width) {
-	gint height = 0;
-	gint _tmp0_ = 0;
-	Page* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	Page* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gboolean _tmp12_ = FALSE;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = width;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->_page;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_get_height (_tmp1_);
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->_page;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = page_get_width (_tmp4_);
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = _tmp5_;
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	height = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->width;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = width;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp8_ == _tmp9_) {
-#line 6347 "page-view.c"
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = self->priv->height;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = height;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = _tmp10_ == _tmp11_;
-#line 6356 "page-view.c"
-	} else {
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = FALSE;
-#line 6360 "page-view.c"
-	}
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = _tmp7_;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp12_) {
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 6368 "page-view.c"
-	}
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = width;
-#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->width = _tmp13_;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = height;
-#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->height = _tmp14_;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "size-changed");
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6384 "page-view.c"
-}
-
-
-void page_view_set_height (PageView* self, gint height) {
-	gint width = 0;
-	gint _tmp0_ = 0;
-	Page* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	Page* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gboolean _tmp7_ = FALSE;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	gboolean _tmp12_ = FALSE;
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_if_fail (self != NULL);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = height;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp1_ = self->priv->_page;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp2_ = page_get_width (_tmp1_);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp3_ = _tmp2_;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp4_ = self->priv->_page;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp5_ = page_get_height (_tmp4_);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = _tmp5_;
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	width = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp8_ = self->priv->width;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp9_ = width;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp8_ == _tmp9_) {
-#line 6427 "page-view.c"
-		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp10_ = self->priv->height;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp11_ = height;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = _tmp10_ == _tmp11_;
-#line 6436 "page-view.c"
-	} else {
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp7_ = FALSE;
-#line 6440 "page-view.c"
-	}
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp12_ = _tmp7_;
-#line 973 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp12_) {
-#line 974 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		return;
-#line 6448 "page-view.c"
+		cairo_stroke (_tmp166_);
+#line 6144 "page-view.c"
 	}
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = width;
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->width = _tmp13_;
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = height;
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->height = _tmp14_;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	self->priv->update_image = TRUE;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "size-changed");
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_signal_emit_by_name (self, "changed");
-#line 6464 "page-view.c"
-}
-
-
-gint page_view_get_width (PageView* self) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-#line 986 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->width;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 988 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6479 "page-view.c"
-}
-
-
-gint page_view_get_height (PageView* self) {
-	gint result = 0;
-	gint _tmp0_ = 0;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	g_return_val_if_fail (self != NULL, 0);
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp0_ = self->priv->height;
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	result = _tmp0_;
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	return result;
-#line 6494 "page-view.c"
 }
 
 
 static void page_view_page_pixels_changed_cb (PageView* self, Page* p) {
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 996 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 994 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 999 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 998 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6507 "page-view.c"
+#line 6158 "page-view.c"
 }
 
 
 static void page_view_page_size_changed_cb (PageView* self, Page* p) {
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1003 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1004 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1007 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1005 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1006 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6522 "page-view.c"
+#line 6173 "page-view.c"
 }
 
 
 static void page_view_page_overlay_changed_cb (PageView* self, Page* p) {
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1013 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1011 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6533 "page-view.c"
+#line 6184 "page-view.c"
 }
 
 
 static void page_view_scan_direction_changed_cb (PageView* self, Page* p) {
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
-#line 1016 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1014 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (p != NULL);
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->update_image = TRUE;
-#line 1020 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "size-changed");
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6548 "page-view.c"
+#line 6199 "page-view.c"
 }
 
 
@@ -6559,14 +6210,14 @@ Page* page_view_get_page (PageView* self) {
 	result = _tmp0_;
 #line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 6563 "page-view.c"
+#line 6214 "page-view.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
 #line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return self ? page_ref (self) : NULL;
-#line 6570 "page-view.c"
+#line 6221 "page-view.c"
 }
 
 
@@ -6583,7 +6234,7 @@ static void page_view_set_page (PageView* self, Page* value) {
 	_page_unref0 (self->priv->_page);
 #line 29 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_page = _tmp1_;
-#line 6587 "page-view.c"
+#line 6238 "page-view.c"
 }
 
 
@@ -6598,7 +6249,7 @@ gboolean page_view_get_selected (PageView* self) {
 	result = _tmp0_;
 #line 38 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 6602 "page-view.c"
+#line 6253 "page-view.c"
 }
 
 
@@ -6607,10 +6258,8 @@ void page_view_set_selected (PageView* self, gboolean value) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
+	gboolean _tmp11_ = FALSE;
+	gboolean _tmp12_ = FALSE;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_return_if_fail (self != NULL);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -6619,7 +6268,7 @@ void page_view_set_selected (PageView* self, gboolean value) {
 	_tmp3_ = _tmp2_;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (_tmp3_) {
-#line 6623 "page-view.c"
+#line 6272 "page-view.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
@@ -6628,68 +6277,61 @@ void page_view_set_selected (PageView* self, gboolean value) {
 		_tmp5_ = _tmp4_;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp1_ = _tmp5_;
-#line 6632 "page-view.c"
+#line 6281 "page-view.c"
 	} else {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp1_ = FALSE;
-#line 6636 "page-view.c"
+#line 6285 "page-view.c"
 	}
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp6_ = _tmp1_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp6_) {
+	if (_tmp1_) {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		_tmp0_ = TRUE;
-#line 6644 "page-view.c"
+#line 6291 "page-view.c"
 	} else {
+		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-		gboolean _tmp9_ = FALSE;
-		gboolean _tmp12_ = FALSE;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp8_ = page_view_get_selected (self);
+		_tmp7_ = page_view_get_selected (self);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp9_ = _tmp8_;
+		_tmp8_ = _tmp7_;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		if (!_tmp9_) {
-#line 6656 "page-view.c"
+		if (!_tmp8_) {
+#line 6302 "page-view.c"
+			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_ = FALSE;
-			gboolean _tmp11_ = FALSE;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp10_ = page_view_get_selected (self);
+			_tmp9_ = page_view_get_selected (self);
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp11_ = _tmp10_;
+			_tmp10_ = _tmp9_;
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp7_ = !_tmp11_;
-#line 6665 "page-view.c"
+			_tmp6_ = !_tmp10_;
+#line 6311 "page-view.c"
 		} else {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-			_tmp7_ = FALSE;
-#line 6669 "page-view.c"
+			_tmp6_ = FALSE;
+#line 6315 "page-view.c"
 		}
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp12_ = _tmp7_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-		_tmp0_ = _tmp12_;
-#line 6675 "page-view.c"
+		_tmp0_ = _tmp6_;
+#line 6319 "page-view.c"
 	}
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp13_ = _tmp0_;
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	if (_tmp13_) {
+	if (_tmp0_) {
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return;
-#line 6683 "page-view.c"
+#line 6325 "page-view.c"
 	}
 #line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp14_ = page_view_get_selected (self);
+	_tmp11_ = page_view_get_selected (self);
 #line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	_tmp15_ = _tmp14_;
+	_tmp12_ = _tmp11_;
 #line 43 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
-	page_view_set_selected (self, _tmp15_);
+	page_view_set_selected (self, _tmp12_);
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_emit_by_name (self, "changed");
-#line 6693 "page-view.c"
+#line 6335 "page-view.c"
 }
 
 
@@ -6704,7 +6346,7 @@ gint page_view_get_x_offset (PageView* self) {
 	result = _tmp0_;
 #line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 6708 "page-view.c"
+#line 6350 "page-view.c"
 }
 
 
@@ -6716,7 +6358,7 @@ void page_view_set_x_offset (PageView* self, gint value) {
 	_tmp0_ = value;
 #line 64 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_x_offset = _tmp0_;
-#line 6720 "page-view.c"
+#line 6362 "page-view.c"
 }
 
 
@@ -6731,7 +6373,7 @@ gint page_view_get_y_offset (PageView* self) {
 	result = _tmp0_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 6735 "page-view.c"
+#line 6377 "page-view.c"
 }
 
 
@@ -6743,7 +6385,7 @@ void page_view_set_y_offset (PageView* self, gint value) {
 	_tmp0_ = value;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_y_offset = _tmp0_;
-#line 6747 "page-view.c"
+#line 6389 "page-view.c"
 }
 
 
@@ -6758,7 +6400,7 @@ GdkCursorType page_view_get_cursor (PageView* self) {
 	result = _tmp0_;
 #line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return result;
-#line 6762 "page-view.c"
+#line 6404 "page-view.c"
 }
 
 
@@ -6770,14 +6412,198 @@ static void page_view_set_cursor (PageView* self, GdkCursorType value) {
 	_tmp0_ = value;
 #line 76 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->priv->_cursor = _tmp0_;
-#line 6774 "page-view.c"
+#line 6416 "page-view.c"
+}
+
+
+gint page_view_get_width (PageView* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->width_;
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = _tmp0_;
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return result;
+#line 6431 "page-view.c"
+}
+
+
+void page_view_set_width (PageView* self, gint value) {
+	gint h = 0;
+	gint _tmp0_ = 0;
+	Page* _tmp1_ = NULL;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	Page* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	gboolean _tmp7_ = FALSE;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
+	gint _tmp12_ = 0;
+	gint _tmp13_ = 0;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (self != NULL);
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = value;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = self->priv->_page;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = page_get_height (_tmp1_);
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = self->priv->_page;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = page_get_width (_tmp4_);
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = _tmp5_;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	h = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = self->priv->width_;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp9_ = value;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp8_ == _tmp9_) {
+#line 6473 "page-view.c"
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp10_ = self->priv->height_;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp11_ = h;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = _tmp10_ == _tmp11_;
+#line 6482 "page-view.c"
+	} else {
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = FALSE;
+#line 6486 "page-view.c"
+	}
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp7_) {
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		return;
+#line 6492 "page-view.c"
+	}
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp12_ = value;
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->width_ = _tmp12_;
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = h;
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->height_ = _tmp13_;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->update_image = TRUE;
+#line 968 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_emit_by_name (self, "size-changed");
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_emit_by_name (self, "changed");
+#line 6508 "page-view.c"
+}
+
+
+gint page_view_get_height (PageView* self) {
+	gint result;
+	gint _tmp0_ = 0;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_val_if_fail (self != NULL, 0);
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = self->priv->height_;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	result = _tmp0_;
+#line 975 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	return result;
+#line 6523 "page-view.c"
+}
+
+
+void page_view_set_height (PageView* self, gint value) {
+	gint w = 0;
+	gint _tmp0_ = 0;
+	Page* _tmp1_ = NULL;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	Page* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	gint _tmp6_ = 0;
+	gboolean _tmp7_ = FALSE;
+	gint _tmp8_ = 0;
+	gint _tmp9_ = 0;
+	gint _tmp12_ = 0;
+	gint _tmp13_ = 0;
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_return_if_fail (self != NULL);
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp0_ = value;
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp1_ = self->priv->_page;
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp2_ = page_get_width (_tmp1_);
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp3_ = _tmp2_;
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp4_ = self->priv->_page;
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp5_ = page_get_height (_tmp4_);
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp6_ = _tmp5_;
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	w = (gint) ((((gdouble) _tmp0_) * _tmp3_) / _tmp6_);
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp8_ = self->priv->width_;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp9_ = w;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp8_ == _tmp9_) {
+#line 6565 "page-view.c"
+		gint _tmp10_ = 0;
+		gint _tmp11_ = 0;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp10_ = self->priv->height_;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp11_ = value;
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = _tmp10_ == _tmp11_;
+#line 6574 "page-view.c"
+	} else {
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		_tmp7_ = FALSE;
+#line 6578 "page-view.c"
+	}
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	if (_tmp7_) {
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+		return;
+#line 6584 "page-view.c"
+	}
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp12_ = w;
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->width_ = _tmp12_;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	_tmp13_ = value;
+#line 984 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->height_ = _tmp13_;
+#line 987 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	self->priv->update_image = TRUE;
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_emit_by_name (self, "size-changed");
+#line 990 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
+	g_signal_emit_by_name (self, "changed");
+#line 6600 "page-view.c"
 }
 
 
 static void value_page_view_init (GValue* value) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	value->data[0].v_pointer = NULL;
-#line 6781 "page-view.c"
+#line 6607 "page-view.c"
 }
 
 
@@ -6786,7 +6612,7 @@ static void value_page_view_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (value->data[0].v_pointer);
-#line 6790 "page-view.c"
+#line 6616 "page-view.c"
 	}
 }
 
@@ -6796,11 +6622,11 @@ static void value_page_view_copy_value (const GValue* src_value, GValue* dest_va
 	if (src_value->data[0].v_pointer) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = page_view_ref (src_value->data[0].v_pointer);
-#line 6800 "page-view.c"
+#line 6626 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6804 "page-view.c"
+#line 6630 "page-view.c"
 	}
 }
 
@@ -6808,37 +6634,37 @@ static void value_page_view_copy_value (const GValue* src_value, GValue* dest_va
 static gpointer value_page_view_peek_pointer (const GValue* value) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
-#line 6812 "page-view.c"
+#line 6638 "page-view.c"
 }
 
 
 static gchar* value_page_view_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (collect_values[0].v_pointer) {
-#line 6819 "page-view.c"
+#line 6645 "page-view.c"
 		PageView* object;
 		object = collect_values[0].v_pointer;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6826 "page-view.c"
+#line 6652 "page-view.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6830 "page-view.c"
+#line 6656 "page-view.c"
 		}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = page_view_ref (object);
-#line 6834 "page-view.c"
+#line 6660 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
-#line 6838 "page-view.c"
+#line 6664 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
-#line 6842 "page-view.c"
+#line 6668 "page-view.c"
 }
 
 
@@ -6849,25 +6675,25 @@ static gchar* value_page_view_lcopy_value (const GValue* value, guint n_collect_
 	if (!object_p) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6853 "page-view.c"
+#line 6679 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (!value->data[0].v_pointer) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = NULL;
-#line 6859 "page-view.c"
+#line 6685 "page-view.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6863 "page-view.c"
+#line 6689 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		*object_p = page_view_ref (value->data[0].v_pointer);
-#line 6867 "page-view.c"
+#line 6693 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return NULL;
-#line 6871 "page-view.c"
+#line 6697 "page-view.c"
 }
 
 
@@ -6881,7 +6707,7 @@ GParamSpec* param_spec_page_view (const gchar* name, const gchar* nick, const gc
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return G_PARAM_SPEC (spec);
-#line 6885 "page-view.c"
+#line 6711 "page-view.c"
 }
 
 
@@ -6890,7 +6716,7 @@ gpointer value_get_page_view (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE_VIEW), NULL);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return value->data[0].v_pointer;
-#line 6894 "page-view.c"
+#line 6720 "page-view.c"
 }
 
 
@@ -6910,17 +6736,17 @@ void value_set_page_view (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_ref (value->data[0].v_pointer);
-#line 6914 "page-view.c"
+#line 6740 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
-#line 6918 "page-view.c"
+#line 6744 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
-#line 6924 "page-view.c"
+#line 6750 "page-view.c"
 	}
 }
 
@@ -6939,17 +6765,17 @@ void value_take_page_view (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = v_object;
-#line 6943 "page-view.c"
+#line 6769 "page-view.c"
 	} else {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		value->data[0].v_pointer = NULL;
-#line 6947 "page-view.c"
+#line 6773 "page-view.c"
 	}
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	if (old) {
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		page_view_unref (old);
-#line 6953 "page-view.c"
+#line 6779 "page-view.c"
 	}
 }
 
@@ -6965,7 +6791,7 @@ static void page_view_class_init (PageViewClass * klass) {
 	g_signal_new ("size_changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	g_signal_new ("changed", TYPE_PAGE_VIEW, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6969 "page-view.c"
+#line 6795 "page-view.c"
 }
 
 
@@ -6986,7 +6812,7 @@ static void page_view_instance_init (PageView * self) {
 	self->priv->animate_n_segments = 7;
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	self->ref_count = 1;
-#line 6990 "page-view.c"
+#line 6816 "page-view.c"
 }
 
 
@@ -7038,7 +6864,7 @@ static void page_view_finalize (PageView* obj) {
 	_page_unref0 (self->priv->_page);
 #line 32 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	_g_object_unref0 (self->priv->image);
-#line 7042 "page-view.c"
+#line 6868 "page-view.c"
 }
 
 
@@ -7063,7 +6889,7 @@ gpointer page_view_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 	return instance;
-#line 7067 "page-view.c"
+#line 6893 "page-view.c"
 }
 
 
@@ -7076,7 +6902,7 @@ void page_view_unref (gpointer instance) {
 		PAGE_VIEW_GET_CLASS (self)->finalize (self);
 #line 26 "/home/bob/bzr/simple-scan/trunk/src/page-view.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7080 "page-view.c"
+#line 6906 "page-view.c"
 	}
 }
 
diff --git a/src/page-view.vala b/src/page-view.vala
index 7ea2082..c982c4b 100644
--- a/src/page-view.vala
+++ b/src/page-view.vala
@@ -57,8 +57,8 @@ public class PageView
     private int scan_line;
 
     /* Dimensions of image to generate */
-    private int width;
-    private int height;
+    private int width_;
+    private int height_;
 
     /* Location to place this page */
     public int x_offset { get; set; }
@@ -475,7 +475,7 @@ public class PageView
 
         unowned uchar[] output = output_image.get_pixels ();
         var output_rowstride = output_image.rowstride;
-        var output_n_channels = output_image.get_n_channels ();
+        var output_n_channels = output_image.n_channels;
 
         if (!page.has_data)
         {
@@ -508,12 +508,12 @@ public class PageView
 
     private int get_preview_width ()
     {
-        return width - border_width * 2;
+        return width_ - border_width * 2;
     }
 
     private int get_preview_height ()
     {
-        return height - border_width * 2;
+        return height_ - border_width * 2;
     }
 
     private void update_page_view ()
@@ -836,8 +836,8 @@ public class PageView
         context.set_line_width (border_width);
         context.rectangle ((double)border_width / 2,
                            (double)border_width / 2,
-                           width - border_width,
-                           height - border_width);
+                           width_ - border_width,
+                           height_ - border_width);
         context.stroke ();
 
         /* Draw image */
@@ -949,48 +949,46 @@ public class PageView
         }
     }
 
-    public void set_width (int width)
+    public int width
     {
-        // FIXME: Automatically update when get updated image
-        var height = (int) ((double)width * page.height / page.width);
-        if (this.width == width && this.height == height)
-            return;
+        get { return width_; }
+        set
+        {
+            // FIXME: Automatically update when get updated image
+            var h = (int) ((double) value * page.height / page.width);
+            if (width_ == value && height_ == h)
+                return;
 
-        this.width = width;
-        this.height = height;
+            width_ = value;
+            height_ = h;
 
-        /* Regenerate image */
-        update_image = true;
+            /* Regenerate image */
+            update_image = true;
 
-        size_changed ();
-        changed ();
+            size_changed ();
+            changed ();
+        }
     }
 
-    public void set_height (int height)
+    public int height
     {
-        // FIXME: Automatically update when get updated image
-        var width = (int) ((double)height * page.width / page.height);
-        if (this.width == width && this.height == height)
-            return;
-
-        this.width = width;
-        this.height = height;
-
-        /* Regenerate image */
-        update_image = true;
+        get { return height_; }
+        set
+        {
+            // FIXME: Automatically update when get updated image
+            var w = (int) ((double) value * page.width / page.height);
+            if (width_ == w && height_ == value)
+                return;
 
-        size_changed ();
-        changed ();
-    }
+            width_ = w;
+            height_ = value;
 
-    public int get_width ()
-    {
-        return width;
-    }
+            /* Regenerate image */
+            update_image = true;
 
-    public int get_height ()
-    {
-        return height;
+            size_changed ();
+            changed ();
+        }
     }
 
     private void page_pixels_changed_cb (Page p)
diff --git a/src/page.c b/src/page.c
index d870104..9f5a9f2 100644
--- a/src/page.c
+++ b/src/page.c
@@ -1,4 +1,4 @@
-/* page.c generated by valac 0.22.1, the Vala compiler
+/* page.c generated by valac 0.24.0, the Vala compiler
  * generated from page.vala, do not modify */
 
 /*
@@ -305,9 +305,8 @@ Page* page_construct (GType object_type, gint width, gint height, gint dpi, Scan
 	Page* self = NULL;
 	gboolean _tmp0_ = FALSE;
 	ScanDirection _tmp1_ = 0;
-	gboolean _tmp3_ = FALSE;
-	gint _tmp8_ = 0;
-	ScanDirection _tmp9_ = 0;
+	gint _tmp7_ = 0;
+	ScanDirection _tmp8_ = 0;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self = (Page*) g_type_create_instance (object_type);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -316,69 +315,67 @@ Page* page_construct (GType object_type, gint width, gint height, gint dpi, Scan
 	if (_tmp1_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
-#line 320 "page.c"
+#line 319 "page.c"
 	} else {
 		ScanDirection _tmp2_ = 0;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = scan_direction;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 327 "page.c"
+#line 326 "page.c"
 	}
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = _tmp0_;
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp3_) {
-#line 333 "page.c"
+	if (_tmp0_) {
+#line 330 "page.c"
+		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-		gint _tmp5_ = 0;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = width;
+		_tmp3_ = width;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_width (self, _tmp4_);
+		page_set_scan_width (self, _tmp3_);
 #line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = height;
+		_tmp4_ = height;
 #line 179 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp5_);
-#line 344 "page.c"
+		page_set_scan_height (self, _tmp4_);
+#line 341 "page.c"
 	} else {
+		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
 #line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = height;
+		_tmp5_ = height;
 #line 183 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_width (self, _tmp6_);
+		page_set_scan_width (self, _tmp5_);
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = width;
+		_tmp6_ = width;
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp7_);
-#line 356 "page.c"
+		page_set_scan_height (self, _tmp6_);
+#line 353 "page.c"
 	}
 #line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp8_ = dpi;
+	_tmp7_ = dpi;
 #line 186 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_dpi (self, _tmp8_);
+	page_set_dpi (self, _tmp7_);
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = scan_direction;
+	_tmp8_ = scan_direction;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_direction (self, _tmp9_);
+	page_set_scan_direction (self, _tmp8_);
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
-#line 368 "page.c"
+#line 365 "page.c"
 }
 
 
 Page* page_new (gint width, gint height, gint dpi, ScanDirection scan_direction) {
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return page_construct (TYPE_PAGE, width, height, dpi, scan_direction);
-#line 375 "page.c"
+#line 372 "page.c"
 }
 
 
 static guchar* _vala_array_dup3 (guchar* self, int length) {
 #line 215 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return g_memdup (self, length * sizeof (guchar));
-#line 382 "page.c"
+#line 379 "page.c"
 }
 
 
@@ -491,14 +488,14 @@ Page* page_construct_from_data (GType object_type, gint scan_width, gint scan_he
 	page_set_crop_height (self, _tmp17_);
 #line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
-#line 495 "page.c"
+#line 492 "page.c"
 }
 
 
 Page* page_new_from_data (gint scan_width, gint scan_height, gint rowstride, gint n_channels, gint depth, gint dpi, ScanDirection scan_direction, const gchar* color_profile, guchar* pixels, int pixels_length1, gboolean has_crop, const gchar* crop_name, gint crop_x, gint crop_y, gint crop_width, gint crop_height) {
 #line 190 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return page_construct_from_data (TYPE_PAGE, scan_width, scan_height, rowstride, n_channels, depth, dpi, scan_direction, color_profile, pixels, pixels_length1, has_crop, crop_name, crop_x, crop_y, crop_width, crop_height);
-#line 502 "page.c"
+#line 499 "page.c"
 }
 
 
@@ -557,13 +554,13 @@ void page_set_page_info (Page* self, ScanPageInfo* info) {
 	_tmp8_ = self->priv->_scan_height;
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp8_ < 0) {
-#line 561 "page.c"
+#line 558 "page.c"
 		gint _tmp9_ = 0;
 #line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp9_ = self->priv->_scan_width;
 #line 235 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_scan_height (self, _tmp9_ / 2);
-#line 567 "page.c"
+#line 564 "page.c"
 	}
 #line 236 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp10_ = info;
@@ -609,7 +606,7 @@ void page_set_page_info (Page* self, ScanPageInfo* info) {
 	_tmp21_ = self->priv->_depth;
 #line 243 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp21_ == 1) {
-#line 613 "page.c"
+#line 610 "page.c"
 		guchar* _tmp22_ = NULL;
 		gint _tmp22__length1 = 0;
 		gint _tmp23_ = 0;
@@ -624,7 +621,7 @@ void page_set_page_info (Page* self, ScanPageInfo* info) {
 		_tmp24_ = self->priv->_rowstride;
 #line 244 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp22_, 0x00, (gsize) (_tmp23_ * _tmp24_));
-#line 628 "page.c"
+#line 625 "page.c"
 	} else {
 		guchar* _tmp25_ = NULL;
 		gint _tmp25__length1 = 0;
@@ -640,13 +637,13 @@ void page_set_page_info (Page* self, ScanPageInfo* info) {
 		_tmp27_ = self->priv->_rowstride;
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		memset (_tmp25_, 0xFF, (gsize) (_tmp26_ * _tmp27_));
-#line 644 "page.c"
+#line 641 "page.c"
 	}
 #line 248 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "size-changed");
 #line 249 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
-#line 650 "page.c"
+#line 647 "page.c"
 }
 
 
@@ -657,7 +654,7 @@ void page_start (Page* self) {
 	page_set_is_scanning (self, TRUE);
 #line 255 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
-#line 661 "page.c"
+#line 658 "page.c"
 }
 
 
@@ -674,7 +671,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 	gint _tmp15_ = 0;
 	ScanLine* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
-	gint _tmp33_ = 0;
+	gint _tmp32_ = 0;
 #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
 #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -691,7 +688,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 	_vala_size_changed = FALSE;
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	while (TRUE) {
-#line 695 "page.c"
+#line 692 "page.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		gint rows = 0;
@@ -711,7 +708,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 		if (!(_tmp3_ >= _tmp4_)) {
 #line 264 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 715 "page.c"
+#line 712 "page.c"
 		}
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = self->priv->_scan_height;
@@ -745,7 +742,7 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 		self->priv->_pixels_size_ = _tmp12_;
 #line 272 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_vala_size_changed = TRUE;
-#line 749 "page.c"
+#line 746 "page.c"
 	}
 #line 276 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp13_ = line_number;
@@ -761,183 +758,177 @@ static void page_parse_line (Page* self, ScanLine* line, gint n, gboolean* size_
 	_tmp17_ = _tmp16_->data_length;
 #line 277 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	line_offset = _tmp15_ * _tmp17_;
-#line 765 "page.c"
+#line 762 "page.c"
 	{
 		gint i = 0;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
-#line 770 "page.c"
+#line 767 "page.c"
 		{
 			gboolean _tmp18_ = FALSE;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp18_ = TRUE;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
-#line 777 "page.c"
-				gboolean _tmp19_ = FALSE;
-				gint _tmp21_ = 0;
-				ScanLine* _tmp22_ = NULL;
-				gint _tmp23_ = 0;
-				guchar* _tmp24_ = NULL;
-				gint _tmp24__length1 = 0;
+#line 774 "page.c"
+				gint _tmp20_ = 0;
+				ScanLine* _tmp21_ = NULL;
+				gint _tmp22_ = 0;
+				guchar* _tmp23_ = NULL;
+				gint _tmp23__length1 = 0;
+				gint _tmp24_ = 0;
 				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				ScanLine* _tmp27_ = NULL;
-				guchar* _tmp28_ = NULL;
-				gint _tmp28__length1 = 0;
+				ScanLine* _tmp26_ = NULL;
+				guchar* _tmp27_ = NULL;
+				gint _tmp27__length1 = 0;
+				gint _tmp28_ = 0;
 				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
+				guchar _tmp30_ = '\0';
 				guchar _tmp31_ = '\0';
-				guchar _tmp32_ = '\0';
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp19_ = _tmp18_;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!_tmp19_) {
-#line 797 "page.c"
-					gint _tmp20_ = 0;
+				if (!_tmp18_) {
+#line 791 "page.c"
+					gint _tmp19_ = 0;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp20_ = i;
+					_tmp19_ = i;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					i = _tmp20_ + 1;
-#line 803 "page.c"
+					i = _tmp19_ + 1;
+#line 797 "page.c"
 				}
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp18_ = FALSE;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp21_ = i;
+				_tmp20_ = i;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp22_ = line;
+				_tmp21_ = line;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp23_ = _tmp22_->data_length;
+				_tmp22_ = _tmp21_->data_length;
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!(_tmp21_ < _tmp23_)) {
+				if (!(_tmp20_ < _tmp22_)) {
 #line 278 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
-#line 817 "page.c"
+#line 811 "page.c"
 				}
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp24_ = self->priv->pixels;
+				_tmp23_ = self->priv->pixels;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp24__length1 = self->priv->pixels_length1;
+				_tmp23__length1 = self->priv->pixels_length1;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp25_ = offset;
+				_tmp24_ = offset;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp26_ = i;
+				_tmp25_ = i;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp27_ = line;
+				_tmp26_ = line;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp28_ = _tmp27_->data;
+				_tmp27_ = _tmp26_->data;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp28__length1 = _tmp27_->data_length1;
+				_tmp27__length1 = _tmp26_->data_length1;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp29_ = line_offset;
+				_tmp28_ = line_offset;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp30_ = i;
+				_tmp29_ = i;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp31_ = _tmp28_[_tmp29_ + _tmp30_];
+				_tmp30_ = _tmp27_[_tmp28_ + _tmp29_];
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp24_[_tmp25_ + _tmp26_] = _tmp31_;
+				_tmp23_[_tmp24_ + _tmp25_] = _tmp30_;
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp32_ = _tmp24_[_tmp25_ + _tmp26_];
-#line 843 "page.c"
+				_tmp31_ = _tmp23_[_tmp24_ + _tmp25_];
+#line 837 "page.c"
 			}
 		}
 	}
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp33_ = line_number;
+	_tmp32_ = line_number;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_scan_line (self, _tmp33_);
+	page_set_scan_line (self, _tmp32_);
 #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (size_changed) {
 #line 258 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*size_changed = _vala_size_changed;
-#line 855 "page.c"
+#line 849 "page.c"
 	}
 }
 
 
 void page_parse_scan_line (Page* self, ScanLine* line) {
 	gboolean size_has_changed = FALSE;
-	gboolean _tmp9_ = FALSE;
+	gboolean _tmp8_ = FALSE;
 #line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
 #line 284 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (line != NULL);
 #line 286 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
-#line 869 "page.c"
+#line 863 "page.c"
 	{
 		gint i = 0;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		i = 0;
-#line 874 "page.c"
+#line 868 "page.c"
 		{
 			gboolean _tmp0_ = FALSE;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp0_ = TRUE;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
-#line 881 "page.c"
-				gboolean _tmp1_ = FALSE;
-				gint _tmp3_ = 0;
-				ScanLine* _tmp4_ = NULL;
-				gint _tmp5_ = 0;
-				ScanLine* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gboolean _tmp8_ = FALSE;
+#line 875 "page.c"
+				gint _tmp2_ = 0;
+				ScanLine* _tmp3_ = NULL;
+				gint _tmp4_ = 0;
+				ScanLine* _tmp5_ = NULL;
+				gint _tmp6_ = 0;
+				gboolean _tmp7_ = FALSE;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp1_ = _tmp0_;
+				if (!_tmp0_) {
+#line 884 "page.c"
+					gint _tmp1_ = 0;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!_tmp1_) {
-#line 893 "page.c"
-					gint _tmp2_ = 0;
+					_tmp1_ = i;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp2_ = i;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					i = _tmp2_ + 1;
-#line 899 "page.c"
+					i = _tmp1_ + 1;
+#line 890 "page.c"
 				}
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp0_ = FALSE;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp3_ = i;
+				_tmp2_ = i;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp4_ = line;
+				_tmp3_ = line;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp5_ = _tmp4_->n_lines;
+				_tmp4_ = _tmp3_->n_lines;
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!(_tmp3_ < _tmp5_)) {
+				if (!(_tmp2_ < _tmp4_)) {
 #line 287 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
-#line 913 "page.c"
+#line 904 "page.c"
 				}
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp6_ = line;
+				_tmp5_ = line;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp7_ = i;
+				_tmp6_ = i;
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				page_parse_line (self, _tmp6_, _tmp7_, &_tmp8_);
+				page_parse_line (self, _tmp5_, _tmp6_, &_tmp7_);
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				size_has_changed = _tmp8_;
-#line 923 "page.c"
+				size_has_changed = _tmp7_;
+#line 914 "page.c"
 			}
 		}
 	}
 #line 290 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_data (self, TRUE);
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp9_ = size_has_changed;
+	_tmp8_ = size_has_changed;
 #line 292 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp9_) {
+	if (_tmp8_) {
 #line 293 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
-#line 935 "page.c"
+#line 926 "page.c"
 	}
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "pixels-changed");
-#line 941 "page.c"
+#line 932 "page.c"
 }
 
 
@@ -945,8 +936,7 @@ void page_finish (Page* self) {
 	gboolean size_has_changed = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_ = 0;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp12_ = FALSE;
+	gboolean _tmp11_ = FALSE;
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -955,7 +945,7 @@ void page_finish (Page* self) {
 	_tmp1_ = self->priv->expected_rows;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_ < 0) {
-#line 959 "page.c"
+#line 949 "page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -964,72 +954,70 @@ void page_finish (Page* self) {
 		_tmp3_ = self->priv->_scan_height;
 #line 304 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_ != _tmp3_;
-#line 968 "page.c"
+#line 958 "page.c"
 	} else {
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
-#line 972 "page.c"
+#line 962 "page.c"
 	}
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp4_ = _tmp0_;
-#line 303 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp4_) {
-#line 978 "page.c"
+	if (_tmp0_) {
+#line 966 "page.c"
 		gint rows = 0;
+		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
 #line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = self->priv->_scan_height;
+		_tmp4_ = self->priv->_scan_height;
 #line 306 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		rows = _tmp5_;
+		rows = _tmp4_;
 #line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_scan_line;
+		_tmp5_ = self->priv->_scan_line;
 #line 307 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		page_set_scan_height (self, _tmp6_);
+		page_set_scan_height (self, _tmp5_);
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->_scan_height;
+		_tmp6_ = self->priv->_scan_height;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = self->priv->_rowstride;
+		_tmp7_ = self->priv->_rowstride;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = _tmp7_ * _tmp8_;
+		_tmp8_ = _tmp6_ * _tmp7_;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp7_ * _tmp8_);
+		self->priv->pixels = g_renew (guchar, self->priv->pixels, _tmp6_ * _tmp7_);
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		(_tmp9_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp9_ - self->priv->pixels_length1)) : NULL;
+		(_tmp8_ > self->priv->pixels_length1) ? memset (self->priv->pixels + self->priv->pixels_length1, 0, sizeof (guchar) * (_tmp8_ - self->priv->pixels_length1)) : NULL;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->pixels_length1 = _tmp9_;
+		self->priv->pixels_length1 = _tmp8_;
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		self->priv->_pixels_size_ = _tmp9_;
+		self->priv->_pixels_size_ = _tmp8_;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = rows;
+		_tmp9_ = rows;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = self->priv->_scan_height;
+		_tmp10_ = self->priv->_scan_height;
 #line 309 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		g_debug ("page.vala:309: Trimming page from %d lines to %d lines", _tmp10_, _tmp11_);
+		g_debug ("page.vala:309: Trimming page from %d lines to %d lines", _tmp9_, _tmp10_);
 #line 311 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
-#line 1017 "page.c"
+#line 1005 "page.c"
 	}
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_is_scanning (self, FALSE);
 #line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp12_ = size_has_changed;
+	_tmp11_ = size_has_changed;
 #line 315 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp12_) {
+	if (_tmp11_) {
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
-#line 1027 "page.c"
+#line 1015 "page.c"
 	}
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-line-changed");
 #line 318 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-finished");
-#line 1033 "page.c"
+#line 1021 "page.c"
 }
 
 
@@ -1046,48 +1034,48 @@ void page_rotate_left (Page* self) {
 	switch (_tmp1_) {
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1050 "page.c"
+#line 1038 "page.c"
 		{
 #line 326 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
 #line 327 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1056 "page.c"
+#line 1044 "page.c"
 		}
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1060 "page.c"
+#line 1048 "page.c"
 		{
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
 #line 330 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1066 "page.c"
+#line 1054 "page.c"
 		}
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1070 "page.c"
+#line 1058 "page.c"
 		{
 #line 332 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
 #line 333 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1076 "page.c"
+#line 1064 "page.c"
 		}
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1080 "page.c"
+#line 1068 "page.c"
 		{
 #line 335 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1086 "page.c"
+#line 1074 "page.c"
 		}
 		default:
 #line 323 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
-#line 1091 "page.c"
+#line 1079 "page.c"
 	}
 }
 
@@ -1105,48 +1093,48 @@ void page_rotate_right (Page* self) {
 	switch (_tmp1_) {
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1109 "page.c"
+#line 1097 "page.c"
 		{
 #line 345 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_RIGHT_TO_LEFT);
 #line 346 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1115 "page.c"
+#line 1103 "page.c"
 		}
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1119 "page.c"
+#line 1107 "page.c"
 		{
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_TOP_TO_BOTTOM);
 #line 349 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1125 "page.c"
+#line 1113 "page.c"
 		}
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1129 "page.c"
+#line 1117 "page.c"
 		{
 #line 351 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_LEFT_TO_RIGHT);
 #line 352 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1135 "page.c"
+#line 1123 "page.c"
 		}
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1139 "page.c"
+#line 1127 "page.c"
 		{
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_scan_direction (self, SCAN_DIRECTION_BOTTOM_TO_TOP);
 #line 355 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1145 "page.c"
+#line 1133 "page.c"
 		}
 		default:
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
-#line 1150 "page.c"
+#line 1138 "page.c"
 	}
 }
 
@@ -1161,7 +1149,7 @@ void page_set_no_crop (Page* self) {
 	if (!_tmp0_) {
 #line 362 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 1165 "page.c"
+#line 1153 "page.c"
 	}
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_crop (self, FALSE);
@@ -1177,7 +1165,7 @@ void page_set_no_crop (Page* self) {
 	page_set_crop_height (self, 0);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1181 "page.c"
+#line 1169 "page.c"
 }
 
 
@@ -1188,11 +1176,8 @@ void page_set_custom_crop (Page* self, gint width, gint height) {
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
 	const gchar* _tmp5_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	gboolean _tmp10_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
+	gint _tmp11_ = 0;
+	gint _tmp12_ = 0;
 #line 372 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1207,79 +1192,73 @@ void page_set_custom_crop (Page* self, gint width, gint height) {
 	_tmp5_ = self->priv->_crop_name;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ == NULL) {
-#line 1211 "page.c"
+#line 1196 "page.c"
 		gboolean _tmp6_ = FALSE;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp6_ = self->priv->_has_crop;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = _tmp6_;
-#line 1217 "page.c"
+#line 1202 "page.c"
 	} else {
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp4_ = FALSE;
-#line 1221 "page.c"
+#line 1206 "page.c"
 	}
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp7_ = _tmp4_;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp7_) {
-#line 1227 "page.c"
+	if (_tmp4_) {
+#line 1210 "page.c"
+		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = self->priv->_crop_width;
+		_tmp7_ = self->priv->_crop_width;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = width;
+		_tmp8_ = width;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp3_ = _tmp8_ == _tmp9_;
-#line 1236 "page.c"
+		_tmp3_ = _tmp7_ == _tmp8_;
+#line 1219 "page.c"
 	} else {
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp3_ = FALSE;
-#line 1240 "page.c"
+#line 1223 "page.c"
 	}
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp10_ = _tmp3_;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp10_) {
-#line 1246 "page.c"
-		gint _tmp11_ = 0;
-		gint _tmp12_ = 0;
+	if (_tmp3_) {
+#line 1227 "page.c"
+		gint _tmp9_ = 0;
+		gint _tmp10_ = 0;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = self->priv->_crop_height;
+		_tmp9_ = self->priv->_crop_height;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = height;
+		_tmp10_ = height;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp2_ = _tmp11_ == _tmp12_;
-#line 1255 "page.c"
+		_tmp2_ = _tmp9_ == _tmp10_;
+#line 1236 "page.c"
 	} else {
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = FALSE;
-#line 1259 "page.c"
+#line 1240 "page.c"
 	}
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp13_ = _tmp2_;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp13_) {
+	if (_tmp2_) {
 #line 378 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 1267 "page.c"
+#line 1246 "page.c"
 	}
 #line 379 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_crop_name (self, NULL);
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	page_set_has_crop (self, TRUE);
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp14_ = width;
+	_tmp11_ = width;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_width (self, _tmp14_);
+	page_set_crop_width (self, _tmp11_);
 #line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp15_ = height;
+	_tmp12_ = height;
 #line 383 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	page_set_crop_height (self, _tmp15_);
+	page_set_crop_height (self, _tmp12_);
 #line 396 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1283 "page.c"
+#line 1262 "page.c"
 }
 
 
@@ -1301,7 +1280,7 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	static GQuark _tmp2_label4 = 0;
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	static GQuark _tmp2_label5 = 0;
-#line 1305 "page.c"
+#line 1284 "page.c"
 	const gchar* _tmp5_ = NULL;
 	gint pw = 0;
 	gint _tmp6_ = 0;
@@ -1333,7 +1312,7 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("A4")))) {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1337 "page.c"
+#line 1316 "page.c"
 			default:
 			{
 #line 405 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1342,13 +1321,13 @@ void page_set_named_crop (Page* self, const gchar* name) {
 				h = 11.7;
 #line 407 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1346 "page.c"
+#line 1325 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("A5")))) {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1352 "page.c"
+#line 1331 "page.c"
 			default:
 			{
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1357,13 +1336,13 @@ void page_set_named_crop (Page* self, const gchar* name) {
 				h = 8.3;
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1361 "page.c"
+#line 1340 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("A6")))) {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1367 "page.c"
+#line 1346 "page.c"
 			default:
 			{
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1372,13 +1351,13 @@ void page_set_named_crop (Page* self, const gchar* name) {
 				h = 5.8;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1376 "page.c"
+#line 1355 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("letter")))) {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1382 "page.c"
+#line 1361 "page.c"
 			default:
 			{
 #line 417 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1387,13 +1366,13 @@ void page_set_named_crop (Page* self, const gchar* name) {
 				h = (gdouble) 11;
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1391 "page.c"
+#line 1370 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label4) ? _tmp2_label4 : (_tmp2_label4 = g_quark_from_static_string ("legal")))) {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1397 "page.c"
+#line 1376 "page.c"
 			default:
 			{
 #line 421 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1402,13 +1381,13 @@ void page_set_named_crop (Page* self, const gchar* name) {
 				h = (gdouble) 14;
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1406 "page.c"
+#line 1385 "page.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label5) ? _tmp2_label5 : (_tmp2_label5 = g_quark_from_static_string ("4x6")))) {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1412 "page.c"
+#line 1391 "page.c"
 			default:
 			{
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1417,13 +1396,13 @@ void page_set_named_crop (Page* self, const gchar* name) {
 				h = (gdouble) 6;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 1421 "page.c"
+#line 1400 "page.c"
 			}
 		}
 	} else {
 #line 402 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		switch (0) {
-#line 1427 "page.c"
+#line 1406 "page.c"
 			default:
 			{
 				const gchar* _tmp4_ = NULL;
@@ -1433,7 +1412,7 @@ void page_set_named_crop (Page* self, const gchar* name) {
 				g_warning ("page.vala:429: Unknown paper size '%s'", _tmp4_);
 #line 430 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
-#line 1437 "page.c"
+#line 1416 "page.c"
 			}
 		}
 	}
@@ -1461,7 +1440,7 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	_tmp11_ = ph;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_ > _tmp11_) {
-#line 1465 "page.c"
+#line 1444 "page.c"
 		gdouble t = 0.0;
 		gdouble _tmp12_ = 0.0;
 		gdouble _tmp13_ = 0.0;
@@ -1478,7 +1457,7 @@ void page_set_named_crop (Page* self, const gchar* name) {
 		_tmp14_ = t;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		h = _tmp14_;
-#line 1482 "page.c"
+#line 1461 "page.c"
 	}
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp15_ = w;
@@ -1498,7 +1477,7 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	_tmp20_ = pw;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp19_ < _tmp20_) {
-#line 1502 "page.c"
+#line 1481 "page.c"
 		gint _tmp21_ = 0;
 		gint _tmp22_ = 0;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1507,11 +1486,11 @@ void page_set_named_crop (Page* self, const gchar* name) {
 		_tmp22_ = self->priv->_crop_width;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_x (self, (_tmp21_ - _tmp22_) / 2);
-#line 1511 "page.c"
+#line 1490 "page.c"
 	} else {
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_x (self, 0);
-#line 1515 "page.c"
+#line 1494 "page.c"
 	}
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp23_ = self->priv->_crop_height;
@@ -1519,7 +1498,7 @@ void page_set_named_crop (Page* self, const gchar* name) {
 	_tmp24_ = ph;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp23_ < _tmp24_) {
-#line 1523 "page.c"
+#line 1502 "page.c"
 		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1528,15 +1507,15 @@ void page_set_named_crop (Page* self, const gchar* name) {
 		_tmp26_ = self->priv->_crop_height;
 #line 456 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_y (self, (_tmp25_ - _tmp26_) / 2);
-#line 1532 "page.c"
+#line 1511 "page.c"
 	} else {
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_set_crop_y (self, 0);
-#line 1536 "page.c"
+#line 1515 "page.c"
 	}
 #line 459 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1540 "page.c"
+#line 1519 "page.c"
 }
 
 
@@ -1587,7 +1566,7 @@ void page_move_crop (Page* self, gint x, gint y) {
 	page_set_crop_y (self, _tmp9_);
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1591 "page.c"
+#line 1570 "page.c"
 }
 
 
@@ -1606,7 +1585,7 @@ void page_rotate_crop (Page* self) {
 	if (!_tmp0_) {
 #line 477 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 1610 "page.c"
+#line 1589 "page.c"
 	}
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp1_ = self->priv->_crop_width;
@@ -1624,7 +1603,7 @@ void page_rotate_crop (Page* self) {
 	_tmp4_ = self->priv->_crop_name;
 #line 484 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ == NULL) {
-#line 1628 "page.c"
+#line 1607 "page.c"
 		gint w = 0;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
@@ -1659,7 +1638,7 @@ void page_rotate_crop (Page* self) {
 		_tmp11_ = w;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if ((_tmp9_ + _tmp10_) > _tmp11_) {
-#line 1663 "page.c"
+#line 1642 "page.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1668,13 +1647,13 @@ void page_rotate_crop (Page* self) {
 			_tmp13_ = self->priv->_crop_width;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_x (self, _tmp12_ - _tmp13_);
-#line 1672 "page.c"
+#line 1651 "page.c"
 		}
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp14_ = self->priv->_crop_x;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp14_ < 0) {
-#line 1678 "page.c"
+#line 1657 "page.c"
 			gint _tmp15_ = 0;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_x (self, 0);
@@ -1682,7 +1661,7 @@ void page_rotate_crop (Page* self) {
 			_tmp15_ = w;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_width (self, _tmp15_);
-#line 1686 "page.c"
+#line 1665 "page.c"
 		}
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = self->priv->_crop_y;
@@ -1692,7 +1671,7 @@ void page_rotate_crop (Page* self) {
 		_tmp18_ = h;
 #line 496 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if ((_tmp16_ + _tmp17_) > _tmp18_) {
-#line 1696 "page.c"
+#line 1675 "page.c"
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1701,13 +1680,13 @@ void page_rotate_crop (Page* self) {
 			_tmp20_ = self->priv->_crop_height;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_y (self, _tmp19_ - _tmp20_);
-#line 1705 "page.c"
+#line 1684 "page.c"
 		}
 #line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp21_ = self->priv->_crop_y;
 #line 498 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp21_ < 0) {
-#line 1711 "page.c"
+#line 1690 "page.c"
 			gint _tmp22_ = 0;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_y (self, 0);
@@ -1715,12 +1694,12 @@ void page_rotate_crop (Page* self) {
 			_tmp22_ = h;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			page_set_crop_height (self, _tmp22_);
-#line 1719 "page.c"
+#line 1698 "page.c"
 		}
 	}
 #line 505 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "crop-changed");
-#line 1724 "page.c"
+#line 1703 "page.c"
 }
 
 
@@ -1744,13 +1723,13 @@ guchar* page_get_pixels (Page* self, int* result_length1) {
 	if (result_length1) {
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*result_length1 = _tmp1__length1;
-#line 1748 "page.c"
+#line 1727 "page.c"
 	}
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = _tmp1_;
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 1754 "page.c"
+#line 1733 "page.c"
 }
 
 
@@ -1762,7 +1741,7 @@ static guchar page_get_sample (Page* self, guchar* pixels, int pixels_length1, g
 	result = (guchar) 0xFF;
 #line 517 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 1766 "page.c"
+#line 1745 "page.c"
 }
 
 
@@ -1774,40 +1753,39 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 	gint _tmp15_ = 0;
 	gboolean _tmp16_ = FALSE;
 	gint _tmp17_ = 0;
-	gboolean _tmp19_ = FALSE;
-	guchar* _tmp103_ = NULL;
-	gint _tmp103__length1 = 0;
+	guchar* _tmp98_ = NULL;
+	gint _tmp98__length1 = 0;
+	gint _tmp99_ = 0;
+	guchar* _tmp100_ = NULL;
+	gint _tmp100__length1 = 0;
+	gint _tmp101_ = 0;
+	gint _tmp102_ = 0;
+	gint _tmp103_ = 0;
 	gint _tmp104_ = 0;
-	guchar* _tmp105_ = NULL;
-	gint _tmp105__length1 = 0;
-	gint _tmp106_ = 0;
-	gint _tmp107_ = 0;
+	guchar _tmp105_ = '\0';
+	guchar _tmp106_ = '\0';
+	guchar* _tmp107_ = NULL;
+	gint _tmp107__length1 = 0;
 	gint _tmp108_ = 0;
-	gint _tmp109_ = 0;
-	guchar _tmp110_ = '\0';
-	guchar _tmp111_ = '\0';
-	guchar* _tmp112_ = NULL;
-	gint _tmp112__length1 = 0;
+	guchar* _tmp109_ = NULL;
+	gint _tmp109__length1 = 0;
+	gint _tmp110_ = 0;
+	gint _tmp111_ = 0;
+	gint _tmp112_ = 0;
 	gint _tmp113_ = 0;
-	guchar* _tmp114_ = NULL;
-	gint _tmp114__length1 = 0;
-	gint _tmp115_ = 0;
-	gint _tmp116_ = 0;
+	guchar _tmp114_ = '\0';
+	guchar _tmp115_ = '\0';
+	guchar* _tmp116_ = NULL;
+	gint _tmp116__length1 = 0;
 	gint _tmp117_ = 0;
-	gint _tmp118_ = 0;
-	guchar _tmp119_ = '\0';
-	guchar _tmp120_ = '\0';
-	guchar* _tmp121_ = NULL;
-	gint _tmp121__length1 = 0;
+	guchar* _tmp118_ = NULL;
+	gint _tmp118__length1 = 0;
+	gint _tmp119_ = 0;
+	gint _tmp120_ = 0;
+	gint _tmp121_ = 0;
 	gint _tmp122_ = 0;
-	guchar* _tmp123_ = NULL;
-	gint _tmp123__length1 = 0;
-	gint _tmp124_ = 0;
-	gint _tmp125_ = 0;
-	gint _tmp126_ = 0;
-	gint _tmp127_ = 0;
-	guchar _tmp128_ = '\0';
-	guchar _tmp129_ = '\0';
+	guchar _tmp123_ = '\0';
+	guchar _tmp124_ = '\0';
 #line 521 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_if_fail (self != NULL);
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -1818,15 +1796,15 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 	switch (_tmp1_) {
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 1822 "page.c"
+#line 1800 "page.c"
 		{
 #line 526 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1826 "page.c"
+#line 1804 "page.c"
 		}
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 1830 "page.c"
+#line 1808 "page.c"
 		{
 			gint _tmp2_ = 0;
 			gint _tmp3_ = 0;
@@ -1846,11 +1824,11 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			y = (_tmp4_ - _tmp5_) - 1;
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1850 "page.c"
+#line 1828 "page.c"
 		}
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 1854 "page.c"
+#line 1832 "page.c"
 		{
 			gint t = 0;
 			gint _tmp6_ = 0;
@@ -1873,11 +1851,11 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			y = _tmp9_;
 #line 535 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1877 "page.c"
+#line 1855 "page.c"
 		}
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 1881 "page.c"
+#line 1859 "page.c"
 		{
 			gint t = 0;
 			gint _tmp10_ = 0;
@@ -1900,12 +1878,12 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 			y = (_tmp12_ - _tmp13_) - 1;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 1904 "page.c"
+#line 1882 "page.c"
 		}
 		default:
 #line 523 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		break;
-#line 1909 "page.c"
+#line 1887 "page.c"
 	}
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp14_ = self->priv->_rowstride;
@@ -1917,172 +1895,173 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 	_tmp17_ = self->priv->_depth;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp17_ == 8) {
-#line 1921 "page.c"
+#line 1899 "page.c"
 		gint _tmp18_ = 0;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp18_ = self->priv->_n_channels;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = _tmp18_ == 3;
-#line 1927 "page.c"
+#line 1905 "page.c"
 	} else {
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp16_ = FALSE;
-#line 1931 "page.c"
+#line 1909 "page.c"
 	}
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp19_ = _tmp16_;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp19_) {
-#line 1937 "page.c"
+	if (_tmp16_) {
+#line 1913 "page.c"
 		gint o = 0;
+		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
 		gint _tmp21_ = 0;
-		gint _tmp22_ = 0;
-		guchar* _tmp23_ = NULL;
-		gint _tmp23__length1 = 0;
-		gint _tmp24_ = 0;
-		guchar* _tmp25_ = NULL;
-		gint _tmp25__length1 = 0;
-		gint _tmp26_ = 0;
+		guchar* _tmp22_ = NULL;
+		gint _tmp22__length1 = 0;
+		gint _tmp23_ = 0;
+		guchar* _tmp24_ = NULL;
+		gint _tmp24__length1 = 0;
+		gint _tmp25_ = 0;
+		guchar _tmp26_ = '\0';
 		guchar _tmp27_ = '\0';
-		guchar _tmp28_ = '\0';
-		guchar* _tmp29_ = NULL;
-		gint _tmp29__length1 = 0;
-		gint _tmp30_ = 0;
-		guchar* _tmp31_ = NULL;
-		gint _tmp31__length1 = 0;
-		gint _tmp32_ = 0;
+		guchar* _tmp28_ = NULL;
+		gint _tmp28__length1 = 0;
+		gint _tmp29_ = 0;
+		guchar* _tmp30_ = NULL;
+		gint _tmp30__length1 = 0;
+		gint _tmp31_ = 0;
+		guchar _tmp32_ = '\0';
 		guchar _tmp33_ = '\0';
-		guchar _tmp34_ = '\0';
-		guchar* _tmp35_ = NULL;
-		gint _tmp35__length1 = 0;
-		gint _tmp36_ = 0;
-		guchar* _tmp37_ = NULL;
-		gint _tmp37__length1 = 0;
-		gint _tmp38_ = 0;
+		guchar* _tmp34_ = NULL;
+		gint _tmp34__length1 = 0;
+		gint _tmp35_ = 0;
+		guchar* _tmp36_ = NULL;
+		gint _tmp36__length1 = 0;
+		gint _tmp37_ = 0;
+		guchar _tmp38_ = '\0';
 		guchar _tmp39_ = '\0';
-		guchar _tmp40_ = '\0';
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp20_ = line_offset;
+		_tmp19_ = line_offset;
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp21_ = x;
+		_tmp20_ = x;
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = self->priv->_n_channels;
+		_tmp21_ = self->priv->_n_channels;
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		o = _tmp20_ + (_tmp21_ * _tmp22_);
+		o = _tmp19_ + (_tmp20_ * _tmp21_);
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = pixel;
+		_tmp22_ = pixel;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23__length1 = pixel_length1;
+		_tmp22__length1 = pixel_length1;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = offset;
+		_tmp23_ = offset;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = self->priv->pixels;
+		_tmp24_ = self->priv->pixels;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25__length1 = self->priv->pixels_length1;
+		_tmp24__length1 = self->priv->pixels_length1;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp26_ = o;
+		_tmp25_ = o;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp27_ = _tmp25_[_tmp26_];
+		_tmp26_ = _tmp24_[_tmp25_];
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_[_tmp24_ + 0] = _tmp27_;
+		_tmp22_[_tmp23_ + 0] = _tmp26_;
 #line 549 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp28_ = _tmp23_[_tmp24_ + 0];
+		_tmp27_ = _tmp22_[_tmp23_ + 0];
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp29_ = pixel;
+		_tmp28_ = pixel;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp29__length1 = pixel_length1;
+		_tmp28__length1 = pixel_length1;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp30_ = offset;
+		_tmp29_ = offset;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp31_ = self->priv->pixels;
+		_tmp30_ = self->priv->pixels;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp31__length1 = self->priv->pixels_length1;
+		_tmp30__length1 = self->priv->pixels_length1;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp32_ = o;
+		_tmp31_ = o;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp33_ = _tmp31_[_tmp32_ + 1];
+		_tmp32_ = _tmp30_[_tmp31_ + 1];
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp29_[_tmp30_ + 1] = _tmp33_;
+		_tmp28_[_tmp29_ + 1] = _tmp32_;
 #line 550 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp34_ = _tmp29_[_tmp30_ + 1];
+		_tmp33_ = _tmp28_[_tmp29_ + 1];
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp35_ = pixel;
+		_tmp34_ = pixel;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp35__length1 = pixel_length1;
+		_tmp34__length1 = pixel_length1;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp36_ = offset;
+		_tmp35_ = offset;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp37_ = self->priv->pixels;
+		_tmp36_ = self->priv->pixels;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp37__length1 = self->priv->pixels_length1;
+		_tmp36__length1 = self->priv->pixels_length1;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp38_ = o;
+		_tmp37_ = o;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp39_ = _tmp37_[_tmp38_ + 2];
+		_tmp38_ = _tmp36_[_tmp37_ + 2];
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp35_[_tmp36_ + 2] = _tmp39_;
+		_tmp34_[_tmp35_ + 2] = _tmp38_;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp40_ = _tmp35_[_tmp36_ + 2];
+		_tmp39_ = _tmp34_[_tmp35_ + 2];
 #line 552 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 2030 "page.c"
+#line 2006 "page.c"
 	} else {
-		gboolean _tmp41_ = FALSE;
-		gint _tmp42_ = 0;
-		gboolean _tmp44_ = FALSE;
+		gboolean _tmp40_ = FALSE;
+		gint _tmp41_ = 0;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp42_ = self->priv->_depth;
+		_tmp41_ = self->priv->_depth;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp42_ == 8) {
-#line 2039 "page.c"
-			gint _tmp43_ = 0;
+		if (_tmp41_ == 8) {
+#line 2014 "page.c"
+			gint _tmp42_ = 0;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp43_ = self->priv->_n_channels;
+			_tmp42_ = self->priv->_n_channels;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp41_ = _tmp43_ == 1;
-#line 2045 "page.c"
+			_tmp40_ = _tmp42_ == 1;
+#line 2020 "page.c"
 		} else {
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp41_ = FALSE;
-#line 2049 "page.c"
+			_tmp40_ = FALSE;
+#line 2024 "page.c"
 		}
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp44_ = _tmp41_;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp44_) {
-#line 2055 "page.c"
+		if (_tmp40_) {
+#line 2028 "page.c"
 			guchar p = '\0';
-			guchar* _tmp45_ = NULL;
-			gint _tmp45__length1 = 0;
-			gint _tmp46_ = 0;
-			gint _tmp47_ = 0;
-			guchar _tmp48_ = '\0';
+			guchar* _tmp43_ = NULL;
+			gint _tmp43__length1 = 0;
+			gint _tmp44_ = 0;
+			gint _tmp45_ = 0;
+			guchar _tmp46_ = '\0';
+			guchar* _tmp47_ = NULL;
+			gint _tmp47__length1 = 0;
+			gint _tmp48_ = 0;
 			guchar* _tmp49_ = NULL;
 			gint _tmp49__length1 = 0;
 			gint _tmp50_ = 0;
 			guchar* _tmp51_ = NULL;
 			gint _tmp51__length1 = 0;
 			gint _tmp52_ = 0;
-			guchar* _tmp53_ = NULL;
-			gint _tmp53__length1 = 0;
-			gint _tmp54_ = 0;
+			guchar _tmp53_ = '\0';
+			guchar _tmp54_ = '\0';
 			guchar _tmp55_ = '\0';
 			guchar _tmp56_ = '\0';
-			guchar _tmp57_ = '\0';
-			guchar _tmp58_ = '\0';
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45_ = self->priv->pixels;
+			_tmp43_ = self->priv->pixels;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp45__length1 = self->priv->pixels_length1;
+			_tmp43__length1 = self->priv->pixels_length1;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp46_ = line_offset;
+			_tmp44_ = line_offset;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp47_ = x;
+			_tmp45_ = x;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp48_ = _tmp45_[_tmp46_ + _tmp47_];
+			_tmp46_ = _tmp43_[_tmp44_ + _tmp45_];
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			p = _tmp48_;
+			p = _tmp46_;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp47_ = pixel;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp47__length1 = pixel_length1;
+#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
+			_tmp48_ = offset;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp49_ = pixel;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -2096,333 +2075,318 @@ static void page_get_pixel (Page* self, gint x, gint y, guchar* pixel, int pixel
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp52_ = offset;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp53_ = pixel;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp53__length1 = pixel_length1;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp54_ = offset;
+			_tmp53_ = p;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp55_ = p;
+			_tmp51_[_tmp52_ + 2] = _tmp53_;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp53_[_tmp54_ + 2] = _tmp55_;
+			_tmp54_ = _tmp51_[_tmp52_ + 2];
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp56_ = _tmp53_[_tmp54_ + 2];
+			_tmp49_[_tmp50_ + 1] = _tmp54_;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp51_[_tmp52_ + 1] = _tmp56_;
+			_tmp55_ = _tmp49_[_tmp50_ + 1];
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp57_ = _tmp51_[_tmp52_ + 1];
+			_tmp47_[_tmp48_ + 0] = _tmp55_;
 #line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp49_[_tmp50_ + 0] = _tmp57_;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp58_ = _tmp49_[_tmp50_ + 0];
+			_tmp56_ = _tmp47_[_tmp48_ + 0];
 #line 558 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
-#line 2121 "page.c"
+#line 2094 "page.c"
 		} else {
-			gboolean _tmp59_ = FALSE;
-			gint _tmp60_ = 0;
-			gboolean _tmp62_ = FALSE;
+			gboolean _tmp57_ = FALSE;
+			gint _tmp58_ = 0;
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp60_ = self->priv->_depth;
+			_tmp58_ = self->priv->_depth;
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp60_ == 1) {
-#line 2130 "page.c"
-				gint _tmp61_ = 0;
+			if (_tmp58_ == 1) {
+#line 2102 "page.c"
+				gint _tmp59_ = 0;
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp61_ = self->priv->_n_channels;
+				_tmp59_ = self->priv->_n_channels;
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp59_ = _tmp61_ == 1;
-#line 2136 "page.c"
+				_tmp57_ = _tmp59_ == 1;
+#line 2108 "page.c"
 			} else {
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp59_ = FALSE;
-#line 2140 "page.c"
+				_tmp57_ = FALSE;
+#line 2112 "page.c"
 			}
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp62_ = _tmp59_;
-#line 562 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			if (_tmp62_) {
-#line 2146 "page.c"
+			if (_tmp57_) {
+#line 2116 "page.c"
 				guchar p = '\0';
-				guchar* _tmp63_ = NULL;
-				gint _tmp63__length1 = 0;
+				guchar* _tmp60_ = NULL;
+				gint _tmp60__length1 = 0;
+				gint _tmp61_ = 0;
+				gint _tmp62_ = 0;
+				guchar _tmp63_ = '\0';
 				gint _tmp64_ = 0;
-				gint _tmp65_ = 0;
-				guchar _tmp66_ = '\0';
-				gint _tmp67_ = 0;
-				guchar _tmp68_ = '\0';
-				gint _tmp69_ = 0;
-				guchar* _tmp70_ = NULL;
-				gint _tmp70__length1 = 0;
-				gint _tmp71_ = 0;
-				guchar* _tmp72_ = NULL;
-				gint _tmp72__length1 = 0;
-				gint _tmp73_ = 0;
-				guchar* _tmp74_ = NULL;
-				gint _tmp74__length1 = 0;
-				gint _tmp75_ = 0;
-				gint _tmp76_ = 0;
-				guchar _tmp77_ = '\0';
-				guchar _tmp78_ = '\0';
-				guchar _tmp79_ = '\0';
+				guchar _tmp65_ = '\0';
+				gint _tmp66_ = 0;
+				guchar* _tmp67_ = NULL;
+				gint _tmp67__length1 = 0;
+				gint _tmp68_ = 0;
+				guchar* _tmp69_ = NULL;
+				gint _tmp69__length1 = 0;
+				gint _tmp70_ = 0;
+				guchar* _tmp71_ = NULL;
+				gint _tmp71__length1 = 0;
+				gint _tmp72_ = 0;
+				guchar _tmp73_ = '\0';
+				guchar _tmp74_ = '\0';
+				guchar _tmp75_ = '\0';
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp63_ = self->priv->pixels;
+				_tmp60_ = self->priv->pixels;
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp63__length1 = self->priv->pixels_length1;
+				_tmp60__length1 = self->priv->pixels_length1;
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp64_ = line_offset;
+				_tmp61_ = line_offset;
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp65_ = x;
+				_tmp62_ = x;
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp66_ = _tmp63_[_tmp64_ + (_tmp65_ / 8)];
+				_tmp63_ = _tmp60_[_tmp61_ + (_tmp62_ / 8)];
 #line 564 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				p = _tmp66_;
+				p = _tmp63_;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp68_ = p;
+				_tmp65_ = p;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp69_ = x;
+				_tmp66_ = x;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (((gint) (_tmp68_ & (0x80 >> (_tmp69_ % 8)))) != 0) {
+				if (((gint) (_tmp65_ & (0x80 >> (_tmp66_ % 8)))) != 0) {
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp67_ = 0x00;
-#line 2189 "page.c"
+					_tmp64_ = 0x00;
+#line 2158 "page.c"
 				} else {
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp67_ = 0xFF;
-#line 2193 "page.c"
+					_tmp64_ = 0xFF;
+#line 2162 "page.c"
 				}
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp70_ = pixel;
-#line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp70__length1 = pixel_length1;
+				_tmp67_ = pixel;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp71_ = offset;
+				_tmp67__length1 = pixel_length1;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp72_ = pixel;
+				_tmp68_ = offset;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp72__length1 = pixel_length1;
+				_tmp69_ = pixel;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp73_ = offset;
+				_tmp69__length1 = pixel_length1;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp74_ = pixel;
+				_tmp70_ = offset;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp74__length1 = pixel_length1;
+				_tmp71_ = pixel;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp75_ = offset;
+				_tmp71__length1 = pixel_length1;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp76_ = _tmp67_;
+				_tmp72_ = offset;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp74_[_tmp75_ + 2] = (guchar) _tmp76_;
+				_tmp71_[_tmp72_ + 2] = (guchar) _tmp64_;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp77_ = _tmp74_[_tmp75_ + 2];
+				_tmp73_ = _tmp71_[_tmp72_ + 2];
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp72_[_tmp73_ + 1] = _tmp77_;
+				_tmp69_[_tmp70_ + 1] = _tmp73_;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp78_ = _tmp72_[_tmp73_ + 1];
+				_tmp74_ = _tmp69_[_tmp70_ + 1];
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp70_[_tmp71_ + 0] = _tmp78_;
+				_tmp67_[_tmp68_ + 0] = _tmp74_;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp79_ = _tmp70_[_tmp71_ + 0];
+				_tmp75_ = _tmp67_[_tmp68_ + 0];
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
-#line 2229 "page.c"
+#line 2196 "page.c"
 			} else {
-				gboolean _tmp80_ = FALSE;
-				gint _tmp81_ = 0;
-				gboolean _tmp83_ = FALSE;
+				gboolean _tmp76_ = FALSE;
+				gint _tmp77_ = 0;
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp81_ = self->priv->_depth;
+				_tmp77_ = self->priv->_depth;
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_tmp81_ == 2) {
-#line 2238 "page.c"
-					gint _tmp82_ = 0;
+				if (_tmp77_ == 2) {
+#line 2204 "page.c"
+					gint _tmp78_ = 0;
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp82_ = self->priv->_n_channels;
+					_tmp78_ = self->priv->_n_channels;
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp80_ = _tmp82_ == 1;
-#line 2244 "page.c"
+					_tmp76_ = _tmp78_ == 1;
+#line 2210 "page.c"
 				} else {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp80_ = FALSE;
-#line 2248 "page.c"
+					_tmp76_ = FALSE;
+#line 2214 "page.c"
 				}
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp83_ = _tmp80_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (_tmp83_) {
-#line 2254 "page.c"
+				if (_tmp76_) {
+#line 2218 "page.c"
 					gint block_shift[4] = {0};
-					gint _tmp84_[4] = {0};
+					gint _tmp79_[4] = {0};
 					guchar p = '\0';
-					guchar* _tmp85_ = NULL;
-					gint _tmp85__length1 = 0;
+					guchar* _tmp80_ = NULL;
+					gint _tmp80__length1 = 0;
+					gint _tmp81_ = 0;
+					gint _tmp82_ = 0;
+					guchar _tmp83_ = '\0';
+					gint sample = 0;
+					guchar _tmp84_ = '\0';
+					gint _tmp85_ = 0;
 					gint _tmp86_ = 0;
 					gint _tmp87_ = 0;
-					guchar _tmp88_ = '\0';
-					gint sample = 0;
-					guchar _tmp89_ = '\0';
-					gint _tmp90_ = 0;
+					guchar* _tmp88_ = NULL;
+					gint _tmp88__length1 = 0;
+					gint _tmp89_ = 0;
+					guchar* _tmp90_ = NULL;
+					gint _tmp90__length1 = 0;
 					gint _tmp91_ = 0;
-					gint _tmp92_ = 0;
-					guchar* _tmp93_ = NULL;
-					gint _tmp93__length1 = 0;
+					guchar* _tmp92_ = NULL;
+					gint _tmp92__length1 = 0;
+					gint _tmp93_ = 0;
 					gint _tmp94_ = 0;
-					guchar* _tmp95_ = NULL;
-					gint _tmp95__length1 = 0;
-					gint _tmp96_ = 0;
-					guchar* _tmp97_ = NULL;
-					gint _tmp97__length1 = 0;
-					gint _tmp98_ = 0;
-					gint _tmp99_ = 0;
-					guchar _tmp100_ = '\0';
-					guchar _tmp101_ = '\0';
-					guchar _tmp102_ = '\0';
+					guchar _tmp95_ = '\0';
+					guchar _tmp96_ = '\0';
+					guchar _tmp97_ = '\0';
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp84_[0] = 6;
+					_tmp79_[0] = 6;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp84_[1] = 4;
+					_tmp79_[1] = 4;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp84_[2] = 2;
+					_tmp79_[2] = 2;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp84_[3] = 0;
+					_tmp79_[3] = 0;
 #line 572 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					memcpy (block_shift, _tmp84_, 4 * sizeof (gint));
+					memcpy (block_shift, _tmp79_, 4 * sizeof (gint));
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp85_ = self->priv->pixels;
+					_tmp80_ = self->priv->pixels;
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp85__length1 = self->priv->pixels_length1;
+					_tmp80__length1 = self->priv->pixels_length1;
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp86_ = line_offset;
+					_tmp81_ = line_offset;
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp87_ = x;
+					_tmp82_ = x;
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp88_ = _tmp85_[_tmp86_ + (_tmp87_ / 4)];
+					_tmp83_ = _tmp80_[_tmp81_ + (_tmp82_ / 4)];
 #line 574 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					p = _tmp88_;
+					p = _tmp83_;
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp89_ = p;
+					_tmp84_ = p;
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp90_ = x;
+					_tmp85_ = x;
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp91_ = block_shift[_tmp90_ % 4];
+					_tmp86_ = block_shift[_tmp85_ % 4];
 #line 575 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					sample = (_tmp89_ >> _tmp91_) & 0x3;
+					sample = (_tmp84_ >> _tmp86_) & 0x3;
 #line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp92_ = sample;
+					_tmp87_ = sample;
 #line 576 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					sample = (_tmp92_ * 255) / 3;
+					sample = (_tmp87_ * 255) / 3;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp93_ = pixel;
+					_tmp88_ = pixel;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp93__length1 = pixel_length1;
+					_tmp88__length1 = pixel_length1;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp94_ = offset;
+					_tmp89_ = offset;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp95_ = pixel;
+					_tmp90_ = pixel;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp95__length1 = pixel_length1;
+					_tmp90__length1 = pixel_length1;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp96_ = offset;
+					_tmp91_ = offset;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp97_ = pixel;
+					_tmp92_ = pixel;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp97__length1 = pixel_length1;
+					_tmp92__length1 = pixel_length1;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp98_ = offset;
+					_tmp93_ = offset;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp99_ = sample;
+					_tmp94_ = sample;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp97_[_tmp98_ + 2] = (guchar) _tmp99_;
+					_tmp92_[_tmp93_ + 2] = (guchar) _tmp94_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp100_ = _tmp97_[_tmp98_ + 2];
+					_tmp95_ = _tmp92_[_tmp93_ + 2];
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp95_[_tmp96_ + 1] = _tmp100_;
+					_tmp90_[_tmp91_ + 1] = _tmp95_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp101_ = _tmp95_[_tmp96_ + 1];
+					_tmp96_ = _tmp90_[_tmp91_ + 1];
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp93_[_tmp94_ + 0] = _tmp101_;
+					_tmp88_[_tmp89_ + 0] = _tmp96_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp102_ = _tmp93_[_tmp94_ + 0];
+					_tmp97_ = _tmp88_[_tmp89_ + 0];
 #line 579 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
-#line 2349 "page.c"
+#line 2313 "page.c"
 				}
 			}
 		}
 	}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp103_ = pixel;
+	_tmp98_ = pixel;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp103__length1 = pixel_length1;
+	_tmp98__length1 = pixel_length1;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp104_ = offset;
+	_tmp99_ = offset;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp105_ = self->priv->pixels;
+	_tmp100_ = self->priv->pixels;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp105__length1 = self->priv->pixels_length1;
+	_tmp100__length1 = self->priv->pixels_length1;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp106_ = line_offset;
+	_tmp101_ = line_offset;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp107_ = x;
+	_tmp102_ = x;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp108_ = self->priv->_depth;
+	_tmp103_ = self->priv->_depth;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp109_ = self->priv->_n_channels;
+	_tmp104_ = self->priv->_n_channels;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp110_ = page_get_sample (self, _tmp105_, _tmp105__length1, _tmp106_, _tmp107_, _tmp108_, _tmp109_, 0);
+	_tmp105_ = page_get_sample (self, _tmp100_, _tmp100__length1, _tmp101_, _tmp102_, _tmp103_, _tmp104_, 0);
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp103_[_tmp104_ + 0] = _tmp110_;
+	_tmp98_[_tmp99_ + 0] = _tmp105_;
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp111_ = _tmp103_[_tmp104_ + 0];
+	_tmp106_ = _tmp98_[_tmp99_ + 0];
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp112_ = pixel;
+	_tmp107_ = pixel;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp112__length1 = pixel_length1;
+	_tmp107__length1 = pixel_length1;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp113_ = offset;
+	_tmp108_ = offset;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp114_ = self->priv->pixels;
+	_tmp109_ = self->priv->pixels;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp114__length1 = self->priv->pixels_length1;
+	_tmp109__length1 = self->priv->pixels_length1;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp115_ = line_offset;
+	_tmp110_ = line_offset;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp116_ = x;
+	_tmp111_ = x;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp117_ = self->priv->_depth;
+	_tmp112_ = self->priv->_depth;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp118_ = self->priv->_n_channels;
+	_tmp113_ = self->priv->_n_channels;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp119_ = page_get_sample (self, _tmp114_, _tmp114__length1, _tmp115_, _tmp116_, _tmp117_, _tmp118_, 1);
+	_tmp114_ = page_get_sample (self, _tmp109_, _tmp109__length1, _tmp110_, _tmp111_, _tmp112_, _tmp113_, 1);
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp112_[_tmp113_ + 1] = _tmp119_;
+	_tmp107_[_tmp108_ + 1] = _tmp114_;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp120_ = _tmp112_[_tmp113_ + 1];
+	_tmp115_ = _tmp107_[_tmp108_ + 1];
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp121_ = pixel;
+	_tmp116_ = pixel;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp121__length1 = pixel_length1;
+	_tmp116__length1 = pixel_length1;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp122_ = offset;
+	_tmp117_ = offset;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp123_ = self->priv->pixels;
+	_tmp118_ = self->priv->pixels;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp123__length1 = self->priv->pixels_length1;
+	_tmp118__length1 = self->priv->pixels_length1;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp124_ = line_offset;
+	_tmp119_ = line_offset;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp125_ = x;
+	_tmp120_ = x;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp126_ = self->priv->_depth;
+	_tmp121_ = self->priv->_depth;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp127_ = self->priv->_n_channels;
+	_tmp122_ = self->priv->_n_channels;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp128_ = page_get_sample (self, _tmp123_, _tmp123__length1, _tmp124_, _tmp125_, _tmp126_, _tmp127_, 2);
+	_tmp123_ = page_get_sample (self, _tmp118_, _tmp118__length1, _tmp119_, _tmp120_, _tmp121_, _tmp122_, 2);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp121_[_tmp122_ + 2] = _tmp128_;
+	_tmp116_[_tmp117_ + 2] = _tmp123_;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp129_ = _tmp121_[_tmp122_ + 2];
-#line 2426 "page.c"
+	_tmp124_ = _tmp116_[_tmp117_ + 2];
+#line 2390 "page.c"
 }
 
 
@@ -2434,16 +2398,15 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 	gint b = 0;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp3_ = FALSE;
 	GdkPixbuf* image = NULL;
+	gint _tmp25_ = 0;
 	gint _tmp26_ = 0;
 	gint _tmp27_ = 0;
 	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	GdkPixbuf* _tmp30_ = NULL;
+	GdkPixbuf* _tmp29_ = NULL;
 	guint8* image_pixels = NULL;
-	GdkPixbuf* _tmp31_ = NULL;
-	guint8* _tmp32_ = NULL;
+	GdkPixbuf* _tmp30_ = NULL;
+	guint8* _tmp31_ = NULL;
 	gint image_pixels_length1 = 0;
 	gint _image_pixels_size_ = 0;
 #line 588 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -2452,23 +2415,22 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 	_tmp1_ = apply_crop;
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp1_) {
-#line 2456 "page.c"
+#line 2419 "page.c"
 		gboolean _tmp2_ = FALSE;
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp2_ = self->priv->_has_crop;
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp2_;
-#line 2462 "page.c"
+#line 2425 "page.c"
 	} else {
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = FALSE;
-#line 2466 "page.c"
+#line 2429 "page.c"
 	}
 #line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp3_ = _tmp0_;
-#line 591 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp3_) {
-#line 2472 "page.c"
+	if (_tmp0_) {
+#line 2433 "page.c"
+		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
@@ -2478,255 +2440,248 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
-		gint _tmp13_ = 0;
+		gint _tmp15_ = 0;
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
-		gint _tmp19_ = 0;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp4_ = self->priv->_crop_x;
+		_tmp3_ = self->priv->_crop_x;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		l = _tmp4_;
+		l = _tmp3_;
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp5_ = l;
+		_tmp4_ = l;
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_crop_width;
+		_tmp5_ = self->priv->_crop_width;
 #line 594 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		r = _tmp5_ + _tmp6_;
+		r = _tmp4_ + _tmp5_;
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->_crop_y;
+		_tmp6_ = self->priv->_crop_y;
 #line 595 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		t = _tmp7_;
+		t = _tmp6_;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp8_ = t;
+		_tmp7_ = t;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp9_ = self->priv->_crop_height;
+		_tmp8_ = self->priv->_crop_height;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		b = _tmp8_ + _tmp9_;
+		b = _tmp7_ + _tmp8_;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp10_ = l;
+		_tmp9_ = l;
 #line 598 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp10_ < 0) {
+		if (_tmp9_ < 0) {
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			l = 0;
-#line 2513 "page.c"
+#line 2474 "page.c"
 		}
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp11_ = r;
+		_tmp10_ = r;
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp12_ = page_get_width (self);
+		_tmp11_ = page_get_width (self);
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp13_ = _tmp12_;
+		_tmp12_ = _tmp11_;
 #line 600 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp11_ > _tmp13_) {
-#line 2523 "page.c"
+		if (_tmp10_ > _tmp12_) {
+#line 2484 "page.c"
+			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
-			gint _tmp15_ = 0;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp14_ = page_get_width (self);
+			_tmp13_ = page_get_width (self);
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp15_ = _tmp14_;
+			_tmp14_ = _tmp13_;
 #line 601 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			r = _tmp15_;
-#line 2532 "page.c"
+			r = _tmp14_;
+#line 2493 "page.c"
 		}
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp16_ = t;
+		_tmp15_ = t;
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp16_ < 0) {
+		if (_tmp15_ < 0) {
 #line 603 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			t = 0;
-#line 2540 "page.c"
+#line 2501 "page.c"
 		}
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp17_ = b;
+		_tmp16_ = b;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp18_ = page_get_height (self);
+		_tmp17_ = page_get_height (self);
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 604 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		if (_tmp17_ > _tmp19_) {
-#line 2550 "page.c"
+		if (_tmp16_ > _tmp18_) {
+#line 2511 "page.c"
+			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
-			gint _tmp21_ = 0;
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp20_ = page_get_height (self);
+			_tmp19_ = page_get_height (self);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp21_ = _tmp20_;
+			_tmp20_ = _tmp19_;
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			b = _tmp21_;
-#line 2559 "page.c"
+			b = _tmp20_;
+#line 2520 "page.c"
 		}
 	} else {
+		gint _tmp21_ = 0;
 		gint _tmp22_ = 0;
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-		gint _tmp25_ = 0;
 #line 609 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		l = 0;
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp22_ = page_get_width (self);
+		_tmp21_ = page_get_width (self);
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp23_ = _tmp22_;
+		_tmp22_ = _tmp21_;
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		r = _tmp23_;
+		r = _tmp22_;
 #line 611 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		t = 0;
 #line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp24_ = page_get_height (self);
+		_tmp23_ = page_get_height (self);
 #line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp25_ = _tmp24_;
+		_tmp24_ = _tmp23_;
 #line 612 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		b = _tmp25_;
-#line 2582 "page.c"
+		b = _tmp24_;
+#line 2543 "page.c"
 	}
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp26_ = r;
+	_tmp25_ = r;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp27_ = l;
+	_tmp26_ = l;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp28_ = b;
+	_tmp27_ = b;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp29_ = t;
+	_tmp28_ = t;
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp30_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp26_ - _tmp27_, _tmp28_ - _tmp29_);
+	_tmp29_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, _tmp25_ - _tmp26_, _tmp27_ - _tmp28_);
 #line 615 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image = _tmp30_;
+	image = _tmp29_;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp31_ = image;
+	_tmp30_ = image;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp32_ = gdk_pixbuf_get_pixels (_tmp31_);
+	_tmp31_ = gdk_pixbuf_get_pixels (_tmp30_);
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	image_pixels = _tmp32_;
+	image_pixels = _tmp31_;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	image_pixels_length1 = -1;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_image_pixels_size_ = image_pixels_length1;
-#line 2606 "page.c"
+#line 2567 "page.c"
 	{
 		gint y = 0;
-		gint _tmp33_ = 0;
+		gint _tmp32_ = 0;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp33_ = t;
+		_tmp32_ = t;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		y = _tmp33_;
-#line 2614 "page.c"
+		y = _tmp32_;
+#line 2575 "page.c"
 		{
-			gboolean _tmp34_ = FALSE;
+			gboolean _tmp33_ = FALSE;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-			_tmp34_ = TRUE;
+			_tmp33_ = TRUE;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			while (TRUE) {
-#line 2621 "page.c"
-				gboolean _tmp35_ = FALSE;
-				gint _tmp37_ = 0;
-				gint _tmp38_ = 0;
+#line 2582 "page.c"
+				gint _tmp35_ = 0;
+				gint _tmp36_ = 0;
 				gint offset = 0;
-				GdkPixbuf* _tmp39_ = NULL;
+				GdkPixbuf* _tmp37_ = NULL;
+				gint _tmp38_ = 0;
+				gint _tmp39_ = 0;
 				gint _tmp40_ = 0;
-				gint _tmp41_ = 0;
-				gint _tmp42_ = 0;
-#line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp35_ = _tmp34_;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!_tmp35_) {
-#line 2634 "page.c"
-					gint _tmp36_ = 0;
+				if (!_tmp33_) {
+#line 2592 "page.c"
+					gint _tmp34_ = 0;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp36_ = y;
+					_tmp34_ = y;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					y = _tmp36_ + 1;
-#line 2640 "page.c"
+					y = _tmp34_ + 1;
+#line 2598 "page.c"
 				}
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp34_ = FALSE;
+				_tmp33_ = FALSE;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp37_ = y;
+				_tmp35_ = y;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp38_ = b;
+				_tmp36_ = b;
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				if (!(_tmp37_ < _tmp38_)) {
+				if (!(_tmp35_ < _tmp36_)) {
 #line 617 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					break;
-#line 2652 "page.c"
+#line 2610 "page.c"
 				}
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp39_ = image;
+				_tmp37_ = image;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp40_ = gdk_pixbuf_get_rowstride (_tmp39_);
+				_tmp38_ = gdk_pixbuf_get_rowstride (_tmp37_);
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp41_ = y;
+				_tmp39_ = y;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				_tmp42_ = t;
+				_tmp40_ = t;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-				offset = _tmp40_ * (_tmp41_ - _tmp42_);
-#line 2664 "page.c"
+				offset = _tmp38_ * (_tmp39_ - _tmp40_);
+#line 2622 "page.c"
 				{
 					gint x = 0;
-					gint _tmp43_ = 0;
+					gint _tmp41_ = 0;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					_tmp43_ = l;
+					_tmp41_ = l;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-					x = _tmp43_;
-#line 2672 "page.c"
+					x = _tmp41_;
+#line 2630 "page.c"
 					{
-						gboolean _tmp44_ = FALSE;
+						gboolean _tmp42_ = FALSE;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-						_tmp44_ = TRUE;
+						_tmp42_ = TRUE;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 						while (TRUE) {
-#line 2679 "page.c"
-							gboolean _tmp45_ = FALSE;
+#line 2637 "page.c"
+							gint _tmp44_ = 0;
+							gint _tmp45_ = 0;
+							gint _tmp46_ = 0;
 							gint _tmp47_ = 0;
-							gint _tmp48_ = 0;
+							guint8* _tmp48_ = NULL;
+							gint _tmp48__length1 = 0;
 							gint _tmp49_ = 0;
 							gint _tmp50_ = 0;
-							guint8* _tmp51_ = NULL;
-							gint _tmp51__length1 = 0;
-							gint _tmp52_ = 0;
-							gint _tmp53_ = 0;
-							gint _tmp54_ = 0;
-#line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp45_ = _tmp44_;
+							gint _tmp51_ = 0;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							if (!_tmp45_) {
-#line 2694 "page.c"
-								gint _tmp46_ = 0;
+							if (!_tmp42_) {
+#line 2649 "page.c"
+								gint _tmp43_ = 0;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-								_tmp46_ = x;
+								_tmp43_ = x;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-								x = _tmp46_ + 1;
-#line 2700 "page.c"
+								x = _tmp43_ + 1;
+#line 2655 "page.c"
 							}
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp44_ = FALSE;
+							_tmp42_ = FALSE;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp47_ = x;
+							_tmp44_ = x;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp48_ = r;
+							_tmp45_ = r;
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							if (!(_tmp47_ < _tmp48_)) {
+							if (!(_tmp44_ < _tmp45_)) {
 #line 620 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 								break;
-#line 2712 "page.c"
+#line 2667 "page.c"
 							}
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp49_ = x;
+							_tmp46_ = x;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp50_ = y;
+							_tmp47_ = y;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp51_ = image_pixels;
+							_tmp48_ = image_pixels;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp51__length1 = image_pixels_length1;
+							_tmp48__length1 = image_pixels_length1;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp52_ = offset;
+							_tmp49_ = offset;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp53_ = x;
+							_tmp50_ = x;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							_tmp54_ = l;
+							_tmp51_ = l;
 #line 621 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-							page_get_pixel (self, _tmp49_, _tmp50_, _tmp51_, _tmp51__length1, _tmp52_ + ((_tmp53_ - _tmp54_) * 3));
-#line 2730 "page.c"
+							page_get_pixel (self, _tmp46_, _tmp47_, _tmp48_, _tmp48__length1, _tmp49_ + ((_tmp50_ - _tmp51_) * 3));
+#line 2685 "page.c"
 						}
 					}
 				}
@@ -2737,7 +2692,7 @@ GdkPixbuf* page_get_image (Page* self, gboolean apply_crop) {
 	result = image;
 #line 624 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 2741 "page.c"
+#line 2696 "page.c"
 }
 
 
@@ -2756,49 +2711,49 @@ static gchar* string_to_utf8 (const gchar* self, int* result_length1) {
 	gint _tmp6_ = 0;
 	gchar* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 1266 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = g_new0 (gchar, _tmp1_ + 1);
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp1_ + 1;
-#line 1267 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1304 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	__result__size_ = _result__length1;
-#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp3_ = _result__length1;
-#line 1268 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1305 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result__length1 = _tmp3_ - 1;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp4_ = _result_;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp4__length1 = _result__length1;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp5_ = strlen (self);
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp6_ = _tmp5_;
-#line 1269 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	memcpy (_tmp4_, self, (gsize) _tmp6_);
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp7_ = _result_;
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp7__length1 = _result__length1;
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (result_length1) {
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp7__length1;
-#line 2796 "page.c"
+#line 2751 "page.c"
 	}
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	result = _tmp7_;
-#line 1270 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1307 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 2802 "page.c"
+#line 2757 "page.c"
 }
 
 
@@ -2817,7 +2772,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 	g_return_val_if_fail (self != NULL, NULL);
 #line 627 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (icc_profile_filename != NULL, NULL);
-#line 2821 "page.c"
+#line 2776 "page.c"
 	{
 		const gchar* _tmp0_ = NULL;
 		gchar* _tmp1_ = NULL;
@@ -2831,7 +2786,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 		contents = _tmp1_;
 #line 633 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_inner_error_ != NULL) {
-#line 2835 "page.c"
+#line 2790 "page.c"
 			goto __catch3_g_error;
 		}
 	}
@@ -2859,7 +2814,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 		_g_free0 (contents);
 #line 638 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 2863 "page.c"
+#line 2818 "page.c"
 	}
 	__finally3:
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -2872,7 +2827,7 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 		g_clear_error (&_inner_error_);
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return NULL;
-#line 2876 "page.c"
+#line 2831 "page.c"
 	}
 #line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp4_ = contents;
@@ -2894,14 +2849,14 @@ static gchar* page_get_icc_data_encoded (Page* self, const gchar* icc_profile_fi
 	_g_free0 (contents);
 #line 642 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 2898 "page.c"
+#line 2853 "page.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2905 "page.c"
+#line 2860 "page.c"
 }
 
 
@@ -2945,7 +2900,7 @@ void page_copy_to_clipboard (Page* self, GtkWindow* window) {
 	_g_object_unref0 (clipboard);
 #line 645 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (display);
-#line 2949 "page.c"
+#line 2904 "page.c"
 }
 
 
@@ -2982,7 +2937,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 		g_propagate_error (error, _inner_error_);
 #line 655 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 2986 "page.c"
+#line 2941 "page.c"
 	}
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp2_ = stream;
@@ -3000,7 +2955,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 	_tmp5_ = self->priv->_color_profile;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp5_ != NULL) {
-#line 3004 "page.c"
+#line 2959 "page.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 #line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3011,7 +2966,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 		_g_free0 (icc_profile_data);
 #line 661 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		icc_profile_data = _tmp7_;
-#line 3015 "page.c"
+#line 2970 "page.c"
 	}
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp8_ = g_strcmp0;
@@ -3021,7 +2976,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 	_tmp10_ = _tmp8_ (_tmp9_, "jpeg");
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp10_ == 0) {
-#line 3025 "page.c"
+#line 2980 "page.c"
 		gchar** keys = NULL;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
@@ -3123,7 +3078,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 		_tmp27_ = icc_profile_data;
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp27_ == NULL) {
-#line 3127 "page.c"
+#line 3082 "page.c"
 			gchar** _tmp28_ = NULL;
 			gint _tmp28__length1 = 0;
 			gchar* _tmp29_ = NULL;
@@ -3137,7 +3092,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 			_tmp28_[4] = NULL;
 #line 668 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp29_ = _tmp28_[4];
-#line 3141 "page.c"
+#line 3096 "page.c"
 		}
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp30_ = writer;
@@ -3171,13 +3126,13 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 			_g_object_unref0 (stream);
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return;
-#line 3175 "page.c"
+#line 3130 "page.c"
 		}
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3181 "page.c"
+#line 3136 "page.c"
 	} else {
 		GCompareFunc _tmp34_ = NULL;
 		const gchar* _tmp35_ = NULL;
@@ -3190,7 +3145,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 		_tmp36_ = _tmp34_ (_tmp35_, "png");
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (_tmp36_ == 0) {
-#line 3194 "page.c"
+#line 3149 "page.c"
 			gchar** keys = NULL;
 			gchar* _tmp37_ = NULL;
 			gchar** _tmp38_ = NULL;
@@ -3243,7 +3198,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 			_tmp42_ = icc_profile_data;
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp42_ == NULL) {
-#line 3247 "page.c"
+#line 3202 "page.c"
 				gchar** _tmp43_ = NULL;
 				gint _tmp43__length1 = 0;
 				gchar* _tmp44_ = NULL;
@@ -3257,7 +3212,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 				_tmp43_[0] = NULL;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp44_ = _tmp43_[0];
-#line 3261 "page.c"
+#line 3216 "page.c"
 			}
 #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			_tmp45_ = writer;
@@ -3291,13 +3246,13 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 				_g_object_unref0 (stream);
 #line 677 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				return;
-#line 3295 "page.c"
+#line 3250 "page.c"
 			}
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 671 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3301 "page.c"
+#line 3256 "page.c"
 		} else {
 			GCompareFunc _tmp49_ = NULL;
 			const gchar* _tmp50_ = NULL;
@@ -3310,7 +3265,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 			_tmp51_ = _tmp49_ (_tmp50_, "tiff");
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			if (_tmp51_ == 0) {
-#line 3314 "page.c"
+#line 3269 "page.c"
 				gchar** keys = NULL;
 				gchar* _tmp52_ = NULL;
 				gchar* _tmp53_ = NULL;
@@ -3373,7 +3328,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 				_tmp59_ = icc_profile_data;
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				if (_tmp59_ == NULL) {
-#line 3377 "page.c"
+#line 3332 "page.c"
 					gchar** _tmp60_ = NULL;
 					gint _tmp60__length1 = 0;
 					gchar* _tmp61_ = NULL;
@@ -3387,7 +3342,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 					_tmp60_[1] = NULL;
 #line 684 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					_tmp61_ = _tmp60_[1];
-#line 3391 "page.c"
+#line 3346 "page.c"
 				}
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				_tmp62_ = writer;
@@ -3421,13 +3376,13 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 					_g_object_unref0 (stream);
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 					return;
-#line 3425 "page.c"
+#line 3380 "page.c"
 				}
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
-#line 3431 "page.c"
+#line 3386 "page.c"
 			} else {
 			}
 		}
@@ -3440,7 +3395,7 @@ void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError
 	_pixbuf_writer_unref0 (writer);
 #line 653 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (stream);
-#line 3444 "page.c"
+#line 3399 "page.c"
 }
 
 
@@ -3449,7 +3404,6 @@ gint page_get_width (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-	gboolean _tmp5_ = FALSE;
 #line 25 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3460,7 +3414,7 @@ gint page_get_width (Page* self) {
 	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
-#line 3464 "page.c"
+#line 3418 "page.c"
 	} else {
 		ScanDirection _tmp3_ = 0;
 		ScanDirection _tmp4_ = 0;
@@ -3470,30 +3424,28 @@ gint page_get_width (Page* self) {
 		_tmp4_ = _tmp3_;
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 3474 "page.c"
+#line 3428 "page.c"
 	}
 #line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = _tmp0_;
-#line 27 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp5_) {
-#line 3480 "page.c"
-		gint _tmp6_ = 0;
+	if (_tmp0_) {
+#line 3432 "page.c"
+		gint _tmp5_ = 0;
 #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_scan_width;
+		_tmp5_ = self->priv->_scan_width;
 #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp6_;
+		result = _tmp5_;
 #line 28 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3488 "page.c"
+#line 3440 "page.c"
 	} else {
-		gint _tmp7_ = 0;
+		gint _tmp6_ = 0;
 #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->_scan_height;
+		_tmp6_ = self->priv->_scan_height;
 #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp7_;
+		result = _tmp6_;
 #line 30 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3497 "page.c"
+#line 3449 "page.c"
 	}
 }
 
@@ -3503,7 +3455,6 @@ gint page_get_height (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-	gboolean _tmp5_ = FALSE;
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -3514,7 +3465,7 @@ gint page_get_height (Page* self) {
 	if (_tmp2_ == SCAN_DIRECTION_TOP_TO_BOTTOM) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = TRUE;
-#line 3518 "page.c"
+#line 3469 "page.c"
 	} else {
 		ScanDirection _tmp3_ = 0;
 		ScanDirection _tmp4_ = 0;
@@ -3524,30 +3475,28 @@ gint page_get_height (Page* self) {
 		_tmp4_ = _tmp3_;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp0_ = _tmp4_ == SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 3528 "page.c"
+#line 3479 "page.c"
 	}
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	_tmp5_ = _tmp0_;
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-	if (_tmp5_) {
-#line 3534 "page.c"
-		gint _tmp6_ = 0;
+	if (_tmp0_) {
+#line 3483 "page.c"
+		gint _tmp5_ = 0;
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp6_ = self->priv->_scan_height;
+		_tmp5_ = self->priv->_scan_height;
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp6_;
+		result = _tmp5_;
 #line 40 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3542 "page.c"
+#line 3491 "page.c"
 	} else {
-		gint _tmp7_ = 0;
+		gint _tmp6_ = 0;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		_tmp7_ = self->priv->_scan_width;
+		_tmp6_ = self->priv->_scan_width;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
-		result = _tmp7_;
+		result = _tmp6_;
 #line 42 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return result;
-#line 3551 "page.c"
+#line 3500 "page.c"
 	}
 }
 
@@ -3572,7 +3521,7 @@ gboolean page_get_is_landscape (Page* self) {
 	result = _tmp1_ > _tmp3_;
 #line 47 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3576 "page.c"
+#line 3525 "page.c"
 }
 
 
@@ -3587,7 +3536,7 @@ gint page_get_dpi (Page* self) {
 	result = _tmp0_;
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3591 "page.c"
+#line 3540 "page.c"
 }
 
 
@@ -3599,7 +3548,7 @@ static void page_set_dpi (Page* self, gint value) {
 	_tmp0_ = value;
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_dpi = _tmp0_;
-#line 3603 "page.c"
+#line 3552 "page.c"
 }
 
 
@@ -3614,7 +3563,7 @@ gint page_get_depth (Page* self) {
 	result = _tmp0_;
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3618 "page.c"
+#line 3567 "page.c"
 }
 
 
@@ -3626,7 +3575,7 @@ static void page_set_depth (Page* self, gint value) {
 	_tmp0_ = value;
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_depth = _tmp0_;
-#line 3630 "page.c"
+#line 3579 "page.c"
 }
 
 
@@ -3641,7 +3590,7 @@ const gchar* page_get_color_profile (Page* self) {
 	result = _tmp0_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3645 "page.c"
+#line 3594 "page.c"
 }
 
 
@@ -3658,7 +3607,7 @@ void page_set_color_profile (Page* self, const gchar* value) {
 	_g_free0 (self->priv->_color_profile);
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_color_profile = _tmp1_;
-#line 3662 "page.c"
+#line 3611 "page.c"
 }
 
 
@@ -3673,7 +3622,7 @@ gint page_get_scan_width (Page* self) {
 	result = _tmp0_;
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3677 "page.c"
+#line 3626 "page.c"
 }
 
 
@@ -3685,7 +3634,7 @@ static void page_set_scan_width (Page* self, gint value) {
 	_tmp0_ = value;
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_width = _tmp0_;
-#line 3689 "page.c"
+#line 3638 "page.c"
 }
 
 
@@ -3700,7 +3649,7 @@ gint page_get_scan_height (Page* self) {
 	result = _tmp0_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3704 "page.c"
+#line 3653 "page.c"
 }
 
 
@@ -3712,7 +3661,7 @@ static void page_set_scan_height (Page* self, gint value) {
 	_tmp0_ = value;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_height = _tmp0_;
-#line 3716 "page.c"
+#line 3665 "page.c"
 }
 
 
@@ -3727,7 +3676,7 @@ gint page_get_rowstride (Page* self) {
 	result = _tmp0_;
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3731 "page.c"
+#line 3680 "page.c"
 }
 
 
@@ -3739,7 +3688,7 @@ static void page_set_rowstride (Page* self, gint value) {
 	_tmp0_ = value;
 #line 68 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_rowstride = _tmp0_;
-#line 3743 "page.c"
+#line 3692 "page.c"
 }
 
 
@@ -3754,7 +3703,7 @@ gint page_get_n_channels (Page* self) {
 	result = _tmp0_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3758 "page.c"
+#line 3707 "page.c"
 }
 
 
@@ -3766,7 +3715,7 @@ static void page_set_n_channels (Page* self, gint value) {
 	_tmp0_ = value;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_n_channels = _tmp0_;
-#line 3770 "page.c"
+#line 3719 "page.c"
 }
 
 
@@ -3781,7 +3730,7 @@ gboolean page_get_is_scanning (Page* self) {
 	result = _tmp0_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3785 "page.c"
+#line 3734 "page.c"
 }
 
 
@@ -3793,7 +3742,7 @@ static void page_set_is_scanning (Page* self, gboolean value) {
 	_tmp0_ = value;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_is_scanning = _tmp0_;
-#line 3797 "page.c"
+#line 3746 "page.c"
 }
 
 
@@ -3808,7 +3757,7 @@ gboolean page_get_has_data (Page* self) {
 	result = _tmp0_;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3812 "page.c"
+#line 3761 "page.c"
 }
 
 
@@ -3820,7 +3769,7 @@ static void page_set_has_data (Page* self, gboolean value) {
 	_tmp0_ = value;
 #line 80 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_has_data = _tmp0_;
-#line 3824 "page.c"
+#line 3773 "page.c"
 }
 
 
@@ -3835,7 +3784,7 @@ gint page_get_scan_line (Page* self) {
 	result = _tmp0_;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3839 "page.c"
+#line 3788 "page.c"
 }
 
 
@@ -3847,7 +3796,7 @@ static void page_set_scan_line (Page* self, gint value) {
 	_tmp0_ = value;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_scan_line = _tmp0_;
-#line 3851 "page.c"
+#line 3800 "page.c"
 }
 
 
@@ -3862,7 +3811,7 @@ gboolean page_get_is_color (Page* self) {
 	result = _tmp0_ > 1;
 #line 86 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3866 "page.c"
+#line 3815 "page.c"
 }
 
 
@@ -3877,7 +3826,7 @@ ScanDirection page_get_scan_direction (Page* self) {
 	result = _tmp0_;
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 3881 "page.c"
+#line 3830 "page.c"
 }
 
 
@@ -3904,7 +3853,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp0_ == _tmp1_) {
 #line 97 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 3908 "page.c"
+#line 3857 "page.c"
 	}
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	size_has_changed = FALSE;
@@ -3918,13 +3867,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	_tmp4_ = left_steps;
 #line 102 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp4_ < 0) {
-#line 3922 "page.c"
+#line 3871 "page.c"
 		gint _tmp5_ = 0;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp5_ = left_steps;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		left_steps = _tmp5_ + 4;
-#line 3928 "page.c"
+#line 3877 "page.c"
 	}
 #line 104 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp6_ = left_steps;
@@ -3932,13 +3881,13 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp6_ != 2) {
 #line 105 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		size_has_changed = TRUE;
-#line 3936 "page.c"
+#line 3885 "page.c"
 	}
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_tmp7_ = self->priv->_has_crop;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (_tmp7_) {
-#line 3942 "page.c"
+#line 3891 "page.c"
 		gint _tmp8_ = 0;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		_tmp8_ = left_steps;
@@ -3946,7 +3895,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 		switch (_tmp8_) {
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 1:
-#line 3950 "page.c"
+#line 3899 "page.c"
 			{
 				gint t = 0;
 				gint _tmp9_ = 0;
@@ -3990,11 +3939,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				page_set_crop_height (self, _tmp17_);
 #line 120 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 3994 "page.c"
+#line 3943 "page.c"
 			}
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 2:
-#line 3998 "page.c"
+#line 3947 "page.c"
 			{
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
@@ -4026,11 +3975,11 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				page_set_crop_y (self, _tmp23_ - (_tmp24_ + _tmp25_));
 #line 125 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 4030 "page.c"
+#line 3979 "page.c"
 			}
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			case 3:
-#line 4034 "page.c"
+#line 3983 "page.c"
 			{
 				gint t = 0;
 				gint _tmp26_ = 0;
@@ -4074,12 +4023,12 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 				page_set_crop_height (self, _tmp34_);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 				break;
-#line 4078 "page.c"
+#line 4027 "page.c"
 			}
 			default:
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			break;
-#line 4083 "page.c"
+#line 4032 "page.c"
 		}
 	}
 #line 138 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
@@ -4092,7 +4041,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp36_) {
 #line 140 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "size-changed");
-#line 4096 "page.c"
+#line 4045 "page.c"
 	}
 #line 141 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_emit_by_name (self, "scan-direction-changed");
@@ -4102,7 +4051,7 @@ void page_set_scan_direction (Page* self, ScanDirection value) {
 	if (_tmp37_) {
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_signal_emit_by_name (self, "crop-changed");
-#line 4106 "page.c"
+#line 4055 "page.c"
 	}
 }
 
@@ -4118,7 +4067,7 @@ gboolean page_get_has_crop (Page* self) {
 	result = _tmp0_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4122 "page.c"
+#line 4071 "page.c"
 }
 
 
@@ -4130,7 +4079,7 @@ static void page_set_has_crop (Page* self, gboolean value) {
 	_tmp0_ = value;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_has_crop = _tmp0_;
-#line 4134 "page.c"
+#line 4083 "page.c"
 }
 
 
@@ -4145,7 +4094,7 @@ const gchar* page_get_crop_name (Page* self) {
 	result = _tmp0_;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4149 "page.c"
+#line 4098 "page.c"
 }
 
 
@@ -4162,7 +4111,7 @@ static void page_set_crop_name (Page* self, const gchar* value) {
 	_g_free0 (self->priv->_crop_name);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_name = _tmp1_;
-#line 4166 "page.c"
+#line 4115 "page.c"
 }
 
 
@@ -4177,7 +4126,7 @@ gint page_get_crop_x (Page* self) {
 	result = _tmp0_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4181 "page.c"
+#line 4130 "page.c"
 }
 
 
@@ -4189,7 +4138,7 @@ static void page_set_crop_x (Page* self, gint value) {
 	_tmp0_ = value;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_x = _tmp0_;
-#line 4193 "page.c"
+#line 4142 "page.c"
 }
 
 
@@ -4204,7 +4153,7 @@ gint page_get_crop_y (Page* self) {
 	result = _tmp0_;
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4208 "page.c"
+#line 4157 "page.c"
 }
 
 
@@ -4216,7 +4165,7 @@ static void page_set_crop_y (Page* self, gint value) {
 	_tmp0_ = value;
 #line 159 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_y = _tmp0_;
-#line 4220 "page.c"
+#line 4169 "page.c"
 }
 
 
@@ -4231,7 +4180,7 @@ gint page_get_crop_width (Page* self) {
 	result = _tmp0_;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4235 "page.c"
+#line 4184 "page.c"
 }
 
 
@@ -4243,7 +4192,7 @@ static void page_set_crop_width (Page* self, gint value) {
 	_tmp0_ = value;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_width = _tmp0_;
-#line 4247 "page.c"
+#line 4196 "page.c"
 }
 
 
@@ -4258,7 +4207,7 @@ gint page_get_crop_height (Page* self) {
 	result = _tmp0_;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4262 "page.c"
+#line 4211 "page.c"
 }
 
 
@@ -4270,14 +4219,14 @@ static void page_set_crop_height (Page* self, gint value) {
 	_tmp0_ = value;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->priv->_crop_height = _tmp0_;
-#line 4274 "page.c"
+#line 4223 "page.c"
 }
 
 
 static void value_page_init (GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
-#line 4281 "page.c"
+#line 4230 "page.c"
 }
 
 
@@ -4286,7 +4235,7 @@ static void value_page_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (value->data[0].v_pointer);
-#line 4290 "page.c"
+#line 4239 "page.c"
 	}
 }
 
@@ -4296,11 +4245,11 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value)
 	if (src_value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = page_ref (src_value->data[0].v_pointer);
-#line 4300 "page.c"
+#line 4249 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4304 "page.c"
+#line 4253 "page.c"
 	}
 }
 
@@ -4308,37 +4257,37 @@ static void value_page_copy_value (const GValue* src_value, GValue* dest_value)
 static gpointer value_page_peek_pointer (const GValue* value) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4312 "page.c"
+#line 4261 "page.c"
 }
 
 
 static gchar* value_page_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
-#line 4319 "page.c"
+#line 4268 "page.c"
 		Page* object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4326 "page.c"
+#line 4275 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4330 "page.c"
+#line 4279 "page.c"
 		}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = page_ref (object);
-#line 4334 "page.c"
+#line 4283 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4338 "page.c"
+#line 4287 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4342 "page.c"
+#line 4291 "page.c"
 }
 
 
@@ -4349,25 +4298,25 @@ static gchar* value_page_lcopy_value (const GValue* value, guint n_collect_value
 	if (!object_p) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4353 "page.c"
+#line 4302 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
-#line 4359 "page.c"
+#line 4308 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4363 "page.c"
+#line 4312 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = page_ref (value->data[0].v_pointer);
-#line 4367 "page.c"
+#line 4316 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4371 "page.c"
+#line 4320 "page.c"
 }
 
 
@@ -4381,7 +4330,7 @@ GParamSpec* param_spec_page (const gchar* name, const gchar* nick, const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
-#line 4385 "page.c"
+#line 4334 "page.c"
 }
 
 
@@ -4390,7 +4339,7 @@ gpointer value_get_page (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PAGE), NULL);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4394 "page.c"
+#line 4343 "page.c"
 }
 
 
@@ -4410,17 +4359,17 @@ void value_set_page (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_ref (value->data[0].v_pointer);
-#line 4414 "page.c"
+#line 4363 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4418 "page.c"
+#line 4367 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
-#line 4424 "page.c"
+#line 4373 "page.c"
 	}
 }
 
@@ -4439,17 +4388,17 @@ void value_take_page (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 4443 "page.c"
+#line 4392 "page.c"
 	} else {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4447 "page.c"
+#line 4396 "page.c"
 	}
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		page_unref (old);
-#line 4453 "page.c"
+#line 4402 "page.c"
 	}
 }
 
@@ -4473,7 +4422,7 @@ static void page_class_init (PageClass * klass) {
 	g_signal_new ("crop_changed", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	g_signal_new ("scan_finished", TYPE_PAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4477 "page.c"
+#line 4426 "page.c"
 }
 
 
@@ -4482,7 +4431,7 @@ static void page_instance_init (Page * self) {
 	self->priv = PAGE_GET_PRIVATE (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4486 "page.c"
+#line 4435 "page.c"
 }
 
 
@@ -4496,7 +4445,7 @@ static void page_finalize (Page* obj) {
 	self->priv->pixels = (g_free (self->priv->pixels), NULL);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_free0 (self->priv->_crop_name);
-#line 4500 "page.c"
+#line 4449 "page.c"
 }
 
 
@@ -4521,7 +4470,7 @@ gpointer page_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
-#line 4525 "page.c"
+#line 4474 "page.c"
 }
 
 
@@ -4534,7 +4483,7 @@ void page_unref (gpointer instance) {
 		PAGE_GET_CLASS (self)->finalize (self);
 #line 20 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4538 "page.c"
+#line 4487 "page.c"
 	}
 }
 
@@ -4557,23 +4506,23 @@ PixbufWriter* pixbuf_writer_construct (GType object_type, GFileOutputStream* str
 	self->stream = _tmp1_;
 #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return self;
-#line 4561 "page.c"
+#line 4510 "page.c"
 }
 
 
 PixbufWriter* pixbuf_writer_new (GFileOutputStream* stream) {
 #line 696 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return pixbuf_writer_construct (TYPE_PIXBUF_WRITER, stream);
-#line 4568 "page.c"
+#line 4517 "page.c"
 }
 
 
 static gboolean _pixbuf_writer_write_pixbuf_data_gdk_pixbuf_save_func (guint8* buf, gsize buf_length1, GError** error, gpointer self) {
 	gboolean result;
-	result = pixbuf_writer_write_pixbuf_data (self, buf, buf_length1, error);
+	result = pixbuf_writer_write_pixbuf_data ((PixbufWriter*) self, buf, buf_length1, error);
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4577 "page.c"
+#line 4526 "page.c"
 }
 
 
@@ -4611,7 +4560,7 @@ void pixbuf_writer_save (PixbufWriter* self, GdkPixbuf* image, const gchar* type
 		g_propagate_error (error, _inner_error_);
 #line 703 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return;
-#line 4615 "page.c"
+#line 4564 "page.c"
 	}
 }
 
@@ -4638,20 +4587,20 @@ static gboolean pixbuf_writer_write_pixbuf_data (PixbufWriter* self, guint8* buf
 		g_propagate_error (error, _inner_error_);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return FALSE;
-#line 4642 "page.c"
+#line 4591 "page.c"
 	}
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	result = TRUE;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return result;
-#line 4648 "page.c"
+#line 4597 "page.c"
 }
 
 
 static void value_pixbuf_writer_init (GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	value->data[0].v_pointer = NULL;
-#line 4655 "page.c"
+#line 4604 "page.c"
 }
 
 
@@ -4660,7 +4609,7 @@ static void value_pixbuf_writer_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (value->data[0].v_pointer);
-#line 4664 "page.c"
+#line 4613 "page.c"
 	}
 }
 
@@ -4670,11 +4619,11 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 	if (src_value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = pixbuf_writer_ref (src_value->data[0].v_pointer);
-#line 4674 "page.c"
+#line 4623 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4678 "page.c"
+#line 4627 "page.c"
 	}
 }
 
@@ -4682,37 +4631,37 @@ static void value_pixbuf_writer_copy_value (const GValue* src_value, GValue* des
 static gpointer value_pixbuf_writer_peek_pointer (const GValue* value) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4686 "page.c"
+#line 4635 "page.c"
 }
 
 
 static gchar* value_pixbuf_writer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (collect_values[0].v_pointer) {
-#line 4693 "page.c"
+#line 4642 "page.c"
 		PixbufWriter* object;
 		object = collect_values[0].v_pointer;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4700 "page.c"
+#line 4649 "page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4704 "page.c"
+#line 4653 "page.c"
 		}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = pixbuf_writer_ref (object);
-#line 4708 "page.c"
+#line 4657 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4712 "page.c"
+#line 4661 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4716 "page.c"
+#line 4665 "page.c"
 }
 
 
@@ -4723,25 +4672,25 @@ static gchar* value_pixbuf_writer_lcopy_value (const GValue* value, guint n_coll
 	if (!object_p) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4727 "page.c"
+#line 4676 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (!value->data[0].v_pointer) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = NULL;
-#line 4733 "page.c"
+#line 4682 "page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4737 "page.c"
+#line 4686 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		*object_p = pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4741 "page.c"
+#line 4690 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return NULL;
-#line 4745 "page.c"
+#line 4694 "page.c"
 }
 
 
@@ -4755,7 +4704,7 @@ GParamSpec* param_spec_pixbuf_writer (const gchar* name, const gchar* nick, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return G_PARAM_SPEC (spec);
-#line 4759 "page.c"
+#line 4708 "page.c"
 }
 
 
@@ -4764,7 +4713,7 @@ gpointer value_get_pixbuf_writer (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXBUF_WRITER), NULL);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return value->data[0].v_pointer;
-#line 4768 "page.c"
+#line 4717 "page.c"
 }
 
 
@@ -4784,17 +4733,17 @@ void value_set_pixbuf_writer (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_ref (value->data[0].v_pointer);
-#line 4788 "page.c"
+#line 4737 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4792 "page.c"
+#line 4741 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4798 "page.c"
+#line 4747 "page.c"
 	}
 }
 
@@ -4813,17 +4762,17 @@ void value_take_pixbuf_writer (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = v_object;
-#line 4817 "page.c"
+#line 4766 "page.c"
 	} else {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		value->data[0].v_pointer = NULL;
-#line 4821 "page.c"
+#line 4770 "page.c"
 	}
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	if (old) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		pixbuf_writer_unref (old);
-#line 4827 "page.c"
+#line 4776 "page.c"
 	}
 }
 
@@ -4833,14 +4782,14 @@ static void pixbuf_writer_class_init (PixbufWriterClass * klass) {
 	pixbuf_writer_parent_class = g_type_class_peek_parent (klass);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	PIXBUF_WRITER_CLASS (klass)->finalize = pixbuf_writer_finalize;
-#line 4837 "page.c"
+#line 4786 "page.c"
 }
 
 
 static void pixbuf_writer_instance_init (PixbufWriter * self) {
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	self->ref_count = 1;
-#line 4844 "page.c"
+#line 4793 "page.c"
 }
 
 
@@ -4850,7 +4799,7 @@ static void pixbuf_writer_finalize (PixbufWriter* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXBUF_WRITER, PixbufWriter);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	_g_object_unref0 (self->stream);
-#line 4854 "page.c"
+#line 4803 "page.c"
 }
 
 
@@ -4875,7 +4824,7 @@ gpointer pixbuf_writer_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 	return instance;
-#line 4879 "page.c"
+#line 4828 "page.c"
 }
 
 
@@ -4888,7 +4837,7 @@ void pixbuf_writer_unref (gpointer instance) {
 		PIXBUF_WRITER_GET_CLASS (self)->finalize (self);
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4892 "page.c"
+#line 4841 "page.c"
 	}
 }
 
diff --git a/src/page.vala b/src/page.vala
index 34613b3..b375723 100644
--- a/src/page.vala
+++ b/src/page.vala
@@ -644,10 +644,10 @@ public class Page
     
     public void copy_to_clipboard (Gtk.Window window)
     {        
-        Gdk.Display display = window.get_display ();
-        Gtk.Clipboard clipboard = Gtk.Clipboard.get_for_display (display, Gdk.SELECTION_CLIPBOARD);
+        var display = window.get_display ();
+        var clipboard = Gtk.Clipboard.get_for_display (display, Gdk.SELECTION_CLIPBOARD);
         var image = get_image (true);
-        clipboard.set_image(image);
+        clipboard.set_image (image);
     }
 
     public void save (string type, int quality, File file) throws Error
diff --git a/src/resources.c b/src/resources.c
index ba2e1c5..124a8cd 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -6,281 +6,48 @@
 # define SECTION
 #endif
 
-static const SECTION union { const guint8 data[45120]; const double alignment; void * const ptr;}  simple_scan_resource_data = { {
+static const SECTION union { const guint8 data[50751]; const double alignment; void * const ptr;}  simple_scan_resource_data = { {
   0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x18, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, 
-  0x00, 0x00, 0x00, 0x28, 0x06, 0x00, 0x00, 0x00, 
+  0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00, 
   0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
-  0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
-  0x06, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
-  0xb8, 0x8c, 0x08, 0x40, 0x04, 0x00, 0x00, 0x00, 
-  0xc8, 0x00, 0x00, 0x00, 0x13, 0x00, 0x76, 0x00, 
-  0xe0, 0x00, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 
-  0x76, 0x8d, 0xc8, 0xbd, 0x04, 0x00, 0x00, 0x00, 
-  0xe0, 0x07, 0x00, 0x00, 0x0e, 0x00, 0x76, 0x00, 
-  0xf0, 0x07, 0x00, 0x00, 0x0f, 0xb0, 0x00, 0x00, 
-  0x4b, 0x50, 0x90, 0x0b, 0x05, 0x00, 0x00, 0x00, 
-  0x0f, 0xb0, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, 
-  0x14, 0xb0, 0x00, 0x00, 0x18, 0xb0, 0x00, 0x00, 
-  0xb0, 0xb7, 0x24, 0x30, 0x02, 0x00, 0x00, 0x00, 
-  0x18, 0xb0, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, 
-  0x20, 0xb0, 0x00, 0x00, 0x24, 0xb0, 0x00, 0x00, 
-  0x6e, 0xa3, 0x22, 0x37, 0x03, 0x00, 0x00, 0x00, 
-  0x24, 0xb0, 0x00, 0x00, 0x0b, 0x00, 0x4c, 0x00, 
-  0x30, 0xb0, 0x00, 0x00, 0x38, 0xb0, 0x00, 0x00, 
-  0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, 
-  0x38, 0xb0, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, 
-  0x3c, 0xb0, 0x00, 0x00, 0x40, 0xb0, 0x00, 0x00, 
-  0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2d, 0x73, 
-  0x63, 0x61, 0x6e, 0x2d, 0x6d, 0x65, 0x6e, 0x75, 
-  0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0xf0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-  0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
-  0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
-  0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, 
-  0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 
-  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 0x6e, 
-  0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x2d, 
-  0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, 
-  0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 0x2e, 
-  0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6d, 0x65, 
-  0x6e, 0x75, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 
-  0x70, 0x70, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
-  0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x3e, 0x4e, 0x65, 0x77, 0x20, 0x44, 0x6f, 
-  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 
-  0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x6e, 
-  0x65, 0x77, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 
-  0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
-  0x21, 0x5b, 0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 
-  0x3c, 0x43, 0x74, 0x72, 0x6c, 0x3e, 0x4e, 0x5d, 
-  0x5d, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 
-  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 
-  0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 
-  0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 
-  0x3c, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 
-  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x3e, 0x44, 0x6f, 0x63, 0x75, 
-  0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, 
-  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 
-  0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x3e, 0x53, 0x61, 0x76, 0x65, 0x3c, 0x2f, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 
-  0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x73, 
-  0x61, 0x76, 0x65, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
-  0x21, 0x5b, 0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 
-  0x3c, 0x43, 0x74, 0x72, 0x6c, 0x3e, 0x53, 0x5d, 
-  0x5d, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 
-  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 
-  0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, 0x61, 
-  0x76, 0x65, 0x20, 0x41, 0x73, 0x2e, 0x2e, 0x2e, 
-  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 
-  0x2e, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x61, 0x73, 
-  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 
-  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 0x43, 
-  0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x53, 0x68, 
-  0x69, 0x66, 0x74, 0x3e, 0x3c, 0x43, 0x74, 0x72, 
-  0x6c, 0x3e, 0x53, 0x5d, 0x5d, 0x3e, 0x3c, 0x2f, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 
-  0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x3e, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x2e, 
-  0x2e, 0x2e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 
-  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 
-  0x70, 0x70, 0x2e, 0x65, 0x6d, 0x61, 0x69, 0x6c, 
-  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 
-  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 0x43, 
-  0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x43, 0x74, 
-  0x72, 0x6c, 0x3e, 0x45, 0x5d, 0x5d, 0x3e, 0x3c, 
-  0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
-  0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 
-  0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 
-  0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
-  0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x3e, 0x50, 0x72, 0x69, 0x6e, 0x74, 
-  0x2e, 0x2e, 0x2e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x61, 0x70, 0x70, 0x2e, 0x70, 0x72, 0x69, 0x6e, 
-  0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 
-  0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 
-  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
-  0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 
-  0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x43, 
-  0x74, 0x72, 0x6c, 0x3e, 0x50, 0x5d, 0x5d, 0x3e, 
-  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 
-  0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 
-  0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x2f, 0x73, 
-  0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 
-  0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 
-  0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
-  0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x3e, 0x50, 0x72, 0x65, 0x66, 0x65, 
-  0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 
-  0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 
-  0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x70, 
-  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
-  0x65, 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 
-  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 
-  0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 
-  0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 
-  0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 
-  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x3e, 0x48, 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x61, 
-  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
-  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x68, 0x65, 
-  0x6c, 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 
-  0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 
-  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 
-  0x5b, 0x43, 0x44, 0x41, 0x54, 0x41, 0x5b, 0x46, 
-  0x31, 0x5d, 0x5d, 0x3e, 0x3c, 0x2f, 0x61, 0x74, 
-  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 
-  0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 
-  0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 
-  0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 
-  0x41, 0x62, 0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x61, 
-  0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 
-  0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x61, 0x62, 
-  0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
-  0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, 
-  0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x51, 
-  0x75, 0x69, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 
-  0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 
-  0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x61, 0x70, 0x70, 0x2e, 0x71, 0x75, 0x69, 0x74, 
-  0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 
-  0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 
-  0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 
-  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x21, 0x5b, 0x43, 
-  0x44, 0x41, 0x54, 0x41, 0x5b, 0x3c, 0x43, 0x74, 
-  0x72, 0x6c, 0x3e, 0x51, 0x5d, 0x5d, 0x3e, 0x3c, 
-  0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 
-  0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 
-  0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 
-  0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 
-  0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 
+  0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+  0x05, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 
+  0xff, 0xff, 0xff, 0xff, 0xac, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x4c, 0x00, 0xb0, 0x00, 0x00, 0x00, 
+  0xb4, 0x00, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, 
+  0x00, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 
+  0x04, 0x00, 0x4c, 0x00, 0xb8, 0x00, 0x00, 0x00, 
+  0xbc, 0x00, 0x00, 0x00, 0x6e, 0xa3, 0x22, 0x37, 
+  0x03, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 
+  0x0b, 0x00, 0x4c, 0x00, 0xc8, 0x00, 0x00, 0x00, 
+  0xcc, 0x00, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, 
+  0x01, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 
+  0x06, 0x00, 0x4c, 0x00, 0xd4, 0x00, 0x00, 0x00, 
+  0xd8, 0x00, 0x00, 0x00, 0x76, 0x8d, 0xc8, 0xbd, 
+  0x02, 0x00, 0x00, 0x00, 0xd8, 0x00, 0x00, 0x00, 
+  0x0e, 0x00, 0x76, 0x00, 0xe8, 0x00, 0x00, 0x00, 
+  0x3f, 0xc6, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 
+  0x01, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 
+  0x03, 0x00, 0x00, 0x00, 0x53, 0x69, 0x6d, 0x70, 
+  0x6c, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x2f, 0x00, 
+  0x04, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, 
+  0x65, 0x2f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 
   0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x2d, 0x73, 
   0x63, 0x61, 0x6e, 0x2e, 0x75, 0x69, 0x00, 0x00, 
-  0x0f, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x47, 0xc5, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
   0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 
   0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 
   0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 
   0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, 
   0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 
-  0x21, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 
-  0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 
-  0x74, 0x68, 0x20, 0x67, 0x6c, 0x61, 0x64, 0x65, 
-  0x20, 0x33, 0x2e, 0x31, 0x36, 0x2e, 0x30, 0x20, 
-  0x6f, 0x6e, 0x20, 0x54, 0x75, 0x65, 0x20, 0x4e, 
-  0x6f, 0x76, 0x20, 0x31, 0x39, 0x20, 0x31, 0x33, 
-  0x3a, 0x35, 0x30, 0x3a, 0x33, 0x35, 0x20, 0x32, 
-  0x30, 0x31, 0x33, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 
-  0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 
-  0x63, 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
   0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 
-  0x65, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 
-  0x65, 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 
-  0x33, 0x2e, 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
+  0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, 
+  0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 
+  0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 
+  0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, 
+  0x2e, 0x31, 0x30, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
   0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
   0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 
@@ -319,324 +86,238 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x79, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x69, 0x65, 0x6e, 0x74, 
-  0x5f, 0x66, 0x6f, 0x72, 0x22, 0x3e, 0x73, 0x69, 
-  0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 
-  0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 
-  0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 
-  0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 
-  0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 
-  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 
-  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 
-  0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 
-  0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x42, 0x6f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 
+  0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x76, 0x62, 
+  0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 
   0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 
-  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, 
-  0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 
-  0x61, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 
-  0x79, 0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 
-  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x42, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 
-  0x73, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x20, 0x61, 
-  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 
-  0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x69, 0x61, 
-  0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x5f, 0x41, 0x75, 
-  0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 
-  0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 
-  0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x76, 0x62, 
+  0x6f, 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 
-  0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 
+  0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
+  0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 
+  0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 0x61, 
+  0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 
+  0x67, 0x2d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+  0x5f, 0x61, 0x72, 0x65, 0x61, 0x31, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 
-  0x78, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x79, 0x6f, 0x75, 
+  0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x22, 
+  0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x68, 
+  0x6f, 0x72, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x20, 0x74, 0x6f, 0x20, 0x73, 0x75, 0x62, 0x6d, 
+  0x69, 0x74, 0x20, 0x61, 0x75, 0x74, 0x68, 0x6f, 
+  0x72, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 
+  0x20, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 
+  0x3e, 0x5f, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 
+  0x69, 0x7a, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 
+  0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 
-  0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 
-  0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 
-  0x22, 0x3e, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x61, 0x75, 0x74, 0x68, 0x6f, 
-  0x72, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 
   0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x54, 0x68, 0x69, 0x73, 0x20, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x20, 0x69, 0x73, 0x20, 0x73, 0x65, 
-  0x74, 0x20, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 
-  0x63, 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x61, 0x6e, 
-  0x64, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x65, 0x64, 0x22, 0x3e, 0x54, 0x6f, 0x20, 
-  0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x20, 
-  0x74, 0x6f, 0x20, 0x3f, 0x20, 0x79, 0x6f, 0x75, 
-  0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, 0x74, 0x6f, 
-  0x20, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 
-  0x7a, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
   0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 
-  0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
+  0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 
+  0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x76, 0x62, 0x6f, 0x78, 0x35, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
-  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 
-  0x69, 0x64, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 
+  0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 
+  0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 
+  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 
+  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x31, 0x32, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 
+  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 
+  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 
-  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 
-  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
-  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 
-  0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 
-  0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 
-  0x72, 0x22, 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x54, 0x68, 0x69, 0x73, 
+  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x69, 
+  0x73, 0x20, 0x73, 0x65, 0x74, 0x20, 0x64, 0x79, 
+  0x6e, 0x61, 0x6d, 0x69, 0x63, 0x61, 0x6c, 0x6c, 
+  0x79, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x69, 0x73, 
+  0x20, 0x6e, 0x6f, 0x74, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x22, 
+  0x3e, 0x54, 0x6f, 0x20, 0x63, 0x6f, 0x6e, 0x6e, 
+  0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x3f, 
+  0x20, 0x79, 0x6f, 0x75, 0x20, 0x6e, 0x65, 0x65, 
+  0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x75, 0x74, 
+  0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
   0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x45, 0x6e, 
-  0x74, 0x72, 0x79, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 
-  0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x32, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
@@ -645,18 +326,40 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x69, 0x6c, 0x69, 0x74, 0x79, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 
+  0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 
+  0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, 0x63, 
+  0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, 0x6e, 
+  0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
@@ -674,7 +377,7 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
@@ -690,10 +393,10 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
   0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x74, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x73, 
+  0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 
+  0x74, 0x72, 0x79, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
   0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
@@ -702,212 +405,240 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
   0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 
-  0x65, 0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 
-  0x3e, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x6e, 0x61, 
-  0x6d, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 
-  0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 
+  0x79, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 
+  0x72, 0x22, 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
+  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 
+  0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 
-  0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
-  0x22, 0x3e, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 
-  0x6d, 0x65, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
-  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
-  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
-  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x70, 0x61, 0x73, 0x73, 0x77, 
-  0x6f, 0x72, 0x64, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
-  0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x70, 
-  0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x20, 
-  0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3e, 0x5f, 
-  0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 
-  0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 
-  0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 
-  0x74, 0x22, 0x3e, 0x70, 0x61, 0x73, 0x73, 0x77, 
-  0x6f, 0x72, 0x64, 0x5f, 0x65, 0x6e, 0x74, 0x72, 
-  0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
-  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 
+  0x73, 0x69, 0x64, 0x65, 0x20, 0x75, 0x73, 0x65, 
+  0x72, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x65, 0x6e, 
+  0x74, 0x72, 0x79, 0x22, 0x3e, 0x5f, 0x55, 0x73, 
+  0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 
+  0x72, 0x63, 0x65, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 
+  0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 
+  0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x75, 0x73, 
+  0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x65, 
+  0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
-  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
-  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
+  0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 
+  0x64, 0x65, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, 
+  0x6f, 0x72, 0x64, 0x20, 0x65, 0x6e, 0x74, 0x72, 
+  0x79, 0x22, 0x3e, 0x5f, 0x50, 0x61, 0x73, 0x73, 
+  0x77, 0x6f, 0x72, 0x64, 0x3a, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 
-  0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
-  0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 
-  0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 0x65, 
-  0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 0x22, 
-  0x30, 0x22, 0x3e, 0x61, 0x75, 0x74, 0x68, 0x6f, 
-  0x72, 0x69, 0x7a, 0x65, 0x5f, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
-  0x65, 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 0x74, 
-  0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 
-  0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 
-  0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 
-  0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 
-  0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 
-  0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 
+  0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 
+  0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 
+  0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 
+  0x65, 0x6e, 0x74, 0x72, 0x79, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
+  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, 
-  0x77, 0x65, 0x72, 0x22, 0x3e, 0x2d, 0x31, 0x30, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 
-  0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 0x2f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 
+  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 
+  0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 
+  0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 
-  0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 
-  0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 
-  0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
+  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, 
-  0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 
-  0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 0x61, 0x64, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 
+  0x73, 0x65, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x61, 
+  0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x65, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 
+  0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x62, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x61, 0x64, 
   0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
   0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
@@ -933,54 +664,60 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
   0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 
-  0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 
-  0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
-  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
-  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x6e, 
-  0x61, 0x6d, 0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 
-  0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 
-  0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 
-  0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
-  0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
-  0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 
-  0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 
-  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x65, 
-  0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 
-  0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 
+  0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
+  0x74, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x6f, 
+  0x77, 0x65, 0x72, 0x22, 0x3e, 0x2d, 0x31, 0x30, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 0x65, 
+  0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
-  0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 
-  0x22, 0x3e, 0x6d, 0x61, 0x69, 0x6c, 0x2d, 0x73, 
-  0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 0x6e, 
+  0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 
+  0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 
+  0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, 0x76, 0x69, 
+  0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 
+  0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
+  0x61, 0x6d, 0x65, 0x20, 0x64, 0x65, 0x76, 0x69, 
+  0x63, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
+  0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
+  0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 
+  0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 
+  0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
+  0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 0x3e, 
+  0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 
+  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x63, 
+  0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 0x79, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x65, 0x6d, 0x61, 0x69, 0x6c, 
   0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
@@ -994,36 +731,58 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
-  0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x68, 0x65, 
-  0x6c, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 
-  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 
-  0x6f, 0x64, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 
-  0x65, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 
-  0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 
-  0x6e, 0x61, 0x6d, 0x65, 0x20, 0x6d, 0x6f, 0x64, 
-  0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6d, 0x61, 
+  0x69, 0x6c, 0x2d, 0x73, 0x65, 0x6e, 0x64, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
+  0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x68, 0x65, 0x6c, 0x70, 0x5f, 0x69, 0x6d, 0x61, 
+  0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
+  0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x67, 0x74, 
+  0x6b, 0x2d, 0x68, 0x65, 0x6c, 0x70, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 
+  0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 
+  0x73, 0x69, 0x64, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 
+  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x73, 0x69, 
+  0x64, 0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 
+  0x70, 0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
+  0x61, 0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
   0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
   0x65, 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 
   0x61, 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
-  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 
-  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
-  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
-  0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 0x6f, 
-  0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x74, 0x65, 
-  0x78, 0x74, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x73, 0x3e, 0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 
+  0x3c, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 
+  0x3e, 0x33, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 
   0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 
   0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
   0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
@@ -1031,52 +790,16 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
   0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
   0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x65, 0x78, 
-  0x74, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 
-  0x6f, 0x64, 0x65, 0x22, 0x3e, 0x54, 0x65, 0x78, 
-  0x74, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
-  0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 
-  0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x70, 0x68, 
-  0x6f, 0x74, 0x6f, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
-  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
-  0x62, 0x6f, 0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x68, 
-  0x6f, 0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 
-  0x20, 0x6d, 0x6f, 0x64, 0x65, 0x22, 0x3e, 0x50, 
-  0x68, 0x6f, 0x74, 0x6f, 0x3c, 0x2f, 0x63, 0x6f, 
-  0x6c, 0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 
-  0x3c, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 
-  0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 
-  0x64, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
-  0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
-  0x61, 0x6d, 0x65, 0x20, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
-  0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
-  0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
-  0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
-  0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 
-  0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
-  0x3c, 0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x72, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x62, 0x6f, 
+  0x74, 0x68, 0x20, 0x73, 0x69, 0x64, 0x65, 0x73, 
+  0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x22, 0x3e, 0x46, 0x72, 0x6f, 0x6e, 
+  0x74, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x42, 0x61, 
+  0x63, 0x6b, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 
+  0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 
   0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x33, 
+  0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x31, 
   0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 
   0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 
   0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
@@ -1086,357 +809,258 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 
   0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 
   0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 
-  0x69, 0x6e, 0x67, 0x20, 0x62, 0x6f, 0x74, 0x68, 
-  0x20, 0x73, 0x69, 0x64, 0x65, 0x73, 0x20, 0x6f, 
-  0x66, 0x20, 0x61, 0x20, 0x70, 0x61, 0x67, 0x65, 
-  0x22, 0x3e, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x20, 
-  0x61, 0x6e, 0x64, 0x20, 0x42, 0x61, 0x63, 0x6b, 
-  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 
-  0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 0x77, 
-  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x30, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
-  0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 0x6f, 0x6d, 
-  0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x20, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 0x72, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 0x6e, 
-  0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x72, 
-  0x6f, 0x6e, 0x74, 0x20, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x70, 0x61, 
-  0x67, 0x65, 0x22, 0x3e, 0x46, 0x72, 0x6f, 0x6e, 
-  0x74, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
-  0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x72, 0x6f, 
-  0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 0x32, 0x3c, 
-  0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x63, 0x6f, 
-  0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x31, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x43, 0x6f, 
-  0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x20, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x69, 
-  0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 
-  0x61, 0x63, 0x6b, 0x20, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x70, 0x61, 
-  0x67, 0x65, 0x22, 0x3e, 0x42, 0x61, 0x63, 0x6b, 
-  0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 0x2f, 
-  0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 0x64, 0x61, 
-  0x74, 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 
-  0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x70, 
-  0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 
-  0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x3e, 0x3c, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
-  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
-  0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x20, 0x2d, 
-  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
-  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 
-  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 
-  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
-  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 
-  0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 
-  0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 
-  0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 
-  0x69, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x22, 
+  0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 
+  0x66, 0x72, 0x6f, 0x6e, 0x74, 0x20, 0x73, 0x69, 
+  0x64, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x46, 0x72, 
+  0x6f, 0x6e, 0x74, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 
+  0x3e, 0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 
+  0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x30, 0x22, 0x3e, 
+  0x32, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 0x3c, 
+  0x63, 0x6f, 0x6c, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x31, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 
+  0x78, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x6e, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x62, 0x61, 0x63, 0x6b, 0x20, 0x73, 0x69, 
+  0x64, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x42, 0x61, 
+  0x63, 0x6b, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x3e, 
+  0x3c, 0x2f, 0x72, 0x6f, 0x77, 0x3e, 0x3c, 0x2f, 
+  0x64, 0x61, 0x74, 0x61, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, 0x6f, 0x72, 
+  0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 
+  0x65, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 
   0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
   0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
   0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
-  0x6d, 0x65, 0x20, 0x64, 0x70, 0x69, 0x20, 0x2d, 
-  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 0x2d, 
-  0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
-  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 
-  0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 0x61, 
-  0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x6f, 
-  0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 
-  0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
-  0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 
-  0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x70, 0x70, 
-  0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 0x30, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 0x5f, 0x69, 
-  0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
-  0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x31, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x70, 
-  0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 
-  0x6e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x69, 0x6d, 
-  0x70, 0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 
-  0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x6d, 0x65, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 
+  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
+  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
+  0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 
+  0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 
+  0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 
+  0x64, 0x70, 0x69, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 
+  0x6c, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 
+  0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 
+  0x6e, 0x61, 0x6d, 0x65, 0x20, 0x64, 0x70, 0x69, 
+  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 
+  0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
+  0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
+  0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
+  0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 
+  0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x41, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 
+  0x74, 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x70, 0x70, 0x65, 0x72, 0x22, 0x3e, 0x31, 0x30, 
+  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 
-  0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x54, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x6f, 0x66, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x77, 0x69, 
-  0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x53, 0x69, 
-  0x6d, 0x70, 0x6c, 0x65, 0x20, 0x53, 0x63, 0x61, 
-  0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x74, 0x65, 0x70, 
+  0x5f, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 
+  0x6e, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x70, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x63, 
+  0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 
+  0x31, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x74, 
+  0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x55, 
+  0x73, 0x65, 0x72, 0x49, 0x6e, 0x74, 0x65, 0x72, 
+  0x66, 0x61, 0x63, 0x65, 0x22, 0x20, 0x70, 0x61, 
+  0x72, 0x65, 0x6e, 0x74, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 
+  0x74, 0x69, 0x6f, 0x6e, 0x57, 0x69, 0x6e, 0x64, 
+  0x6f, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
-  0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 
-  0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 0x2f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x54, 0x69, 0x74, 0x6c, 0x65, 
+  0x20, 0x6f, 0x66, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x20, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 
+  0x3e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x20, 
+  0x53, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 
+  0x22, 0x3e, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 
+  0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 
+  0x75, 0x72, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 
+  0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 
+  0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x63, 
   0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 
-  0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 
-  0x64, 0x6f, 0x77, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 
-  0x69, 0x67, 0x75, 0x72, 0x65, 0x5f, 0x65, 0x76, 
-  0x65, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 
-  0x74, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 
-  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, 
-  0x77, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
   0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 
   0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
   0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
   0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
-  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x73, 0x74, 
-  0x61, 0x74, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 
-  0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x73, 0x69, 0x6d, 0x70, 
-  0x6c, 0x65, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
-  0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x77, 
-  0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x74, 
-  0x61, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x65, 0x6c, 0x65, 0x74, 0x65, 0x2d, 0x65, 0x76, 
+  0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x77, 0x69, 
+  0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x64, 0x65, 0x6c, 
+  0x65, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 
   0x74, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
   0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x61, 
-  0x69, 0x6e, 0x5f, 0x76, 0x62, 0x6f, 0x78, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
+  0x2d, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2d, 0x65, 
+  0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 
+  0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 
+  0x77, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
+  0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x65, 
+  0x76, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x6d, 0x61, 0x69, 0x6e, 0x5f, 0x76, 0x62, 
+  0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 
-  0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 
-  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
-  0x75, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x61, 
-  0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x6f, 0x63, 
-  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
-  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
-  0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 
-  0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 
-  0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x28, 0x63, 
-  0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 
-  0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 
-  0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x69, 0x73, 
-  0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
-  0x74, 0x2c, 0x20, 0x65, 0x2e, 0x67, 0x2e, 0x20, 
-  0x73, 0x61, 0x76, 0x65, 0x2c, 0x20, 0x70, 0x72, 
-  0x69, 0x6e, 0x74, 0x29, 0x22, 0x3e, 0x5f, 0x44, 
-  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 
-  0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 
-  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x6f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 
+  0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 
+  0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
   0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
-  0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
-  0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x6e, 0x65, 0x77, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x4d, 0x65, 0x6e, 0x75, 0x42, 0x61, 0x72, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x65, 0x6e, 
+  0x75, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
-  0x2d, 0x6e, 0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
   0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
   0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
-  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
-  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
-  0x65, 0x79, 0x3d, 0x22, 0x6e, 0x22, 0x20, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
-  0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 
-  0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 
-  0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x6e, 0x65, 0x77, 0x5f, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
-  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 
-  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x53, 0x63, 0x5f, 
-  0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x6f, 0x6e, 0x20, 0x64, 0x6f, 0x63, 0x75, 
+  0x6d, 0x65, 0x6e, 0x74, 0x20, 0x6d, 0x65, 0x6e, 
+  0x75, 0x20, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x61, 
+  0x69, 0x6e, 0x73, 0x20, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+  0x74, 0x68, 0x69, 0x73, 0x20, 0x64, 0x6f, 0x63, 
+  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x2c, 0x20, 0x65, 
+  0x2e, 0x67, 0x2e, 0x20, 0x73, 0x61, 0x76, 0x65, 
+  0x2c, 0x20, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x29, 
+  0x22, 0x3e, 0x5f, 0x44, 0x6f, 0x63, 0x75, 0x6d, 
+  0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
+  0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 
+  0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x6f, 
+  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
   0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
@@ -1447,164 +1071,106 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
   0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
-  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 
-  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 
-  0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
   0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x65, 0x77, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x73, 0x69, 0x6e, 
-  0x67, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x6e, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 
+  0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 
+  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
+  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x53, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 
+  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x53, 0x63, 0x5f, 0x61, 0x6e, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 
-  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
-  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 
-  0x6e, 0x67, 0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 
-  0x65, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 
-  0x68, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 
-  0x65, 0x72, 0x22, 0x3e, 0x53, 0x69, 0x6e, 0x67, 
-  0x6c, 0x65, 0x20, 0x5f, 0x50, 0x61, 0x67, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
-  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
-  0x79, 0x3d, 0x22, 0x31, 0x22, 0x20, 0x73, 0x69, 
-  0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
-  0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 
-  0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 
-  0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 
-  0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 
-  0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 
-  0x6e, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
-  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x53, 
-  0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 
-  0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 
-  0x6c, 0x20, 0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 
-  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x61, 0x20, 0x64, 
-  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 
-  0x66, 0x65, 0x65, 0x64, 0x65, 0x72, 0x22, 0x3e, 
-  0x41, 0x6c, 0x6c, 0x20, 0x50, 0x61, 0x67, 0x65, 
-  0x73, 0x20, 0x46, 0x72, 0x6f, 0x6d, 0x20, 0x5f, 
-  0x46, 0x65, 0x65, 0x64, 0x65, 0x72, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x66, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
-  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
-  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
-  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
-  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 
-  0x74, 0x69, 0x6e, 0x75, 0x6f, 0x75, 0x73, 0x5f, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
-  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, 
-  0x6f, 0x70, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
   0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
@@ -1612,45 +1178,63 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 
-  0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
   0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 
-  0x20, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x20, 0x74, 
-  0x6f, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x63, 
-  0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x22, 0x3e, 0x5f, 0x53, 0x74, 
-  0x6f, 0x70, 0x20, 0x53, 0x63, 0x61, 0x6e, 0x3c, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
-  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
-  0x3d, 0x22, 0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x53, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 
+  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
+  0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
+  0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x66, 0x72, 
+  0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x22, 0x3e, 
+  0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x5f, 
+  0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x31, 
   0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
   0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
-  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x74, 
-  0x6f, 0x70, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 
+  0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 
+  0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 
+  0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
   0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
   0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
   0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
@@ -1660,30 +1244,10 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
   0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 
-  0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 
-  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x61, 0x6c, 
+  0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
   0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
@@ -1700,42 +1264,62 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
   0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
   0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
-  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x53, 0x63, 0x61, 0x6e, 0x20, 
+  0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x73, 0x20, 0x66, 0x72, 0x6f, 0x6d, 
+  0x20, 0x61, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 
+  0x65, 0x6e, 0x74, 0x20, 0x66, 0x65, 0x65, 0x64, 
+  0x65, 0x72, 0x22, 0x3e, 0x41, 0x6c, 0x6c, 0x20, 
+  0x50, 0x61, 0x67, 0x65, 0x73, 0x20, 0x46, 0x72, 
+  0x6f, 0x6d, 0x20, 0x5f, 0x46, 0x65, 0x65, 0x64, 
+  0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 
+  0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 
+  0x6b, 0x65, 0x79, 0x3d, 0x22, 0x66, 0x22, 0x20, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 
+  0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 
+  0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 
+  0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 
+  0x6f, 0x75, 0x73, 0x5f, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
-  0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 
-  0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 
-  0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 
+  0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
@@ -1747,59 +1331,45 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
   0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
   0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x68, 
-  0x6f, 0x74, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4d, 0x65, 0x6e, 0x75, 0x20, 0x65, 0x6e, 0x74, 
+  0x72, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x73, 0x74, 
+  0x6f, 0x70, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 
+  0x6e, 0x74, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x22, 
+  0x3e, 0x5f, 0x53, 0x74, 0x6f, 0x70, 0x20, 0x53, 
+  0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
   0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
   0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 
-  0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 
-  0x74, 0x65, 0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
-  0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 
-  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
-  0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x73, 0x61, 0x76, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
-  0x6b, 0x2d, 0x73, 0x61, 0x76, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
+  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
+  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x45, 0x73, 
+  0x63, 0x61, 0x70, 0x65, 0x22, 0x20, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 
+  0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x32, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
@@ -1807,42 +1377,55 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 
-  0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 
+  0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x65, 0x78, 
+  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x73, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
-  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
-  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
-  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
-  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x61, 0x76, 
-  0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 
-  0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 
+  0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x74, 0x65, 0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 
   0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
   0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
   0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
@@ -1850,31 +1433,27 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
   0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 
+  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
   0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 
-  0x65, 0x5f, 0x61, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
-  0x6b, 0x2d, 0x73, 0x61, 0x76, 0x65, 0x2d, 0x61, 
-  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 
-  0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x68, 0x6f, 
+  0x74, 0x6f, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
@@ -1884,111 +1463,43 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
-  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
-  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
-  0x65, 0x79, 0x3d, 0x22, 0x73, 0x22, 0x20, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
-  0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 
-  0x53, 0x48, 0x49, 0x46, 0x54, 0x5f, 0x4d, 0x41, 
-  0x53, 0x4b, 0x20, 0x7c, 0x20, 0x47, 0x44, 0x4b, 
-  0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 
-  0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x61, 0x73, 
-  0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
-  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
+  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
+  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
+  0x75, 0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 
+  0x6f, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
   0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
   0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x65, 0x6d, 0x61, 0x69, 
-  0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 
-  0x20, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x20, 0x6d, 
-  0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x5f, 0x45, 0x6d, 0x61, 0x69, 0x6c, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 
-  0x65, 0x22, 0x3e, 0x65, 0x6d, 0x61, 0x69, 0x6c, 
-  0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
-  0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
-  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
-  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x65, 0x22, 
-  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 
-  0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 
-  0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 
-  0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
-  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 
-  0x69, 0x6e, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
-  0x2d, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 
+  0x65, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
@@ -2001,55 +1512,93 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x65, 0x6f, 
+  0x72, 0x64, 0x65, 0x72, 0x20, 0x70, 0x61, 0x67, 
+  0x65, 0x73, 0x22, 0x3e, 0x52, 0x65, 0x6f, 0x72, 
+  0x64, 0x65, 0x72, 0x20, 0x50, 0x61, 0x67, 0x65, 
+  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
   0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
   0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
-  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 
-  0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 
-  0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x70, 0x22, 
-  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 
-  0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 
-  0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 
-  0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x5f, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
-  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 
-  0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
-  0x6e, 0x74, 0x5f, 0x73, 0x65, 0x70, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x72, 0x65, 0x6f, 0x72, 0x64, 
+  0x65, 0x72, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x73, 0x61, 
+  0x76, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 
+  0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
+  0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 
+  0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 
+  0x6b, 0x65, 0x79, 0x3d, 0x22, 0x73, 0x22, 0x20, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 
+  0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 
+  0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 
+  0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x66, 0x69, 
+  0x6c, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
   0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
@@ -2057,14 +1606,13 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
   0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
   0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 
-  0x6e, 0x63, 0x65, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 
-  0x6b, 0x2d, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 
-  0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 
+  0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x61, 0x73, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x73, 0x61, 
+  0x76, 0x65, 0x2d, 0x61, 0x73, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
@@ -2073,65 +1621,67 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
-  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 
-  0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 
-  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 
-  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 
-  0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x31, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x71, 0x75, 
-  0x69, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 
-  0x71, 0x75, 0x69, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x73, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 
+  0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 
+  0x47, 0x44, 0x4b, 0x5f, 0x53, 0x48, 0x49, 0x46, 
+  0x54, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x20, 0x7c, 
+  0x20, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
+  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
+  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x61, 0x76, 
+  0x65, 0x5f, 0x61, 0x73, 0x5f, 0x66, 0x69, 0x6c, 
+  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
+  0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x65, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x65, 0x6d, 0x61, 
+  0x69, 0x6c, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x5f, 0x45, 
+  0x6d, 0x61, 0x69, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
@@ -2151,164 +1701,97 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
-  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
-  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
-  0x65, 0x79, 0x3d, 0x22, 0x77, 0x22, 0x20, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
-  0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 
-  0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 
-  0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 
-  0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 
-  0x22, 0x71, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 
-  0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 
-  0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 
-  0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 
-  0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x71, 0x75, 0x69, 
-  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x50, 0x61, 
-  0x67, 0x65, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 
-  0x28, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 
-  0x73, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
-  0x20, 0x66, 0x6f, 0x72, 0x20, 0x65, 0x61, 0x63, 
-  0x68, 0x20, 0x70, 0x61, 0x67, 0x65, 0x2c, 0x20, 
-  0x65, 0x2e, 0x67, 0x2e, 0x20, 0x64, 0x65, 0x6c, 
-  0x65, 0x74, 0x65, 0x2c, 0x20, 0x63, 0x72, 0x6f, 
-  0x70, 0x29, 0x22, 0x3e, 0x5f, 0x50, 0x61, 0x67, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 
-  0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
-  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x65, 
+  0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x69, 0x6d, 0x61, 
+  0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
+  0x3d, 0x22, 0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 
+  0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 
+  0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 
+  0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 
+  0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x65, 0x6d, 
+  0x61, 0x69, 0x6c, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 
-  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
-  0x74, 0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 
-  0x6f, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x28, 
-  0x61, 0x6e, 0x74, 0x69, 0x2d, 0x63, 0x6c, 0x6f, 
-  0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x29, 0x22, 
-  0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
-  0x5f, 0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 0x70, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x70, 0x72, 0x69, 
+  0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
   0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
-  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
-  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
-  0x62, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x6c, 
-  0x65, 0x66, 0x74, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 
+  0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 
+  0x3d, 0x22, 0x70, 0x22, 0x20, 0x73, 0x69, 0x67, 
   0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
-  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
-  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 
+  0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 
+  0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 
+  0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 
+  0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 
+  0x69, 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 
+  0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 
   0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x6f, 
-  0x74, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 
-  0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x6f, 
+  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x73, 
+  0x65, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
   0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
@@ -2320,52 +1803,64 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
   0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
-  0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 
-  0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 
-  0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
-  0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 
-  0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x63, 
-  0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 
-  0x29, 0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x20, 0x5f, 0x52, 0x69, 0x67, 0x68, 0x74, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 
+  0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x70, 0x72, 
+  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
+  0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
-  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
-  0x79, 0x3d, 0x22, 0x62, 0x72, 0x61, 0x63, 0x6b, 
-  0x65, 0x74, 0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 
-  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
-  0x61, 0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 
-  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
-  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
-  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
-  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 
+  0x63, 0x65, 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 
+  0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 
+  0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x31, 
   0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
@@ -2376,106 +1871,139 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
   0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
   0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x66, 
-  0x6f, 0x72, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
-  0x63, 0x72, 0x6f, 0x70, 0x20, 0x73, 0x75, 0x62, 
-  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 
-  0x72, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x71, 0x75, 0x69, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x67, 0x74, 0x6b, 0x2d, 0x71, 0x75, 0x69, 0x74, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
   0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
   0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
-  0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 
-  0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 
-  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 
-  0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
-  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 
-  0x72, 0x20, 0x6e, 0x6f, 0x20, 0x63, 0x72, 0x6f, 
-  0x70, 0x22, 0x3e, 0x5f, 0x4e, 0x6f, 0x6e, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x77, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 
+  0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 
+  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
+  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 
+  0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 
+  0x6b, 0x65, 0x79, 0x3d, 0x22, 0x71, 0x22, 0x20, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 
+  0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
+  0x22, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 
+  0x65, 0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 
+  0x5f, 0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 
+  0x5f, 0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x71, 0x75, 0x69, 0x74, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x50, 0x61, 0x67, 0x65, 0x20, 0x6d, 
+  0x65, 0x6e, 0x75, 0x20, 0x28, 0x63, 0x6f, 0x6e, 
+  0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
+  0x20, 0x65, 0x61, 0x63, 0x68, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x2c, 0x20, 0x65, 0x2e, 0x67, 0x2e, 
+  0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x2c, 
+  0x20, 0x63, 0x72, 0x6f, 0x70, 0x29, 0x22, 0x3e, 
+  0x5f, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
-  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
   0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 
-  0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6e, 0x6f, 
-  0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 
-  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 
-  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
-  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
-  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x34, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 
+  0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 
+  0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
+  0x6e, 0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 
   0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
   0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
@@ -2494,48 +2022,46 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
   0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
   0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 
-  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 
-  0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 
-  0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 
-  0x20, 0x74, 0x6f, 0x20, 0x41, 0x34, 0x20, 0x73, 
-  0x69, 0x7a, 0x65, 0x22, 0x3e, 0x41, 0x5f, 0x34, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 
-  0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 
-  0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 
-  0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x61, 0x34, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 
-  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x61, 0x35, 0x5f, 0x6d, 
+  0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
+  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x72, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x6c, 0x65, 
+  0x66, 0x74, 0x20, 0x28, 0x61, 0x6e, 0x74, 0x69, 
+  0x2d, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 
+  0x73, 0x65, 0x29, 0x22, 0x3e, 0x52, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x20, 0x5f, 0x4c, 0x65, 0x66, 
+  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
+  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
+  0x65, 0x79, 0x3d, 0x22, 0x62, 0x72, 0x61, 0x63, 
+  0x6b, 0x65, 0x74, 0x6c, 0x65, 0x66, 0x74, 0x22, 
+  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x6d, 
   0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
@@ -2554,36 +2080,144 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
   0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
   0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
-  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
-  0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 
-  0x6f, 0x20, 0x41, 0x35, 0x20, 0x73, 0x69, 0x7a, 
-  0x65, 0x22, 0x3e, 0x41, 0x5f, 0x35, 0x3c, 0x2f, 
+  0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 
+  0x6d, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x74, 0x6f, 0x20, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x20, 0x28, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 
+  0x77, 0x69, 0x73, 0x65, 0x29, 0x22, 0x3e, 0x52, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 0x5f, 0x52, 
+  0x69, 0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x62, 
+  0x72, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x72, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x20, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 
+  0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
+  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 
+  0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
-  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
-  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 
+  0x65, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 
+  0x61, 0x67, 0x65, 0x20, 0x63, 0x72, 0x6f, 0x70, 
+  0x20, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 0x75, 
+  0x22, 0x3e, 0x5f, 0x43, 0x72, 0x6f, 0x70, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 
+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 0x62, 
+  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
-  0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x5f, 0x63, 
   0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 
+  0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x6f, 
+  0x20, 0x63, 0x72, 0x6f, 0x70, 0x22, 0x3e, 0x5f, 
+  0x4e, 0x6f, 0x6e, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
-  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 
-  0x35, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
+  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
+  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 
+  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
   0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
   0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
   0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
@@ -2595,7 +2229,7 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 
   0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 
   0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x61, 0x36, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x3d, 0x22, 0x61, 0x34, 0x5f, 0x6d, 0x65, 0x6e, 
   0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
@@ -2618,8 +2252,8 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 
   0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 
   0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 
-  0x41, 0x36, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x22, 
-  0x3e, 0x41, 0x5f, 0x36, 0x3c, 0x2f, 0x70, 0x72, 
+  0x41, 0x34, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x22, 
+  0x3e, 0x41, 0x5f, 0x34, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
@@ -2642,7 +2276,7 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
   0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x36, 0x5f, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x34, 0x5f, 
   0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
   0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
   0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
@@ -2655,95 +2289,31 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 
   0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
   0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x6c, 0x65, 0x74, 0x74, 0x65, 0x72, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
-  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
-  0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 
-  0x6f, 0x20, 0x55, 0x53, 0x20, 0x6c, 0x65, 0x74, 
-  0x74, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 0x65, 
-  0x22, 0x3e, 0x5f, 0x4c, 0x65, 0x74, 0x74, 0x65, 
-  0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 
-  0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x61, 0x35, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x6e, 
-  0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 
-  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x72, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 
-  0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
-  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
-  0x67, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x61, 0x67, 
-  0x65, 0x20, 0x74, 0x6f, 0x20, 0x55, 0x53, 0x20, 
-  0x6c, 0x65, 0x67, 0x61, 0x6c, 0x20, 0x73, 0x69, 
-  0x7a, 0x65, 0x22, 0x3e, 0x4c, 0x65, 0x5f, 0x67, 
-  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 
+  0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x41, 0x35, 
+  0x20, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x41, 
+  0x5f, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
@@ -2766,107 +2336,167 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
   0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x6c, 0x65, 0x67, 0x61, 0x6c, 
+  0x72, 0x3d, 0x22, 0x61, 0x35, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x36, 
   0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 
-  0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
-  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x34, 0x78, 0x36, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 
-  0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 
-  0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 
-  0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 
-  0x34, 0x78, 0x36, 0x20, 0x69, 0x6e, 0x63, 0x68, 
-  0x22, 0x3e, 0x34, 0xc3, 0x97, 0x36, 0x3c, 0x2f, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 
+  0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x74, 0x6f, 0x20, 0x41, 0x36, 0x20, 0x73, 
+  0x69, 0x7a, 0x65, 0x22, 0x3e, 0x41, 0x5f, 0x36, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 
+  0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
-  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
-  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 
+  0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 
+  0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x61, 0x36, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x74, 0x74, 
+  0x65, 0x72, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
-  0x75, 0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 
-  0x72, 0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
-  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x66, 
-  0x6f, 0x75, 0x72, 0x5f, 0x62, 0x79, 0x5f, 0x73, 
-  0x69, 0x78, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
-  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 
-  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, 
-  0x6d, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 
+  0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 
+  0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x55, 0x53, 
+  0x20, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x72, 0x20, 
+  0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x5f, 0x4c, 
+  0x65, 0x74, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
+  0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 
+  0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 
-  0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 0x69, 0x6e, 
-  0x67, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x75, 0x73, 
-  0x74, 0x6f, 0x6d, 0x20, 0x70, 0x61, 0x67, 0x65, 
-  0x20, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x5f, 
-  0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x3c, 0x2f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 0x75, 
+  0x70, 0x22, 0x3e, 0x6e, 0x6f, 0x5f, 0x63, 0x72, 
+  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 
+  0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6c, 0x65, 
+  0x74, 0x74, 0x65, 0x72, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
+  0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x65, 0x67, 
+  0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 
+  0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
+  0x20, 0x55, 0x53, 0x20, 0x6c, 0x65, 0x67, 0x61, 
+  0x6c, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 
+  0x4c, 0x65, 0x5f, 0x67, 0x61, 0x6c, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
@@ -2889,42 +2519,21 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
   0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 
-  0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x72, 
-  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 
-  0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 
-  0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
-  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 
-  0x72, 0x6f, 0x70, 0x5f, 0x73, 0x65, 0x70, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6c, 
+  0x65, 0x67, 0x61, 0x6c, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 
+  0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
+  0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 
   0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 
-  0x70, 0x5f, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f, 0x75, 
+  0x72, 0x5f, 0x62, 0x79, 0x5f, 0x73, 0x69, 0x78, 
   0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
   0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
@@ -2933,237 +2542,125 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 0x69, 
-  0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 0x61, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
   0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 
-  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 
-  0x6f, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 
-  0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x72, 0x6f, 
-  0x70, 0x20, 0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 
-  0x5f, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x20, 
-  0x43, 0x72, 0x6f, 0x70, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
-  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x72, 
-  0x6f, 0x70, 0x5f, 0x72, 0x6f, 0x74, 0x61, 0x74, 
-  0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 
-  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
-  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 0x76, 
-  0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x6d, 
-  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x20, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 0x70, 0x70, 
+  0x69, 0x6e, 0x67, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x20, 0x74, 0x6f, 0x20, 0x34, 0x78, 0x36, 0x20, 
+  0x69, 0x6e, 0x63, 0x68, 0x22, 0x3e, 0x34, 0xc3, 
+  0x97, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 
+  0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 
-  0x6d, 0x20, 0x74, 0x6f, 0x20, 0x6d, 0x6f, 0x76, 
-  0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 
-  0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x70, 
-  0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 
-  0x68, 0x65, 0x20, 0x6c, 0x65, 0x66, 0x74, 0x22, 
-  0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 0x4c, 0x65, 
-  0x66, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
-  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
-  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x6c, 
-  0x65, 0x73, 0x73, 0x22, 0x20, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 
-  0x76, 0x65, 0x5f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
+  0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 
+  0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
   0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
-  0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x72, 0x69, 
-  0x67, 0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 
-  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 
-  0x6f, 0x20, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x74, 
-  0x68, 0x65, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 
-  0x74, 0x65, 0x64, 0x20, 0x70, 0x61, 0x67, 0x65, 
-  0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 
-  0x72, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x4d, 
-  0x6f, 0x76, 0x65, 0x20, 0x52, 0x69, 0x67, 0x68, 
-  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
-  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
-  0x65, 0x79, 0x3d, 0x22, 0x67, 0x72, 0x65, 0x61, 
-  0x74, 0x65, 0x72, 0x22, 0x20, 0x73, 0x69, 0x67, 
-  0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 
-  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 
-  0x76, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
-  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x74, 
-  0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x70, 0x62, 0x6f, 
-  0x61, 0x72, 0x64, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
-  0x2d, 0x63, 0x6f, 0x70, 0x79, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x66, 0x6f, 0x75, 0x72, 0x5f, 
+  0x62, 0x79, 0x5f, 0x73, 0x69, 0x78, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
+  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 
+  0x75, 0x73, 0x74, 0x6f, 0x6d, 0x5f, 0x63, 0x72, 
+  0x6f, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
-  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x72, 0x6f, 
+  0x70, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x6f, 
+  0x20, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x20, 0x73, 0x69, 0x7a, 
+  0x65, 0x22, 0x3e, 0x5f, 0x43, 0x75, 0x73, 0x74, 
+  0x6f, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
-  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
-  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
-  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
-  0x63, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x22, 0x20, 0x6d, 0x6f, 0x64, 
-  0x69, 0x66, 0x69, 0x65, 0x72, 0x73, 0x3d, 0x22, 
-  0x47, 0x44, 0x4b, 0x5f, 0x43, 0x4f, 0x4e, 0x54, 
-  0x52, 0x4f, 0x4c, 0x5f, 0x4d, 0x41, 0x53, 0x4b, 
-  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
-  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
-  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
-  0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 0x70, 0x79, 
-  0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6c, 0x69, 0x70, 
-  0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
-  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 
-  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
-  0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 
+  0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 
+  0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x3e, 
+  0x6e, 0x6f, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
   0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x64, 0x65, 0x6c, 
-  0x65, 0x74, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x63, 0x75, 0x73, 0x74, 0x6f, 
+  0x6d, 0x5f, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
+  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 
+  0x73, 0x65, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
   0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
@@ -3174,37 +2671,6 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
   0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
-  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
-  0x79, 0x3d, 0x22, 0x44, 0x65, 0x6c, 0x65, 0x74, 
-  0x65, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
-  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
-  0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 
-  0x61, 0x67, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x65, 
-  0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
-  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
@@ -3212,28 +2678,37 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
   0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
   0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 0x6d, 0x65, 
-  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
-  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
-  0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 
-  0x68, 0x65, 0x6c, 0x70, 0x20, 0x6d, 0x65, 0x6e, 
-  0x75, 0x22, 0x3e, 0x5f, 0x48, 0x65, 0x6c, 0x70, 
+  0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
+  0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 
+  0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x63, 0x72, 0x6f, 0x70, 0x20, 0x61, 0x72, 
+  0x65, 0x61, 0x22, 0x3e, 0x5f, 0x52, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x20, 0x43, 0x72, 0x6f, 0x70, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
@@ -3241,128 +2716,241 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
   0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 
-  0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x73, 0x75, 
-  0x62, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
-  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x72, 
+  0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 
+  0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4d, 0x65, 0x6e, 0x75, 
+  0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 
+  0x20, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x74, 0x68, 
+  0x65, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 
+  0x65, 0x64, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 
+  0x65, 0x66, 0x74, 0x22, 0x3e, 0x4d, 0x6f, 0x76, 
+  0x65, 0x20, 0x4c, 0x65, 0x66, 0x74, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
+  0x79, 0x3d, 0x22, 0x6c, 0x65, 0x73, 0x73, 0x22, 
+  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 
+  0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
+  0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
   0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x4d, 
-  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 
-  0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 
-  0x74, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x61, 0x67, 0x65, 0x5f, 0x6d, 0x6f, 0x76, 
+  0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
   0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
   0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
   0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
   0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
-  0x22, 0x48, 0x65, 0x6c, 0x70, 0x7c, 0x43, 0x6f, 
-  0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x6d, 
-  0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 0x43, 0x6f, 
-  0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x22, 0x4d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 
+  0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x6d, 0x6f, 
+  0x76, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 
+  0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 
+  0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 
+  0x74, 0x68, 0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x22, 0x3e, 0x4d, 0x6f, 0x76, 0x65, 0x20, 
+  0x52, 0x69, 0x67, 0x68, 0x74, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 
+  0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 
+  0x6f, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 
+  0x67, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x22, 
+  0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 
+  0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 
+  0x70, 0x79, 0x5f, 0x74, 0x6f, 0x5f, 0x63, 0x6c, 
+  0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6f, 0x70, 
+  0x79, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
-  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, 0x73, 
+  0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 
-  0x3e, 0x68, 0x65, 0x6c, 0x70, 0x5f, 0x69, 0x6d, 
-  0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
+  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 
+  0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 
+  0x65, 0x79, 0x3d, 0x22, 0x63, 0x22, 0x20, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
+  0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 
+  0x72, 0x73, 0x3d, 0x22, 0x47, 0x44, 0x4b, 0x5f, 
+  0x43, 0x4f, 0x4e, 0x54, 0x52, 0x4f, 0x4c, 0x5f, 
+  0x4d, 0x41, 0x53, 0x4b, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 
+  0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x63, 0x6f, 0x70, 0x79, 0x5f, 0x74, 0x6f, 0x5f, 
+  0x63, 0x6c, 0x69, 0x70, 0x62, 0x6f, 0x61, 0x72, 
+  0x64, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 
+  0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
+  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x70, 0x61, 0x67, 0x65, 0x5f, 0x64, 0x65, 0x6c, 
+  0x65, 0x74, 0x65, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 
-  0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6b, 0x65, 
-  0x79, 0x3d, 0x22, 0x46, 0x31, 0x22, 0x20, 0x73, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 
+  0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x44, 
+  0x65, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x20, 0x73, 
   0x69, 0x67, 0x6e, 0x61, 0x6c, 0x3d, 0x22, 0x61, 
   0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
   0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
   0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
   0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 
-  0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 
-  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
-  0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
-  0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
-  0x6d, 0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x5f, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x61, 0x62, 0x6f, 
-  0x75, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
-  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
-  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
-  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
-  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
-  0x22, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x5f, 0x6d, 
+  0x72, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 
+  0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x5f, 0x6d, 
   0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
   0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 
   0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
@@ -3373,191 +2961,357 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 
-  0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x6f, 
-  0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
-  0x61, 0x72, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x70, 0x72, 0x69, 0x6d, 
-  0x61, 0x72, 0x79, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 
-  0x62, 0x61, 0x72, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
-  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
-  0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 
-  0x65, 0x77, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
+  0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x6c, 
+  0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x6f, 0x6e, 0x20, 0x68, 0x65, 0x6c, 0x70, 
+  0x20, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x5f, 
+  0x48, 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x73, 0x75, 0x62, 0x6d, 0x65, 0x6e, 
+  0x75, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
+  0x75, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, 
+  0x65, 0x6c, 0x70, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
-  0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 
+  0x61, 0x67, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x68, 0x65, 0x6c, 0x70, 0x5f, 0x63, 0x6f, 
+  0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
   0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
   0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
   0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 
-  0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 
-  0x20, 0x6e, 0x65, 0x77, 0x20, 0x64, 0x6f, 0x63, 
-  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x74, 
-  0x61, 0x72, 0x74, 0x20, 0x61, 0x20, 0x6e, 0x65, 
-  0x77, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
-  0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x48, 0x65, 0x6c, 
+  0x70, 0x7c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 
+  0x74, 0x73, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x22, 
+  0x3e, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 
+  0x74, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
-  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
-  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 
-  0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
-  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
-  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x73, 0x74, 0x6f, 0x63, 0x6b, 
-  0x5f, 0x69, 0x64, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
-  0x2d, 0x6e, 0x65, 0x77, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 
-  0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
-  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x6e, 
-  0x65, 0x77, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
-  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
-  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 
-  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x6f, 
-  0x6d, 0x6f, 0x67, 0x65, 0x6e, 0x65, 0x6f, 0x75, 
-  0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6d, 
+  0x61, 0x67, 0x65, 0x22, 0x3e, 0x68, 0x65, 0x6c, 
+  0x70, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 
-  0x75, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x74, 0x6f, 
-  0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x61, 0x63, 
+  0x63, 0x65, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 
+  0x72, 0x20, 0x6b, 0x65, 0x79, 0x3d, 0x22, 0x46, 
+  0x31, 0x22, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
+  0x61, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x68, 
+  0x65, 0x6c, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 
+  0x65, 0x6e, 0x74, 0x73, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 
+  0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 
+  0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x62, 
+  0x6f, 0x75, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, 0x6b, 
+  0x2d, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
   0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 
-  0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 
-  0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 
-  0x66, 0x6f, 0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 
-  0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 
-  0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
-  0x3e, 0x53, 0x63, 0x61, 0x6e, 0x20, 0x61, 0x20, 
-  0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x70, 
-  0x61, 0x67, 0x65, 0x20, 0x66, 0x72, 0x6f, 0x6d, 
-  0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
-  0x73, 0x5f, 0x69, 0x6d, 0x70, 0x6f, 0x72, 0x74, 
-  0x61, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 
+  0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 
+  0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x61, 0x62, 0x6f, 
+  0x75, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x5f, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
-  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
-  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
-  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
-  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 
-  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x6f, 
-  0x6f, 0x6c, 0x62, 0x61, 0x72, 0x20, 0x69, 0x74, 
-  0x65, 0x6d, 0x22, 0x3e, 0x53, 0x63, 0x61, 0x6e, 
+  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 
+  0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
+  0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 
+  0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x70, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x2d, 
+  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 
+  0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x54, 0x6f, 0x6f, 0x6c, 0x42, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 0x74, 
+  0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 
+  0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x65, 0x77, 
+  0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 
+  0x61, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x64, 0x6f, 
+  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 
-  0x6d, 0x65, 0x22, 0x3e, 0x73, 0x63, 0x61, 0x6e, 
-  0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
+  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 
+  0x74, 0x6f, 0x63, 0x6b, 0x5f, 0x69, 0x64, 0x22, 
+  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x6e, 0x65, 0x77, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+  0x72, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 
+  0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 
+  0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
+  0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x68, 0x6f, 0x6d, 0x6f, 0x67, 0x65, 
+  0x6e, 0x65, 0x6f, 0x75, 0x73, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x54, 0x6f, 0x6f, 
+  0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 
+  0x6e, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x65, 
-  0x6e, 0x75, 0x22, 0x3e, 0x73, 0x63, 0x61, 0x6e, 
-  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 
+  0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x20, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 
+  0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x73, 0x5f, 0x69, 0x6d, 
+  0x70, 0x6f, 0x72, 0x74, 0x61, 0x6e, 0x74, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 
+  0x72, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 
+  0x53, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 
+  0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 
+  0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 
   0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
@@ -4070,145 +3824,535 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
   0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 
-  0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 
-  0x70, 0x69, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 
-  0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 
-  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 
-  0x61, 0x6d, 0x65, 0x20, 0x64, 0x70, 0x69, 0x20, 
-  0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 
-  0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 
-  0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 
-  0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 
-  0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 
-  0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x2d, 
-  0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 
-  0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 
-  0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, 
-  0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 
-  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
-  0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 
+  0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 
+  0x6c, 0x65, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 
+  0x61, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x62, 0x61, 
+  0x72, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 
+  0x6f, 0x77, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x54, 0x69, 0x74, 0x6c, 
+  0x65, 0x20, 0x6f, 0x66, 0x20, 0x73, 0x63, 0x61, 
+  0x6e, 0x20, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 
+  0x22, 0x3e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 
+  0x20, 0x53, 0x63, 0x61, 0x6e, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 
+  0x65, 0x62, 0x61, 0x72, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x62, 0x6f, 
+  0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 
+  0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 
+  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 
-  0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 
-  0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
-  0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x54, 0x69, 0x74, 0x6c, 0x65, 
-  0x20, 0x6f, 0x66, 0x20, 0x70, 0x72, 0x65, 0x66, 
-  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x20, 
-  0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 
-  0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 
-  0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 
+  0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 
+  0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 
+  0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x73, 0x74, 0x6f, 0x70, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 
-  0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 
+  0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x74, 0x6f, 
+  0x70, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x53, 0x74, 0x6f, 0x70, 0x20, 0x74, 
+  0x68, 0x65, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 
+  0x6e, 0x74, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x3e, 0x53, 0x74, 0x6f, 0x70, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x73, 0x74, 0x6f, 0x70, 0x5f, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x79, 
+  0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 
-  0x6d, 0x65, 0x22, 0x3e, 0x73, 0x63, 0x61, 0x6e, 
-  0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, 
-  0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, 
-  0x3e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x3c, 
+  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 
+  0x74, 0x69, 0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x20, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 
+  0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 
+  0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x74, 0x6f, 0x6f, 
+  0x6c, 0x62, 0x61, 0x72, 0x20, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x53, 0x63, 0x61, 0x6e, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x69, 
-  0x65, 0x6e, 0x74, 0x5f, 0x66, 0x6f, 0x72, 0x22, 
-  0x3e, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x77, 0x69, 0x6e, 
-  0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
-  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 
-  0x74, 0x65, 0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 
-  0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
-  0x72, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 
-  0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 
-  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x64, 0x65, 
-  0x6c, 0x65, 0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 
-  0x6e, 0x74, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 
-  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x72, 0x65, 0x73, 0x70, 0x6f, 
-  0x6e, 0x73, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 
-  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
-  0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
-  0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 
-  0x65, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
-  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
-  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 
-  0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 
-  0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 
-  0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x32, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 
+  0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 
+  0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 
+  0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 
+  0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 
+  0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x42, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x70, 0x75, 0x70, 0x22, 0x3e, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x68, 0x62, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 
+  0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x65, 0x78, 0x74, 0x2d, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 
+  0x70, 0x65, 0x22, 0x3e, 0x73, 0x74, 0x61, 0x72, 
+  0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 
+  0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x61, 0x76, 
+  0x65, 0x20, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 
+  0x72, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x53, 0x61, 0x76, 0x65, 0x20, 0x64, 
+  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 
+  0x74, 0x6f, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
   0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 0x5f, 0x66, 
+  0x69, 0x6c, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 
+  0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x73, 0x61, 0x76, 0x65, 
+  0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 
+  0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 
+  0x22, 0x3e, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x2d, 0x73, 0x61, 0x76, 0x65, 0x2d, 
+  0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 
+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 
+  0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x6e, 0x65, 0x77, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 
+  0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
+  0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6e, 0x65, 
+  0x77, 0x20, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 
+  0x6e, 0x74, 0x20, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x53, 0x74, 0x61, 0x72, 0x74, 
+  0x20, 0x61, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x64, 
+  0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 
-  0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 
-  0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 
-  0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 
-  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 
+  0x69, 0x63, 0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 
+  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
+  0x6e, 0x65, 0x77, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 
+  0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 
+  0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x6e, 0x65, 0x77, 0x5f, 
+  0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, 0x65, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 
+  0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, 
+  0x3e, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 
+  0x74, 0x2d, 0x6e, 0x65, 0x77, 0x2d, 0x73, 0x79, 
+  0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
+  0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, 
+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x5f, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, 
+  0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x68, 0x6f, 0x72, 0x69, 
+  0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
+  0x3e, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 
-  0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 
-  0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 
-  0x61, 0x72, 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x6f, 
+  0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 
+  0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x69, 
+  0x6e, 0x6b, 0x65, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
   0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x42, 0x6f, 
-  0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 
-  0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, 
-  0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 
-  0x61, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x72, 0x6f, 0x74, 0x61, 
+  0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 
+  0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 
+  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x20, 0x66, 
+  0x6f, 0x72, 0x20, 0x72, 0x6f, 0x74, 0x61, 0x74, 
+  0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 
+  0x28, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 
+  0x73, 0x65, 0x29, 0x20, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x52, 0x6f, 0x74, 0x61, 
+  0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 
+  0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 
+  0x68, 0x65, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x20, 0x28, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 
+  0x69, 0x73, 0x65, 0x29, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x5f, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 
+  0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x72, 0x69, 
+  0x67, 0x68, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 
+  0x5f, 0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x2d, 0x72, 0x6f, 0x74, 
+  0x61, 0x74, 0x65, 0x2d, 0x72, 0x69, 0x67, 0x68, 
+  0x74, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 
+  0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 
+  0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 
+  0x65, 0x66, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
   0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
@@ -4220,94 +4364,577 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 
-  0x79, 0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 0x5f, 0x74, 
+  0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 
+  0x70, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x20, 0x6c, 0x65, 0x66, 
+  0x74, 0x20, 0x28, 0x63, 0x6f, 0x75, 0x6e, 0x74, 
+  0x65, 0x72, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 
+  0x77, 0x69, 0x73, 0x65, 0x29, 0x20, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x52, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x20, 0x74, 0x68, 0x65, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x74, 0x6f, 
+  0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x65, 0x66, 
+  0x74, 0x20, 0x28, 0x63, 0x6f, 0x75, 0x6e, 0x74, 
+  0x65, 0x72, 0x2d, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 
+  0x77, 0x69, 0x73, 0x65, 0x29, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6c, 0x69, 0x63, 
+  0x6b, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x72, 0x6f, 
+  0x74, 0x61, 0x74, 0x65, 0x5f, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 
+  0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 
+  0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 
+  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 
+  0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x6c, 0x65, 
+  0x66, 0x74, 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
+  0x73, 0x69, 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 
+  0x61, 0x6d, 0x65, 0x22, 0x3e, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x2d, 0x72, 0x6f, 0x74, 0x61, 
+  0x74, 0x65, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x2d, 
+  0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 
+  0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 
+  0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 
+  0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 
+  0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
+  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x42, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, 0x69, 0x70, 
+  0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x3e, 0x43, 0x72, 0x6f, 0x70, 0x20, 0x74, 
+  0x68, 0x65, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 
+  0x74, 0x65, 0x64, 0x20, 0x70, 0x61, 0x67, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x63, 0x72, 0x6f, 0x70, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
+  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 
+  0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 
+  0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x63, 0x72, 0x6f, 0x70, 
+  0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 
+  0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 
+  0x65, 0x22, 0x3e, 0x65, 0x64, 0x69, 0x74, 0x2d, 
+  0x63, 0x75, 0x74, 0x2d, 0x73, 0x79, 0x6d, 0x62, 
+  0x6f, 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 
+  0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 
+  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 
+  0x74, 0x65, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 
+  0x74, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 
+  0x5f, 0x64, 0x70, 0x69, 0x5f, 0x6d, 0x6f, 0x64, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 
+  0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
+  0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x64, 0x70, 
+  0x69, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 
+  0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 
+  0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, 0x74, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 
+  0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 
+  0x6d, 0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 
+  0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 
+  0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 
+  0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, 0x6c, 
+  0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
   0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 
-  0x63, 0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 
-  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x63, 0x65, 0x73, 0x5f, 0x64, 0x69, 0x61, 0x6c, 
+  0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
+  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x69, 0x74, 
+  0x6c, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x70, 0x72, 
+  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
+  0x73, 0x20, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x22, 0x3e, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72, 
+  0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x72, 0x65, 0x73, 0x69, 0x7a, 0x61, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x73, 0x63, 
+  0x61, 0x6e, 0x6e, 0x65, 0x72, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x79, 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 
+  0x74, 0x22, 0x3e, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 
+  0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 
+  0x2d, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 
+  0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 0x69, 0x61, 
+  0x6c, 0x6f, 0x67, 0x5f, 0x64, 0x65, 0x6c, 0x65, 
+  0x74, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x74, 
+  0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 
+  0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 
+  0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 
+  0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 
+  0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, 
+  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 
+  0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x5f, 0x72, 
+  0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 
+  0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 
+  0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 
+  0x2d, 0x76, 0x62, 0x6f, 0x78, 0x32, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 
+  0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, 
+  0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 
+  0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, 
+  0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 
+  0x65, 0x61, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x42, 0x6f, 0x78, 0x22, 
+  0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 
+  0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, 0x74, 0x69, 
+  0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x32, 
   0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x3e, 0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6c, 0x6f, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
   0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x79, 
+  0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 
+  0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
+  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
+  0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 
+  0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 
+  0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 
+  0x74, 0x6b, 0x2d, 0x63, 0x6c, 0x6f, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
+  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
+  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
   0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 
+  0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 
+  0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
+  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
   0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
-  0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 
-  0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 
+  0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x75, 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 
-  0x6b, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x33, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 
+  0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 
+  0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 
+  0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 
+  0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 
+  0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 
+  0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
+  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
+  0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 
+  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 
+  0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 
+  0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 
+  0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 
+  0x62, 0x6f, 0x78, 0x22, 0x3e, 0x53, 0x63, 0x61, 
+  0x6e, 0x20, 0x53, 0x5f, 0x6f, 0x75, 0x72, 0x63, 
+  0x65, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 
+  0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 
+  0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 
+  0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 
+  0x65, 0x74, 0x22, 0x3e, 0x64, 0x65, 0x76, 0x69, 
+  0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x65, 
+  0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 
+  0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
   0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 
-  0x70, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
+  0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x64, 0x65, 
+  0x76, 0x69, 0x63, 0x65, 0x5f, 0x6d, 0x6f, 0x64, 
+  0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
+  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x63, 0x68, 0x61, 0x6e, 0x67, 
+  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
+  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x64, 0x65, 0x76, 
+  0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 
+  0x6f, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
+  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 
-  0x64, 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 
+  0x5f, 0x64, 0x70, 0x69, 0x5f, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
   0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
@@ -4319,26 +4946,66 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x77, 0x69, 
-  0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 
+  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 
+  0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 
+  0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 
+  0x78, 0x22, 0x3e, 0x5f, 0x54, 0x65, 0x78, 0x74, 
+  0x20, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 
+  0x69, 0x6f, 0x6e, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 
+  0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 
+  0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x74, 0x65, 
+  0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 
-  0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 
-  0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 
-  0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 
   0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
@@ -4365,21 +5032,22 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
   0x73, 0x63, 0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 
   0x72, 0x63, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 
-  0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x53, 
-  0x63, 0x61, 0x6e, 0x20, 0x53, 0x5f, 0x6f, 0x75, 
-  0x72, 0x63, 0x65, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 
-  0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 
-  0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x64, 0x65, 
-  0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 
+  0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x5f, 
+  0x50, 0x68, 0x6f, 0x74, 0x6f, 0x20, 0x52, 0x65, 
+  0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 
+  0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 
+  0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 
+  0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 
+  0x74, 0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 
+  0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 
   0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
   0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
@@ -4392,7 +5060,7 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
+  0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
@@ -4410,55 +5078,164 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
   0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 
   0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 
+  0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 
+  0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
+  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 
+  0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 
+  0x70, 0x69, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x68, 
+  0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 
+  0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 
+  0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 
+  0x70, 0x69, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
+  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 
+  0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 
+  0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 
+  0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 
+  0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 
-  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x73, 
-  0x74, 0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 
+  0x73, 0x69, 0x64, 0x65, 0x5f, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 
-  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x73, 0x65, 
-  0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 
-  0x79, 0x22, 0x3e, 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x68, 
-  0x61, 0x6e, 0x67, 0x65, 0x64, 0x22, 0x20, 0x68, 
-  0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 
-  0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x63, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x5f, 0x63, 0x68, 0x61, 
-  0x6e, 0x67, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
-  0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
-  0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 
+  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
+  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
+  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
+  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
+  0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 
+  0x69, 0x64, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x20, 0x73, 0x69, 0x64, 0x65, 0x20, 0x63, 0x6f, 
+  0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 
+  0x3e, 0x53, 0x63, 0x61, 0x6e, 0x20, 0x53, 0x69, 
+  0x64, 0x65, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 
+  0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 
+  0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x68, 0x6f, 
+  0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 
+  0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
   0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
   0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
@@ -4474,83 +5251,11 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
   0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 
-  0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
-  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
-  0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 
-  0x63, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
-  0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x5f, 0x54, 
-  0x65, 0x78, 0x74, 0x20, 0x52, 0x65, 0x73, 0x6f, 
-  0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 
-  0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 
-  0x3e, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x70, 
-  0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 
-  0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 
-  0x64, 0x70, 0x69, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 
+  0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 
+  0x69, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 
+  0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
   0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
@@ -4562,88 +5267,139 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 
-  0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
+  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 
+  0x64, 0x65, 0x6c, 0x22, 0x3e, 0x70, 0x61, 0x67, 
+  0x65, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x6d, 
+  0x6f, 0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 
-  0x64, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
-  0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x63, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 
-  0x22, 0x3e, 0x5f, 0x50, 0x68, 0x6f, 0x74, 0x6f, 
-  0x20, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 
-  0x69, 0x6f, 0x6e, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
-  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
-  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
+  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x33, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 
-  0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 
-  0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x68, 
-  0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 
-  0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
+  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
+  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 
+  0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 
+  0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 
-  0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
+  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
+  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
+  0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 
+  0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 
+  0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x73, 0x69, 
+  0x7a, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
+  0x20, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x50, 0x61, 
+  0x67, 0x65, 0x20, 0x53, 0x69, 0x7a, 0x65, 0x3a, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 
-  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
-  0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 
-  0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 
-  0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 
+  0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 
+  0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 
   0x64, 0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 
-  0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 
-  0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x6f, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 
-  0x64, 0x65, 0x6c, 0x22, 0x3e, 0x74, 0x65, 0x78, 
-  0x74, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x73, 0x74, 
-  0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
+  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 
+  0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x61, 0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 
+  0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 
+  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 
+  0x6c, 0x22, 0x3e, 0x70, 0x61, 0x70, 0x65, 0x72, 
+  0x5f, 0x73, 0x69, 0x7a, 0x65, 0x5f, 0x6d, 0x6f, 
+  0x64, 0x65, 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
@@ -4655,7 +5411,7 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
@@ -4671,43 +5427,55 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
   0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 
-  0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 
-  0x70, 0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 
-  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
-  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
-  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 
-  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 
-  0x65, 0x6c, 0x22, 0x3e, 0x70, 0x68, 0x6f, 0x74, 
-  0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x73, 0x74, 
-  0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 
+  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 
+  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
+  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
+  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
+  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
+  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
+  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
+  0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 
+  0x73, 0x73, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 
+  0x22, 0x3e, 0x42, 0x72, 0x69, 0x67, 0x68, 0x74, 
+  0x6e, 0x65, 0x73, 0x73, 0x3a, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
   0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
   0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
   0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
-  0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
@@ -4723,102 +5491,37 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
   0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
   0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 
-  0x67, 0x65, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
-  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
-  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
-  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x47, 0x74, 0x6b, 0x53, 0x63, 0x61, 0x6c, 0x65, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 
+  0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 
-  0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
-  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
-  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
-  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
-  0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 
-  0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x20, 0x73, 0x69, 0x64, 0x65, 
-  0x20, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x20, 0x62, 
-  0x6f, 0x78, 0x22, 0x3e, 0x53, 0x63, 0x61, 0x6e, 
-  0x20, 0x53, 0x69, 0x64, 0x65, 0x3a, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
-  0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 
-  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 
-  0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x64, 0x70, 
-  0x69, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3c, 
+  0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
+  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
-  0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
-  0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 
-  0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 
-  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 
-  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x42, 0x6f, 0x78, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x61, 0x67, 
-  0x65, 0x5f, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x63, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
+  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x62, 0x72, 
+  0x69, 0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 
+  0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 
+  0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 
-  0x70, 0x61, 0x67, 0x65, 0x5f, 0x73, 0x69, 0x64, 
-  0x65, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3c, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 
+  0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
   0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 
@@ -4831,7 +5534,7 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 
   0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 
-  0x3e, 0x33, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 
@@ -4848,36 +5551,35 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
   0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 
   0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 
-  0x73, 0x69, 0x7a, 0x65, 0x5f, 0x6c, 0x61, 0x62, 
-  0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x3d, 0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 
+  0x73, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 
+  0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 
-  0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 
-  0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 
-  0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 
-  0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 
-  0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 
-  0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 
-  0x69, 0x64, 0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 
-  0x20, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x63, 0x6f, 
-  0x6d, 0x62, 0x6f, 0x20, 0x62, 0x6f, 0x78, 0x22, 
-  0x3e, 0x50, 0x61, 0x67, 0x65, 0x20, 0x53, 0x69, 
-  0x7a, 0x65, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
+  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 
+  0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 
+  0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 
+  0x73, 0x74, 0x20, 0x73, 0x63, 0x61, 0x6c, 0x65, 
+  0x22, 0x3e, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 
+  0x73, 0x74, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
   0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
@@ -4888,214 +5590,97 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
   0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 
   0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 
-  0x67, 0x65, 0x74, 0x22, 0x3e, 0x70, 0x68, 0x6f, 
-  0x74, 0x6f, 0x5f, 0x64, 0x70, 0x69, 0x5f, 0x63, 
-  0x6f, 0x6d, 0x62, 0x6f, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
+  0x67, 0x65, 0x74, 0x22, 0x3e, 0x63, 0x6f, 0x6e, 
+  0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x63, 
+  0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x34, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
-  0x22, 0x47, 0x74, 0x6b, 0x43, 0x6f, 0x6d, 0x62, 
-  0x6f, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x70, 0x61, 0x70, 0x65, 0x72, 0x5f, 
-  0x73, 0x69, 0x7a, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 
-  0x62, 0x6f, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
-  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
-  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
-  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
-  0x6f, 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x70, 0x61, 
-  0x70, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x7a, 0x65, 
-  0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x3c, 0x2f, 
+  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
   0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x34, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
-  0x65, 0x73, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 
-  0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 
+  0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x53, 0x63, 0x61, 0x6c, 0x65, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 
+  0x6e, 0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 0x73, 
+  0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 
-  0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 
+  0x6e, 0x74, 0x22, 0x3e, 0x63, 0x6f, 0x6e, 0x74, 
+  0x72, 0x61, 0x73, 0x74, 0x5f, 0x61, 0x64, 0x6a, 
+  0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
-  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
-  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
-  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 0x73, 0x69, 
-  0x64, 0x65, 0x20, 0x62, 0x72, 0x69, 0x67, 0x68, 
-  0x74, 0x6e, 0x65, 0x73, 0x73, 0x20, 0x73, 0x63, 
-  0x61, 0x6c, 0x65, 0x22, 0x3e, 0x42, 0x72, 0x69, 
-  0x67, 0x68, 0x74, 0x6e, 0x65, 0x73, 0x73, 0x3a, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 
-  0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
-  0x65, 0x73, 0x73, 0x5f, 0x73, 0x63, 0x61, 0x6c, 
-  0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 
-  0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 
-  0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 
-  0x3e, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x6e, 
-  0x65, 0x73, 0x73, 0x5f, 0x61, 0x64, 0x6a, 0x75, 
-  0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 
+  0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 
+  0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 
+  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 
-  0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 
-  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 
-  0x63, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
+  0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 
+  0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 
-  0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 
-  0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
-  0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
-  0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x63, 0x6f, 0x6e, 
-  0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 0x6c, 0x61, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x71, 0x75, 
+  0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x6c, 0x61, 
   0x62, 0x65, 0x6c, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
   0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
@@ -5119,275 +5704,165 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
   0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
   0x4c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x62, 0x65, 
-  0x73, 0x69, 0x64, 0x65, 0x20, 0x63, 0x6f, 0x6e, 
-  0x74, 0x72, 0x61, 0x73, 0x74, 0x20, 0x73, 0x63, 
-  0x61, 0x6c, 0x65, 0x22, 0x3e, 0x43, 0x6f, 0x6e, 
-  0x74, 0x72, 0x61, 0x73, 0x74, 0x3a, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x73, 0x69, 0x64, 0x65, 0x20, 0x71, 0x75, 0x61, 
+  0x6c, 0x69, 0x74, 0x79, 0x20, 0x73, 0x63, 0x61, 
+  0x6c, 0x65, 0x22, 0x3e, 0x51, 0x75, 0x61, 0x6c, 
+  0x69, 0x74, 0x79, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 
-  0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 
-  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 
-  0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 0x74, 
-  0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
+  0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 
+  0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 
+  0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 
+  0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x71, 0x75, 
+  0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x63, 
+  0x61, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 
-  0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 
-  0x74, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 
+  0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
-  0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 
-  0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 
-  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x63, 
-  0x6f, 0x6e, 0x74, 0x72, 0x61, 0x73, 0x74, 0x5f, 
-  0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 
-  0x6e, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 
-  0x77, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
+  0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 
   0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
   0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
-  0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 
+  0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x53, 0x63, 0x61, 0x6c, 0x65, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x71, 0x75, 
+  0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x73, 0x63, 
+  0x61, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
+  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
+  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
+  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 
-  0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
-  0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
-  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 
-  0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 
+  0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 
-  0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 
-  0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 
-  0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 
-  0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 
-  0x73, 0x3d, 0x22, 0x4c, 0x61, 0x62, 0x65, 0x6c, 
-  0x20, 0x62, 0x65, 0x73, 0x69, 0x64, 0x65, 0x20, 
-  0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x20, 
-  0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 0x51, 
-  0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x3a, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
+  0x64, 0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 
+  0x74, 0x22, 0x3e, 0x71, 0x75, 0x61, 0x6c, 0x69, 
+  0x74, 0x79, 0x5f, 0x61, 0x64, 0x6a, 0x75, 0x73, 
+  0x74, 0x6d, 0x65, 0x6e, 0x74, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 
-  0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 
-  0x3e, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
-  0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
-  0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 
-  0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 
-  0x37, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
-  0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x76, 0x61, 0x6c, 
+  0x75, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 
+  0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 
+  0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
   0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 
-  0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
-  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
-  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 
-  0x61, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 
-  0x22, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 
-  0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x22, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
-  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
-  0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, 0x6e, 
-  0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x61, 0x64, 0x6a, 0x75, 0x73, 0x74, 
-  0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x71, 0x75, 
-  0x61, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x61, 0x64, 
-  0x6a, 0x75, 0x73, 0x74, 0x6d, 0x65, 0x6e, 0x74, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 
-  0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x3e, 0x46, 
-  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 
+  0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 
+  0x68, 0x22, 0x3e, 0x37, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
-  0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 
+  0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 
-  0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x37, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 
+  0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
+  0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
+  0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 
-  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 
-  0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 
-  0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 
-  0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 
-  0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 
-  0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
-  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 
-  0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
   0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
   0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 
-  0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 
-  0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
-  0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
-  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
-  0x6c, 0x64, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 
-  0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 
-  0x74, 0x73, 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 
-  0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 
-  0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 
-  0x73, 0x65, 0x3d, 0x22, 0x31, 0x22, 0x3e, 0x70, 
-  0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 
-  0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 
-  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 
-  0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
-  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
+  0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 
+  0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 
+  0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 
+  0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 
+  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
   0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 
-  0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
-  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
-  0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 
-  0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 
-  0x6e, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 
-  0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 
+  0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, 0x72, 
+  0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x3d, 
+  0x22, 0x31, 0x22, 0x3e, 0x70, 0x72, 0x65, 0x66, 
+  0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, 
+  0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
+  0x67, 0x65, 0x74, 0x3e, 0x3c, 0x2f, 0x61, 0x63, 
+  0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 
+  0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 
+  0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 
+  0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
+  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 
+  0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
   0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
@@ -5397,54 +5872,90 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
   0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
   0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 
+  0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 
+  0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 
+  0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 
+  0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 
+  0x3d, 0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 
+  0x72, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 
+  0x65, 0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 
+  0x20, 0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 
+  0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 0x6c, 
+  0x65, 0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x66, 
+  0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x22, 
+  0x3e, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 
+  0x5f, 0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 
+  0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 
+  0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
   0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
   0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
   0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 
   0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 
   0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 
-  0x6e, 0x5f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
-  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
-  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
-  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
-  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
-  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
-  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
-  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x6e, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
-  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
-  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 
-  0x6c, 0x62, 0x61, 0x72, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
-  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x20, 0x61, 0x20, 0x73, 0x69, 
-  0x6e, 0x67, 0x6c, 0x65, 0x20, 0x70, 0x61, 0x67, 
-  0x65, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 
-  0x68, 0x65, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x6e, 
-  0x65, 0x72, 0x22, 0x3e, 0x53, 0x69, 0x6e, 0x67, 
-  0x6c, 0x65, 0x20, 0x5f, 0x50, 0x61, 0x67, 0x65, 
-  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
-  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
-  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
-  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 
-  0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 
-  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
-  0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 
+  0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 
+  0x6f, 0x6c, 0x62, 0x61, 0x72, 0x20, 0x73, 0x63, 
+  0x61, 0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 
+  0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 0x66, 
+  0x72, 0x6f, 0x6d, 0x20, 0x61, 0x20, 0x64, 0x6f, 
+  0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 
+  0x65, 0x65, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x41, 
+  0x6c, 0x6c, 0x20, 0x50, 0x61, 0x67, 0x65, 0x73, 
+  0x20, 0x46, 0x72, 0x6f, 0x6d, 0x20, 0x5f, 0x46, 
+  0x65, 0x65, 0x64, 0x65, 0x72, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 
+  0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 
+  0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 
+  0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 
+  0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x6f, 0x75, 
+  0x73, 0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 
   0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 
   0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 
   0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 
@@ -5454,10 +5965,78 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
   0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 
   0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 
-  0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x73, 0x63, 0x61, 0x6e, 0x5f, 0x61, 0x6c, 0x6c, 
-  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
+  0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 
+  0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 
+  0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 
+  0x22, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 
+  0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 
+  0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 
+  0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
+  0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 
+  0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 
+  0x65, 0x78, 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 
+  0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 
+  0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 
+  0x5f, 0x61, 0x73, 0x5f, 0x72, 0x61, 0x64, 0x69, 
+  0x6f, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 
+  0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x22, 
+  0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 
+  0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x5f, 
+  0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 
+  0x6f, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 
+  0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 
+  0x68, 0x6f, 0x74, 0x6f, 0x5f, 0x62, 0x75, 0x74, 
   0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
   0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
@@ -5475,19 +6054,96 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
   0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
   0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
-  0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 
-  0x6e, 0x74, 0x73, 0x3d, 0x22, 0x54, 0x6f, 0x6f, 
-  0x6c, 0x62, 0x61, 0x72, 0x20, 0x73, 0x63, 0x61, 
-  0x6e, 0x20, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 
-  0x74, 0x65, 0x6d, 0x20, 0x74, 0x6f, 0x20, 0x73, 
-  0x63, 0x61, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 
-  0x70, 0x61, 0x67, 0x65, 0x73, 0x20, 0x66, 0x72, 
-  0x6f, 0x6d, 0x20, 0x61, 0x20, 0x64, 0x6f, 0x63, 
-  0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x65, 
-  0x65, 0x64, 0x65, 0x72, 0x22, 0x3e, 0x41, 0x6c, 
-  0x6c, 0x20, 0x50, 0x61, 0x67, 0x65, 0x73, 0x20, 
-  0x46, 0x72, 0x6f, 0x6d, 0x20, 0x5f, 0x46, 0x65, 
-  0x65, 0x64, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 
+  0x73, 0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
+  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 
+  0x6f, 0x75, 0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 
+  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 
+  0x6d, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 0x67, 
+  0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 
+  0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c, 
+  0x65, 0x72, 0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 
+  0x6f, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
+  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
+  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
+  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
+  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
+  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
+  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
+  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
+  0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
+  0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 
+  0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x68, 
+  0x62, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x22, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
+  0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 
+  0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 
+  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
+  0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x73, 
+  0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x62, 0x75, 
+  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x68, 0x62, 0x5f, 
+  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
+  0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 
+  0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 
+  0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 
+  0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 
+  0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 
+  0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+  0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 
+  0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 
+  0x22, 0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 
+  0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 
+  0x6e, 0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 
+  0x74, 0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 
+  0x61, 0x20, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 
+  0x20, 0x70, 0x61, 0x67, 0x65, 0x20, 0x66, 0x72, 
+  0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 
+  0x63, 0x61, 0x6e, 0x6e, 0x65, 0x72, 0x22, 0x3e, 
+  0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x5f, 
+  0x50, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 
@@ -5498,11 +6154,134 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
   0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 
   0x61, 0x74, 0x65, 0x22, 0x20, 0x68, 0x61, 0x6e, 
-  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x63, 0x6f, 
-  0x6e, 0x74, 0x69, 0x6e, 0x75, 0x6f, 0x75, 0x73, 
-  0x5f, 0x73, 0x63, 0x61, 0x6e, 0x5f, 0x62, 0x75, 
-  0x74, 0x74, 0x6f, 0x6e, 0x5f, 0x63, 0x6c, 0x69, 
-  0x63, 0x6b, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
+  0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x73, 0x63, 
+  0x61, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 
+  0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 
+  0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 
+  0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 
+  0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 
+  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 
+  0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 
+  0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 
+  0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x62, 0x75, 0x74, 
+  0x74, 0x6f, 0x6e, 0x5f, 0x68, 0x62, 0x5f, 0x6d, 
+  0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 
+  0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 
+  0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 
+  0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 
+  0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 
+  0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 
+  0x22, 0x79, 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 
+  0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 
+  0x54, 0x6f, 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x20, 
+  0x73, 0x63, 0x61, 0x6e, 0x20, 0x6d, 0x65, 0x6e, 
+  0x75, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x74, 
+  0x6f, 0x20, 0x73, 0x63, 0x61, 0x6e, 0x20, 0x61, 
+  0x6c, 0x6c, 0x20, 0x70, 0x61, 0x67, 0x65, 0x73, 
+  0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x61, 0x20, 
+  0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 
+  0x20, 0x66, 0x65, 0x65, 0x64, 0x65, 0x72, 0x22, 
+  0x3e, 0x41, 0x6c, 0x6c, 0x20, 0x50, 0x61, 0x67, 
+  0x65, 0x73, 0x20, 0x46, 0x72, 0x6f, 0x6d, 0x20, 
+  0x5f, 0x46, 0x65, 0x65, 0x64, 0x65, 0x72, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
+  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
+  0x3c, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 
+  0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x22, 0x20, 
+  0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 
+  0x22, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 
+  0x6f, 0x75, 0x73, 0x5f, 0x73, 0x63, 0x61, 0x6e, 
+  0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x5f, 
+  0x63, 0x6c, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x5f, 
+  0x63, 0x62, 0x22, 0x20, 0x73, 0x77, 0x61, 0x70, 
+  0x70, 0x65, 0x64, 0x3d, 0x22, 0x6e, 0x6f, 0x22, 
+  0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 
+  0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 
+  0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 
+  0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 
+  0x72, 0x61, 0x74, 0x6f, 0x72, 0x4d, 0x65, 0x6e, 
+  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
+  0x64, 0x3d, 0x22, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
+  0x74, 0x65, 0x6d, 0x33, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
+  0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 
+  0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 
+  0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 
+  0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 
+  0x47, 0x74, 0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 
+  0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 
+  0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x65, 
+  0x78, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 
+  0x6e, 0x5f, 0x68, 0x62, 0x5f, 0x6d, 0x65, 0x6e, 
+  0x75, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 
+  0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 
+  0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 
+  0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 
+  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
+  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
+  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
+  0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 
+  0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 
+  0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 
+  0x65, 0x73, 0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 
+  0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
+  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 
+  0x5f, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 
+  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
+  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
+  0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
+  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 
+  0x6e, 0x64, 0x6c, 0x65, 0x72, 0x3d, 0x22, 0x74, 
+  0x65, 0x78, 0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 
+  0x67, 0x6c, 0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 
   0x20, 0x73, 0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 
   0x3d, 0x22, 0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 
   0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 
@@ -5510,120 +6289,51 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
   0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 
   0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 
-  0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 
-  0x6f, 0x72, 0x4d, 0x65, 0x6e, 0x75, 0x49, 0x74, 
-  0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 
-  0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 
-  0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 
-  0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 
+  0x6b, 0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 
+  0x6e, 0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 
+  0x69, 0x64, 0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 
+  0x6f, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x68, 0x62, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x69, 0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 
+  0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 
+  0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 
+  0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 
+  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
+  0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
+  0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
+  0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 
+  0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 
+  0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 
+  0x73, 0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 
   0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 
   0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 
-  0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 
-  0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
-  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 
-  0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 
-  0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 
-  0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 
-  0x52, 0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 
-  0x75, 0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 
-  0x64, 0x3d, 0x22, 0x74, 0x65, 0x78, 0x74, 0x5f, 
-  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x3e, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 
+  0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 
+  0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 
+  0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 
   0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
   0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 
   0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 
-  0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 
-  0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
-  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
-  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x69, 
-  0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 0x61, 0x6d, 
-  0x65, 0x3d, 0x22, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
-  0x65, 0x64, 0x22, 0x20, 0x68, 0x61, 0x6e, 0x64, 
-  0x6c, 0x65, 0x72, 0x3d, 0x22, 0x74, 0x65, 0x78, 
-  0x74, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 
-  0x65, 0x6d, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, 
-  0x65, 0x64, 0x5f, 0x63, 0x62, 0x22, 0x20, 0x73, 
-  0x77, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3d, 0x22, 
-  0x6e, 0x6f, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6f, 
-  0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 
-  0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 
-  0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 
-  0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 
-  0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x52, 
-  0x61, 0x64, 0x69, 0x6f, 0x4d, 0x65, 0x6e, 0x75, 
-  0x49, 0x74, 0x65, 0x6d, 0x22, 0x20, 0x69, 0x64, 
-  0x3d, 0x22, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x5f, 
-  0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 0x74, 
-  0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 0x69, 
-  0x74, 0x65, 0x6d, 0x22, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 
-  0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 
-  0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 
-  0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 
-  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
-  0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 
-  0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 
-  0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 
-  0x22, 0x3e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x3c, 
-  0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
-  0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 
-  0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 
-  0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, 
-  0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 
+  0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 
   0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 
   0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 
   0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 
   0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 
-  0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 
-  0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
-  0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 
-  0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 
-  0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 0x72, 
-  0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 0x72, 
-  0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 
-  0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 
-  0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 
-  0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 0x6f, 
-  0x75, 0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 0x74, 
-  0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x62, 0x75, 0x74, 
-  0x74, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
+  0x64, 0x72, 0x61, 0x77, 0x5f, 0x61, 0x73, 0x5f, 
+  0x72, 0x61, 0x64, 0x69, 0x6f, 0x22, 0x3e, 0x54, 
+  0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 
+  0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 
+  0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 
+  0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x67, 0x72, 
+  0x6f, 0x75, 0x70, 0x22, 0x3e, 0x74, 0x65, 0x78, 
+  0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 
+  0x5f, 0x68, 0x62, 0x5f, 0x6d, 0x65, 0x6e, 0x75, 
   0x69, 0x74, 0x65, 0x6d, 0x3c, 0x2f, 0x70, 0x72, 
   0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 
   0x73, 0x69, 0x67, 0x6e, 0x61, 0x6c, 0x20, 0x6e, 
@@ -5640,13 +6350,7 @@ static const SECTION union { const guint8 data[45120]; const double alignment; v
   0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 
   0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 
   0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 
-  0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6f, 
-  0x72, 0x67, 0x2f, 0x00, 0x03, 0x00, 0x00, 0x00, 
-  0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 
-  0x04, 0x00, 0x00, 0x00, 0x53, 0x69, 0x6d, 0x70, 
-  0x6c, 0x65, 0x53, 0x63, 0x61, 0x6e, 0x2f, 0x00, 
-  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
-  0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+  0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29
 } };
 
 static GStaticResource static_resource = { simple_scan_resource_data.data, sizeof (simple_scan_resource_data.data), NULL, NULL, NULL };
diff --git a/src/scanner.c b/src/scanner.c
index de389f6..a9fd325 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -1,4 +1,4 @@
-/* scanner.c generated by valac 0.22.1, the Vala compiler
+/* scanner.c generated by valac 0.24.0, the Vala compiler
  * generated from scanner.vala, do not modify */
 
 /*
@@ -3811,7 +3811,6 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-	gboolean _tmp7_ = FALSE;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotPageInfo*) base;
 #line 178 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3824,7 +3823,7 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3828 "scanner.c"
+#line 3827 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3836,26 +3835,24 @@ static void notify_got_page_info_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3840 "scanner.c"
+#line 3839 "scanner.c"
 	} else {
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3844 "scanner.c"
+#line 3843 "scanner.c"
 	}
 #line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = _tmp0_;
-#line 180 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp7_) {
-#line 3850 "scanner.c"
-		Scanner* _tmp8_ = NULL;
-		ScanPageInfo* _tmp9_ = NULL;
+	if (_tmp0_) {
+#line 3847 "scanner.c"
+		Scanner* _tmp7_ = NULL;
+		ScanPageInfo* _tmp8_ = NULL;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = scanner;
+		_tmp7_ = scanner;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = self->priv->info;
+		_tmp8_ = self->priv->info;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_signal_emit_by_name (_tmp8_, "got-page-info", _tmp9_);
-#line 3859 "scanner.c"
+		g_signal_emit_by_name (_tmp7_, "got-page-info", _tmp8_);
+#line 3856 "scanner.c"
 	}
 }
 
@@ -3869,14 +3866,14 @@ static void notify_got_page_info_class_init (NotifyGotPageInfoClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyGotPageInfoPrivate));
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_got_page_info_real_run;
-#line 3873 "scanner.c"
+#line 3870 "scanner.c"
 }
 
 
 static void notify_got_page_info_instance_init (NotifyGotPageInfo * self) {
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_PAGE_INFO_GET_PRIVATE (self);
-#line 3880 "scanner.c"
+#line 3877 "scanner.c"
 }
 
 
@@ -3888,7 +3885,7 @@ static void notify_got_page_info_finalize (Notify* obj) {
 	_scan_page_info_unref0 (self->priv->info);
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_page_info_parent_class)->finalize (obj);
-#line 3892 "scanner.c"
+#line 3889 "scanner.c"
 }
 
 
@@ -3915,14 +3912,14 @@ NotifyPageDone* notify_page_done_construct (GType object_type, gint job_id) {
 	self->priv->job_id = _tmp0_;
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 3919 "scanner.c"
+#line 3916 "scanner.c"
 }
 
 
 NotifyPageDone* notify_page_done_new (gint job_id) {
 #line 187 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_page_done_construct (TYPE_NOTIFY_PAGE_DONE, job_id);
-#line 3926 "scanner.c"
+#line 3923 "scanner.c"
 }
 
 
@@ -3932,7 +3929,6 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-	gboolean _tmp7_ = FALSE;
 #line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyPageDone*) base;
 #line 189 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -3945,7 +3941,7 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 3949 "scanner.c"
+#line 3945 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3957,23 +3953,21 @@ static void notify_page_done_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 3961 "scanner.c"
+#line 3957 "scanner.c"
 	} else {
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 3965 "scanner.c"
+#line 3961 "scanner.c"
 	}
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = _tmp0_;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp7_) {
-#line 3971 "scanner.c"
-		Scanner* _tmp8_ = NULL;
+	if (_tmp0_) {
+#line 3965 "scanner.c"
+		Scanner* _tmp7_ = NULL;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = scanner;
+		_tmp7_ = scanner;
 #line 192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_signal_emit_by_name (_tmp8_, "page-done");
-#line 3977 "scanner.c"
+		g_signal_emit_by_name (_tmp7_, "page-done");
+#line 3971 "scanner.c"
 	}
 }
 
@@ -3987,14 +3981,14 @@ static void notify_page_done_class_init (NotifyPageDoneClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyPageDonePrivate));
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_page_done_real_run;
-#line 3991 "scanner.c"
+#line 3985 "scanner.c"
 }
 
 
 static void notify_page_done_instance_init (NotifyPageDone * self) {
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_PAGE_DONE_GET_PRIVATE (self);
-#line 3998 "scanner.c"
+#line 3992 "scanner.c"
 }
 
 
@@ -4004,7 +3998,7 @@ static void notify_page_done_finalize (Notify* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_NOTIFY_PAGE_DONE, NotifyPageDone);
 #line 185 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_page_done_parent_class)->finalize (obj);
-#line 4008 "scanner.c"
+#line 4002 "scanner.c"
 }
 
 
@@ -4023,7 +4017,7 @@ GType notify_page_done_get_type (void) {
 static gpointer _scan_line_ref0 (gpointer self) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_line_ref (self) : NULL;
-#line 4027 "scanner.c"
+#line 4021 "scanner.c"
 }
 
 
@@ -4050,14 +4044,14 @@ NotifyGotLine* notify_got_line_construct (GType object_type, gint job_id, ScanLi
 	self->priv->line = _tmp2_;
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4054 "scanner.c"
+#line 4048 "scanner.c"
 }
 
 
 NotifyGotLine* notify_got_line_new (gint job_id, ScanLine* line) {
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return notify_got_line_construct (TYPE_NOTIFY_GOT_LINE, job_id, line);
-#line 4061 "scanner.c"
+#line 4055 "scanner.c"
 }
 
 
@@ -4067,7 +4061,6 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	gint _tmp1_ = 0;
 	Scanner* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
-	gboolean _tmp7_ = FALSE;
 #line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self = (NotifyGotLine*) base;
 #line 201 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4080,7 +4073,7 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 	_tmp3_ = _tmp2_->first_job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ >= _tmp3_) {
-#line 4084 "scanner.c"
+#line 4077 "scanner.c"
 		gint _tmp4_ = 0;
 		Scanner* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -4092,26 +4085,24 @@ static void notify_got_line_real_run (Notify* base, Scanner* scanner) {
 		_tmp6_ = _tmp5_->job_id;
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp4_ < _tmp6_;
-#line 4096 "scanner.c"
+#line 4089 "scanner.c"
 	} else {
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 4100 "scanner.c"
+#line 4093 "scanner.c"
 	}
 #line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = _tmp0_;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp7_) {
-#line 4106 "scanner.c"
-		Scanner* _tmp8_ = NULL;
-		ScanLine* _tmp9_ = NULL;
+	if (_tmp0_) {
+#line 4097 "scanner.c"
+		Scanner* _tmp7_ = NULL;
+		ScanLine* _tmp8_ = NULL;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = scanner;
+		_tmp7_ = scanner;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = self->priv->line;
+		_tmp8_ = self->priv->line;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_signal_emit_by_name (_tmp8_, "got-line", _tmp9_);
-#line 4115 "scanner.c"
+		g_signal_emit_by_name (_tmp7_, "got-line", _tmp8_);
+#line 4106 "scanner.c"
 	}
 }
 
@@ -4125,14 +4116,14 @@ static void notify_got_line_class_init (NotifyGotLineClass * klass) {
 	g_type_class_add_private (klass, sizeof (NotifyGotLinePrivate));
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (klass)->run = notify_got_line_real_run;
-#line 4129 "scanner.c"
+#line 4120 "scanner.c"
 }
 
 
 static void notify_got_line_instance_init (NotifyGotLine * self) {
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv = NOTIFY_GOT_LINE_GET_PRIVATE (self);
-#line 4136 "scanner.c"
+#line 4127 "scanner.c"
 }
 
 
@@ -4144,7 +4135,7 @@ static void notify_got_line_finalize (Notify* obj) {
 	_scan_line_unref0 (self->priv->line);
 #line 196 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	NOTIFY_CLASS (notify_got_line_parent_class)->finalize (obj);
-#line 4148 "scanner.c"
+#line 4139 "scanner.c"
 }
 
 
@@ -4163,7 +4154,7 @@ GType notify_got_line_get_type (void) {
 static void _scan_job_unref0_ (gpointer var) {
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (scan_job_unref (var), NULL));
-#line 4167 "scanner.c"
+#line 4158 "scanner.c"
 }
 
 
@@ -4172,28 +4163,28 @@ static void _g_list_free__scan_job_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_job_unref0_, NULL);
 #line 234 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_list_free (self);
-#line 4176 "scanner.c"
+#line 4167 "scanner.c"
 }
 
 
 static void _request_unref0_ (gpointer var) {
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (request_unref (var), NULL));
-#line 4183 "scanner.c"
+#line 4174 "scanner.c"
 }
 
 
 static void _notify_unref0_ (gpointer var) {
 #line 274 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (notify_unref (var), NULL));
-#line 4190 "scanner.c"
+#line 4181 "scanner.c"
 }
 
 
 static void _credentials_unref0_ (gpointer var) {
 #line 275 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	(var == NULL) ? NULL : (var = (credentials_unref (var), NULL));
-#line 4197 "scanner.c"
+#line 4188 "scanner.c"
 }
 
 
@@ -4224,21 +4215,21 @@ static Scanner* scanner_construct (GType object_type) {
 	self->priv->authorize_queue = _tmp2_;
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self;
-#line 4228 "scanner.c"
+#line 4219 "scanner.c"
 }
 
 
 static Scanner* scanner_new (void) {
 #line 271 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return scanner_construct (TYPE_SCANNER);
-#line 4235 "scanner.c"
+#line 4226 "scanner.c"
 }
 
 
 static gpointer _scanner_ref0 (gpointer self) {
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scanner_ref (self) : NULL;
-#line 4242 "scanner.c"
+#line 4233 "scanner.c"
 }
 
 
@@ -4251,7 +4242,7 @@ Scanner* scanner_get_instance (void) {
 	_tmp0_ = scanner_scanner_object;
 #line 280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_ == NULL) {
-#line 4255 "scanner.c"
+#line 4246 "scanner.c"
 		Scanner* _tmp1_ = NULL;
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = scanner_new ();
@@ -4259,7 +4250,7 @@ Scanner* scanner_get_instance (void) {
 		_scanner_unref0 (scanner_scanner_object);
 #line 281 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_scanner_object = _tmp1_;
-#line 4263 "scanner.c"
+#line 4254 "scanner.c"
 	}
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = scanner_scanner_object;
@@ -4269,7 +4260,7 @@ Scanner* scanner_get_instance (void) {
 	result = _tmp3_;
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4273 "scanner.c"
+#line 4264 "scanner.c"
 }
 
 
@@ -4294,23 +4285,23 @@ static gboolean scanner_notify_idle_cb (Scanner* self) {
 	_notify_unref0 (notification);
 #line 289 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4298 "scanner.c"
+#line 4289 "scanner.c"
 }
 
 
 static gpointer _notify_ref0 (gpointer self) {
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? notify_ref (self) : NULL;
-#line 4305 "scanner.c"
+#line 4296 "scanner.c"
 }
 
 
 static gboolean _scanner_notify_idle_cb_gsource_func (gpointer self) {
 	gboolean result;
-	result = scanner_notify_idle_cb (self);
+	result = scanner_notify_idle_cb ((Scanner*) self);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4314 "scanner.c"
+#line 4305 "scanner.c"
 }
 
 
@@ -4332,7 +4323,7 @@ static void scanner_notify (Scanner* self, Notify* notification) {
 	g_async_queue_push (_tmp0_, _tmp2_);
 #line 295 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _scanner_notify_idle_cb_gsource_func, scanner_ref (self), scanner_unref);
-#line 4336 "scanner.c"
+#line 4327 "scanner.c"
 }
 
 
@@ -4340,80 +4331,71 @@ static void scanner_set_scanning (Scanner* self, gboolean is_scanning) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp9_ = FALSE;
 #line 298 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_) {
-#line 4352 "scanner.c"
+#line 4341 "scanner.c"
 		gboolean _tmp3_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = !_tmp3_;
-#line 4358 "scanner.c"
+#line 4347 "scanner.c"
 	} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = FALSE;
-#line 4362 "scanner.c"
+#line 4351 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = _tmp1_;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp4_) {
+	if (_tmp1_) {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = TRUE;
-#line 4370 "scanner.c"
+#line 4357 "scanner.c"
 	} else {
+		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-		gboolean _tmp6_ = FALSE;
-		gboolean _tmp8_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp6_ = self->priv->scanning;
+		_tmp5_ = self->priv->scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (!_tmp6_) {
-#line 4379 "scanner.c"
-			gboolean _tmp7_ = FALSE;
+		if (!_tmp5_) {
+#line 4365 "scanner.c"
+			gboolean _tmp6_ = FALSE;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp7_ = is_scanning;
+			_tmp6_ = is_scanning;
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp5_ = _tmp7_;
-#line 4385 "scanner.c"
+			_tmp4_ = _tmp6_;
+#line 4371 "scanner.c"
 		} else {
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp5_ = FALSE;
-#line 4389 "scanner.c"
+			_tmp4_ = FALSE;
+#line 4375 "scanner.c"
 		}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = _tmp5_;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp0_ = _tmp8_;
-#line 4395 "scanner.c"
+		_tmp0_ = _tmp4_;
+#line 4379 "scanner.c"
 	}
 #line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = _tmp0_;
-#line 300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp9_) {
-#line 4401 "scanner.c"
-		gboolean _tmp10_ = FALSE;
-		NotifyScanningChanged* _tmp11_ = NULL;
-		NotifyScanningChanged* _tmp12_ = NULL;
+	if (_tmp0_) {
+#line 4383 "scanner.c"
+		gboolean _tmp7_ = FALSE;
+		NotifyScanningChanged* _tmp8_ = NULL;
+		NotifyScanningChanged* _tmp9_ = NULL;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp10_ = is_scanning;
+		_tmp7_ = is_scanning;
 #line 302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->scanning = _tmp10_;
+		self->priv->scanning = _tmp7_;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp11_ = notify_scanning_changed_new ();
+		_tmp8_ = notify_scanning_changed_new ();
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp12_ = _tmp11_;
+		_tmp9_ = _tmp8_;
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_notify (self, (Notify*) _tmp12_);
+		scanner_notify (self, (Notify*) _tmp9_);
 #line 303 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp12_);
-#line 4417 "scanner.c"
+		_notify_unref0 (_tmp9_);
+#line 4399 "scanner.c"
 	}
 }
 
@@ -4422,19 +4404,19 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1237 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1274 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1237 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1274 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = needle;
-#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	result = _tmp1_ != NULL;
-#line 1238 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1275 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 4438 "scanner.c"
+#line 4420 "scanner.c"
 }
 
 
@@ -4456,7 +4438,7 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 2;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4460 "scanner.c"
+#line 4442 "scanner.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = device;
@@ -4468,13 +4450,13 @@ static gint scanner_get_device_weight (const gchar* device) {
 		result = 0;
 #line 317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4472 "scanner.c"
+#line 4454 "scanner.c"
 	}
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = 1;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4478 "scanner.c"
+#line 4460 "scanner.c"
 }
 
 
@@ -4522,7 +4504,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	_tmp7_ = weight2;
 #line 328 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != _tmp7_) {
-#line 4526 "scanner.c"
+#line 4508 "scanner.c"
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4533,7 +4515,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 		result = _tmp8_ - _tmp9_;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 4537 "scanner.c"
+#line 4519 "scanner.c"
 	}
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = g_strcmp0;
@@ -4551,7 +4533,7 @@ static gint scanner_compare_devices (ScanDevice* device1, ScanDevice* device2) {
 	result = _tmp15_;
 #line 331 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4555 "scanner.c"
+#line 4537 "scanner.c"
 }
 
 
@@ -4564,7 +4546,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 	switch (_tmp0_) {
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_GOOD:
-#line 4568 "scanner.c"
+#line 4550 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4573,11 +4555,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp1_;
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4577 "scanner.c"
+#line 4559 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_UNSUPPORTED:
-#line 4581 "scanner.c"
+#line 4563 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4586,11 +4568,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp2_;
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4590 "scanner.c"
+#line 4572 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_CANCELLED:
-#line 4594 "scanner.c"
+#line 4576 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4599,11 +4581,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp3_;
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4603 "scanner.c"
+#line 4585 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_DEVICE_BUSY:
-#line 4607 "scanner.c"
+#line 4589 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4612,11 +4594,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp4_;
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4616 "scanner.c"
+#line 4598 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_INVAL:
-#line 4620 "scanner.c"
+#line 4602 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4625,11 +4607,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp5_;
 #line 65 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4629 "scanner.c"
+#line 4611 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_EOF:
-#line 4633 "scanner.c"
+#line 4615 "scanner.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4638,11 +4620,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp6_;
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4642 "scanner.c"
+#line 4624 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_JAMMED:
-#line 4646 "scanner.c"
+#line 4628 "scanner.c"
 		{
 			gchar* _tmp7_ = NULL;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4651,11 +4633,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp7_;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4655 "scanner.c"
+#line 4637 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_DOCS:
-#line 4659 "scanner.c"
+#line 4641 "scanner.c"
 		{
 			gchar* _tmp8_ = NULL;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4664,11 +4646,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp8_;
 #line 71 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4668 "scanner.c"
+#line 4650 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_COVER_OPEN:
-#line 4672 "scanner.c"
+#line 4654 "scanner.c"
 		{
 			gchar* _tmp9_ = NULL;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4677,11 +4659,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp9_;
 #line 73 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4681 "scanner.c"
+#line 4663 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_IO_ERROR:
-#line 4685 "scanner.c"
+#line 4667 "scanner.c"
 		{
 			gchar* _tmp10_ = NULL;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4690,11 +4672,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp10_;
 #line 75 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4694 "scanner.c"
+#line 4676 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_NO_MEM:
-#line 4698 "scanner.c"
+#line 4680 "scanner.c"
 		{
 			gchar* _tmp11_ = NULL;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4703,11 +4685,11 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp11_;
 #line 77 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4707 "scanner.c"
+#line 4689 "scanner.c"
 		}
 #line 54 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_STATUS_ACCESS_DENIED:
-#line 4711 "scanner.c"
+#line 4693 "scanner.c"
 		{
 			gchar* _tmp12_ = NULL;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -4716,7 +4698,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp12_;
 #line 79 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4720 "scanner.c"
+#line 4702 "scanner.c"
 		}
 		default:
 		{
@@ -4730,7 +4712,7 @@ static gchar* sane_status_to_string (SANE_Status status) {
 			result = _tmp14_;
 #line 81 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 4734 "scanner.c"
+#line 4716 "scanner.c"
 		}
 	}
 }
@@ -4739,13 +4721,13 @@ static gchar* sane_status_to_string (SANE_Status status) {
 static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 4749 "scanner.c"
+#line 4731 "scanner.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4757,94 +4739,101 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		GRegex* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+		gchar* _tmp9_ = NULL;
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp0_ = old;
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp1_;
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp4_ = _tmp3_;
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_g_free0 (_tmp2_);
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		regex = _tmp4_;
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4779 "scanner.c"
+#line 4762 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1280 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4788 "scanner.c"
+#line 4771 "scanner.c"
 		}
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp7_ = replacement;
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_);
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp5_ = _tmp8_;
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		if (_inner_error_ != NULL) {
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 4804 "scanner.c"
+#line 4787 "scanner.c"
 				goto __catch14_g_regex_error;
 			}
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 			return NULL;
-#line 4815 "scanner.c"
+#line 4798 "scanner.c"
 		}
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		result = _tmp5_;
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp9_ = _tmp5_;
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp5_ = NULL;
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		result = _tmp9_;
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp5_);
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1281 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 4823 "scanner.c"
+#line 4812 "scanner.c"
 	}
 	goto __finally14;
 	__catch14_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1246 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1283 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 4837 "scanner.c"
+#line 4826 "scanner.c"
 	}
 	__finally14:
-#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_inner_error_ != NULL) {
-#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return NULL;
-#line 4848 "scanner.c"
+#line 4837 "scanner.c"
 	}
 }
 
@@ -4852,16 +4841,16 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 4856 "scanner.c"
+#line 4845 "scanner.c"
 }
 
 
 static gint _scanner_compare_devices_gcompare_func (gconstpointer a, gconstpointer b) {
 	gint result;
-	result = scanner_compare_devices (a, b);
+	result = scanner_compare_devices ((ScanDevice*) a, (ScanDevice*) b);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 4865 "scanner.c"
+#line 4854 "scanner.c"
 }
 
 
@@ -4877,10 +4866,10 @@ static void scanner_do_redetect (Scanner* self) {
 	gchar* _tmp4_ = NULL;
 	SANE_Status _tmp5_ = 0;
 	GList* devices = NULL;
-	GList* _tmp57_ = NULL;
-	GList* _tmp64_ = NULL;
+	GList* _tmp56_ = NULL;
+	GList* _tmp63_ = NULL;
+	NotifyUpdateDevices* _tmp64_ = NULL;
 	NotifyUpdateDevices* _tmp65_ = NULL;
-	NotifyUpdateDevices* _tmp66_ = NULL;
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4913,7 +4902,7 @@ static void scanner_do_redetect (Scanner* self) {
 	_tmp5_ = status;
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 4917 "scanner.c"
+#line 4906 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -4928,241 +4917,238 @@ static void scanner_do_redetect (Scanner* self) {
 		self->priv->state = SCAN_STATE_IDLE;
 #line 344 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 4932 "scanner.c"
+#line 4921 "scanner.c"
 	}
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
-#line 4936 "scanner.c"
+#line 4925 "scanner.c"
 	{
 		gint i = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 4941 "scanner.c"
+#line 4930 "scanner.c"
 		{
 			gboolean _tmp8_ = FALSE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp8_ = TRUE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 4948 "scanner.c"
-				gboolean _tmp9_ = FALSE;
-				SANE_Device** _tmp11_ = NULL;
-				gint _tmp11__length1 = 0;
-				gint _tmp12_ = 0;
-				SANE_Device* _tmp13_ = NULL;
-				SANE_Device** _tmp14_ = NULL;
-				gint _tmp14__length1 = 0;
-				gint _tmp15_ = 0;
-				SANE_Device* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				SANE_Device** _tmp18_ = NULL;
-				gint _tmp18__length1 = 0;
-				gint _tmp19_ = 0;
-				SANE_Device* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				SANE_Device** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				SANE_Device* _tmp24_ = NULL;
-				const gchar* _tmp25_ = NULL;
-				SANE_Device** _tmp26_ = NULL;
-				gint _tmp26__length1 = 0;
-				gint _tmp27_ = 0;
-				SANE_Device* _tmp28_ = NULL;
-				const gchar* _tmp29_ = NULL;
+#line 4937 "scanner.c"
+				SANE_Device** _tmp10_ = NULL;
+				gint _tmp10__length1 = 0;
+				gint _tmp11_ = 0;
+				SANE_Device* _tmp12_ = NULL;
+				SANE_Device** _tmp13_ = NULL;
+				gint _tmp13__length1 = 0;
+				gint _tmp14_ = 0;
+				SANE_Device* _tmp15_ = NULL;
+				const gchar* _tmp16_ = NULL;
+				SANE_Device** _tmp17_ = NULL;
+				gint _tmp17__length1 = 0;
+				gint _tmp18_ = 0;
+				SANE_Device* _tmp19_ = NULL;
+				const gchar* _tmp20_ = NULL;
+				SANE_Device** _tmp21_ = NULL;
+				gint _tmp21__length1 = 0;
+				gint _tmp22_ = 0;
+				SANE_Device* _tmp23_ = NULL;
+				const gchar* _tmp24_ = NULL;
+				SANE_Device** _tmp25_ = NULL;
+				gint _tmp25__length1 = 0;
+				gint _tmp26_ = 0;
+				SANE_Device* _tmp27_ = NULL;
+				const gchar* _tmp28_ = NULL;
 				ScanDevice* scan_device = NULL;
+				ScanDevice* _tmp29_ = NULL;
 				ScanDevice* _tmp30_ = NULL;
-				ScanDevice* _tmp31_ = NULL;
-				SANE_Device** _tmp32_ = NULL;
-				gint _tmp32__length1 = 0;
-				gint _tmp33_ = 0;
-				SANE_Device* _tmp34_ = NULL;
-				const gchar* _tmp35_ = NULL;
-				gchar* _tmp36_ = NULL;
+				SANE_Device** _tmp31_ = NULL;
+				gint _tmp31__length1 = 0;
+				gint _tmp32_ = 0;
+				SANE_Device* _tmp33_ = NULL;
+				const gchar* _tmp34_ = NULL;
+				gchar* _tmp35_ = NULL;
 				gchar* vendor = NULL;
-				SANE_Device** _tmp37_ = NULL;
-				gint _tmp37__length1 = 0;
-				gint _tmp38_ = 0;
-				SANE_Device* _tmp39_ = NULL;
-				const gchar* _tmp40_ = NULL;
-				gchar* _tmp41_ = NULL;
-				const gchar* _tmp42_ = NULL;
-				ScanDevice* _tmp44_ = NULL;
-				const gchar* _tmp45_ = NULL;
-				SANE_Device** _tmp46_ = NULL;
-				gint _tmp46__length1 = 0;
-				gint _tmp47_ = 0;
-				SANE_Device* _tmp48_ = NULL;
-				const gchar* _tmp49_ = NULL;
-				gchar* _tmp50_ = NULL;
-				ScanDevice* _tmp51_ = NULL;
-				const gchar* _tmp52_ = NULL;
+				SANE_Device** _tmp36_ = NULL;
+				gint _tmp36__length1 = 0;
+				gint _tmp37_ = 0;
+				SANE_Device* _tmp38_ = NULL;
+				const gchar* _tmp39_ = NULL;
+				gchar* _tmp40_ = NULL;
+				const gchar* _tmp41_ = NULL;
+				ScanDevice* _tmp43_ = NULL;
+				const gchar* _tmp44_ = NULL;
+				SANE_Device** _tmp45_ = NULL;
+				gint _tmp45__length1 = 0;
+				gint _tmp46_ = 0;
+				SANE_Device* _tmp47_ = NULL;
+				const gchar* _tmp48_ = NULL;
+				gchar* _tmp49_ = NULL;
+				ScanDevice* _tmp50_ = NULL;
+				const gchar* _tmp51_ = NULL;
+				gchar* _tmp52_ = NULL;
 				gchar* _tmp53_ = NULL;
-				gchar* _tmp54_ = NULL;
+				ScanDevice* _tmp54_ = NULL;
 				ScanDevice* _tmp55_ = NULL;
-				ScanDevice* _tmp56_ = NULL;
-#line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp9_ = _tmp8_;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp9_) {
-#line 5009 "scanner.c"
-					gint _tmp10_ = 0;
+				if (!_tmp8_) {
+#line 4995 "scanner.c"
+					gint _tmp9_ = 0;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp10_ = i;
+					_tmp9_ = i;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp10_ + 1;
-#line 5015 "scanner.c"
+					i = _tmp9_ + 1;
+#line 5001 "scanner.c"
 				}
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp8_ = FALSE;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp11_ = device_list;
+				_tmp10_ = device_list;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp11__length1 = device_list_length1;
+				_tmp10__length1 = device_list_length1;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp12_ = i;
+				_tmp11_ = i;
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp13_ = _tmp11_[_tmp12_];
+				_tmp12_ = _tmp10_[_tmp11_];
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!(_tmp13_ != NULL)) {
+				if (!(_tmp12_ != NULL)) {
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 5031 "scanner.c"
+#line 5017 "scanner.c"
 				}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp14_ = device_list;
+				_tmp13_ = device_list;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp14__length1 = device_list_length1;
+				_tmp13__length1 = device_list_length1;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp15_ = i;
+				_tmp14_ = i;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp16_ = _tmp14_[_tmp15_];
+				_tmp15_ = _tmp13_[_tmp14_];
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp17_ = _tmp16_->name;
+				_tmp16_ = _tmp15_->name;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp18_ = device_list;
+				_tmp17_ = device_list;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp18__length1 = device_list_length1;
+				_tmp17__length1 = device_list_length1;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp19_ = i;
+				_tmp18_ = i;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp20_ = _tmp18_[_tmp19_];
+				_tmp19_ = _tmp17_[_tmp18_];
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp21_ = _tmp20_->vendor;
+				_tmp20_ = _tmp19_->vendor;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp22_ = device_list;
+				_tmp21_ = device_list;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp22__length1 = device_list_length1;
+				_tmp21__length1 = device_list_length1;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp23_ = i;
+				_tmp22_ = i;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp24_ = _tmp22_[_tmp23_];
+				_tmp23_ = _tmp21_[_tmp22_];
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp25_ = _tmp24_->model;
+				_tmp24_ = _tmp23_->model;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp26_ = device_list;
+				_tmp25_ = device_list;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp26__length1 = device_list_length1;
+				_tmp25__length1 = device_list_length1;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp27_ = i;
+				_tmp26_ = i;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp28_ = _tmp26_[_tmp27_];
+				_tmp27_ = _tmp25_[_tmp26_];
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp29_ = _tmp28_->type;
+				_tmp28_ = _tmp27_->type;
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_debug ("scanner.vala:350: Device: name=\"%s\" vendor=\"%s\" model=\"%s\" type=" \
-"\"%s\"", _tmp17_, _tmp21_, _tmp25_, _tmp29_);
+"\"%s\"", _tmp16_, _tmp20_, _tmp24_, _tmp28_);
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp30_ = scan_device_new ();
+				_tmp29_ = scan_device_new ();
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scan_device = _tmp30_;
+				scan_device = _tmp29_;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp31_ = scan_device;
+				_tmp30_ = scan_device;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp32_ = device_list;
+				_tmp31_ = device_list;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp32__length1 = device_list_length1;
+				_tmp31__length1 = device_list_length1;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp33_ = i;
+				_tmp32_ = i;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp34_ = _tmp32_[_tmp33_];
+				_tmp33_ = _tmp31_[_tmp32_];
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp35_ = _tmp34_->name;
+				_tmp34_ = _tmp33_->name;
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp36_ = g_strdup (_tmp35_);
+				_tmp35_ = g_strdup (_tmp34_);
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp31_->name);
+				_g_free0 (_tmp30_->name);
 #line 354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp31_->name = _tmp36_;
+				_tmp30_->name = _tmp35_;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp37_ = device_list;
+				_tmp36_ = device_list;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp37__length1 = device_list_length1;
+				_tmp36__length1 = device_list_length1;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp38_ = i;
+				_tmp37_ = i;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp39_ = _tmp37_[_tmp38_];
+				_tmp38_ = _tmp36_[_tmp37_];
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp40_ = _tmp39_->vendor;
+				_tmp39_ = _tmp38_->vendor;
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp41_ = g_strdup (_tmp40_);
+				_tmp40_ = g_strdup (_tmp39_);
 #line 357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				vendor = _tmp41_;
+				vendor = _tmp40_;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp42_ = vendor;
+				_tmp41_ = vendor;
 #line 358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (g_strcmp0 (_tmp42_, "Hewlett-Packard") == 0) {
-#line 5115 "scanner.c"
-					gchar* _tmp43_ = NULL;
+				if (g_strcmp0 (_tmp41_, "Hewlett-Packard") == 0) {
+#line 5101 "scanner.c"
+					gchar* _tmp42_ = NULL;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp43_ = g_strdup ("HP");
+					_tmp42_ = g_strdup ("HP");
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (vendor);
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					vendor = _tmp43_;
-#line 5123 "scanner.c"
+					vendor = _tmp42_;
+#line 5109 "scanner.c"
 				}
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp44_ = scan_device;
+				_tmp43_ = scan_device;
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp45_ = vendor;
+				_tmp44_ = vendor;
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp46_ = device_list;
+				_tmp45_ = device_list;
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp46__length1 = device_list_length1;
+				_tmp45__length1 = device_list_length1;
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp47_ = i;
+				_tmp46_ = i;
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp48_ = _tmp46_[_tmp47_];
+				_tmp47_ = _tmp45_[_tmp46_];
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp49_ = _tmp48_->model;
+				_tmp48_ = _tmp47_->model;
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp50_ = g_strdup_printf ("%s %s", _tmp45_, _tmp49_);
+				_tmp49_ = g_strdup_printf ("%s %s", _tmp44_, _tmp48_);
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp44_->label);
+				_g_free0 (_tmp43_->label);
 #line 361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp44_->label = _tmp50_;
+				_tmp43_->label = _tmp49_;
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp51_ = scan_device;
+				_tmp50_ = scan_device;
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp52_ = _tmp51_->label;
+				_tmp51_ = _tmp50_->label;
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp53_ = string_replace (_tmp52_, "_", " ");
+				_tmp52_ = string_replace (_tmp51_, "_", " ");
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp54_ = _tmp53_;
+				_tmp53_ = _tmp52_;
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_g_free0 (_tmp54_);
+				_g_free0 (_tmp53_);
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp55_ = scan_device;
+				_tmp54_ = scan_device;
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp56_ = _scan_device_ref0 (_tmp55_);
+				_tmp55_ = _scan_device_ref0 (_tmp54_);
 #line 365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				devices = g_list_append (devices, _tmp56_);
+				devices = g_list_append (devices, _tmp55_);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (vendor);
 #line 348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_scan_device_unref0 (scan_device);
-#line 5165 "scanner.c"
+#line 5151 "scanner.c"
 			}
 		}
 	}
@@ -5173,60 +5159,60 @@ static void scanner_do_redetect (Scanner* self) {
 #line 372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_IDLE;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp57_ = devices;
+	_tmp56_ = devices;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp57_ != NULL) {
-#line 5179 "scanner.c"
+	if (_tmp56_ != NULL) {
+#line 5165 "scanner.c"
 		ScanDevice* device = NULL;
-		GList* _tmp58_ = NULL;
-		gconstpointer _tmp59_ = NULL;
+		GList* _tmp57_ = NULL;
+		gconstpointer _tmp58_ = NULL;
+		ScanDevice* _tmp59_ = NULL;
 		ScanDevice* _tmp60_ = NULL;
-		ScanDevice* _tmp61_ = NULL;
-		const gchar* _tmp62_ = NULL;
-		gchar* _tmp63_ = NULL;
+		const gchar* _tmp61_ = NULL;
+		gchar* _tmp62_ = NULL;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp58_ = devices;
+		_tmp57_ = devices;
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_ = g_list_nth_data (_tmp58_, (guint) 0);
+		_tmp58_ = g_list_nth_data (_tmp57_, (guint) 0);
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp60_ = _scan_device_ref0 ((ScanDevice*) _tmp59_);
+		_tmp59_ = _scan_device_ref0 ((ScanDevice*) _tmp58_);
 #line 376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		device = _tmp60_;
+		device = _tmp59_;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp61_ = device;
+		_tmp60_ = device;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp62_ = _tmp61_->name;
+		_tmp61_ = _tmp60_->name;
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp63_ = g_strdup (_tmp62_);
+		_tmp62_ = g_strdup (_tmp61_);
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->default_device = _tmp63_;
+		self->priv->default_device = _tmp62_;
 #line 374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_device_unref0 (device);
-#line 5207 "scanner.c"
+#line 5193 "scanner.c"
 	} else {
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (self->priv->default_device);
 #line 380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->default_device = NULL;
-#line 5213 "scanner.c"
+#line 5199 "scanner.c"
 	}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp64_ = devices;
+	_tmp63_ = devices;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	devices = NULL;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp65_ = notify_update_devices_new (_tmp64_);
+	_tmp64_ = notify_update_devices_new (_tmp63_);
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp66_ = _tmp65_;
+	_tmp65_ = _tmp64_;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_notify (self, (Notify*) _tmp66_);
+	scanner_notify (self, (Notify*) _tmp65_);
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_notify_unref0 (_tmp66_);
+	_notify_unref0 (_tmp65_);
 #line 334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	__g_list_free__scan_device_unref0_0 (devices);
-#line 5229 "scanner.c"
+#line 5215 "scanner.c"
 }
 
 
@@ -5240,7 +5226,6 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	gboolean _tmp4_ = FALSE;
 	SANE_Option_Descriptor* _tmp5_ = NULL;
 	SANE_Constraint_Type _tmp6_ = 0;
-	gboolean _tmp13_ = FALSE;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, 0);
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5263,7 +5248,7 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 	_tmp6_ = _tmp5_->constraint_type;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ == SANE_CONSTRAINT_RANGE) {
-#line 5266 "scanner.c"
+#line 5251 "scanner.c"
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Range* _tmp8_ = NULL;
 		SANE_Word _tmp9_ = {0};
@@ -5284,113 +5269,111 @@ static gint scanner_scale_int (Scanner* self, gint source_min, gint source_max,
 		_tmp12_ = _tmp11_->min;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = _tmp9_ != _tmp12_;
-#line 5287 "scanner.c"
+#line 5272 "scanner.c"
 	} else {
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp4_ = FALSE;
-#line 5291 "scanner.c"
+#line 5276 "scanner.c"
 	}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = _tmp4_;
-#line 391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp13_) {
-#line 5297 "scanner.c"
+	if (_tmp4_) {
+#line 5280 "scanner.c"
+		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
-		gint _tmp16_ = 0;
-		SANE_Option_Descriptor* _tmp17_ = NULL;
-		SANE_Range* _tmp18_ = NULL;
-		SANE_Word _tmp19_ = {0};
-		SANE_Option_Descriptor* _tmp20_ = NULL;
-		SANE_Range* _tmp21_ = NULL;
-		SANE_Word _tmp22_ = {0};
+		SANE_Option_Descriptor* _tmp16_ = NULL;
+		SANE_Range* _tmp17_ = NULL;
+		SANE_Word _tmp18_ = {0};
+		SANE_Option_Descriptor* _tmp19_ = NULL;
+		SANE_Range* _tmp20_ = NULL;
+		SANE_Word _tmp21_ = {0};
+		gint _tmp22_ = 0;
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-		gint _tmp26_ = 0;
-		SANE_Option_Descriptor* _tmp27_ = NULL;
-		SANE_Range* _tmp28_ = NULL;
-		SANE_Word _tmp29_ = {0};
+		SANE_Option_Descriptor* _tmp26_ = NULL;
+		SANE_Range* _tmp27_ = NULL;
+		SANE_Word _tmp28_ = {0};
+		gint _tmp29_ = 0;
 		gint _tmp30_ = 0;
 		gint _tmp31_ = 0;
 		gint _tmp32_ = 0;
-		gint _tmp33_ = 0;
-		SANE_Option_Descriptor* _tmp34_ = NULL;
-		SANE_Range* _tmp35_ = NULL;
-		SANE_Word _tmp36_ = {0};
-		SANE_Option_Descriptor* _tmp37_ = NULL;
-		SANE_Range* _tmp38_ = NULL;
-		SANE_Word _tmp39_ = {0};
+		SANE_Option_Descriptor* _tmp33_ = NULL;
+		SANE_Range* _tmp34_ = NULL;
+		SANE_Word _tmp35_ = {0};
+		SANE_Option_Descriptor* _tmp36_ = NULL;
+		SANE_Range* _tmp37_ = NULL;
+		SANE_Word _tmp38_ = {0};
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = v;
+		_tmp13_ = v;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = source_min;
+		_tmp14_ = source_min;
 #line 393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp14_ - _tmp15_;
+		v = _tmp13_ - _tmp14_;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp16_ = v;
+		_tmp15_ = v;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp17_ = option;
+		_tmp16_ = option;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp18_ = _tmp17_->constraint.range;
+		_tmp17_ = _tmp16_->constraint.range;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp19_ = _tmp18_->max;
+		_tmp18_ = _tmp17_->max;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp20_ = option;
+		_tmp19_ = option;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp21_ = _tmp20_->constraint.range;
+		_tmp20_ = _tmp19_->constraint.range;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp22_ = _tmp21_->min;
+		_tmp21_ = _tmp20_->min;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp16_ * ((gint) (_tmp19_ - _tmp22_));
+		v = _tmp15_ * ((gint) (_tmp18_ - _tmp21_));
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp23_ = v;
+		_tmp22_ = v;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp24_ = source_max;
+		_tmp23_ = source_max;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp25_ = source_min;
+		_tmp24_ = source_min;
 #line 395 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp23_ / (_tmp24_ - _tmp25_);
+		v = _tmp22_ / (_tmp23_ - _tmp24_);
 #line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp26_ = v;
+		_tmp25_ = v;
 #line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp27_ = option;
+		_tmp26_ = option;
 #line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp28_ = _tmp27_->constraint.range;
+		_tmp27_ = _tmp26_->constraint.range;
 #line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp29_ = _tmp28_->min;
+		_tmp28_ = _tmp27_->min;
 #line 396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		v = _tmp26_ + ((gint) _tmp29_);
+		v = _tmp25_ + ((gint) _tmp28_);
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp30_ = value;
+		_tmp29_ = value;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp31_ = source_min;
+		_tmp30_ = source_min;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp32_ = source_max;
+		_tmp31_ = source_max;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp33_ = v;
+		_tmp32_ = v;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp34_ = option;
+		_tmp33_ = option;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp35_ = _tmp34_->constraint.range;
+		_tmp34_ = _tmp33_->constraint.range;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp36_ = _tmp35_->min;
+		_tmp35_ = _tmp34_->min;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp37_ = option;
+		_tmp36_ = option;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp38_ = _tmp37_->constraint.range;
+		_tmp37_ = _tmp36_->constraint.range;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp39_ = _tmp38_->max;
+		_tmp38_ = _tmp37_->max;
 #line 397 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:397: scale_int: scaling %d [min: %d, max: %d] to %d [min:" \
-" %d, max: %d]", _tmp30_, _tmp31_, _tmp32_, _tmp33_, (gint) _tmp36_, (gint) _tmp39_);
-#line 5386 "scanner.c"
+" %d, max: %d]", _tmp29_, _tmp30_, _tmp31_, _tmp32_, (gint) _tmp35_, (gint) _tmp38_);
+#line 5369 "scanner.c"
 	}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = v;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5392 "scanner.c"
+#line 5375 "scanner.c"
 }
 
 
@@ -5422,7 +5405,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		result = FALSE;
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 5424 "scanner.c"
+#line 5407 "scanner.c"
 	}
 #line 410 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -5448,7 +5431,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	_tmp9_ = status;
 #line 412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ != SANE_STATUS_GOOD) {
-#line 5450 "scanner.c"
+#line 5433 "scanner.c"
 		SANE_Option_Descriptor* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		SANE_Status _tmp12_ = 0;
@@ -5463,7 +5446,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 		_tmp13_ = sane_strstatus (_tmp12_);
 #line 413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:413: Error setting default option %s: %s", _tmp11_, _tmp13_);
-#line 5465 "scanner.c"
+#line 5448 "scanner.c"
 	}
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp14_ = status;
@@ -5471,7 +5454,7 @@ static gboolean scanner_set_default_option (Scanner* self, SANE_Handle handle, S
 	result = _tmp14_ == SANE_STATUS_GOOD;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 5473 "scanner.c"
+#line 5456 "scanner.c"
 }
 
 
@@ -5491,11 +5474,9 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	const gchar* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
 	SANE_Int _tmp11_ = {0};
-	const gchar* _tmp12_ = NULL;
-	SANE_Status _tmp13_ = 0;
+	SANE_Status _tmp12_ = 0;
+	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	const gchar* _tmp16_ = NULL;
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5528,11 +5509,11 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp8_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_TRUE";
-#line 5530 "scanner.c"
+#line 5511 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp7_ = "SANE_FALSE";
-#line 5534 "scanner.c"
+#line 5515 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = _vala_result;
@@ -5540,34 +5521,30 @@ static void scanner_set_bool_option (Scanner* self, SANE_Handle handle, SANE_Opt
 	if (_tmp10_) {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_TRUE";
-#line 5542 "scanner.c"
+#line 5523 "scanner.c"
 	} else {
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = "SANE_FALSE";
-#line 5546 "scanner.c"
+#line 5527 "scanner.c"
 	}
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = option_index;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp12_ = _tmp7_;
+	_tmp12_ = status;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = status;
+	_tmp13_ = sane_status_to_string (_tmp12_);
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp14_ = sane_status_to_string (_tmp13_);
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp15_ = _tmp14_;
-#line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp16_ = _tmp9_;
+	_tmp14_ = _tmp13_;
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:425: sane_control_option (%d, SANE_ACTION_SET_VALUE, %s) " \
-"-> (%s, %s)", (gint) _tmp11_, _tmp12_, _tmp15_, _tmp16_);
+"-> (%s, %s)", (gint) _tmp11_, _tmp7_, _tmp14_, _tmp9_);
 #line 425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp15_);
+	_g_free0 (_tmp14_);
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 418 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5568 "scanner.c"
+#line 5545 "scanner.c"
 	}
 }
 
@@ -5581,15 +5558,15 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	SANE_Option_Descriptor* _tmp3_ = NULL;
 	SANE_Constraint_Type _tmp4_ = 0;
 	SANE_Status status = 0;
-	SANE_Handle _tmp49_ = {0};
-	SANE_Int _tmp50_ = {0};
-	SANE_Status _tmp51_ = 0;
-	SANE_Int _tmp52_ = {0};
-	gint _tmp53_ = 0;
+	SANE_Handle _tmp48_ = {0};
+	SANE_Int _tmp49_ = {0};
+	SANE_Status _tmp50_ = 0;
+	SANE_Int _tmp51_ = {0};
+	gint _tmp52_ = 0;
+	gchar* _tmp53_ = NULL;
 	gchar* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
+	SANE_Int _tmp55_ = {0};
 	SANE_Int _tmp56_ = {0};
-	SANE_Int _tmp57_ = {0};
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5610,7 +5587,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 	_tmp4_ = _tmp3_->constraint_type;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5611 "scanner.c"
+#line 5588 "scanner.c"
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
 		SANE_Word _tmp7_ = {0};
@@ -5630,7 +5607,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp7_ = _tmp6_->quant;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp7_ != ((SANE_Word) 0)) {
-#line 5631 "scanner.c"
+#line 5608 "scanner.c"
 			SANE_Int _tmp8_ = {0};
 			SANE_Option_Descriptor* _tmp9_ = NULL;
 			SANE_Range* _tmp10_ = NULL;
@@ -5645,7 +5622,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp11_ = _tmp10_->quant;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp8_ * _tmp11_;
-#line 5646 "scanner.c"
+#line 5623 "scanner.c"
 		}
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp12_ = v;
@@ -5657,7 +5634,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp15_ = _tmp14_->min;
 #line 437 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp12_ < ((SANE_Int) _tmp15_)) {
-#line 5658 "scanner.c"
+#line 5635 "scanner.c"
 			SANE_Option_Descriptor* _tmp16_ = NULL;
 			SANE_Range* _tmp17_ = NULL;
 			SANE_Word _tmp18_ = {0};
@@ -5669,7 +5646,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp18_ = _tmp17_->min;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp18_;
-#line 5670 "scanner.c"
+#line 5647 "scanner.c"
 		}
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = v;
@@ -5681,7 +5658,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp22_ = _tmp21_->max;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp19_ > ((SANE_Int) _tmp22_)) {
-#line 5682 "scanner.c"
+#line 5659 "scanner.c"
 			SANE_Option_Descriptor* _tmp23_ = NULL;
 			SANE_Range* _tmp24_ = NULL;
 			SANE_Word _tmp25_ = {0};
@@ -5693,7 +5670,7 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 			_tmp25_ = _tmp24_->max;
 #line 440 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = (SANE_Int) _tmp25_;
-#line 5694 "scanner.c"
+#line 5671 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp26_ = NULL;
@@ -5704,164 +5681,161 @@ static void scanner_set_int_option (Scanner* self, SANE_Handle handle, SANE_Opti
 		_tmp27_ = _tmp26_->constraint_type;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp27_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5705 "scanner.c"
+#line 5682 "scanner.c"
 			gint distance = 0;
 			gint _tmp28_ = 0;
 			gint nearest = 0;
-			gint _tmp48_ = 0;
+			gint _tmp47_ = 0;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp28_ = G_MAXINT;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = _tmp28_;
 #line 444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0;
-#line 5716 "scanner.c"
+#line 5693 "scanner.c"
 			{
 				gint i = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5721 "scanner.c"
+#line 5698 "scanner.c"
 				{
 					gboolean _tmp29_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp29_ = TRUE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 5728 "scanner.c"
-						gboolean _tmp30_ = FALSE;
-						gint _tmp32_ = 0;
-						SANE_Option_Descriptor* _tmp33_ = NULL;
-						SANE_Word* _tmp34_ = NULL;
-						gint _tmp34__length1 = 0;
-						SANE_Word _tmp35_ = {0};
+#line 5705 "scanner.c"
+						gint _tmp31_ = 0;
+						SANE_Option_Descriptor* _tmp32_ = NULL;
+						SANE_Word* _tmp33_ = NULL;
+						gint _tmp33__length1 = 0;
+						SANE_Word _tmp34_ = {0};
 						gint x = 0;
-						SANE_Option_Descriptor* _tmp36_ = NULL;
-						SANE_Word* _tmp37_ = NULL;
-						gint _tmp37__length1 = 0;
-						gint _tmp38_ = 0;
-						SANE_Word _tmp39_ = {0};
+						SANE_Option_Descriptor* _tmp35_ = NULL;
+						SANE_Word* _tmp36_ = NULL;
+						gint _tmp36__length1 = 0;
+						gint _tmp37_ = 0;
+						SANE_Word _tmp38_ = {0};
 						gint d = 0;
-						gint _tmp40_ = 0;
-						SANE_Int _tmp41_ = {0};
+						gint _tmp39_ = 0;
+						SANE_Int _tmp40_ = {0};
+						gint _tmp41_ = 0;
 						gint _tmp42_ = 0;
 						gint _tmp43_ = 0;
 						gint _tmp44_ = 0;
-						gint _tmp45_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp30_ = _tmp29_;
+						if (!_tmp29_) {
+#line 5726 "scanner.c"
+							gint _tmp30_ = 0;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp30_) {
-#line 5752 "scanner.c"
-							gint _tmp31_ = 0;
+							_tmp30_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp31_ = i;
-#line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp31_ + 1;
-#line 5758 "scanner.c"
+							i = _tmp30_ + 1;
+#line 5732 "scanner.c"
 						}
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp29_ = FALSE;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = i;
+						_tmp31_ = i;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = option;
+						_tmp32_ = option;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = _tmp33_->constraint.word_list;
+						_tmp33_ = _tmp32_->constraint.word_list;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34__length1 = -1;
+						_tmp33__length1 = -1;
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = _tmp34_[0];
+						_tmp34_ = _tmp33_[0];
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp32_) < _tmp35_)) {
+						if (!(((SANE_Word) _tmp31_) < _tmp34_)) {
 #line 447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 5776 "scanner.c"
+#line 5750 "scanner.c"
 						}
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36_ = option;
+						_tmp35_ = option;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp37_ = _tmp36_->constraint.word_list;
+						_tmp36_ = _tmp35_->constraint.word_list;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp37__length1 = -1;
+						_tmp36__length1 = -1;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp38_ = i;
+						_tmp37_ = i;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp39_ = _tmp37_[_tmp38_ + 1];
+						_tmp38_ = _tmp36_[_tmp37_ + 1];
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = (gint) _tmp39_;
+						x = (gint) _tmp38_;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp40_ = x;
+						_tmp39_ = x;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp41_ = v;
+						_tmp40_ = v;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = (gint) (_tmp40_ - _tmp41_);
+						d = (gint) (_tmp39_ - _tmp40_);
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp42_ = d;
+						_tmp41_ = d;
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp43_ = abs (_tmp42_);
+						_tmp42_ = abs (_tmp41_);
 #line 451 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						d = _tmp43_;
+						d = _tmp42_;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp44_ = d;
+						_tmp43_ = d;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp45_ = distance;
+						_tmp44_ = distance;
 #line 452 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp44_ < _tmp45_) {
-#line 5808 "scanner.c"
+						if (_tmp43_ < _tmp44_) {
+#line 5782 "scanner.c"
+							gint _tmp45_ = 0;
 							gint _tmp46_ = 0;
-							gint _tmp47_ = 0;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp46_ = d;
+							_tmp45_ = d;
 #line 454 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp46_;
+							distance = _tmp45_;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp47_ = x;
+							_tmp46_ = x;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp47_;
-#line 5819 "scanner.c"
+							nearest = _tmp46_;
+#line 5793 "scanner.c"
 						}
 					}
 				}
 			}
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp48_ = nearest;
+			_tmp47_ = nearest;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = (SANE_Int) _tmp48_;
-#line 5828 "scanner.c"
+			v = (SANE_Int) _tmp47_;
+#line 5802 "scanner.c"
 		}
 	}
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = handle;
+	_tmp48_ = handle;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = option_index;
+	_tmp49_ = option_index;
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = sane_control_option (_tmp49_, _tmp50_, SANE_ACTION_SET_VALUE, &v, NULL);
+	_tmp50_ = sane_control_option (_tmp48_, _tmp49_, SANE_ACTION_SET_VALUE, &v, NULL);
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp51_;
+	status = _tmp50_;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = option_index;
+	_tmp51_ = option_index;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = value;
+	_tmp52_ = value;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp54_ = sane_status_to_string (status);
+	_tmp53_ = sane_status_to_string (status);
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp55_ = _tmp54_;
+	_tmp54_ = _tmp53_;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp56_ = v;
+	_tmp55_ = v;
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:462: sane_control_option (%d, SANE_ACTION_SET_VALUE, %d) " \
-"-> (%s, %d)", (gint) _tmp52_, _tmp53_, _tmp55_, (gint) _tmp56_);
+"-> (%s, %d)", (gint) _tmp51_, _tmp52_, _tmp54_, (gint) _tmp55_);
 #line 462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp55_);
+	_g_free0 (_tmp54_);
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp57_ = v;
+	_tmp56_ = v;
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = (gint) _tmp57_;
+	_vala_result = (gint) _tmp56_;
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 428 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 5861 "scanner.c"
+#line 5835 "scanner.c"
 	}
 }
 
@@ -5875,18 +5849,18 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	SANE_Value_Type _tmp2_ = 0;
 	SANE_Option_Descriptor* _tmp3_ = NULL;
 	SANE_Constraint_Type _tmp4_ = 0;
-	gdouble _tmp43_ = 0.0;
-	SANE_Fixed _tmp44_ = {0};
+	gdouble _tmp42_ = 0.0;
+	SANE_Fixed _tmp43_ = {0};
 	SANE_Status status = 0;
-	SANE_Handle _tmp45_ = {0};
-	SANE_Int _tmp46_ = {0};
-	SANE_Status _tmp47_ = 0;
-	SANE_Int _tmp48_ = {0};
-	gdouble _tmp49_ = 0.0;
+	SANE_Handle _tmp44_ = {0};
+	SANE_Int _tmp45_ = {0};
+	SANE_Status _tmp46_ = 0;
+	SANE_Int _tmp47_ = {0};
+	gdouble _tmp48_ = 0.0;
+	gchar* _tmp49_ = NULL;
 	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
+	gdouble _tmp51_ = 0.0;
 	gdouble _tmp52_ = 0.0;
-	gdouble _tmp53_ = 0.0;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -5907,7 +5881,7 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 	_tmp4_ = _tmp3_->constraint_type;
 #line 473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp4_ == SANE_CONSTRAINT_RANGE) {
-#line 5907 "scanner.c"
+#line 5881 "scanner.c"
 		gdouble min = 0.0;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		SANE_Range* _tmp6_ = NULL;
@@ -5948,13 +5922,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp14_ = min;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp13_ < _tmp14_) {
-#line 5948 "scanner.c"
+#line 5922 "scanner.c"
 			gdouble _tmp15_ = 0.0;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp15_ = min;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp15_;
-#line 5954 "scanner.c"
+#line 5928 "scanner.c"
 		}
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp16_ = v;
@@ -5962,13 +5936,13 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp17_ = max;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp16_ > _tmp17_) {
-#line 5962 "scanner.c"
+#line 5936 "scanner.c"
 			gdouble _tmp18_ = 0.0;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = max;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			v = _tmp18_;
-#line 5968 "scanner.c"
+#line 5942 "scanner.c"
 		}
 	} else {
 		SANE_Option_Descriptor* _tmp19_ = NULL;
@@ -5979,168 +5953,165 @@ static void scanner_set_fixed_option (Scanner* self, SANE_Handle handle, SANE_Op
 		_tmp20_ = _tmp19_->constraint_type;
 #line 483 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ == SANE_CONSTRAINT_WORD_LIST) {
-#line 5979 "scanner.c"
+#line 5953 "scanner.c"
 			gdouble distance = 0.0;
 			gdouble _tmp21_ = 0.0;
 			gdouble nearest = 0.0;
-			gdouble _tmp42_ = 0.0;
+			gdouble _tmp41_ = 0.0;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp21_ = DBL_MAX;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			distance = _tmp21_;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			nearest = 0.0;
-#line 5990 "scanner.c"
+#line 5964 "scanner.c"
 			{
 				gint i = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 5995 "scanner.c"
+#line 5969 "scanner.c"
 				{
 					gboolean _tmp22_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp22_ = TRUE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 6002 "scanner.c"
-						gboolean _tmp23_ = FALSE;
-						gint _tmp25_ = 0;
-						SANE_Option_Descriptor* _tmp26_ = NULL;
-						SANE_Word* _tmp27_ = NULL;
-						gint _tmp27__length1 = 0;
-						SANE_Word _tmp28_ = {0};
+#line 5976 "scanner.c"
+						gint _tmp24_ = 0;
+						SANE_Option_Descriptor* _tmp25_ = NULL;
+						SANE_Word* _tmp26_ = NULL;
+						gint _tmp26__length1 = 0;
+						SANE_Word _tmp27_ = {0};
 						gdouble x = 0.0;
-						SANE_Option_Descriptor* _tmp29_ = NULL;
-						SANE_Word* _tmp30_ = NULL;
-						gint _tmp30__length1 = 0;
-						gint _tmp31_ = 0;
-						SANE_Word _tmp32_ = {0};
+						SANE_Option_Descriptor* _tmp28_ = NULL;
+						SANE_Word* _tmp29_ = NULL;
+						gint _tmp29__length1 = 0;
+						gint _tmp30_ = 0;
+						SANE_Word _tmp31_ = {0};
+						gdouble _tmp32_ = 0.0;
 						gdouble _tmp33_ = 0.0;
 						gdouble _tmp34_ = 0.0;
 						gdouble _tmp35_ = 0.0;
 						gdouble _tmp36_ = 0.0;
-						gdouble _tmp37_ = 0.0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp23_ = _tmp22_;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp23_) {
-#line 6024 "scanner.c"
-							gint _tmp24_ = 0;
+						if (!_tmp22_) {
+#line 5995 "scanner.c"
+							gint _tmp23_ = 0;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp24_ = i;
+							_tmp23_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp24_ + 1;
-#line 6030 "scanner.c"
+							i = _tmp23_ + 1;
+#line 6001 "scanner.c"
 						}
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp22_ = FALSE;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp25_ = i;
+						_tmp24_ = i;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp26_ = option;
+						_tmp25_ = option;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp27_ = _tmp26_->constraint.word_list;
+						_tmp26_ = _tmp25_->constraint.word_list;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp27__length1 = -1;
+						_tmp26__length1 = -1;
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp28_ = _tmp27_[0];
+						_tmp27_ = _tmp26_[0];
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp25_) < _tmp28_)) {
+						if (!(((SANE_Word) _tmp24_) < _tmp27_)) {
 #line 488 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6048 "scanner.c"
+#line 6019 "scanner.c"
 						}
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp29_ = option;
+						_tmp28_ = option;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp30_ = _tmp29_->constraint.word_list;
+						_tmp29_ = _tmp28_->constraint.word_list;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp30__length1 = -1;
+						_tmp29__length1 = -1;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp31_ = i;
+						_tmp30_ = i;
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp32_ = _tmp30_[_tmp31_ + 1];
+						_tmp31_ = _tmp29_[_tmp30_ + 1];
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp33_ = SANE_UNFIX ((SANE_Fixed) _tmp32_);
+						_tmp32_ = SANE_UNFIX ((SANE_Fixed) _tmp31_);
 #line 490 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						x = _tmp33_;
+						x = _tmp32_;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp34_ = x;
+						_tmp33_ = x;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp35_ = v;
+						_tmp34_ = v;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp36_ = fabs (_tmp34_ - _tmp35_);
+						_tmp35_ = fabs (_tmp33_ - _tmp34_);
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp37_ = distance;
+						_tmp36_ = distance;
 #line 491 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp36_ < _tmp37_) {
-#line 6074 "scanner.c"
+						if (_tmp35_ < _tmp36_) {
+#line 6045 "scanner.c"
+							gdouble _tmp37_ = 0.0;
 							gdouble _tmp38_ = 0.0;
 							gdouble _tmp39_ = 0.0;
 							gdouble _tmp40_ = 0.0;
-							gdouble _tmp41_ = 0.0;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp38_ = x;
+							_tmp37_ = x;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp39_ = v;
+							_tmp38_ = v;
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp40_ = fabs (_tmp38_ - _tmp39_);
+							_tmp39_ = fabs (_tmp37_ - _tmp38_);
 #line 493 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							distance = _tmp40_;
+							distance = _tmp39_;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp41_ = x;
+							_tmp40_ = x;
 #line 494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							nearest = _tmp41_;
-#line 6091 "scanner.c"
+							nearest = _tmp40_;
+#line 6062 "scanner.c"
 						}
 					}
 				}
 			}
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp42_ = nearest;
+			_tmp41_ = nearest;
 #line 497 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			v = _tmp42_;
-#line 6100 "scanner.c"
+			v = _tmp41_;
+#line 6071 "scanner.c"
 		}
 	}
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = v;
+	_tmp42_ = v;
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = SANE_FIX (_tmp43_);
+	_tmp43_ = SANE_FIX (_tmp42_);
 #line 500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	v_fixed = _tmp44_;
+	v_fixed = _tmp43_;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_ = handle;
+	_tmp44_ = handle;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp46_ = option_index;
+	_tmp45_ = option_index;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = sane_control_option (_tmp45_, _tmp46_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
+	_tmp46_ = sane_control_option (_tmp44_, _tmp45_, SANE_ACTION_SET_VALUE, &v_fixed, NULL);
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp47_;
+	status = _tmp46_;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = option_index;
+	_tmp47_ = option_index;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = value;
+	_tmp48_ = value;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = sane_status_to_string (status);
+	_tmp49_ = sane_status_to_string (status);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = _tmp50_;
+	_tmp50_ = _tmp49_;
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = SANE_UNFIX (v_fixed);
+	_tmp51_ = SANE_UNFIX (v_fixed);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:502: sane_control_option (%d, SANE_ACTION_SET_VALUE, %f) " \
-"-> (%s, %f)", (gint) _tmp48_, _tmp49_, _tmp51_, _tmp52_);
+"-> (%s, %f)", (gint) _tmp47_, _tmp48_, _tmp50_, _tmp51_);
 #line 502 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp51_);
+	_g_free0 (_tmp50_);
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = SANE_UNFIX (v_fixed);
+	_tmp52_ = SANE_UNFIX (v_fixed);
 #line 504 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp53_;
+	_vala_result = _tmp52_;
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 466 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6139 "scanner.c"
+#line 6110 "scanner.c"
 	}
 }
 
@@ -6159,7 +6130,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 	_tmp1_ = _tmp0_->type;
 #line 509 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_TYPE_FIXED) {
-#line 6158 "scanner.c"
+#line 6129 "scanner.c"
 		SANE_Handle _tmp2_ = {0};
 		SANE_Option_Descriptor* _tmp3_ = NULL;
 		SANE_Int _tmp4_ = {0};
@@ -6177,7 +6148,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		scanner_set_fixed_option (self, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
 #line 510 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_vala_result = _tmp6_;
-#line 6176 "scanner.c"
+#line 6147 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp7_ = NULL;
 		SANE_Value_Type _tmp8_ = 0;
@@ -6187,7 +6158,7 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 		_tmp8_ = _tmp7_->type;
 #line 511 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp8_ == SANE_TYPE_INT) {
-#line 6186 "scanner.c"
+#line 6157 "scanner.c"
 			gint r = 0;
 			SANE_Handle _tmp9_ = {0};
 			SANE_Option_Descriptor* _tmp10_ = NULL;
@@ -6214,20 +6185,20 @@ static void scanner_set_fixed_or_int_option (Scanner* self, SANE_Handle handle,
 			_tmp15_ = r;
 #line 515 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = (gdouble) _tmp15_;
-#line 6213 "scanner.c"
+#line 6184 "scanner.c"
 		} else {
 #line 519 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_vala_result = 0.0;
 #line 520 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:520: Unable to set unsupported option type");
-#line 6219 "scanner.c"
+#line 6190 "scanner.c"
 		}
 	}
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6226 "scanner.c"
+#line 6197 "scanner.c"
 	}
 }
 
@@ -6257,7 +6228,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 	if (_tmp1_ != SANE_CONSTRAINT_RANGE) {
 #line 527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 6256 "scanner.c"
+#line 6227 "scanner.c"
 	}
 #line 529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp2_ = handle;
@@ -6284,7 +6255,7 @@ static void scanner_set_option_to_max (Scanner* self, SANE_Handle handle, SANE_O
 "on.range.max) -> (%s)", (gint) _tmp7_, _tmp10_);
 #line 530 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp10_);
-#line 6282 "scanner.c"
+#line 6253 "scanner.c"
 }
 
 
@@ -6292,17 +6263,17 @@ static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
 	glong _tmp0_ = 0L;
 	gchar _tmp1_ = '\0';
-#line 965 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 996 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 966 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 6300 "scanner.c"
+#line 6271 "scanner.c"
 }
 
 
@@ -6319,24 +6290,24 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	gint s_length1 = 0;
 	gint _s_size_ = 0;
 	gint i = 0;
-	gchar* _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	gint _tmp24_ = 0;
-	gchar _tmp25_ = '\0';
+	gchar* _tmp21_ = NULL;
+	gint _tmp21__length1 = 0;
+	gint _tmp22_ = 0;
+	gchar _tmp23_ = '\0';
 	SANE_Status status = 0;
-	SANE_Handle _tmp26_ = {0};
-	SANE_Int _tmp27_ = {0};
+	SANE_Handle _tmp24_ = {0};
+	SANE_Int _tmp25_ = {0};
+	gchar* _tmp26_ = NULL;
+	gint _tmp26__length1 = 0;
+	SANE_Status _tmp27_ = 0;
 	gchar* _tmp28_ = NULL;
 	gint _tmp28__length1 = 0;
-	SANE_Status _tmp29_ = 0;
-	gchar* _tmp30_ = NULL;
-	gint _tmp30__length1 = 0;
-	gchar* _tmp31_ = NULL;
-	SANE_Int _tmp32_ = {0};
-	const gchar* _tmp33_ = NULL;
-	gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
+	gchar* _tmp29_ = NULL;
+	SANE_Int _tmp30_ = {0};
+	const gchar* _tmp31_ = NULL;
+	gchar* _tmp32_ = NULL;
+	gchar* _tmp33_ = NULL;
+	const gchar* _tmp34_ = NULL;
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
 #line 533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6369,141 +6340,135 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	_s_size_ = s_length1;
 #line 540 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	i = 0;
-#line 6367 "scanner.c"
+#line 6338 "scanner.c"
 	{
 		gboolean _tmp6_ = FALSE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = TRUE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		while (TRUE) {
-#line 6374 "scanner.c"
-			gboolean _tmp7_ = FALSE;
-			gboolean _tmp9_ = FALSE;
-			gint _tmp10_ = 0;
-			SANE_Option_Descriptor* _tmp11_ = NULL;
-			SANE_Int _tmp12_ = {0};
-			gboolean _tmp16_ = FALSE;
-			gchar* _tmp17_ = NULL;
-			gint _tmp17__length1 = 0;
+#line 6345 "scanner.c"
+			gboolean _tmp8_ = FALSE;
+			gint _tmp9_ = 0;
+			SANE_Option_Descriptor* _tmp10_ = NULL;
+			SANE_Int _tmp11_ = {0};
+			gchar* _tmp15_ = NULL;
+			gint _tmp15__length1 = 0;
+			gint _tmp16_ = 0;
+			const gchar* _tmp17_ = NULL;
 			gint _tmp18_ = 0;
-			const gchar* _tmp19_ = NULL;
-			gint _tmp20_ = 0;
-			gchar _tmp21_ = '\0';
-			gchar _tmp22_ = '\0';
+			gchar _tmp19_ = '\0';
+			gchar _tmp20_ = '\0';
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp7_ = _tmp6_;
+			if (!_tmp6_) {
+#line 6359 "scanner.c"
+				gint _tmp7_ = 0;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (!_tmp7_) {
-#line 6392 "scanner.c"
-				gint _tmp8_ = 0;
+				_tmp7_ = i;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp8_ = i;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				i = _tmp8_ + 1;
-#line 6398 "scanner.c"
+				i = _tmp7_ + 1;
+#line 6365 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = FALSE;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp10_ = i;
+			_tmp9_ = i;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp11_ = option;
+			_tmp10_ = option;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp12_ = _tmp11_->size;
+			_tmp11_ = _tmp10_->size;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (((SANE_Int) _tmp10_) < (_tmp12_ - 1)) {
-#line 6410 "scanner.c"
-				const gchar* _tmp13_ = NULL;
-				gint _tmp14_ = 0;
-				gchar _tmp15_ = '\0';
+			if (((SANE_Int) _tmp9_) < (_tmp11_ - 1)) {
+#line 6377 "scanner.c"
+				const gchar* _tmp12_ = NULL;
+				gint _tmp13_ = 0;
+				gchar _tmp14_ = '\0';
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp13_ = value;
+				_tmp12_ = value;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp14_ = i;
+				_tmp13_ = i;
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp15_ = string_get (_tmp13_, (glong) _tmp14_);
+				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp9_ = _tmp15_ != '\0';
-#line 6422 "scanner.c"
+				_tmp8_ = _tmp14_ != '\0';
+#line 6389 "scanner.c"
 			} else {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp9_ = FALSE;
-#line 6426 "scanner.c"
+				_tmp8_ = FALSE;
+#line 6393 "scanner.c"
 			}
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp16_ = _tmp9_;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (!_tmp16_) {
+			if (!_tmp8_) {
 #line 541 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 6434 "scanner.c"
+#line 6399 "scanner.c"
 			}
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp17_ = s;
+			_tmp15_ = s;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp17__length1 = s_length1;
+			_tmp15__length1 = s_length1;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp18_ = i;
+			_tmp16_ = i;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp19_ = value;
+			_tmp17_ = value;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp20_ = i;
+			_tmp18_ = i;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
+			_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp17_[_tmp18_] = _tmp21_;
+			_tmp15_[_tmp16_] = _tmp19_;
 #line 542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp22_ = _tmp17_[_tmp18_];
-#line 6452 "scanner.c"
+			_tmp20_ = _tmp15_[_tmp16_];
+#line 6417 "scanner.c"
 		}
 	}
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_ = s;
+	_tmp21_ = s;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23__length1 = s_length1;
+	_tmp21__length1 = s_length1;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp24_ = i;
+	_tmp22_ = i;
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_[_tmp24_] = '\0';
+	_tmp21_[_tmp22_] = '\0';
 #line 543 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = _tmp23_[_tmp24_];
+	_tmp23_ = _tmp21_[_tmp22_];
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = handle;
+	_tmp24_ = handle;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = option_index;
+	_tmp25_ = option_index;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = s;
+	_tmp26_ = s;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28__length1 = s_length1;
+	_tmp26__length1 = s_length1;
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = sane_control_option (_tmp26_, _tmp27_, SANE_ACTION_SET_VALUE, _tmp28_, NULL);
+	_tmp27_ = sane_control_option (_tmp24_, _tmp25_, SANE_ACTION_SET_VALUE, _tmp26_, NULL);
 #line 544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp29_;
+	status = _tmp27_;
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = s;
+	_tmp28_ = s;
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30__length1 = s_length1;
+	_tmp28__length1 = s_length1;
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_ = g_strdup ((const gchar*) _tmp30_);
+	_tmp29_ = g_strdup ((const gchar*) _tmp28_);
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
 #line 545 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp31_;
+	_vala_result = _tmp29_;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp32_ = option_index;
+	_tmp30_ = option_index;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_ = value;
+	_tmp31_ = value;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_ = sane_status_to_string (status);
+	_tmp32_ = sane_status_to_string (status);
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp35_ = _tmp34_;
+	_tmp33_ = _tmp32_;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = _vala_result;
+	_tmp34_ = _vala_result;
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:546: sane_control_option (%d, SANE_ACTION_SET_VALUE, \"%s" \
-"\") -> (%s, \"%s\")", (gint) _tmp32_, _tmp33_, _tmp35_, _tmp36_);
+"\") -> (%s, \"%s\")", (gint) _tmp30_, _tmp31_, _tmp33_, _tmp34_);
 #line 546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp35_);
+	_g_free0 (_tmp33_);
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = status == SANE_STATUS_GOOD;
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6512,15 +6477,15 @@ static gboolean scanner_set_string_option (Scanner* self, SANE_Handle handle, SA
 	if (_result_) {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6509 "scanner.c"
+#line 6474 "scanner.c"
 	} else {
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6513 "scanner.c"
+#line 6478 "scanner.c"
 	}
 #line 548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6517 "scanner.c"
+#line 6482 "scanner.c"
 }
 
 
@@ -6531,7 +6496,7 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	SANE_Value_Type _tmp1_ = 0;
 	SANE_Option_Descriptor* _tmp2_ = NULL;
 	SANE_Constraint_Type _tmp3_ = 0;
-	gchar* _tmp36_ = NULL;
+	gchar* _tmp34_ = NULL;
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
 #line 551 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6548,221 +6513,215 @@ static gboolean scanner_set_constrained_string_option (Scanner* self, SANE_Handl
 	_tmp3_ = _tmp2_->constraint_type;
 #line 554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (_tmp3_ == SANE_CONSTRAINT_STRING_LIST, FALSE);
-#line 6545 "scanner.c"
+#line 6510 "scanner.c"
 	{
 		gint i = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 6550 "scanner.c"
+#line 6515 "scanner.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp4_ = TRUE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 6557 "scanner.c"
-				gboolean _tmp5_ = FALSE;
-				gchar** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				gint _tmp8_ = 0;
-				const gchar* _tmp9_ = NULL;
+#line 6522 "scanner.c"
+				gchar** _tmp6_ = NULL;
+				gint _tmp6__length1 = 0;
+				gint _tmp7_ = 0;
+				const gchar* _tmp8_ = NULL;
 				gint j = 0;
-				SANE_Option_Descriptor* _tmp24_ = NULL;
-				gchar** _tmp25_ = NULL;
-				gint _tmp25__length1 = 0;
-				gint _tmp26_ = 0;
-				const gchar* _tmp27_ = NULL;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp5_ = _tmp4_;
+				SANE_Option_Descriptor* _tmp22_ = NULL;
+				gchar** _tmp23_ = NULL;
+				gint _tmp23__length1 = 0;
+				gint _tmp24_ = 0;
+				const gchar* _tmp25_ = NULL;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp5_) {
-#line 6573 "scanner.c"
-					gint _tmp6_ = 0;
+				if (!_tmp4_) {
+#line 6535 "scanner.c"
+					gint _tmp5_ = 0;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp6_ = i;
+					_tmp5_ = i;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp6_ + 1;
-#line 6579 "scanner.c"
+					i = _tmp5_ + 1;
+#line 6541 "scanner.c"
 				}
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp4_ = FALSE;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp7_ = values;
+				_tmp6_ = values;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp7__length1 = values_length1;
+				_tmp6__length1 = values_length1;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp8_ = i;
+				_tmp7_ = i;
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp9_ = _tmp7_[_tmp8_];
+				_tmp8_ = _tmp6_[_tmp7_];
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!(_tmp9_ != NULL)) {
+				if (!(_tmp8_ != NULL)) {
 #line 556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 6595 "scanner.c"
+#line 6557 "scanner.c"
 				}
 #line 558 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				j = 0;
-#line 6599 "scanner.c"
+#line 6561 "scanner.c"
 				{
-					gboolean _tmp10_ = FALSE;
+					gboolean _tmp9_ = FALSE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp10_ = TRUE;
+					_tmp9_ = TRUE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 6606 "scanner.c"
-						gboolean _tmp11_ = FALSE;
-						SANE_Option_Descriptor* _tmp13_ = NULL;
-						gchar** _tmp14_ = NULL;
-						gint _tmp14__length1 = 0;
-						gint _tmp15_ = 0;
-						const gchar* _tmp16_ = NULL;
-						gchar** _tmp17_ = NULL;
-						gint _tmp17__length1 = 0;
-						gint _tmp18_ = 0;
-						const gchar* _tmp19_ = NULL;
-						SANE_Option_Descriptor* _tmp20_ = NULL;
-						gchar** _tmp21_ = NULL;
-						gint _tmp21__length1 = 0;
-						gint _tmp22_ = 0;
-						const gchar* _tmp23_ = NULL;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp11_ = _tmp10_;
+#line 6568 "scanner.c"
+						SANE_Option_Descriptor* _tmp11_ = NULL;
+						gchar** _tmp12_ = NULL;
+						gint _tmp12__length1 = 0;
+						gint _tmp13_ = 0;
+						const gchar* _tmp14_ = NULL;
+						gchar** _tmp15_ = NULL;
+						gint _tmp15__length1 = 0;
+						gint _tmp16_ = 0;
+						const gchar* _tmp17_ = NULL;
+						SANE_Option_Descriptor* _tmp18_ = NULL;
+						gchar** _tmp19_ = NULL;
+						gint _tmp19__length1 = 0;
+						gint _tmp20_ = 0;
+						const gchar* _tmp21_ = NULL;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp11_) {
-#line 6626 "scanner.c"
-							gint _tmp12_ = 0;
+						if (!_tmp9_) {
+#line 6585 "scanner.c"
+							gint _tmp10_ = 0;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp12_ = j;
+							_tmp10_ = j;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							j = _tmp12_ + 1;
-#line 6632 "scanner.c"
+							j = _tmp10_ + 1;
+#line 6591 "scanner.c"
 						}
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp10_ = FALSE;
+						_tmp9_ = FALSE;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp13_ = option;
+						_tmp11_ = option;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp14_ = _tmp13_->constraint.string_list;
+						_tmp12_ = _tmp11_->constraint.string_list;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp14__length1 = -1;
+						_tmp12__length1 = -1;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp15_ = j;
+						_tmp13_ = j;
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp16_ = _tmp14_[_tmp15_];
+						_tmp14_ = _tmp12_[_tmp13_];
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(_tmp16_ != NULL)) {
+						if (!(_tmp14_ != NULL)) {
 #line 559 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6650 "scanner.c"
+#line 6609 "scanner.c"
 						}
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp17_ = values;
+						_tmp15_ = values;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp17__length1 = values_length1;
+						_tmp15__length1 = values_length1;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp18_ = i;
+						_tmp16_ = i;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp19_ = _tmp17_[_tmp18_];
+						_tmp17_ = _tmp15_[_tmp16_];
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp20_ = option;
+						_tmp18_ = option;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp21_ = _tmp20_->constraint.string_list;
+						_tmp19_ = _tmp18_->constraint.string_list;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp21__length1 = -1;
+						_tmp19__length1 = -1;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp22_ = j;
+						_tmp20_ = j;
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp23_ = _tmp21_[_tmp22_];
+						_tmp21_ = _tmp19_[_tmp20_];
 #line 561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (g_strcmp0 (_tmp19_, _tmp23_) == 0) {
+						if (g_strcmp0 (_tmp17_, _tmp21_) == 0) {
 #line 562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 6674 "scanner.c"
+#line 6633 "scanner.c"
 						}
 					}
 				}
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp24_ = option;
+				_tmp22_ = option;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp25_ = _tmp24_->constraint.string_list;
+				_tmp23_ = _tmp22_->constraint.string_list;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp25__length1 = -1;
+				_tmp23__length1 = -1;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp26_ = j;
+				_tmp24_ = j;
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp27_ = _tmp25_[_tmp26_];
+				_tmp25_ = _tmp23_[_tmp24_];
 #line 565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp27_ != NULL) {
-#line 6690 "scanner.c"
-					SANE_Handle _tmp28_ = {0};
-					SANE_Option_Descriptor* _tmp29_ = NULL;
-					SANE_Int _tmp30_ = {0};
-					gchar** _tmp31_ = NULL;
-					gint _tmp31__length1 = 0;
-					gint _tmp32_ = 0;
-					const gchar* _tmp33_ = NULL;
-					gchar* _tmp34_ = NULL;
-					gboolean _tmp35_ = FALSE;
+				if (_tmp25_ != NULL) {
+#line 6649 "scanner.c"
+					SANE_Handle _tmp26_ = {0};
+					SANE_Option_Descriptor* _tmp27_ = NULL;
+					SANE_Int _tmp28_ = {0};
+					gchar** _tmp29_ = NULL;
+					gint _tmp29__length1 = 0;
+					gint _tmp30_ = 0;
+					const gchar* _tmp31_ = NULL;
+					gchar* _tmp32_ = NULL;
+					gboolean _tmp33_ = FALSE;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp28_ = handle;
+					_tmp26_ = handle;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp29_ = option;
+					_tmp27_ = option;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp30_ = option_index;
+					_tmp28_ = option_index;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp31_ = values;
+					_tmp29_ = values;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp31__length1 = values_length1;
+					_tmp29__length1 = values_length1;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp32_ = i;
+					_tmp30_ = i;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp33_ = _tmp31_[_tmp32_];
+					_tmp31_ = _tmp29_[_tmp30_];
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp35_ = scanner_set_string_option (self, _tmp28_, _tmp29_, _tmp30_, _tmp33_, &_tmp34_);
+					_tmp33_ = scanner_set_string_option (self, _tmp26_, _tmp27_, _tmp28_, _tmp31_, &_tmp32_);
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_g_free0 (_vala_result);
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_vala_result = _tmp34_;
+					_vala_result = _tmp32_;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					result = _tmp35_;
+					result = _tmp33_;
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (_result_) {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						*_result_ = _vala_result;
-#line 6726 "scanner.c"
+#line 6685 "scanner.c"
 					} else {
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (_vala_result);
-#line 6730 "scanner.c"
+#line 6689 "scanner.c"
 					}
 #line 566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 6734 "scanner.c"
+#line 6693 "scanner.c"
 				}
 			}
 		}
 	}
 #line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = g_strdup ("");
+	_tmp34_ = g_strdup ("");
 #line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_vala_result);
 #line 569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_vala_result = _tmp36_;
+	_vala_result = _tmp34_;
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = FALSE;
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_result_) {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*_result_ = _vala_result;
-#line 6751 "scanner.c"
+#line 6710 "scanner.c"
 	} else {
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_vala_result);
-#line 6755 "scanner.c"
+#line 6714 "scanner.c"
 	}
 #line 570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 6759 "scanner.c"
+#line 6718 "scanner.c"
 }
 
 
@@ -6787,12 +6746,12 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	SANE_Option_Descriptor* _tmp64_ = NULL;
 	SANE_Constraint_Type _tmp65_ = 0;
 	SANE_Int cap = {0};
-	SANE_Option_Descriptor* _tmp151_ = NULL;
-	SANE_Int _tmp152_ = {0};
-	SANE_Int _tmp153_ = {0};
+	SANE_Option_Descriptor* _tmp149_ = NULL;
+	SANE_Int _tmp150_ = {0};
+	SANE_Int _tmp151_ = {0};
+	const gchar* _tmp212_ = NULL;
+	SANE_Option_Descriptor* _tmp213_ = NULL;
 	const gchar* _tmp214_ = NULL;
-	SANE_Option_Descriptor* _tmp215_ = NULL;
-	const gchar* _tmp216_ = NULL;
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -6809,7 +6768,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp3_ = _tmp2_->name;
 #line 577 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp3_, "") != 0) {
-#line 6806 "scanner.c"
+#line 6765 "scanner.c"
 		const gchar* _tmp4_ = NULL;
 		SANE_Option_Descriptor* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -6834,7 +6793,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp9_;
 #line 578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp8_);
-#line 6831 "scanner.c"
+#line 6790 "scanner.c"
 	}
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = option;
@@ -6842,7 +6801,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	_tmp11_ = _tmp10_->title;
 #line 580 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (g_strcmp0 (_tmp11_, "") != 0) {
-#line 6839 "scanner.c"
+#line 6798 "scanner.c"
 		const gchar* _tmp12_ = NULL;
 		SANE_Option_Descriptor* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -6867,7 +6826,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 		s = _tmp17_;
 #line 581 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (_tmp16_);
-#line 6864 "scanner.c"
+#line 6823 "scanner.c"
 	}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp18_ = option;
@@ -6877,7 +6836,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp19_) {
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BOOL:
-#line 6874 "scanner.c"
+#line 6833 "scanner.c"
 		{
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
@@ -6891,11 +6850,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp21_;
 #line 587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6888 "scanner.c"
+#line 6847 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_INT:
-#line 6892 "scanner.c"
+#line 6851 "scanner.c"
 		{
 			const gchar* _tmp22_ = NULL;
 			gchar* _tmp23_ = NULL;
@@ -6909,11 +6868,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp23_;
 #line 590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6906 "scanner.c"
+#line 6865 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_FIXED:
-#line 6910 "scanner.c"
+#line 6869 "scanner.c"
 		{
 			const gchar* _tmp24_ = NULL;
 			gchar* _tmp25_ = NULL;
@@ -6927,11 +6886,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp25_;
 #line 593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6924 "scanner.c"
+#line 6883 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_STRING:
-#line 6928 "scanner.c"
+#line 6887 "scanner.c"
 		{
 			const gchar* _tmp26_ = NULL;
 			gchar* _tmp27_ = NULL;
@@ -6945,11 +6904,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp27_;
 #line 596 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6942 "scanner.c"
+#line 6901 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_BUTTON:
-#line 6946 "scanner.c"
+#line 6905 "scanner.c"
 		{
 			const gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
@@ -6963,11 +6922,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp29_;
 #line 599 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6960 "scanner.c"
+#line 6919 "scanner.c"
 		}
 #line 583 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_TYPE_GROUP:
-#line 6964 "scanner.c"
+#line 6923 "scanner.c"
 		{
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
@@ -6981,7 +6940,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp31_;
 #line 602 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 6978 "scanner.c"
+#line 6937 "scanner.c"
 		}
 		default:
 		{
@@ -7011,7 +6970,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp36_);
 #line 605 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7008 "scanner.c"
+#line 6967 "scanner.c"
 		}
 	}
 #line 608 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7040,15 +6999,15 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp45_) {
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_NONE:
-#line 7037 "scanner.c"
+#line 6996 "scanner.c"
 		{
 #line 613 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7041 "scanner.c"
+#line 7000 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PIXEL:
-#line 7045 "scanner.c"
+#line 7004 "scanner.c"
 		{
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
@@ -7062,11 +7021,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp47_;
 #line 616 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7059 "scanner.c"
+#line 7018 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_BIT:
-#line 7063 "scanner.c"
+#line 7022 "scanner.c"
 		{
 			const gchar* _tmp48_ = NULL;
 			gchar* _tmp49_ = NULL;
@@ -7080,11 +7039,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp49_;
 #line 619 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7077 "scanner.c"
+#line 7036 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MM:
-#line 7081 "scanner.c"
+#line 7040 "scanner.c"
 		{
 			const gchar* _tmp50_ = NULL;
 			gchar* _tmp51_ = NULL;
@@ -7098,11 +7057,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp51_;
 #line 622 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7095 "scanner.c"
+#line 7054 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_DPI:
-#line 7099 "scanner.c"
+#line 7058 "scanner.c"
 		{
 			const gchar* _tmp52_ = NULL;
 			gchar* _tmp53_ = NULL;
@@ -7116,11 +7075,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp53_;
 #line 625 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7113 "scanner.c"
+#line 7072 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_PERCENT:
-#line 7117 "scanner.c"
+#line 7076 "scanner.c"
 		{
 			const gchar* _tmp54_ = NULL;
 			gchar* _tmp55_ = NULL;
@@ -7134,11 +7093,11 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp55_;
 #line 628 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7131 "scanner.c"
+#line 7090 "scanner.c"
 		}
 #line 610 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_UNIT_MICROSECOND:
-#line 7135 "scanner.c"
+#line 7094 "scanner.c"
 		{
 			const gchar* _tmp56_ = NULL;
 			gchar* _tmp57_ = NULL;
@@ -7152,7 +7111,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			s = _tmp57_;
 #line 631 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7149 "scanner.c"
+#line 7108 "scanner.c"
 		}
 		default:
 		{
@@ -7182,7 +7141,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (_tmp62_);
 #line 634 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7179 "scanner.c"
+#line 7138 "scanner.c"
 		}
 	}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7193,7 +7152,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 	switch (_tmp65_) {
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_RANGE:
-#line 7190 "scanner.c"
+#line 7149 "scanner.c"
 		{
 			SANE_Option_Descriptor* _tmp66_ = NULL;
 			SANE_Value_Type _tmp67_ = 0;
@@ -7203,7 +7162,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_tmp67_ = _tmp66_->type;
 #line 640 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp67_ == SANE_TYPE_FIXED) {
-#line 7200 "scanner.c"
+#line 7159 "scanner.c"
 				const gchar* _tmp68_ = NULL;
 				SANE_Option_Descriptor* _tmp69_ = NULL;
 				SANE_Range* _tmp70_ = NULL;
@@ -7255,7 +7214,7 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp82_;
 #line 641 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp81_);
-#line 7252 "scanner.c"
+#line 7211 "scanner.c"
 			} else {
 				const gchar* _tmp83_ = NULL;
 				SANE_Option_Descriptor* _tmp84_ = NULL;
@@ -7302,20 +7261,20 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 				s = _tmp95_;
 #line 643 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (_tmp94_);
-#line 7299 "scanner.c"
+#line 7258 "scanner.c"
 			}
 #line 644 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7303 "scanner.c"
+#line 7262 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_WORD_LIST:
-#line 7307 "scanner.c"
+#line 7266 "scanner.c"
 		{
 			const gchar* _tmp96_ = NULL;
 			gchar* _tmp97_ = NULL;
-			const gchar* _tmp127_ = NULL;
-			gchar* _tmp128_ = NULL;
+			const gchar* _tmp126_ = NULL;
+			gchar* _tmp127_ = NULL;
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp96_ = s;
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -7324,689 +7283,683 @@ static void scanner_log_option (Scanner* self, SANE_Int index, SANE_Option_Descr
 			_g_free0 (s);
 #line 646 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			s = _tmp97_;
-#line 7321 "scanner.c"
+#line 7280 "scanner.c"
 			{
 				gint i = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7326 "scanner.c"
+#line 7285 "scanner.c"
 				{
 					gboolean _tmp98_ = FALSE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					_tmp98_ = TRUE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7333 "scanner.c"
-						gboolean _tmp99_ = FALSE;
-						gint _tmp101_ = 0;
-						SANE_Option_Descriptor* _tmp102_ = NULL;
-						SANE_Word* _tmp103_ = NULL;
-						gint _tmp103__length1 = 0;
-						SANE_Word _tmp104_ = {0};
-						gint _tmp105_ = 0;
-						SANE_Option_Descriptor* _tmp108_ = NULL;
-						SANE_Value_Type _tmp109_ = 0;
-#line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp99_ = _tmp98_;
+#line 7292 "scanner.c"
+						gint _tmp100_ = 0;
+						SANE_Option_Descriptor* _tmp101_ = NULL;
+						SANE_Word* _tmp102_ = NULL;
+						gint _tmp102__length1 = 0;
+						SANE_Word _tmp103_ = {0};
+						gint _tmp104_ = 0;
+						SANE_Option_Descriptor* _tmp107_ = NULL;
+						SANE_Value_Type _tmp108_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp99_) {
-#line 7347 "scanner.c"
-							gint _tmp100_ = 0;
+						if (!_tmp98_) {
+#line 7303 "scanner.c"
+							gint _tmp99_ = 0;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp100_ = i;
+							_tmp99_ = i;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp100_ + 1;
-#line 7353 "scanner.c"
+							i = _tmp99_ + 1;
+#line 7309 "scanner.c"
 						}
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_tmp98_ = FALSE;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp101_ = i;
+						_tmp100_ = i;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp102_ = option;
+						_tmp101_ = option;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp103_ = _tmp102_->constraint.word_list;
+						_tmp102_ = _tmp101_->constraint.word_list;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp103__length1 = -1;
+						_tmp102__length1 = -1;
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp104_ = _tmp103_[0];
+						_tmp103_ = _tmp102_[0];
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(((SANE_Word) _tmp101_) < _tmp104_)) {
+						if (!(((SANE_Word) _tmp100_) < _tmp103_)) {
 #line 647 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7371 "scanner.c"
+#line 7327 "scanner.c"
 						}
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp105_ = i;
+						_tmp104_ = i;
 #line 649 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp105_ != 0) {
-#line 7377 "scanner.c"
-							const gchar* _tmp106_ = NULL;
-							gchar* _tmp107_ = NULL;
+						if (_tmp104_ != 0) {
+#line 7333 "scanner.c"
+							const gchar* _tmp105_ = NULL;
+							gchar* _tmp106_ = NULL;
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp106_ = s;
+							_tmp105_ = s;
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp107_ = g_strconcat (_tmp106_, ", ", NULL);
+							_tmp106_ = g_strconcat (_tmp105_, ", ", NULL);
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
 #line 650 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							s = _tmp107_;
-#line 7388 "scanner.c"
+							s = _tmp106_;
+#line 7344 "scanner.c"
 						}
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp108_ = option;
+						_tmp107_ = option;
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp109_ = _tmp108_->type;
+						_tmp108_ = _tmp107_->type;
 #line 651 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp109_ == SANE_TYPE_INT) {
-#line 7396 "scanner.c"
-							const gchar* _tmp110_ = NULL;
-							SANE_Option_Descriptor* _tmp111_ = NULL;
-							SANE_Word* _tmp112_ = NULL;
-							gint _tmp112__length1 = 0;
-							gint _tmp113_ = 0;
-							SANE_Word _tmp114_ = {0};
+						if (_tmp108_ == SANE_TYPE_INT) {
+#line 7352 "scanner.c"
+							const gchar* _tmp109_ = NULL;
+							SANE_Option_Descriptor* _tmp110_ = NULL;
+							SANE_Word* _tmp111_ = NULL;
+							gint _tmp111__length1 = 0;
+							gint _tmp112_ = 0;
+							SANE_Word _tmp113_ = {0};
+							gchar* _tmp114_ = NULL;
 							gchar* _tmp115_ = NULL;
 							gchar* _tmp116_ = NULL;
-							gchar* _tmp117_ = NULL;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp110_ = s;
+							_tmp109_ = s;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp111_ = option;
+							_tmp110_ = option;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp112_ = _tmp111_->constraint.word_list;
+							_tmp111_ = _tmp110_->constraint.word_list;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp112__length1 = -1;
+							_tmp111__length1 = -1;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp113_ = i;
+							_tmp112_ = i;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp114_ = _tmp112_[_tmp113_ + 1];
+							_tmp113_ = _tmp111_[_tmp112_ + 1];
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp115_ = g_strdup_printf ("%d", (gint) _tmp114_);
+							_tmp114_ = g_strdup_printf ("%d", (gint) _tmp113_);
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp116_ = _tmp115_;
+							_tmp115_ = _tmp114_;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp117_ = g_strconcat (_tmp110_, _tmp116_, NULL);
+							_tmp116_ = g_strconcat (_tmp109_, _tmp115_, NULL);
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							s = _tmp117_;
+							s = _tmp116_;
 #line 652 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_g_free0 (_tmp116_);
-#line 7430 "scanner.c"
+							_g_free0 (_tmp115_);
+#line 7386 "scanner.c"
 						} else {
-							const gchar* _tmp118_ = NULL;
-							SANE_Option_Descriptor* _tmp119_ = NULL;
-							SANE_Word* _tmp120_ = NULL;
-							gint _tmp120__length1 = 0;
-							gint _tmp121_ = 0;
-							SANE_Word _tmp122_ = {0};
-							gdouble _tmp123_ = 0.0;
+							const gchar* _tmp117_ = NULL;
+							SANE_Option_Descriptor* _tmp118_ = NULL;
+							SANE_Word* _tmp119_ = NULL;
+							gint _tmp119__length1 = 0;
+							gint _tmp120_ = 0;
+							SANE_Word _tmp121_ = {0};
+							gdouble _tmp122_ = 0.0;
+							gchar* _tmp123_ = NULL;
 							gchar* _tmp124_ = NULL;
 							gchar* _tmp125_ = NULL;
-							gchar* _tmp126_ = NULL;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp118_ = s;
+							_tmp117_ = s;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp119_ = option;
+							_tmp118_ = option;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp120_ = _tmp119_->constraint.word_list;
+							_tmp119_ = _tmp118_->constraint.word_list;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp120__length1 = -1;
+							_tmp119__length1 = -1;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp121_ = i;
+							_tmp120_ = i;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp122_ = _tmp120_[_tmp121_ + 1];
+							_tmp121_ = _tmp119_[_tmp120_ + 1];
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp123_ = SANE_UNFIX ((SANE_Fixed) _tmp122_);
+							_tmp122_ = SANE_UNFIX ((SANE_Fixed) _tmp121_);
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp124_ = g_strdup_printf ("%f", _tmp123_);
+							_tmp123_ = g_strdup_printf ("%f", _tmp122_);
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp125_ = _tmp124_;
+							_tmp124_ = _tmp123_;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp126_ = g_strconcat (_tmp118_, _tmp125_, NULL);
+							_tmp125_ = g_strconcat (_tmp117_, _tmp124_, NULL);
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							s = _tmp126_;
+							s = _tmp125_;
 #line 654 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_g_free0 (_tmp125_);
-#line 7468 "scanner.c"
+							_g_free0 (_tmp124_);
+#line 7424 "scanner.c"
 						}
 					}
 				}
 			}
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp127_ = s;
+			_tmp126_ = s;
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp128_ = g_strconcat (_tmp127_, "]", NULL);
+			_tmp127_ = g_strconcat (_tmp126_, "]", NULL);
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 656 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp128_;
+			s = _tmp127_;
 #line 657 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7483 "scanner.c"
+#line 7439 "scanner.c"
 		}
 #line 637 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SANE_CONSTRAINT_STRING_LIST:
-#line 7487 "scanner.c"
+#line 7443 "scanner.c"
 		{
-			const gchar* _tmp129_ = NULL;
-			gchar* _tmp130_ = NULL;
-			const gchar* _tmp149_ = NULL;
-			gchar* _tmp150_ = NULL;
+			const gchar* _tmp128_ = NULL;
+			gchar* _tmp129_ = NULL;
+			const gchar* _tmp147_ = NULL;
+			gchar* _tmp148_ = NULL;
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp129_ = s;
+			_tmp128_ = s;
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp130_ = g_strconcat (_tmp129_, " values=[", NULL);
+			_tmp129_ = g_strconcat (_tmp128_, " values=[", NULL);
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 659 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp130_;
-#line 7501 "scanner.c"
+			s = _tmp129_;
+#line 7457 "scanner.c"
 			{
 				gint i = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 7506 "scanner.c"
+#line 7462 "scanner.c"
 				{
-					gboolean _tmp131_ = FALSE;
+					gboolean _tmp130_ = FALSE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp131_ = TRUE;
+					_tmp130_ = TRUE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 7513 "scanner.c"
-						gboolean _tmp132_ = FALSE;
-						SANE_Option_Descriptor* _tmp134_ = NULL;
-						gchar** _tmp135_ = NULL;
-						gint _tmp135__length1 = 0;
+#line 7469 "scanner.c"
+						SANE_Option_Descriptor* _tmp132_ = NULL;
+						gchar** _tmp133_ = NULL;
+						gint _tmp133__length1 = 0;
+						gint _tmp134_ = 0;
+						const gchar* _tmp135_ = NULL;
 						gint _tmp136_ = 0;
-						const gchar* _tmp137_ = NULL;
-						gint _tmp138_ = 0;
-						const gchar* _tmp141_ = NULL;
-						SANE_Option_Descriptor* _tmp142_ = NULL;
-						gchar** _tmp143_ = NULL;
-						gint _tmp143__length1 = 0;
-						gint _tmp144_ = 0;
-						const gchar* _tmp145_ = NULL;
+						const gchar* _tmp139_ = NULL;
+						SANE_Option_Descriptor* _tmp140_ = NULL;
+						gchar** _tmp141_ = NULL;
+						gint _tmp141__length1 = 0;
+						gint _tmp142_ = 0;
+						const gchar* _tmp143_ = NULL;
+						gchar* _tmp144_ = NULL;
+						gchar* _tmp145_ = NULL;
 						gchar* _tmp146_ = NULL;
-						gchar* _tmp147_ = NULL;
-						gchar* _tmp148_ = NULL;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp132_ = _tmp131_;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp132_) {
-#line 7534 "scanner.c"
-							gint _tmp133_ = 0;
+						if (!_tmp130_) {
+#line 7487 "scanner.c"
+							gint _tmp131_ = 0;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp133_ = i;
+							_tmp131_ = i;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp133_ + 1;
-#line 7540 "scanner.c"
+							i = _tmp131_ + 1;
+#line 7493 "scanner.c"
 						}
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp131_ = FALSE;
+						_tmp130_ = FALSE;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp134_ = option;
+						_tmp132_ = option;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp135_ = _tmp134_->constraint.string_list;
+						_tmp133_ = _tmp132_->constraint.string_list;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp135__length1 = -1;
+						_tmp133__length1 = -1;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp136_ = i;
+						_tmp134_ = i;
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp137_ = _tmp135_[_tmp136_];
+						_tmp135_ = _tmp133_[_tmp134_];
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(_tmp137_ != NULL)) {
+						if (!(_tmp135_ != NULL)) {
 #line 660 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 7558 "scanner.c"
+#line 7511 "scanner.c"
 						}
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp138_ = i;
+						_tmp136_ = i;
 #line 662 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp138_ != 0) {
-#line 7564 "scanner.c"
-							const gchar* _tmp139_ = NULL;
-							gchar* _tmp140_ = NULL;
+						if (_tmp136_ != 0) {
+#line 7517 "scanner.c"
+							const gchar* _tmp137_ = NULL;
+							gchar* _tmp138_ = NULL;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp139_ = s;
+							_tmp137_ = s;
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp140_ = g_strconcat (_tmp139_, ", ", NULL);
+							_tmp138_ = g_strconcat (_tmp137_, ", ", NULL);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							_g_free0 (s);
 #line 663 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							s = _tmp140_;
-#line 7575 "scanner.c"
+							s = _tmp138_;
+#line 7528 "scanner.c"
 						}
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp141_ = s;
+						_tmp139_ = s;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp142_ = option;
+						_tmp140_ = option;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp143_ = _tmp142_->constraint.string_list;
+						_tmp141_ = _tmp140_->constraint.string_list;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp143__length1 = -1;
+						_tmp141__length1 = -1;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp144_ = i;
+						_tmp142_ = i;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp145_ = _tmp143_[_tmp144_];
+						_tmp143_ = _tmp141_[_tmp142_];
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp146_ = g_strdup_printf ("\"%s\"", _tmp145_);
+						_tmp144_ = g_strdup_printf ("\"%s\"", _tmp143_);
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp147_ = _tmp146_;
+						_tmp145_ = _tmp144_;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp148_ = g_strconcat (_tmp141_, _tmp147_, NULL);
+						_tmp146_ = g_strconcat (_tmp139_, _tmp145_, NULL);
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						_g_free0 (s);
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						s = _tmp148_;
+						s = _tmp146_;
 #line 664 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_g_free0 (_tmp147_);
-#line 7601 "scanner.c"
+						_g_free0 (_tmp145_);
+#line 7554 "scanner.c"
 					}
 				}
 			}
 #line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp149_ = s;
+			_tmp147_ = s;
 #line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp150_ = g_strconcat (_tmp149_, "]", NULL);
+			_tmp148_ = g_strconcat (_tmp147_, "]", NULL);
 #line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 666 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp150_;
+			s = _tmp148_;
 #line 667 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7615 "scanner.c"
+#line 7568 "scanner.c"
 		}
 		default:
 		{
 #line 669 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 7621 "scanner.c"
+#line 7574 "scanner.c"
 		}
 	}
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp151_ = option;
+	_tmp149_ = option;
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp152_ = _tmp151_->cap;
+	_tmp150_ = _tmp149_->cap;
 #line 672 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	cap = _tmp152_;
+	cap = _tmp150_;
 #line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp153_ = cap;
+	_tmp151_ = cap;
 #line 673 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp153_ != ((SANE_Int) 0)) {
-#line 7634 "scanner.c"
-		const gchar* _tmp154_ = NULL;
-		gchar* _tmp155_ = NULL;
-		SANE_Int _tmp156_ = {0};
-		SANE_Int _tmp163_ = {0};
-		SANE_Int _tmp170_ = {0};
-		SANE_Int _tmp177_ = {0};
-		SANE_Int _tmp184_ = {0};
-		SANE_Int _tmp191_ = {0};
-		SANE_Int _tmp198_ = {0};
-		SANE_Int _tmp205_ = {0};
+	if (_tmp151_ != ((SANE_Int) 0)) {
+#line 7587 "scanner.c"
+		const gchar* _tmp152_ = NULL;
+		gchar* _tmp153_ = NULL;
+		SANE_Int _tmp154_ = {0};
+		SANE_Int _tmp161_ = {0};
+		SANE_Int _tmp168_ = {0};
+		SANE_Int _tmp175_ = {0};
+		SANE_Int _tmp182_ = {0};
+		SANE_Int _tmp189_ = {0};
+		SANE_Int _tmp196_ = {0};
+		SANE_Int _tmp203_ = {0};
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp154_ = s;
+		_tmp152_ = s;
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp155_ = g_strconcat (_tmp154_, " cap=", NULL);
+		_tmp153_ = g_strconcat (_tmp152_, " cap=", NULL);
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_free0 (s);
 #line 675 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		s = _tmp155_;
+		s = _tmp153_;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp156_ = cap;
+		_tmp154_ = cap;
 #line 676 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp156_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
-#line 7657 "scanner.c"
-			const gchar* _tmp157_ = NULL;
-			const gchar* _tmp160_ = NULL;
-			gchar* _tmp161_ = NULL;
-			SANE_Int _tmp162_ = {0};
+		if ((_tmp154_ & SANE_CAP_SOFT_SELECT) != ((SANE_Int) 0)) {
+#line 7610 "scanner.c"
+			const gchar* _tmp155_ = NULL;
+			const gchar* _tmp158_ = NULL;
+			gchar* _tmp159_ = NULL;
+			SANE_Int _tmp160_ = {0};
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp157_ = s;
+			_tmp155_ = s;
 #line 678 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp157_, "") != 0) {
-#line 7666 "scanner.c"
-				const gchar* _tmp158_ = NULL;
-				gchar* _tmp159_ = NULL;
+			if (g_strcmp0 (_tmp155_, "") != 0) {
+#line 7619 "scanner.c"
+				const gchar* _tmp156_ = NULL;
+				gchar* _tmp157_ = NULL;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp158_ = s;
+				_tmp156_ = s;
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp159_ = g_strconcat (_tmp158_, ",", NULL);
+				_tmp157_ = g_strconcat (_tmp156_, ",", NULL);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 679 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp159_;
-#line 7677 "scanner.c"
+				s = _tmp157_;
+#line 7630 "scanner.c"
 			}
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp160_ = s;
+			_tmp158_ = s;
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp161_ = g_strconcat (_tmp160_, "soft-select", NULL);
+			_tmp159_ = g_strconcat (_tmp158_, "soft-select", NULL);
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 680 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp161_;
+			s = _tmp159_;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp162_ = cap;
+			_tmp160_ = cap;
 #line 681 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp162_ & (~SANE_CAP_SOFT_SELECT);
-#line 7691 "scanner.c"
+			cap = _tmp160_ & (~SANE_CAP_SOFT_SELECT);
+#line 7644 "scanner.c"
 		}
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp163_ = cap;
+		_tmp161_ = cap;
 #line 683 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp163_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
-#line 7697 "scanner.c"
-			const gchar* _tmp164_ = NULL;
-			const gchar* _tmp167_ = NULL;
-			gchar* _tmp168_ = NULL;
-			SANE_Int _tmp169_ = {0};
+		if ((_tmp161_ & SANE_CAP_HARD_SELECT) != ((SANE_Int) 0)) {
+#line 7650 "scanner.c"
+			const gchar* _tmp162_ = NULL;
+			const gchar* _tmp165_ = NULL;
+			gchar* _tmp166_ = NULL;
+			SANE_Int _tmp167_ = {0};
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp164_ = s;
+			_tmp162_ = s;
 #line 685 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp164_, "") != 0) {
-#line 7706 "scanner.c"
-				const gchar* _tmp165_ = NULL;
-				gchar* _tmp166_ = NULL;
+			if (g_strcmp0 (_tmp162_, "") != 0) {
+#line 7659 "scanner.c"
+				const gchar* _tmp163_ = NULL;
+				gchar* _tmp164_ = NULL;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp165_ = s;
+				_tmp163_ = s;
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp166_ = g_strconcat (_tmp165_, ",", NULL);
+				_tmp164_ = g_strconcat (_tmp163_, ",", NULL);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 686 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp166_;
-#line 7717 "scanner.c"
+				s = _tmp164_;
+#line 7670 "scanner.c"
 			}
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp167_ = s;
+			_tmp165_ = s;
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp168_ = g_strconcat (_tmp167_, "hard-select", NULL);
+			_tmp166_ = g_strconcat (_tmp165_, "hard-select", NULL);
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 687 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp168_;
+			s = _tmp166_;
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp169_ = cap;
+			_tmp167_ = cap;
 #line 688 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp169_ & (~SANE_CAP_HARD_SELECT);
-#line 7731 "scanner.c"
+			cap = _tmp167_ & (~SANE_CAP_HARD_SELECT);
+#line 7684 "scanner.c"
 		}
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp170_ = cap;
+		_tmp168_ = cap;
 #line 690 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp170_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
-#line 7737 "scanner.c"
-			const gchar* _tmp171_ = NULL;
-			const gchar* _tmp174_ = NULL;
-			gchar* _tmp175_ = NULL;
-			SANE_Int _tmp176_ = {0};
+		if ((_tmp168_ & SANE_CAP_SOFT_DETECT) != ((SANE_Int) 0)) {
+#line 7690 "scanner.c"
+			const gchar* _tmp169_ = NULL;
+			const gchar* _tmp172_ = NULL;
+			gchar* _tmp173_ = NULL;
+			SANE_Int _tmp174_ = {0};
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp171_ = s;
+			_tmp169_ = s;
 #line 692 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp171_, "") != 0) {
-#line 7746 "scanner.c"
-				const gchar* _tmp172_ = NULL;
-				gchar* _tmp173_ = NULL;
+			if (g_strcmp0 (_tmp169_, "") != 0) {
+#line 7699 "scanner.c"
+				const gchar* _tmp170_ = NULL;
+				gchar* _tmp171_ = NULL;
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp172_ = s;
+				_tmp170_ = s;
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp173_ = g_strconcat (_tmp172_, ",", NULL);
+				_tmp171_ = g_strconcat (_tmp170_, ",", NULL);
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 693 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp173_;
-#line 7757 "scanner.c"
+				s = _tmp171_;
+#line 7710 "scanner.c"
 			}
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp174_ = s;
+			_tmp172_ = s;
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp175_ = g_strconcat (_tmp174_, "soft-detect", NULL);
+			_tmp173_ = g_strconcat (_tmp172_, "soft-detect", NULL);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 694 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp175_;
+			s = _tmp173_;
 #line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp176_ = cap;
+			_tmp174_ = cap;
 #line 695 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp176_ & (~SANE_CAP_SOFT_DETECT);
-#line 7771 "scanner.c"
+			cap = _tmp174_ & (~SANE_CAP_SOFT_DETECT);
+#line 7724 "scanner.c"
 		}
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp177_ = cap;
+		_tmp175_ = cap;
 #line 697 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp177_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
-#line 7777 "scanner.c"
-			const gchar* _tmp178_ = NULL;
-			const gchar* _tmp181_ = NULL;
-			gchar* _tmp182_ = NULL;
-			SANE_Int _tmp183_ = {0};
+		if ((_tmp175_ & SANE_CAP_EMULATED) != ((SANE_Int) 0)) {
+#line 7730 "scanner.c"
+			const gchar* _tmp176_ = NULL;
+			const gchar* _tmp179_ = NULL;
+			gchar* _tmp180_ = NULL;
+			SANE_Int _tmp181_ = {0};
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp178_ = s;
+			_tmp176_ = s;
 #line 699 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp178_, "") != 0) {
-#line 7786 "scanner.c"
-				const gchar* _tmp179_ = NULL;
-				gchar* _tmp180_ = NULL;
+			if (g_strcmp0 (_tmp176_, "") != 0) {
+#line 7739 "scanner.c"
+				const gchar* _tmp177_ = NULL;
+				gchar* _tmp178_ = NULL;
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp179_ = s;
+				_tmp177_ = s;
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp180_ = g_strconcat (_tmp179_, ",", NULL);
+				_tmp178_ = g_strconcat (_tmp177_, ",", NULL);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 700 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp180_;
-#line 7797 "scanner.c"
+				s = _tmp178_;
+#line 7750 "scanner.c"
 			}
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp181_ = s;
+			_tmp179_ = s;
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp182_ = g_strconcat (_tmp181_, "emulated", NULL);
+			_tmp180_ = g_strconcat (_tmp179_, "emulated", NULL);
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 701 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp182_;
+			s = _tmp180_;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp183_ = cap;
+			_tmp181_ = cap;
 #line 702 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp183_ & (~SANE_CAP_EMULATED);
-#line 7811 "scanner.c"
+			cap = _tmp181_ & (~SANE_CAP_EMULATED);
+#line 7764 "scanner.c"
 		}
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp184_ = cap;
+		_tmp182_ = cap;
 #line 704 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp184_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
-#line 7817 "scanner.c"
-			const gchar* _tmp185_ = NULL;
-			const gchar* _tmp188_ = NULL;
-			gchar* _tmp189_ = NULL;
-			SANE_Int _tmp190_ = {0};
+		if ((_tmp182_ & SANE_CAP_AUTOMATIC) != ((SANE_Int) 0)) {
+#line 7770 "scanner.c"
+			const gchar* _tmp183_ = NULL;
+			const gchar* _tmp186_ = NULL;
+			gchar* _tmp187_ = NULL;
+			SANE_Int _tmp188_ = {0};
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp185_ = s;
+			_tmp183_ = s;
 #line 706 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp185_, "") != 0) {
-#line 7826 "scanner.c"
-				const gchar* _tmp186_ = NULL;
-				gchar* _tmp187_ = NULL;
+			if (g_strcmp0 (_tmp183_, "") != 0) {
+#line 7779 "scanner.c"
+				const gchar* _tmp184_ = NULL;
+				gchar* _tmp185_ = NULL;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp186_ = s;
+				_tmp184_ = s;
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp187_ = g_strconcat (_tmp186_, ",", NULL);
+				_tmp185_ = g_strconcat (_tmp184_, ",", NULL);
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 707 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp187_;
-#line 7837 "scanner.c"
+				s = _tmp185_;
+#line 7790 "scanner.c"
 			}
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp188_ = s;
+			_tmp186_ = s;
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp189_ = g_strconcat (_tmp188_, "automatic", NULL);
+			_tmp187_ = g_strconcat (_tmp186_, "automatic", NULL);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 708 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp189_;
+			s = _tmp187_;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp190_ = cap;
+			_tmp188_ = cap;
 #line 709 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp190_ & (~SANE_CAP_AUTOMATIC);
-#line 7851 "scanner.c"
+			cap = _tmp188_ & (~SANE_CAP_AUTOMATIC);
+#line 7804 "scanner.c"
 		}
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp191_ = cap;
+		_tmp189_ = cap;
 #line 711 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp191_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
-#line 7857 "scanner.c"
-			const gchar* _tmp192_ = NULL;
-			const gchar* _tmp195_ = NULL;
-			gchar* _tmp196_ = NULL;
-			SANE_Int _tmp197_ = {0};
+		if ((_tmp189_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
+#line 7810 "scanner.c"
+			const gchar* _tmp190_ = NULL;
+			const gchar* _tmp193_ = NULL;
+			gchar* _tmp194_ = NULL;
+			SANE_Int _tmp195_ = {0};
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp192_ = s;
+			_tmp190_ = s;
 #line 713 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp192_, "") != 0) {
-#line 7866 "scanner.c"
-				const gchar* _tmp193_ = NULL;
-				gchar* _tmp194_ = NULL;
+			if (g_strcmp0 (_tmp190_, "") != 0) {
+#line 7819 "scanner.c"
+				const gchar* _tmp191_ = NULL;
+				gchar* _tmp192_ = NULL;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp193_ = s;
+				_tmp191_ = s;
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp194_ = g_strconcat (_tmp193_, ",", NULL);
+				_tmp192_ = g_strconcat (_tmp191_, ",", NULL);
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 714 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp194_;
-#line 7877 "scanner.c"
+				s = _tmp192_;
+#line 7830 "scanner.c"
 			}
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp195_ = s;
+			_tmp193_ = s;
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp196_ = g_strconcat (_tmp195_, "inactive", NULL);
+			_tmp194_ = g_strconcat (_tmp193_, "inactive", NULL);
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 715 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp196_;
+			s = _tmp194_;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp197_ = cap;
+			_tmp195_ = cap;
 #line 716 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp197_ & (~SANE_CAP_INACTIVE);
-#line 7891 "scanner.c"
+			cap = _tmp195_ & (~SANE_CAP_INACTIVE);
+#line 7844 "scanner.c"
 		}
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp198_ = cap;
+		_tmp196_ = cap;
 #line 718 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if ((_tmp198_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
-#line 7897 "scanner.c"
-			const gchar* _tmp199_ = NULL;
-			const gchar* _tmp202_ = NULL;
-			gchar* _tmp203_ = NULL;
-			SANE_Int _tmp204_ = {0};
+		if ((_tmp196_ & SANE_CAP_ADVANCED) != ((SANE_Int) 0)) {
+#line 7850 "scanner.c"
+			const gchar* _tmp197_ = NULL;
+			const gchar* _tmp200_ = NULL;
+			gchar* _tmp201_ = NULL;
+			SANE_Int _tmp202_ = {0};
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp199_ = s;
+			_tmp197_ = s;
 #line 720 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp199_, "") != 0) {
-#line 7906 "scanner.c"
-				const gchar* _tmp200_ = NULL;
-				gchar* _tmp201_ = NULL;
+			if (g_strcmp0 (_tmp197_, "") != 0) {
+#line 7859 "scanner.c"
+				const gchar* _tmp198_ = NULL;
+				gchar* _tmp199_ = NULL;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp200_ = s;
+				_tmp198_ = s;
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp201_ = g_strconcat (_tmp200_, ",", NULL);
+				_tmp199_ = g_strconcat (_tmp198_, ",", NULL);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 721 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp201_;
-#line 7917 "scanner.c"
+				s = _tmp199_;
+#line 7870 "scanner.c"
 			}
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp202_ = s;
+			_tmp200_ = s;
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp203_ = g_strconcat (_tmp202_, "advanced", NULL);
+			_tmp201_ = g_strconcat (_tmp200_, "advanced", NULL);
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 722 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp203_;
+			s = _tmp201_;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp204_ = cap;
+			_tmp202_ = cap;
 #line 723 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			cap = _tmp204_ & (~SANE_CAP_ADVANCED);
-#line 7931 "scanner.c"
+			cap = _tmp202_ & (~SANE_CAP_ADVANCED);
+#line 7884 "scanner.c"
 		}
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp205_ = cap;
+		_tmp203_ = cap;
 #line 726 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp205_ != ((SANE_Int) 0)) {
-#line 7937 "scanner.c"
-			const gchar* _tmp206_ = NULL;
-			const gchar* _tmp209_ = NULL;
-			SANE_Int _tmp210_ = {0};
+		if (_tmp203_ != ((SANE_Int) 0)) {
+#line 7890 "scanner.c"
+			const gchar* _tmp204_ = NULL;
+			const gchar* _tmp207_ = NULL;
+			SANE_Int _tmp208_ = {0};
+			gchar* _tmp209_ = NULL;
+			gchar* _tmp210_ = NULL;
 			gchar* _tmp211_ = NULL;
-			gchar* _tmp212_ = NULL;
-			gchar* _tmp213_ = NULL;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp206_ = s;
+			_tmp204_ = s;
 #line 728 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (g_strcmp0 (_tmp206_, "") != 0) {
-#line 7948 "scanner.c"
-				const gchar* _tmp207_ = NULL;
-				gchar* _tmp208_ = NULL;
+			if (g_strcmp0 (_tmp204_, "") != 0) {
+#line 7901 "scanner.c"
+				const gchar* _tmp205_ = NULL;
+				gchar* _tmp206_ = NULL;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp207_ = s;
+				_tmp205_ = s;
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp208_ = g_strconcat (_tmp207_, ",", NULL);
+				_tmp206_ = g_strconcat (_tmp205_, ",", NULL);
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_g_free0 (s);
 #line 729 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				s = _tmp208_;
-#line 7959 "scanner.c"
+				s = _tmp206_;
+#line 7912 "scanner.c"
 			}
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp209_ = s;
+			_tmp207_ = s;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp210_ = cap;
+			_tmp208_ = cap;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp211_ = g_strdup_printf ("%x", (guint) ((gint) _tmp210_));
+			_tmp209_ = g_strdup_printf ("%x", (guint) ((gint) _tmp208_));
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp212_ = _tmp211_;
+			_tmp210_ = _tmp209_;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp213_ = g_strconcat (_tmp209_, _tmp212_, NULL);
+			_tmp211_ = g_strconcat (_tmp207_, _tmp210_, NULL);
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_g_free0 (s);
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			s = _tmp213_;
+			s = _tmp211_;
 #line 730 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_g_free0 (_tmp212_);
-#line 7977 "scanner.c"
+			_g_free0 (_tmp210_);
+#line 7930 "scanner.c"
 		}
 	}
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp214_ = s;
+	_tmp212_ = s;
 #line 734 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:734: %s", _tmp214_);
+	g_debug ("scanner.vala:734: %s", _tmp212_);
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp215_ = option;
+	_tmp213_ = option;
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp216_ = _tmp215_->desc;
+	_tmp214_ = _tmp213_->desc;
 #line 736 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp216_ != NULL) {
-#line 7990 "scanner.c"
-		SANE_Option_Descriptor* _tmp217_ = NULL;
-		const gchar* _tmp218_ = NULL;
+	if (_tmp214_ != NULL) {
+#line 7943 "scanner.c"
+		SANE_Option_Descriptor* _tmp215_ = NULL;
+		const gchar* _tmp216_ = NULL;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp217_ = option;
+		_tmp215_ = option;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp218_ = _tmp217_->desc;
+		_tmp216_ = _tmp215_->desc;
 #line 737 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_debug ("scanner.vala:737:   Description: %s", _tmp218_);
-#line 7999 "scanner.c"
+		g_debug ("scanner.vala:737:   Description: %s", _tmp216_);
+#line 7952 "scanner.c"
 	}
 #line 573 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (s);
-#line 8003 "scanner.c"
+#line 7956 "scanner.c"
 }
 
 
@@ -8041,100 +7994,94 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 	_tmp6_ = g_async_queue_pop (_tmp5_);
 #line 744 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	credentials = (Credentials*) _tmp6_;
-#line 8038 "scanner.c"
+#line 7991 "scanner.c"
 	{
 		gint i = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8043 "scanner.c"
+#line 7996 "scanner.c"
 		{
 			gboolean _tmp7_ = FALSE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp7_ = TRUE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8050 "scanner.c"
-				gboolean _tmp8_ = FALSE;
-				gboolean _tmp10_ = FALSE;
-				Credentials* _tmp11_ = NULL;
-				const gchar* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gchar _tmp14_ = '\0';
-				gboolean _tmp17_ = FALSE;
-				gchar* _tmp18_ = NULL;
-				gint _tmp18__length1 = 0;
-				gint _tmp19_ = 0;
-				Credentials* _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				gint _tmp22_ = 0;
-				gchar _tmp23_ = '\0';
-				gchar _tmp24_ = '\0';
+#line 8003 "scanner.c"
+				gboolean _tmp9_ = FALSE;
+				Credentials* _tmp10_ = NULL;
+				const gchar* _tmp11_ = NULL;
+				gint _tmp12_ = 0;
+				gchar _tmp13_ = '\0';
+				gchar* _tmp16_ = NULL;
+				gint _tmp16__length1 = 0;
+				gint _tmp17_ = 0;
+				Credentials* _tmp18_ = NULL;
+				const gchar* _tmp19_ = NULL;
+				gint _tmp20_ = 0;
+				gchar _tmp21_ = '\0';
+				gchar _tmp22_ = '\0';
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp8_ = _tmp7_;
+				if (!_tmp7_) {
+#line 8019 "scanner.c"
+					gint _tmp8_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp8_) {
-#line 8070 "scanner.c"
-					gint _tmp9_ = 0;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp9_ = i;
+					_tmp8_ = i;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp9_ + 1;
-#line 8076 "scanner.c"
+					i = _tmp8_ + 1;
+#line 8025 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				_tmp7_ = FALSE;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp11_ = credentials;
+				_tmp10_ = credentials;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp12_ = _tmp11_->username;
+				_tmp11_ = _tmp10_->username;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp13_ = i;
+				_tmp12_ = i;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
+				_tmp13_ = string_get (_tmp11_, (glong) _tmp12_);
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp14_ != '\0') {
-#line 8090 "scanner.c"
+				if (_tmp13_ != '\0') {
+#line 8039 "scanner.c"
+					gint _tmp14_ = 0;
 					gint _tmp15_ = 0;
-					gint _tmp16_ = 0;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp15_ = i;
+					_tmp14_ = i;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp16_ = SANE_MAX_USERNAME_LEN;
+					_tmp15_ = SANE_MAX_USERNAME_LEN;
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp10_ = _tmp15_ < _tmp16_;
-#line 8099 "scanner.c"
+					_tmp9_ = _tmp14_ < _tmp15_;
+#line 8048 "scanner.c"
 				} else {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp10_ = FALSE;
-#line 8103 "scanner.c"
+					_tmp9_ = FALSE;
+#line 8052 "scanner.c"
 				}
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp17_ = _tmp10_;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp17_) {
+				if (!_tmp9_) {
 #line 745 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8111 "scanner.c"
+#line 8058 "scanner.c"
 				}
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp18_ = username;
+				_tmp16_ = username;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp18__length1 = username_length1;
+				_tmp16__length1 = username_length1;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp19_ = i;
+				_tmp17_ = i;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp20_ = credentials;
+				_tmp18_ = credentials;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp21_ = _tmp20_->username;
+				_tmp19_ = _tmp18_->username;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp22_ = i;
+				_tmp20_ = i;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp23_ = string_get (_tmp21_, (glong) _tmp22_);
+				_tmp21_ = string_get (_tmp19_, (glong) _tmp20_);
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp18_[_tmp19_] = _tmp23_;
+				_tmp16_[_tmp17_] = _tmp21_;
 #line 746 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp24_ = _tmp18_[_tmp19_];
-#line 8131 "scanner.c"
+				_tmp22_ = _tmp16_[_tmp17_];
+#line 8078 "scanner.c"
 			}
 		}
 	}
@@ -8142,108 +8089,102 @@ static void scanner_authorization_cb (const gchar* resource, gchar* username, in
 		gint i = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		i = 0;
-#line 8139 "scanner.c"
+#line 8086 "scanner.c"
 		{
-			gboolean _tmp25_ = FALSE;
+			gboolean _tmp23_ = FALSE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp25_ = TRUE;
+			_tmp23_ = TRUE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			while (TRUE) {
-#line 8146 "scanner.c"
-				gboolean _tmp26_ = FALSE;
-				gboolean _tmp28_ = FALSE;
-				Credentials* _tmp29_ = NULL;
-				const gchar* _tmp30_ = NULL;
-				gint _tmp31_ = 0;
-				gchar _tmp32_ = '\0';
-				gboolean _tmp35_ = FALSE;
-				gchar* _tmp36_ = NULL;
-				gint _tmp36__length1 = 0;
-				gint _tmp37_ = 0;
-				Credentials* _tmp38_ = NULL;
-				const gchar* _tmp39_ = NULL;
-				gint _tmp40_ = 0;
-				gchar _tmp41_ = '\0';
-				gchar _tmp42_ = '\0';
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp26_ = _tmp25_;
+#line 8093 "scanner.c"
+				gboolean _tmp25_ = FALSE;
+				Credentials* _tmp26_ = NULL;
+				const gchar* _tmp27_ = NULL;
+				gint _tmp28_ = 0;
+				gchar _tmp29_ = '\0';
+				gchar* _tmp32_ = NULL;
+				gint _tmp32__length1 = 0;
+				gint _tmp33_ = 0;
+				Credentials* _tmp34_ = NULL;
+				const gchar* _tmp35_ = NULL;
+				gint _tmp36_ = 0;
+				gchar _tmp37_ = '\0';
+				gchar _tmp38_ = '\0';
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp26_) {
-#line 8166 "scanner.c"
-					gint _tmp27_ = 0;
+				if (!_tmp23_) {
+#line 8109 "scanner.c"
+					gint _tmp24_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp27_ = i;
+					_tmp24_ = i;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					i = _tmp27_ + 1;
-#line 8172 "scanner.c"
+					i = _tmp24_ + 1;
+#line 8115 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp25_ = FALSE;
+				_tmp23_ = FALSE;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp29_ = credentials;
+				_tmp26_ = credentials;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp30_ = _tmp29_->password;
+				_tmp27_ = _tmp26_->password;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp31_ = i;
+				_tmp28_ = i;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp32_ = string_get (_tmp30_, (glong) _tmp31_);
+				_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (_tmp32_ != '\0') {
-#line 8186 "scanner.c"
-					gint _tmp33_ = 0;
-					gint _tmp34_ = 0;
+				if (_tmp29_ != '\0') {
+#line 8129 "scanner.c"
+					gint _tmp30_ = 0;
+					gint _tmp31_ = 0;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp33_ = i;
+					_tmp30_ = i;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp34_ = SANE_MAX_USERNAME_LEN;
+					_tmp31_ = SANE_MAX_USERNAME_LEN;
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp28_ = _tmp33_ < _tmp34_;
-#line 8195 "scanner.c"
+					_tmp25_ = _tmp30_ < _tmp31_;
+#line 8138 "scanner.c"
 				} else {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp28_ = FALSE;
-#line 8199 "scanner.c"
+					_tmp25_ = FALSE;
+#line 8142 "scanner.c"
 				}
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp35_ = _tmp28_;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (!_tmp35_) {
+				if (!_tmp25_) {
 #line 747 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 8207 "scanner.c"
+#line 8148 "scanner.c"
 				}
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp36_ = password;
+				_tmp32_ = password;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp36__length1 = password_length1;
+				_tmp32__length1 = password_length1;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp37_ = i;
+				_tmp33_ = i;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp38_ = credentials;
+				_tmp34_ = credentials;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp39_ = _tmp38_->password;
+				_tmp35_ = _tmp34_->password;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp40_ = i;
+				_tmp36_ = i;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
+				_tmp37_ = string_get (_tmp35_, (glong) _tmp36_);
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp36_[_tmp37_] = _tmp41_;
+				_tmp32_[_tmp33_] = _tmp37_;
 #line 748 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp42_ = _tmp36_[_tmp37_];
-#line 8227 "scanner.c"
+				_tmp38_ = _tmp32_[_tmp33_];
+#line 8168 "scanner.c"
 			}
 		}
 	}
 #line 740 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8233 "scanner.c"
+#line 8174 "scanner.c"
 }
 
 
 static gpointer _credentials_ref0 (gpointer self) {
 #line 756 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? credentials_ref (self) : NULL;
-#line 8240 "scanner.c"
+#line 8181 "scanner.c"
 }
 
 
@@ -8290,7 +8231,7 @@ void scanner_authorize (Scanner* self, const gchar* username, const gchar* passw
 	g_async_queue_push (_tmp5_, _tmp6_);
 #line 751 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_credentials_unref0 (credentials);
-#line 8287 "scanner.c"
+#line 8228 "scanner.c"
 }
 
 
@@ -8302,7 +8243,7 @@ static void scanner_close_device (Scanner* self) {
 	_tmp0_ = self->priv->have_handle;
 #line 761 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp0_) {
-#line 8299 "scanner.c"
+#line 8240 "scanner.c"
 		SANE_Handle _tmp1_ = {0};
 		SANE_Handle _tmp2_ = {0};
 #line 763 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8323,7 +8264,7 @@ static void scanner_close_device (Scanner* self) {
 		_g_hash_table_unref0 (self->priv->options);
 #line 769 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->options = NULL;
-#line 8320 "scanner.c"
+#line 8261 "scanner.c"
 	}
 #line 772 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
@@ -8339,7 +8280,7 @@ static void scanner_close_device (Scanner* self) {
 	self->priv->job_queue = NULL;
 #line 775 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 8336 "scanner.c"
+#line 8277 "scanner.c"
 }
 
 
@@ -8368,21 +8309,21 @@ static void scanner_fail_scan (Scanner* self, gint error_code, const gchar* erro
 	scanner_notify (self, (Notify*) _tmp3_);
 #line 782 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_notify_unref0 (_tmp3_);
-#line 8365 "scanner.c"
+#line 8306 "scanner.c"
 }
 
 
 static gpointer _request_ref0 (gpointer self) {
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? request_ref (self) : NULL;
-#line 8372 "scanner.c"
+#line 8313 "scanner.c"
 }
 
 
 static gpointer _scan_job_ref0 (gpointer self) {
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return self ? scan_job_ref (self) : NULL;
-#line 8379 "scanner.c"
+#line 8320 "scanner.c"
 }
 
 
@@ -8390,7 +8331,6 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	ScanState _tmp1_ = 0;
-	gboolean _tmp3_ = FALSE;
 	gint request_count = 0;
 #line 785 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
@@ -8398,89 +8338,81 @@ static gboolean scanner_handle_requests (Scanner* self) {
 	_tmp1_ = self->priv->state;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SCAN_STATE_IDLE) {
-#line 8395 "scanner.c"
+#line 8335 "scanner.c"
 		gboolean _tmp2_ = FALSE;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = self->priv->need_redetect;
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 8401 "scanner.c"
+#line 8341 "scanner.c"
 	} else {
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = FALSE;
-#line 8405 "scanner.c"
+#line 8345 "scanner.c"
 	}
 #line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = _tmp0_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp3_) {
+	if (_tmp0_) {
 #line 789 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_REDETECT;
-#line 8413 "scanner.c"
+#line 8351 "scanner.c"
 	}
 #line 792 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	request_count = 0;
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 8419 "scanner.c"
+#line 8357 "scanner.c"
 		Request* request = NULL;
+		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-		gboolean _tmp5_ = FALSE;
-		ScanState _tmp6_ = 0;
-		gboolean _tmp8_ = FALSE;
-		gboolean _tmp11_ = FALSE;
-		gint _tmp14_ = 0;
-		Request* _tmp15_ = NULL;
+		ScanState _tmp5_ = 0;
+		gint _tmp11_ = 0;
+		Request* _tmp12_ = NULL;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp6_ = self->priv->state;
+		_tmp5_ = self->priv->state;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp6_ == SCAN_STATE_IDLE) {
-#line 8432 "scanner.c"
-			gint _tmp7_ = 0;
+		if (_tmp5_ == SCAN_STATE_IDLE) {
+#line 8368 "scanner.c"
+			gint _tmp6_ = 0;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp7_ = request_count;
+			_tmp6_ = request_count;
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp5_ = _tmp7_ == 0;
-#line 8438 "scanner.c"
+			_tmp4_ = _tmp6_ == 0;
+#line 8374 "scanner.c"
 		} else {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp5_ = FALSE;
-#line 8442 "scanner.c"
+			_tmp4_ = FALSE;
+#line 8378 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = _tmp5_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp8_) {
+		if (_tmp4_) {
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = TRUE;
-#line 8450 "scanner.c"
+			_tmp3_ = TRUE;
+#line 8384 "scanner.c"
 		} else {
-			GAsyncQueue* _tmp9_ = NULL;
-			gint _tmp10_ = 0;
+			GAsyncQueue* _tmp7_ = NULL;
+			gint _tmp8_ = 0;
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp9_ = self->priv->request_queue;
+			_tmp7_ = self->priv->request_queue;
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp10_ = g_async_queue_length (_tmp9_);
+			_tmp8_ = g_async_queue_length (_tmp7_);
 #line 797 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp4_ = _tmp10_ > 0;
-#line 8460 "scanner.c"
+			_tmp3_ = _tmp8_ > 0;
+#line 8394 "scanner.c"
 		}
 #line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp11_ = _tmp4_;
-#line 796 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp11_) {
-#line 8466 "scanner.c"
-			GAsyncQueue* _tmp12_ = NULL;
-			gpointer _tmp13_ = NULL;
+		if (_tmp3_) {
+#line 8398 "scanner.c"
+			GAsyncQueue* _tmp9_ = NULL;
+			gpointer _tmp10_ = NULL;
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp12_ = self->priv->request_queue;
+			_tmp9_ = self->priv->request_queue;
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp13_ = g_async_queue_pop (_tmp12_);
+			_tmp10_ = g_async_queue_pop (_tmp9_);
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (request);
 #line 798 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			request = (Request*) _tmp13_;
-#line 8477 "scanner.c"
+			request = (Request*) _tmp10_;
+#line 8409 "scanner.c"
 		} else {
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			result = TRUE;
@@ -8488,57 +8420,57 @@ static gboolean scanner_handle_requests (Scanner* self) {
 			_request_unref0 (request);
 #line 800 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 8485 "scanner.c"
+#line 8417 "scanner.c"
 		}
 #line 802 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:802: Processing request");
 #line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp14_ = request_count;
+		_tmp11_ = request_count;
 #line 803 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		request_count = _tmp14_ + 1;
+		request_count = _tmp11_ + 1;
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = request;
+		_tmp12_ = request;
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_REQUEST_START_SCAN)) {
-#line 8497 "scanner.c"
+		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_REQUEST_START_SCAN)) {
+#line 8429 "scanner.c"
 			RequestStartScan* r = NULL;
-			Request* _tmp16_ = NULL;
-			RequestStartScan* _tmp17_ = NULL;
-			RequestStartScan* _tmp18_ = NULL;
-			ScanJob* _tmp19_ = NULL;
-			ScanJob* _tmp20_ = NULL;
+			Request* _tmp13_ = NULL;
+			RequestStartScan* _tmp14_ = NULL;
+			RequestStartScan* _tmp15_ = NULL;
+			ScanJob* _tmp16_ = NULL;
+			ScanJob* _tmp17_ = NULL;
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp16_ = request;
+			_tmp13_ = request;
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp17_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_REQUEST_START_SCAN, RequestStartScan));
+			_tmp14_ = _request_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_REQUEST_START_SCAN, RequestStartScan));
 #line 807 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			r = _tmp17_;
+			r = _tmp14_;
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp18_ = r;
+			_tmp15_ = r;
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp19_ = _tmp18_->job;
+			_tmp16_ = _tmp15_->job;
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp20_ = _scan_job_ref0 (_tmp19_);
+			_tmp17_ = _scan_job_ref0 (_tmp16_);
 #line 808 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp20_);
+			self->priv->job_queue = g_list_append (self->priv->job_queue, _tmp17_);
 #line 805 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_request_unref0 (r);
-#line 8520 "scanner.c"
+#line 8452 "scanner.c"
 		} else {
-			Request* _tmp21_ = NULL;
+			Request* _tmp18_ = NULL;
 #line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp21_ = request;
+			_tmp18_ = request;
 #line 810 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_REQUEST_CANCEL)) {
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, TYPE_REQUEST_CANCEL)) {
 #line 812 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_fail_scan (self, (gint) SANE_STATUS_CANCELLED, "Scan cancelled - do not report this error");
-#line 8529 "scanner.c"
+#line 8461 "scanner.c"
 			} else {
-				Request* _tmp22_ = NULL;
+				Request* _tmp19_ = NULL;
 #line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp22_ = request;
+				_tmp19_ = request;
 #line 814 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp22_, TYPE_REQUEST_QUIT)) {
+				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_REQUEST_QUIT)) {
 #line 816 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_close_device (self);
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8547,13 +8479,13 @@ static gboolean scanner_handle_requests (Scanner* self) {
 					_request_unref0 (request);
 #line 817 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					return result;
-#line 8544 "scanner.c"
+#line 8476 "scanner.c"
 				}
 			}
 		}
 #line 793 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_request_unref0 (request);
-#line 8550 "scanner.c"
+#line 8482 "scanner.c"
 	}
 }
 
@@ -8561,7 +8493,7 @@ static gboolean scanner_handle_requests (Scanner* self) {
 static void _g_free0_ (gpointer var) {
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	var = (g_free (var), NULL);
-#line 8558 "scanner.c"
+#line 8490 "scanner.c"
 }
 
 
@@ -8573,27 +8505,26 @@ static void scanner_do_open (Scanner* self) {
 	gboolean _tmp3_ = FALSE;
 	ScanJob* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	ScanJob* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	GHashFunc _tmp19_ = NULL;
-	GEqualFunc _tmp20_ = NULL;
-	GHashTable* _tmp21_ = NULL;
+	ScanJob* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	gboolean _tmp13_ = FALSE;
+	GHashFunc _tmp18_ = NULL;
+	GEqualFunc _tmp19_ = NULL;
+	GHashTable* _tmp20_ = NULL;
 	SANE_Status status = 0;
-	ScanJob* _tmp22_ = NULL;
-	const gchar* _tmp23_ = NULL;
-	SANE_Handle _tmp24_ = {0};
-	SANE_Status _tmp25_ = 0;
-	ScanJob* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
-	SANE_Status _tmp28_ = 0;
+	ScanJob* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
+	SANE_Handle _tmp23_ = {0};
+	SANE_Status _tmp24_ = 0;
+	ScanJob* _tmp25_ = NULL;
+	const gchar* _tmp26_ = NULL;
+	SANE_Status _tmp27_ = 0;
+	gchar* _tmp28_ = NULL;
 	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	SANE_Status _tmp31_ = 0;
-	ScanJob* _tmp36_ = NULL;
-	const gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
+	SANE_Status _tmp30_ = 0;
+	ScanJob* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
+	gchar* _tmp37_ = NULL;
 #line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 824 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8620,92 +8551,90 @@ static void scanner_do_open (Scanner* self) {
 	_tmp5_ = _tmp4_->device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ == NULL) {
-#line 8617 "scanner.c"
+#line 8548 "scanner.c"
 		const gchar* _tmp6_ = NULL;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp6_ = self->priv->default_device;
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = _tmp6_ != NULL;
-#line 8623 "scanner.c"
+#line 8554 "scanner.c"
 	} else {
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = FALSE;
-#line 8627 "scanner.c"
+#line 8558 "scanner.c"
 	}
 #line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = _tmp3_;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp7_) {
-#line 8633 "scanner.c"
-		ScanJob* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
+	if (_tmp3_) {
+#line 8562 "scanner.c"
+		ScanJob* _tmp7_ = NULL;
+		const gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_ = job;
+		_tmp7_ = job;
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp9_ = self->priv->default_device;
+		_tmp8_ = self->priv->default_device;
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp10_ = g_strdup (_tmp9_);
+		_tmp9_ = g_strdup (_tmp8_);
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_g_free0 (_tmp8_->device);
+		_g_free0 (_tmp7_->device);
 #line 833 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp8_->device = _tmp10_;
-#line 8647 "scanner.c"
+		_tmp7_->device = _tmp9_;
+#line 8576 "scanner.c"
 	}
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = job;
+	_tmp10_ = job;
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp12_ = _tmp11_->device;
+	_tmp11_ = _tmp10_->device;
 #line 835 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp12_ == NULL) {
-#line 8655 "scanner.c"
-		const gchar* _tmp13_ = NULL;
+	if (_tmp11_ == NULL) {
+#line 8584 "scanner.c"
+		const gchar* _tmp12_ = NULL;
 #line 837 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_warning ("scanner.vala:837: No scan device available");
 #line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp13_ = _ ("No scanners available.  Please connect a scanner.");
+		_tmp12_ = _ ("No scanners available.  Please connect a scanner.");
 #line 838 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_fail_scan (self, 0, _tmp13_);
+		scanner_fail_scan (self, 0, _tmp12_);
 #line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
 #line 841 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8667 "scanner.c"
+#line 8596 "scanner.c"
 	}
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp14_ = self->priv->have_handle;
+	_tmp13_ = self->priv->have_handle;
 #line 845 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp14_) {
-#line 8673 "scanner.c"
-		const gchar* _tmp15_ = NULL;
-		ScanJob* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		SANE_Handle _tmp18_ = {0};
+	if (_tmp13_) {
+#line 8602 "scanner.c"
+		const gchar* _tmp14_ = NULL;
+		ScanJob* _tmp15_ = NULL;
+		const gchar* _tmp16_ = NULL;
+		SANE_Handle _tmp17_ = {0};
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp15_ = self->priv->current_device;
+		_tmp14_ = self->priv->current_device;
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp16_ = job;
+		_tmp15_ = job;
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp17_ = _tmp16_->device;
+		_tmp16_ = _tmp15_->device;
 #line 847 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (g_strcmp0 (_tmp15_, _tmp17_) == 0) {
+		if (g_strcmp0 (_tmp14_, _tmp16_) == 0) {
 #line 849 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			self->priv->state = SCAN_STATE_GET_OPTION;
 #line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_scan_job_unref0 (job);
 #line 850 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return;
-#line 8692 "scanner.c"
+#line 8621 "scanner.c"
 		}
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp18_ = self->priv->handle;
+		_tmp17_ = self->priv->handle;
 #line 853 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		sane_close (_tmp18_);
+		sane_close (_tmp17_);
 #line 854 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_debug ("scanner.vala:854: sane_close ()");
 #line 855 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->have_handle = FALSE;
-#line 8702 "scanner.c"
+#line 8631 "scanner.c"
 	}
 #line 858 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
@@ -8714,83 +8643,83 @@ static void scanner_do_open (Scanner* self) {
 #line 860 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = FALSE;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp19_ = g_str_hash;
+	_tmp18_ = g_str_hash;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp20_ = g_str_equal;
+	_tmp19_ = g_str_equal;
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_ = g_hash_table_new_full (_tmp19_, _tmp20_, _g_free0_, NULL);
+	_tmp20_ = g_hash_table_new_full (_tmp18_, _tmp19_, _g_free0_, NULL);
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_hash_table_unref0 (self->priv->options);
 #line 861 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->options = _tmp21_;
+	self->priv->options = _tmp20_;
 #line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp22_ = job;
+	_tmp21_ = job;
 #line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_ = _tmp22_->device;
+	_tmp22_ = _tmp21_->device;
 #line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = sane_open (_tmp23_, &_tmp24_);
+	_tmp24_ = sane_open (_tmp22_, &_tmp23_);
 #line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->handle = _tmp24_;
+	self->priv->handle = _tmp23_;
 #line 862 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	status = _tmp25_;
+	status = _tmp24_;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = job;
+	_tmp25_ = job;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = _tmp26_->device;
+	_tmp26_ = _tmp25_->device;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = status;
+	_tmp27_ = status;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = sane_status_to_string (_tmp28_);
+	_tmp28_ = sane_status_to_string (_tmp27_);
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = _tmp29_;
+	_tmp29_ = _tmp28_;
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_debug ("scanner.vala:863: sane_open (\"%s\") -> %s", _tmp27_, _tmp30_);
+	g_debug ("scanner.vala:863: sane_open (\"%s\") -> %s", _tmp26_, _tmp29_);
 #line 863 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp30_);
+	_g_free0 (_tmp29_);
 #line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_ = status;
+	_tmp30_ = status;
 #line 865 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp31_ != SANE_STATUS_GOOD) {
-#line 8748 "scanner.c"
-		SANE_Status _tmp32_ = 0;
-		const gchar* _tmp33_ = NULL;
-		SANE_Status _tmp34_ = 0;
-		const gchar* _tmp35_ = NULL;
+	if (_tmp30_ != SANE_STATUS_GOOD) {
+#line 8677 "scanner.c"
+		SANE_Status _tmp31_ = 0;
+		const gchar* _tmp32_ = NULL;
+		SANE_Status _tmp33_ = 0;
+		const gchar* _tmp34_ = NULL;
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp32_ = status;
+		_tmp31_ = status;
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp33_ = sane_strstatus (_tmp32_);
+		_tmp32_ = sane_strstatus (_tmp31_);
 #line 867 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:867: Unable to get open device: %s", _tmp33_);
+		g_warning ("scanner.vala:867: Unable to get open device: %s", _tmp32_);
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp34_ = status;
+		_tmp33_ = status;
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp35_ = _ ("Unable to connect to scanner");
+		_tmp34_ = _ ("Unable to connect to scanner");
 #line 868 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_fail_scan (self, (gint) _tmp34_, _tmp35_);
+		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
 #line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
 #line 871 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 8769 "scanner.c"
+#line 8698 "scanner.c"
 	}
 #line 873 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->have_handle = TRUE;
 #line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = job;
+	_tmp35_ = job;
 #line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_ = _tmp36_->device;
+	_tmp36_ = _tmp35_->device;
 #line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp38_ = g_strdup (_tmp37_);
+	_tmp37_ = g_strdup (_tmp36_);
 #line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (self->priv->current_device);
 #line 875 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->current_device = _tmp38_;
+	self->priv->current_device = _tmp37_;
 #line 876 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->state = SCAN_STATE_GET_OPTION;
 #line 822 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 8787 "scanner.c"
+#line 8716 "scanner.c"
 }
 
 
@@ -8808,19 +8737,19 @@ static void scanner_do_get_option (Scanner* self) {
 	SANE_Int _tmp7_ = {0};
 	SANE_Int _tmp8_ = {0};
 	SANE_Option_Descriptor* _tmp9_ = NULL;
-	SANE_Int _tmp355_ = {0};
-	SANE_Option_Descriptor* _tmp356_ = NULL;
+	SANE_Int _tmp353_ = {0};
+	SANE_Option_Descriptor* _tmp354_ = NULL;
+	SANE_Option_Descriptor* _tmp355_ = NULL;
+	SANE_Value_Type _tmp356_ = 0;
 	SANE_Option_Descriptor* _tmp357_ = NULL;
-	SANE_Value_Type _tmp358_ = 0;
+	SANE_Int _tmp358_ = {0};
 	SANE_Option_Descriptor* _tmp359_ = NULL;
-	SANE_Int _tmp360_ = {0};
-	SANE_Option_Descriptor* _tmp361_ = NULL;
-	const gchar* _tmp362_ = NULL;
-	GHashTable* _tmp363_ = NULL;
-	SANE_Option_Descriptor* _tmp364_ = NULL;
-	const gchar* _tmp365_ = NULL;
-	gchar* _tmp366_ = NULL;
-	SANE_Int _tmp367_ = {0};
+	const gchar* _tmp360_ = NULL;
+	GHashTable* _tmp361_ = NULL;
+	SANE_Option_Descriptor* _tmp362_ = NULL;
+	const gchar* _tmp363_ = NULL;
+	gchar* _tmp364_ = NULL;
+	SANE_Int _tmp365_ = {0};
 #line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 881 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8855,7 +8784,7 @@ static void scanner_do_get_option (Scanner* self) {
 	_tmp9_ = option;
 #line 889 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp9_ == NULL) {
-#line 8852 "scanner.c"
+#line 8781 "scanner.c"
 		SANE_Handle _tmp10_ = {0};
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
@@ -8900,25 +8829,23 @@ static void scanner_do_get_option (Scanner* self) {
 		SANE_Option_Descriptor* _tmp256_ = NULL;
 		gboolean _tmp257_ = FALSE;
 		SANE_Option_Descriptor* _tmp258_ = NULL;
-		gboolean _tmp261_ = FALSE;
-		SANE_Handle _tmp271_ = {0};
-		const gchar* _tmp272_ = NULL;
-		gint _tmp273_ = 0;
-		SANE_Option_Descriptor* _tmp274_ = NULL;
-		gboolean _tmp275_ = FALSE;
-		SANE_Option_Descriptor* _tmp276_ = NULL;
-		gboolean _tmp279_ = FALSE;
-		SANE_Handle _tmp289_ = {0};
-		const gchar* _tmp290_ = NULL;
-		gint _tmp291_ = 0;
-		SANE_Option_Descriptor* _tmp292_ = NULL;
-		SANE_Option_Descriptor* _tmp293_ = NULL;
-		SANE_Handle _tmp304_ = {0};
-		const gchar* _tmp305_ = NULL;
-		gint _tmp306_ = 0;
-		SANE_Option_Descriptor* _tmp307_ = NULL;
-		SANE_Option_Descriptor* _tmp308_ = NULL;
-		const gchar* _tmp319_ = NULL;
+		SANE_Handle _tmp270_ = {0};
+		const gchar* _tmp271_ = NULL;
+		gint _tmp272_ = 0;
+		SANE_Option_Descriptor* _tmp273_ = NULL;
+		gboolean _tmp274_ = FALSE;
+		SANE_Option_Descriptor* _tmp275_ = NULL;
+		SANE_Handle _tmp287_ = {0};
+		const gchar* _tmp288_ = NULL;
+		gint _tmp289_ = 0;
+		SANE_Option_Descriptor* _tmp290_ = NULL;
+		SANE_Option_Descriptor* _tmp291_ = NULL;
+		SANE_Handle _tmp302_ = {0};
+		const gchar* _tmp303_ = NULL;
+		gint _tmp304_ = 0;
+		SANE_Option_Descriptor* _tmp305_ = NULL;
+		SANE_Option_Descriptor* _tmp306_ = NULL;
+		const gchar* _tmp317_ = NULL;
 #line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp10_ = self->priv->handle;
 #line 892 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -8933,7 +8860,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp14_ = option;
 #line 893 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp14_ == NULL) {
-#line 8930 "scanner.c"
+#line 8857 "scanner.c"
 			SANE_Handle _tmp15_ = {0};
 			gint _tmp16_ = 0;
 			SANE_Option_Descriptor* _tmp17_ = NULL;
@@ -8948,13 +8875,13 @@ static void scanner_do_get_option (Scanner* self) {
 			index = (SANE_Int) _tmp16_;
 #line 896 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			option = _tmp17_;
-#line 8944 "scanner.c"
+#line 8871 "scanner.c"
 		}
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp18_ = option;
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp18_ != NULL) {
-#line 8950 "scanner.c"
+#line 8877 "scanner.c"
 			gchar** flatbed_sources = NULL;
 			gchar* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
@@ -9151,7 +9078,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp53_) {
 #line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_SINGLE:
-#line 9147 "scanner.c"
+#line 9074 "scanner.c"
 				{
 					SANE_Handle _tmp54_ = {0};
 					SANE_Option_Descriptor* _tmp55_ = NULL;
@@ -9167,7 +9094,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp57_ = scanner_set_default_option (self, _tmp54_, _tmp55_, _tmp56_);
 #line 944 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp57_) {
-#line 9163 "scanner.c"
+#line 9090 "scanner.c"
 						SANE_Handle _tmp58_ = {0};
 						SANE_Option_Descriptor* _tmp59_ = NULL;
 						SANE_Int _tmp60_ = {0};
@@ -9190,16 +9117,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp62_) {
 #line 946 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:946: Unable to set single page source, please file a bug");
-#line 9186 "scanner.c"
+#line 9113 "scanner.c"
 						}
 					}
 #line 947 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9191 "scanner.c"
+#line 9118 "scanner.c"
 				}
 #line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_FRONT:
-#line 9195 "scanner.c"
+#line 9122 "scanner.c"
 				{
 					SANE_Handle _tmp63_ = {0};
 					SANE_Option_Descriptor* _tmp64_ = NULL;
@@ -9221,7 +9148,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp67_ = scanner_set_constrained_string_option (self, _tmp63_, _tmp64_, _tmp65_, _tmp66_, _tmp66__length1, NULL);
 #line 949 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp67_) {
-#line 9217 "scanner.c"
+#line 9144 "scanner.c"
 						SANE_Handle _tmp68_ = {0};
 						SANE_Option_Descriptor* _tmp69_ = NULL;
 						SANE_Int _tmp70_ = {0};
@@ -9244,16 +9171,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp72_) {
 #line 951 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:951: Unable to set front ADF source, please file a bug");
-#line 9240 "scanner.c"
+#line 9167 "scanner.c"
 						}
 					}
 #line 952 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9245 "scanner.c"
+#line 9172 "scanner.c"
 				}
 #line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BACK:
-#line 9249 "scanner.c"
+#line 9176 "scanner.c"
 				{
 					SANE_Handle _tmp73_ = {0};
 					SANE_Option_Descriptor* _tmp74_ = NULL;
@@ -9275,7 +9202,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp77_ = scanner_set_constrained_string_option (self, _tmp73_, _tmp74_, _tmp75_, _tmp76_, _tmp76__length1, NULL);
 #line 954 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp77_) {
-#line 9271 "scanner.c"
+#line 9198 "scanner.c"
 						SANE_Handle _tmp78_ = {0};
 						SANE_Option_Descriptor* _tmp79_ = NULL;
 						SANE_Int _tmp80_ = {0};
@@ -9298,16 +9225,16 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp82_) {
 #line 956 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:956: Unable to set back ADF source, please file a bug");
-#line 9294 "scanner.c"
+#line 9221 "scanner.c"
 						}
 					}
 #line 957 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9299 "scanner.c"
+#line 9226 "scanner.c"
 				}
 #line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_TYPE_ADF_BOTH:
-#line 9303 "scanner.c"
+#line 9230 "scanner.c"
 				{
 					SANE_Handle _tmp83_ = {0};
 					SANE_Option_Descriptor* _tmp84_ = NULL;
@@ -9329,7 +9256,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp87_ = scanner_set_constrained_string_option (self, _tmp83_, _tmp84_, _tmp85_, _tmp86_, _tmp86__length1, NULL);
 #line 959 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					if (!_tmp87_) {
-#line 9325 "scanner.c"
+#line 9252 "scanner.c"
 						SANE_Handle _tmp88_ = {0};
 						SANE_Option_Descriptor* _tmp89_ = NULL;
 						SANE_Int _tmp90_ = {0};
@@ -9352,17 +9279,17 @@ static void scanner_do_get_option (Scanner* self) {
 						if (!_tmp92_) {
 #line 961 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							g_warning ("scanner.vala:961: Unable to set duplex ADF source, please file a bug");
-#line 9348 "scanner.c"
+#line 9275 "scanner.c"
 						}
 					}
 #line 962 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9353 "scanner.c"
+#line 9280 "scanner.c"
 				}
 				default:
 #line 941 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 9358 "scanner.c"
+#line 9285 "scanner.c"
 			}
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			adf_duplex_sources = (_vala_array_free (adf_duplex_sources, adf_duplex_sources_length1, (GDestroyNotify) g_free), NULL);
@@ -9374,7 +9301,7 @@ static void scanner_do_get_option (Scanner* self) {
 			adf_sources = (_vala_array_free (adf_sources, adf_sources_length1, (GDestroyNotify) g_free), NULL);
 #line 898 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			flatbed_sources = (_vala_array_free (flatbed_sources, flatbed_sources_length1, (GDestroyNotify) g_free), NULL);
-#line 9370 "scanner.c"
+#line 9297 "scanner.c"
 		}
 #line 967 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp93_ = self->priv->handle;
@@ -9390,7 +9317,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp97_ = option;
 #line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp97_ != NULL) {
-#line 9386 "scanner.c"
+#line 9313 "scanner.c"
 			gchar** color_scan_modes = NULL;
 			const gchar* _tmp98_ = NULL;
 			gchar* _tmp99_ = NULL;
@@ -9594,7 +9521,7 @@ static void scanner_do_get_option (Scanner* self) {
 			switch (_tmp137_) {
 #line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_COLOR:
-#line 9590 "scanner.c"
+#line 9517 "scanner.c"
 				{
 					SANE_Handle _tmp138_ = {0};
 					SANE_Option_Descriptor* _tmp139_ = NULL;
@@ -9618,15 +9545,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp142_) {
 #line 1011 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1011: Unable to set Color mode, please file a bug");
-#line 9614 "scanner.c"
+#line 9541 "scanner.c"
 					}
 #line 1012 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9618 "scanner.c"
+#line 9545 "scanner.c"
 				}
 #line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_GRAY:
-#line 9622 "scanner.c"
+#line 9549 "scanner.c"
 				{
 					SANE_Handle _tmp143_ = {0};
 					SANE_Option_Descriptor* _tmp144_ = NULL;
@@ -9650,15 +9577,15 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp147_) {
 #line 1015 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1015: Unable to set Gray mode, please file a bug");
-#line 9646 "scanner.c"
+#line 9573 "scanner.c"
 					}
 #line 1016 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9650 "scanner.c"
+#line 9577 "scanner.c"
 				}
 #line 1007 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				case SCAN_MODE_LINEART:
-#line 9654 "scanner.c"
+#line 9581 "scanner.c"
 				{
 					SANE_Handle _tmp148_ = {0};
 					SANE_Option_Descriptor* _tmp149_ = NULL;
@@ -9682,17 +9609,17 @@ static void scanner_do_get_option (Scanner* self) {
 					if (!_tmp152_) {
 #line 1019 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						g_warning ("scanner.vala:1019: Unable to set Lineart mode, please file a bug");
-#line 9678 "scanner.c"
+#line 9605 "scanner.c"
 					}
 #line 1020 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9682 "scanner.c"
+#line 9609 "scanner.c"
 				}
 				default:
 				{
 #line 1022 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					break;
-#line 9688 "scanner.c"
+#line 9615 "scanner.c"
 				}
 			}
 #line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9701,7 +9628,7 @@ static void scanner_do_get_option (Scanner* self) {
 			gray_scan_modes = (_vala_array_free (gray_scan_modes, gray_scan_modes_length1, (GDestroyNotify) g_free), NULL);
 #line 968 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			color_scan_modes = (_vala_array_free (color_scan_modes, color_scan_modes_length1, (GDestroyNotify) g_free), NULL);
-#line 9697 "scanner.c"
+#line 9624 "scanner.c"
 		}
 #line 1027 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp153_ = self->priv->handle;
@@ -9715,7 +9642,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp156_ = option;
 #line 1028 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp156_ != NULL) {
-#line 9711 "scanner.c"
+#line 9638 "scanner.c"
 			SANE_Option_Descriptor* _tmp157_ = NULL;
 			SANE_Value_Type _tmp158_ = 0;
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9724,7 +9651,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp158_ = _tmp157_->type;
 #line 1030 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp158_ == SANE_TYPE_BOOL) {
-#line 9720 "scanner.c"
+#line 9647 "scanner.c"
 				SANE_Handle _tmp159_ = {0};
 				SANE_Option_Descriptor* _tmp160_ = NULL;
 				SANE_Int _tmp161_ = {0};
@@ -9742,7 +9669,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp163_ = _tmp162_->type;
 #line 1031 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp159_, _tmp160_, _tmp161_, _tmp163_ == SCAN_TYPE_ADF_BOTH, NULL);
-#line 9738 "scanner.c"
+#line 9665 "scanner.c"
 			}
 		}
 #line 1035 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9757,7 +9684,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp167_ = option;
 #line 1036 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp167_ != NULL) {
-#line 9753 "scanner.c"
+#line 9680 "scanner.c"
 			SANE_Option_Descriptor* _tmp168_ = NULL;
 			SANE_Value_Type _tmp169_ = 0;
 #line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9766,7 +9693,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp169_ = _tmp168_->type;
 #line 1038 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp169_ == SANE_TYPE_BOOL) {
-#line 9762 "scanner.c"
+#line 9689 "scanner.c"
 				SANE_Handle _tmp170_ = {0};
 				SANE_Option_Descriptor* _tmp171_ = NULL;
 				SANE_Int _tmp172_ = {0};
@@ -9784,7 +9711,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp174_ = _tmp173_->type;
 #line 1039 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_bool_option (self, _tmp170_, _tmp171_, _tmp172_, _tmp174_ != SCAN_TYPE_SINGLE, NULL);
-#line 9780 "scanner.c"
+#line 9707 "scanner.c"
 			}
 		}
 #line 1043 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9799,7 +9726,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp178_ = option;
 #line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp178_ != NULL) {
-#line 9795 "scanner.c"
+#line 9722 "scanner.c"
 			gchar** disable_compression_names = NULL;
 			const gchar* _tmp179_ = NULL;
 			gchar* _tmp180_ = NULL;
@@ -9860,11 +9787,11 @@ static void scanner_do_get_option (Scanner* self) {
 			if (!_tmp190_) {
 #line 1055 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				g_warning ("scanner.vala:1055: Unable to disable compression, please file a bug");
-#line 9856 "scanner.c"
+#line 9783 "scanner.c"
 			}
 #line 1044 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			disable_compression_names = (_vala_array_free (disable_compression_names, disable_compression_names_length1, (GDestroyNotify) g_free), NULL);
-#line 9860 "scanner.c"
+#line 9787 "scanner.c"
 		}
 #line 1059 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp191_ = self->priv->handle;
@@ -9880,7 +9807,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp195_ = option;
 #line 1060 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp195_ != NULL) {
-#line 9876 "scanner.c"
+#line 9803 "scanner.c"
 			SANE_Handle _tmp196_ = {0};
 			SANE_Option_Descriptor* _tmp197_ = NULL;
 			SANE_Int _tmp198_ = {0};
@@ -9923,7 +9850,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp207_ = option;
 #line 1064 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp207_ != NULL) {
-#line 9919 "scanner.c"
+#line 9846 "scanner.c"
 				ScanJob* _tmp208_ = NULL;
 				gint _tmp209_ = 0;
 #line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9932,7 +9859,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp209_ = _tmp208_->depth;
 #line 1066 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				if (_tmp209_ > 0) {
-#line 9928 "scanner.c"
+#line 9855 "scanner.c"
 					SANE_Handle _tmp210_ = {0};
 					SANE_Option_Descriptor* _tmp211_ = NULL;
 					SANE_Int _tmp212_ = {0};
@@ -9950,7 +9877,7 @@ static void scanner_do_get_option (Scanner* self) {
 					_tmp214_ = _tmp213_->depth;
 #line 1067 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					scanner_set_int_option (self, _tmp210_, _tmp211_, _tmp212_, _tmp214_, NULL);
-#line 9946 "scanner.c"
+#line 9873 "scanner.c"
 				}
 			}
 		}
@@ -9968,7 +9895,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp219_ = option;
 #line 1073 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp219_ != NULL) {
-#line 9964 "scanner.c"
+#line 9891 "scanner.c"
 			ScanJob* _tmp220_ = NULL;
 			gint _tmp221_ = 0;
 #line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -9977,7 +9904,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp221_ = _tmp220_->page_width;
 #line 1075 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp221_ > 0) {
-#line 9973 "scanner.c"
+#line 9900 "scanner.c"
 				SANE_Handle _tmp222_ = {0};
 				SANE_Option_Descriptor* _tmp223_ = NULL;
 				SANE_Int _tmp224_ = {0};
@@ -10007,7 +9934,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp230_ = scanner_convert_page_size (self, _tmp225_, (gdouble) _tmp227_, _tmp229_);
 #line 1076 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp222_, _tmp223_, _tmp224_, _tmp230_, NULL);
-#line 10003 "scanner.c"
+#line 9930 "scanner.c"
 			} else {
 				SANE_Handle _tmp231_ = {0};
 				SANE_Option_Descriptor* _tmp232_ = NULL;
@@ -10020,7 +9947,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp233_ = index;
 #line 1078 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp231_, _tmp232_, _tmp233_);
-#line 10016 "scanner.c"
+#line 9943 "scanner.c"
 			}
 		}
 #line 1080 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10037,7 +9964,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp238_ = option;
 #line 1081 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp238_ != NULL) {
-#line 10033 "scanner.c"
+#line 9960 "scanner.c"
 			ScanJob* _tmp239_ = NULL;
 			gint _tmp240_ = 0;
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10046,7 +9973,7 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp240_ = _tmp239_->page_height;
 #line 1083 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			if (_tmp240_ > 0) {
-#line 10042 "scanner.c"
+#line 9969 "scanner.c"
 				SANE_Handle _tmp241_ = {0};
 				SANE_Option_Descriptor* _tmp242_ = NULL;
 				SANE_Int _tmp243_ = {0};
@@ -10076,7 +10003,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp249_ = scanner_convert_page_size (self, _tmp244_, (gdouble) _tmp246_, _tmp248_);
 #line 1084 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_fixed_or_int_option (self, _tmp241_, _tmp242_, _tmp243_, _tmp249_, NULL);
-#line 10072 "scanner.c"
+#line 9999 "scanner.c"
 			} else {
 				SANE_Handle _tmp250_ = {0};
 				SANE_Option_Descriptor* _tmp251_ = NULL;
@@ -10089,7 +10016,7 @@ static void scanner_do_get_option (Scanner* self) {
 				_tmp252_ = index;
 #line 1086 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_set_option_to_max (self, _tmp250_, _tmp251_, _tmp252_);
-#line 10085 "scanner.c"
+#line 10012 "scanner.c"
 			}
 		}
 #line 1090 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10106,7 +10033,7 @@ static void scanner_do_get_option (Scanner* self) {
 		_tmp258_ = option;
 #line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp258_ != NULL) {
-#line 10102 "scanner.c"
+#line 10029 "scanner.c"
 			ScanJob* _tmp259_ = NULL;
 			gint _tmp260_ = 0;
 #line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10115,379 +10042,375 @@ static void scanner_do_get_option (Scanner* self) {
 			_tmp260_ = _tmp259_->page_width;
 #line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp257_ = ((gdouble) _tmp260_) > 0.0;
-#line 10111 "scanner.c"
+#line 10038 "scanner.c"
 		} else {
 #line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp257_ = FALSE;
-#line 10115 "scanner.c"
+#line 10042 "scanner.c"
 		}
 #line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp261_ = _tmp257_;
-#line 1091 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp261_) {
-#line 10121 "scanner.c"
-			SANE_Handle _tmp262_ = {0};
-			SANE_Option_Descriptor* _tmp263_ = NULL;
-			SANE_Int _tmp264_ = {0};
-			SANE_Option_Descriptor* _tmp265_ = NULL;
-			ScanJob* _tmp266_ = NULL;
-			gint _tmp267_ = 0;
-			ScanJob* _tmp268_ = NULL;
+		if (_tmp257_) {
+#line 10046 "scanner.c"
+			SANE_Handle _tmp261_ = {0};
+			SANE_Option_Descriptor* _tmp262_ = NULL;
+			SANE_Int _tmp263_ = {0};
+			SANE_Option_Descriptor* _tmp264_ = NULL;
+			ScanJob* _tmp265_ = NULL;
+			gint _tmp266_ = 0;
+			ScanJob* _tmp267_ = NULL;
+			gdouble _tmp268_ = 0.0;
 			gdouble _tmp269_ = 0.0;
-			gdouble _tmp270_ = 0.0;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp262_ = self->priv->handle;
+			_tmp261_ = self->priv->handle;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp263_ = option;
+			_tmp262_ = option;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp264_ = index;
+			_tmp263_ = index;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp265_ = option;
+			_tmp264_ = option;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp266_ = job;
+			_tmp265_ = job;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp267_ = _tmp266_->page_width;
+			_tmp266_ = _tmp265_->page_width;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp268_ = job;
+			_tmp267_ = job;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp269_ = _tmp268_->dpi;
+			_tmp268_ = _tmp267_->dpi;
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp270_ = scanner_convert_page_size (self, _tmp265_, (gdouble) _tmp267_, _tmp269_);
+			_tmp269_ = scanner_convert_page_size (self, _tmp264_, (gdouble) _tmp266_, _tmp268_);
 #line 1092 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_set_fixed_or_int_option (self, _tmp262_, _tmp263_, _tmp264_, _tmp270_, NULL);
-#line 10151 "scanner.c"
+			scanner_set_fixed_or_int_option (self, _tmp261_, _tmp262_, _tmp263_, _tmp269_, NULL);
+#line 10076 "scanner.c"
 		}
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp271_ = self->priv->handle;
+		_tmp270_ = self->priv->handle;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp272_ = SANE_NAME_PAGE_HEIGHT;
+		_tmp271_ = SANE_NAME_PAGE_HEIGHT;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp274_ = scanner_get_option_by_name (self, _tmp271_, _tmp272_, &_tmp273_);
+		_tmp273_ = scanner_get_option_by_name (self, _tmp270_, _tmp271_, &_tmp272_);
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp273_;
+		index = (SANE_Int) _tmp272_;
 #line 1093 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp274_;
+		option = _tmp273_;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp276_ = option;
+		_tmp275_ = option;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp276_ != NULL) {
-#line 10167 "scanner.c"
-			ScanJob* _tmp277_ = NULL;
-			gint _tmp278_ = 0;
+		if (_tmp275_ != NULL) {
+#line 10092 "scanner.c"
+			ScanJob* _tmp276_ = NULL;
+			gint _tmp277_ = 0;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp277_ = job;
+			_tmp276_ = job;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp278_ = _tmp277_->page_height;
+			_tmp277_ = _tmp276_->page_height;
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp275_ = ((gdouble) _tmp278_) > 0.0;
-#line 10176 "scanner.c"
+			_tmp274_ = ((gdouble) _tmp277_) > 0.0;
+#line 10101 "scanner.c"
 		} else {
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp275_ = FALSE;
-#line 10180 "scanner.c"
+			_tmp274_ = FALSE;
+#line 10105 "scanner.c"
 		}
 #line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp279_ = _tmp275_;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp279_) {
-#line 10186 "scanner.c"
-			SANE_Handle _tmp280_ = {0};
+		if (_tmp274_) {
+#line 10109 "scanner.c"
+			SANE_Handle _tmp278_ = {0};
+			SANE_Option_Descriptor* _tmp279_ = NULL;
+			SANE_Int _tmp280_ = {0};
 			SANE_Option_Descriptor* _tmp281_ = NULL;
-			SANE_Int _tmp282_ = {0};
-			SANE_Option_Descriptor* _tmp283_ = NULL;
+			ScanJob* _tmp282_ = NULL;
+			gint _tmp283_ = 0;
 			ScanJob* _tmp284_ = NULL;
-			gint _tmp285_ = 0;
-			ScanJob* _tmp286_ = NULL;
-			gdouble _tmp287_ = 0.0;
-			gdouble _tmp288_ = 0.0;
+			gdouble _tmp285_ = 0.0;
+			gdouble _tmp286_ = 0.0;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp280_ = self->priv->handle;
+			_tmp278_ = self->priv->handle;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp281_ = option;
+			_tmp279_ = option;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp282_ = index;
+			_tmp280_ = index;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp283_ = option;
+			_tmp281_ = option;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp284_ = job;
+			_tmp282_ = job;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp285_ = _tmp284_->page_height;
+			_tmp283_ = _tmp282_->page_height;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp286_ = job;
+			_tmp284_ = job;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp287_ = _tmp286_->dpi;
+			_tmp285_ = _tmp284_->dpi;
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp288_ = scanner_convert_page_size (self, _tmp283_, (gdouble) _tmp285_, _tmp287_);
+			_tmp286_ = scanner_convert_page_size (self, _tmp281_, (gdouble) _tmp283_, _tmp285_);
 #line 1095 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			scanner_set_fixed_or_int_option (self, _tmp280_, _tmp281_, _tmp282_, _tmp288_, NULL);
-#line 10216 "scanner.c"
+			scanner_set_fixed_or_int_option (self, _tmp278_, _tmp279_, _tmp280_, _tmp286_, NULL);
+#line 10139 "scanner.c"
 		}
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp289_ = self->priv->handle;
+		_tmp287_ = self->priv->handle;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp290_ = SANE_NAME_BRIGHTNESS;
+		_tmp288_ = SANE_NAME_BRIGHTNESS;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp292_ = scanner_get_option_by_name (self, _tmp289_, _tmp290_, &_tmp291_);
+		_tmp290_ = scanner_get_option_by_name (self, _tmp287_, _tmp288_, &_tmp289_);
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp291_;
+		index = (SANE_Int) _tmp289_;
 #line 1097 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp292_;
+		option = _tmp290_;
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp293_ = option;
+		_tmp291_ = option;
 #line 1098 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp293_ != NULL) {
-#line 10232 "scanner.c"
-			ScanJob* _tmp294_ = NULL;
-			gint _tmp295_ = 0;
+		if (_tmp291_ != NULL) {
+#line 10155 "scanner.c"
+			ScanJob* _tmp292_ = NULL;
+			gint _tmp293_ = 0;
 #line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp294_ = job;
+			_tmp292_ = job;
 #line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp295_ = _tmp294_->brightness;
+			_tmp293_ = _tmp292_->brightness;
 #line 1100 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp295_ != 0) {
-#line 10241 "scanner.c"
+			if (_tmp293_ != 0) {
+#line 10164 "scanner.c"
 				gint brightness = 0;
-				SANE_Option_Descriptor* _tmp296_ = NULL;
-				ScanJob* _tmp297_ = NULL;
-				gint _tmp298_ = 0;
-				gint _tmp299_ = 0;
-				SANE_Handle _tmp300_ = {0};
-				SANE_Option_Descriptor* _tmp301_ = NULL;
-				SANE_Int _tmp302_ = {0};
-				gint _tmp303_ = 0;
+				SANE_Option_Descriptor* _tmp294_ = NULL;
+				ScanJob* _tmp295_ = NULL;
+				gint _tmp296_ = 0;
+				gint _tmp297_ = 0;
+				SANE_Handle _tmp298_ = {0};
+				SANE_Option_Descriptor* _tmp299_ = NULL;
+				SANE_Int _tmp300_ = {0};
+				gint _tmp301_ = 0;
 #line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp296_ = option;
+				_tmp294_ = option;
 #line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp297_ = job;
+				_tmp295_ = job;
 #line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp298_ = _tmp297_->brightness;
+				_tmp296_ = _tmp295_->brightness;
 #line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp299_ = scanner_scale_int (self, -100, 100, _tmp296_, _tmp298_);
+				_tmp297_ = scanner_scale_int (self, -100, 100, _tmp294_, _tmp296_);
 #line 1102 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				brightness = _tmp299_;
+				brightness = _tmp297_;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp300_ = self->priv->handle;
+				_tmp298_ = self->priv->handle;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp301_ = option;
+				_tmp299_ = option;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp302_ = index;
+				_tmp300_ = index;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp303_ = brightness;
+				_tmp301_ = brightness;
 #line 1103 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp300_, _tmp301_, _tmp302_, _tmp303_, NULL);
-#line 10271 "scanner.c"
+				scanner_set_int_option (self, _tmp298_, _tmp299_, _tmp300_, _tmp301_, NULL);
+#line 10194 "scanner.c"
 			}
 		}
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp304_ = self->priv->handle;
+		_tmp302_ = self->priv->handle;
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp305_ = SANE_NAME_CONTRAST;
+		_tmp303_ = SANE_NAME_CONTRAST;
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp307_ = scanner_get_option_by_name (self, _tmp304_, _tmp305_, &_tmp306_);
+		_tmp305_ = scanner_get_option_by_name (self, _tmp302_, _tmp303_, &_tmp304_);
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		index = (SANE_Int) _tmp306_;
+		index = (SANE_Int) _tmp304_;
 #line 1106 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		option = _tmp307_;
+		option = _tmp305_;
 #line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp308_ = option;
+		_tmp306_ = option;
 #line 1107 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp308_ != NULL) {
-#line 10288 "scanner.c"
-			ScanJob* _tmp309_ = NULL;
-			gint _tmp310_ = 0;
+		if (_tmp306_ != NULL) {
+#line 10211 "scanner.c"
+			ScanJob* _tmp307_ = NULL;
+			gint _tmp308_ = 0;
 #line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp309_ = job;
+			_tmp307_ = job;
 #line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp310_ = _tmp309_->contrast;
+			_tmp308_ = _tmp307_->contrast;
 #line 1109 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp310_ != 0) {
-#line 10297 "scanner.c"
+			if (_tmp308_ != 0) {
+#line 10220 "scanner.c"
 				gint contrast = 0;
-				SANE_Option_Descriptor* _tmp311_ = NULL;
-				ScanJob* _tmp312_ = NULL;
-				gint _tmp313_ = 0;
-				gint _tmp314_ = 0;
-				SANE_Handle _tmp315_ = {0};
-				SANE_Option_Descriptor* _tmp316_ = NULL;
-				SANE_Int _tmp317_ = {0};
-				gint _tmp318_ = 0;
+				SANE_Option_Descriptor* _tmp309_ = NULL;
+				ScanJob* _tmp310_ = NULL;
+				gint _tmp311_ = 0;
+				gint _tmp312_ = 0;
+				SANE_Handle _tmp313_ = {0};
+				SANE_Option_Descriptor* _tmp314_ = NULL;
+				SANE_Int _tmp315_ = {0};
+				gint _tmp316_ = 0;
 #line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp311_ = option;
+				_tmp309_ = option;
 #line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp312_ = job;
+				_tmp310_ = job;
 #line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp313_ = _tmp312_->contrast;
+				_tmp311_ = _tmp310_->contrast;
 #line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp314_ = scanner_scale_int (self, -100, 100, _tmp311_, _tmp313_);
+				_tmp312_ = scanner_scale_int (self, -100, 100, _tmp309_, _tmp311_);
 #line 1111 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				contrast = _tmp314_;
+				contrast = _tmp312_;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp315_ = self->priv->handle;
+				_tmp313_ = self->priv->handle;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp316_ = option;
+				_tmp314_ = option;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp317_ = index;
+				_tmp315_ = index;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp318_ = contrast;
+				_tmp316_ = contrast;
 #line 1112 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp315_, _tmp316_, _tmp317_, _tmp318_, NULL);
-#line 10327 "scanner.c"
+				scanner_set_int_option (self, _tmp313_, _tmp314_, _tmp315_, _tmp316_, NULL);
+#line 10250 "scanner.c"
 			}
 		}
 #line 1117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp319_ = self->priv->current_device;
+		_tmp317_ = self->priv->current_device;
 #line 1117 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (g_strcmp0 (_tmp319_, "test") == 0) {
-#line 10334 "scanner.c"
-			SANE_Handle _tmp320_ = {0};
-			gint _tmp321_ = 0;
-			SANE_Option_Descriptor* _tmp322_ = NULL;
-			SANE_Option_Descriptor* _tmp323_ = NULL;
-			SANE_Handle _tmp327_ = {0};
-			gint _tmp328_ = 0;
-			SANE_Option_Descriptor* _tmp329_ = NULL;
-			SANE_Option_Descriptor* _tmp330_ = NULL;
-			SANE_Handle _tmp334_ = {0};
-			gint _tmp335_ = 0;
-			SANE_Option_Descriptor* _tmp336_ = NULL;
-			SANE_Option_Descriptor* _tmp337_ = NULL;
-			SANE_Handle _tmp341_ = {0};
-			gint _tmp342_ = 0;
-			SANE_Option_Descriptor* _tmp343_ = NULL;
-			SANE_Option_Descriptor* _tmp344_ = NULL;
-			SANE_Handle _tmp348_ = {0};
-			gint _tmp349_ = 0;
-			SANE_Option_Descriptor* _tmp350_ = NULL;
-			SANE_Option_Descriptor* _tmp351_ = NULL;
+		if (g_strcmp0 (_tmp317_, "test") == 0) {
+#line 10257 "scanner.c"
+			SANE_Handle _tmp318_ = {0};
+			gint _tmp319_ = 0;
+			SANE_Option_Descriptor* _tmp320_ = NULL;
+			SANE_Option_Descriptor* _tmp321_ = NULL;
+			SANE_Handle _tmp325_ = {0};
+			gint _tmp326_ = 0;
+			SANE_Option_Descriptor* _tmp327_ = NULL;
+			SANE_Option_Descriptor* _tmp328_ = NULL;
+			SANE_Handle _tmp332_ = {0};
+			gint _tmp333_ = 0;
+			SANE_Option_Descriptor* _tmp334_ = NULL;
+			SANE_Option_Descriptor* _tmp335_ = NULL;
+			SANE_Handle _tmp339_ = {0};
+			gint _tmp340_ = 0;
+			SANE_Option_Descriptor* _tmp341_ = NULL;
+			SANE_Option_Descriptor* _tmp342_ = NULL;
+			SANE_Handle _tmp346_ = {0};
+			gint _tmp347_ = 0;
+			SANE_Option_Descriptor* _tmp348_ = NULL;
+			SANE_Option_Descriptor* _tmp349_ = NULL;
 #line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp320_ = self->priv->handle;
+			_tmp318_ = self->priv->handle;
 #line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp322_ = scanner_get_option_by_name (self, _tmp320_, "hand-scanner", &_tmp321_);
+			_tmp320_ = scanner_get_option_by_name (self, _tmp318_, "hand-scanner", &_tmp319_);
 #line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp321_;
+			index = (SANE_Int) _tmp319_;
 #line 1119 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp322_;
+			option = _tmp320_;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp323_ = option;
+			_tmp321_ = option;
 #line 1120 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp323_ != NULL) {
-#line 10367 "scanner.c"
-				SANE_Handle _tmp324_ = {0};
-				SANE_Option_Descriptor* _tmp325_ = NULL;
-				SANE_Int _tmp326_ = {0};
+			if (_tmp321_ != NULL) {
+#line 10290 "scanner.c"
+				SANE_Handle _tmp322_ = {0};
+				SANE_Option_Descriptor* _tmp323_ = NULL;
+				SANE_Int _tmp324_ = {0};
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp324_ = self->priv->handle;
+				_tmp322_ = self->priv->handle;
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp325_ = option;
+				_tmp323_ = option;
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp326_ = index;
+				_tmp324_ = index;
 #line 1121 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp324_, _tmp325_, _tmp326_, FALSE, NULL);
-#line 10379 "scanner.c"
+				scanner_set_bool_option (self, _tmp322_, _tmp323_, _tmp324_, FALSE, NULL);
+#line 10302 "scanner.c"
 			}
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp327_ = self->priv->handle;
+			_tmp325_ = self->priv->handle;
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp329_ = scanner_get_option_by_name (self, _tmp327_, "three-pass", &_tmp328_);
+			_tmp327_ = scanner_get_option_by_name (self, _tmp325_, "three-pass", &_tmp326_);
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp328_;
+			index = (SANE_Int) _tmp326_;
 #line 1122 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp329_;
+			option = _tmp327_;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp330_ = option;
+			_tmp328_ = option;
 #line 1123 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp330_ != NULL) {
-#line 10393 "scanner.c"
-				SANE_Handle _tmp331_ = {0};
-				SANE_Option_Descriptor* _tmp332_ = NULL;
-				SANE_Int _tmp333_ = {0};
+			if (_tmp328_ != NULL) {
+#line 10316 "scanner.c"
+				SANE_Handle _tmp329_ = {0};
+				SANE_Option_Descriptor* _tmp330_ = NULL;
+				SANE_Int _tmp331_ = {0};
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp331_ = self->priv->handle;
+				_tmp329_ = self->priv->handle;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp332_ = option;
+				_tmp330_ = option;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp333_ = index;
+				_tmp331_ = index;
 #line 1124 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp331_, _tmp332_, _tmp333_, FALSE, NULL);
-#line 10405 "scanner.c"
+				scanner_set_bool_option (self, _tmp329_, _tmp330_, _tmp331_, FALSE, NULL);
+#line 10328 "scanner.c"
 			}
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp334_ = self->priv->handle;
+			_tmp332_ = self->priv->handle;
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp336_ = scanner_get_option_by_name (self, _tmp334_, "test-picture", &_tmp335_);
+			_tmp334_ = scanner_get_option_by_name (self, _tmp332_, "test-picture", &_tmp333_);
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp335_;
+			index = (SANE_Int) _tmp333_;
 #line 1125 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp336_;
+			option = _tmp334_;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp337_ = option;
+			_tmp335_ = option;
 #line 1126 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp337_ != NULL) {
-#line 10419 "scanner.c"
-				SANE_Handle _tmp338_ = {0};
-				SANE_Option_Descriptor* _tmp339_ = NULL;
-				SANE_Int _tmp340_ = {0};
+			if (_tmp335_ != NULL) {
+#line 10342 "scanner.c"
+				SANE_Handle _tmp336_ = {0};
+				SANE_Option_Descriptor* _tmp337_ = NULL;
+				SANE_Int _tmp338_ = {0};
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp338_ = self->priv->handle;
+				_tmp336_ = self->priv->handle;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp339_ = option;
+				_tmp337_ = option;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp340_ = index;
+				_tmp338_ = index;
 #line 1127 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_string_option (self, _tmp338_, _tmp339_, _tmp340_, "Color pattern", NULL);
-#line 10431 "scanner.c"
+				scanner_set_string_option (self, _tmp336_, _tmp337_, _tmp338_, "Color pattern", NULL);
+#line 10354 "scanner.c"
 			}
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp341_ = self->priv->handle;
+			_tmp339_ = self->priv->handle;
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp343_ = scanner_get_option_by_name (self, _tmp341_, "read-delay", &_tmp342_);
+			_tmp341_ = scanner_get_option_by_name (self, _tmp339_, "read-delay", &_tmp340_);
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp342_;
+			index = (SANE_Int) _tmp340_;
 #line 1128 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp343_;
+			option = _tmp341_;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp344_ = option;
+			_tmp342_ = option;
 #line 1129 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp344_ != NULL) {
-#line 10445 "scanner.c"
-				SANE_Handle _tmp345_ = {0};
-				SANE_Option_Descriptor* _tmp346_ = NULL;
-				SANE_Int _tmp347_ = {0};
+			if (_tmp342_ != NULL) {
+#line 10368 "scanner.c"
+				SANE_Handle _tmp343_ = {0};
+				SANE_Option_Descriptor* _tmp344_ = NULL;
+				SANE_Int _tmp345_ = {0};
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp345_ = self->priv->handle;
+				_tmp343_ = self->priv->handle;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp346_ = option;
+				_tmp344_ = option;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp347_ = index;
+				_tmp345_ = index;
 #line 1130 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_bool_option (self, _tmp345_, _tmp346_, _tmp347_, TRUE, NULL);
-#line 10457 "scanner.c"
+				scanner_set_bool_option (self, _tmp343_, _tmp344_, _tmp345_, TRUE, NULL);
+#line 10380 "scanner.c"
 			}
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp348_ = self->priv->handle;
+			_tmp346_ = self->priv->handle;
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp350_ = scanner_get_option_by_name (self, _tmp348_, "read-delay-duration", &_tmp349_);
+			_tmp348_ = scanner_get_option_by_name (self, _tmp346_, "read-delay-duration", &_tmp347_);
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			index = (SANE_Int) _tmp349_;
+			index = (SANE_Int) _tmp347_;
 #line 1131 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			option = _tmp350_;
+			option = _tmp348_;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp351_ = option;
+			_tmp349_ = option;
 #line 1132 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			if (_tmp351_ != NULL) {
-#line 10471 "scanner.c"
-				SANE_Handle _tmp352_ = {0};
-				SANE_Option_Descriptor* _tmp353_ = NULL;
-				SANE_Int _tmp354_ = {0};
+			if (_tmp349_ != NULL) {
+#line 10394 "scanner.c"
+				SANE_Handle _tmp350_ = {0};
+				SANE_Option_Descriptor* _tmp351_ = NULL;
+				SANE_Int _tmp352_ = {0};
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp352_ = self->priv->handle;
+				_tmp350_ = self->priv->handle;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp353_ = option;
+				_tmp351_ = option;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp354_ = index;
+				_tmp352_ = index;
 #line 1133 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				scanner_set_int_option (self, _tmp352_, _tmp353_, _tmp354_, 200000, NULL);
-#line 10483 "scanner.c"
+				scanner_set_int_option (self, _tmp350_, _tmp351_, _tmp352_, 200000, NULL);
+#line 10406 "scanner.c"
 			}
 		}
 #line 1136 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10496,65 +10419,65 @@ static void scanner_do_get_option (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1137 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10492 "scanner.c"
+#line 10415 "scanner.c"
 	}
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp355_ = index;
+	_tmp353_ = index;
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp356_ = option;
+	_tmp354_ = option;
 #line 1140 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	scanner_log_option (self, _tmp355_, _tmp356_);
+	scanner_log_option (self, _tmp353_, _tmp354_);
 #line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp357_ = option;
+	_tmp355_ = option;
 #line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp358_ = _tmp357_->type;
+	_tmp356_ = _tmp355_->type;
 #line 1143 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp358_ == SANE_TYPE_GROUP) {
+	if (_tmp356_ == SANE_TYPE_GROUP) {
 #line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
 #line 1144 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10510 "scanner.c"
+#line 10433 "scanner.c"
 	}
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp359_ = option;
+	_tmp357_ = option;
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp360_ = _tmp359_->cap;
+	_tmp358_ = _tmp357_->cap;
 #line 1147 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if ((_tmp360_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
+	if ((_tmp358_ & SANE_CAP_INACTIVE) != ((SANE_Int) 0)) {
 #line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
 #line 1148 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10522 "scanner.c"
+#line 10445 "scanner.c"
 	}
 #line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp361_ = option;
+	_tmp359_ = option;
 #line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp362_ = _tmp361_->name;
+	_tmp360_ = _tmp359_->name;
 #line 1151 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp362_ == NULL) {
+	if (_tmp360_ == NULL) {
 #line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
 #line 1152 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10534 "scanner.c"
+#line 10457 "scanner.c"
 	}
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp363_ = self->priv->options;
+	_tmp361_ = self->priv->options;
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp364_ = option;
+	_tmp362_ = option;
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp365_ = _tmp364_->name;
+	_tmp363_ = _tmp362_->name;
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp366_ = g_strdup (_tmp365_);
+	_tmp364_ = g_strdup (_tmp363_);
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp367_ = index;
+	_tmp365_ = index;
 #line 1154 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_hash_table_insert (_tmp363_, _tmp366_, (gpointer) ((gintptr) ((gint) _tmp367_)));
+	g_hash_table_insert (_tmp361_, _tmp364_, (gpointer) ((gintptr) ((gint) _tmp365_)));
 #line 879 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 10550 "scanner.c"
+#line 10473 "scanner.c"
 }
 
 
@@ -10572,7 +10495,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 	_tmp1_ = _tmp0_->unit;
 #line 1159 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ == SANE_UNIT_PIXEL) {
-#line 10568 "scanner.c"
+#line 10491 "scanner.c"
 		gdouble _tmp2_ = 0.0;
 		gdouble _tmp3_ = 0.0;
 #line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10583,7 +10506,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		result = (_tmp2_ * _tmp3_) / 254.0;
 #line 1160 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10579 "scanner.c"
+#line 10502 "scanner.c"
 	} else {
 		SANE_Option_Descriptor* _tmp4_ = NULL;
 		SANE_Unit _tmp5_ = 0;
@@ -10593,7 +10516,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 		_tmp5_ = _tmp4_->unit;
 #line 1161 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp5_ == SANE_UNIT_MM) {
-#line 10589 "scanner.c"
+#line 10512 "scanner.c"
 			gdouble _tmp6_ = 0.0;
 #line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp6_ = size;
@@ -10601,7 +10524,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = _tmp6_ / 10.0;
 #line 1162 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10597 "scanner.c"
+#line 10520 "scanner.c"
 		} else {
 #line 1165 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			g_warning ("scanner.vala:1165: Unable to set unsupported unit type");
@@ -10609,7 +10532,7 @@ static gdouble scanner_convert_page_size (Scanner* self, SANE_Option_Descriptor*
 			result = (gdouble) 0.0f;
 #line 1166 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 10605 "scanner.c"
+#line 10528 "scanner.c"
 		}
 	}
 }
@@ -10647,11 +10570,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 		if (index) {
 #line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			*index = _vala_index;
-#line 10643 "scanner.c"
+#line 10566 "scanner.c"
 		}
 #line 1174 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 10647 "scanner.c"
+#line 10570 "scanner.c"
 	}
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp4_ = handle;
@@ -10665,11 +10588,11 @@ static SANE_Option_Descriptor* scanner_get_option_by_name (Scanner* self, SANE_H
 	if (index) {
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*index = _vala_index;
-#line 10661 "scanner.c"
+#line 10584 "scanner.c"
 	}
 #line 1176 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 10665 "scanner.c"
+#line 10588 "scanner.c"
 }
 
 
@@ -10701,7 +10624,7 @@ static void scanner_do_complete_document (Scanner* self) {
 		self->priv->state = SCAN_STATE_OPEN;
 #line 1192 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10697 "scanner.c"
+#line 10620 "scanner.c"
 	}
 #line 1198 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp3_ = notify_document_done_new ();
@@ -10713,7 +10636,7 @@ static void scanner_do_complete_document (Scanner* self) {
 	_notify_unref0 (_tmp4_);
 #line 1199 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_set_scanning (self, FALSE);
-#line 10709 "scanner.c"
+#line 10632 "scanner.c"
 }
 
 
@@ -10765,7 +10688,7 @@ static void scanner_do_start (Scanner* self) {
 	if (_tmp9_ == SANE_STATUS_GOOD) {
 #line 1211 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->state = SCAN_STATE_GET_PARAMETERS;
-#line 10761 "scanner.c"
+#line 10684 "scanner.c"
 	} else {
 		SANE_Status _tmp10_ = 0;
 #line 1212 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10774,7 +10697,7 @@ static void scanner_do_start (Scanner* self) {
 		if (_tmp10_ == SANE_STATUS_NO_DOCS) {
 #line 1213 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_do_complete_document (self);
-#line 10770 "scanner.c"
+#line 10693 "scanner.c"
 		} else {
 			SANE_Status _tmp11_ = 0;
 			const gchar* _tmp12_ = NULL;
@@ -10792,7 +10715,7 @@ static void scanner_do_start (Scanner* self) {
 			_tmp14_ = _ ("Unable to start scan");
 #line 1217 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			scanner_fail_scan (self, (gint) _tmp13_, _tmp14_);
-#line 10788 "scanner.c"
+#line 10711 "scanner.c"
 		}
 	}
 }
@@ -10807,7 +10730,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 	switch (_tmp0_) {
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GRAY:
-#line 10803 "scanner.c"
+#line 10726 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10816,11 +10739,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp1_;
 #line 106 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10812 "scanner.c"
+#line 10735 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RGB:
-#line 10816 "scanner.c"
+#line 10739 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10829,11 +10752,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp2_;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10825 "scanner.c"
+#line 10748 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_RED:
-#line 10829 "scanner.c"
+#line 10752 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10842,11 +10765,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp3_;
 #line 110 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10838 "scanner.c"
+#line 10761 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_GREEN:
-#line 10842 "scanner.c"
+#line 10765 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10855,11 +10778,11 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp4_;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10851 "scanner.c"
+#line 10774 "scanner.c"
 		}
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 		case SANE_FRAME_BLUE:
-#line 10855 "scanner.c"
+#line 10778 "scanner.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
@@ -10868,7 +10791,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp5_;
 #line 114 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10864 "scanner.c"
+#line 10787 "scanner.c"
 		}
 		default:
 		{
@@ -10882,7 +10805,7 @@ static gchar* sane_frame_to_string (SANE_Frame frame) {
 			result = _tmp7_;
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/sane.vapi"
 			return result;
-#line 10878 "scanner.c"
+#line 10801 "scanner.c"
 		}
 	}
 }
@@ -10908,52 +10831,47 @@ static void scanner_do_get_parameters (Scanner* self) {
 	SANE_Frame _tmp18_ = 0;
 	gchar* _tmp19_ = NULL;
 	gchar* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	SANE_Parameters _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	SANE_Parameters _tmp24_ = {0};
-	gint _tmp25_ = 0;
-	SANE_Parameters _tmp26_ = {0};
-	gint _tmp27_ = 0;
-	SANE_Parameters _tmp28_ = {0};
-	gint _tmp29_ = 0;
+	SANE_Parameters _tmp21_ = {0};
+	gint _tmp22_ = 0;
+	SANE_Parameters _tmp23_ = {0};
+	gint _tmp24_ = 0;
+	SANE_Parameters _tmp25_ = {0};
+	gint _tmp26_ = 0;
+	SANE_Parameters _tmp27_ = {0};
+	gint _tmp28_ = 0;
 	ScanPageInfo* info = NULL;
+	ScanPageInfo* _tmp29_ = NULL;
 	ScanPageInfo* _tmp30_ = NULL;
-	ScanPageInfo* _tmp31_ = NULL;
-	SANE_Parameters _tmp32_ = {0};
-	gint _tmp33_ = 0;
-	ScanPageInfo* _tmp34_ = NULL;
-	SANE_Parameters _tmp35_ = {0};
-	gint _tmp36_ = 0;
-	ScanPageInfo* _tmp37_ = NULL;
-	SANE_Parameters _tmp38_ = {0};
-	gint _tmp39_ = 0;
+	SANE_Parameters _tmp31_ = {0};
+	gint _tmp32_ = 0;
+	ScanPageInfo* _tmp33_ = NULL;
+	SANE_Parameters _tmp34_ = {0};
+	gint _tmp35_ = 0;
+	ScanPageInfo* _tmp36_ = NULL;
+	SANE_Parameters _tmp37_ = {0};
+	gint _tmp38_ = 0;
+	gboolean _tmp39_ = FALSE;
 	gboolean _tmp40_ = FALSE;
 	gboolean _tmp41_ = FALSE;
-	gboolean _tmp42_ = FALSE;
-	SANE_Parameters _tmp43_ = {0};
-	gint _tmp44_ = 0;
-	gboolean _tmp47_ = FALSE;
-	gboolean _tmp50_ = FALSE;
-	gboolean _tmp53_ = FALSE;
-	gint _tmp57_ = 0;
-	SANE_Parameters _tmp58_ = {0};
-	SANE_Frame _tmp59_ = 0;
+	SANE_Parameters _tmp42_ = {0};
+	gint _tmp43_ = 0;
+	gint _tmp53_ = 0;
+	SANE_Parameters _tmp54_ = {0};
+	SANE_Frame _tmp55_ = 0;
+	ScanPageInfo* _tmp56_ = NULL;
+	ScanPageInfo* _tmp57_ = NULL;
+	ScanJob* _tmp58_ = NULL;
+	gdouble _tmp59_ = 0.0;
 	ScanPageInfo* _tmp60_ = NULL;
-	gint _tmp61_ = 0;
-	ScanPageInfo* _tmp62_ = NULL;
-	ScanJob* _tmp63_ = NULL;
-	gdouble _tmp64_ = 0.0;
-	ScanPageInfo* _tmp65_ = NULL;
-	const gchar* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	gint _tmp68_ = 0;
-	gint _tmp69_ = 0;
+	const gchar* _tmp61_ = NULL;
+	gchar* _tmp62_ = NULL;
+	gint _tmp63_ = 0;
+	gint _tmp64_ = 0;
 	gint buffer_size = 0;
-	SANE_Parameters _tmp76_ = {0};
-	gint _tmp77_ = 0;
-	gint _tmp78_ = 0;
-	guchar* _tmp79_ = NULL;
+	SANE_Parameters _tmp71_ = {0};
+	gint _tmp72_ = 0;
+	gint _tmp73_ = 0;
+	guchar* _tmp74_ = NULL;
 #line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 1225 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -10978,7 +10896,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_tmp6_ = status;
 #line 1227 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp6_ != SANE_STATUS_GOOD) {
-#line 10974 "scanner.c"
+#line 10892 "scanner.c"
 		SANE_Status _tmp7_ = 0;
 		const gchar* _tmp8_ = NULL;
 		SANE_Status _tmp9_ = 0;
@@ -10997,7 +10915,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 		scanner_fail_scan (self, (gint) _tmp9_, _tmp10_);
 #line 1233 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 10993 "scanner.c"
+#line 10911 "scanner.c"
 	}
 #line 1236 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp11_ = self->priv->job_queue;
@@ -11015,11 +10933,11 @@ static void scanner_do_get_parameters (Scanner* self) {
 	if (_tmp16_) {
 #line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_TRUE";
-#line 11011 "scanner.c"
+#line 10929 "scanner.c"
 	} else {
 #line 1240 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp14_ = "SANE_FALSE";
-#line 11015 "scanner.c"
+#line 10933 "scanner.c"
 	}
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp17_ = self->priv->parameters;
@@ -11030,220 +10948,210 @@ static void scanner_do_get_parameters (Scanner* self) {
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp20_ = _tmp19_;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_ = _tmp14_;
-#line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp22_ = self->priv->parameters;
+	_tmp21_ = self->priv->parameters;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_ = _tmp22_.bytes_per_line;
+	_tmp22_ = _tmp21_.bytes_per_line;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp24_ = self->priv->parameters;
+	_tmp23_ = self->priv->parameters;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = _tmp24_.pixels_per_line;
+	_tmp24_ = _tmp23_.pixels_per_line;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = self->priv->parameters;
+	_tmp25_ = self->priv->parameters;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = _tmp26_.lines;
+	_tmp26_ = _tmp25_.lines;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = self->priv->parameters;
+	_tmp27_ = self->priv->parameters;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = _tmp28_.depth;
+	_tmp28_ = _tmp27_.depth;
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1238: Parameters: format=%s last_frame=%s bytes_per_line=" \
-"%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp21_, _tmp23_, _tmp25_, _tmp27_, _tmp29_);
+"%d pixels_per_line=%d lines=%d depth=%d", _tmp20_, _tmp14_, _tmp22_, _tmp24_, _tmp26_, _tmp28_);
 #line 1238 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_g_free0 (_tmp20_);
 #line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = scan_page_info_new ();
+	_tmp29_ = scan_page_info_new ();
 #line 1246 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	info = _tmp30_;
+	info = _tmp29_;
 #line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_ = info;
+	_tmp30_ = info;
 #line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp32_ = self->priv->parameters;
+	_tmp31_ = self->priv->parameters;
 #line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_ = _tmp32_.pixels_per_line;
+	_tmp32_ = _tmp31_.pixels_per_line;
 #line 1247 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_->width = _tmp33_;
+	_tmp30_->width = _tmp32_;
 #line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_ = info;
+	_tmp33_ = info;
 #line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp35_ = self->priv->parameters;
+	_tmp34_ = self->priv->parameters;
 #line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = _tmp35_.lines;
+	_tmp35_ = _tmp34_.lines;
 #line 1248 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_->height = _tmp36_;
+	_tmp33_->height = _tmp35_;
 #line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_ = info;
+	_tmp36_ = info;
 #line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp38_ = self->priv->parameters;
+	_tmp37_ = self->priv->parameters;
 #line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_ = _tmp38_.depth;
+	_tmp38_ = _tmp37_.depth;
 #line 1249 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_->depth = _tmp39_;
+	_tmp36_->depth = _tmp38_;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = self->priv->parameters;
+	_tmp42_ = self->priv->parameters;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = _tmp43_.depth;
+	_tmp43_ = _tmp42_.depth;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp44_ == 8) {
-#line 11081 "scanner.c"
-		SANE_Parameters _tmp45_ = {0};
-		SANE_Frame _tmp46_ = 0;
+	if (_tmp43_ == 8) {
+#line 10997 "scanner.c"
+		SANE_Parameters _tmp44_ = {0};
+		SANE_Frame _tmp45_ = 0;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp45_ = self->priv->parameters;
+		_tmp44_ = self->priv->parameters;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp46_ = _tmp45_.format;
+		_tmp45_ = _tmp44_.format;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp42_ = _tmp46_ == SANE_FRAME_GRAY;
-#line 11090 "scanner.c"
+		_tmp41_ = _tmp45_ == SANE_FRAME_GRAY;
+#line 11006 "scanner.c"
 	} else {
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp42_ = FALSE;
-#line 11094 "scanner.c"
+		_tmp41_ = FALSE;
+#line 11010 "scanner.c"
 	}
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = _tmp42_;
+	if (_tmp41_) {
+#line 11014 "scanner.c"
+		ScanJob* _tmp46_ = NULL;
+		gint _tmp47_ = 0;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp47_) {
-#line 11100 "scanner.c"
-		ScanJob* _tmp48_ = NULL;
-		gint _tmp49_ = 0;
+		_tmp46_ = job;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp48_ = job;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp49_ = _tmp48_->depth;
+		_tmp47_ = _tmp46_->depth;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp41_ = _tmp49_ == 2;
-#line 11109 "scanner.c"
+		_tmp40_ = _tmp47_ == 2;
+#line 11023 "scanner.c"
 	} else {
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp41_ = FALSE;
-#line 11113 "scanner.c"
+		_tmp40_ = FALSE;
+#line 11027 "scanner.c"
 	}
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = _tmp41_;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp50_) {
-#line 11119 "scanner.c"
-		ScanJob* _tmp51_ = NULL;
-		ScanMode _tmp52_ = 0;
+	if (_tmp40_) {
+#line 11031 "scanner.c"
+		ScanJob* _tmp48_ = NULL;
+		ScanMode _tmp49_ = 0;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp51_ = job;
+		_tmp48_ = job;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp52_ = _tmp51_->scan_mode;
+		_tmp49_ = _tmp48_->scan_mode;
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp40_ = _tmp52_ == SCAN_MODE_GRAY;
-#line 11128 "scanner.c"
+		_tmp39_ = _tmp49_ == SCAN_MODE_GRAY;
+#line 11040 "scanner.c"
 	} else {
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp40_ = FALSE;
-#line 11132 "scanner.c"
+		_tmp39_ = FALSE;
+#line 11044 "scanner.c"
 	}
 #line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = _tmp40_;
-#line 1252 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp53_) {
-#line 11138 "scanner.c"
-		ScanPageInfo* _tmp54_ = NULL;
-		ScanJob* _tmp55_ = NULL;
-		gint _tmp56_ = 0;
+	if (_tmp39_) {
+#line 11048 "scanner.c"
+		ScanPageInfo* _tmp50_ = NULL;
+		ScanJob* _tmp51_ = NULL;
+		gint _tmp52_ = 0;
 #line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp54_ = info;
+		_tmp50_ = info;
 #line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp55_ = job;
+		_tmp51_ = job;
 #line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp56_ = _tmp55_->depth;
+		_tmp52_ = _tmp51_->depth;
 #line 1253 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp54_->depth = _tmp56_;
-#line 11150 "scanner.c"
+		_tmp50_->depth = _tmp52_;
+#line 11060 "scanner.c"
 	}
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp58_ = self->priv->parameters;
+	_tmp54_ = self->priv->parameters;
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp59_ = _tmp58_.format;
+	_tmp55_ = _tmp54_.format;
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp59_ == SANE_FRAME_GRAY) {
+	if (_tmp55_ == SANE_FRAME_GRAY) {
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_ = 1;
-#line 11160 "scanner.c"
+		_tmp53_ = 1;
+#line 11070 "scanner.c"
 	} else {
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_ = 3;
-#line 11164 "scanner.c"
+		_tmp53_ = 3;
+#line 11074 "scanner.c"
 	}
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp60_ = info;
-#line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp61_ = _tmp57_;
+	_tmp56_ = info;
 #line 1254 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp60_->n_channels = _tmp61_;
+	_tmp56_->n_channels = _tmp53_;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp62_ = info;
+	_tmp57_ = info;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp63_ = job;
+	_tmp58_ = job;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp64_ = _tmp63_->dpi;
+	_tmp59_ = _tmp58_->dpi;
 #line 1255 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp62_->dpi = _tmp64_;
+	_tmp57_->dpi = _tmp59_;
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp65_ = info;
+	_tmp60_ = info;
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp66_ = self->priv->current_device;
+	_tmp61_ = self->priv->current_device;
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp67_ = g_strdup (_tmp66_);
+	_tmp62_ = g_strdup (_tmp61_);
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp65_->device);
+	_g_free0 (_tmp60_->device);
 #line 1256 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp65_->device = _tmp67_;
+	_tmp60_->device = _tmp62_;
 #line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp68_ = self->priv->page_number;
+	_tmp63_ = self->priv->page_number;
 #line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp69_ = self->priv->notified_page;
+	_tmp64_ = self->priv->notified_page;
 #line 1258 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp68_ != _tmp69_) {
-#line 11196 "scanner.c"
-		ScanJob* _tmp70_ = NULL;
-		gint _tmp71_ = 0;
-		ScanPageInfo* _tmp72_ = NULL;
-		NotifyGotPageInfo* _tmp73_ = NULL;
-		NotifyGotPageInfo* _tmp74_ = NULL;
-		gint _tmp75_ = 0;
+	if (_tmp63_ != _tmp64_) {
+#line 11104 "scanner.c"
+		ScanJob* _tmp65_ = NULL;
+		gint _tmp66_ = 0;
+		ScanPageInfo* _tmp67_ = NULL;
+		NotifyGotPageInfo* _tmp68_ = NULL;
+		NotifyGotPageInfo* _tmp69_ = NULL;
+		gint _tmp70_ = 0;
 #line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp70_ = job;
+		_tmp65_ = job;
 #line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp71_ = _tmp70_->id;
+		_tmp66_ = _tmp65_->id;
 #line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp72_ = info;
+		_tmp67_ = info;
 #line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp73_ = notify_got_page_info_new (_tmp71_, _tmp72_);
+		_tmp68_ = notify_got_page_info_new (_tmp66_, _tmp67_);
 #line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp74_ = _tmp73_;
+		_tmp69_ = _tmp68_;
 #line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_notify (self, (Notify*) _tmp74_);
+		scanner_notify (self, (Notify*) _tmp69_);
 #line 1260 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp74_);
+		_notify_unref0 (_tmp69_);
 #line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp75_ = self->priv->page_number;
+		_tmp70_ = self->priv->page_number;
 #line 1261 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->notified_page = _tmp75_;
-#line 11221 "scanner.c"
+		self->priv->notified_page = _tmp70_;
+#line 11129 "scanner.c"
 	}
 #line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp76_ = self->priv->parameters;
+	_tmp71_ = self->priv->parameters;
 #line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp77_ = _tmp76_.bytes_per_line;
+	_tmp72_ = _tmp71_.bytes_per_line;
 #line 1265 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	buffer_size = _tmp77_ + 1;
+	buffer_size = _tmp72_ + 1;
 #line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp78_ = buffer_size;
+	_tmp73_ = buffer_size;
 #line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp79_ = g_new0 (guchar, _tmp78_);
+	_tmp74_ = g_new0 (guchar, _tmp73_);
 #line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
 #line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer = _tmp79_;
+	self->priv->buffer = _tmp74_;
 #line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->buffer_length1 = _tmp78_;
+	self->priv->buffer_length1 = _tmp73_;
 #line 1266 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->_buffer_size_ = self->priv->buffer_length1;
 #line 1267 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11258,7 +11166,7 @@ static void scanner_do_get_parameters (Scanner* self) {
 	_scan_page_info_unref0 (info);
 #line 1223 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11253 "scanner.c"
+#line 11161 "scanner.c"
 }
 
 
@@ -11303,7 +11211,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp8_ = _tmp7_.last_frame;
 #line 1280 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!_tmp8_) {
-#line 11298 "scanner.c"
+#line 11206 "scanner.c"
 		gint _tmp9_ = 0;
 #line 1282 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp9_ = self->priv->pass_number;
@@ -11315,7 +11223,7 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1284 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11310 "scanner.c"
+#line 11218 "scanner.c"
 	}
 #line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp10_ = job;
@@ -11323,7 +11231,7 @@ static void scanner_do_complete_page (Scanner* self) {
 	_tmp11_ = _tmp10_->type;
 #line 1288 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp11_ != SCAN_TYPE_SINGLE) {
-#line 11318 "scanner.c"
+#line 11226 "scanner.c"
 		gint _tmp12_ = 0;
 		ScanJob* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
@@ -11353,13 +11261,13 @@ static void scanner_do_complete_page (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1294 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11348 "scanner.c"
+#line 11256 "scanner.c"
 	}
 #line 1297 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_do_complete_document (self);
 #line 1273 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 11354 "scanner.c"
+#line 11262 "scanner.c"
 }
 
 
@@ -11389,16 +11297,15 @@ static void scanner_do_read (Scanner* self) {
 	gchar* _tmp15_ = NULL;
 	SANE_Int _tmp16_ = {0};
 	SANE_Status _tmp17_ = 0;
-	SANE_Status _tmp30_ = 0;
+	SANE_Status _tmp29_ = 0;
 	gboolean full_read = FALSE;
-	gboolean _tmp35_ = FALSE;
-	gint _tmp36_ = 0;
-	gboolean _tmp39_ = FALSE;
+	gboolean _tmp34_ = FALSE;
+	gint _tmp35_ = 0;
+	gint _tmp38_ = 0;
+	SANE_Int _tmp39_ = {0};
 	gint _tmp40_ = 0;
-	SANE_Int _tmp41_ = {0};
+	SANE_Parameters _tmp41_ = {0};
 	gint _tmp42_ = 0;
-	SANE_Parameters _tmp43_ = {0};
-	gint _tmp44_ = 0;
 #line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 1302 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -11455,19 +11362,18 @@ static void scanner_do_read (Scanner* self) {
 	_tmp17_ = status;
 #line 1313 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp17_ == SANE_STATUS_EOF) {
-#line 11450 "scanner.c"
+#line 11357 "scanner.c"
 		gboolean _tmp18_ = FALSE;
 		SANE_Parameters _tmp19_ = {0};
 		gint _tmp20_ = 0;
-		gboolean _tmp24_ = FALSE;
-		gint _tmp28_ = 0;
+		gint _tmp27_ = 0;
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp19_ = self->priv->parameters;
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp20_ = _tmp19_.lines;
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_tmp20_ > 0) {
-#line 11462 "scanner.c"
+#line 11368 "scanner.c"
 			gint _tmp21_ = 0;
 			SANE_Parameters _tmp22_ = {0};
 			gint _tmp23_ = 0;
@@ -11479,41 +11385,39 @@ static void scanner_do_read (Scanner* self) {
 			_tmp23_ = _tmp22_.lines;
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = _tmp21_ != _tmp23_;
-#line 11474 "scanner.c"
+#line 11380 "scanner.c"
 		} else {
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			_tmp18_ = FALSE;
-#line 11478 "scanner.c"
+#line 11384 "scanner.c"
 		}
 #line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp24_ = _tmp18_;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp24_) {
-#line 11484 "scanner.c"
-			gint _tmp25_ = 0;
-			SANE_Parameters _tmp26_ = {0};
-			gint _tmp27_ = 0;
+		if (_tmp18_) {
+#line 11388 "scanner.c"
+			gint _tmp24_ = 0;
+			SANE_Parameters _tmp25_ = {0};
+			gint _tmp26_ = 0;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp25_ = self->priv->line_count;
+			_tmp24_ = self->priv->line_count;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp26_ = self->priv->parameters;
+			_tmp25_ = self->priv->parameters;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp27_ = _tmp26_.lines;
+			_tmp26_ = _tmp25_.lines;
 #line 1316 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1316: Scan completed with %d lines, expected %d lines", _tmp25_, _tmp27_);
-#line 11496 "scanner.c"
+			g_warning ("scanner.vala:1316: Scan completed with %d lines, expected %d lines", _tmp24_, _tmp26_);
+#line 11400 "scanner.c"
 		}
 #line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp28_ = self->priv->n_used;
+		_tmp27_ = self->priv->n_used;
 #line 1317 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp28_ > 0) {
-#line 11502 "scanner.c"
-			gint _tmp29_ = 0;
+		if (_tmp27_ > 0) {
+#line 11406 "scanner.c"
+			gint _tmp28_ = 0;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp29_ = self->priv->n_used;
+			_tmp28_ = self->priv->n_used;
 #line 1318 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			g_warning ("scanner.vala:1318: Scan complete with %d bytes of unused data", _tmp29_);
-#line 11508 "scanner.c"
+			g_warning ("scanner.vala:1318: Scan complete with %d bytes of unused data", _tmp28_);
+#line 11412 "scanner.c"
 		}
 #line 1319 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_do_complete_page (self);
@@ -11521,779 +11425,764 @@ static void scanner_do_read (Scanner* self) {
 		_scan_job_unref0 (job);
 #line 1320 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11516 "scanner.c"
+#line 11420 "scanner.c"
 	}
 #line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = status;
+	_tmp29_ = status;
 #line 1324 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp30_ != SANE_STATUS_GOOD) {
-#line 11522 "scanner.c"
-		SANE_Status _tmp31_ = 0;
-		const gchar* _tmp32_ = NULL;
-		SANE_Status _tmp33_ = 0;
-		const gchar* _tmp34_ = NULL;
+	if (_tmp29_ != SANE_STATUS_GOOD) {
+#line 11426 "scanner.c"
+		SANE_Status _tmp30_ = 0;
+		const gchar* _tmp31_ = NULL;
+		SANE_Status _tmp32_ = 0;
+		const gchar* _tmp33_ = NULL;
 #line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp31_ = status;
+		_tmp30_ = status;
 #line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp32_ = sane_strstatus (_tmp31_);
+		_tmp31_ = sane_strstatus (_tmp30_);
 #line 1326 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_warning ("scanner.vala:1326: Unable to read frame from device: %s", _tmp32_);
+		g_warning ("scanner.vala:1326: Unable to read frame from device: %s", _tmp31_);
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp33_ = status;
+		_tmp32_ = status;
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp34_ = _ ("Error communicating with scanner");
+		_tmp33_ = _ ("Error communicating with scanner");
 #line 1327 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_fail_scan (self, (gint) _tmp33_, _tmp34_);
+		scanner_fail_scan (self, (gint) _tmp32_, _tmp33_);
 #line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_job_unref0 (job);
 #line 1330 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 11543 "scanner.c"
+#line 11447 "scanner.c"
 	}
 #line 1333 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	full_read = FALSE;
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = self->priv->n_used;
+	_tmp35_ = self->priv->n_used;
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp36_ == 0) {
-#line 11551 "scanner.c"
-		SANE_Int _tmp37_ = {0};
-		guchar* _tmp38_ = NULL;
-		gint _tmp38__length1 = 0;
+	if (_tmp35_ == 0) {
+#line 11455 "scanner.c"
+		SANE_Int _tmp36_ = {0};
+		guchar* _tmp37_ = NULL;
+		gint _tmp37__length1 = 0;
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp37_ = n_read;
+		_tmp36_ = n_read;
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp38_ = self->priv->buffer;
+		_tmp37_ = self->priv->buffer;
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp38__length1 = self->priv->buffer_length1;
+		_tmp37__length1 = self->priv->buffer_length1;
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp35_ = _tmp37_ == ((SANE_Int) _tmp38__length1);
-#line 11563 "scanner.c"
+		_tmp34_ = _tmp36_ == ((SANE_Int) _tmp37__length1);
+#line 11467 "scanner.c"
 	} else {
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp35_ = FALSE;
-#line 11567 "scanner.c"
+		_tmp34_ = FALSE;
+#line 11471 "scanner.c"
 	}
 #line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_ = _tmp35_;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp39_) {
+	if (_tmp34_) {
 #line 1335 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		full_read = TRUE;
-#line 11575 "scanner.c"
+#line 11477 "scanner.c"
 	}
 #line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp40_ = self->priv->n_used;
+	_tmp38_ = self->priv->n_used;
 #line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp41_ = n_read;
+	_tmp39_ = n_read;
 #line 1336 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->priv->n_used = _tmp40_ + ((gint) _tmp41_);
+	self->priv->n_used = _tmp38_ + ((gint) _tmp39_);
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = self->priv->n_used;
+	_tmp40_ = self->priv->n_used;
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = self->priv->parameters;
+	_tmp41_ = self->priv->parameters;
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = _tmp43_.bytes_per_line;
+	_tmp42_ = _tmp41_.bytes_per_line;
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	if (_tmp42_ >= _tmp44_) {
-#line 11591 "scanner.c"
+	if (_tmp40_ >= _tmp42_) {
+#line 11493 "scanner.c"
 		ScanLine* line = NULL;
-		ScanLine* _tmp45_ = NULL;
-		SANE_Parameters _tmp46_ = {0};
-		SANE_Frame _tmp47_ = 0;
-		ScanLine* _tmp53_ = NULL;
-		SANE_Parameters _tmp54_ = {0};
-		gint _tmp55_ = 0;
-		ScanLine* _tmp56_ = NULL;
-		SANE_Parameters _tmp57_ = {0};
-		gint _tmp58_ = 0;
+		ScanLine* _tmp43_ = NULL;
+		SANE_Parameters _tmp44_ = {0};
+		SANE_Frame _tmp45_ = 0;
+		ScanLine* _tmp51_ = NULL;
+		SANE_Parameters _tmp52_ = {0};
+		gint _tmp53_ = 0;
+		ScanLine* _tmp54_ = NULL;
+		SANE_Parameters _tmp55_ = {0};
+		gint _tmp56_ = 0;
+		ScanLine* _tmp57_ = NULL;
+		guchar* _tmp58_ = NULL;
+		gint _tmp58__length1 = 0;
 		ScanLine* _tmp59_ = NULL;
-		guchar* _tmp60_ = NULL;
-		gint _tmp60__length1 = 0;
-		ScanLine* _tmp61_ = NULL;
-		SANE_Parameters _tmp62_ = {0};
+		SANE_Parameters _tmp60_ = {0};
+		gint _tmp61_ = 0;
+		ScanLine* _tmp62_ = NULL;
 		gint _tmp63_ = 0;
 		ScanLine* _tmp64_ = NULL;
 		gint _tmp65_ = 0;
 		ScanLine* _tmp66_ = NULL;
 		gint _tmp67_ = 0;
-		ScanLine* _tmp68_ = NULL;
-		gint _tmp69_ = 0;
+		gint _tmp68_ = 0;
+		ScanLine* _tmp69_ = NULL;
 		gint _tmp70_ = 0;
-		ScanLine* _tmp71_ = NULL;
-		gint _tmp72_ = 0;
 		gint buffer_size = 0;
-		guchar* _tmp73_ = NULL;
-		gint _tmp73__length1 = 0;
-		gboolean _tmp74_ = FALSE;
-		gint _tmp78_ = 0;
-		guchar* _tmp79_ = NULL;
+		ScanLine* _tmp71_ = NULL;
+		guchar* _tmp72_ = NULL;
+		gint _tmp72__length1 = 0;
+		gboolean _tmp73_ = FALSE;
+		gint _tmp77_ = 0;
+		guchar* _tmp78_ = NULL;
 		gint n_remaining = 0;
-		gint _tmp80_ = 0;
-		ScanLine* _tmp81_ = NULL;
-		gint _tmp82_ = 0;
-		ScanLine* _tmp83_ = NULL;
-		gint _tmp84_ = 0;
+		gint _tmp79_ = 0;
+		ScanLine* _tmp80_ = NULL;
+		gint _tmp81_ = 0;
+		ScanLine* _tmp82_ = NULL;
+		gint _tmp83_ = 0;
+		gboolean _tmp100_ = FALSE;
+		gboolean _tmp101_ = FALSE;
 		gboolean _tmp102_ = FALSE;
-		gboolean _tmp103_ = FALSE;
-		gboolean _tmp104_ = FALSE;
-		SANE_Parameters _tmp105_ = {0};
-		gint _tmp106_ = 0;
-		gboolean _tmp109_ = FALSE;
-		gboolean _tmp112_ = FALSE;
-		gboolean _tmp115_ = FALSE;
-		ScanJob* _tmp160_ = NULL;
-		gint _tmp161_ = 0;
-		ScanLine* _tmp162_ = NULL;
-		NotifyGotLine* _tmp163_ = NULL;
-		NotifyGotLine* _tmp164_ = NULL;
+		SANE_Parameters _tmp103_ = {0};
+		gint _tmp104_ = 0;
+		ScanJob* _tmp153_ = NULL;
+		gint _tmp154_ = 0;
+		ScanLine* _tmp155_ = NULL;
+		NotifyGotLine* _tmp156_ = NULL;
+		NotifyGotLine* _tmp157_ = NULL;
 #line 1341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp45_ = scan_line_new ();
+		_tmp43_ = scan_line_new ();
 #line 1341 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		line = _tmp45_;
+		line = _tmp43_;
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp46_ = self->priv->parameters;
+		_tmp44_ = self->priv->parameters;
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp47_ = _tmp46_.format;
+		_tmp45_ = _tmp44_.format;
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		switch (_tmp47_) {
+		switch (_tmp45_) {
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GRAY:
-#line 11654 "scanner.c"
+#line 11554 "scanner.c"
 			{
-				ScanLine* _tmp48_ = NULL;
+				ScanLine* _tmp46_ = NULL;
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp48_ = line;
+				_tmp46_ = line;
 #line 1345 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp48_->channel = 0;
+				_tmp46_->channel = 0;
 #line 1346 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11663 "scanner.c"
+#line 11563 "scanner.c"
 			}
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RGB:
-#line 11667 "scanner.c"
+#line 11567 "scanner.c"
 			{
-				ScanLine* _tmp49_ = NULL;
+				ScanLine* _tmp47_ = NULL;
 #line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp49_ = line;
+				_tmp47_ = line;
 #line 1348 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp49_->channel = -1;
+				_tmp47_->channel = -1;
 #line 1349 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11676 "scanner.c"
+#line 11576 "scanner.c"
 			}
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_RED:
-#line 11680 "scanner.c"
+#line 11580 "scanner.c"
 			{
-				ScanLine* _tmp50_ = NULL;
+				ScanLine* _tmp48_ = NULL;
 #line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp50_ = line;
+				_tmp48_ = line;
 #line 1351 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp50_->channel = 0;
+				_tmp48_->channel = 0;
 #line 1352 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11689 "scanner.c"
+#line 11589 "scanner.c"
 			}
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_GREEN:
-#line 11693 "scanner.c"
+#line 11593 "scanner.c"
 			{
-				ScanLine* _tmp51_ = NULL;
+				ScanLine* _tmp49_ = NULL;
 #line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp51_ = line;
+				_tmp49_ = line;
 #line 1354 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp51_->channel = 1;
+				_tmp49_->channel = 1;
 #line 1355 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11702 "scanner.c"
+#line 11602 "scanner.c"
 			}
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SANE_FRAME_BLUE:
-#line 11706 "scanner.c"
+#line 11606 "scanner.c"
 			{
-				ScanLine* _tmp52_ = NULL;
+				ScanLine* _tmp50_ = NULL;
 #line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp52_ = line;
+				_tmp50_ = line;
 #line 1357 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp52_->channel = 2;
+				_tmp50_->channel = 2;
 #line 1358 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 11715 "scanner.c"
+#line 11615 "scanner.c"
 			}
 			default:
 #line 1342 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 11720 "scanner.c"
+#line 11620 "scanner.c"
 		}
 #line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp53_ = line;
+		_tmp51_ = line;
 #line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp54_ = self->priv->parameters;
+		_tmp52_ = self->priv->parameters;
 #line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp55_ = _tmp54_.pixels_per_line;
+		_tmp53_ = _tmp52_.pixels_per_line;
 #line 1360 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp53_->width = _tmp55_;
+		_tmp51_->width = _tmp53_;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp56_ = line;
+		_tmp54_ = line;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp57_ = self->priv->parameters;
+		_tmp55_ = self->priv->parameters;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp58_ = _tmp57_.depth;
+		_tmp56_ = _tmp55_.depth;
 #line 1361 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp56_->depth = _tmp58_;
+		_tmp54_->depth = _tmp56_;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_ = line;
+		_tmp57_ = line;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp60_ = self->priv->buffer;
+		_tmp58_ = self->priv->buffer;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp60__length1 = self->priv->buffer_length1;
+		_tmp58__length1 = self->priv->buffer_length1;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = NULL;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_->data = (g_free (_tmp59_->data), NULL);
+		self->priv->buffer_length1 = 0;
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_->data = _tmp60_;
+		_tmp57_->data = (g_free (_tmp57_->data), NULL);
 #line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp59_->data_length1 = _tmp60__length1;
+		_tmp57_->data = _tmp58_;
+#line 1362 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp57_->data_length1 = _tmp58__length1;
 #line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp61_ = line;
+		_tmp59_ = line;
 #line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp62_ = self->priv->parameters;
+		_tmp60_ = self->priv->parameters;
 #line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp63_ = _tmp62_.bytes_per_line;
+		_tmp61_ = _tmp60_.bytes_per_line;
 #line 1363 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp61_->data_length = _tmp63_;
+		_tmp59_->data_length = _tmp61_;
 #line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp64_ = line;
+		_tmp62_ = line;
 #line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp65_ = self->priv->line_count;
+		_tmp63_ = self->priv->line_count;
 #line 1364 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp64_->number = _tmp65_;
+		_tmp62_->number = _tmp63_;
 #line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp66_ = line;
+		_tmp64_ = line;
 #line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp67_ = self->priv->n_used;
+		_tmp65_ = self->priv->n_used;
 #line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp68_ = line;
+		_tmp66_ = line;
 #line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp69_ = _tmp68_->data_length;
+		_tmp67_ = _tmp66_->data_length;
 #line 1365 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp66_->n_lines = _tmp67_ / _tmp69_;
+		_tmp64_->n_lines = _tmp65_ / _tmp67_;
 #line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp70_ = self->priv->line_count;
+		_tmp68_ = self->priv->line_count;
 #line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp71_ = line;
+		_tmp69_ = line;
 #line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp72_ = _tmp71_->n_lines;
+		_tmp70_ = _tmp69_->n_lines;
 #line 1367 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->line_count = _tmp70_ + _tmp72_;
+		self->priv->line_count = _tmp68_ + _tmp70_;
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp71_ = line;
 #line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp73_ = self->priv->buffer;
+		_tmp72_ = _tmp71_->data;
 #line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp73__length1 = self->priv->buffer_length1;
+		_tmp72__length1 = _tmp71_->data_length1;
 #line 1370 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		buffer_size = _tmp73__length1;
+		buffer_size = _tmp72__length1;
 #line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp74_ = full_read;
+		_tmp73_ = full_read;
 #line 1371 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp74_) {
-#line 11794 "scanner.c"
-			gint _tmp75_ = 0;
-			SANE_Parameters _tmp76_ = {0};
-			gint _tmp77_ = 0;
+		if (_tmp73_) {
+#line 11698 "scanner.c"
+			gint _tmp74_ = 0;
+			SANE_Parameters _tmp75_ = {0};
+			gint _tmp76_ = 0;
 #line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp75_ = buffer_size;
+			_tmp74_ = buffer_size;
 #line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp76_ = self->priv->parameters;
+			_tmp75_ = self->priv->parameters;
 #line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp77_ = _tmp76_.bytes_per_line;
+			_tmp76_ = _tmp75_.bytes_per_line;
 #line 1372 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			buffer_size = _tmp75_ + _tmp77_;
-#line 11806 "scanner.c"
+			buffer_size = _tmp74_ + _tmp76_;
+#line 11710 "scanner.c"
 		}
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp78_ = buffer_size;
+		_tmp77_ = buffer_size;
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp79_ = g_new0 (guchar, _tmp78_);
+		_tmp78_ = g_new0 (guchar, _tmp77_);
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->buffer = (g_free (self->priv->buffer), NULL);
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->buffer = _tmp79_;
+		self->priv->buffer = _tmp78_;
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->buffer_length1 = _tmp78_;
+		self->priv->buffer_length1 = _tmp77_;
 #line 1374 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->_buffer_size_ = self->priv->buffer_length1;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp80_ = self->priv->n_used;
+		_tmp79_ = self->priv->n_used;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp81_ = line;
+		_tmp80_ = line;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp82_ = _tmp81_->n_lines;
+		_tmp81_ = _tmp80_->n_lines;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp83_ = line;
+		_tmp82_ = line;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp84_ = _tmp83_->data_length;
+		_tmp83_ = _tmp82_->data_length;
 #line 1375 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		n_remaining = _tmp80_ - (_tmp82_ * _tmp84_);
+		n_remaining = _tmp79_ - (_tmp81_ * _tmp83_);
 #line 1376 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->n_used = 0;
-#line 11834 "scanner.c"
+#line 11738 "scanner.c"
 		{
 			gint i = 0;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			i = 0;
-#line 11839 "scanner.c"
+#line 11743 "scanner.c"
 			{
-				gboolean _tmp85_ = FALSE;
+				gboolean _tmp84_ = FALSE;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-				_tmp85_ = TRUE;
+				_tmp84_ = TRUE;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				while (TRUE) {
-#line 11846 "scanner.c"
-					gboolean _tmp86_ = FALSE;
-					gint _tmp88_ = 0;
+#line 11750 "scanner.c"
+					gint _tmp86_ = 0;
+					gint _tmp87_ = 0;
+					guchar* _tmp88_ = NULL;
+					gint _tmp88__length1 = 0;
 					gint _tmp89_ = 0;
-					guchar* _tmp90_ = NULL;
-					gint _tmp90__length1 = 0;
-					gint _tmp91_ = 0;
-					ScanLine* _tmp92_ = NULL;
-					guchar* _tmp93_ = NULL;
-					gint _tmp93__length1 = 0;
+					ScanLine* _tmp90_ = NULL;
+					guchar* _tmp91_ = NULL;
+					gint _tmp91__length1 = 0;
+					gint _tmp92_ = 0;
+					ScanLine* _tmp93_ = NULL;
 					gint _tmp94_ = 0;
 					ScanLine* _tmp95_ = NULL;
 					gint _tmp96_ = 0;
-					ScanLine* _tmp97_ = NULL;
-					gint _tmp98_ = 0;
-					guchar _tmp99_ = '\0';
-					guchar _tmp100_ = '\0';
-					gint _tmp101_ = 0;
-#line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp86_ = _tmp85_;
+					guchar _tmp97_ = '\0';
+					guchar _tmp98_ = '\0';
+					gint _tmp99_ = 0;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!_tmp86_) {
-#line 11868 "scanner.c"
-						gint _tmp87_ = 0;
+					if (!_tmp84_) {
+#line 11769 "scanner.c"
+						gint _tmp85_ = 0;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp87_ = i;
+						_tmp85_ = i;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						i = _tmp87_ + 1;
-#line 11874 "scanner.c"
+						i = _tmp85_ + 1;
+#line 11775 "scanner.c"
 					}
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp85_ = FALSE;
+					_tmp84_ = FALSE;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp88_ = i;
+					_tmp86_ = i;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp89_ = n_remaining;
+					_tmp87_ = n_remaining;
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					if (!(_tmp88_ < _tmp89_)) {
+					if (!(_tmp86_ < _tmp87_)) {
 #line 1377 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 						break;
-#line 11886 "scanner.c"
+#line 11787 "scanner.c"
 					}
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp90_ = self->priv->buffer;
+					_tmp88_ = self->priv->buffer;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp90__length1 = self->priv->buffer_length1;
+					_tmp88__length1 = self->priv->buffer_length1;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp91_ = i;
+					_tmp89_ = i;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp92_ = line;
+					_tmp90_ = line;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp93_ = _tmp92_->data;
+					_tmp91_ = _tmp90_->data;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp93__length1 = _tmp92_->data_length1;
+					_tmp91__length1 = _tmp90_->data_length1;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp94_ = i;
+					_tmp92_ = i;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp95_ = line;
+					_tmp93_ = line;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp96_ = _tmp95_->n_lines;
+					_tmp94_ = _tmp93_->n_lines;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp97_ = line;
+					_tmp95_ = line;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp98_ = _tmp97_->data_length;
+					_tmp96_ = _tmp95_->data_length;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp99_ = _tmp93_[_tmp94_ + (_tmp96_ * _tmp98_)];
+					_tmp97_ = _tmp91_[_tmp92_ + (_tmp94_ * _tmp96_)];
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp90_[_tmp91_] = _tmp99_;
+					_tmp88_[_tmp89_] = _tmp97_;
 #line 1379 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp100_ = _tmp90_[_tmp91_];
+					_tmp98_ = _tmp88_[_tmp89_];
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp101_ = self->priv->n_used;
+					_tmp99_ = self->priv->n_used;
 #line 1380 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					self->priv->n_used = _tmp101_ + 1;
-#line 11920 "scanner.c"
+					self->priv->n_used = _tmp99_ + 1;
+#line 11821 "scanner.c"
 				}
 			}
 		}
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp105_ = self->priv->parameters;
+		_tmp103_ = self->priv->parameters;
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp106_ = _tmp105_.depth;
+		_tmp104_ = _tmp103_.depth;
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp106_ == 8) {
-#line 11930 "scanner.c"
-			SANE_Parameters _tmp107_ = {0};
-			SANE_Frame _tmp108_ = 0;
+		if (_tmp104_ == 8) {
+#line 11831 "scanner.c"
+			SANE_Parameters _tmp105_ = {0};
+			SANE_Frame _tmp106_ = 0;
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp107_ = self->priv->parameters;
+			_tmp105_ = self->priv->parameters;
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp108_ = _tmp107_.format;
+			_tmp106_ = _tmp105_.format;
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp104_ = _tmp108_ == SANE_FRAME_GRAY;
-#line 11939 "scanner.c"
+			_tmp102_ = _tmp106_ == SANE_FRAME_GRAY;
+#line 11840 "scanner.c"
 		} else {
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp104_ = FALSE;
-#line 11943 "scanner.c"
+			_tmp102_ = FALSE;
+#line 11844 "scanner.c"
 		}
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp109_ = _tmp104_;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp109_) {
-#line 11949 "scanner.c"
-			ScanJob* _tmp110_ = NULL;
-			gint _tmp111_ = 0;
+		if (_tmp102_) {
+#line 11848 "scanner.c"
+			ScanJob* _tmp107_ = NULL;
+			gint _tmp108_ = 0;
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp110_ = job;
+			_tmp107_ = job;
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp111_ = _tmp110_->depth;
+			_tmp108_ = _tmp107_->depth;
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp103_ = _tmp111_ == 2;
-#line 11958 "scanner.c"
+			_tmp101_ = _tmp108_ == 2;
+#line 11857 "scanner.c"
 		} else {
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp103_ = FALSE;
-#line 11962 "scanner.c"
+			_tmp101_ = FALSE;
+#line 11861 "scanner.c"
 		}
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp112_ = _tmp103_;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp112_) {
-#line 11968 "scanner.c"
-			ScanJob* _tmp113_ = NULL;
-			ScanMode _tmp114_ = 0;
+		if (_tmp101_) {
+#line 11865 "scanner.c"
+			ScanJob* _tmp109_ = NULL;
+			ScanMode _tmp110_ = 0;
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp113_ = job;
+			_tmp109_ = job;
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp114_ = _tmp113_->scan_mode;
+			_tmp110_ = _tmp109_->scan_mode;
 #line 1386 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp102_ = _tmp114_ == SCAN_MODE_GRAY;
-#line 11977 "scanner.c"
+			_tmp100_ = _tmp110_ == SCAN_MODE_GRAY;
+#line 11874 "scanner.c"
 		} else {
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp102_ = FALSE;
-#line 11981 "scanner.c"
+			_tmp100_ = FALSE;
+#line 11878 "scanner.c"
 		}
 #line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp115_ = _tmp102_;
-#line 1385 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		if (_tmp115_) {
-#line 11987 "scanner.c"
+		if (_tmp100_) {
+#line 11882 "scanner.c"
 			guchar block = '\0';
 			gint write_offset = 0;
 			gint block_shift = 0;
-			ScanLine* _tmp157_ = NULL;
-			ScanLine* _tmp158_ = NULL;
-			gint _tmp159_ = 0;
+			ScanLine* _tmp150_ = NULL;
+			ScanLine* _tmp151_ = NULL;
+			gint _tmp152_ = 0;
 #line 1388 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block = (guchar) 0;
 #line 1389 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			write_offset = 0;
 #line 1390 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			block_shift = 6;
-#line 12000 "scanner.c"
+#line 11895 "scanner.c"
 			{
 				gint i = 0;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				i = 0;
-#line 12005 "scanner.c"
+#line 11900 "scanner.c"
 				{
-					gboolean _tmp116_ = FALSE;
+					gboolean _tmp111_ = FALSE;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-					_tmp116_ = TRUE;
+					_tmp111_ = TRUE;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					while (TRUE) {
-#line 12012 "scanner.c"
-						gboolean _tmp117_ = FALSE;
-						gint _tmp119_ = 0;
-						ScanLine* _tmp120_ = NULL;
-						gint _tmp121_ = 0;
+#line 11907 "scanner.c"
+						gint _tmp113_ = 0;
+						ScanLine* _tmp114_ = NULL;
+						gint _tmp115_ = 0;
 						gint offset = 0;
-						gint _tmp122_ = 0;
-						ScanLine* _tmp123_ = NULL;
-						gint _tmp124_ = 0;
-						gint _tmp150_ = 0;
+						gint _tmp116_ = 0;
+						ScanLine* _tmp117_ = NULL;
+						gint _tmp118_ = 0;
+						gint _tmp143_ = 0;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp117_ = _tmp116_;
+						if (!_tmp111_) {
+#line 11918 "scanner.c"
+							gint _tmp112_ = 0;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!_tmp117_) {
-#line 12026 "scanner.c"
-							gint _tmp118_ = 0;
+							_tmp112_ = i;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp118_ = i;
-#line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							i = _tmp118_ + 1;
-#line 12032 "scanner.c"
+							i = _tmp112_ + 1;
+#line 11924 "scanner.c"
 						}
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp116_ = FALSE;
+						_tmp111_ = FALSE;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp119_ = i;
+						_tmp113_ = i;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp120_ = line;
+						_tmp114_ = line;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp121_ = _tmp120_->n_lines;
+						_tmp115_ = _tmp114_->n_lines;
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (!(_tmp119_ < _tmp121_)) {
+						if (!(_tmp113_ < _tmp115_)) {
 #line 1391 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							break;
-#line 12046 "scanner.c"
+#line 11938 "scanner.c"
 						}
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp122_ = i;
+						_tmp116_ = i;
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp123_ = line;
+						_tmp117_ = line;
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp124_ = _tmp123_->data_length;
+						_tmp118_ = _tmp117_->data_length;
 #line 1393 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						offset = _tmp122_ * _tmp124_;
-#line 12056 "scanner.c"
+						offset = _tmp116_ * _tmp118_;
+#line 11948 "scanner.c"
 						{
 							gint x = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							x = 0;
-#line 12061 "scanner.c"
+#line 11953 "scanner.c"
 							{
-								gboolean _tmp125_ = FALSE;
+								gboolean _tmp119_ = FALSE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-								_tmp125_ = TRUE;
+								_tmp119_ = TRUE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 								while (TRUE) {
-#line 12068 "scanner.c"
-									gboolean _tmp126_ = FALSE;
-									gint _tmp128_ = 0;
-									ScanLine* _tmp129_ = NULL;
-									gint _tmp130_ = 0;
+#line 11960 "scanner.c"
+									gint _tmp121_ = 0;
+									ScanLine* _tmp122_ = NULL;
+									gint _tmp123_ = 0;
 									guchar p = '\0';
-									ScanLine* _tmp131_ = NULL;
-									guchar* _tmp132_ = NULL;
-									gint _tmp132__length1 = 0;
-									gint _tmp133_ = 0;
-									gint _tmp134_ = 0;
-									guchar _tmp135_ = '\0';
+									ScanLine* _tmp124_ = NULL;
+									guchar* _tmp125_ = NULL;
+									gint _tmp125__length1 = 0;
+									gint _tmp126_ = 0;
+									gint _tmp127_ = 0;
+									guchar _tmp128_ = '\0';
 									guchar sample = '\0';
-									guchar _tmp136_ = '\0';
-									guchar _tmp139_ = '\0';
-									guchar _tmp140_ = '\0';
-									gint _tmp141_ = 0;
-									gint _tmp142_ = 0;
-#line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp126_ = _tmp125_;
+									guchar _tmp129_ = '\0';
+									guchar _tmp132_ = '\0';
+									guchar _tmp133_ = '\0';
+									gint _tmp134_ = 0;
+									gint _tmp135_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (!_tmp126_) {
-#line 12090 "scanner.c"
-										gint _tmp127_ = 0;
+									if (!_tmp119_) {
+#line 11979 "scanner.c"
+										gint _tmp120_ = 0;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp127_ = x;
+										_tmp120_ = x;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										x = _tmp127_ + 1;
-#line 12096 "scanner.c"
+										x = _tmp120_ + 1;
+#line 11985 "scanner.c"
 									}
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp125_ = FALSE;
+									_tmp119_ = FALSE;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp128_ = x;
+									_tmp121_ = x;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp129_ = line;
+									_tmp122_ = line;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp130_ = _tmp129_->width;
+									_tmp123_ = _tmp122_->width;
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (!(_tmp128_ < _tmp130_)) {
+									if (!(_tmp121_ < _tmp123_)) {
 #line 1394 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										break;
-#line 12110 "scanner.c"
+#line 11999 "scanner.c"
 									}
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp131_ = line;
+									_tmp124_ = line;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp132_ = _tmp131_->data;
+									_tmp125_ = _tmp124_->data;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp132__length1 = _tmp131_->data_length1;
+									_tmp125__length1 = _tmp124_->data_length1;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp133_ = offset;
+									_tmp126_ = offset;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp134_ = x;
+									_tmp127_ = x;
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp135_ = _tmp132_[_tmp133_ + _tmp134_];
+									_tmp128_ = _tmp125_[_tmp126_ + _tmp127_];
 #line 1396 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									p = _tmp135_;
+									p = _tmp128_;
 #line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp136_ = p;
+									_tmp129_ = p;
 #line 1399 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (((gint) _tmp136_) >= 192) {
+									if (((gint) _tmp129_) >= 192) {
 #line 1400 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										sample = (guchar) 3;
-#line 12132 "scanner.c"
+#line 12021 "scanner.c"
 									} else {
-										guchar _tmp137_ = '\0';
+										guchar _tmp130_ = '\0';
 #line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp137_ = p;
+										_tmp130_ = p;
 #line 1401 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										if (((gint) _tmp137_) >= 128) {
+										if (((gint) _tmp130_) >= 128) {
 #line 1402 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 											sample = (guchar) 2;
-#line 12141 "scanner.c"
+#line 12030 "scanner.c"
 										} else {
-											guchar _tmp138_ = '\0';
+											guchar _tmp131_ = '\0';
 #line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-											_tmp138_ = p;
+											_tmp131_ = p;
 #line 1403 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-											if (((gint) _tmp138_) >= 64) {
+											if (((gint) _tmp131_) >= 64) {
 #line 1404 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 1;
-#line 12150 "scanner.c"
+#line 12039 "scanner.c"
 											} else {
 #line 1406 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 												sample = (guchar) 0;
-#line 12154 "scanner.c"
+#line 12043 "scanner.c"
 											}
 										}
 									}
 #line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp139_ = block;
+									_tmp132_ = block;
 #line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp140_ = sample;
+									_tmp133_ = sample;
 #line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp141_ = block_shift;
+									_tmp134_ = block_shift;
 #line 1408 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									block = _tmp139_ | (_tmp140_ << _tmp141_);
+									block = _tmp132_ | (_tmp133_ << _tmp134_);
 #line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									_tmp142_ = block_shift;
+									_tmp135_ = block_shift;
 #line 1409 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-									if (_tmp142_ == 0) {
-#line 12170 "scanner.c"
-										ScanLine* _tmp143_ = NULL;
-										guchar* _tmp144_ = NULL;
-										gint _tmp144__length1 = 0;
-										gint _tmp145_ = 0;
-										guchar _tmp146_ = '\0';
-										guchar _tmp147_ = '\0';
-										gint _tmp148_ = 0;
+									if (_tmp135_ == 0) {
+#line 12059 "scanner.c"
+										ScanLine* _tmp136_ = NULL;
+										guchar* _tmp137_ = NULL;
+										gint _tmp137__length1 = 0;
+										gint _tmp138_ = 0;
+										guchar _tmp139_ = '\0';
+										guchar _tmp140_ = '\0';
+										gint _tmp141_ = 0;
 #line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp143_ = line;
+										_tmp136_ = line;
 #line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp144_ = _tmp143_->data;
+										_tmp137_ = _tmp136_->data;
 #line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp144__length1 = _tmp143_->data_length1;
+										_tmp137__length1 = _tmp136_->data_length1;
 #line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp145_ = write_offset;
+										_tmp138_ = write_offset;
 #line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp146_ = block;
+										_tmp139_ = block;
 #line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp144_[_tmp145_] = _tmp146_;
+										_tmp137_[_tmp138_] = _tmp139_;
 #line 1411 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp147_ = _tmp144_[_tmp145_];
+										_tmp140_ = _tmp137_[_tmp138_];
 #line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp148_ = write_offset;
+										_tmp141_ = write_offset;
 #line 1412 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										write_offset = _tmp148_ + 1;
+										write_offset = _tmp141_ + 1;
 #line 1413 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block = (guchar) 0;
 #line 1414 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 										block_shift = 6;
-#line 12200 "scanner.c"
+#line 12089 "scanner.c"
 									} else {
-										gint _tmp149_ = 0;
+										gint _tmp142_ = 0;
 #line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										_tmp149_ = block_shift;
+										_tmp142_ = block_shift;
 #line 1417 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-										block_shift = _tmp149_ - 2;
-#line 12207 "scanner.c"
+										block_shift = _tmp142_ - 2;
+#line 12096 "scanner.c"
 									}
 								}
 							}
 						}
 #line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						_tmp150_ = block_shift;
+						_tmp143_ = block_shift;
 #line 1421 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-						if (_tmp150_ != 6) {
-#line 12216 "scanner.c"
-							ScanLine* _tmp151_ = NULL;
-							guchar* _tmp152_ = NULL;
-							gint _tmp152__length1 = 0;
-							gint _tmp153_ = 0;
-							guchar _tmp154_ = '\0';
-							guchar _tmp155_ = '\0';
-							gint _tmp156_ = 0;
+						if (_tmp143_ != 6) {
+#line 12105 "scanner.c"
+							ScanLine* _tmp144_ = NULL;
+							guchar* _tmp145_ = NULL;
+							gint _tmp145__length1 = 0;
+							gint _tmp146_ = 0;
+							guchar _tmp147_ = '\0';
+							guchar _tmp148_ = '\0';
+							gint _tmp149_ = 0;
 #line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp151_ = line;
+							_tmp144_ = line;
 #line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp152_ = _tmp151_->data;
+							_tmp145_ = _tmp144_->data;
 #line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp152__length1 = _tmp151_->data_length1;
+							_tmp145__length1 = _tmp144_->data_length1;
 #line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp153_ = write_offset;
+							_tmp146_ = write_offset;
 #line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp154_ = block;
+							_tmp147_ = block;
 #line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp152_[_tmp153_] = _tmp154_;
+							_tmp145_[_tmp146_] = _tmp147_;
 #line 1423 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp155_ = _tmp152_[_tmp153_];
+							_tmp148_ = _tmp145_[_tmp146_];
 #line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							_tmp156_ = write_offset;
+							_tmp149_ = write_offset;
 #line 1424 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-							write_offset = _tmp156_ + 1;
+							write_offset = _tmp149_ + 1;
 #line 1425 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block = (guchar) 0;
 #line 1426 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 							block_shift = 6;
-#line 12246 "scanner.c"
+#line 12135 "scanner.c"
 						}
 					}
 				}
 			}
 #line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp157_ = line;
+			_tmp150_ = line;
 #line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp158_ = line;
+			_tmp151_ = line;
 #line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp159_ = _tmp158_->width;
+			_tmp152_ = _tmp151_->width;
 #line 1430 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-			_tmp157_->data_length = ((_tmp159_ * 2) + 7) / 8;
-#line 12259 "scanner.c"
+			_tmp150_->data_length = ((_tmp152_ * 2) + 7) / 8;
+#line 12148 "scanner.c"
 		}
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp160_ = job;
+		_tmp153_ = job;
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp161_ = _tmp160_->id;
+		_tmp154_ = _tmp153_->id;
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp162_ = line;
+		_tmp155_ = line;
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp163_ = notify_got_line_new (_tmp161_, _tmp162_);
+		_tmp156_ = notify_got_line_new (_tmp154_, _tmp155_);
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp164_ = _tmp163_;
+		_tmp157_ = _tmp156_;
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		scanner_notify (self, (Notify*) _tmp164_);
+		scanner_notify (self, (Notify*) _tmp157_);
 #line 1433 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_notify_unref0 (_tmp164_);
+		_notify_unref0 (_tmp157_);
 #line 1339 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_scan_line_unref0 (line);
-#line 12277 "scanner.c"
+#line 12166 "scanner.c"
 	}
 #line 1300 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (job);
-#line 12281 "scanner.c"
+#line 12170 "scanner.c"
 }
 
 
 static void _scanner_authorization_cb_sane_authcallback (const gchar* resource, gchar* username, gchar* password) {
 #line 1442 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_authorization_cb (resource, username, -1, password, -1);
-#line 12288 "scanner.c"
+#line 12177 "scanner.c"
 }
 
 
@@ -12337,7 +12226,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	_tmp5_ = status;
 #line 1444 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp5_ != SANE_STATUS_GOOD) {
-#line 12332 "scanner.c"
+#line 12221 "scanner.c"
 		SANE_Status _tmp6_ = 0;
 		const gchar* _tmp7_ = NULL;
 #line 1446 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12350,7 +12239,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		result = NULL;
 #line 1447 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return result;
-#line 12345 "scanner.c"
+#line 12234 "scanner.c"
 	}
 #line 1449 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_tmp8_ = version_code;
@@ -12370,7 +12259,7 @@ static void* scanner_scan_thread (Scanner* self) {
 	scanner_redetect (self);
 #line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	while (TRUE) {
-#line 12365 "scanner.c"
+#line 12254 "scanner.c"
 		gboolean _tmp14_ = FALSE;
 		ScanState _tmp15_ = 0;
 #line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12379,7 +12268,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		if (!_tmp14_) {
 #line 1457 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12374 "scanner.c"
+#line 12263 "scanner.c"
 		}
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp15_ = self->priv->state;
@@ -12387,7 +12276,7 @@ static void* scanner_scan_thread (Scanner* self) {
 		switch (_tmp15_) {
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_IDLE:
-#line 12382 "scanner.c"
+#line 12271 "scanner.c"
 			{
 				GList* _tmp16_ = NULL;
 #line 1462 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12398,94 +12287,94 @@ static void* scanner_scan_thread (Scanner* self) {
 					scanner_set_scanning (self, TRUE);
 #line 1465 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 					self->priv->state = SCAN_STATE_OPEN;
-#line 12393 "scanner.c"
+#line 12282 "scanner.c"
 				}
 #line 1467 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12397 "scanner.c"
+#line 12286 "scanner.c"
 			}
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_REDETECT:
-#line 12401 "scanner.c"
+#line 12290 "scanner.c"
 			{
 #line 1469 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_redetect (self);
 #line 1470 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12407 "scanner.c"
+#line 12296 "scanner.c"
 			}
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_OPEN:
-#line 12411 "scanner.c"
+#line 12300 "scanner.c"
 			{
 #line 1472 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_open (self);
 #line 1473 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12417 "scanner.c"
+#line 12306 "scanner.c"
 			}
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_OPTION:
-#line 12421 "scanner.c"
+#line 12310 "scanner.c"
 			{
 #line 1475 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_option (self);
 #line 1476 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12427 "scanner.c"
+#line 12316 "scanner.c"
 			}
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_START:
-#line 12431 "scanner.c"
+#line 12320 "scanner.c"
 			{
 #line 1478 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_start (self);
 #line 1479 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12437 "scanner.c"
+#line 12326 "scanner.c"
 			}
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_GET_PARAMETERS:
-#line 12441 "scanner.c"
+#line 12330 "scanner.c"
 			{
 #line 1481 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_get_parameters (self);
 #line 1482 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12447 "scanner.c"
+#line 12336 "scanner.c"
 			}
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			case SCAN_STATE_READ:
-#line 12451 "scanner.c"
+#line 12340 "scanner.c"
 			{
 #line 1484 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				scanner_do_read (self);
 #line 1485 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 				break;
-#line 12457 "scanner.c"
+#line 12346 "scanner.c"
 			}
 			default:
 #line 1459 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			break;
-#line 12462 "scanner.c"
+#line 12351 "scanner.c"
 		}
 	}
 #line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	result = NULL;
 #line 1489 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12469 "scanner.c"
+#line 12358 "scanner.c"
 }
 
 
 static gpointer _scanner_scan_thread_gthread_func (gpointer self) {
 	gpointer result;
-	result = scanner_scan_thread (self);
+	result = scanner_scan_thread ((Scanner*) self);
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	scanner_unref (self);
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12480 "scanner.c"
+#line 12369 "scanner.c"
 }
 
 
@@ -12493,44 +12382,51 @@ void scanner_start (Scanner* self) {
 	GError * _inner_error_ = NULL;
 #line 1492 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
-#line 12488 "scanner.c"
+#line 12377 "scanner.c"
 	{
 		GThread* _tmp0_ = NULL;
 		GThread* _tmp1_ = NULL;
+		GThread* _tmp2_ = NULL;
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp1_ = g_thread_try_new ("scan-thread", _scanner_scan_thread_gthread_func, scanner_ref (self), &_inner_error_);
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp1_;
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (_inner_error_ != NULL) {
-#line 12498 "scanner.c"
+#line 12388 "scanner.c"
 			goto __catch15_g_error;
 		}
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp2_ = _tmp0_;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_tmp0_ = NULL;
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
 #line 1496 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		self->priv->thread = _tmp0_;
-#line 12505 "scanner.c"
+		self->priv->thread = _tmp2_;
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		_g_thread_unref0 (_tmp0_);
+#line 12401 "scanner.c"
 	}
 	goto __finally15;
 	__catch15_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
+		GError* _tmp3_ = NULL;
+		const gchar* _tmp4_ = NULL;
 #line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		e = _inner_error_;
 #line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_inner_error_ = NULL;
 #line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp2_ = e;
+		_tmp3_ = e;
 #line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		_tmp3_ = _tmp2_->message;
+		_tmp4_ = _tmp3_->message;
 #line 1500 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_critical ("scanner.vala:1500: Unable to create thread: %s", _tmp3_);
+		g_critical ("scanner.vala:1500: Unable to create thread: %s", _tmp4_);
 #line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_error_free0 (e);
-#line 12525 "scanner.c"
+#line 12421 "scanner.c"
 	}
 	__finally15:
 #line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12541,7 +12437,7 @@ void scanner_start (Scanner* self) {
 		g_clear_error (&_inner_error_);
 #line 1494 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12536 "scanner.c"
+#line 12432 "scanner.c"
 	}
 }
 
@@ -12558,7 +12454,7 @@ void scanner_redetect (Scanner* self) {
 	if (_tmp0_) {
 #line 1507 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return;
-#line 12553 "scanner.c"
+#line 12449 "scanner.c"
 	}
 #line 1508 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->need_redetect = TRUE;
@@ -12570,7 +12466,7 @@ void scanner_redetect (Scanner* self) {
 	_tmp2_ = request_redetect_new ();
 #line 1512 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12565 "scanner.c"
+#line 12461 "scanner.c"
 }
 
 
@@ -12585,7 +12481,7 @@ gboolean scanner_is_scanning (Scanner* self) {
 	result = _tmp0_;
 #line 1517 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return result;
-#line 12580 "scanner.c"
+#line 12476 "scanner.c"
 }
 
 
@@ -12600,7 +12496,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 	switch (_tmp0_) {
 #line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_DEFAULT:
-#line 12595 "scanner.c"
+#line 12491 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12609,11 +12505,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp1_;
 #line 1525 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12604 "scanner.c"
+#line 12500 "scanner.c"
 		}
 #line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_COLOR:
-#line 12608 "scanner.c"
+#line 12504 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12622,11 +12518,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp2_;
 #line 1527 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12617 "scanner.c"
+#line 12513 "scanner.c"
 		}
 #line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_GRAY:
-#line 12621 "scanner.c"
+#line 12517 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12635,11 +12531,11 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp3_;
 #line 1529 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12630 "scanner.c"
+#line 12526 "scanner.c"
 		}
 #line 1522 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_MODE_LINEART:
-#line 12634 "scanner.c"
+#line 12530 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12648,7 +12544,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp4_;
 #line 1531 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12643 "scanner.c"
+#line 12539 "scanner.c"
 		}
 		default:
 		{
@@ -12662,7 +12558,7 @@ static gchar* scanner_get_scan_mode_string (Scanner* self, ScanMode mode) {
 			result = _tmp6_;
 #line 1533 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12657 "scanner.c"
+#line 12553 "scanner.c"
 		}
 	}
 }
@@ -12679,7 +12575,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 	switch (_tmp0_) {
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_SINGLE:
-#line 12674 "scanner.c"
+#line 12570 "scanner.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12688,11 +12584,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp1_;
 #line 1542 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12683 "scanner.c"
+#line 12579 "scanner.c"
 		}
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_FRONT:
-#line 12687 "scanner.c"
+#line 12583 "scanner.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12701,11 +12597,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp2_;
 #line 1544 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12696 "scanner.c"
+#line 12592 "scanner.c"
 		}
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BACK:
-#line 12700 "scanner.c"
+#line 12596 "scanner.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12714,11 +12610,11 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp3_;
 #line 1546 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12709 "scanner.c"
+#line 12605 "scanner.c"
 		}
 #line 1539 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		case SCAN_TYPE_ADF_BOTH:
-#line 12713 "scanner.c"
+#line 12609 "scanner.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12727,7 +12623,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp4_;
 #line 1548 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12722 "scanner.c"
+#line 12618 "scanner.c"
 		}
 		default:
 		{
@@ -12741,7 +12637,7 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 			result = _tmp6_;
 #line 1550 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return result;
-#line 12736 "scanner.c"
+#line 12632 "scanner.c"
 		}
 	}
 }
@@ -12750,61 +12646,60 @@ static gchar* scanner_get_scan_type_string (Scanner* self, ScanType type) {
 void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	ScanOptions* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	ScanOptions* _tmp6_ = NULL;
-	ScanMode _tmp7_ = 0;
+	ScanOptions* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	ScanOptions* _tmp5_ = NULL;
+	ScanMode _tmp6_ = 0;
+	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	ScanOptions* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	ScanOptions* _tmp12_ = NULL;
-	ScanType _tmp13_ = 0;
+	ScanOptions* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	ScanOptions* _tmp11_ = NULL;
+	ScanType _tmp12_ = 0;
+	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	ScanOptions* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	ScanOptions* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	ScanOptions* _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	ScanOptions* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
+	ScanOptions* _tmp15_ = NULL;
+	gint _tmp16_ = 0;
+	ScanOptions* _tmp17_ = NULL;
+	gint _tmp18_ = 0;
+	ScanOptions* _tmp19_ = NULL;
+	gint _tmp20_ = 0;
+	ScanOptions* _tmp21_ = NULL;
+	gint _tmp22_ = 0;
 	RequestStartScan* request = NULL;
-	RequestStartScan* _tmp24_ = NULL;
+	RequestStartScan* _tmp23_ = NULL;
+	ScanJob* _tmp24_ = NULL;
 	ScanJob* _tmp25_ = NULL;
-	ScanJob* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	ScanJob* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	ScanJob* _tmp31_ = NULL;
-	ScanOptions* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	ScanJob* _tmp34_ = NULL;
-	ScanOptions* _tmp35_ = NULL;
-	ScanMode _tmp36_ = 0;
-	ScanJob* _tmp37_ = NULL;
-	ScanOptions* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	ScanJob* _tmp40_ = NULL;
-	ScanOptions* _tmp41_ = NULL;
-	ScanType _tmp42_ = 0;
-	ScanJob* _tmp43_ = NULL;
-	ScanOptions* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	ScanJob* _tmp46_ = NULL;
-	ScanOptions* _tmp47_ = NULL;
-	gint _tmp48_ = 0;
-	ScanJob* _tmp49_ = NULL;
-	ScanOptions* _tmp50_ = NULL;
-	gint _tmp51_ = 0;
-	ScanJob* _tmp52_ = NULL;
-	ScanOptions* _tmp53_ = NULL;
-	gint _tmp54_ = 0;
-	GAsyncQueue* _tmp55_ = NULL;
-	Request* _tmp56_ = NULL;
+	gint _tmp26_ = 0;
+	ScanJob* _tmp27_ = NULL;
+	const gchar* _tmp28_ = NULL;
+	gchar* _tmp29_ = NULL;
+	ScanJob* _tmp30_ = NULL;
+	ScanOptions* _tmp31_ = NULL;
+	gint _tmp32_ = 0;
+	ScanJob* _tmp33_ = NULL;
+	ScanOptions* _tmp34_ = NULL;
+	ScanMode _tmp35_ = 0;
+	ScanJob* _tmp36_ = NULL;
+	ScanOptions* _tmp37_ = NULL;
+	gint _tmp38_ = 0;
+	ScanJob* _tmp39_ = NULL;
+	ScanOptions* _tmp40_ = NULL;
+	ScanType _tmp41_ = 0;
+	ScanJob* _tmp42_ = NULL;
+	ScanOptions* _tmp43_ = NULL;
+	gint _tmp44_ = 0;
+	ScanJob* _tmp45_ = NULL;
+	ScanOptions* _tmp46_ = NULL;
+	gint _tmp47_ = 0;
+	ScanJob* _tmp48_ = NULL;
+	ScanOptions* _tmp49_ = NULL;
+	gint _tmp50_ = 0;
+	ScanJob* _tmp51_ = NULL;
+	ScanOptions* _tmp52_ = NULL;
+	gint _tmp53_ = 0;
+	GAsyncQueue* _tmp54_ = NULL;
+	Request* _tmp55_ = NULL;
 #line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_return_if_fail (self != NULL);
 #line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
@@ -12813,169 +12708,167 @@ void scanner_scan (Scanner* self, const gchar* device, ScanOptions* options) {
 	_tmp1_ = device;
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp1_ != NULL) {
-#line 12808 "scanner.c"
+#line 12703 "scanner.c"
 		const gchar* _tmp2_ = NULL;
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp2_ = device;
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = _tmp2_;
-#line 12814 "scanner.c"
+#line 12709 "scanner.c"
 	} else {
 #line 1557 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp0_ = "(null)";
-#line 12818 "scanner.c"
+#line 12713 "scanner.c"
 	}
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp3_ = _tmp0_;
+	_tmp3_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp4_ = options;
+	_tmp4_ = _tmp3_->dpi;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp5_ = _tmp4_->dpi;
+	_tmp5_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp6_ = options;
+	_tmp6_ = _tmp5_->scan_mode;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp7_ = _tmp6_->scan_mode;
+	_tmp7_ = scanner_get_scan_mode_string (self, _tmp6_);
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp8_ = scanner_get_scan_mode_string (self, _tmp7_);
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp10_ = options;
+	_tmp9_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp11_ = _tmp10_->depth;
+	_tmp10_ = _tmp9_->depth;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp12_ = options;
+	_tmp11_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp13_ = _tmp12_->type;
+	_tmp12_ = _tmp11_->type;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp14_ = scanner_get_scan_type_string (self, _tmp13_);
+	_tmp13_ = scanner_get_scan_type_string (self, _tmp12_);
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp15_ = _tmp14_;
+	_tmp14_ = _tmp13_;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp16_ = options;
+	_tmp15_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp17_ = _tmp16_->paper_width;
+	_tmp16_ = _tmp15_->paper_width;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp18_ = options;
+	_tmp17_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp19_ = _tmp18_->paper_height;
+	_tmp18_ = _tmp17_->paper_height;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp20_ = options;
+	_tmp19_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp21_ = _tmp20_->brightness;
+	_tmp20_ = _tmp19_->brightness;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp22_ = options;
+	_tmp21_ = options;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp23_ = _tmp22_->contrast;
+	_tmp22_ = _tmp21_->contrast;
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1556: Scanner.scan (\"%s\", dpi=%d, scan_mode=%s, depth=%" \
 "d, type=%s, paper_width=%d, paper_height=%d, brightness=%d, contrast=%" \
-"d)", _tmp3_, _tmp5_, _tmp9_, _tmp11_, _tmp15_, _tmp17_, _tmp19_, _tmp21_, _tmp23_);
+"d)", _tmp0_, _tmp4_, _tmp8_, _tmp10_, _tmp14_, _tmp16_, _tmp18_, _tmp20_, _tmp22_);
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp15_);
+	_g_free0 (_tmp14_);
 #line 1556 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp8_);
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp24_ = request_start_scan_new ();
+	_tmp23_ = request_start_scan_new ();
 #line 1560 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request = _tmp24_;
+	request = _tmp23_;
 #line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp25_ = scan_job_new ();
+	_tmp24_ = scan_job_new ();
 #line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_scan_job_unref0 (request->job);
 #line 1561 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	request->job = _tmp25_;
+	request->job = _tmp24_;
 #line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_ = request->job;
+	_tmp25_ = request->job;
 #line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp27_ = self->job_id;
+	_tmp26_ = self->job_id;
 #line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	self->job_id = _tmp27_ + 1;
+	self->job_id = _tmp26_ + 1;
 #line 1562 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp26_->id = _tmp27_;
+	_tmp25_->id = _tmp26_;
 #line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_ = request->job;
+	_tmp27_ = request->job;
 #line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp29_ = device;
+	_tmp28_ = device;
 #line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp30_ = g_strdup (_tmp29_);
+	_tmp29_ = g_strdup (_tmp28_);
 #line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_g_free0 (_tmp28_->device);
+	_g_free0 (_tmp27_->device);
 #line 1563 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp28_->device = _tmp30_;
+	_tmp27_->device = _tmp29_;
 #line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_ = request->job;
+	_tmp30_ = request->job;
 #line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp32_ = options;
+	_tmp31_ = options;
 #line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp33_ = _tmp32_->dpi;
+	_tmp32_ = _tmp31_->dpi;
 #line 1564 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp31_->dpi = (gdouble) _tmp33_;
+	_tmp30_->dpi = (gdouble) _tmp32_;
 #line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_ = request->job;
+	_tmp33_ = request->job;
 #line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp35_ = options;
+	_tmp34_ = options;
 #line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp36_ = _tmp35_->scan_mode;
+	_tmp35_ = _tmp34_->scan_mode;
 #line 1565 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp34_->scan_mode = _tmp36_;
+	_tmp33_->scan_mode = _tmp35_;
 #line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_ = request->job;
+	_tmp36_ = request->job;
 #line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp38_ = options;
+	_tmp37_ = options;
 #line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp39_ = _tmp38_->depth;
+	_tmp38_ = _tmp37_->depth;
 #line 1566 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp37_->depth = _tmp39_;
+	_tmp36_->depth = _tmp38_;
 #line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp40_ = request->job;
+	_tmp39_ = request->job;
 #line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp41_ = options;
+	_tmp40_ = options;
 #line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp42_ = _tmp41_->type;
+	_tmp41_ = _tmp40_->type;
 #line 1567 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp40_->type = _tmp42_;
+	_tmp39_->type = _tmp41_;
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_ = request->job;
+	_tmp42_ = request->job;
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp44_ = options;
+	_tmp43_ = options;
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp45_ = _tmp44_->paper_width;
+	_tmp44_ = _tmp43_->paper_width;
 #line 1568 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp43_->page_width = _tmp45_;
+	_tmp42_->page_width = _tmp44_;
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp46_ = request->job;
+	_tmp45_ = request->job;
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp47_ = options;
+	_tmp46_ = options;
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp48_ = _tmp47_->paper_height;
+	_tmp47_ = _tmp46_->paper_height;
 #line 1569 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp46_->page_height = _tmp48_;
+	_tmp45_->page_height = _tmp47_;
 #line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_ = request->job;
+	_tmp48_ = request->job;
 #line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp50_ = options;
+	_tmp49_ = options;
 #line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp51_ = _tmp50_->brightness;
+	_tmp50_ = _tmp49_->brightness;
 #line 1570 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp49_->brightness = _tmp51_;
+	_tmp48_->brightness = _tmp50_;
 #line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_ = request->job;
+	_tmp51_ = request->job;
 #line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp53_ = options;
+	_tmp52_ = options;
 #line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp54_ = _tmp53_->contrast;
+	_tmp53_ = _tmp52_->contrast;
 #line 1571 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp52_->contrast = _tmp54_;
+	_tmp51_->contrast = _tmp53_;
 #line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp55_ = self->priv->request_queue;
+	_tmp54_ = self->priv->request_queue;
 #line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	_tmp56_ = _request_ref0 ((Request*) request);
+	_tmp55_ = _request_ref0 ((Request*) request);
 #line 1572 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-	g_async_queue_push (_tmp55_, _tmp56_);
+	g_async_queue_push (_tmp54_, _tmp55_);
 #line 1554 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	_request_unref0 (request);
-#line 12968 "scanner.c"
+#line 12861 "scanner.c"
 }
 
 
@@ -12995,7 +12888,14 @@ void scanner_cancel (Scanner* self) {
 	_tmp2_ = request_cancel_new ();
 #line 1578 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_async_queue_push (_tmp1_, (Request*) _tmp2_);
-#line 12988 "scanner.c"
+#line 12881 "scanner.c"
+}
+
+
+static gpointer _g_thread_ref0 (gpointer self) {
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+	return self ? g_thread_ref (self) : NULL;
+#line 12888 "scanner.c"
 }
 
 
@@ -13017,23 +12917,26 @@ void scanner_free (Scanner* self) {
 	_tmp2_ = self->priv->thread;
 #line 1587 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (_tmp2_ != NULL) {
-#line 13010 "scanner.c"
+#line 12910 "scanner.c"
 		GThread* _tmp3_ = NULL;
+		GThread* _tmp4_ = NULL;
 #line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_tmp3_ = self->priv->thread;
 #line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
-		g_thread_join (_tmp3_);
+		_tmp4_ = _g_thread_ref0 (_tmp3_);
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
+		g_thread_join (_tmp4_);
 #line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		_g_thread_unref0 (self->priv->thread);
 #line 1590 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		self->priv->thread = NULL;
-#line 13020 "scanner.c"
+#line 12923 "scanner.c"
 	}
 #line 1593 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	sane_exit ();
 #line 1594 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_debug ("scanner.vala:1594: sane_exit ()");
-#line 13026 "scanner.c"
+#line 12929 "scanner.c"
 }
 
 
@@ -13052,19 +12955,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_PAGE_INFO (GClosure * closure, GV
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13045 "scanner.c"
+#line 12948 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13051 "scanner.c"
+#line 12954 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_PAGE_INFO) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_page_info (param_values + 1), data2);
-#line 13057 "scanner.c"
+#line 12960 "scanner.c"
 }
 
 
@@ -13083,19 +12986,19 @@ static void g_cclosure_user_marshal_VOID__SCAN_LINE (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13076 "scanner.c"
+#line 12979 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13082 "scanner.c"
+#line 12985 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__SCAN_LINE) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, value_get_scan_line (param_values + 1), data2);
-#line 13088 "scanner.c"
+#line 12991 "scanner.c"
 }
 
 
@@ -13114,26 +13017,26 @@ static void g_cclosure_user_marshal_VOID__INT_STRING (GClosure * closure, GValue
 		data1 = closure->data;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 13107 "scanner.c"
+#line 13010 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		data2 = closure->data;
-#line 13113 "scanner.c"
+#line 13016 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 13119 "scanner.c"
+#line 13022 "scanner.c"
 }
 
 
 static void value_scanner_init (GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	value->data[0].v_pointer = NULL;
-#line 13126 "scanner.c"
+#line 13029 "scanner.c"
 }
 
 
@@ -13142,7 +13045,7 @@ static void value_scanner_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (value->data[0].v_pointer);
-#line 13135 "scanner.c"
+#line 13038 "scanner.c"
 	}
 }
 
@@ -13152,11 +13055,11 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 	if (src_value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = scanner_ref (src_value->data[0].v_pointer);
-#line 13145 "scanner.c"
+#line 13048 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 13149 "scanner.c"
+#line 13052 "scanner.c"
 	}
 }
 
@@ -13164,37 +13067,37 @@ static void value_scanner_copy_value (const GValue* src_value, GValue* dest_valu
 static gpointer value_scanner_peek_pointer (const GValue* value) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13157 "scanner.c"
+#line 13060 "scanner.c"
 }
 
 
 static gchar* value_scanner_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (collect_values[0].v_pointer) {
-#line 13164 "scanner.c"
+#line 13067 "scanner.c"
 		Scanner* object;
 		object = collect_values[0].v_pointer;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13171 "scanner.c"
+#line 13074 "scanner.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 13175 "scanner.c"
+#line 13078 "scanner.c"
 		}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = scanner_ref (object);
-#line 13179 "scanner.c"
+#line 13082 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13183 "scanner.c"
+#line 13086 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13187 "scanner.c"
+#line 13090 "scanner.c"
 }
 
 
@@ -13205,25 +13108,25 @@ static gchar* value_scanner_lcopy_value (const GValue* value, guint n_collect_va
 	if (!object_p) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 13198 "scanner.c"
+#line 13101 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (!value->data[0].v_pointer) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = NULL;
-#line 13204 "scanner.c"
+#line 13107 "scanner.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = value->data[0].v_pointer;
-#line 13208 "scanner.c"
+#line 13111 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		*object_p = scanner_ref (value->data[0].v_pointer);
-#line 13212 "scanner.c"
+#line 13115 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return NULL;
-#line 13216 "scanner.c"
+#line 13119 "scanner.c"
 }
 
 
@@ -13237,7 +13140,7 @@ GParamSpec* param_spec_scanner (const gchar* name, const gchar* nick, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return G_PARAM_SPEC (spec);
-#line 13230 "scanner.c"
+#line 13133 "scanner.c"
 }
 
 
@@ -13246,7 +13149,7 @@ gpointer value_get_scanner (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SCANNER), NULL);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return value->data[0].v_pointer;
-#line 13239 "scanner.c"
+#line 13142 "scanner.c"
 }
 
 
@@ -13266,17 +13169,17 @@ void value_set_scanner (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_ref (value->data[0].v_pointer);
-#line 13259 "scanner.c"
+#line 13162 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13263 "scanner.c"
+#line 13166 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13269 "scanner.c"
+#line 13172 "scanner.c"
 	}
 }
 
@@ -13295,17 +13198,17 @@ void value_take_scanner (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = v_object;
-#line 13288 "scanner.c"
+#line 13191 "scanner.c"
 	} else {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		value->data[0].v_pointer = NULL;
-#line 13292 "scanner.c"
+#line 13195 "scanner.c"
 	}
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	if (old) {
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		scanner_unref (old);
-#line 13298 "scanner.c"
+#line 13201 "scanner.c"
 	}
 }
 
@@ -13335,7 +13238,7 @@ static void scanner_class_init (ScannerClass * klass) {
 	g_signal_new ("document_done", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	g_signal_new ("scanning_changed", TYPE_SCANNER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 13328 "scanner.c"
+#line 13231 "scanner.c"
 }
 
 
@@ -13344,7 +13247,7 @@ static void scanner_instance_init (Scanner * self) {
 	self->priv = SCANNER_GET_PRIVATE (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->ref_count = 1;
-#line 13337 "scanner.c"
+#line 13240 "scanner.c"
 }
 
 
@@ -13370,7 +13273,7 @@ static void scanner_finalize (Scanner* obj) {
 	_g_hash_table_unref0 (self->priv->options);
 #line 250 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	self->priv->buffer = (g_free (self->priv->buffer), NULL);
-#line 13363 "scanner.c"
+#line 13266 "scanner.c"
 }
 
 
@@ -13395,7 +13298,7 @@ gpointer scanner_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 	return instance;
-#line 13388 "scanner.c"
+#line 13291 "scanner.c"
 }
 
 
@@ -13408,7 +13311,7 @@ void scanner_unref (gpointer instance) {
 		SCANNER_GET_CLASS (self)->finalize (self);
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/scanner.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 13401 "scanner.c"
+#line 13304 "scanner.c"
 	}
 }
 
diff --git a/src/scanner.vala b/src/scanner.vala
index 33cf86f..2107a60 100644
--- a/src/scanner.vala
+++ b/src/scanner.vala
@@ -1367,7 +1367,7 @@ public class Scanner
             line_count += line.n_lines;
 
             /* Increase buffer size if did full read */
-            var buffer_size = buffer.length;
+            var buffer_size = line.data.length;
             if (full_read)
                 buffer_size += parameters.bytes_per_line;
 
diff --git a/src/simple-scan.c b/src/simple-scan.c
index 754893a..144a78d 100644
--- a/src/simple-scan.c
+++ b/src/simple-scan.c
@@ -1,4 +1,4 @@
-/* simple-scan.c generated by valac 0.22.1, the Vala compiler
+/* simple-scan.c generated by valac 0.24.0, the Vala compiler
  * generated from simple-scan.vala, do not modify */
 
 /*
@@ -82,7 +82,6 @@ typedef struct _Book Book;
 typedef struct _BookClass BookClass;
 #define _scan_device_unref0(var) ((var == NULL) ? NULL : (var = (scan_device_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _user_interface_unref0(var) ((var == NULL) ? NULL : (var = (user_interface_unref (var), NULL)))
 #define _scanner_unref0(var) ((var == NULL) ? NULL : (var = (scanner_unref (var), NULL)))
 #define _book_unref0(var) ((var == NULL) ? NULL : (var = (book_unref (var), NULL)))
 
@@ -139,10 +138,8 @@ typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
 #define TYPE_SCAN_MODE (scan_mode_get_type ())
 
 #define TYPE_SCAN_TYPE (scan_type_get_type ())
-#define _fclose0(var) ((var == NULL) ? NULL : (var = (fclose (var), NULL)))
-#define _g_match_info_unref0(var) ((var == NULL) ? NULL : (var = (g_match_info_unref (var), NULL)))
 #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
+#define _fclose0(var) ((var == NULL) ? NULL : (var = (fclose (var), NULL)))
 #define _g_option_context_free0(var) ((var == NULL) ? NULL : (var = (g_option_context_free (var), NULL)))
 #define _g_timer_destroy0(var) ((var == NULL) ? NULL : (var = (g_timer_destroy (var), NULL)))
 
@@ -255,12 +252,6 @@ void value_set_scan_device (GValue* value, gpointer v_object);
 void value_take_scan_device (GValue* value, gpointer v_object);
 gpointer value_get_scan_device (const GValue* value);
 GType scan_device_get_type (void) G_GNUC_CONST;
-gpointer user_interface_ref (gpointer instance);
-void user_interface_unref (gpointer instance);
-GParamSpec* param_spec_user_interface (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_user_interface (GValue* value, gpointer v_object);
-void value_take_user_interface (GValue* value, gpointer v_object);
-gpointer value_get_user_interface (const GValue* value);
 GType user_interface_get_type (void) G_GNUC_CONST;
 gpointer scanner_ref (gpointer instance);
 void scanner_unref (gpointer instance);
@@ -411,7 +402,7 @@ const GOptionEntry SIMPLE_SCAN_options[4] = {{"version", 'v', 0, G_OPTION_ARG_NO
 static gpointer _scan_device_ref0 (gpointer self) {
 #line 41 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 415 "simple-scan.c"
+#line 406 "simple-scan.c"
 }
 
 
@@ -431,119 +422,119 @@ SimpleScan* simple_scan_construct (GType object_type, ScanDevice* device) {
 	self->priv->default_device = _tmp1_;
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self;
-#line 435 "simple-scan.c"
+#line 426 "simple-scan.c"
 }
 
 
 SimpleScan* simple_scan_new (ScanDevice* device) {
 #line 39 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_construct (TYPE_SIMPLE_SCAN, device);
-#line 442 "simple-scan.c"
+#line 433 "simple-scan.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return self ? book_ref (self) : NULL;
-#line 449 "simple-scan.c"
+#line 440 "simple-scan.c"
 }
 
 
 static void _simple_scan_scan_cb_user_interface_start_scan (UserInterface* _sender, const gchar* device, ScanOptions* options, gpointer self) {
 #line 50 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scan_cb (self, _sender, device, options);
-#line 456 "simple-scan.c"
+	simple_scan_scan_cb ((SimpleScan*) self, _sender, device, options);
+#line 447 "simple-scan.c"
 }
 
 
 static void _simple_scan_cancel_cb_user_interface_stop_scan (UserInterface* _sender, gpointer self) {
 #line 51 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_cancel_cb (self, _sender);
-#line 463 "simple-scan.c"
+	simple_scan_cancel_cb ((SimpleScan*) self, _sender);
+#line 454 "simple-scan.c"
 }
 
 
 static void _simple_scan_email_cb_user_interface_email (UserInterface* _sender, const gchar* profile, gint quality, gpointer self) {
 #line 52 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_email_cb (self, _sender, profile, quality);
-#line 470 "simple-scan.c"
+	simple_scan_email_cb ((SimpleScan*) self, _sender, profile, quality);
+#line 461 "simple-scan.c"
 }
 
 
 static void _simple_scan_update_scan_devices_cb_scanner_update_devices (Scanner* _sender, GList* devices, gpointer self) {
 #line 55 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_update_scan_devices_cb (self, _sender, devices);
-#line 477 "simple-scan.c"
+	simple_scan_update_scan_devices_cb ((SimpleScan*) self, _sender, devices);
+#line 468 "simple-scan.c"
 }
 
 
 static void _simple_scan_authorize_cb_scanner_request_authorization (Scanner* _sender, const gchar* resource, gpointer self) {
 #line 56 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_authorize_cb (self, _sender, resource);
-#line 484 "simple-scan.c"
+	simple_scan_authorize_cb ((SimpleScan*) self, _sender, resource);
+#line 475 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_new_page_cb_scanner_expect_page (Scanner* _sender, gpointer self) {
 #line 57 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scanner_new_page_cb (self, _sender);
-#line 491 "simple-scan.c"
+	simple_scan_scanner_new_page_cb ((SimpleScan*) self, _sender);
+#line 482 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_info_cb_scanner_got_page_info (Scanner* _sender, ScanPageInfo* info, gpointer self) {
 #line 58 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scanner_page_info_cb (self, _sender, info);
-#line 498 "simple-scan.c"
+	simple_scan_scanner_page_info_cb ((SimpleScan*) self, _sender, info);
+#line 489 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_line_cb_scanner_got_line (Scanner* _sender, ScanLine* line, gpointer self) {
 #line 59 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scanner_line_cb (self, _sender, line);
-#line 505 "simple-scan.c"
+	simple_scan_scanner_line_cb ((SimpleScan*) self, _sender, line);
+#line 496 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_page_done_cb_scanner_page_done (Scanner* _sender, gpointer self) {
 #line 60 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scanner_page_done_cb (self, _sender);
-#line 512 "simple-scan.c"
+	simple_scan_scanner_page_done_cb ((SimpleScan*) self, _sender);
+#line 503 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_document_done_cb_scanner_document_done (Scanner* _sender, gpointer self) {
 #line 61 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scanner_document_done_cb (self, _sender);
-#line 519 "simple-scan.c"
+	simple_scan_scanner_document_done_cb ((SimpleScan*) self, _sender);
+#line 510 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_failed_cb_scanner_scan_failed (Scanner* _sender, gint error_code, const gchar* error_string, gpointer self) {
 #line 62 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scanner_failed_cb (self, _sender, error_code, error_string);
-#line 526 "simple-scan.c"
+	simple_scan_scanner_failed_cb ((SimpleScan*) self, _sender, error_code, error_string);
+#line 517 "simple-scan.c"
 }
 
 
 static void _simple_scan_scanner_scanning_changed_cb_scanner_scanning_changed (Scanner* _sender, gpointer self) {
 #line 63 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_scanner_scanning_changed_cb (self, _sender);
-#line 533 "simple-scan.c"
+	simple_scan_scanner_scanning_changed_cb ((SimpleScan*) self, _sender);
+#line 524 "simple-scan.c"
 }
 
 
 static void _simple_scan_on_uevent_g_udev_client_uevent (GUdevClient* _sender, const gchar* action, GUdevDevice* device, gpointer self) {
 #line 67 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_on_uevent (self, _sender, action, device);
-#line 540 "simple-scan.c"
+	simple_scan_on_uevent ((SimpleScan*) self, _sender, action, device);
+#line 531 "simple-scan.c"
 }
 
 
 static void _scan_device_unref0_ (gpointer var) {
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	(var == NULL) ? NULL : (var = (scan_device_unref (var), NULL));
-#line 547 "simple-scan.c"
+#line 538 "simple-scan.c"
 }
 
 
@@ -552,7 +543,7 @@ static void _g_list_free__scan_device_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _scan_device_unref0_, NULL);
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_list_free (self);
-#line 556 "simple-scan.c"
+#line 547 "simple-scan.c"
 }
 
 
@@ -593,7 +584,9 @@ static void simple_scan_real_startup (GApplication* base) {
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = user_interface_new ();
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_user_interface_unref0 (self->priv->ui);
+	g_object_ref_sink (_tmp0_);
+#line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_object_unref0 (self->priv->ui);
 #line 48 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->ui = _tmp0_;
 #line 49 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -694,7 +687,7 @@ static void simple_scan_real_startup (GApplication* base) {
 	_tmp23_ = self->priv->default_device;
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp23_ != NULL) {
-#line 698 "simple-scan.c"
+#line 691 "simple-scan.c"
 		GList* device_list = NULL;
 		ScanDevice* _tmp24_ = NULL;
 		ScanDevice* _tmp25_ = NULL;
@@ -727,11 +720,11 @@ static void simple_scan_real_startup (GApplication* base) {
 		user_interface_set_selected_device (_tmp28_, _tmp30_);
 #line 69 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		__g_list_free__scan_device_unref0_0 (device_list);
-#line 731 "simple-scan.c"
+#line 724 "simple-scan.c"
 	}
 #line 44 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	subsystems = (_vala_array_free (subsystems, subsystems_length1, (GDestroyNotify) g_free), NULL);
-#line 735 "simple-scan.c"
+#line 728 "simple-scan.c"
 }
 
 
@@ -751,7 +744,7 @@ static void simple_scan_real_activate (GApplication* base) {
 	_tmp1_ = self->priv->scanner;
 #line 83 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_start (_tmp1_);
-#line 755 "simple-scan.c"
+#line 748 "simple-scan.c"
 }
 
 
@@ -767,7 +760,7 @@ static void simple_scan_real_shutdown (GApplication* base) {
 #line 89 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->book = NULL;
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_user_interface_unref0 (self->priv->ui);
+	_g_object_unref0 (self->priv->ui);
 #line 90 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->ui = NULL;
 #line 91 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -778,7 +771,7 @@ static void simple_scan_real_shutdown (GApplication* base) {
 	_tmp0_ = self->priv->scanner;
 #line 92 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_free (_tmp0_);
-#line 782 "simple-scan.c"
+#line 775 "simple-scan.c"
 }
 
 
@@ -805,7 +798,7 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 	_tmp2_ = self->priv->default_device;
 #line 100 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp2_ != NULL) {
-#line 809 "simple-scan.c"
+#line 802 "simple-scan.c"
 		gboolean default_in_list = FALSE;
 		GList* _tmp3_ = NULL;
 		gboolean _tmp8_ = FALSE;
@@ -813,7 +806,7 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 		default_in_list = FALSE;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp3_ = devices_copy;
-#line 817 "simple-scan.c"
+#line 810 "simple-scan.c"
 		{
 			GList* device_collection = NULL;
 			GList* device_it = NULL;
@@ -821,11 +814,11 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 			device_collection = _tmp3_;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 825 "simple-scan.c"
+#line 818 "simple-scan.c"
 				ScanDevice* device = NULL;
 #line 103 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				device = (ScanDevice*) device_it->data;
-#line 829 "simple-scan.c"
+#line 822 "simple-scan.c"
 				{
 					ScanDevice* _tmp4_ = NULL;
 					const gchar* _tmp5_ = NULL;
@@ -845,7 +838,7 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 						default_in_list = TRUE;
 #line 108 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 849 "simple-scan.c"
+#line 842 "simple-scan.c"
 					}
 				}
 			}
@@ -854,13 +847,13 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 		_tmp8_ = default_in_list;
 #line 112 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (!_tmp8_) {
-#line 858 "simple-scan.c"
+#line 851 "simple-scan.c"
 			ScanDevice* _tmp9_ = NULL;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp9_ = self->priv->default_device;
 #line 113 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			devices_copy = g_list_prepend (devices_copy, _tmp9_);
-#line 864 "simple-scan.c"
+#line 857 "simple-scan.c"
 		}
 	}
 #line 116 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -877,7 +870,7 @@ static void simple_scan_update_scan_devices_cb (SimpleScan* self, Scanner* scann
 	user_interface_set_scan_devices (_tmp12_, _tmp13_);
 #line 95 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_list_free0 (devices_copy);
-#line 881 "simple-scan.c"
+#line 874 "simple-scan.c"
 }
 
 
@@ -917,7 +910,7 @@ static void simple_scan_authorize_cb (SimpleScan* self, Scanner* scanner, const
 	_g_free0 (password);
 #line 120 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (username);
-#line 921 "simple-scan.c"
+#line 914 "simple-scan.c"
 }
 
 
@@ -928,7 +921,6 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 	Page* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	Page* _tmp3_ = NULL;
-	gboolean _tmp7_ = FALSE;
 	ScanDirection scan_direction = 0;
 	gboolean do_crop = FALSE;
 	gchar* named_crop = NULL;
@@ -939,18 +931,18 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 	gint cy = 0;
 	gint cw = 0;
 	gint ch = 0;
-	Page* _tmp11_ = NULL;
+	Page* _tmp10_ = NULL;
+	gint _tmp43_ = 0;
 	gint _tmp44_ = 0;
 	gint _tmp45_ = 0;
-	gint _tmp46_ = 0;
-	ScanDirection _tmp47_ = 0;
-	Page* _tmp48_ = NULL;
-	Book* _tmp49_ = NULL;
-	Page* _tmp50_ = NULL;
-	gboolean _tmp51_ = FALSE;
-	UserInterface* _tmp61_ = NULL;
+	ScanDirection _tmp46_ = 0;
+	Page* _tmp47_ = NULL;
+	Book* _tmp48_ = NULL;
+	Page* _tmp49_ = NULL;
+	gboolean _tmp50_ = FALSE;
+	UserInterface* _tmp60_ = NULL;
+	Page* _tmp61_ = NULL;
 	Page* _tmp62_ = NULL;
-	Page* _tmp63_ = NULL;
 #line 127 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
 #line 130 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -963,7 +955,7 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 	_tmp3_ = page;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp3_ != NULL) {
-#line 967 "simple-scan.c"
+#line 959 "simple-scan.c"
 		Page* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
@@ -975,35 +967,33 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 		_tmp6_ = _tmp5_;
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = !_tmp6_;
-#line 979 "simple-scan.c"
+#line 971 "simple-scan.c"
 	} else {
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp2_ = FALSE;
-#line 983 "simple-scan.c"
+#line 975 "simple-scan.c"
 	}
 #line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp7_ = _tmp2_;
-#line 131 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp7_) {
-#line 989 "simple-scan.c"
-		UserInterface* _tmp8_ = NULL;
+	if (_tmp2_) {
+#line 979 "simple-scan.c"
+		UserInterface* _tmp7_ = NULL;
+		Page* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
-		Page* _tmp10_ = NULL;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp8_ = self->priv->ui;
+		_tmp7_ = self->priv->ui;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp9_ = page;
+		_tmp8_ = page;
 #line 133 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		user_interface_set_selected_page (_tmp8_, _tmp9_);
+		user_interface_set_selected_page (_tmp7_, _tmp8_);
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp10_ = page;
+		_tmp9_ = page;
 #line 134 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		page_start (_tmp10_);
+		page_start (_tmp9_);
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = page;
 #line 135 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1007 "simple-scan.c"
+#line 997 "simple-scan.c"
 	}
 #line 139 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
@@ -1026,218 +1016,218 @@ static Page* simple_scan_append_page (SimpleScan* self) {
 #line 142 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	ch = 0;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp11_ = page;
+	_tmp10_ = page;
 #line 143 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp11_ != NULL) {
-#line 1033 "simple-scan.c"
-		Page* _tmp12_ = NULL;
+	if (_tmp10_ != NULL) {
+#line 1023 "simple-scan.c"
+		Page* _tmp11_ = NULL;
+		ScanDirection _tmp12_ = 0;
 		ScanDirection _tmp13_ = 0;
-		ScanDirection _tmp14_ = 0;
-		Page* _tmp15_ = NULL;
+		Page* _tmp14_ = NULL;
+		gint _tmp15_ = 0;
 		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		Page* _tmp18_ = NULL;
+		Page* _tmp17_ = NULL;
+		gint _tmp18_ = 0;
 		gint _tmp19_ = 0;
-		gint _tmp20_ = 0;
-		Page* _tmp21_ = NULL;
+		Page* _tmp20_ = NULL;
+		gint _tmp21_ = 0;
 		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		Page* _tmp24_ = NULL;
+		Page* _tmp23_ = NULL;
+		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
 		gboolean _tmp26_ = FALSE;
-		gboolean _tmp27_ = FALSE;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = page;
+		_tmp11_ = page;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = page_get_scan_direction (_tmp12_);
+		_tmp12_ = page_get_scan_direction (_tmp11_);
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13_ = _tmp12_;
 #line 145 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		scan_direction = _tmp14_;
+		scan_direction = _tmp13_;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp15_ = page;
+		_tmp14_ = page;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp16_ = page_get_width (_tmp15_);
+		_tmp15_ = page_get_width (_tmp14_);
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp17_ = _tmp16_;
+		_tmp16_ = _tmp15_;
 #line 146 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		width = _tmp17_;
+		width = _tmp16_;
 #line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp18_ = page;
+		_tmp17_ = page;
 #line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp19_ = page_get_height (_tmp18_);
+		_tmp18_ = page_get_height (_tmp17_);
 #line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp20_ = _tmp19_;
+		_tmp19_ = _tmp18_;
 #line 147 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		height = _tmp20_;
+		height = _tmp19_;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp21_ = page;
+		_tmp20_ = page;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp22_ = page_get_dpi (_tmp21_);
+		_tmp21_ = page_get_dpi (_tmp20_);
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = _tmp22_;
+		_tmp22_ = _tmp21_;
 #line 148 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		dpi = _tmp23_;
+		dpi = _tmp22_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = page;
+		_tmp23_ = page;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp25_ = page_get_has_crop (_tmp24_);
+		_tmp24_ = page_get_has_crop (_tmp23_);
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp26_ = _tmp25_;
+		_tmp25_ = _tmp24_;
 #line 150 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		do_crop = _tmp26_;
+		do_crop = _tmp25_;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp27_ = do_crop;
+		_tmp26_ = do_crop;
 #line 151 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp27_) {
-#line 1094 "simple-scan.c"
-			Page* _tmp28_ = NULL;
+		if (_tmp26_) {
+#line 1084 "simple-scan.c"
+			Page* _tmp27_ = NULL;
+			const gchar* _tmp28_ = NULL;
 			const gchar* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-			Page* _tmp32_ = NULL;
+			gchar* _tmp30_ = NULL;
+			Page* _tmp31_ = NULL;
+			gint _tmp32_ = 0;
 			gint _tmp33_ = 0;
-			gint _tmp34_ = 0;
-			Page* _tmp35_ = NULL;
+			Page* _tmp34_ = NULL;
+			gint _tmp35_ = 0;
 			gint _tmp36_ = 0;
-			gint _tmp37_ = 0;
-			Page* _tmp38_ = NULL;
+			Page* _tmp37_ = NULL;
+			gint _tmp38_ = 0;
 			gint _tmp39_ = 0;
-			gint _tmp40_ = 0;
-			Page* _tmp41_ = NULL;
+			Page* _tmp40_ = NULL;
+			gint _tmp41_ = 0;
 			gint _tmp42_ = 0;
-			gint _tmp43_ = 0;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp28_ = page;
+			_tmp27_ = page;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp29_ = page_get_crop_name (_tmp28_);
+			_tmp28_ = page_get_crop_name (_tmp27_);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp30_ = _tmp29_;
+			_tmp29_ = _tmp28_;
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp31_ = g_strdup (_tmp30_);
+			_tmp30_ = g_strdup (_tmp29_);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_free0 (named_crop);
 #line 153 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			named_crop = _tmp31_;
+			named_crop = _tmp30_;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp32_ = page;
+			_tmp31_ = page;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp33_ = page_get_crop_x (_tmp32_);
+			_tmp32_ = page_get_crop_x (_tmp31_);
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp34_ = _tmp33_;
+			_tmp33_ = _tmp32_;
 #line 154 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cx = _tmp34_;
+			cx = _tmp33_;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp35_ = page;
+			_tmp34_ = page;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp36_ = page_get_crop_y (_tmp35_);
+			_tmp35_ = page_get_crop_y (_tmp34_);
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp37_ = _tmp36_;
+			_tmp36_ = _tmp35_;
 #line 155 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cy = _tmp37_;
+			cy = _tmp36_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp38_ = page;
+			_tmp37_ = page;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp39_ = page_get_crop_width (_tmp38_);
+			_tmp38_ = page_get_crop_width (_tmp37_);
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp40_ = _tmp39_;
+			_tmp39_ = _tmp38_;
 #line 156 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			cw = _tmp40_;
+			cw = _tmp39_;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp41_ = page;
+			_tmp40_ = page;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp42_ = page_get_crop_height (_tmp41_);
+			_tmp41_ = page_get_crop_height (_tmp40_);
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp43_ = _tmp42_;
+			_tmp42_ = _tmp41_;
 #line 157 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			ch = _tmp43_;
-#line 1155 "simple-scan.c"
+			ch = _tmp42_;
+#line 1145 "simple-scan.c"
 		}
 	}
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp44_ = width;
+	_tmp43_ = width;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp45_ = height;
+	_tmp44_ = height;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp46_ = dpi;
+	_tmp45_ = dpi;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp47_ = scan_direction;
+	_tmp46_ = scan_direction;
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp48_ = page_new (_tmp44_, _tmp45_, _tmp46_, _tmp47_);
+	_tmp47_ = page_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
 #line 161 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page = _tmp48_;
+	page = _tmp47_;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp49_ = self->priv->book;
+	_tmp48_ = self->priv->book;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp50_ = page;
+	_tmp49_ = page;
 #line 162 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	book_append_page (_tmp49_, _tmp50_);
+	book_append_page (_tmp48_, _tmp49_);
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp51_ = do_crop;
+	_tmp50_ = do_crop;
 #line 163 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp51_) {
-#line 1182 "simple-scan.c"
-		const gchar* _tmp52_ = NULL;
-		Page* _tmp58_ = NULL;
+	if (_tmp50_) {
+#line 1172 "simple-scan.c"
+		const gchar* _tmp51_ = NULL;
+		Page* _tmp57_ = NULL;
+		gint _tmp58_ = 0;
 		gint _tmp59_ = 0;
-		gint _tmp60_ = 0;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp52_ = named_crop;
+		_tmp51_ = named_crop;
 #line 165 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp52_ != NULL) {
-#line 1191 "simple-scan.c"
-			Page* _tmp53_ = NULL;
-			const gchar* _tmp54_ = NULL;
+		if (_tmp51_ != NULL) {
+#line 1181 "simple-scan.c"
+			Page* _tmp52_ = NULL;
+			const gchar* _tmp53_ = NULL;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp53_ = page;
+			_tmp52_ = page;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp54_ = named_crop;
+			_tmp53_ = named_crop;
 #line 167 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			page_set_named_crop (_tmp53_, _tmp54_);
-#line 1200 "simple-scan.c"
+			page_set_named_crop (_tmp52_, _tmp53_);
+#line 1190 "simple-scan.c"
 		} else {
-			Page* _tmp55_ = NULL;
+			Page* _tmp54_ = NULL;
+			gint _tmp55_ = 0;
 			gint _tmp56_ = 0;
-			gint _tmp57_ = 0;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp55_ = page;
+			_tmp54_ = page;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp56_ = cw;
+			_tmp55_ = cw;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp57_ = ch;
+			_tmp56_ = ch;
 #line 170 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			page_set_custom_crop (_tmp55_, _tmp56_, _tmp57_);
-#line 1213 "simple-scan.c"
+			page_set_custom_crop (_tmp54_, _tmp55_, _tmp56_);
+#line 1203 "simple-scan.c"
 		}
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp58_ = page;
+		_tmp57_ = page;
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp59_ = cx;
+		_tmp58_ = cx;
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp60_ = cy;
+		_tmp59_ = cy;
 #line 171 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		page_move_crop (_tmp58_, _tmp59_, _tmp60_);
-#line 1223 "simple-scan.c"
+		page_move_crop (_tmp57_, _tmp58_, _tmp59_);
+#line 1213 "simple-scan.c"
 	}
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp61_ = self->priv->ui;
+	_tmp60_ = self->priv->ui;
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp62_ = page;
+	_tmp61_ = page;
 #line 173 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	user_interface_set_selected_page (_tmp61_, _tmp62_);
+	user_interface_set_selected_page (_tmp60_, _tmp61_);
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp63_ = page;
+	_tmp62_ = page;
 #line 174 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	page_start (_tmp63_);
+	page_start (_tmp62_);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = page;
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (named_crop);
 #line 176 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 1241 "simple-scan.c"
+#line 1231 "simple-scan.c"
 }
 
 
@@ -1254,7 +1244,7 @@ static void simple_scan_scanner_new_page_cb (SimpleScan* self, Scanner* scanner)
 	_tmp1_ = _tmp0_;
 #line 181 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (_tmp1_);
-#line 1258 "simple-scan.c"
+#line 1248 "simple-scan.c"
 }
 
 
@@ -1268,20 +1258,20 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	CdClient* _tmp3_ = NULL;
 	CdDevice* device = NULL;
 	CdProfile* profile = NULL;
-	CdDevice* _tmp18_ = NULL;
-	CdProfile* _tmp19_ = NULL;
+	CdDevice* _tmp19_ = NULL;
 	CdProfile* _tmp20_ = NULL;
-	CdProfile* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
+	CdProfile* _tmp21_ = NULL;
+	CdProfile* _tmp27_ = NULL;
 	const gchar* _tmp28_ = NULL;
-	CdProfile* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
+	const gchar* _tmp29_ = NULL;
+	CdProfile* _tmp31_ = NULL;
 	const gchar* _tmp32_ = NULL;
 	const gchar* _tmp33_ = NULL;
-	CdProfile* _tmp34_ = NULL;
-	const gchar* _tmp35_ = NULL;
+	const gchar* _tmp34_ = NULL;
+	CdProfile* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	const gchar* _tmp37_ = NULL;
+	gchar* _tmp38_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 184 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_val_if_fail (self != NULL, NULL);
@@ -1301,7 +1291,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	_tmp3_ = cd_client_new ();
 #line 190 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	client = _tmp3_;
-#line 1305 "simple-scan.c"
+#line 1295 "simple-scan.c"
 	{
 		CdClient* _tmp4_ = NULL;
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1310,7 +1300,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		cd_client_connect_sync (_tmp4_, NULL, &_inner_error_);
 #line 193 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1314 "simple-scan.c"
+#line 1304 "simple-scan.c"
 			goto __catch4_g_error;
 		}
 	}
@@ -1340,7 +1330,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		_g_free0 (device_id);
 #line 198 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1344 "simple-scan.c"
+#line 1334 "simple-scan.c"
 	}
 	__finally4:
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1355,13 +1345,14 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		g_clear_error (&_inner_error_);
 #line 191 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1359 "simple-scan.c"
+#line 1349 "simple-scan.c"
 	}
 	{
 		CdDevice* _tmp7_ = NULL;
 		CdClient* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		CdDevice* _tmp10_ = NULL;
+		CdDevice* _tmp11_ = NULL;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = client;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1372,34 +1363,40 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		_tmp7_ = _tmp10_;
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1376 "simple-scan.c"
+#line 1367 "simple-scan.c"
 			goto __catch5_g_error;
 		}
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp11_ = _tmp7_;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp7_ = NULL;
+#line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_object_unref0 (device);
 #line 204 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device = _tmp7_;
-#line 1383 "simple-scan.c"
+		device = _tmp11_;
+#line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_g_object_unref0 (_tmp7_);
+#line 1380 "simple-scan.c"
 	}
 	goto __finally5;
 	__catch5_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp11_ = NULL;
-		GError* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
+		const gchar* _tmp12_ = NULL;
+		GError* _tmp13_ = NULL;
+		const gchar* _tmp14_ = NULL;
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = device_name;
+		_tmp12_ = device_name;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = e;
+		_tmp13_ = e;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = _tmp12_->message;
+		_tmp14_ = _tmp13_->message;
 #line 208 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:208: Unable to find colord device %s: %s", _tmp11_, _tmp13_);
+		g_debug ("simple-scan.vala:208: Unable to find colord device %s: %s", _tmp12_, _tmp14_);
 #line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
 #line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1412,7 +1409,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		_g_free0 (device_id);
 #line 209 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1416 "simple-scan.c"
+#line 1413 "simple-scan.c"
 	}
 	__finally5:
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1429,17 +1426,17 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		g_clear_error (&_inner_error_);
 #line 202 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1433 "simple-scan.c"
+#line 1430 "simple-scan.c"
 	}
 	{
-		CdDevice* _tmp14_ = NULL;
+		CdDevice* _tmp15_ = NULL;
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp14_ = device;
+		_tmp15_ = device;
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		cd_device_connect_sync (_tmp14_, NULL, &_inner_error_);
+		cd_device_connect_sync (_tmp15_, NULL, &_inner_error_);
 #line 214 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1443 "simple-scan.c"
+#line 1440 "simple-scan.c"
 			goto __catch6_g_error;
 		}
 	}
@@ -1447,21 +1444,21 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	__catch6_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp15_ = NULL;
-		GError* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		const gchar* _tmp16_ = NULL;
+		GError* _tmp17_ = NULL;
+		const gchar* _tmp18_ = NULL;
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp15_ = device_name;
+		_tmp16_ = device_name;
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp16_ = e;
+		_tmp17_ = e;
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp17_ = _tmp16_->message;
+		_tmp18_ = _tmp17_->message;
 #line 218 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:218: Failed to get properties from the device %s: %s", _tmp15_, _tmp17_);
+		g_debug ("simple-scan.vala:218: Failed to get properties from the device %s: %s", _tmp16_, _tmp18_);
 #line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
 #line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1474,7 +1471,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		_g_free0 (device_id);
 #line 219 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1478 "simple-scan.c"
+#line 1475 "simple-scan.c"
 	}
 	__finally6:
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1491,24 +1488,24 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		g_clear_error (&_inner_error_);
 #line 212 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1495 "simple-scan.c"
+#line 1492 "simple-scan.c"
 	}
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp18_ = device;
+	_tmp19_ = device;
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp19_ = cd_device_get_default_profile (_tmp18_);
+	_tmp20_ = cd_device_get_default_profile (_tmp19_);
 #line 222 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	profile = _tmp19_;
+	profile = _tmp20_;
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp20_ = profile;
+	_tmp21_ = profile;
 #line 223 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp20_ == NULL) {
-#line 1507 "simple-scan.c"
-		const gchar* _tmp21_ = NULL;
+	if (_tmp21_ == NULL) {
+#line 1504 "simple-scan.c"
+		const gchar* _tmp22_ = NULL;
 #line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp21_ = device_name;
+		_tmp22_ = device_name;
 #line 225 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:225: No default color profile for device: %s", _tmp21_);
+		g_debug ("simple-scan.vala:225: No default color profile for device: %s", _tmp22_);
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1521,17 +1518,17 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		_g_free0 (device_id);
 #line 226 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1525 "simple-scan.c"
+#line 1522 "simple-scan.c"
 	}
 	{
-		CdProfile* _tmp22_ = NULL;
+		CdProfile* _tmp23_ = NULL;
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp22_ = profile;
+		_tmp23_ = profile;
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		cd_profile_connect_sync (_tmp22_, NULL, &_inner_error_);
+		cd_profile_connect_sync (_tmp23_, NULL, &_inner_error_);
 #line 231 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 1535 "simple-scan.c"
+#line 1532 "simple-scan.c"
 			goto __catch7_g_error;
 		}
 	}
@@ -1539,21 +1536,21 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	__catch7_g_error:
 	{
 		GError* e = NULL;
-		const gchar* _tmp23_ = NULL;
-		GError* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
+		const gchar* _tmp24_ = NULL;
+		GError* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
 #line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = device_name;
+		_tmp24_ = device_name;
 #line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = e;
+		_tmp25_ = e;
 #line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp25_ = _tmp24_->message;
+		_tmp26_ = _tmp25_->message;
 #line 235 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:235: Failed to get properties from the profile %s: %s", _tmp23_, _tmp25_);
+		g_debug ("simple-scan.vala:235: Failed to get properties from the profile %s: %s", _tmp24_, _tmp26_);
 #line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
 #line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1568,7 +1565,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		_g_free0 (device_id);
 #line 236 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1572 "simple-scan.c"
+#line 1569 "simple-scan.c"
 	}
 	__finally7:
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1587,22 +1584,22 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		g_clear_error (&_inner_error_);
 #line 229 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 1591 "simple-scan.c"
+#line 1588 "simple-scan.c"
 	}
 #line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp26_ = profile;
+	_tmp27_ = profile;
 #line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp27_ = cd_profile_get_filename (_tmp26_);
+	_tmp28_ = cd_profile_get_filename (_tmp27_);
 #line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp28_ = _tmp27_;
+	_tmp29_ = _tmp28_;
 #line 239 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp28_ == NULL) {
-#line 1601 "simple-scan.c"
-		const gchar* _tmp29_ = NULL;
+	if (_tmp29_ == NULL) {
+#line 1598 "simple-scan.c"
+		const gchar* _tmp30_ = NULL;
 #line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp29_ = device_name;
+		_tmp30_ = device_name;
 #line 241 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_debug ("simple-scan.vala:241: No icc color profile for the device %s", _tmp29_);
+		g_debug ("simple-scan.vala:241: No icc color profile for the device %s", _tmp30_);
 #line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = NULL;
 #line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1615,28 +1612,28 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 		_g_free0 (device_id);
 #line 242 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 1619 "simple-scan.c"
+#line 1616 "simple-scan.c"
 	}
 #line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp30_ = profile;
+	_tmp31_ = profile;
 #line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp31_ = cd_profile_get_filename (_tmp30_);
+	_tmp32_ = cd_profile_get_filename (_tmp31_);
 #line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp32_ = _tmp31_;
+	_tmp33_ = _tmp32_;
 #line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp33_ = device_name;
+	_tmp34_ = device_name;
 #line 245 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:245: Using color profile %s for device %s", _tmp32_, _tmp33_);
+	g_debug ("simple-scan.vala:245: Using color profile %s for device %s", _tmp33_, _tmp34_);
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp34_ = profile;
+	_tmp35_ = profile;
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp35_ = cd_profile_get_filename (_tmp34_);
+	_tmp36_ = cd_profile_get_filename (_tmp35_);
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp36_ = _tmp35_;
+	_tmp37_ = _tmp36_;
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp37_ = g_strdup (_tmp36_);
+	_tmp38_ = g_strdup (_tmp37_);
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	result = _tmp37_;
+	result = _tmp38_;
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (profile);
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1647,7 +1644,7 @@ static gchar* simple_scan_get_profile_for_device (SimpleScan* self, const gchar*
 	_g_free0 (device_id);
 #line 246 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 1651 "simple-scan.c"
+#line 1648 "simple-scan.c"
 }
 
 
@@ -1708,7 +1705,7 @@ static void simple_scan_scanner_page_info_cb (SimpleScan* self, Scanner* scanner
 	_g_free0 (_tmp11_);
 #line 252 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1711 "simple-scan.c"
+#line 1708 "simple-scan.c"
 }
 
 
@@ -1744,7 +1741,7 @@ static void simple_scan_scanner_line_cb (SimpleScan* self, Scanner* scanner, Sca
 	page_parse_scan_line (page, _tmp5_);
 #line 267 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1747 "simple-scan.c"
+#line 1744 "simple-scan.c"
 }
 
 
@@ -1775,7 +1772,7 @@ static void simple_scan_scanner_page_done_cb (SimpleScan* self, Scanner* scanner
 	page_finish (page);
 #line 273 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1778 "simple-scan.c"
+#line 1775 "simple-scan.c"
 }
 
 
@@ -1811,7 +1808,7 @@ static void simple_scan_remove_empty_page (SimpleScan* self) {
 	_tmp7_ = _tmp6_;
 #line 282 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp7_) {
-#line 1814 "simple-scan.c"
+#line 1811 "simple-scan.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1820,11 +1817,11 @@ static void simple_scan_remove_empty_page (SimpleScan* self) {
 		_tmp9_ = page;
 #line 283 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		book_delete_page (_tmp8_, _tmp9_);
-#line 1823 "simple-scan.c"
+#line 1820 "simple-scan.c"
 	}
 #line 279 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_page_unref0 (page);
-#line 1827 "simple-scan.c"
+#line 1824 "simple-scan.c"
 }
 
 
@@ -1835,7 +1832,7 @@ static void simple_scan_scanner_document_done_cb (SimpleScan* self, Scanner* sca
 	g_return_if_fail (scanner != NULL);
 #line 288 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_remove_empty_page (self);
-#line 1838 "simple-scan.c"
+#line 1835 "simple-scan.c"
 }
 
 
@@ -1853,7 +1850,7 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g
 	_tmp0_ = error_code;
 #line 294 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp0_ != ((gint) SANE_STATUS_CANCELLED)) {
-#line 1856 "simple-scan.c"
+#line 1853 "simple-scan.c"
 		UserInterface* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -1868,7 +1865,7 @@ static void simple_scan_scanner_failed_cb (SimpleScan* self, Scanner* scanner, g
 		_tmp4_ = self->priv->have_devices;
 #line 296 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		user_interface_show_error (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1871 "simple-scan.c"
+#line 1868 "simple-scan.c"
 	}
 }
 
@@ -1889,7 +1886,7 @@ static void simple_scan_scanner_scanning_changed_cb (SimpleScan* self, Scanner*
 	_tmp2_ = scanner_is_scanning (_tmp1_);
 #line 305 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	user_interface_set_scanning (_tmp0_, _tmp2_);
-#line 1892 "simple-scan.c"
+#line 1889 "simple-scan.c"
 }
 
 
@@ -1933,7 +1930,7 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	_tmp4_ = scanner_is_scanning (_tmp3_);
 #line 312 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (!_tmp4_) {
-#line 1936 "simple-scan.c"
+#line 1933 "simple-scan.c"
 		Page* _tmp5_ = NULL;
 		Page* _tmp6_ = NULL;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1942,7 +1939,7 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 		_tmp6_ = _tmp5_;
 #line 313 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_page_unref0 (_tmp6_);
-#line 1945 "simple-scan.c"
+#line 1942 "simple-scan.c"
 	}
 #line 316 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp7_ = _ ("Scanned Document");
@@ -1956,7 +1953,7 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	_tmp10_ = _tmp9_->scan_mode;
 #line 318 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp10_ == SCAN_MODE_COLOR) {
-#line 1959 "simple-scan.c"
+#line 1956 "simple-scan.c"
 		gchar* _tmp11_ = NULL;
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = g_strdup ("jpg");
@@ -1964,7 +1961,7 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 		_g_free0 (extension);
 #line 319 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp11_;
-#line 1967 "simple-scan.c"
+#line 1964 "simple-scan.c"
 	} else {
 		gchar* _tmp12_ = NULL;
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -1973,7 +1970,7 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 		_g_free0 (extension);
 #line 321 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		extension = _tmp12_;
-#line 1976 "simple-scan.c"
+#line 1973 "simple-scan.c"
 	}
 #line 322 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp13_ = filename_prefix;
@@ -2001,7 +1998,7 @@ static void simple_scan_scan_cb (SimpleScan* self, UserInterface* ui, const gcha
 	_g_free0 (extension);
 #line 308 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (filename_prefix);
-#line 2004 "simple-scan.c"
+#line 2001 "simple-scan.c"
 }
 
 
@@ -2015,7 +2012,7 @@ static void simple_scan_cancel_cb (SimpleScan* self, UserInterface* ui) {
 	_tmp0_ = self->priv->scanner;
 #line 329 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_cancel (_tmp0_);
-#line 2018 "simple-scan.c"
+#line 2015 "simple-scan.c"
 }
 
 
@@ -2041,7 +2038,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
 #line 337 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	filename = _tmp2_;
-#line 2044 "simple-scan.c"
+#line 2041 "simple-scan.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
@@ -2060,14 +2057,14 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		fd = _tmp5_;
 #line 341 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 2063 "simple-scan.c"
+#line 2060 "simple-scan.c"
 			goto __catch8_g_error;
 		}
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = fd;
 #line 342 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		close (_tmp6_);
-#line 2070 "simple-scan.c"
+#line 2067 "simple-scan.c"
 	}
 	goto __finally8;
 	__catch8_g_error:
@@ -2095,7 +2092,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		_g_free0 (filename);
 #line 347 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 2098 "simple-scan.c"
+#line 2095 "simple-scan.c"
 	}
 	__finally8:
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2110,7 +2107,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 		g_clear_error (&_inner_error_);
 #line 339 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return NULL;
-#line 2113 "simple-scan.c"
+#line 2110 "simple-scan.c"
 	}
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	result = path;
@@ -2118,7 +2115,7 @@ static gchar* simple_scan_get_temporary_filename (SimpleScan* self, const gchar*
 	_g_free0 (filename);
 #line 350 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 2121 "simple-scan.c"
+#line 2118 "simple-scan.c"
 }
 
 
@@ -2127,7 +2124,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	gchar* command_line = NULL;
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp43_ = NULL;
+	const gchar* _tmp42_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (self != NULL);
@@ -2145,7 +2142,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	_tmp1_ = profile;
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 2148 "simple-scan.c"
+#line 2145 "simple-scan.c"
 		gchar* path = NULL;
 		gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -2157,7 +2154,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 		_tmp3_ = path;
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_tmp3_ != NULL) {
-#line 2160 "simple-scan.c"
+#line 2157 "simple-scan.c"
 			GFile* file = NULL;
 			const gchar* _tmp4_ = NULL;
 			GFile* _tmp5_ = NULL;
@@ -2177,7 +2174,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			_tmp6_ = ui;
 #line 366 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			user_interface_show_progress_dialog (_tmp6_);
-#line 2180 "simple-scan.c"
+#line 2177 "simple-scan.c"
 			{
 				Book* _tmp7_ = NULL;
 				gint _tmp8_ = 0;
@@ -2192,7 +2189,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 				book_save (_tmp7_, "pdf", _tmp8_, _tmp9_, &_inner_error_);
 #line 369 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				if (_inner_error_ != NULL) {
-#line 2195 "simple-scan.c"
+#line 2192 "simple-scan.c"
 					goto __catch9_g_error;
 				}
 			}
@@ -2227,7 +2224,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 				_g_free0 (command_line);
 #line 375 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
-#line 2230 "simple-scan.c"
+#line 2227 "simple-scan.c"
 			}
 			__finally9:
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2244,7 +2241,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 				g_clear_error (&_inner_error_);
 #line 367 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				return;
-#line 2247 "simple-scan.c"
+#line 2244 "simple-scan.c"
 			}
 #line 377 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp13_ = command_line;
@@ -2264,118 +2261,115 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 			_g_free0 (_tmp16_);
 #line 363 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_object_unref0 (file);
-#line 2267 "simple-scan.c"
+#line 2264 "simple-scan.c"
 		}
 #line 359 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_free0 (path);
-#line 2271 "simple-scan.c"
+#line 2268 "simple-scan.c"
 	} else {
 		{
 			gint i = 0;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			i = 0;
-#line 2277 "simple-scan.c"
+#line 2274 "simple-scan.c"
 			{
 				gboolean _tmp18_ = FALSE;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				_tmp18_ = TRUE;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				while (TRUE) {
-#line 2284 "simple-scan.c"
-					gboolean _tmp19_ = FALSE;
-					gint _tmp21_ = 0;
-					Book* _tmp22_ = NULL;
+#line 2281 "simple-scan.c"
+					gint _tmp20_ = 0;
+					Book* _tmp21_ = NULL;
+					guint _tmp22_ = 0U;
 					guint _tmp23_ = 0U;
-					guint _tmp24_ = 0U;
 					gchar* path = NULL;
-					gchar* _tmp25_ = NULL;
-					const gchar* _tmp26_ = NULL;
+					gchar* _tmp24_ = NULL;
+					const gchar* _tmp25_ = NULL;
 					GFile* file = NULL;
-					const gchar* _tmp27_ = NULL;
-					GFile* _tmp28_ = NULL;
+					const gchar* _tmp26_ = NULL;
+					GFile* _tmp27_ = NULL;
+					const gchar* _tmp36_ = NULL;
 					const gchar* _tmp37_ = NULL;
-					const gchar* _tmp38_ = NULL;
+					gchar* _tmp38_ = NULL;
 					gchar* _tmp39_ = NULL;
 					gchar* _tmp40_ = NULL;
-					gchar* _tmp41_ = NULL;
-					gboolean _tmp42_ = FALSE;
-#line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp19_ = _tmp18_;
+					gboolean _tmp41_ = FALSE;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!_tmp19_) {
-#line 2306 "simple-scan.c"
-						gint _tmp20_ = 0;
+					if (!_tmp18_) {
+#line 2300 "simple-scan.c"
+						gint _tmp19_ = 0;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp20_ = i;
+						_tmp19_ = i;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						i = _tmp20_ + 1;
-#line 2312 "simple-scan.c"
+						i = _tmp19_ + 1;
+#line 2306 "simple-scan.c"
 					}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = FALSE;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp21_ = i;
+					_tmp20_ = i;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp22_ = self->priv->book;
+					_tmp21_ = self->priv->book;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp23_ = book_get_n_pages (_tmp22_);
+					_tmp22_ = book_get_n_pages (_tmp21_);
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp24_ = _tmp23_;
+					_tmp23_ = _tmp22_;
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!(((guint) _tmp21_) < _tmp24_)) {
+					if (!(((guint) _tmp20_) < _tmp23_)) {
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2328 "simple-scan.c"
+#line 2322 "simple-scan.c"
 					}
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp25_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
+					_tmp24_ = simple_scan_get_temporary_filename (self, "scan", "jpg");
 #line 384 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					path = _tmp25_;
+					path = _tmp24_;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp26_ = path;
+					_tmp25_ = path;
 #line 385 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_tmp26_ == NULL) {
+					if (_tmp25_ == NULL) {
 #line 387 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						saved = FALSE;
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
 #line 388 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2344 "simple-scan.c"
+#line 2338 "simple-scan.c"
 					}
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp27_ = path;
+					_tmp26_ = path;
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp28_ = g_file_new_for_path (_tmp27_);
+					_tmp27_ = g_file_new_for_path (_tmp26_);
 #line 391 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					file = _tmp28_;
-#line 2352 "simple-scan.c"
+					file = _tmp27_;
+#line 2346 "simple-scan.c"
 					{
-						Book* _tmp29_ = NULL;
-						gint _tmp30_ = 0;
+						Book* _tmp28_ = NULL;
+						gint _tmp29_ = 0;
+						Page* _tmp30_ = NULL;
 						Page* _tmp31_ = NULL;
-						Page* _tmp32_ = NULL;
-						gint _tmp33_ = 0;
-						GFile* _tmp34_ = NULL;
+						gint _tmp32_ = 0;
+						GFile* _tmp33_ = NULL;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp29_ = self->priv->book;
+						_tmp28_ = self->priv->book;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp30_ = i;
+						_tmp29_ = i;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp31_ = book_get_page (_tmp29_, _tmp30_);
+						_tmp30_ = book_get_page (_tmp28_, _tmp29_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp32_ = _tmp31_;
+						_tmp31_ = _tmp30_;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp33_ = quality;
+						_tmp32_ = quality;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp34_ = file;
+						_tmp33_ = file;
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						page_save (_tmp32_, "jpeg", _tmp33_, _tmp34_, &_inner_error_);
+						page_save (_tmp31_, "jpeg", _tmp32_, _tmp33_, &_inner_error_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_page_unref0 (_tmp32_);
+						_page_unref0 (_tmp31_);
 #line 394 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_inner_error_ != NULL) {
-#line 2378 "simple-scan.c"
+#line 2372 "simple-scan.c"
 							goto __catch10_g_error;
 						}
 					}
@@ -2383,18 +2377,18 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 					__catch10_g_error:
 					{
 						GError* e = NULL;
-						GError* _tmp35_ = NULL;
-						const gchar* _tmp36_ = NULL;
+						GError* _tmp34_ = NULL;
+						const gchar* _tmp35_ = NULL;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						e = _inner_error_;
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_inner_error_ = NULL;
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp35_ = e;
+						_tmp34_ = e;
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp36_ = _tmp35_->message;
+						_tmp35_ = _tmp34_->message;
 #line 398 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp36_);
+						g_warning ("simple-scan.vala:398: Unable to save email file: %s", _tmp35_);
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_error_free0 (e);
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2405,7 +2399,7 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 						_g_free0 (command_line);
 #line 399 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
-#line 2408 "simple-scan.c"
+#line 2402 "simple-scan.c"
 					}
 					__finally10:
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2422,59 +2416,59 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 						g_clear_error (&_inner_error_);
 #line 392 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						return;
-#line 2425 "simple-scan.c"
+#line 2419 "simple-scan.c"
 					}
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp37_ = command_line;
+					_tmp36_ = command_line;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp38_ = path;
+					_tmp37_ = path;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp39_ = g_strdup_printf (" --attach %s", _tmp38_);
+					_tmp38_ = g_strdup_printf (" --attach %s", _tmp37_);
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp40_ = _tmp39_;
+					_tmp39_ = _tmp38_;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp41_ = g_strconcat (_tmp37_, _tmp40_, NULL);
+					_tmp40_ = g_strconcat (_tmp36_, _tmp39_, NULL);
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (command_line);
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					command_line = _tmp41_;
+					command_line = _tmp40_;
 #line 401 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_free0 (_tmp40_);
+					_g_free0 (_tmp39_);
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp42_ = saved;
+					_tmp41_ = saved;
 #line 403 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (!_tmp42_) {
+					if (!_tmp41_) {
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_object_unref0 (file);
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (path);
 #line 404 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						break;
-#line 2453 "simple-scan.c"
+#line 2447 "simple-scan.c"
 					}
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_object_unref0 (file);
 #line 382 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_g_free0 (path);
-#line 2459 "simple-scan.c"
+#line 2453 "simple-scan.c"
 				}
 			}
 		}
 	}
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp43_ = command_line;
+	_tmp42_ = command_line;
 #line 408 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp43_);
-#line 2468 "simple-scan.c"
+	g_debug ("simple-scan.vala:408: Launching email client: %s", _tmp42_);
+#line 2462 "simple-scan.c"
 	{
-		const gchar* _tmp44_ = NULL;
+		const gchar* _tmp43_ = NULL;
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp44_ = command_line;
+		_tmp43_ = command_line;
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_spawn_command_line_async (_tmp44_, &_inner_error_);
+		g_spawn_command_line_async (_tmp43_, &_inner_error_);
 #line 411 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 2477 "simple-scan.c"
+#line 2471 "simple-scan.c"
 			goto __catch11_g_error;
 		}
 	}
@@ -2482,21 +2476,21 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 	__catch11_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp45_ = NULL;
-		const gchar* _tmp46_ = NULL;
+		GError* _tmp44_ = NULL;
+		const gchar* _tmp45_ = NULL;
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp45_ = e;
+		_tmp44_ = e;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp46_ = _tmp45_->message;
+		_tmp45_ = _tmp44_->message;
 #line 415 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp46_);
+		g_warning ("simple-scan.vala:415: Unable to start email: %s", _tmp45_);
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 2499 "simple-scan.c"
+#line 2493 "simple-scan.c"
 	}
 	__finally11:
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2509,11 +2503,11 @@ static void simple_scan_email_cb (SimpleScan* self, UserInterface* ui, const gch
 		g_clear_error (&_inner_error_);
 #line 409 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
-#line 2512 "simple-scan.c"
+#line 2506 "simple-scan.c"
 	}
 #line 353 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (command_line);
-#line 2516 "simple-scan.c"
+#line 2510 "simple-scan.c"
 }
 
 
@@ -2534,7 +2528,7 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 	switch (_tmp0_ & G_LOG_LEVEL_MASK) {
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_ERROR:
-#line 2537 "simple-scan.c"
+#line 2531 "simple-scan.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 426 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2545,11 +2539,11 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp1_;
 #line 427 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2548 "simple-scan.c"
+#line 2542 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_CRITICAL:
-#line 2552 "simple-scan.c"
+#line 2546 "simple-scan.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 429 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2560,11 +2554,11 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp2_;
 #line 430 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2563 "simple-scan.c"
+#line 2557 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_WARNING:
-#line 2567 "simple-scan.c"
+#line 2561 "simple-scan.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 432 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2575,11 +2569,11 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp3_;
 #line 433 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2578 "simple-scan.c"
+#line 2572 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_MESSAGE:
-#line 2582 "simple-scan.c"
+#line 2576 "simple-scan.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 435 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2590,11 +2584,11 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp4_;
 #line 436 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2593 "simple-scan.c"
+#line 2587 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_INFO:
-#line 2597 "simple-scan.c"
+#line 2591 "simple-scan.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 438 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2605,11 +2599,11 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp5_;
 #line 439 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2608 "simple-scan.c"
+#line 2602 "simple-scan.c"
 		}
 #line 423 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		case G_LOG_LEVEL_DEBUG:
-#line 2612 "simple-scan.c"
+#line 2606 "simple-scan.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 441 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2620,7 +2614,7 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp6_;
 #line 442 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2623 "simple-scan.c"
+#line 2617 "simple-scan.c"
 		}
 		default:
 		{
@@ -2633,7 +2627,7 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 			prefix = _tmp7_;
 #line 445 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2636 "simple-scan.c"
+#line 2630 "simple-scan.c"
 		}
 	}
 #line 448 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
@@ -2652,7 +2646,7 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 	_tmp13_ = simple_scan_debug_enabled;
 #line 449 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp13_) {
-#line 2655 "simple-scan.c"
+#line 2649 "simple-scan.c"
 		FILE* _tmp14_ = NULL;
 		GTimer* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
@@ -2670,11 +2664,11 @@ static void simple_scan_log_cb (const gchar* log_domain, GLogLevelFlags log_leve
 		_tmp18_ = message;
 #line 450 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp14_, "[%+.2fs] %s %s\n", _tmp16_, _tmp17_, _tmp18_);
-#line 2673 "simple-scan.c"
+#line 2667 "simple-scan.c"
 	}
 #line 419 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_free0 (prefix);
-#line 2677 "simple-scan.c"
+#line 2671 "simple-scan.c"
 }
 
 
@@ -2692,7 +2686,7 @@ static void simple_scan_on_uevent (SimpleScan* self, GUdevClient* client, const
 	_tmp0_ = self->priv->scanner;
 #line 455 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	scanner_redetect (_tmp0_);
-#line 2695 "simple-scan.c"
+#line 2689 "simple-scan.c"
 }
 
 
@@ -2703,39 +2697,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 2718 "simple-scan.c"
+#line 2712 "simple-scan.c"
 		glong _tmp4_ = 0L;
-#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 2726 "simple-scan.c"
+#line 2720 "simple-scan.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 2738 "simple-scan.c"
+#line 2732 "simple-scan.c"
 	}
 }
 
@@ -2745,125 +2739,122 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
 	glong _tmp1_ = 0L;
-	gboolean _tmp3_ = FALSE;
-	glong _tmp9_ = 0L;
-	glong _tmp15_ = 0L;
+	glong _tmp8_ = 0L;
+	glong _tmp14_ = 0L;
+	glong _tmp17_ = 0L;
 	glong _tmp18_ = 0L;
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
-	glong _tmp22_ = 0L;
-	gchar* _tmp23_ = NULL;
-#line 1167 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+	gchar* _tmp22_ = NULL;
+#line 1204 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 2763 "simple-scan.c"
+#line 2756 "simple-scan.c"
 		glong _tmp2_ = 0L;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2769 "simple-scan.c"
+#line 2762 "simple-scan.c"
 	} else {
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 2773 "simple-scan.c"
+#line 2766 "simple-scan.c"
 	}
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp3_ = _tmp0_;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp3_) {
-#line 2779 "simple-scan.c"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2770 "simple-scan.c"
+		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-		glong _tmp6_ = 0L;
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp4_ = offset;
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp5_ = len;
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_);
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		string_length = _tmp6_;
-#line 2791 "simple-scan.c"
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 2782 "simple-scan.c"
 	} else {
+		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp7_ = strlen (self);
-#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp8_;
-#line 2801 "simple-scan.c"
+#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 2792 "simple-scan.c"
 	}
-#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp9_ = offset;
-#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp9_ < ((glong) 0)) {
-#line 2807 "simple-scan.c"
+#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 2798 "simple-scan.c"
+		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-		glong _tmp12_ = 0L;
-#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp10_ = string_length;
-#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		offset = _tmp10_ + _tmp11_;
-#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL);
-#line 2821 "simple-scan.c"
+#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 2812 "simple-scan.c"
 	} else {
+		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-		glong _tmp14_ = 0L;
-#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp13_ = offset;
-#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp14_ = string_length;
-#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL);
-#line 2831 "simple-scan.c"
+#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 2822 "simple-scan.c"
 	}
-#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp15_ = len;
-#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp15_ < ((glong) 0)) {
-#line 2837 "simple-scan.c"
+#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 2828 "simple-scan.c"
+		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-		glong _tmp17_ = 0L;
-#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp16_ = string_length;
-#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp17_ = offset;
-#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		len = _tmp16_ - _tmp17_;
-#line 2846 "simple-scan.c"
+#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 2837 "simple-scan.c"
 	}
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp18_ = offset;
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp19_ = len;
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp20_ = string_length;
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL);
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp21_ = offset;
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp22_ = len;
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_);
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	result = _tmp23_;
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 2866 "simple-scan.c"
+#line 2857 "simple-scan.c"
 }
 
 
@@ -2884,17 +2875,16 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 	gint line_number = 0;
 	gint xref_offset = 0;
 	gint xref_line = 0;
-	GRegex* xref_regex = NULL;
-	GRegex* _tmp8_ = NULL;
-	GMatchInfo* xref_match = NULL;
+	gint startxref_line = 0;
+	gint fixed_size = 0;
 	GString* line = NULL;
-	GString* _tmp9_ = NULL;
-	const gchar* _tmp84_ = NULL;
-	const gchar* _tmp85_ = NULL;
-	gchar* _tmp86_ = NULL;
-	gchar* _tmp87_ = NULL;
-	gint _tmp88_ = 0;
-	gboolean _tmp89_ = FALSE;
+	GString* _tmp8_ = NULL;
+	const gchar* _tmp102_ = NULL;
+	const gchar* _tmp103_ = NULL;
+	gchar* _tmp104_ = NULL;
+	gchar* _tmp105_ = NULL;
+	gint _tmp106_ = 0;
+	gboolean _tmp107_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_return_if_fail (filename != NULL);
@@ -2918,7 +2908,7 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 		data = (g_free (data), NULL);
 #line 461 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return;
-#line 2921 "simple-scan.c"
+#line 2911 "simple-scan.c"
 	}
 #line 463 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = filename;
@@ -2943,391 +2933,480 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 #line 468 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	xref_line = -1;
 #line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp8_ = g_regex_new ("^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d 0000 n$", G_REGEX_RAW, 0, &_inner_error_);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	xref_regex = _tmp8_;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_inner_error_ != NULL) {
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_propagate_error (error, _inner_error_);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_fclose0 (fixed_file);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		data = (g_free (data), NULL);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		return;
-#line 2959 "simple-scan.c"
-	}
+	startxref_line = -1;
+#line 470 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	fixed_size = -1;
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp9_ = g_string_new ("");
+	_tmp8_ = g_string_new ("");
 #line 471 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	line = _tmp9_;
+	line = _tmp8_;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	while (TRUE) {
-#line 2967 "simple-scan.c"
-		gint _tmp10_ = 0;
-		guint8* _tmp11_ = NULL;
-		gint _tmp11__length1 = 0;
+#line 2945 "simple-scan.c"
+		gint _tmp9_ = 0;
 		gint end_offset = 0;
-		gint _tmp12_ = 0;
-		GString* _tmp13_ = NULL;
-		GString* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gboolean _tmp26_ = FALSE;
-		gint _tmp27_ = 0;
-		gboolean _tmp31_ = FALSE;
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp10_ = offset;
-#line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11_ = data;
+		gint _tmp10_ = 0;
+		GString* _tmp11_ = NULL;
+		GString* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+		GString* _tmp22_ = NULL;
+		const gchar* _tmp23_ = NULL;
+		gboolean _tmp25_ = FALSE;
+		gint _tmp26_ = 0;
+		gint _tmp100_ = 0;
+		gint _tmp101_ = 0;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp11__length1 = data_length1;
+		_tmp9_ = offset;
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (!(_tmp10_ < _tmp11__length1)) {
+		if (!(_tmp9_ < data_length1)) {
 #line 472 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			break;
-#line 2991 "simple-scan.c"
+#line 2964 "simple-scan.c"
 		}
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp12_ = offset;
+		_tmp10_ = offset;
 #line 474 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		end_offset = _tmp12_;
+		end_offset = _tmp10_;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp13_ = line;
+		_tmp11_ = line;
 #line 475 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_string_assign (_tmp13_, "");
+		g_string_assign (_tmp11_, "");
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		while (TRUE) {
-#line 3003 "simple-scan.c"
-			gint _tmp14_ = 0;
-			guint8* _tmp15_ = NULL;
-			gint _tmp15__length1 = 0;
+#line 2976 "simple-scan.c"
+			gint _tmp12_ = 0;
 			guint8 c = 0U;
-			guint8* _tmp16_ = NULL;
-			gint _tmp16__length1 = 0;
+			gint _tmp13_ = 0;
+			guint8 _tmp14_ = 0U;
+			GString* _tmp15_ = NULL;
+			guint8 _tmp16_ = 0U;
 			gint _tmp17_ = 0;
 			guint8 _tmp18_ = 0U;
-			GString* _tmp19_ = NULL;
-			guint8 _tmp20_ = 0U;
-			gint _tmp21_ = 0;
-			guint8 _tmp22_ = 0U;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp14_ = end_offset;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp15_ = data;
+			_tmp12_ = end_offset;
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp15__length1 = data_length1;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (!(_tmp14_ < _tmp15__length1)) {
+			if (!(_tmp12_ < data_length1)) {
 #line 476 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
-#line 3026 "simple-scan.c"
+#line 2991 "simple-scan.c"
 			}
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp16_ = data;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp16__length1 = data_length1;
-#line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp17_ = end_offset;
+			_tmp13_ = end_offset;
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp18_ = _tmp16_[_tmp17_];
+			_tmp14_ = data[_tmp13_];
 #line 478 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			c = _tmp18_;
+			c = _tmp14_;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp19_ = line;
+			_tmp15_ = line;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp20_ = c;
+			_tmp16_ = c;
 #line 479 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			g_string_append_c (_tmp19_, (gchar) _tmp20_);
+			g_string_append_c (_tmp15_, (gchar) _tmp16_);
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp21_ = end_offset;
+			_tmp17_ = end_offset;
 #line 480 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			end_offset = _tmp21_ + 1;
+			end_offset = _tmp17_ + 1;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp22_ = c;
+			_tmp18_ = c;
 #line 481 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (_tmp22_ == ((guint8) '\n')) {
+			if (_tmp18_ == ((guint8) '\n')) {
 #line 482 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				break;
-#line 3054 "simple-scan.c"
+#line 3015 "simple-scan.c"
 			}
 		}
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp23_ = line;
+		_tmp19_ = line;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp24_ = _tmp23_->str;
+		_tmp20_ = _tmp19_->str;
 #line 485 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (g_strcmp0 (_tmp24_, "startxref\n") == 0) {
-#line 3063 "simple-scan.c"
-			gint _tmp25_ = 0;
+		if (g_strcmp0 (_tmp20_, "startxref\n") == 0) {
+#line 3024 "simple-scan.c"
+			gint _tmp21_ = 0;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp25_ = line_number;
+			_tmp21_ = line_number;
 #line 486 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			xref_line = _tmp25_;
-#line 3069 "simple-scan.c"
+			startxref_line = _tmp21_;
+#line 3030 "simple-scan.c"
 		}
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp22_ = line;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp23_ = _tmp22_->str;
+#line 488 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		if (g_strcmp0 (_tmp23_, "xref\n") == 0) {
+#line 3038 "simple-scan.c"
+			gint _tmp24_ = 0;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp27_ = line_number;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp27_ < 2) {
-#line 3075 "simple-scan.c"
-			GString* _tmp28_ = NULL;
-			const gchar* _tmp29_ = NULL;
-			gboolean _tmp30_ = FALSE;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp28_ = line;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp29_ = _tmp28_->str;
+			_tmp24_ = line_number;
 #line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp30_ = g_str_has_prefix (_tmp29_, "%%");
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp26_ = _tmp30_;
-#line 3087 "simple-scan.c"
-		} else {
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp26_ = FALSE;
-#line 3091 "simple-scan.c"
+			xref_line = _tmp24_;
+#line 3044 "simple-scan.c"
 		}
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp31_ = _tmp26_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		if (_tmp31_) {
-#line 3097 "simple-scan.c"
-			gint _tmp32_ = 0;
-			FILE* _tmp33_ = NULL;
-			GString* _tmp34_ = NULL;
-			const gchar* _tmp35_ = NULL;
-			gchar* _tmp36_ = NULL;
-			gchar* _tmp37_ = NULL;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp32_ = xref_offset;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			xref_offset = _tmp32_ - 1;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp33_ = fixed_file;
+		_tmp26_ = line_number;
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		if (_tmp26_ < 2) {
+#line 3050 "simple-scan.c"
+			GString* _tmp27_ = NULL;
+			const gchar* _tmp28_ = NULL;
+			gboolean _tmp29_ = FALSE;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp34_ = line;
+			_tmp27_ = line;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp35_ = _tmp34_->str;
+			_tmp28_ = _tmp27_->str;
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp36_ = string_substring (_tmp35_, (glong) 1, (glong) (-1));
+			_tmp29_ = g_str_has_prefix (_tmp28_, "%%");
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp37_ = _tmp36_;
+			_tmp25_ = _tmp29_;
+#line 3062 "simple-scan.c"
+		} else {
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			fprintf (_tmp33_, "%s", _tmp37_);
+			_tmp25_ = FALSE;
+#line 3066 "simple-scan.c"
+		}
 #line 492 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_free0 (_tmp37_);
-#line 3122 "simple-scan.c"
+		if (_tmp25_) {
+#line 3070 "simple-scan.c"
+			gint _tmp30_ = 0;
+			FILE* _tmp31_ = NULL;
+			GString* _tmp32_ = NULL;
+			const gchar* _tmp33_ = NULL;
+			gchar* _tmp34_ = NULL;
+			gchar* _tmp35_ = NULL;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp30_ = xref_offset;
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			xref_offset = _tmp30_ - 1;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp31_ = fixed_file;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp32_ = line;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp33_ = _tmp32_->str;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp34_ = string_substring (_tmp33_, (glong) 1, (glong) (-1));
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp35_ = _tmp34_;
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			fprintf (_tmp31_, "%s", _tmp35_);
+#line 495 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_g_free0 (_tmp35_);
+#line 3095 "simple-scan.c"
 		} else {
-			GRegex* _tmp38_ = NULL;
-			GString* _tmp39_ = NULL;
-			const gchar* _tmp40_ = NULL;
-			GMatchInfo* _tmp41_ = NULL;
-			gboolean _tmp42_ = FALSE;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp38_ = xref_regex;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp39_ = line;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp40_ = _tmp39_->str;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp42_ = g_regex_match (_tmp38_, _tmp40_, 0, &_tmp41_);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_g_match_info_unref0 (xref_match);
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			xref_match = _tmp41_;
-#line 496 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			if (_tmp42_) {
-#line 3143 "simple-scan.c"
-				FILE* _tmp43_ = NULL;
-				GMatchInfo* _tmp44_ = NULL;
-				const gchar* _tmp45_ = NULL;
-				gint _tmp46_ = 0;
-				gint _tmp47_ = 0;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp43_ = fixed_file;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp44_ = xref_match;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp45_ = g_match_info_get_string (_tmp44_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp46_ = atoi (_tmp45_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp47_ = xref_offset;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				fprintf (_tmp43_, "%010d 00000 n \n", _tmp46_ + _tmp47_);
-#line 3161 "simple-scan.c"
+			gboolean _tmp36_ = FALSE;
+			gint _tmp37_ = 0;
+			gint _tmp38_ = 0;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp37_ = line_number;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp38_ = xref_line;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			if (_tmp37_ == (_tmp38_ + 1)) {
+#line 3106 "simple-scan.c"
+				GString* _tmp39_ = NULL;
+				const gchar* _tmp40_ = NULL;
+				gboolean _tmp41_ = FALSE;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp39_ = line;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp40_ = _tmp39_->str;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp41_ = g_str_has_prefix (_tmp40_, "1 ");
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp36_ = _tmp41_;
+#line 3118 "simple-scan.c"
 			} else {
-				gboolean _tmp48_ = FALSE;
-				gint _tmp49_ = 0;
-				gboolean _tmp52_ = FALSE;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp49_ = xref_line;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (_tmp49_ > 0) {
-#line 3170 "simple-scan.c"
-					gint _tmp50_ = 0;
-					gint _tmp51_ = 0;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp50_ = line_number;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp51_ = xref_line;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp48_ = _tmp50_ == (_tmp51_ + 1);
-#line 3179 "simple-scan.c"
-				} else {
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp48_ = FALSE;
-#line 3183 "simple-scan.c"
-				}
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				_tmp52_ = _tmp48_;
-#line 500 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-				if (_tmp52_) {
-#line 3189 "simple-scan.c"
-					FILE* _tmp53_ = NULL;
-					GString* _tmp54_ = NULL;
-					const gchar* _tmp55_ = NULL;
-					gint _tmp56_ = 0;
-					gint _tmp57_ = 0;
-					gchar* _tmp58_ = NULL;
-					gchar* _tmp59_ = NULL;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp53_ = fixed_file;
-#line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp54_ = line;
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp36_ = FALSE;
+#line 3122 "simple-scan.c"
+			}
+#line 499 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			if (_tmp36_) {
+#line 3126 "simple-scan.c"
+				GString* _tmp42_ = NULL;
+				const gchar* _tmp43_ = NULL;
+				gchar* _tmp44_ = NULL;
+				gchar* _tmp45_ = NULL;
+				gint _tmp46_ = 0;
+				FILE* _tmp47_ = NULL;
+				gint _tmp48_ = 0;
+				FILE* _tmp49_ = NULL;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp55_ = _tmp54_->str;
+				_tmp42_ = line;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp56_ = atoi (_tmp55_);
+				_tmp43_ = _tmp42_->str;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp57_ = xref_offset;
+				_tmp44_ = string_substring (_tmp43_, (glong) 2, (glong) (-1));
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp58_ = g_strdup_printf ("%d\n", _tmp56_ + _tmp57_);
+				_tmp45_ = _tmp44_;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp59_ = _tmp58_;
+				_tmp46_ = atoi (_tmp45_);
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					fprintf (_tmp53_, "%s", _tmp59_);
+				fixed_size = _tmp46_ + 1;
 #line 501 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_g_free0 (_tmp59_);
-#line 3215 "simple-scan.c"
+				_g_free0 (_tmp45_);
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp47_ = fixed_file;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp48_ = fixed_size;
+#line 502 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				fprintf (_tmp47_, "0 %d\n", _tmp48_);
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp49_ = fixed_file;
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				fprintf (_tmp49_, "0000000000 65535 f \n");
+#line 3159 "simple-scan.c"
+			} else {
+				gboolean _tmp50_ = FALSE;
+				gint _tmp51_ = 0;
+				gint _tmp52_ = 0;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp51_ = line_number;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				_tmp52_ = xref_line;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				if (_tmp51_ > _tmp52_) {
+#line 3170 "simple-scan.c"
+					GString* _tmp53_ = NULL;
+					const gchar* _tmp54_ = NULL;
+					gboolean _tmp55_ = FALSE;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp53_ = line;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp54_ = _tmp53_->str;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp55_ = g_str_has_suffix (_tmp54_, " 0000 n\n");
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp50_ = _tmp55_;
+#line 3182 "simple-scan.c"
 				} else {
-					gboolean _tmp60_ = FALSE;
-					gint _tmp61_ = 0;
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp50_ = FALSE;
+#line 3186 "simple-scan.c"
+				}
+#line 507 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+				if (_tmp50_) {
+#line 3190 "simple-scan.c"
+					FILE* _tmp56_ = NULL;
+					GString* _tmp57_ = NULL;
+					const gchar* _tmp58_ = NULL;
+					gint _tmp59_ = 0;
+					gint _tmp60_ = 0;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp56_ = fixed_file;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp57_ = line;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp58_ = _tmp57_->str;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp59_ = atoi (_tmp58_);
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp60_ = xref_offset;
+#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					fprintf (_tmp56_, "%010d 00000 n \n", _tmp59_ + _tmp60_);
+#line 3208 "simple-scan.c"
+				} else {
+					gboolean _tmp61_ = FALSE;
 					gint _tmp62_ = 0;
-					gboolean _tmp66_ = FALSE;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp61_ = line_number;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp62_ = xref_line;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_tmp61_ == (_tmp62_ + 2)) {
-#line 3227 "simple-scan.c"
-						GString* _tmp63_ = NULL;
-						const gchar* _tmp64_ = NULL;
-						gboolean _tmp65_ = FALSE;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp63_ = line;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp64_ = _tmp63_->str;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp65_ = g_str_has_prefix (_tmp64_, "%%%%");
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp60_ = _tmp65_;
-#line 3239 "simple-scan.c"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					_tmp62_ = startxref_line;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					if (_tmp62_ > 0) {
+#line 3216 "simple-scan.c"
+						gint _tmp63_ = 0;
+						gint _tmp64_ = 0;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp63_ = line_number;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp64_ = startxref_line;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp61_ = _tmp63_ == (_tmp64_ + 1);
+#line 3225 "simple-scan.c"
 					} else {
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp60_ = FALSE;
-#line 3243 "simple-scan.c"
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp61_ = FALSE;
+#line 3229 "simple-scan.c"
 					}
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					_tmp66_ = _tmp60_;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-					if (_tmp66_) {
-#line 3249 "simple-scan.c"
-						FILE* _tmp67_ = NULL;
-						GString* _tmp68_ = NULL;
-						const gchar* _tmp69_ = NULL;
+#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+					if (_tmp61_) {
+#line 3233 "simple-scan.c"
+						FILE* _tmp65_ = NULL;
+						GString* _tmp66_ = NULL;
+						const gchar* _tmp67_ = NULL;
+						gint _tmp68_ = 0;
+						gint _tmp69_ = 0;
 						gchar* _tmp70_ = NULL;
 						gchar* _tmp71_ = NULL;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp67_ = fixed_file;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp68_ = line;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp69_ = _tmp68_->str;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp70_ = string_substring (_tmp69_, (glong) 2, (glong) (-1));
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp65_ = fixed_file;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp66_ = line;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp67_ = _tmp66_->str;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp68_ = atoi (_tmp67_);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp69_ = xref_offset;
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp70_ = g_strdup_printf ("%d\n", _tmp68_ + _tmp69_);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp71_ = _tmp70_;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						fprintf (_tmp67_, "%s", _tmp71_);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						fprintf (_tmp65_, "%s", _tmp71_);
+#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_g_free0 (_tmp71_);
-#line 3269 "simple-scan.c"
+#line 3259 "simple-scan.c"
 					} else {
-						{
-							gint i = 0;
-							gint _tmp72_ = 0;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp72_ = offset;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							i = _tmp72_;
-#line 3278 "simple-scan.c"
-							{
-								gboolean _tmp73_ = FALSE;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								_tmp73_ = TRUE;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-								while (TRUE) {
-#line 3285 "simple-scan.c"
-									gboolean _tmp74_ = FALSE;
-									gint _tmp76_ = 0;
-									gint _tmp77_ = 0;
-									FILE* _tmp78_ = NULL;
-									guint8* _tmp79_ = NULL;
-									gint _tmp79__length1 = 0;
-									gint _tmp80_ = 0;
-									guint8 _tmp81_ = 0U;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp74_ = _tmp73_;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									if (!_tmp74_) {
-#line 3298 "simple-scan.c"
-										gint _tmp75_ = 0;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-										_tmp75_ = i;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-										i = _tmp75_ + 1;
+						gboolean _tmp72_ = FALSE;
+						gint _tmp73_ = 0;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp73_ = fixed_size;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						if (_tmp73_ > 0) {
+#line 3267 "simple-scan.c"
+							GString* _tmp74_ = NULL;
+							const gchar* _tmp75_ = NULL;
+							gboolean _tmp76_ = FALSE;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp74_ = line;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp75_ = _tmp74_->str;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp76_ = g_str_has_prefix (_tmp75_, "/Size ");
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp72_ = _tmp76_;
+#line 3279 "simple-scan.c"
+						} else {
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp72_ = FALSE;
+#line 3283 "simple-scan.c"
+						}
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						if (_tmp72_) {
+#line 3287 "simple-scan.c"
+							FILE* _tmp77_ = NULL;
+							gint _tmp78_ = 0;
+							gchar* _tmp79_ = NULL;
+							gchar* _tmp80_ = NULL;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp77_ = fixed_file;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp78_ = fixed_size;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp79_ = g_strdup_printf ("/Size %d\n", _tmp78_);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp80_ = _tmp79_;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							fprintf (_tmp77_, "%s", _tmp80_);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_g_free0 (_tmp80_);
 #line 3304 "simple-scan.c"
+						} else {
+							gboolean _tmp81_ = FALSE;
+							gint _tmp82_ = 0;
+							gint _tmp83_ = 0;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp82_ = line_number;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp83_ = startxref_line;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							if (_tmp82_ == (_tmp83_ + 2)) {
+#line 3315 "simple-scan.c"
+								GString* _tmp84_ = NULL;
+								const gchar* _tmp85_ = NULL;
+								gboolean _tmp86_ = FALSE;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp84_ = line;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp85_ = _tmp84_->str;
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp86_ = g_str_has_prefix (_tmp85_, "%%%%");
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp81_ = _tmp86_;
+#line 3327 "simple-scan.c"
+							} else {
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp81_ = FALSE;
+#line 3331 "simple-scan.c"
+							}
+#line 518 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							if (_tmp81_) {
+#line 3335 "simple-scan.c"
+								FILE* _tmp87_ = NULL;
+								GString* _tmp88_ = NULL;
+								const gchar* _tmp89_ = NULL;
+								gchar* _tmp90_ = NULL;
+								gchar* _tmp91_ = NULL;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp87_ = fixed_file;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp88_ = line;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp89_ = _tmp88_->str;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp90_ = string_substring (_tmp89_, (glong) 2, (glong) (-1));
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_tmp91_ = _tmp90_;
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								fprintf (_tmp87_, "%s", _tmp91_);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+								_g_free0 (_tmp91_);
+#line 3355 "simple-scan.c"
+							} else {
+								{
+									gint i = 0;
+									gint _tmp92_ = 0;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+									_tmp92_ = offset;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+									i = _tmp92_;
+#line 3364 "simple-scan.c"
+									{
+										gboolean _tmp93_ = FALSE;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+										_tmp93_ = TRUE;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+										while (TRUE) {
+#line 3371 "simple-scan.c"
+											gint _tmp95_ = 0;
+											gint _tmp96_ = 0;
+											FILE* _tmp97_ = NULL;
+											gint _tmp98_ = 0;
+											guint8 _tmp99_ = 0U;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											if (!_tmp93_) {
+#line 3379 "simple-scan.c"
+												gint _tmp94_ = 0;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+												_tmp94_ = i;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+												i = _tmp94_ + 1;
+#line 3385 "simple-scan.c"
+											}
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											_tmp93_ = FALSE;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											_tmp95_ = i;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											_tmp96_ = end_offset;
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											if (!(_tmp95_ < _tmp96_)) {
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+												break;
+#line 3397 "simple-scan.c"
+											}
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											_tmp97_ = fixed_file;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											_tmp98_ = i;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											_tmp99_ = data[_tmp98_];
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+											fputc ((gchar) _tmp99_, _tmp97_);
+#line 3407 "simple-scan.c"
+										}
 									}
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp73_ = FALSE;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp76_ = i;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp77_ = end_offset;
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									if (!(_tmp76_ < _tmp77_)) {
-#line 508 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-										break;
-#line 3316 "simple-scan.c"
-									}
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp78_ = fixed_file;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp79_ = data;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp79__length1 = data_length1;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp80_ = i;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									_tmp81_ = _tmp79_[_tmp80_];
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-									fputc ((gchar) _tmp81_, _tmp78_);
-#line 3330 "simple-scan.c"
 								}
 							}
 						}
@@ -3335,69 +3414,65 @@ static void simple_scan_fix_pdf (const gchar* filename, GError** error) {
 				}
 			}
 		}
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp82_ = line_number;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		line_number = _tmp82_ + 1;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp83_ = end_offset;
-#line 512 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		offset = _tmp83_;
-#line 3346 "simple-scan.c"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp100_ = line_number;
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		line_number = _tmp100_ + 1;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp101_ = end_offset;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		offset = _tmp101_;
+#line 3425 "simple-scan.c"
 	}
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp84_ = filename;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp85_ = filename;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp86_ = g_strconcat (_tmp85_, "~", NULL);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp87_ = _tmp86_;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp88_ = g_rename (_tmp84_, _tmp87_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp89_ = _tmp88_ >= 0;
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (_tmp87_);
-#line 515 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp89_) {
-#line 3364 "simple-scan.c"
-		const gchar* _tmp90_ = NULL;
-		gchar* _tmp91_ = NULL;
-		gchar* _tmp92_ = NULL;
-		const gchar* _tmp93_ = NULL;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp90_ = filename;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp91_ = g_strconcat (_tmp90_, ".fixed", NULL);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp92_ = _tmp91_;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp93_ = filename;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		g_rename (_tmp92_, _tmp93_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp92_);
-#line 3381 "simple-scan.c"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp102_ = filename;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp103_ = filename;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp104_ = g_strconcat (_tmp103_, "~", NULL);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp105_ = _tmp104_;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp106_ = g_rename (_tmp102_, _tmp105_);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp107_ = _tmp106_ >= 0;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_free0 (_tmp105_);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	if (_tmp107_) {
+#line 3443 "simple-scan.c"
+		const gchar* _tmp108_ = NULL;
+		gchar* _tmp109_ = NULL;
+		gchar* _tmp110_ = NULL;
+		const gchar* _tmp111_ = NULL;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp108_ = filename;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp109_ = g_strconcat (_tmp108_, ".fixed", NULL);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp110_ = _tmp109_;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp111_ = filename;
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		g_rename (_tmp110_, _tmp111_);
+#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_g_free0 (_tmp110_);
+#line 3460 "simple-scan.c"
 	}
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_string_free0 (line);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_match_info_unref0 (xref_match);
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_regex_unref0 (xref_regex);
-#line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_fclose0 (fixed_file);
 #line 458 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	data = (g_free (data), NULL);
-#line 3393 "simple-scan.c"
+#line 3468 "simple-scan.c"
 }
 
 
 static void _simple_scan_log_cb_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	simple_scan_log_cb (log_domain, log_levels, message);
-#line 3400 "simple-scan.c"
+#line 3475 "simple-scan.c"
 }
 
 
@@ -3412,60 +3487,60 @@ gint simple_scan_main (gchar** args, int args_length1) {
 	gboolean _tmp14_ = FALSE;
 	const gchar* _tmp16_ = NULL;
 	ScanDevice* device = NULL;
-	gchar** _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	GTimer* _tmp39_ = NULL;
+	gchar** _tmp28_ = NULL;
+	gint _tmp28__length1 = 0;
+	GTimer* _tmp38_ = NULL;
 	gchar* path = NULL;
-	const gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
+	const gchar* _tmp39_ = NULL;
+	gchar* _tmp40_ = NULL;
+	const gchar* _tmp41_ = NULL;
 	const gchar* _tmp42_ = NULL;
-	const gchar* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	FILE* _tmp46_ = NULL;
-	pid_t _tmp47_ = 0;
+	gchar* _tmp43_ = NULL;
+	const gchar* _tmp44_ = NULL;
+	FILE* _tmp45_ = NULL;
+	pid_t _tmp46_ = 0;
 	SimpleScan* app = NULL;
-	ScanDevice* _tmp48_ = NULL;
+	ScanDevice* _tmp47_ = NULL;
+	SimpleScan* _tmp48_ = NULL;
 	SimpleScan* _tmp49_ = NULL;
-	SimpleScan* _tmp50_ = NULL;
-	gint _tmp51_ = 0;
+	gint _tmp50_ = 0;
 	GError * _inner_error_ = NULL;
-#line 521 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 535 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	setlocale (LC_ALL, "");
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	textdomain (GETTEXT_PACKAGE);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 540 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	gtk_init (&args_length1, &args);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp0_ = _ ("[DEVICE...] - Scanning utility");
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp1_ = g_option_context_new (_tmp0_);
-#line 528 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	c = _tmp1_;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp2_ = c;
-#line 530 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_main_entries (_tmp2_, SIMPLE_SCAN_options, GETTEXT_PACKAGE);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp3_ = c;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp4_ = gtk_get_option_group (TRUE);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 545 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	g_option_context_add_group (_tmp3_, _tmp4_);
-#line 3459 "simple-scan.c"
+#line 3534 "simple-scan.c"
 	{
 		GOptionContext* _tmp5_ = NULL;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp5_ = c;
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_option_context_parse (_tmp5_, &args_length1, &args, &_inner_error_);
-#line 534 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 3468 "simple-scan.c"
+#line 3543 "simple-scan.c"
 			goto __catch12_g_error;
 		}
 	}
@@ -3482,150 +3557,147 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		gint _tmp11__length1 = 0;
 		const gchar* _tmp12_ = NULL;
 		FILE* _tmp13_ = NULL;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		e = _inner_error_;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_inner_error_ = NULL;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp6_ = stderr;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp7_ = e;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp8_ = _tmp7_->message;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp6_, "%s\n", _tmp8_);
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp9_ = stderr;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp10_ = _ ("Run '%s --help' to see a full list of available command line options.");
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11_ = args;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp11__length1 = args_length1;
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp12_ = _tmp11_[0];
-#line 539 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 553 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp9_, _tmp10_, _tmp12_);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp13_ = stderr;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp13_, "\n");
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_FAILURE;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_error_free0 (e);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3521 "simple-scan.c"
+#line 3596 "simple-scan.c"
 	}
 	__finally12:
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_inner_error_ != NULL) {
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		g_clear_error (&_inner_error_);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 546 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return 0;
-#line 3534 "simple-scan.c"
+#line 3609 "simple-scan.c"
 	}
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp14_ = simple_scan_show_version;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 558 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp14_) {
-#line 3540 "simple-scan.c"
+#line 3615 "simple-scan.c"
 		FILE* _tmp15_ = NULL;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_tmp15_ = stderr;
-#line 547 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		fprintf (_tmp15_, "simple-scan %s\n", VERSION);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3552 "simple-scan.c"
+#line 3627 "simple-scan.c"
 	}
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_tmp16_ = simple_scan_fix_pdf_filename;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	if (_tmp16_ != NULL) {
-#line 3558 "simple-scan.c"
+#line 3633 "simple-scan.c"
 		{
 			const gchar* _tmp17_ = NULL;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_tmp17_ = simple_scan_fix_pdf_filename;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			simple_scan_fix_pdf (_tmp17_, &_inner_error_);
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			if (_inner_error_ != NULL) {
-#line 3567 "simple-scan.c"
+#line 3642 "simple-scan.c"
 				goto __catch13_g_error;
 			}
 			{
 				gint i = 0;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 				i = 1;
-#line 3574 "simple-scan.c"
+#line 3649 "simple-scan.c"
 				{
 					gboolean _tmp18_ = FALSE;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					_tmp18_ = TRUE;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 					while (TRUE) {
-#line 3581 "simple-scan.c"
-						gboolean _tmp19_ = FALSE;
-						gint _tmp21_ = 0;
+#line 3656 "simple-scan.c"
+						gint _tmp20_ = 0;
+						gchar** _tmp21_ = NULL;
+						gint _tmp21__length1 = 0;
 						gchar** _tmp22_ = NULL;
 						gint _tmp22__length1 = 0;
-						gchar** _tmp23_ = NULL;
-						gint _tmp23__length1 = 0;
-						gint _tmp24_ = 0;
-						const gchar* _tmp25_ = NULL;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp19_ = _tmp18_;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (!_tmp19_) {
-#line 3594 "simple-scan.c"
-							gint _tmp20_ = 0;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							_tmp20_ = i;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-							i = _tmp20_ + 1;
-#line 3600 "simple-scan.c"
+						gint _tmp23_ = 0;
+						const gchar* _tmp24_ = NULL;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						if (!_tmp18_) {
+#line 3666 "simple-scan.c"
+							gint _tmp19_ = 0;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							_tmp19_ = i;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+							i = _tmp19_ + 1;
+#line 3672 "simple-scan.c"
 						}
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						_tmp18_ = FALSE;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp21_ = i;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp22_ = args;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp22__length1 = args_length1;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						if (!(_tmp21_ < _tmp22__length1)) {
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp20_ = i;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp21_ = args;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp21__length1 = args_length1;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						if (!(_tmp20_ < _tmp21__length1)) {
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 							break;
-#line 3614 "simple-scan.c"
+#line 3686 "simple-scan.c"
 						}
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp23_ = args;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp23__length1 = args_length1;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp24_ = i;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						_tmp25_ = _tmp23_[_tmp24_];
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-						simple_scan_fix_pdf (_tmp25_, &_inner_error_);
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp22_ = args;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp22__length1 = args_length1;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp23_ = i;
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						_tmp24_ = _tmp22_[_tmp23_];
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+						simple_scan_fix_pdf (_tmp24_, &_inner_error_);
+#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 						if (_inner_error_ != NULL) {
-#line 3628 "simple-scan.c"
+#line 3700 "simple-scan.c"
 							goto __catch13_g_error;
 						}
 					}
@@ -3636,178 +3708,179 @@ gint simple_scan_main (gchar** args, int args_length1) {
 		__catch13_g_error:
 		{
 			GError* e = NULL;
-			FILE* _tmp26_ = NULL;
-			GError* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			FILE* _tmp25_ = NULL;
+			GError* _tmp26_ = NULL;
+			const gchar* _tmp27_ = NULL;
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			e = _inner_error_;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_inner_error_ = NULL;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp26_ = stderr;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp27_ = e;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			_tmp28_ = _tmp27_->message;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-			fprintf (_tmp26_, "Error fixing PDF file: %s", _tmp28_);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp25_ = stderr;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp26_ = e;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			_tmp27_ = _tmp26_->message;
+#line 574 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+			fprintf (_tmp25_, "Error fixing PDF file: %s", _tmp27_);
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			result = EXIT_FAILURE;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_error_free0 (e);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return result;
-#line 3662 "simple-scan.c"
+#line 3734 "simple-scan.c"
 		}
 		__finally13:
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		if (_inner_error_ != NULL) {
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			_g_option_context_free0 (c);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			g_clear_error (&_inner_error_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 			return 0;
-#line 3675 "simple-scan.c"
+#line 3747 "simple-scan.c"
 		}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		result = EXIT_SUCCESS;
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_g_option_context_free0 (c);
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		return result;
-#line 3683 "simple-scan.c"
+#line 3755 "simple-scan.c"
 	}
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	device = NULL;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp29_ = args;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp29__length1 = args_length1;
-#line 567 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	if (_tmp29__length1 > 1) {
-#line 3693 "simple-scan.c"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp28_ = args;
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp28__length1 = args_length1;
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	if (_tmp28__length1 > 1) {
+#line 3765 "simple-scan.c"
+		ScanDevice* _tmp29_ = NULL;
 		ScanDevice* _tmp30_ = NULL;
-		ScanDevice* _tmp31_ = NULL;
-		gchar** _tmp32_ = NULL;
-		gint _tmp32__length1 = 0;
-		const gchar* _tmp33_ = NULL;
-		gchar* _tmp34_ = NULL;
-		ScanDevice* _tmp35_ = NULL;
-		gchar** _tmp36_ = NULL;
-		gint _tmp36__length1 = 0;
-		const gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp30_ = scan_device_new ();
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		gchar** _tmp31_ = NULL;
+		gint _tmp31__length1 = 0;
+		const gchar* _tmp32_ = NULL;
+		gchar* _tmp33_ = NULL;
+		ScanDevice* _tmp34_ = NULL;
+		gchar** _tmp35_ = NULL;
+		gint _tmp35__length1 = 0;
+		const gchar* _tmp36_ = NULL;
+		gchar* _tmp37_ = NULL;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp29_ = scan_device_new ();
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 		_scan_device_unref0 (device);
-#line 569 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		device = _tmp30_;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp31_ = device;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp32_ = args;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp32__length1 = args_length1;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp33_ = _tmp32_[1];
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp34_ = g_strdup (_tmp33_);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp31_->name);
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp31_->name = _tmp34_;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp35_ = device;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp36_ = args;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp36__length1 = args_length1;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp37_ = _tmp36_[1];
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp38_ = g_strdup (_tmp37_);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_g_free0 (_tmp35_->label);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-		_tmp35_->label = _tmp38_;
-#line 3739 "simple-scan.c"
-	}
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp39_ = g_timer_new ();
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_timer_destroy0 (simple_scan_log_timer);
-#line 575 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_log_timer = _tmp39_;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp40_ = g_get_user_cache_dir ();
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp41_ = g_build_filename (_tmp40_, "simple-scan", NULL, NULL);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	path = _tmp41_;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp42_ = path;
-#line 577 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_mkdir_with_parents (_tmp42_, 0700);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp43_ = g_get_user_cache_dir ();
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp44_ = g_build_filename (_tmp43_, "simple-scan", "simple-scan.log", NULL, NULL);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (path);
-#line 578 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	path = _tmp44_;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp45_ = path;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp46_ = g_fopen (_tmp45_, "w");
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_fclose0 (simple_scan_log_file);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	simple_scan_log_file = _tmp46_;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp47_ = getpid ();
-#line 582 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	g_debug ("simple-scan.vala:582: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp47_);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		device = _tmp29_;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp30_ = device;
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp31_ = args;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp48_ = device;
+		_tmp31__length1 = args_length1;
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp49_ = simple_scan_new (_tmp48_);
+		_tmp32_ = _tmp31_[1];
 #line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	app = _tmp49_;
+		_tmp33_ = g_strdup (_tmp32_);
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_g_free0 (_tmp30_->name);
+#line 584 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp30_->name = _tmp33_;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp50_ = app;
+		_tmp34_ = device;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_tmp51_ = g_application_run ((GApplication*) _tmp50_, 0, NULL);
+		_tmp35_ = args;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	result = _tmp51_;
+		_tmp35__length1 = args_length1;
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_object_unref0 (app);
+		_tmp36_ = _tmp35_[1];
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_g_free0 (path);
+		_tmp37_ = g_strdup (_tmp36_);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_scan_device_unref0 (device);
+		_g_free0 (_tmp34_->label);
 #line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+		_tmp34_->label = _tmp37_;
+#line 3811 "simple-scan.c"
+	}
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp38_ = g_timer_new ();
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_timer_destroy0 (simple_scan_log_timer);
+#line 589 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_log_timer = _tmp38_;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp39_ = g_get_user_cache_dir ();
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp40_ = g_build_filename (_tmp39_, "simple-scan", NULL, NULL);
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	path = _tmp40_;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp41_ = path;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_mkdir_with_parents (_tmp41_, 0700);
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp42_ = g_get_user_cache_dir ();
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp43_ = g_build_filename (_tmp42_, "simple-scan", "simple-scan.log", NULL, NULL);
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_free0 (path);
+#line 592 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	path = _tmp43_;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp44_ = path;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp45_ = g_fopen (_tmp44_, "w");
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_fclose0 (simple_scan_log_file);
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	simple_scan_log_file = _tmp45_;
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_log_set_default_handler (_simple_scan_log_cb_glog_func, NULL);
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp46_ = getpid ();
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	g_debug ("simple-scan.vala:596: Starting Simple Scan %s, PID=%i", VERSION, (gint) _tmp46_);
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp47_ = device;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp48_ = simple_scan_new (_tmp47_);
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	app = _tmp48_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp49_ = app;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_tmp50_ = g_application_run ((GApplication*) _tmp49_, 0, NULL);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	result = _tmp50_;
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_object_unref0 (app);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_g_free0 (path);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+	_scan_device_unref0 (device);
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_option_context_free0 (c);
-#line 585 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#line 599 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return result;
-#line 3801 "simple-scan.c"
+#line 3873 "simple-scan.c"
 }
 
 
 int main (int argc, char ** argv) {
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
+#endif
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	return simple_scan_main (argv, argc);
-#line 3810 "simple-scan.c"
+#line 3883 "simple-scan.c"
 }
 
 
@@ -3824,7 +3897,7 @@ static void simple_scan_class_init (SimpleScanClass * klass) {
 	G_APPLICATION_CLASS (klass)->shutdown = simple_scan_real_shutdown;
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (klass)->finalize = simple_scan_finalize;
-#line 3827 "simple-scan.c"
+#line 3900 "simple-scan.c"
 }
 
 
@@ -3835,7 +3908,7 @@ static void simple_scan_instance_init (SimpleScan * self) {
 	self->priv->default_device = NULL;
 #line 33 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	self->priv->have_devices = FALSE;
-#line 3838 "simple-scan.c"
+#line 3911 "simple-scan.c"
 }
 
 
@@ -3848,14 +3921,14 @@ static void simple_scan_finalize (GObject* obj) {
 #line 34 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_g_object_unref0 (self->priv->udev_client);
 #line 35 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
-	_user_interface_unref0 (self->priv->ui);
+	_g_object_unref0 (self->priv->ui);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_scanner_unref0 (self->priv->scanner);
 #line 37 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	_book_unref0 (self->priv->book);
 #line 12 "/home/bob/bzr/simple-scan/trunk/src/simple-scan.vala"
 	G_OBJECT_CLASS (simple_scan_parent_class)->finalize (obj);
-#line 3858 "simple-scan.c"
+#line 3931 "simple-scan.c"
 }
 
 
diff --git a/src/simple-scan.vala b/src/simple-scan.vala
index 5ae73ab..813f29b 100644
--- a/src/simple-scan.vala
+++ b/src/simple-scan.vala
@@ -466,8 +466,8 @@ public class SimpleScan : Gtk.Application
         var line_number = 0;
         var xref_offset = 0;
         var xref_line = -1;
-        var xref_regex = new Regex ("^\\d\\d\\d\\d\\d\\d\\d\\d\\d\\d 0000 n$", RegexCompileFlags.RAW);
-        MatchInfo xref_match;
+        var startxref_line = -1;
+        var fixed_size = -1;
         var line = new StringBuilder ();
         while (offset < data.length)
         {
@@ -483,6 +483,9 @@ public class SimpleScan : Gtk.Application
             }
 
             if (line.str == "startxref\n")
+                startxref_line = line_number;
+
+            if (line.str == "xref\n")
                 xref_line = line_number;
 
             /* Fix PDF header and binary comment */
@@ -492,16 +495,27 @@ public class SimpleScan : Gtk.Application
                 fixed_file.printf ("%s", line.str.substring (1));
             }
 
+            /* Fix xref subsection count */
+            else if (line_number == xref_line + 1 && line.str.has_prefix ("1 "))
+            {
+                fixed_size = int.parse (line.str.substring (2)) + 1;
+                fixed_file.printf ("0 %d\n", fixed_size);
+                fixed_file.printf ("0000000000 65535 f \n");
+            }
+
             /* Fix xref format */
-            else if (xref_regex.match (line.str, 0, out xref_match))
-                fixed_file.printf ("%010d 00000 n \n", int.parse (xref_match.get_string ()) + xref_offset);
+            else if (line_number > xref_line && line.str.has_suffix (" 0000 n\n"))
+                fixed_file.printf ("%010d 00000 n \n", int.parse (line.str) + xref_offset);
 
             /* Fix xref offset */
-            else if (xref_line > 0 && line_number == xref_line + 1)
+            else if (startxref_line > 0 && line_number == startxref_line + 1)
                 fixed_file.printf ("%d\n".printf (int.parse (line.str) + xref_offset));
 
+            else if (fixed_size > 0 && line.str.has_prefix ("/Size "))
+                fixed_file.printf ("/Size %d\n".printf (fixed_size));
+
             /* Fix EOF marker */
-            else if (line_number == xref_line + 2 && line.str.has_prefix ("%%%%"))
+            else if (line_number == startxref_line + 2 && line.str.has_prefix ("%%%%"))
                 fixed_file.printf ("%s", line.str.substring (2));
 
             else
diff --git a/src/ui.c b/src/ui.c
index 6f6df74..340b940 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1,9 +1,10 @@
-/* ui.c generated by valac 0.22.1, the Vala compiler
+/* ui.c generated by valac 0.24.0, the Vala compiler
  * generated from ui.vala, do not modify */
 
 /*
  * Copyright (C) 2009-2011 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
+ * Author: Robert Ancell <robert.ancell@canonical.com>,
+ *         Eduard Gotwig <g@ox.io>
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -14,19 +15,18 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <gio/gio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <cairo.h>
+#include <gdk/gdk.h>
 #include <float.h>
 #include <math.h>
+#include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdk.h>
 #include <glib/gstdio.h>
 #include <unistd.h>
-#include <gobject/gvaluecollector.h>
 
 
 #define TYPE_USER_INTERFACE (user_interface_get_type ())
@@ -125,20 +125,29 @@ typedef struct _ScanOptionsClass ScanOptionsClass;
 #define TYPE_SCAN_MODE (scan_mode_get_type ())
 typedef struct _ScanOptionsPrivate ScanOptionsPrivate;
 #define _scan_options_unref0(var) ((var == NULL) ? NULL : (var = (scan_options_unref (var), NULL)))
+typedef struct _Block1Data Block1Data;
+
+#define TYPE_PAGE_ICON (page_icon_get_type ())
+#define PAGE_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PAGE_ICON, PageIcon))
+#define PAGE_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PAGE_ICON, PageIconClass))
+#define IS_PAGE_ICON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PAGE_ICON))
+#define IS_PAGE_ICON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PAGE_ICON))
+#define PAGE_ICON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PAGE_ICON, PageIconClass))
+
+typedef struct _PageIcon PageIcon;
+typedef struct _PageIconClass PageIconClass;
 #define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
 #define _g_key_file_unref0(var) ((var == NULL) ? NULL : (var = (g_key_file_unref (var), NULL)))
-typedef struct _ParamSpecUserInterface ParamSpecUserInterface;
 typedef struct _ProgressBarDialogPrivate ProgressBarDialogPrivate;
+typedef struct _PageIconPrivate PageIconPrivate;
 
 struct _UserInterface {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
+	GtkApplicationWindow parent_instance;
 	UserInterfacePrivate * priv;
 };
 
 struct _UserInterfaceClass {
-	GTypeClass parent_class;
-	void (*finalize) (UserInterface *self);
+	GtkApplicationWindowClass parent_class;
 };
 
 typedef enum  {
@@ -150,16 +159,23 @@ typedef enum  {
 
 struct _UserInterfacePrivate {
 	GSettings* settings;
-	GtkBuilder* builder;
-	GtkApplicationWindow* window;
-	GMenuModel* app_menu;
 	GtkMenuBar* menubar;
+	GtkToolbar* toolbar;
+	GtkMenu* page_menu;
 	GtkBox* main_vbox;
 	GtkInfoBar* info_bar;
 	GtkImage* info_bar_image;
 	GtkLabel* info_bar_label;
 	GtkButton* info_bar_close_button;
 	GtkButton* info_bar_change_scanner_button;
+	GtkRadioMenuItem* custom_crop_menuitem;
+	GtkRadioMenuItem* a4_menuitem;
+	GtkRadioMenuItem* a5_menuitem;
+	GtkRadioMenuItem* a6_menuitem;
+	GtkRadioMenuItem* letter_menuitem;
+	GtkRadioMenuItem* legal_menuitem;
+	GtkRadioMenuItem* four_by_six_menuitem;
+	GtkRadioMenuItem* no_crop_menuitem;
 	GtkMenuItem* page_move_left_menuitem;
 	GtkMenuItem* page_move_right_menuitem;
 	GtkMenuItem* page_delete_menuitem;
@@ -167,13 +183,20 @@ struct _UserInterfacePrivate {
 	GtkMenuItem* save_menuitem;
 	GtkMenuItem* save_as_menuitem;
 	GtkMenuItem* copy_to_clipboard_menuitem;
+	GtkButton* save_button;
 	GtkToolButton* save_toolbutton;
-	GtkMenuItem* stop_menuitem;
+	GtkMenuItem* stop_scan_menuitem;
 	GtkToolButton* stop_toolbutton;
-	GtkRadioMenuItem* text_toolbar_menuitem;
-	GtkRadioMenuItem* text_menu_menuitem;
-	GtkRadioMenuItem* photo_toolbar_menuitem;
-	GtkRadioMenuItem* photo_menu_menuitem;
+	GtkToggleButton* crop_button;
+	GtkToggleToolButton* crop_toolbutton;
+	GtkButton* stop_button;
+	GtkButton* scan_button;
+	GtkRadioMenuItem* text_button_menuitem;
+	GtkRadioMenuItem* text_button_hb_menuitem;
+	GtkRadioMenuItem* text_menuitem;
+	GtkRadioMenuItem* photo_button_menuitem;
+	GtkRadioMenuItem* photo_button_hb_menuitem;
+	GtkRadioMenuItem* photo_menuitem;
 	GtkDialog* authorize_dialog;
 	GtkLabel* authorize_label;
 	GtkEntry* username_entry;
@@ -267,8 +290,10 @@ struct _ScanOptionsClass {
 	void (*finalize) (ScanOptions *self);
 };
 
-struct _ParamSpecUserInterface {
-	GParamSpec parent_instance;
+struct _Block1Data {
+	int _ref_count_;
+	UserInterface* self;
+	GtkWindow* dialog;
 };
 
 struct _ProgressBarDialog {
@@ -284,16 +309,27 @@ struct _ProgressBarDialogPrivate {
 	GtkProgressBar* bar;
 };
 
+struct _PageIcon {
+	GtkDrawingArea parent_instance;
+	PageIconPrivate * priv;
+};
+
+struct _PageIconClass {
+	GtkDrawingAreaClass parent_class;
+};
+
+struct _PageIconPrivate {
+	gchar* text;
+	gdouble r;
+	gdouble g;
+	gdouble b;
+};
+
 
 static gpointer user_interface_parent_class = NULL;
 static gpointer progress_bar_dialog_parent_class = NULL;
+static gpointer page_icon_parent_class = NULL;
 
-gpointer user_interface_ref (gpointer instance);
-void user_interface_unref (gpointer instance);
-GParamSpec* param_spec_user_interface (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_user_interface (GValue* value, gpointer v_object);
-void value_take_user_interface (GValue* value, gpointer v_object);
-gpointer value_get_user_interface (const GValue* value);
 GType user_interface_get_type (void) G_GNUC_CONST;
 GType progress_bar_dialog_get_type (void) G_GNUC_CONST;
 gpointer book_ref (gpointer instance);
@@ -314,7 +350,15 @@ GType book_view_get_type (void) G_GNUC_CONST;
 GType scan_direction_get_type (void) G_GNUC_CONST;
 #define USER_INTERFACE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_USER_INTERFACE, UserInterfacePrivate))
 enum  {
-	USER_INTERFACE_DUMMY_PROPERTY
+	USER_INTERFACE_DUMMY_PROPERTY,
+	USER_INTERFACE_BOOK,
+	USER_INTERFACE_SELECTED_PAGE,
+	USER_INTERFACE_DEFAULT_FILE_NAME,
+	USER_INTERFACE_SCANNING,
+	USER_INTERFACE_BRIGHTNESS,
+	USER_INTERFACE_CONTRAST,
+	USER_INTERFACE_QUALITY,
+	USER_INTERFACE_SELECTED_DEVICE
 };
 Book* user_interface_get_book (UserInterface* self);
 gpointer page_ref (gpointer instance);
@@ -324,14 +368,18 @@ void value_set_page (GValue* value, gpointer v_object);
 void value_take_page (GValue* value, gpointer v_object);
 gpointer value_get_page (const GValue* value);
 GType page_get_type (void) G_GNUC_CONST;
-static void user_interface_page_removed_cb (UserInterface* self, Book* book, Page* page);
-static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self);
 static void user_interface_page_added_cb (UserInterface* self, Book* book, Page* page);
 static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self);
+static void user_interface_reordered_cb (UserInterface* self, Book* book);
+static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self);
+static void user_interface_page_removed_cb (UserInterface* self, Book* book, Page* page);
+static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self);
 #define USER_INTERFACE_DEFAULT_TEXT_DPI 150
 #define USER_INTERFACE_DEFAULT_PHOTO_DPI 300
 void user_interface_new_document_activate_cb (UserInterface* self);
 static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+void user_interface_reorder_document_activate_cb (UserInterface* self);
+static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void user_interface_save_document_activate_cb (UserInterface* self);
 static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
 void user_interface_save_as_document_activate_cb (UserInterface* self);
@@ -368,8 +416,9 @@ static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _se
 static gboolean user_interface_find_scan_device (UserInterface* self, const gchar* device, GtkTreeIter* iter);
 static void user_interface_show_error_dialog (UserInterface* self, const gchar* error_title, const gchar* error_text);
 void user_interface_authorize (UserInterface* self, const gchar* resource, gchar** username, gchar** password);
-void G_MODULE_EXPORT device_combo_changed_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidget* widget);
 gchar* user_interface_get_selected_device (UserInterface* self);
+static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 static void user_interface_update_info_bar (UserInterface* self);
 gpointer scan_device_ref (gpointer instance);
 void scan_device_unref (gpointer instance);
@@ -399,10 +448,13 @@ static void user_interface_clear_document (UserInterface* self);
 void book_clear (Book* self);
 static void user_interface_new_document (UserInterface* self);
 gboolean user_interface_get_scanning (UserInterface* self);
-void G_MODULE_EXPORT new_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void user_interface_set_document_hint (UserInterface* self, const gchar* document_hint, gboolean save);
-void G_MODULE_EXPORT text_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT photo_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
+static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
 GType scan_type_get_type (void) G_GNUC_CONST;
 static void user_interface_set_page_side (UserInterface* self, ScanType page_side);
 static void user_interface_set_paper_size (UserInterface* self, gint width, gint height);
@@ -423,12 +475,18 @@ ScanOptions* scan_options_construct (GType object_type);
 GType scan_mode_get_type (void) G_GNUC_CONST;
 gint user_interface_get_brightness (UserInterface* self);
 gint user_interface_get_contrast (UserInterface* self);
-void G_MODULE_EXPORT scan_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-void G_MODULE_EXPORT stop_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-void G_MODULE_EXPORT continuous_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-void G_MODULE_EXPORT preferences_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-gboolean G_MODULE_EXPORT preferences_dialog_delete_event_cb (GtkWidget* widget, UserInterface* self);
-void G_MODULE_EXPORT preferences_dialog_response_cb (GtkWidget* widget, gint response_id, UserInterface* self);
+static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event);
+static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
+static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id);
+static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self);
 static void user_interface_update_page_menu (UserInterface* self);
 Page* book_view_get_selected_page (BookView* self);
 guint book_get_page_index (Book* self, Page* page);
@@ -439,10 +497,12 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 gchar* get_temporary_filename (const gchar* prefix, const gchar* extension);
 void page_save (Page* self, const gchar* type, gint quality, GFile* file, GError** error);
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view);
-void G_MODULE_EXPORT rotate_left_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, GtkWidget* widget);
 void page_rotate_left (Page* self);
-void G_MODULE_EXPORT rotate_right_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void user_interface_rotate_right_button_clicked_cb (UserInterface* self, GtkWidget* widget);
 void page_rotate_right (Page* self);
+static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void user_interface_set_crop (UserInterface* self, const gchar* crop_name);
 void page_set_no_crop (Page* self);
 gint page_get_width (Page* self);
@@ -450,72 +510,121 @@ gint page_get_height (Page* self);
 void page_set_custom_crop (Page* self, gint width, gint height);
 void page_move_crop (Page* self, gint x, gint y);
 void page_set_named_crop (Page* self, const gchar* name);
-void G_MODULE_EXPORT no_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT custom_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT crop_toolbutton_toggled_cb (GtkToggleToolButton* widget, UserInterface* self);
-void G_MODULE_EXPORT four_by_six_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT legal_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT letter_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT a6_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT a5_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT a4_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self);
-void G_MODULE_EXPORT crop_rotate_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggleButton* widget);
+static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self);
+static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkToggleToolButton* widget);
+static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
+static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget);
+static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self);
+static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
 void page_rotate_crop (Page* self);
-void G_MODULE_EXPORT page_move_left_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
+static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
 void book_move_page (Book* self, Page* page, guint location);
-void G_MODULE_EXPORT page_move_right_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
-void G_MODULE_EXPORT page_delete_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
+static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_page_move_right_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
 Book* book_view_get_book (BookView* self);
 void book_delete_page (Book* self, Page* page);
-void G_MODULE_EXPORT save_file_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-void G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_reorder_document (UserInterface* self);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
+static gboolean __lambda4_ (Block1Data* _data1_, GdkEventKey* e);
+static gboolean ___lambda4__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
+static GtkButton* user_interface_make_reorder_button (UserInterface* self, const gchar* text, const gchar* items);
+static void __lambda5_ (Block1Data* _data1_);
+void book_combine_sides (Book* self);
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda6_ (Block1Data* _data1_);
+void book_combine_sides_reverse (Book* self);
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda7_ (Block1Data* _data1_);
+void book_reverse (Book* self);
+static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda8_ (Block1Data* _data1_);
+static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar* items);
+GType page_icon_get_type (void) G_GNUC_CONST;
+PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b);
+PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r, gdouble g, gdouble b);
+static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* self, GtkWidget* widget);
 void page_copy_to_clipboard (Page* self, GtkWindow* window);
-void G_MODULE_EXPORT save_as_file_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* operation, GtkPrintContext* print_context, gint page_number);
 gboolean page_get_is_landscape (Page* self);
 gint page_get_dpi (Page* self);
 GdkPixbuf* page_get_image (Page* self, gboolean apply_crop);
-void G_MODULE_EXPORT email_button_clicked_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static void user_interface_print_document (UserInterface* self);
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self);
-void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface* self);
-static void user_interface_show_help (UserInterface* self);
-void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static void user_interface_launch_help (UserInterface* self);
+static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static void user_interface_show_about (UserInterface* self);
-void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
+static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
 static gboolean user_interface_on_quit (UserInterface* self);
 static void user_interface_save_state (UserInterface* self, gboolean force);
 void autosave_manager_cleanup (AutosaveManager* self);
-void G_MODULE_EXPORT quit_menuitem_activate_cb (GtkWidget* widget, UserInterface* self);
-gboolean G_MODULE_EXPORT simple_scan_window_configure_event_cb (GtkWidget* widget, GdkEventConfigure* event, UserInterface* self);
+static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget);
+static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
+static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterface* self, GtkWidget* widget, GdkEventConfigure* event);
+static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self);
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id);
-gboolean G_MODULE_EXPORT simple_scan_window_window_state_event_cb (GtkWidget* widget, GdkEventWindowState* event, UserInterface* self);
-gboolean G_MODULE_EXPORT window_delete_event_cb (GtkWidget* widget, GdkEvent* event, UserInterface* self);
+static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInterface* self, GtkWidget* widget, GdkEventWindowState* event);
+static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self);
+static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event);
+static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self);
 static void user_interface_page_size_changed_cb (UserInterface* self, Page* page);
 static void user_interface_page_scan_direction_changed_cb (UserInterface* self, Page* page);
 ScanDirection page_get_scan_direction (Page* self);
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self);
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self);
 static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* combo, gint default_dpi, gint current_dpi);
-static gboolean user_interface_has_app_menu (UserInterface* self, GtkApplication* app);
+static gboolean user_interface_get_shell_shows_menubar (UserInterface* self);
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self);
-static void __lambda4_ (UserInterface* self);
-static void ___lambda4__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda5_ (UserInterface* self);
-static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda6_ (UserInterface* self);
-static void ___lambda6__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
-static void __lambda7_ (UserInterface* self);
-static void ___lambda7__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda10_ (UserInterface* self);
+static void ___lambda10__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda11_ (UserInterface* self);
+static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda12_ (UserInterface* self);
+static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void __lambda13_ (UserInterface* self);
+static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
 void user_interface_set_brightness (UserInterface* self, gint value);
-static void __lambda8_ (UserInterface* self);
-static void ___lambda8__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+static void __lambda14_ (UserInterface* self);
+static void ___lambda14__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
 void user_interface_set_contrast (UserInterface* self, gint value);
-static void __lambda9_ (UserInterface* self);
-static void ___lambda9__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+static void __lambda15_ (UserInterface* self);
+static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
 void user_interface_set_quality (UserInterface* self, gint value);
-static void __lambda10_ (UserInterface* self);
-static void ___lambda10__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
+static void __lambda16_ (UserInterface* self);
+static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self);
 BookView* book_view_new (Book* book);
 BookView* book_view_construct (GType object_type, Book* book);
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self);
@@ -530,12 +639,12 @@ static gchar* user_interface_get_state_filename (UserInterface* self);
 static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_);
 static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_);
 static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_);
-static gboolean ___lambda3_ (UserInterface* self);
-static gboolean ____lambda3__gsource_func (gpointer self);
-static gboolean ___lambda11_ (UserInterface* self);
-static gboolean ____lambda11__gsource_func (gpointer self);
-void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble percent);
-void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* message);
+static gboolean ___lambda9_ (UserInterface* self);
+static gboolean ____lambda9__gsource_func (gpointer self);
+static gboolean ___lambda17_ (UserInterface* self);
+static gboolean ____lambda17__gsource_func (gpointer self);
+void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value);
+void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value);
 void user_interface_start (UserInterface* self);
 Page* user_interface_get_selected_page (UserInterface* self);
 void user_interface_set_selected_page (UserInterface* self, Page* value);
@@ -544,208 +653,246 @@ void user_interface_set_scanning (UserInterface* self, gboolean value);
 void user_interface_set_selected_device (UserInterface* self, const gchar* value);
 static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
 static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void user_interface_finalize (UserInterface* obj);
+static void user_interface_finalize (GObject* obj);
+static void _vala_user_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_user_interface_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
 #define PROGRESS_BAR_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialogPrivate))
 enum  {
-	PROGRESS_BAR_DIALOG_DUMMY_PROPERTY
+	PROGRESS_BAR_DIALOG_DUMMY_PROPERTY,
+	PROGRESS_BAR_DIALOG_FRACTION,
+	PROGRESS_BAR_DIALOG_MESSAGE
 };
+gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self);
+const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self);
 static void progress_bar_dialog_finalize (GObject* obj);
+static void _vala_progress_bar_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_progress_bar_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+#define PAGE_ICON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PAGE_ICON, PageIconPrivate))
+enum  {
+	PAGE_ICON_DUMMY_PROPERTY
+};
+#define PAGE_ICON_MINIMUM_WIDTH 20
+static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width);
+static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_height, gint* natural_height);
+static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height);
+static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint height, gint* minimum_width, gint* natural_width);
+static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c);
+static void page_icon_finalize (GObject* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
-static const GActionEntry USER_INTERFACE_action_entries[9] = {{"new_document", _user_interface_new_document_activate_cb_gsimple_action_activate_callback}, {"save", _user_interface_save_document_activate_cb_gsimple_action_activate_callback}, {"save_as", _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback}, {"email", _user_interface_email_document_activate_cb_gsimple_action_activate_callback}, {"print", _user_interface_print_document_activate_cb_gsimple_action_activate_callback}, {"preferences", _user_interface_preferences_activate_cb_gsimple_action_activate_callback}, {"help", _user_interface_help_contents_activate_cb_gsimple_action_activate_callback}, {"about", _user_interface_about_activate_cb_gsimple_action_activate_callback}, {"quit", _user_interface_quit_activate_cb_gsimple_action_activate_callback}};
+static const GActionEntry USER_INTERFACE_action_entries[10] = {{"new_document", _user_interface_new_document_activate_cb_gsimple_action_activate_callback}, {"reorder", _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback}, {"save", _user_interface_save_document_activate_cb_gsimple_action_activate_callback}, {"save_as", _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback}, {"email", _user_interface_email_document_activate_cb_gsimple_action_activate_callback}, {"print", _user_interface_print_document_activate_cb_gsimple_action_activate_callback}, {"preferences", _user_interface_preferences_activate_cb_gsimple_action_activate_callback}, {"help", _user_interface_help_contents_activate_cb_gsimple_action_activate_callback}, {"about", _user_interface_about_activate_cb_gsimple_action_activate_callback}, {"quit", _user_interface_quit_activate_cb_gsimple_action_activate_callback}};
 
-static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_removed_cb (self, _sender, page);
-#line 562 "ui.c"
+static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_added_cb ((UserInterface*) self, _sender, page);
+#line 690 "ui.c"
 }
 
 
-static void _user_interface_page_added_cb_book_page_added (Book* _sender, Page* page, gpointer self) {
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_added_cb (self, _sender, page);
-#line 569 "ui.c"
+static void _user_interface_reordered_cb_book_reordered (Book* _sender, gpointer self) {
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_reordered_cb ((UserInterface*) self, _sender);
+#line 697 "ui.c"
+}
+
+
+static void _user_interface_page_removed_cb_book_page_removed (Book* _sender, Page* page, gpointer self) {
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_removed_cb ((UserInterface*) self, _sender, page);
+#line 704 "ui.c"
 }
 
 
 static void _user_interface_new_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_new_document_activate_cb (self);
-#line 576 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_new_document_activate_cb ((UserInterface*) self);
+#line 711 "ui.c"
+}
+
+
+static void _user_interface_reorder_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_reorder_document_activate_cb ((UserInterface*) self);
+#line 718 "ui.c"
 }
 
 
 static void _user_interface_save_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_document_activate_cb (self);
-#line 583 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_document_activate_cb ((UserInterface*) self);
+#line 725 "ui.c"
 }
 
 
 static void _user_interface_save_as_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_save_as_document_activate_cb (self);
-#line 590 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_as_document_activate_cb ((UserInterface*) self);
+#line 732 "ui.c"
 }
 
 
 static void _user_interface_email_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_email_document_activate_cb (self);
-#line 597 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_email_document_activate_cb ((UserInterface*) self);
+#line 739 "ui.c"
 }
 
 
 static void _user_interface_print_document_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_print_document_activate_cb (self);
-#line 604 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_print_document_activate_cb ((UserInterface*) self);
+#line 746 "ui.c"
 }
 
 
 static void _user_interface_preferences_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_preferences_activate_cb (self);
-#line 611 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_preferences_activate_cb ((UserInterface*) self);
+#line 753 "ui.c"
 }
 
 
 static void _user_interface_help_contents_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_help_contents_activate_cb (self);
-#line 618 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_help_contents_activate_cb ((UserInterface*) self);
+#line 760 "ui.c"
 }
 
 
 static void _user_interface_about_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_about_activate_cb (self);
-#line 625 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_about_activate_cb ((UserInterface*) self);
+#line 767 "ui.c"
 }
 
 
 static void _user_interface_quit_activate_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 17 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_quit_activate_cb (self);
-#line 632 "ui.c"
+#line 19 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_quit_activate_cb ((UserInterface*) self);
+#line 774 "ui.c"
 }
 
 
 static void _user_interface_needs_saving_cb_book_needs_saving_changed (Book* _sender, gpointer self) {
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_needs_saving_cb (self, _sender);
-#line 639 "ui.c"
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_needs_saving_cb ((UserInterface*) self, _sender);
+#line 781 "ui.c"
 }
 
 
 UserInterface* user_interface_construct (GType object_type) {
-	UserInterface* self = NULL;
+	UserInterface * self = NULL;
 	GSettings* _tmp0_ = NULL;
 	Book* _tmp1_ = NULL;
 	Book* _tmp2_ = NULL;
 	Book* _tmp3_ = NULL;
 	Book* _tmp4_ = NULL;
-	AutosaveManager* _tmp5_ = NULL;
+	Book* _tmp5_ = NULL;
 	AutosaveManager* _tmp6_ = NULL;
-	Book* _tmp7_ = NULL;
-	AutosaveManager* _tmp8_ = NULL;
-	Book* _tmp9_ = NULL;
-	guint _tmp10_ = 0U;
+	AutosaveManager* _tmp7_ = NULL;
+	Book* _tmp8_ = NULL;
+	AutosaveManager* _tmp9_ = NULL;
+	Book* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
-	Book* _tmp17_ = NULL;
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self = (UserInterface*) g_type_create_instance (object_type);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	guint _tmp12_ = 0U;
+	Book* _tmp18_ = NULL;
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (UserInterface*) g_object_new (object_type, NULL);
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_settings_new ("org.gnome.SimpleScan");
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->settings = _tmp0_;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_new ();
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_set_book (self, _tmp2_);
-#line 191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 263 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (_tmp2_);
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp3_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp3_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self, 0);
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp4_, "page-added", (GCallback) _user_interface_page_added_cb_book_page_added, self);
-#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp4_, "reordered", (GCallback) _user_interface_reordered_cb_book_reordered, self, 0);
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = self->priv->_book;
+#line 266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp5_, "page-removed", (GCallback) _user_interface_page_removed_cb_book_page_removed, self, 0);
+#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load (self);
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = autosave_manager_new ();
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = autosave_manager_new ();
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->autosave_manager = _tmp5_;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = self->priv->autosave_manager;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = self->priv->_book;
-#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_set_book (_tmp6_, _tmp7_);
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = self->priv->autosave_manager;
-#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_load (_tmp8_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->_book;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = book_get_n_pages (_tmp9_);
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = _tmp10_;
-#line 201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp11_ == ((guint) 0)) {
-#line 708 "ui.c"
-		Book* _tmp12_ = NULL;
-#line 203 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->autosave_manager = _tmp6_;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = self->priv->autosave_manager;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = self->priv->_book;
+#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	autosave_manager_set_book (_tmp7_, _tmp8_);
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = self->priv->autosave_manager;
+#line 272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	autosave_manager_load (_tmp9_);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = self->priv->_book;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = book_get_n_pages (_tmp10_);
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = _tmp11_;
+#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp12_ == ((guint) 0)) {
+#line 855 "ui.c"
+		Book* _tmp13_ = NULL;
+#line 276 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = self->priv->_book;
-#line 204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_set_needs_saving (_tmp12_, FALSE);
-#line 716 "ui.c"
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = self->priv->_book;
+#line 277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_set_needs_saving (_tmp13_, FALSE);
+#line 863 "ui.c"
 	} else {
-		BookView* _tmp13_ = NULL;
-		Book* _tmp14_ = NULL;
-		Page* _tmp15_ = NULL;
+		BookView* _tmp14_ = NULL;
+		Book* _tmp15_ = NULL;
 		Page* _tmp16_ = NULL;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp13_ = self->priv->book_view;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp14_ = self->priv->_book;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp15_ = book_get_page (_tmp14_, 0);
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = _tmp15_;
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_view_set_selected_page (_tmp13_, _tmp16_);
-#line 207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_page_unref0 (_tmp16_);
-#line 734 "ui.c"
-	}
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->_book;
-#line 208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp17_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self);
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		Page* _tmp17_ = NULL;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = self->priv->book_view;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = self->priv->_book;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = book_get_page (_tmp15_, 0);
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp17_ = _tmp16_;
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_view_set_selected_page (_tmp14_, _tmp17_);
+#line 280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_page_unref0 (_tmp17_);
+#line 881 "ui.c"
+	}
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = self->priv->_book;
+#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp18_, "needs-saving-changed", (GCallback) _user_interface_needs_saving_cb_book_needs_saving_changed, self, 0);
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 742 "ui.c"
+#line 889 "ui.c"
 }
 
 
 UserInterface* user_interface_new (void) {
-#line 187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 259 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return user_interface_construct (TYPE_USER_INTERFACE);
-#line 749 "ui.c"
+#line 896 "ui.c"
 }
 
 
@@ -756,144 +903,135 @@ static gboolean user_interface_find_scan_device (UserInterface* self, const gcha
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (device != NULL, FALSE);
-#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_iter = FALSE;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_model;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_iter = _tmp1_;
-#line 221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 774 "ui.c"
+#line 921 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 781 "ui.c"
-				gboolean _tmp4_ = FALSE;
+#line 928 "ui.c"
 				gchar* d = NULL;
-				GtkListStore* _tmp10_ = NULL;
-				GtkTreeIter _tmp11_ = {0};
-				const gchar* _tmp12_ = NULL;
-				const gchar* _tmp13_ = NULL;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp4_ = _tmp3_;
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp4_) {
-#line 792 "ui.c"
+				GtkListStore* _tmp8_ = NULL;
+				GtkTreeIter _tmp9_ = {0};
+				const gchar* _tmp10_ = NULL;
+				const gchar* _tmp11_ = NULL;
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!_tmp3_) {
+#line 936 "ui.c"
+					gboolean _tmp4_ = FALSE;
 					gboolean _tmp5_ = FALSE;
-					gboolean _tmp6_ = FALSE;
-					gboolean _tmp9_ = FALSE;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp6_ = have_iter;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp6_) {
-#line 800 "ui.c"
-						GtkListStore* _tmp7_ = NULL;
-						gboolean _tmp8_ = FALSE;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp7_ = self->priv->device_model;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp8_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp7_, &_vala_iter);
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp5_ = _tmp8_;
-#line 809 "ui.c"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp5_ = have_iter;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (!_tmp5_) {
+#line 943 "ui.c"
+						GtkListStore* _tmp6_ = NULL;
+						gboolean _tmp7_ = FALSE;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp6_ = self->priv->device_model;
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp7_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp6_, &_vala_iter);
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp4_ = _tmp7_;
+#line 952 "ui.c"
 					} else {
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp5_ = FALSE;
-#line 813 "ui.c"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp4_ = FALSE;
+#line 956 "ui.c"
 					}
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp9_ = _tmp5_;
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp9_) {
-#line 229 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (!_tmp4_) {
+#line 303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 821 "ui.c"
+#line 962 "ui.c"
 					}
 				}
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp10_ = self->priv->device_model;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = _vala_iter;
-#line 226 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp10_, &_tmp11_, 0, &d, -1, -1);
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp12_ = d;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp13_ = device;
-#line 227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp12_, _tmp13_) == 0) {
-#line 228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp8_ = self->priv->device_model;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp9_ = _vala_iter;
+#line 300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &d, -1, -1);
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp10_ = d;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp11_ = device;
+#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
+#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					have_iter = TRUE;
-#line 840 "ui.c"
+#line 981 "ui.c"
 				}
-#line 223 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (d);
-#line 844 "ui.c"
+#line 985 "ui.c"
 			}
 		}
 	}
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = have_iter;
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (iter) {
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*iter = _vala_iter;
-#line 854 "ui.c"
+#line 995 "ui.c"
 	}
-#line 232 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 858 "ui.c"
+#line 999 "ui.c"
 }
 
 
 static void user_interface_show_error_dialog (UserInterface* self, const gchar* error_title, const gchar* error_text) {
 	GtkMessageDialog* dialog = NULL;
-	GtkApplicationWindow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	GtkMessageDialog* _tmp2_ = NULL;
+	const gchar* _tmp0_ = NULL;
+	GtkMessageDialog* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->window;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = error_title;
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp1_);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp2_);
-#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dialog = _tmp2_;
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _ ("_Close");
-#line 242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp3_, 0);
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = error_text;
-#line 243 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp4_);
-#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = error_title;
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp0_);
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp1_);
+#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dialog = _tmp1_;
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _ ("_Close");
+#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) dialog, _tmp2_, 0);
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = error_text;
+#line 317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_message_dialog_format_secondary_text (dialog, "%s", _tmp3_);
+#line 318 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_destroy ((GtkWidget*) dialog);
-#line 235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 897 "ui.c"
+#line 1035 "ui.c"
 }
 
 
@@ -912,145 +1050,158 @@ void user_interface_authorize (UserInterface* self, const gchar* resource, gchar
 	GtkDialog* _tmp8_ = NULL;
 	GtkEntry* _tmp9_ = NULL;
 	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	GtkEntry* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	const gchar* _tmp11_ = NULL;
+	gchar* _tmp12_ = NULL;
+	GtkEntry* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
+	const gchar* _tmp15_ = NULL;
+	gchar* _tmp16_ = NULL;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (resource != NULL);
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Username and password required to access '%s'");
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = resource;
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp2_;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->username_entry;
-#line 252 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp3_, "");
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->password_entry;
-#line 253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_entry_set_text (_tmp4_, "");
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->authorize_label;
-#line 254 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_text (_tmp5_, description);
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->authorize_dialog;
-#line 256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp6_);
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = self->priv->authorize_dialog;
-#line 257 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_dialog_run (_tmp7_);
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->authorize_dialog;
-#line 258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_hide ((GtkWidget*) _tmp8_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 332 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp8_, FALSE);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->username_entry;
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = gtk_entry_get_text (_tmp9_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = g_strdup (_tmp10_);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = _tmp10_;
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = g_strdup (_tmp11_);
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_username);
-#line 260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_username = _tmp11_;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = self->priv->password_entry;
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = gtk_entry_get_text (_tmp12_);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = g_strdup (_tmp13_);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_username = _tmp12_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = self->priv->password_entry;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = gtk_entry_get_text (_tmp13_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = _tmp14_;
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = g_strdup (_tmp15_);
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_vala_password);
-#line 261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_vala_password = _tmp14_;
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_password = _tmp16_;
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (username) {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*username = _vala_username;
-#line 982 "ui.c"
+#line 1126 "ui.c"
 	} else {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_username);
-#line 986 "ui.c"
+#line 1130 "ui.c"
 	}
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (password) {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*password = _vala_password;
-#line 992 "ui.c"
+#line 1136 "ui.c"
 	} else {
-#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_vala_password);
-#line 996 "ui.c"
+#line 1140 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT device_combo_changed_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_device_combo_changed_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->setting_devices;
-#line 267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 1017 "ui.c"
+#line 1161 "ui.c"
 	}
-#line 269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 343 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1033 "ui.c"
+#line 1177 "ui.c"
 		GSettings* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->settings;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = user_interface_get_selected_device (self);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_;
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_settings_set_string (_tmp5_, "selected-device", _tmp8_);
-#line 271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp8_);
-#line 1050 "ui.c"
+#line 1194 "ui.c"
 	}
 }
 
 
+static void _user_interface_device_combo_changed_cb_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_device_combo_changed_cb ((UserInterface*) self, _sender);
+#line 1202 "ui.c"
+}
+
+
 static void user_interface_update_info_bar (UserInterface* self) {
 	GtkMessageType type = 0;
 	gchar* title = NULL;
@@ -1074,169 +1225,169 @@ static void user_interface_update_info_bar (UserInterface* self) {
 	GtkButton* _tmp26_ = NULL;
 	gboolean _tmp27_ = FALSE;
 	GtkInfoBar* _tmp28_ = NULL;
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_close_button = FALSE;
-#line 279 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	show_change_scanner_button = FALSE;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->have_error;
-#line 281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1088 "ui.c"
+#line 1239 "ui.c"
 		gchar* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		type = GTK_MESSAGE_ERROR;
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = g_strdup ("dialog-error");
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (image_id);
-#line 284 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		image_id = _tmp1_;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->error_title;
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = g_strdup (_tmp2_);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (title);
-#line 285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		title = _tmp3_;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->error_text;
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (text);
-#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		text = _tmp5_;
-#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_close_button = TRUE;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->error_change_scanner_hint;
-#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		show_change_scanner_button = _tmp6_;
-#line 1125 "ui.c"
+#line 1276 "ui.c"
 	} else {
 		GtkListStore* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->device_model;
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = gtk_tree_model_iter_n_children ((GtkTreeModel*) _tmp7_, NULL);
-#line 290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp8_ == 0) {
-#line 1135 "ui.c"
+#line 1286 "ui.c"
 			gchar* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
-#line 292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 366 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			type = GTK_MESSAGE_WARNING;
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = g_strdup ("dialog-warning");
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			image_id = _tmp9_;
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _ ("No scanners detected");
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
-#line 295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			title = _tmp11_;
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = _ ("Please check your scanner is connected and powered on");
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = g_strdup (_tmp12_);
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
-#line 297 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			text = _tmp13_;
-#line 1165 "ui.c"
+#line 1316 "ui.c"
 		} else {
 			GtkInfoBar* _tmp14_ = NULL;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = self->priv->info_bar;
-#line 301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_widget_hide ((GtkWidget*) _tmp14_);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_widget_set_visible ((GtkWidget*) _tmp14_, FALSE);
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (image_id);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (text);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (title);
-#line 302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return;
-#line 1180 "ui.c"
+#line 1331 "ui.c"
 		}
 	}
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->info_bar;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = type;
-#line 305 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_info_bar_set_message_type (_tmp15_, _tmp16_);
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->info_bar_image;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = image_id;
-#line 306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_image_set_from_icon_name (_tmp17_, _tmp18_, GTK_ICON_SIZE_DIALOG);
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = title;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = text;
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", _tmp19_, _tmp20_);
-#line 307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp21_;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = self->priv->info_bar_label;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = message;
-#line 308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 382 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_label_set_markup (_tmp22_, _tmp23_);
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = self->priv->info_bar_close_button;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = show_close_button;
-#line 309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp24_, _tmp25_);
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = self->priv->info_bar_change_scanner_button;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = show_change_scanner_button;
-#line 310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_visible ((GtkWidget*) _tmp26_, _tmp27_);
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = self->priv->info_bar;
-#line 311 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp28_);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp28_, TRUE);
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (image_id);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (text);
-#line 274 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1233 "ui.c"
+#line 1384 "ui.c"
 }
 
 
 static gpointer _scan_device_ref0 (gpointer self) {
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? scan_device_ref (self) : NULL;
-#line 1240 "ui.c"
+#line 1391 "ui.c"
 }
 
 
@@ -1245,84 +1396,85 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 	gint index = 0;
 	GtkTreeIter iter = {0};
 	gboolean _tmp0_ = FALSE;
-	GList* _tmp3_ = NULL;
+	GList* _tmp4_ = NULL;
+	gboolean _tmp51_ = FALSE;
 	gboolean _tmp52_ = FALSE;
-	gboolean _tmp53_ = FALSE;
-	gboolean _tmp55_ = FALSE;
-#line 314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	have_selection = FALSE;
-#line 320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = TRUE;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->user_selected_device;
-#line 323 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1263 "ui.c"
+#line 1413 "ui.c"
 		GtkComboBox* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gint _tmp3_ = 0;
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 324 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		have_selection = _tmp2_ >= 0;
-#line 1272 "ui.c"
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = _tmp2_;
+#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		have_selection = _tmp3_ >= 0;
+#line 1425 "ui.c"
 	}
-#line 327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = 0;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = devices;
-#line 1278 "ui.c"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = devices;
+#line 1431 "ui.c"
 	{
 		GList* device_collection = NULL;
 		GList* device_it = NULL;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		device_collection = _tmp3_;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		device_collection = _tmp4_;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		for (device_it = device_collection; device_it != NULL; device_it = device_it->next) {
-#line 1286 "ui.c"
-			ScanDevice* _tmp4_ = NULL;
+#line 1439 "ui.c"
+			ScanDevice* _tmp5_ = NULL;
 			ScanDevice* device = NULL;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp4_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			device = _tmp4_;
-#line 1293 "ui.c"
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp5_ = _scan_device_ref0 ((ScanDevice*) device_it->data);
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			device = _tmp5_;
+#line 1446 "ui.c"
 			{
 				gint n_delete = 0;
-				GtkListStore* _tmp5_ = NULL;
-				gint _tmp6_ = 0;
-				GtkTreeIter _tmp7_ = {0};
-				gboolean _tmp8_ = FALSE;
+				GtkListStore* _tmp6_ = NULL;
+				gint _tmp7_ = 0;
+				GtkTreeIter _tmp8_ = {0};
+				gboolean _tmp9_ = FALSE;
 				gint _tmp21_ = 0;
-				gint _tmp45_ = 0;
-#line 330 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gint _tmp44_ = 0;
+#line 404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				n_delete = -1;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp5_ = self->priv->device_model;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp6_ = index;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp5_, &_tmp7_, NULL, _tmp6_);
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				iter = _tmp7_;
-#line 333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp8_) {
-#line 1314 "ui.c"
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp6_ = self->priv->device_model;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp7_ = index;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp9_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp6_, &_tmp8_, NULL, _tmp7_);
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				iter = _tmp8_;
+#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp9_) {
+#line 1467 "ui.c"
 					gint i = 0;
-#line 335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					i = 0;
-#line 1318 "ui.c"
+#line 1471 "ui.c"
 					{
-						gboolean _tmp9_ = FALSE;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp9_ = TRUE;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						gboolean _tmp10_ = FALSE;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp10_ = TRUE;
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1325 "ui.c"
-							gboolean _tmp10_ = FALSE;
+#line 1478 "ui.c"
 							gchar* name = NULL;
 							gboolean matched = FALSE;
 							GtkListStore* _tmp13_ = NULL;
@@ -1332,253 +1484,246 @@ void user_interface_set_scan_devices (UserInterface* self, GList* devices) {
 							const gchar* _tmp17_ = NULL;
 							gboolean _tmp18_ = FALSE;
 							gint _tmp20_ = 0;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp10_ = _tmp9_;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (!_tmp10_) {
-#line 1340 "ui.c"
+#line 1490 "ui.c"
 								GtkListStore* _tmp11_ = NULL;
 								gboolean _tmp12_ = FALSE;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp11_ = self->priv->device_model;
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp12_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp11_, &iter);
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								if (!_tmp12_) {
-#line 350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 424 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 									break;
-#line 1351 "ui.c"
+#line 1501 "ui.c"
 								}
 							}
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp9_ = FALSE;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp10_ = FALSE;
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp13_ = self->priv->device_model;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp14_ = iter;
-#line 341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							gtk_tree_model_get ((GtkTreeModel*) _tmp13_, &_tmp14_, 0, &name, -1, -1);
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp15_ = name;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp16_ = device;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp17_ = _tmp16_->name;
-#line 342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							matched = g_strcmp0 (_tmp15_, _tmp17_) == 0;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp18_ = matched;
-#line 344 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							if (_tmp18_) {
-#line 1374 "ui.c"
+#line 1524 "ui.c"
 								gint _tmp19_ = 0;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_tmp19_ = i;
-#line 346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								n_delete = _tmp19_;
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								_g_free0 (name);
-#line 347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 421 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1384 "ui.c"
+#line 1534 "ui.c"
 							}
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp20_ = i;
-#line 349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							i = _tmp20_ + 1;
-#line 336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 410 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (name);
-#line 1392 "ui.c"
+#line 1542 "ui.c"
 						}
 					}
 				}
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp21_ = n_delete;
-#line 354 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 428 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				if (_tmp21_ >= 0) {
-#line 1400 "ui.c"
+#line 1550 "ui.c"
 					gint i = 0;
 					GtkListStore* _tmp22_ = NULL;
 					GtkTreeIter _tmp23_ = {0};
 					ScanDevice* _tmp24_ = NULL;
 					const gchar* _tmp25_ = NULL;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp22_ = self->priv->device_model;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp23_ = iter;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp24_ = device;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_tmp25_ = _tmp24_->label;
-#line 359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					gtk_list_store_set (_tmp22_, &_tmp23_, 1, _tmp25_, -1, -1);
-#line 1416 "ui.c"
+#line 1566 "ui.c"
 					{
 						gboolean _tmp26_ = FALSE;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						i = 0;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_tmp26_ = TRUE;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						while (TRUE) {
-#line 1425 "ui.c"
-							gboolean _tmp27_ = FALSE;
+#line 1575 "ui.c"
+							gint _tmp28_ = 0;
 							gint _tmp29_ = 0;
-							gint _tmp30_ = 0;
-							GtkListStore* _tmp31_ = NULL;
-							gint _tmp32_ = 0;
-							GtkTreeIter _tmp33_ = {0};
-							GtkListStore* _tmp34_ = NULL;
-							GtkTreeIter _tmp35_ = {0};
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp27_ = _tmp26_;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!_tmp27_) {
-#line 1438 "ui.c"
-								gint _tmp28_ = 0;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp28_ = i;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								i = _tmp28_ + 1;
-#line 1444 "ui.c"
+							GtkListStore* _tmp30_ = NULL;
+							gint _tmp31_ = 0;
+							GtkTreeIter _tmp32_ = {0};
+							GtkListStore* _tmp33_ = NULL;
+							GtkTreeIter _tmp34_ = {0};
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (!_tmp26_) {
+#line 1585 "ui.c"
+								gint _tmp27_ = 0;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_tmp27_ = i;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								i = _tmp27_ + 1;
+#line 1591 "ui.c"
 							}
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_tmp26_ = FALSE;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp29_ = i;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp30_ = n_delete;
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (!(_tmp29_ < _tmp30_)) {
-#line 361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp28_ = i;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp29_ = n_delete;
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (!(_tmp28_ < _tmp29_)) {
+#line 435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 								break;
-#line 1456 "ui.c"
+#line 1603 "ui.c"
 							}
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp31_ = self->priv->device_model;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp32_ = index;
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp31_, &_tmp33_, NULL, _tmp32_);
-#line 363 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							iter = _tmp33_;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp34_ = self->priv->device_model;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp35_ = iter;
-#line 364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							gtk_list_store_remove (_tmp34_, &_tmp35_);
-#line 1472 "ui.c"
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp30_ = self->priv->device_model;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp31_ = index;
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp30_, &_tmp32_, NULL, _tmp31_);
+#line 437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							iter = _tmp32_;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp33_ = self->priv->device_model;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp34_ = iter;
+#line 438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							gtk_list_store_remove (_tmp33_, &_tmp34_);
+#line 1619 "ui.c"
 						}
 					}
 				} else {
-					GtkListStore* _tmp36_ = NULL;
-					gint _tmp37_ = 0;
-					GtkTreeIter _tmp38_ = {0};
-					GtkListStore* _tmp39_ = NULL;
-					GtkTreeIter _tmp40_ = {0};
-					ScanDevice* _tmp41_ = NULL;
-					const gchar* _tmp42_ = NULL;
-					ScanDevice* _tmp43_ = NULL;
-					const gchar* _tmp44_ = NULL;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp36_ = self->priv->device_model;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp37_ = index;
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_insert (_tmp36_, &_tmp38_, _tmp37_);
-#line 369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					iter = _tmp38_;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp39_ = self->priv->device_model;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp40_ = iter;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp41_ = device;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp42_ = _tmp41_->name;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp43_ = device;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp44_ = _tmp43_->label;
-#line 370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_list_store_set (_tmp39_, &_tmp40_, 0, _tmp42_, 1, _tmp44_, -1, -1);
-#line 1507 "ui.c"
+					GtkListStore* _tmp35_ = NULL;
+					gint _tmp36_ = 0;
+					GtkTreeIter _tmp37_ = {0};
+					GtkListStore* _tmp38_ = NULL;
+					GtkTreeIter _tmp39_ = {0};
+					ScanDevice* _tmp40_ = NULL;
+					const gchar* _tmp41_ = NULL;
+					ScanDevice* _tmp42_ = NULL;
+					const gchar* _tmp43_ = NULL;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp35_ = self->priv->device_model;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp36_ = index;
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_list_store_insert (_tmp35_, &_tmp37_, _tmp36_);
+#line 443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					iter = _tmp37_;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp38_ = self->priv->device_model;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp39_ = iter;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp40_ = device;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp41_ = _tmp40_->name;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp42_ = device;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp43_ = _tmp42_->label;
+#line 444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_list_store_set (_tmp38_, &_tmp39_, 0, _tmp41_, 1, _tmp43_, -1, -1);
+#line 1654 "ui.c"
 				}
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp45_ = index;
-#line 372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				index = _tmp45_ + 1;
-#line 328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp44_ = index;
+#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				index = _tmp44_ + 1;
+#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_scan_device_unref0 (device);
-#line 1515 "ui.c"
+#line 1662 "ui.c"
 			}
 		}
 	}
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 1521 "ui.c"
-		GtkListStore* _tmp46_ = NULL;
-		gint _tmp47_ = 0;
-		GtkTreeIter _tmp48_ = {0};
-		gboolean _tmp49_ = FALSE;
-		GtkListStore* _tmp50_ = NULL;
-		GtkTreeIter _tmp51_ = {0};
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp46_ = self->priv->device_model;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp47_ = index;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp49_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp46_, &_tmp48_, NULL, _tmp47_);
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp48_;
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (!_tmp49_) {
-#line 376 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1668 "ui.c"
+		GtkListStore* _tmp45_ = NULL;
+		gint _tmp46_ = 0;
+		GtkTreeIter _tmp47_ = {0};
+		gboolean _tmp48_ = FALSE;
+		GtkListStore* _tmp49_ = NULL;
+		GtkTreeIter _tmp50_ = {0};
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp45_ = self->priv->device_model;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp46_ = index;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp48_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) _tmp45_, &_tmp47_, NULL, _tmp46_);
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		iter = _tmp47_;
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (!_tmp48_) {
+#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 1540 "ui.c"
+#line 1687 "ui.c"
 		}
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp50_ = self->priv->device_model;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp51_ = iter;
-#line 377 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_list_store_remove (_tmp50_, &_tmp51_);
-#line 1548 "ui.c"
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp49_ = self->priv->device_model;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp50_ = iter;
+#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_list_store_remove (_tmp49_, &_tmp50_);
+#line 1695 "ui.c"
 	}
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = have_selection;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp53_) {
-#line 1554 "ui.c"
-		GList* _tmp54_ = NULL;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp54_ = devices;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp52_ = _tmp54_ != NULL;
-#line 1560 "ui.c"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp52_ = have_selection;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp52_) {
+#line 1701 "ui.c"
+		GList* _tmp53_ = NULL;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp53_ = devices;
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp51_ = _tmp53_ != NULL;
+#line 1707 "ui.c"
 	} else {
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp52_ = FALSE;
-#line 1564 "ui.c"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp51_ = FALSE;
+#line 1711 "ui.c"
 	}
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = _tmp52_;
-#line 380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp55_) {
-#line 1570 "ui.c"
-		GtkComboBox* _tmp56_ = NULL;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp56_ = self->priv->device_combo;
-#line 381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_combo_box_set_active (_tmp56_, 0);
-#line 1576 "ui.c"
+#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp51_) {
+#line 1715 "ui.c"
+		GtkComboBox* _tmp54_ = NULL;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp54_ = self->priv->device_combo;
+#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_combo_box_set_active (_tmp54_, 0);
+#line 1721 "ui.c"
 	}
-#line 383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->setting_devices = FALSE;
-#line 385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 1582 "ui.c"
+#line 1727 "ui.c"
 }
 
 
@@ -1591,31 +1736,31 @@ static void user_interface_add_default_page (UserInterface* self) {
 	Page* _tmp4_ = NULL;
 	Book* _tmp5_ = NULL;
 	BookView* _tmp6_ = NULL;
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->default_page_width;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->default_page_height;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->default_page_dpi;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->default_page_scan_direction;
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_new (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 390 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->_book;
-#line 394 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_append_page (_tmp5_, page);
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->book_view;
-#line 395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp6_, page);
-#line 388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1619 "ui.c"
+#line 1764 "ui.c"
 }
 
 
@@ -1626,35 +1771,35 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	gunichar _tmp1_ = 0U;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 928 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 930 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_);
-#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 931 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 933 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1644 "ui.c"
+#line 1789 "ui.c"
 		gchar* _tmp4_ = NULL;
-#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 934 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 1652 "ui.c"
+#line 1797 "ui.c"
 	} else {
-#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = -1;
-#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 936 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 1658 "ui.c"
+#line 1803 "ui.c"
 	}
 }
 
@@ -1669,118 +1814,112 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gboolean _tmp8_ = FALSE;
 	glong _tmp9_ = 0L;
 	gboolean _tmp12_ = FALSE;
-	gboolean _tmp13_ = FALSE;
-	glong _tmp14_ = 0L;
-	gboolean _tmp17_ = FALSE;
+	glong _tmp13_ = 0L;
+	glong _tmp16_ = 0L;
+	glong _tmp17_ = 0L;
 	glong _tmp18_ = 0L;
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	glong _tmp22_ = 0L;
-	gchar* _tmp23_ = NULL;
-#line 1189 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+	gchar* _tmp21_ = NULL;
+#line 1226 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1227 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1228 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1694 "ui.c"
+#line 1837 "ui.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
-#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1229 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1703 "ui.c"
+#line 1846 "ui.c"
 	}
-#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1231 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1709 "ui.c"
+#line 1852 "ui.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
-#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1232 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1718 "ui.c"
+#line 1861 "ui.c"
 	}
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1724 "ui.c"
+#line 1867 "ui.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1733 "ui.c"
+#line 1876 "ui.c"
 	} else {
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1737 "ui.c"
-	}
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp12_ = _tmp8_;
-#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp14_ = end;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp14_ >= ((glong) 0)) {
-#line 1747 "ui.c"
+#line 1880 "ui.c"
+	}
+#line 1234 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp8_, NULL);
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp13_ = end;
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp13_ >= ((glong) 0)) {
+#line 1888 "ui.c"
+		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp15_ = end;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp16_ = string_length;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp13_ = _tmp15_ <= _tmp16_;
-#line 1756 "ui.c"
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp14_ = end;
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp12_ = _tmp14_ <= _tmp15_;
+#line 1897 "ui.c"
 	} else {
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp13_ = FALSE;
-#line 1760 "ui.c"
-	}
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp17_ = _tmp13_;
-#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp17_, NULL);
-#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp12_ = FALSE;
+#line 1901 "ui.c"
+	}
+#line 1235 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp12_, NULL);
+#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp16_ = start;
+#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp17_ = end;
+#line 1236 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL);
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp21_ = end;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp22_ = start;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_));
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	result = _tmp23_;
-#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	result = _tmp21_;
+#line 1237 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 1784 "ui.c"
+#line 1923 "ui.c"
 }
 
 
@@ -1803,84 +1942,84 @@ static void user_interface_on_file_type_changed (UserInterface* self, GtkTreeSel
 	gchar* _tmp14_ = NULL;
 	GtkFileChooserDialog* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (selection != NULL);
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = selection;
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_extension (self, _tmp0_);
-#line 400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp1_;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_dialog;
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp2_);
-#line 401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp3_;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = path;
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_path_get_basename (_tmp4_);
-#line 402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp5_;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = filename;
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = string_last_index_of_char (_tmp6_, (gunichar) '.', 0);
-#line 405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension_index = _tmp7_;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = extension_index;
-#line 406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ >= 0) {
-#line 1839 "ui.c"
+#line 1978 "ui.c"
 		const gchar* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = filename;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = extension_index;
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = string_slice (_tmp9_, (glong) 0, (glong) _tmp10_);
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 407 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		filename = _tmp11_;
-#line 1853 "ui.c"
+#line 1992 "ui.c"
 	}
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = filename;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = extension;
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = g_strconcat (_tmp12_, _tmp13_, NULL);
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp14_;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = filename;
-#line 409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 398 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 472 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (extension);
-#line 1877 "ui.c"
+#line 2016 "ui.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1884 "ui.c"
+#line 2023 "ui.c"
 }
 
 
@@ -1895,46 +2034,46 @@ static gchar* user_interface_get_selected_extension (UserInterface* self, GtkTre
 	GtkTreeIter _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
 	GtkTreeModel* _tmp5_ = NULL;
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 412 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (selection != NULL, NULL);
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("");
-#line 416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	extension = _tmp0_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = selection;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = gtk_tree_selection_get_selected (_tmp1_, &_tmp2_, &_tmp3_);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _g_object_ref0 (_tmp2_);
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	model = _tmp5_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp3_;
-#line 418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 1921 "ui.c"
+#line 2060 "ui.c"
 		GtkTreeModel* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = model;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = iter;
-#line 419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get (_tmp6_, &_tmp7_, 1, &extension, -1, -1);
-#line 1930 "ui.c"
+#line 2069 "ui.c"
 	}
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = extension;
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 1938 "ui.c"
+#line 2077 "ui.c"
 }
 
 
@@ -1945,39 +2084,39 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	glong _tmp1_ = 0L;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1193 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1194 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1961 "ui.c"
+#line 2100 "ui.c"
 		glong _tmp4_ = 0L;
-#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1195 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 1969 "ui.c"
+#line 2108 "ui.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1197 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		return result;
-#line 1981 "ui.c"
+#line 2120 "ui.c"
 	}
 }
 
@@ -1987,132 +2126,129 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
 	glong _tmp1_ = 0L;
-	gboolean _tmp3_ = FALSE;
-	glong _tmp9_ = 0L;
-	glong _tmp15_ = 0L;
+	glong _tmp8_ = 0L;
+	glong _tmp14_ = 0L;
+	glong _tmp17_ = 0L;
 	glong _tmp18_ = 0L;
 	glong _tmp19_ = 0L;
 	glong _tmp20_ = 0L;
 	glong _tmp21_ = 0L;
-	glong _tmp22_ = 0L;
-	gchar* _tmp23_ = NULL;
-#line 1167 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+	gchar* _tmp22_ = NULL;
+#line 1204 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 2006 "ui.c"
+#line 2144 "ui.c"
 		glong _tmp2_ = 0L;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 2012 "ui.c"
+#line 2150 "ui.c"
 	} else {
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 2016 "ui.c"
+#line 2154 "ui.c"
 	}
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp3_ = _tmp0_;
-#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp3_) {
-#line 2022 "ui.c"
+#line 1206 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2158 "ui.c"
+		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
-		glong _tmp6_ = 0L;
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp4_ = offset;
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp5_ = len;
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_);
-#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		string_length = _tmp6_;
-#line 2034 "ui.c"
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1208 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 2170 "ui.c"
 	} else {
+		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-		gint _tmp8_ = 0;
-#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp7_ = strlen (self);
-#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp8_;
-#line 2044 "ui.c"
-	}
-#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp9_ = offset;
-#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp9_ < ((glong) 0)) {
-#line 2050 "ui.c"
+#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1210 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 2180 "ui.c"
+	}
+#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1213 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 2186 "ui.c"
+		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
-		glong _tmp12_ = 0L;
-#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp10_ = string_length;
-#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1214 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		offset = _tmp10_ + _tmp11_;
-#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL);
-#line 2064 "ui.c"
+#line 1215 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 2200 "ui.c"
 	} else {
+		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
-		glong _tmp14_ = 0L;
-#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp13_ = offset;
-#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp14_ = string_length;
-#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL);
-#line 2074 "ui.c"
-	}
-#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp15_ = len;
-#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	if (_tmp15_ < ((glong) 0)) {
-#line 2080 "ui.c"
+#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1217 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 2210 "ui.c"
+	}
+#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1219 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 2216 "ui.c"
+		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
-		glong _tmp17_ = 0L;
-#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp16_ = string_length;
-#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		_tmp17_ = offset;
-#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-		len = _tmp16_ - _tmp17_;
-#line 2089 "ui.c"
-	}
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp18_ = offset;
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp19_ = len;
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp20_ = string_length;
-#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL);
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp21_ = offset;
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp22_ = len;
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	_tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_);
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
-	result = _tmp23_;
-#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi"
+#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1220 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 2225 "ui.c"
+	}
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1222 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1223 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
 	return result;
-#line 2109 "ui.c"
+#line 2245 "ui.c"
 }
 
 
 static void _user_interface_on_file_type_changed_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self) {
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_on_file_type_changed (self, _sender);
-#line 2116 "ui.c"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_on_file_type_changed ((UserInterface*) self, _sender);
+#line 2252 "ui.c"
 }
 
 
@@ -2123,610 +2259,601 @@ static gchar* user_interface_choose_file_location (UserInterface* self) {
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	const gchar* _tmp3_ = NULL;
-	gboolean _tmp5_ = FALSE;
+	const gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-	GtkApplicationWindow* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	GtkFileChooserDialog* _tmp10_ = NULL;
+	GtkFileChooserDialog* _tmp11_ = NULL;
 	GtkFileChooserDialog* _tmp12_ = NULL;
 	GtkFileChooserDialog* _tmp13_ = NULL;
-	GtkFileChooserDialog* _tmp14_ = NULL;
+	const gchar* _tmp14_ = NULL;
 	GtkFileChooserDialog* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
-	GtkFileChooserDialog* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
 	GtkFileFilter* filter = NULL;
-	GtkFileFilter* _tmp19_ = NULL;
+	GtkFileFilter* _tmp17_ = NULL;
+	GtkFileFilter* _tmp18_ = NULL;
+	const gchar* _tmp19_ = NULL;
 	GtkFileFilter* _tmp20_ = NULL;
-	const gchar* _tmp21_ = NULL;
-	GtkFileFilter* _tmp22_ = NULL;
+	GtkFileFilter* _tmp21_ = NULL;
+	GtkFileChooserDialog* _tmp22_ = NULL;
 	GtkFileFilter* _tmp23_ = NULL;
-	GtkFileChooserDialog* _tmp24_ = NULL;
+	GtkFileFilter* _tmp24_ = NULL;
 	GtkFileFilter* _tmp25_ = NULL;
 	GtkFileFilter* _tmp26_ = NULL;
-	GtkFileFilter* _tmp27_ = NULL;
+	const gchar* _tmp27_ = NULL;
 	GtkFileFilter* _tmp28_ = NULL;
-	const gchar* _tmp29_ = NULL;
+	GtkFileChooserDialog* _tmp29_ = NULL;
 	GtkFileFilter* _tmp30_ = NULL;
-	GtkFileChooserDialog* _tmp31_ = NULL;
-	GtkFileFilter* _tmp32_ = NULL;
-	GtkFileFilter* _tmp33_ = NULL;
+	GtkFileFilter* _tmp31_ = NULL;
 	GtkExpander* expander = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkExpander* _tmp35_ = NULL;
+	const gchar* _tmp32_ = NULL;
+	GtkExpander* _tmp33_ = NULL;
+	GtkExpander* _tmp34_ = NULL;
+	GtkFileChooserDialog* _tmp35_ = NULL;
 	GtkExpander* _tmp36_ = NULL;
-	GtkFileChooserDialog* _tmp37_ = NULL;
-	GtkExpander* _tmp38_ = NULL;
 	gchar* default_extension = NULL;
-	gchar* _tmp39_ = NULL;
+	gchar* _tmp37_ = NULL;
 	gint index = 0;
-	const gchar* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
+	const gchar* _tmp38_ = NULL;
+	gint _tmp39_ = 0;
+	gint _tmp40_ = 0;
 	GtkListStore* file_type_store = NULL;
-	GtkListStore* _tmp46_ = NULL;
+	GtkListStore* _tmp44_ = NULL;
 	GtkTreeIter iter = {0};
+	GtkListStore* _tmp45_ = NULL;
+	GtkTreeIter _tmp46_ = {0};
 	GtkListStore* _tmp47_ = NULL;
 	GtkTreeIter _tmp48_ = {0};
-	GtkListStore* _tmp49_ = NULL;
-	GtkTreeIter _tmp50_ = {0};
-	const gchar* _tmp51_ = NULL;
+	const gchar* _tmp49_ = NULL;
+	GtkListStore* _tmp50_ = NULL;
+	GtkTreeIter _tmp51_ = {0};
 	GtkListStore* _tmp52_ = NULL;
 	GtkTreeIter _tmp53_ = {0};
-	GtkListStore* _tmp54_ = NULL;
-	GtkTreeIter _tmp55_ = {0};
-	const gchar* _tmp56_ = NULL;
+	const gchar* _tmp54_ = NULL;
+	GtkListStore* _tmp55_ = NULL;
+	GtkTreeIter _tmp56_ = {0};
 	GtkListStore* _tmp57_ = NULL;
 	GtkTreeIter _tmp58_ = {0};
-	GtkListStore* _tmp59_ = NULL;
-	GtkTreeIter _tmp60_ = {0};
-	const gchar* _tmp61_ = NULL;
+	const gchar* _tmp59_ = NULL;
 	GtkTreeView* file_type_view = NULL;
-	GtkListStore* _tmp62_ = NULL;
+	GtkListStore* _tmp60_ = NULL;
+	GtkTreeView* _tmp61_ = NULL;
+	GtkTreeView* _tmp62_ = NULL;
 	GtkTreeView* _tmp63_ = NULL;
-	GtkTreeView* _tmp64_ = NULL;
-	GtkTreeView* _tmp65_ = NULL;
 	GtkTreeViewColumn* column = NULL;
-	GtkCellRendererText* _tmp66_ = NULL;
-	GtkCellRendererText* _tmp67_ = NULL;
-	GtkTreeViewColumn* _tmp68_ = NULL;
+	GtkCellRendererText* _tmp64_ = NULL;
+	GtkCellRendererText* _tmp65_ = NULL;
+	GtkTreeViewColumn* _tmp66_ = NULL;
+	GtkTreeViewColumn* _tmp67_ = NULL;
+	GtkTreeView* _tmp68_ = NULL;
 	GtkTreeViewColumn* _tmp69_ = NULL;
-	GtkTreeView* _tmp70_ = NULL;
-	GtkTreeViewColumn* _tmp71_ = NULL;
-	GtkExpander* _tmp72_ = NULL;
-	GtkTreeView* _tmp73_ = NULL;
-	GtkListStore* _tmp74_ = NULL;
-	GtkTreeIter _tmp75_ = {0};
-	gboolean _tmp76_ = FALSE;
-	GtkTreeView* _tmp88_ = NULL;
-	GtkTreeSelection* _tmp89_ = NULL;
-	GtkExpander* _tmp90_ = NULL;
+	GtkExpander* _tmp70_ = NULL;
+	GtkTreeView* _tmp71_ = NULL;
+	GtkListStore* _tmp72_ = NULL;
+	GtkTreeIter _tmp73_ = {0};
+	gboolean _tmp74_ = FALSE;
+	GtkTreeView* _tmp85_ = NULL;
+	GtkTreeSelection* _tmp86_ = NULL;
+	GtkExpander* _tmp87_ = NULL;
 	gint response = 0;
-	GtkFileChooserDialog* _tmp91_ = NULL;
-	gint _tmp92_ = 0;
+	GtkFileChooserDialog* _tmp88_ = NULL;
+	gint _tmp89_ = 0;
 	gchar* uri = NULL;
-	gint _tmp93_ = 0;
-	GSettings* _tmp113_ = NULL;
-	GtkFileChooserDialog* _tmp114_ = NULL;
-	gchar* _tmp115_ = NULL;
-	gchar* _tmp116_ = NULL;
-	GtkTreeView* _tmp117_ = NULL;
-	GtkTreeSelection* _tmp118_ = NULL;
-	guint _tmp119_ = 0U;
-	GtkFileChooserDialog* _tmp120_ = NULL;
-#line 423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint _tmp90_ = 0;
+	GSettings* _tmp110_ = NULL;
+	GtkFileChooserDialog* _tmp111_ = NULL;
+	gchar* _tmp112_ = NULL;
+	gchar* _tmp113_ = NULL;
+	GtkTreeView* _tmp114_ = NULL;
+	GtkTreeSelection* _tmp115_ = NULL;
+	guint _tmp116_ = 0U;
+	GtkFileChooserDialog* _tmp117_ = NULL;
+#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 500 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = NULL;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_settings_get_string (_tmp0_, "save-directory");
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	directory = _tmp1_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = directory;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_ == NULL) {
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = TRUE;
-#line 2236 "ui.c"
+#line 2370 "ui.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = directory;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") == 0;
-#line 2243 "ui.c"
+#line 2377 "ui.c"
 	}
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = _tmp2_;
-#line 429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp5_) {
-#line 2249 "ui.c"
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = g_strdup (_tmp6_);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 2381 "ui.c"
+		const gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS);
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = g_strdup (_tmp5_);
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (directory);
-#line 430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		directory = _tmp7_;
-#line 2260 "ui.c"
-	}
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = _ ("Save As...");
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = self->priv->window;
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = _ ("_Cancel");
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = _ ("_Save");
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp8_, (GtkWindow*) _tmp9_, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp10_, GTK_RESPONSE_CANCEL, _tmp11_, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp12_);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		directory = _tmp6_;
+#line 2392 "ui.c"
+	}
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = _ ("Save As...");
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = _ ("_Cancel");
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = _ ("_Save");
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp7_, (GtkWindow*) self, GTK_FILE_CHOOSER_ACTION_SAVE, _tmp8_, GTK_RESPONSE_CANCEL, _tmp9_, GTK_RESPONSE_ACCEPT, NULL, NULL);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp10_);
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_dialog = _tmp12_;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->save_dialog = _tmp10_;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = self->priv->save_dialog;
+#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp11_, TRUE);
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = self->priv->save_dialog;
+#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp12_, FALSE);
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->save_dialog;
-#line 439 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp13_, TRUE);
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = self->priv->save_dialog;
-#line 440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp14_, FALSE);
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = directory;
+#line 515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp13_, _tmp14_);
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->save_dialog;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = directory;
-#line 441 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp15_, _tmp16_);
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->save_dialog;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = self->priv->_default_file_name;
-#line 442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp17_, _tmp18_);
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = gtk_file_filter_new ();
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp19_);
-#line 445 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp19_;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = self->priv->_default_file_name;
+#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp15_, _tmp16_);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = gtk_file_filter_new ();
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp17_);
+#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filter = _tmp17_;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = filter;
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = _ ("Image Files");
+#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_set_name (_tmp18_, _tmp19_);
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = filter;
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = _ ("Image Files");
-#line 446 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_set_name (_tmp20_, _tmp21_);
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = filter;
-#line 448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pixbuf_formats (_tmp22_);
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_pixbuf_formats (_tmp20_);
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp21_ = filter;
+#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_mime_type (_tmp21_, "application/pdf");
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = self->priv->save_dialog;
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = filter;
-#line 449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_mime_type (_tmp23_, "application/pdf");
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = self->priv->save_dialog;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = filter;
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = _g_object_ref0 (_tmp25_);
-#line 450 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp24_, _tmp26_);
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = gtk_file_filter_new ();
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp27_);
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = _g_object_ref0 (_tmp23_);
+#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp24_);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp25_ = gtk_file_filter_new ();
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp25_);
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	filter = _tmp27_;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	filter = _tmp25_;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp26_ = filter;
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = _ ("All Files");
+#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_set_name (_tmp26_, _tmp27_);
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = filter;
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = _ ("All Files");
-#line 452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_set_name (_tmp28_, _tmp29_);
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_filter_add_pattern (_tmp28_, "*");
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = self->priv->save_dialog;
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = filter;
-#line 454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_filter_add_pattern (_tmp30_, "*");
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = self->priv->save_dialog;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = filter;
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = _g_object_ref0 (_tmp32_);
-#line 455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp31_, _tmp33_);
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = _ ("Select File _Type");
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = (GtkExpander*) gtk_expander_new_with_mnemonic (_tmp34_);
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp35_);
-#line 457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	expander = _tmp35_;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = _g_object_ref0 (_tmp30_);
+#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp29_, _tmp31_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = _ ("Select File _Type");
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = (GtkExpander*) gtk_expander_new_with_mnemonic (_tmp32_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp33_);
+#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	expander = _tmp33_;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = expander;
+#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_expander_set_spacing (_tmp34_, 5);
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = self->priv->save_dialog;
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp36_ = expander;
-#line 459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_expander_set_spacing (_tmp36_, 5);
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = self->priv->save_dialog;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = expander;
-#line 460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp37_, (GtkWidget*) _tmp38_);
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = g_strdup ("");
-#line 462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	default_extension = _tmp39_;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = self->priv->_default_file_name;
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = string_last_index_of_char (_tmp40_, (gunichar) '.', 0);
-#line 463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	index = _tmp41_;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = index;
-#line 464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp42_ >= 0) {
-#line 2384 "ui.c"
-		const gchar* _tmp43_ = NULL;
-		gint _tmp44_ = 0;
-		gchar* _tmp45_ = NULL;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp43_ = self->priv->_default_file_name;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp44_ = index;
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp45_ = string_substring (_tmp43_, (glong) _tmp44_, (glong) (-1));
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_file_chooser_set_extra_widget ((GtkFileChooser*) _tmp35_, (GtkWidget*) _tmp36_);
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = g_strdup ("");
+#line 536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	default_extension = _tmp37_;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = self->priv->_default_file_name;
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = string_last_index_of_char (_tmp38_, (gunichar) '.', 0);
+#line 537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	index = _tmp39_;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = index;
+#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp40_ >= 0) {
+#line 2514 "ui.c"
+		const gchar* _tmp41_ = NULL;
+		gint _tmp42_ = 0;
+		gchar* _tmp43_ = NULL;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp41_ = self->priv->_default_file_name;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp42_ = index;
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp43_ = string_substring (_tmp41_, (glong) _tmp42_, (glong) (-1));
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (default_extension);
-#line 465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		default_extension = _tmp45_;
-#line 2398 "ui.c"
-	}
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp46_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-#line 467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file_type_store = _tmp46_;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		default_extension = _tmp43_;
+#line 2528 "ui.c"
+	}
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp44_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	file_type_store = _tmp44_;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp45_ = file_type_store;
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp45_, &_tmp46_);
+#line 543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp46_;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp47_ = file_type_store;
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp47_, &_tmp48_);
-#line 469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp48_;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp49_ = file_type_store;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = iter;
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp51_ = _ ("PDF (multi-page document)");
-#line 470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp49_, &_tmp50_, 0, _tmp51_, 1, ".pdf", -1, -1);
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp48_ = iter;
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp49_ = _ ("PDF (multi-page document)");
+#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp47_, &_tmp48_, 0, _tmp49_, 1, ".pdf", -1, -1);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp50_ = file_type_store;
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp50_, &_tmp51_);
+#line 549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp51_;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp52_ = file_type_store;
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp52_, &_tmp53_);
-#line 475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp53_;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = file_type_store;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = iter;
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = _ ("JPEG (compressed)");
-#line 476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp54_, &_tmp55_, 0, _tmp56_, 1, ".jpg", -1, -1);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp53_ = iter;
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = _ ("JPEG (compressed)");
+#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp52_, &_tmp53_, 0, _tmp54_, 1, ".jpg", -1, -1);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp55_ = file_type_store;
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp55_, &_tmp56_);
+#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp56_;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp57_ = file_type_store;
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp57_, &_tmp58_);
-#line 481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp58_;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = file_type_store;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = iter;
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = _ ("PNG (lossless)");
-#line 482 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp59_, &_tmp60_, 0, _tmp61_, 1, ".png", -1, -1);
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = file_type_store;
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp62_);
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp63_);
-#line 488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file_type_view = _tmp63_;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = file_type_view;
-#line 489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_set_headers_visible (_tmp64_, FALSE);
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = file_type_view;
-#line 490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_set_rules_hint (_tmp65_, TRUE);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp58_ = iter;
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp59_ = _ ("PNG (lossless)");
+#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp57_, &_tmp58_, 0, _tmp59_, 1, ".png", -1, -1);
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp60_ = file_type_store;
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp61_ = (GtkTreeView*) gtk_tree_view_new_with_model ((GtkTreeModel*) _tmp60_);
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp61_);
+#line 562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	file_type_view = _tmp61_;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = file_type_view;
+#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_tree_view_set_headers_visible (_tmp62_, FALSE);
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = file_type_view;
+#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_tree_view_set_rules_hint (_tmp63_, TRUE);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp64_);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp65_ = _tmp64_;
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp66_ = gtk_tree_view_column_new_with_attributes ("", (GtkCellRenderer*) _tmp65_, "text", 0, NULL, NULL);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp66_);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp67_ = _tmp66_;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = gtk_tree_view_column_new_with_attributes ("", (GtkCellRenderer*) _tmp67_, "text", 0, NULL, NULL);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp68_);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = _tmp68_;
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (_tmp67_);
-#line 491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	column = _tmp69_;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = file_type_view;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = column;
-#line 494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_tree_view_append_column (_tmp70_, _tmp71_);
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = expander;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp73_ = file_type_view;
-#line 495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add ((GtkContainer*) _tmp72_, (GtkWidget*) _tmp73_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp74_ = file_type_store;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp74_, &_tmp75_);
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp75_;
-#line 497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp76_) {
-#line 2498 "ui.c"
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (_tmp65_);
+#line 565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	column = _tmp67_;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp68_ = file_type_view;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69_ = column;
+#line 568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_tree_view_append_column (_tmp68_, _tmp69_);
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp70_ = expander;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp71_ = file_type_view;
+#line 569 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add ((GtkContainer*) _tmp70_, (GtkWidget*) _tmp71_);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp72_ = file_type_store;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp74_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp72_, &_tmp73_);
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp73_;
+#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp74_) {
+#line 2628 "ui.c"
 		{
-			gboolean _tmp77_ = FALSE;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp77_ = TRUE;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gboolean _tmp75_ = FALSE;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp75_ = TRUE;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 2505 "ui.c"
-				gboolean _tmp78_ = FALSE;
+#line 2635 "ui.c"
 				gchar* e = NULL;
-				GtkListStore* _tmp81_ = NULL;
-				GtkTreeIter _tmp82_ = {0};
-				const gchar* _tmp83_ = NULL;
-				const gchar* _tmp84_ = NULL;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp78_ = _tmp77_;
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp78_) {
-#line 2516 "ui.c"
-					GtkListStore* _tmp79_ = NULL;
-					gboolean _tmp80_ = FALSE;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp79_ = file_type_store;
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp80_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp79_, &iter);
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp80_) {
-#line 505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				GtkListStore* _tmp78_ = NULL;
+				GtkTreeIter _tmp79_ = {0};
+				const gchar* _tmp80_ = NULL;
+				const gchar* _tmp81_ = NULL;
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!_tmp75_) {
+#line 2643 "ui.c"
+					GtkListStore* _tmp76_ = NULL;
+					gboolean _tmp77_ = FALSE;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp76_ = file_type_store;
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp77_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp76_, &iter);
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (!_tmp77_) {
+#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 2527 "ui.c"
+#line 2654 "ui.c"
 					}
 				}
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp77_ = FALSE;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp81_ = file_type_store;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp82_ = iter;
-#line 502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp81_, &_tmp82_, 1, &e, -1, -1);
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp83_ = default_extension;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp84_ = e;
-#line 503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp83_, _tmp84_) == 0) {
-#line 2544 "ui.c"
-					GtkTreeView* _tmp85_ = NULL;
-					GtkTreeSelection* _tmp86_ = NULL;
-					GtkTreeIter _tmp87_ = {0};
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp85_ = file_type_view;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp86_ = gtk_tree_view_get_selection (_tmp85_);
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp87_ = iter;
-#line 504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_tree_selection_select_iter (_tmp86_, &_tmp87_);
-#line 2556 "ui.c"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp75_ = FALSE;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp78_ = file_type_store;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp79_ = iter;
+#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_tree_model_get ((GtkTreeModel*) _tmp78_, &_tmp79_, 1, &e, -1, -1);
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp80_ = default_extension;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp81_ = e;
+#line 577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (g_strcmp0 (_tmp80_, _tmp81_) == 0) {
+#line 2671 "ui.c"
+					GtkTreeView* _tmp82_ = NULL;
+					GtkTreeSelection* _tmp83_ = NULL;
+					GtkTreeIter _tmp84_ = {0};
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp82_ = file_type_view;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp83_ = gtk_tree_view_get_selection (_tmp82_);
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp84_ = iter;
+#line 578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_tree_selection_select_iter (_tmp83_, &_tmp84_);
+#line 2683 "ui.c"
 				}
-#line 499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (e);
-#line 2560 "ui.c"
+#line 2687 "ui.c"
 			}
 		}
 	}
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = file_type_view;
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp89_ = gtk_tree_view_get_selection (_tmp88_);
-#line 507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp89_, "changed", (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = expander;
-#line 509 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show_all ((GtkWidget*) _tmp90_);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp91_ = self->priv->save_dialog;
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp92_ = gtk_dialog_run ((GtkDialog*) _tmp91_);
-#line 511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp92_;
-#line 513 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp85_ = file_type_view;
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp86_ = gtk_tree_view_get_selection (_tmp85_);
+#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp86_, "changed", (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self, 0);
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp87_ = expander;
+#line 583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_show_all ((GtkWidget*) _tmp87_);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp88_ = self->priv->save_dialog;
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp89_ = gtk_dialog_run ((GtkDialog*) _tmp88_);
+#line 585 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	response = _tmp89_;
+#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	uri = NULL;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp93_ = response;
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp93_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2586 "ui.c"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp90_ = response;
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp90_ == ((gint) GTK_RESPONSE_ACCEPT)) {
+#line 2713 "ui.c"
 		GtkTreeSelection* selection = NULL;
-		GtkTreeView* _tmp94_ = NULL;
-		GtkTreeSelection* _tmp95_ = NULL;
-		GtkTreeSelection* _tmp96_ = NULL;
+		GtkTreeView* _tmp91_ = NULL;
+		GtkTreeSelection* _tmp92_ = NULL;
+		GtkTreeSelection* _tmp93_ = NULL;
 		gchar* extension = NULL;
-		GtkTreeSelection* _tmp97_ = NULL;
-		gchar* _tmp98_ = NULL;
+		GtkTreeSelection* _tmp94_ = NULL;
+		gchar* _tmp95_ = NULL;
 		gchar* path = NULL;
-		GtkFileChooserDialog* _tmp99_ = NULL;
-		gchar* _tmp100_ = NULL;
+		GtkFileChooserDialog* _tmp96_ = NULL;
+		gchar* _tmp97_ = NULL;
 		gchar* filename = NULL;
-		const gchar* _tmp101_ = NULL;
-		gchar* _tmp102_ = NULL;
+		const gchar* _tmp98_ = NULL;
+		gchar* _tmp99_ = NULL;
 		gint extension_index = 0;
-		const gchar* _tmp103_ = NULL;
-		gint _tmp104_ = 0;
-		gint _tmp105_ = 0;
-		const gchar* _tmp109_ = NULL;
-		GFile* _tmp110_ = NULL;
-		GFile* _tmp111_ = NULL;
-		gchar* _tmp112_ = NULL;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp94_ = file_type_view;
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp95_ = gtk_tree_view_get_selection (_tmp94_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp96_ = _g_object_ref0 (_tmp95_);
-#line 516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		selection = _tmp96_;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp97_ = selection;
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp98_ = user_interface_get_selected_extension (self, _tmp97_);
-#line 517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension = _tmp98_;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp99_ = self->priv->save_dialog;
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp100_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp99_);
-#line 519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		path = _tmp100_;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp101_ = path;
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp102_ = g_path_get_basename (_tmp101_);
-#line 520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		filename = _tmp102_;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp103_ = filename;
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp104_ = string_last_index_of_char (_tmp103_, (gunichar) '.', 0);
-#line 522 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		extension_index = _tmp104_;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp105_ = extension_index;
-#line 523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp105_ < 0) {
-#line 2644 "ui.c"
-			const gchar* _tmp106_ = NULL;
-			const gchar* _tmp107_ = NULL;
-			gchar* _tmp108_ = NULL;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp106_ = path;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp107_ = extension;
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp108_ = g_strconcat (_tmp106_, _tmp107_, NULL);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp100_ = NULL;
+		gint _tmp101_ = 0;
+		gint _tmp102_ = 0;
+		const gchar* _tmp106_ = NULL;
+		GFile* _tmp107_ = NULL;
+		GFile* _tmp108_ = NULL;
+		gchar* _tmp109_ = NULL;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp91_ = file_type_view;
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp92_ = gtk_tree_view_get_selection (_tmp91_);
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp93_ = _g_object_ref0 (_tmp92_);
+#line 590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		selection = _tmp93_;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp94_ = selection;
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp95_ = user_interface_get_selected_extension (self, _tmp94_);
+#line 591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		extension = _tmp95_;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp96_ = self->priv->save_dialog;
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp97_ = gtk_file_chooser_get_filename ((GtkFileChooser*) _tmp96_);
+#line 593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		path = _tmp97_;
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp98_ = path;
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp99_ = g_path_get_basename (_tmp98_);
+#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		filename = _tmp99_;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp100_ = filename;
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp101_ = string_last_index_of_char (_tmp100_, (gunichar) '.', 0);
+#line 596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		extension_index = _tmp101_;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp102_ = extension_index;
+#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp102_ < 0) {
+#line 2771 "ui.c"
+			const gchar* _tmp103_ = NULL;
+			const gchar* _tmp104_ = NULL;
+			gchar* _tmp105_ = NULL;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp103_ = path;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp104_ = extension;
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp105_ = g_strconcat (_tmp103_, _tmp104_, NULL);
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (path);
-#line 524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			path = _tmp108_;
-#line 2658 "ui.c"
+#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			path = _tmp105_;
+#line 2785 "ui.c"
 		}
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp109_ = path;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp110_ = g_file_new_for_path (_tmp109_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp111_ = _tmp110_;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp112_ = g_file_get_uri (_tmp111_);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp106_ = path;
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp107_ = g_file_new_for_path (_tmp106_);
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp108_ = _tmp107_;
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp109_ = g_file_get_uri (_tmp108_);
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp112_;
-#line 526 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (_tmp111_);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		uri = _tmp109_;
+#line 600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_tmp108_);
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (extension);
-#line 514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (selection);
-#line 2682 "ui.c"
-	}
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp113_ = self->priv->settings;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp114_ = self->priv->save_dialog;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp115_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp114_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp116_ = _tmp115_;
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_settings_set_string (_tmp113_, "save-directory", _tmp116_);
-#line 529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (_tmp116_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp117_ = file_type_view;
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp118_ = gtk_tree_view_get_selection (_tmp117_);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_TREE_SELECTION, &_tmp119_, NULL, FALSE);
-#line 531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp118_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp119_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp120_ = self->priv->save_dialog;
-#line 532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp120_);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2809 "ui.c"
+	}
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp110_ = self->priv->settings;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp111_ = self->priv->save_dialog;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp112_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp111_);
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp113_ = _tmp112_;
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_settings_set_string (_tmp110_, "save-directory", _tmp113_);
+#line 603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (_tmp113_);
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp114_ = file_type_view;
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp115_ = gtk_tree_view_get_selection (_tmp114_);
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("changed", GTK_TYPE_TREE_SELECTION, &_tmp116_, NULL, FALSE);
+#line 605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp115_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp116_, 0, NULL, (GCallback) _user_interface_on_file_type_changed_gtk_tree_selection_changed, self);
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp117_ = self->priv->save_dialog;
+#line 606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp117_);
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_dialog = NULL;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = uri;
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (column);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_view);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file_type_store);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (default_extension);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (expander);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (filter);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (directory);
-#line 535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 2730 "ui.c"
+#line 2857 "ui.c"
 }
 
 
@@ -2735,216 +2862,210 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	gchar* uri = NULL;
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp7_ = NULL;
+	const gchar* _tmp6_ = NULL;
 	GFile* file = NULL;
-	const gchar* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
+	const gchar* _tmp7_ = NULL;
+	GFile* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
 	gchar* uri_lower = NULL;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	const gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
 	gchar* format = NULL;
-	gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	const gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	Book* _tmp42_ = NULL;
+	gchar* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	const gchar* _tmp38_ = NULL;
+	gchar* _tmp39_ = NULL;
+	Book* _tmp40_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_uri;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ != NULL) {
-#line 2762 "ui.c"
+#line 2888 "ui.c"
 		gboolean _tmp2_ = FALSE;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = force_choose_location;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = !_tmp2_;
-#line 2768 "ui.c"
+#line 2894 "ui.c"
 	} else {
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = FALSE;
-#line 2772 "ui.c"
+#line 2898 "ui.c"
 	}
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = _tmp0_;
-#line 541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp3_) {
-#line 2778 "ui.c"
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->book_uri;
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = g_strdup (_tmp4_);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 2902 "ui.c"
+		const gchar* _tmp3_ = NULL;
+		gchar* _tmp4_ = NULL;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = self->priv->book_uri;
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = g_strdup (_tmp3_);
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp5_;
-#line 2789 "ui.c"
+#line 616 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		uri = _tmp4_;
+#line 2913 "ui.c"
 	} else {
-		gchar* _tmp6_ = NULL;
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = user_interface_choose_file_location (self);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gchar* _tmp5_ = NULL;
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = user_interface_choose_file_location (self);
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		uri = _tmp6_;
-#line 2798 "ui.c"
+#line 618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		uri = _tmp5_;
+#line 2922 "ui.c"
 	}
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = uri;
-#line 545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp7_ == NULL) {
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = uri;
+#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp6_ == NULL) {
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2810 "ui.c"
-	}
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = uri;
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = g_file_new_for_uri (_tmp8_);
-#line 548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	file = _tmp9_;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2934 "ui.c"
+	}
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = uri;
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = g_file_new_for_uri (_tmp7_);
+#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	file = _tmp8_;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = uri;
+#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:624: Saving to '%s'", _tmp9_);
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = uri;
-#line 550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:550: Saving to '%s'", _tmp10_);
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = uri;
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) (-1));
-#line 552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	uri_lower = _tmp12_;
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = g_strdup ("jpeg");
-#line 553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	format = _tmp13_;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = uri_lower;
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = g_str_has_suffix (_tmp14_, ".pdf");
-#line 554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp15_) {
-#line 2838 "ui.c"
-		gchar* _tmp16_ = NULL;
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp16_ = g_strdup ("pdf");
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = g_utf8_strdown (_tmp10_, (gssize) (-1));
+#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	uri_lower = _tmp11_;
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = g_strdup ("jpeg");
+#line 627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	format = _tmp12_;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = uri_lower;
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = g_str_has_suffix (_tmp13_, ".pdf");
+#line 628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp14_) {
+#line 2962 "ui.c"
+		gchar* _tmp15_ = NULL;
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = g_strdup ("pdf");
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		format = _tmp16_;
-#line 2846 "ui.c"
+#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		format = _tmp15_;
+#line 2970 "ui.c"
 	} else {
-		const gchar* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = uri_lower;
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp18_ = g_str_has_suffix (_tmp17_, ".ps");
-#line 556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp18_) {
-#line 2856 "ui.c"
-			gchar* _tmp19_ = NULL;
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp19_ = g_strdup ("ps");
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp16_ = NULL;
+		gboolean _tmp17_ = FALSE;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = uri_lower;
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp17_ = g_str_has_suffix (_tmp16_, ".ps");
+#line 630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp17_) {
+#line 2980 "ui.c"
+			gchar* _tmp18_ = NULL;
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp18_ = g_strdup ("ps");
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_free0 (format);
-#line 557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			format = _tmp19_;
-#line 2864 "ui.c"
+#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			format = _tmp18_;
+#line 2988 "ui.c"
 		} else {
-			const gchar* _tmp20_ = NULL;
-			gboolean _tmp21_ = FALSE;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp20_ = uri_lower;
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp21_ = g_str_has_suffix (_tmp20_, ".png");
-#line 558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp21_) {
-#line 2874 "ui.c"
-				gchar* _tmp22_ = NULL;
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp22_ = g_strdup ("png");
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			const gchar* _tmp19_ = NULL;
+			gboolean _tmp20_ = FALSE;
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp19_ = uri_lower;
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp20_ = g_str_has_suffix (_tmp19_, ".png");
+#line 632 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_tmp20_) {
+#line 2998 "ui.c"
+				gchar* _tmp21_ = NULL;
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp21_ = g_strdup ("png");
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (format);
-#line 559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				format = _tmp22_;
-#line 2882 "ui.c"
+#line 633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				format = _tmp21_;
+#line 3006 "ui.c"
 			} else {
-				gboolean _tmp23_ = FALSE;
-				const gchar* _tmp24_ = NULL;
-				gboolean _tmp25_ = FALSE;
-				gboolean _tmp28_ = FALSE;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp24_ = uri_lower;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp25_ = g_str_has_suffix (_tmp24_, ".tif");
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp25_) {
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp23_ = TRUE;
-#line 2896 "ui.c"
+				gboolean _tmp22_ = FALSE;
+				const gchar* _tmp23_ = NULL;
+				gboolean _tmp24_ = FALSE;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp23_ = uri_lower;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp24_ = g_str_has_suffix (_tmp23_, ".tif");
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp24_) {
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp22_ = TRUE;
+#line 3019 "ui.c"
 				} else {
-					const gchar* _tmp26_ = NULL;
-					gboolean _tmp27_ = FALSE;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp26_ = uri_lower;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp27_ = g_str_has_suffix (_tmp26_, ".tiff");
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp23_ = _tmp27_;
-#line 2906 "ui.c"
+					const gchar* _tmp25_ = NULL;
+					gboolean _tmp26_ = FALSE;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp25_ = uri_lower;
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp26_ = g_str_has_suffix (_tmp25_, ".tiff");
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp22_ = _tmp26_;
+#line 3029 "ui.c"
 				}
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp28_ = _tmp23_;
-#line 560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp28_) {
-#line 2912 "ui.c"
-					gchar* _tmp29_ = NULL;
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp29_ = g_strdup ("tiff");
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp22_) {
+#line 3033 "ui.c"
+					gchar* _tmp27_ = NULL;
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp27_ = g_strdup ("tiff");
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (format);
-#line 561 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					format = _tmp29_;
-#line 2920 "ui.c"
+#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					format = _tmp27_;
+#line 3041 "ui.c"
 				}
 			}
 		}
 	}
-#line 563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_progress_dialog (self);
-#line 2927 "ui.c"
+#line 3048 "ui.c"
 	{
-		Book* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gint _tmp32_ = 0;
-		gint _tmp33_ = 0;
-		GFile* _tmp34_ = NULL;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp30_ = self->priv->_book;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp31_ = format;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp32_ = user_interface_get_quality (self);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp33_ = _tmp32_;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp34_ = file;
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		book_save (_tmp30_, _tmp31_, _tmp33_, _tmp34_, &_inner_error_);
-#line 566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		Book* _tmp28_ = NULL;
+		const gchar* _tmp29_ = NULL;
+		gint _tmp30_ = 0;
+		gint _tmp31_ = 0;
+		GFile* _tmp32_ = NULL;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp28_ = self->priv->_book;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp29_ = format;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp30_ = user_interface_get_quality (self);
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp31_ = _tmp30_;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp32_ = file;
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		book_save (_tmp28_, _tmp29_, _tmp31_, _tmp32_, &_inner_error_);
+#line 640 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 2948 "ui.c"
+#line 3069 "ui.c"
 			goto __catch16_g_error;
 		}
 	}
@@ -2952,91 +3073,91 @@ static gboolean user_interface_save_document (UserInterface* self, gboolean forc
 	__catch16_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp35_ = NULL;
-		const gchar* _tmp36_ = NULL;
+		GError* _tmp33_ = NULL;
+		const gchar* _tmp34_ = NULL;
+		const gchar* _tmp35_ = NULL;
+		GError* _tmp36_ = NULL;
 		const gchar* _tmp37_ = NULL;
-		GError* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 644 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_hide_progress_dialog (self);
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp35_ = e;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp36_ = _tmp35_->message;
-#line 571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:571: Error saving file: %s", _tmp36_);
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp37_ = _ ("Failed to save file");
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp38_ = e;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp39_ = _tmp38_->message;
-#line 572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error (self, _tmp37_, _tmp39_, FALSE);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp33_ = e;
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp34_ = _tmp33_->message;
+#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:645: Error saving file: %s", _tmp34_);
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp35_ = _ ("Failed to save file");
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp36_ = e;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp37_ = _tmp36_->message;
+#line 646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_show_error (self, _tmp35_, _tmp37_, FALSE);
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 2995 "ui.c"
+#line 3116 "ui.c"
 	}
 	__finally16:
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (format);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri_lower);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (uri);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return FALSE;
-#line 3014 "ui.c"
+#line 3135 "ui.c"
 	}
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = uri;
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = g_strdup (_tmp40_);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = uri;
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = g_strdup (_tmp38_);
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_uri = _tmp41_;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = self->priv->_book;
-#line 580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	book_set_needs_saving (_tmp42_, FALSE);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_uri = _tmp39_;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp40_ = self->priv->_book;
+#line 654 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_set_needs_saving (_tmp40_, FALSE);
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (format);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri_lower);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (uri);
-#line 581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3040 "ui.c"
+#line 3161 "ui.c"
 }
 
 
@@ -3046,145 +3167,142 @@ static gboolean user_interface_prompt_to_save (UserInterface* self, const gchar*
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	GtkMessageDialog* dialog = NULL;
-	GtkApplicationWindow* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	GtkMessageDialog* _tmp4_ = NULL;
 	GtkMessageDialog* _tmp5_ = NULL;
-	GtkMessageDialog* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GtkMessageDialog* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	GtkMessageDialog* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	GtkMessageDialog* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	GtkMessageDialog* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	GtkMessageDialog* _tmp9_ = NULL;
+	const gchar* _tmp10_ = NULL;
+	GtkMessageDialog* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
 	gint response = 0;
-	GtkMessageDialog* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	GtkMessageDialog* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkMessageDialog* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	GtkMessageDialog* _tmp15_ = NULL;
+	gint _tmp16_ = 0;
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, FALSE);
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (discard_label != NULL, FALSE);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_get_needs_saving (_tmp0_);
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3084 "ui.c"
-	}
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->window;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = title;
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) _tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp4_);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp5_);
-#line 589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dialog = _tmp5_;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = dialog;
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = _ ("If you don't save, changes will be permanently lost.");
-#line 594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_message_dialog_format_secondary_text (_tmp6_, "%s", _tmp7_);
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = dialog;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = discard_label;
-#line 597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp8_, _tmp9_, (gint) GTK_RESPONSE_NO);
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = dialog;
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp11_ = _ ("_Cancel");
-#line 598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp10_, _tmp11_, (gint) GTK_RESPONSE_CANCEL);
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = dialog;
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = _ ("_Save");
-#line 599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_dialog_add_button ((GtkDialog*) _tmp12_, _tmp13_, (gint) GTK_RESPONSE_YES);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = dialog;
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = gtk_dialog_run ((GtkDialog*) _tmp14_);
-#line 601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	response = _tmp15_;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = dialog;
-#line 602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp16_);
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = response;
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	switch (_tmp17_) {
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 3204 "ui.c"
+	}
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = title;
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new ((GtkWindow*) self, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp3_);
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp4_);
+#line 663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dialog = _tmp4_;
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = dialog;
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = _ ("If you don't save, changes will be permanently lost.");
+#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_message_dialog_format_secondary_text (_tmp5_, "%s", _tmp6_);
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = dialog;
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = discard_label;
+#line 671 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp7_, _tmp8_, (gint) GTK_RESPONSE_NO);
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = dialog;
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = _ ("_Cancel");
+#line 672 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp9_, _tmp10_, (gint) GTK_RESPONSE_CANCEL);
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = dialog;
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = _ ("_Save");
+#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_dialog_add_button ((GtkDialog*) _tmp11_, _tmp12_, (gint) GTK_RESPONSE_YES);
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = dialog;
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = gtk_dialog_run ((GtkDialog*) _tmp13_);
+#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	response = _tmp14_;
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = dialog;
+#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _tmp15_);
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = response;
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (_tmp16_) {
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_YES:
-#line 3136 "ui.c"
+#line 3254 "ui.c"
 		{
-			gboolean _tmp18_ = FALSE;
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp18_ = user_interface_save_document (self, FALSE);
-#line 607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp18_) {
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gboolean _tmp17_ = FALSE;
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp17_ = user_interface_save_document (self, FALSE);
+#line 681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_tmp17_) {
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = TRUE;
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3149 "ui.c"
+#line 3267 "ui.c"
 			} else {
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				result = FALSE;
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_object_unref0 (dialog);
-#line 610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				return result;
-#line 3157 "ui.c"
+#line 3275 "ui.c"
 			}
 		}
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_CANCEL:
-#line 3162 "ui.c"
+#line 3280 "ui.c"
 		{
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = FALSE;
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 612 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3170 "ui.c"
+#line 3288 "ui.c"
 		}
 		default:
-#line 604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case GTK_RESPONSE_NO:
-#line 3175 "ui.c"
+#line 3293 "ui.c"
 		{
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			result = TRUE;
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_g_object_unref0 (dialog);
-#line 615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 689 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			return result;
-#line 3183 "ui.c"
+#line 3301 "ui.c"
 		}
 	}
-#line 584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (dialog);
-#line 3188 "ui.c"
+#line 3306 "ui.c"
 }
 
 
@@ -3193,31 +3311,31 @@ static void user_interface_clear_document (UserInterface* self) {
 	Book* _tmp1_ = NULL;
 	GtkMenuItem* _tmp2_ = NULL;
 	GtkMenuItem* _tmp3_ = NULL;
-#line 619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_clear (_tmp0_);
-#line 622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_add_default_page (self);
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_set_needs_saving (_tmp1_, FALSE);
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->save_as_menuitem;
-#line 625 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 699 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp2_, FALSE);
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->copy_to_clipboard_menuitem;
-#line 626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE);
-#line 3221 "ui.c"
+#line 3339 "ui.c"
 }
 
 
@@ -3227,53 +3345,60 @@ static void user_interface_new_document (UserInterface* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save current document?");
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Discard Changes");
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 635 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 709 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 3243 "ui.c"
+#line 3361 "ui.c"
 	}
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = user_interface_get_scanning (self);
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _tmp3_;
-#line 637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 711 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_) {
-#line 638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3253 "ui.c"
+#line 3371 "ui.c"
 	}
-#line 639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_clear_document (self);
-#line 3257 "ui.c"
+#line 3375 "ui.c"
 }
 
 
-void G_MODULE_EXPORT new_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void user_interface_new_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3268 "ui.c"
+#line 3386 "ui.c"
+}
+
+
+static void _user_interface_new_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_new_button_clicked_cb ((UserInterface*) self, _sender);
+#line 3393 "ui.c"
 }
 
 
 void user_interface_new_document_activate_cb (UserInterface* self) {
-#line 648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_new_document (self);
-#line 3277 "ui.c"
+#line 3402 "ui.c"
 }
 
 
@@ -3281,186 +3406,213 @@ static void user_interface_set_document_hint (UserInterface* self, const gchar*
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	gboolean _tmp8_ = FALSE;
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp10_ = FALSE;
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 727 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (document_hint != NULL);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = document_hint;
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp1_;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = document_hint;
-#line 657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp2_, "text") == 0) {
-#line 3302 "ui.c"
+#line 3427 "ui.c"
 		GtkRadioMenuItem* _tmp3_ = NULL;
 		GtkRadioMenuItem* _tmp4_ = NULL;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->text_toolbar_menuitem;
-#line 659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GtkRadioMenuItem* _tmp5_ = NULL;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = self->priv->text_button_menuitem;
+#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp3_, TRUE);
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->text_menu_menuitem;
-#line 660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = self->priv->text_button_hb_menuitem;
+#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
-#line 3313 "ui.c"
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = self->priv->text_menuitem;
+#line 735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
+#line 3443 "ui.c"
 	} else {
-		const gchar* _tmp5_ = NULL;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = document_hint;
-#line 662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (g_strcmp0 (_tmp5_, "photo") == 0) {
-#line 3320 "ui.c"
-			GtkRadioMenuItem* _tmp6_ = NULL;
+		const gchar* _tmp6_ = NULL;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = document_hint;
+#line 737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (g_strcmp0 (_tmp6_, "photo") == 0) {
+#line 3450 "ui.c"
 			GtkRadioMenuItem* _tmp7_ = NULL;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp6_ = self->priv->photo_toolbar_menuitem;
-#line 664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp6_, TRUE);
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp7_ = self->priv->photo_menu_menuitem;
-#line 665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			GtkRadioMenuItem* _tmp8_ = NULL;
+			GtkRadioMenuItem* _tmp9_ = NULL;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp7_ = self->priv->photo_button_menuitem;
+#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp7_, TRUE);
-#line 3331 "ui.c"
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp8_ = self->priv->photo_button_hb_menuitem;
+#line 740 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp8_, TRUE);
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp9_ = self->priv->photo_menuitem;
+#line 741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
+#line 3466 "ui.c"
 		}
 	}
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = save;
-#line 668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp8_) {
-#line 3338 "ui.c"
-		GSettings* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = self->priv->settings;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = document_hint;
-#line 669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_settings_set_string (_tmp9_, "document-type", _tmp10_);
-#line 3347 "ui.c"
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = save;
+#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp10_) {
+#line 3473 "ui.c"
+		GSettings* _tmp11_ = NULL;
+		const gchar* _tmp12_ = NULL;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = self->priv->settings;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = document_hint;
+#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_settings_set_string (_tmp11_, "document-type", _tmp12_);
+#line 3482 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT text_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void user_interface_text_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 749 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 676 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "text", TRUE);
-#line 3367 "ui.c"
+#line 3505 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT photo_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_text_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 3513 "ui.c"
+}
+
+
+static void user_interface_photo_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 682 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_document_hint (self, "photo", TRUE);
-#line 3387 "ui.c"
+#line 3535 "ui.c"
 	}
 }
 
 
+static void _user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_photo_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 3543 "ui.c"
+}
+
+
 static void user_interface_set_page_side (UserInterface* self, ScanType page_side) {
 	GtkTreeIter iter = {0};
 	GtkListStore* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_model;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3407 "ui.c"
+#line 3562 "ui.c"
 		{
 			gboolean _tmp3_ = FALSE;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = TRUE;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			while (TRUE) {
-#line 3414 "ui.c"
-				gboolean _tmp4_ = FALSE;
+#line 3569 "ui.c"
 				gint s = 0;
-				GtkListStore* _tmp7_ = NULL;
-				GtkTreeIter _tmp8_ = {0};
-				gint _tmp9_ = 0;
-				ScanType _tmp10_ = 0;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp4_ = _tmp3_;
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (!_tmp4_) {
-#line 3425 "ui.c"
-					GtkListStore* _tmp5_ = NULL;
-					gboolean _tmp6_ = FALSE;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp5_ = self->priv->page_side_model;
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (!_tmp6_) {
-#line 703 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				GtkListStore* _tmp6_ = NULL;
+				GtkTreeIter _tmp7_ = {0};
+				gint _tmp8_ = 0;
+				ScanType _tmp9_ = 0;
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!_tmp3_) {
+#line 3577 "ui.c"
+					GtkListStore* _tmp4_ = NULL;
+					gboolean _tmp5_ = FALSE;
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp4_ = self->priv->page_side_model;
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (!_tmp5_) {
+#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						break;
-#line 3436 "ui.c"
+#line 3588 "ui.c"
 					}
 				}
-#line 694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_tmp3_ = FALSE;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp7_ = self->priv->page_side_model;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp8_ = iter;
-#line 697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &s, -1, -1);
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp9_ = s;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp10_ = page_side;
-#line 698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp9_ == ((gint) _tmp10_)) {
-#line 3453 "ui.c"
-					GtkComboBox* _tmp11_ = NULL;
-					GtkTreeIter _tmp12_ = {0};
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp11_ = self->priv->page_side_combo;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp12_ = iter;
-#line 700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_combo_box_set_active_iter (_tmp11_, &_tmp12_);
-#line 701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp6_ = self->priv->page_side_model;
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp7_ = iter;
+#line 771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_tree_model_get ((GtkTreeModel*) _tmp6_, &_tmp7_, 0, &s, -1, -1);
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp8_ = s;
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp9_ = page_side;
+#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp8_ == ((gint) _tmp9_)) {
+#line 3605 "ui.c"
+					GtkComboBox* _tmp10_ = NULL;
+					GtkTreeIter _tmp11_ = {0};
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp10_ = self->priv->page_side_combo;
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp11_ = iter;
+#line 774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_combo_box_set_active_iter (_tmp10_, &_tmp11_);
+#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					return;
-#line 3464 "ui.c"
+#line 3616 "ui.c"
 				}
 			}
 		}
@@ -3471,133 +3623,127 @@ static void user_interface_set_page_side (UserInterface* self, ScanType page_sid
 static void user_interface_set_paper_size (UserInterface* self, gint width, gint height) {
 	GtkTreeIter iter = {0};
 	gboolean have_iter = FALSE;
-	gboolean _tmp16_ = FALSE;
-	gboolean _tmp20_ = FALSE;
-#line 707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp14_ = FALSE;
+	gboolean _tmp18_ = FALSE;
+#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 3479 "ui.c"
+#line 3631 "ui.c"
 	{
 		GtkListStore* _tmp0_ = NULL;
 		GtkTreeIter _tmp1_ = {0};
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = self->priv->paper_size_model;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp0_, &_tmp1_);
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		iter = _tmp1_;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		have_iter = _tmp2_;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = TRUE;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		while (TRUE) {
-#line 3497 "ui.c"
-			gboolean _tmp4_ = FALSE;
-			gboolean _tmp7_ = FALSE;
+#line 3649 "ui.c"
+			gboolean _tmp6_ = FALSE;
 			gint w = 0;
 			gint h = 0;
-			GtkListStore* _tmp8_ = NULL;
-			GtkTreeIter _tmp9_ = {0};
-			gboolean _tmp10_ = FALSE;
+			GtkListStore* _tmp7_ = NULL;
+			GtkTreeIter _tmp8_ = {0};
+			gboolean _tmp9_ = FALSE;
+			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-			gint _tmp12_ = 0;
-			gboolean _tmp15_ = FALSE;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp4_ = _tmp3_;
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (!_tmp4_) {
-#line 3512 "ui.c"
-				GtkListStore* _tmp5_ = NULL;
-				gboolean _tmp6_ = FALSE;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp5_ = self->priv->paper_size_model;
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp6_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp5_, &iter);
-#line 714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				have_iter = _tmp6_;
-#line 3521 "ui.c"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (!_tmp3_) {
+#line 3660 "ui.c"
+				GtkListStore* _tmp4_ = NULL;
+				gboolean _tmp5_ = FALSE;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp4_ = self->priv->paper_size_model;
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp5_ = gtk_tree_model_iter_next ((GtkTreeModel*) _tmp4_, &iter);
+#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				have_iter = _tmp5_;
+#line 3669 "ui.c"
 			}
-#line 712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp3_ = FALSE;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp7_ = have_iter;
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (!_tmp7_) {
-#line 713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp6_ = have_iter;
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (!_tmp6_) {
+#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3531 "ui.c"
+#line 3679 "ui.c"
 			}
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp8_ = self->priv->paper_size_model;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp9_ = iter;
-#line 717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_tree_model_get ((GtkTreeModel*) _tmp8_, &_tmp9_, 0, &w, 1, &h, -1, -1);
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp11_ = w;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp12_ = width;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp11_ == _tmp12_) {
-#line 3545 "ui.c"
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp7_ = self->priv->paper_size_model;
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp8_ = iter;
+#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_tree_model_get ((GtkTreeModel*) _tmp7_, &_tmp8_, 0, &w, 1, &h, -1, -1);
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp10_ = w;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp11_ = width;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_tmp10_ == _tmp11_) {
+#line 3693 "ui.c"
+				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
-				gint _tmp14_ = 0;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp13_ = h;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp14_ = height;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp10_ = _tmp13_ == _tmp14_;
-#line 3554 "ui.c"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp12_ = h;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp13_ = height;
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp9_ = _tmp12_ == _tmp13_;
+#line 3702 "ui.c"
 			} else {
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp10_ = FALSE;
-#line 3558 "ui.c"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp9_ = FALSE;
+#line 3706 "ui.c"
 			}
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp15_ = _tmp10_;
-#line 718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_tmp15_) {
-#line 719 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (_tmp9_) {
+#line 793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 3566 "ui.c"
+#line 3712 "ui.c"
 			}
 		}
 	}
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = have_iter;
-#line 722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!_tmp16_) {
-#line 3574 "ui.c"
-		GtkListStore* _tmp17_ = NULL;
-		GtkTreeIter _tmp18_ = {0};
-		gboolean _tmp19_ = FALSE;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp17_ = self->priv->paper_size_model;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp19_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp17_, &_tmp18_);
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp18_;
-#line 723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		have_iter = _tmp19_;
-#line 3586 "ui.c"
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = have_iter;
+#line 796 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp14_) {
+#line 3720 "ui.c"
+		GtkListStore* _tmp15_ = NULL;
+		GtkTreeIter _tmp16_ = {0};
+		gboolean _tmp17_ = FALSE;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = self->priv->paper_size_model;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp17_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp15_, &_tmp16_);
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		iter = _tmp16_;
+#line 797 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		have_iter = _tmp17_;
+#line 3732 "ui.c"
 	}
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = have_iter;
-#line 724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp20_) {
-#line 3592 "ui.c"
-		GtkComboBox* _tmp21_ = NULL;
-		GtkTreeIter _tmp22_ = {0};
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp21_ = self->priv->paper_size_combo;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp22_ = iter;
-#line 725 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_combo_box_set_active_iter (_tmp21_, &_tmp22_);
-#line 3601 "ui.c"
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = have_iter;
+#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp18_) {
+#line 3738 "ui.c"
+		GtkComboBox* _tmp19_ = NULL;
+		GtkTreeIter _tmp20_ = {0};
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp19_ = self->priv->paper_size_combo;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp20_ = iter;
+#line 799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_combo_box_set_active_iter (_tmp19_, &_tmp20_);
+#line 3747 "ui.c"
 	}
 }
 
@@ -3609,34 +3755,34 @@ static gint user_interface_get_text_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->text_dpi_combo;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3625 "ui.c"
+#line 3771 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->text_dpi_model;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3634 "ui.c"
+#line 3780 "ui.c"
 	}
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3640 "ui.c"
+#line 3786 "ui.c"
 }
 
 
@@ -3647,34 +3793,34 @@ static gint user_interface_get_photo_dpi (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->photo_dpi_combo;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3663 "ui.c"
+#line 3809 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->photo_dpi_model;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &dpi, -1, -1);
-#line 3672 "ui.c"
+#line 3818 "ui.c"
 	}
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = dpi;
-#line 747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3678 "ui.c"
+#line 3824 "ui.c"
 }
 
 
@@ -3686,36 +3832,36 @@ static ScanType user_interface_get_page_side (UserInterface* self) {
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	gint _tmp5_ = 0;
-#line 750 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 753 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_side = (gint) SCAN_TYPE_ADF_BOTH;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->page_side_combo;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 3702 "ui.c"
+#line 3848 "ui.c"
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->page_side_model;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &page_side, -1, -1);
-#line 3711 "ui.c"
+#line 3857 "ui.c"
 	}
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page_side;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = (ScanType) _tmp5_;
-#line 758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3719 "ui.c"
+#line 3865 "ui.c"
 }
 
 
@@ -3728,66 +3874,66 @@ static gboolean user_interface_get_paper_size (UserInterface* self, gint* width,
 	GtkComboBox* _tmp1_ = NULL;
 	GtkTreeIter _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_height = 0;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _vala_height;
-#line 765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_vala_width = _tmp0_;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->paper_size_combo;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_);
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp2_;
-#line 766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp3_) {
-#line 3748 "ui.c"
+#line 3894 "ui.c"
 		GtkListStore* _tmp4_ = NULL;
 		GtkTreeIter _tmp5_ = {0};
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = self->priv->paper_size_model;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = iter;
-#line 768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp4_, &_tmp5_, 0, &_vala_width, 1, &_vala_height, -1, -1);
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = TRUE;
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (width) {
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*width = _vala_width;
-#line 3763 "ui.c"
+#line 3909 "ui.c"
 		}
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (height) {
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			*height = _vala_height;
-#line 3769 "ui.c"
+#line 3915 "ui.c"
 		}
-#line 769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 843 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 3773 "ui.c"
+#line 3919 "ui.c"
 	}
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (width) {
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*width = _vala_width;
-#line 3781 "ui.c"
+#line 3927 "ui.c"
 	}
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (height) {
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		*height = _vala_height;
-#line 3787 "ui.c"
+#line 3933 "ui.c"
 	}
-#line 772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3791 "ui.c"
+#line 3937 "ui.c"
 }
 
 
@@ -3806,150 +3952,164 @@ static ScanOptions* user_interface_make_scan_options (UserInterface* self) {
 	ScanOptions* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
-#line 775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = scan_options_new ();
-#line 777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->document_hint;
-#line 778 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (g_strcmp0 (_tmp1_, "text") == 0) {
-#line 3820 "ui.c"
+#line 3966 "ui.c"
 		ScanOptions* _tmp2_ = NULL;
 		ScanOptions* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		ScanOptions* _tmp5_ = NULL;
-#line 780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = options;
-#line 780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_->scan_mode = SCAN_MODE_GRAY;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_text_dpi (self);
-#line 781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 855 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->dpi = _tmp4_;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = options;
-#line 782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_->depth = 2;
-#line 3839 "ui.c"
+#line 3985 "ui.c"
 	} else {
 		ScanOptions* _tmp6_ = NULL;
 		ScanOptions* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		ScanOptions* _tmp9_ = NULL;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = options;
-#line 786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_->scan_mode = SCAN_MODE_COLOR;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = options;
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = user_interface_get_photo_dpi (self);
-#line 787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_->dpi = _tmp8_;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = options;
-#line 788 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 862 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_->depth = 8;
-#line 3859 "ui.c"
+#line 4005 "ui.c"
 	}
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = options;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = options;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp12_, &_tmp13_);
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_->paper_width = _tmp12_;
-#line 790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_->paper_height = _tmp13_;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = options;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_get_brightness (self);
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = _tmp15_;
-#line 791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_->brightness = _tmp16_;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = options;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_get_contrast (self);
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = _tmp18_;
-#line 792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_->contrast = _tmp19_;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = options;
-#line 794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 3891 "ui.c"
+#line 4037 "ui.c"
 }
 
 
-void G_MODULE_EXPORT scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	ScanOptions* options = NULL;
 	ScanOptions* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_make_scan_options (self);
-#line 800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 874 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options = _tmp0_;
-#line 801 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	options->type = SCAN_TYPE_SINGLE;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_selected_device (self);
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "start-scan", _tmp3_, options);
-#line 802 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp3_);
-#line 798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_options_unref0 (options);
-#line 3923 "ui.c"
+#line 4069 "ui.c"
 }
 
 
-void G_MODULE_EXPORT stop_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void _user_interface_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_scan_button_clicked_cb ((UserInterface*) self, _sender);
+#line 4076 "ui.c"
+}
+
+
+static void user_interface_stop_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "stop-scan");
-#line 3934 "ui.c"
+#line 4087 "ui.c"
 }
 
 
-void G_MODULE_EXPORT continuous_scan_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void _user_interface_stop_scan_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_stop_scan_button_clicked_cb ((UserInterface*) self, _sender);
+#line 4094 "ui.c"
+}
+
+
+static void user_interface_continuous_scan_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_scanning (self);
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_) {
-#line 815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "stop-scan");
-#line 3953 "ui.c"
+#line 4113 "ui.c"
 	} else {
 		ScanOptions* options = NULL;
 		ScanOptions* _tmp2_ = NULL;
@@ -3959,93 +4119,125 @@ void G_MODULE_EXPORT continuous_scan_button_clicked_cb (GtkWidget* widget, UserI
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		ScanOptions* _tmp8_ = NULL;
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = user_interface_make_scan_options (self);
-#line 818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		options = _tmp2_;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = options;
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = user_interface_get_page_side (self);
-#line 819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_->type = _tmp4_;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_selected_device (self);
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = options;
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_signal_emit_by_name (self, "start-scan", _tmp7_, _tmp8_);
-#line 820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_scan_options_unref0 (options);
-#line 3987 "ui.c"
+#line 4147 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT preferences_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void _user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_continuous_scan_button_clicked_cb ((UserInterface*) self, _sender);
+#line 4155 "ui.c"
+}
+
+
+static void user_interface_preferences_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	GtkDialog* _tmp0_ = NULL;
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4002 "ui.c"
+#line 4169 "ui.c"
+}
+
+
+static void _user_interface_preferences_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_preferences_button_clicked_cb ((UserInterface*) self, _sender);
+#line 4176 "ui.c"
 }
 
 
 void user_interface_preferences_activate_cb (UserInterface* self) {
 	GtkDialog* _tmp0_ = NULL;
-#line 830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_present ((GtkWindow*) _tmp0_);
-#line 4014 "ui.c"
+#line 4188 "ui.c"
 }
 
 
-gboolean G_MODULE_EXPORT preferences_dialog_delete_event_cb (GtkWidget* widget, UserInterface* self) {
+static gboolean user_interface_preferences_dialog_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 838 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 912 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 4028 "ui.c"
+#line 4204 "ui.c"
+}
+
+
+static gboolean _user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+	gboolean result;
+	result = user_interface_preferences_dialog_delete_event_cb ((UserInterface*) self, _sender, event);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 4213 "ui.c"
 }
 
 
-void G_MODULE_EXPORT preferences_dialog_response_cb (GtkWidget* widget, gint response_id, UserInterface* self) {
+static void user_interface_preferences_dialog_response_cb (UserInterface* self, GtkWidget* widget, gint response_id) {
 	GtkDialog* _tmp0_ = NULL;
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 916 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->preferences_dialog;
-#line 844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_hide ((GtkWidget*) _tmp0_);
-#line 4042 "ui.c"
+#line 918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
+#line 4227 "ui.c"
+}
+
+
+static void _user_interface_preferences_dialog_response_cb_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_preferences_dialog_response_cb ((UserInterface*) self, _sender, response_id);
+#line 4234 "ui.c"
 }
 
 
 static gpointer _page_ref0 (gpointer self) {
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? page_ref (self) : NULL;
-#line 4049 "ui.c"
+#line 4241 "ui.c"
 }
 
 
@@ -4056,34 +4248,34 @@ static void user_interface_update_page_menu (UserInterface* self) {
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 924 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 4076 "ui.c"
+#line 4268 "ui.c"
 		GtkMenuItem* _tmp5_ = NULL;
 		GtkMenuItem* _tmp6_ = NULL;
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = self->priv->page_move_left_menuitem;
-#line 852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE);
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = self->priv->page_move_right_menuitem;
-#line 853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 927 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, FALSE);
-#line 4087 "ui.c"
+#line 4279 "ui.c"
 	} else {
 		guint index = 0U;
 		Book* _tmp7_ = NULL;
@@ -4096,200 +4288,216 @@ static void user_interface_update_page_menu (UserInterface* self) {
 		Book* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = self->priv->_book;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = page;
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = book_get_page_index (_tmp7_, _tmp8_);
-#line 857 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 931 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		index = _tmp9_;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = self->priv->page_move_left_menuitem;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = index;
-#line 858 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp10_, _tmp11_ > ((guint) 0));
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = self->priv->page_move_right_menuitem;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = index;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = self->priv->_book;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_n_pages (_tmp14_);
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = _tmp15_;
-#line 859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 933 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, _tmp13_ < (_tmp16_ - 1));
-#line 4126 "ui.c"
+#line 4318 "ui.c"
 	}
-#line 847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 921 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4130 "ui.c"
+#line 4322 "ui.c"
 }
 
 
 static void user_interface_page_selected_cb (UserInterface* self, BookView* view, Page* page) {
 	Page* _tmp0_ = NULL;
-	gchar* name = NULL;
-	gchar* _tmp1_ = NULL;
-	Page* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
 	GtkRadioMenuItem* menuitem = NULL;
-	GtkBuilder* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	GObject* _tmp25_ = NULL;
-	GtkRadioMenuItem* _tmp26_ = NULL;
-	GtkRadioMenuItem* _tmp27_ = NULL;
-	GtkToggleToolButton* toolbutton = NULL;
-	GtkBuilder* _tmp28_ = NULL;
-	GObject* _tmp29_ = NULL;
-	GtkToggleToolButton* _tmp30_ = NULL;
-	GtkToggleToolButton* _tmp31_ = NULL;
-	Page* _tmp32_ = NULL;
-	gboolean _tmp33_ = FALSE;
+	GtkRadioMenuItem* _tmp1_ = NULL;
+	GtkRadioMenuItem* _tmp2_ = NULL;
+	Page* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+	gboolean _tmp5_ = FALSE;
+	GtkRadioMenuItem* _tmp31_ = NULL;
+	GtkToggleButton* _tmp32_ = NULL;
+	Page* _tmp33_ = NULL;
 	gboolean _tmp34_ = FALSE;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp35_ = FALSE;
+	GtkToggleToolButton* _tmp36_ = NULL;
+	Page* _tmp37_ = NULL;
+	gboolean _tmp38_ = FALSE;
+	gboolean _tmp39_ = FALSE;
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 865 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 939 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == NULL) {
-#line 866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 940 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4165 "ui.c"
+#line 4353 "ui.c"
 	}
-#line 868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = TRUE;
-#line 870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = g_strdup ("no_crop_menuitem");
-#line 872 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	name = _tmp1_;
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = page;
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = page_get_has_crop (_tmp2_);
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = _tmp3_;
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_) {
-#line 4183 "ui.c"
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = self->priv->no_crop_menuitem;
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	menuitem = _tmp2_;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = page;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = page_get_has_crop (_tmp3_);
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = _tmp4_;
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp5_) {
+#line 4373 "ui.c"
 		gchar* crop_name = NULL;
-		Page* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		Page* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = page;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = page_get_crop_name (_tmp5_);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = _tmp6_;
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = g_strdup (_tmp7_);
-#line 876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		crop_name = _tmp8_;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = crop_name;
-#line 877 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp9_ != NULL) {
-#line 4204 "ui.c"
-			const gchar* _tmp10_ = NULL;
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp10_ = crop_name;
-#line 879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (g_strcmp0 (_tmp10_, "A4") == 0) {
-#line 4210 "ui.c"
-				gchar* _tmp11_ = NULL;
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = g_strdup ("a4_menuitem");
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_g_free0 (name);
-#line 880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				name = _tmp11_;
-#line 4218 "ui.c"
+		const gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = page;
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = page_get_crop_name (_tmp6_);
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = _tmp7_;
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = g_strdup (_tmp8_);
+#line 949 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		crop_name = _tmp9_;
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = crop_name;
+#line 950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp10_ != NULL) {
+#line 4394 "ui.c"
+			const gchar* _tmp11_ = NULL;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp11_ = crop_name;
+#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			if (g_strcmp0 (_tmp11_, "A4") == 0) {
+#line 4400 "ui.c"
+				GtkRadioMenuItem* _tmp12_ = NULL;
+				GtkRadioMenuItem* _tmp13_ = NULL;
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp12_ = self->priv->a4_menuitem;
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp13_ = _g_object_ref0 (_tmp12_);
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_object_unref0 (menuitem);
+#line 953 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				menuitem = _tmp13_;
+#line 4411 "ui.c"
 			} else {
-				const gchar* _tmp12_ = NULL;
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp12_ = crop_name;
-#line 881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (g_strcmp0 (_tmp12_, "A5") == 0) {
-#line 4225 "ui.c"
-					gchar* _tmp13_ = NULL;
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp13_ = g_strdup ("a5_menuitem");
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_g_free0 (name);
-#line 882 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					name = _tmp13_;
-#line 4233 "ui.c"
+				const gchar* _tmp14_ = NULL;
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp14_ = crop_name;
+#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (g_strcmp0 (_tmp14_, "A5") == 0) {
+#line 4418 "ui.c"
+					GtkRadioMenuItem* _tmp15_ = NULL;
+					GtkRadioMenuItem* _tmp16_ = NULL;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp15_ = self->priv->a5_menuitem;
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp16_ = _g_object_ref0 (_tmp15_);
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_g_object_unref0 (menuitem);
+#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					menuitem = _tmp16_;
+#line 4429 "ui.c"
 				} else {
-					const gchar* _tmp14_ = NULL;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp14_ = crop_name;
-#line 883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (g_strcmp0 (_tmp14_, "A6") == 0) {
-#line 4240 "ui.c"
-						gchar* _tmp15_ = NULL;
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp15_ = g_strdup ("a6_menuitem");
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_g_free0 (name);
-#line 884 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						name = _tmp15_;
-#line 4248 "ui.c"
+					const gchar* _tmp17_ = NULL;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp17_ = crop_name;
+#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (g_strcmp0 (_tmp17_, "A6") == 0) {
+#line 4436 "ui.c"
+						GtkRadioMenuItem* _tmp18_ = NULL;
+						GtkRadioMenuItem* _tmp19_ = NULL;
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp18_ = self->priv->a6_menuitem;
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp19_ = _g_object_ref0 (_tmp18_);
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_g_object_unref0 (menuitem);
+#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						menuitem = _tmp19_;
+#line 4447 "ui.c"
 					} else {
-						const gchar* _tmp16_ = NULL;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp16_ = crop_name;
-#line 885 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						if (g_strcmp0 (_tmp16_, "letter") == 0) {
-#line 4255 "ui.c"
-							gchar* _tmp17_ = NULL;
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp17_ = g_strdup ("letter_menuitem");
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_g_free0 (name);
-#line 886 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							name = _tmp17_;
-#line 4263 "ui.c"
+						const gchar* _tmp20_ = NULL;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp20_ = crop_name;
+#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						if (g_strcmp0 (_tmp20_, "letter") == 0) {
+#line 4454 "ui.c"
+							GtkRadioMenuItem* _tmp21_ = NULL;
+							GtkRadioMenuItem* _tmp22_ = NULL;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp21_ = self->priv->letter_menuitem;
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp22_ = _g_object_ref0 (_tmp21_);
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_g_object_unref0 (menuitem);
+#line 959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							menuitem = _tmp22_;
+#line 4465 "ui.c"
 						} else {
-							const gchar* _tmp18_ = NULL;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp18_ = crop_name;
-#line 887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							if (g_strcmp0 (_tmp18_, "legal") == 0) {
-#line 4270 "ui.c"
-								gchar* _tmp19_ = NULL;
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp19_ = g_strdup ("legal_menuitem");
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_g_free0 (name);
-#line 888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								name = _tmp19_;
-#line 4278 "ui.c"
+							const gchar* _tmp23_ = NULL;
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp23_ = crop_name;
+#line 960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							if (g_strcmp0 (_tmp23_, "legal") == 0) {
+#line 4472 "ui.c"
+								GtkRadioMenuItem* _tmp24_ = NULL;
+								GtkRadioMenuItem* _tmp25_ = NULL;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_tmp24_ = self->priv->legal_menuitem;
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_tmp25_ = _g_object_ref0 (_tmp24_);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_g_object_unref0 (menuitem);
+#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								menuitem = _tmp25_;
+#line 4483 "ui.c"
 							} else {
-								const gchar* _tmp20_ = NULL;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								_tmp20_ = crop_name;
-#line 889 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-								if (g_strcmp0 (_tmp20_, "4x6") == 0) {
-#line 4285 "ui.c"
-									gchar* _tmp21_ = NULL;
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									_tmp21_ = g_strdup ("4x6_menuitem");
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									_g_free0 (name);
-#line 890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-									name = _tmp21_;
-#line 4293 "ui.c"
+								const gchar* _tmp26_ = NULL;
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								_tmp26_ = crop_name;
+#line 962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+								if (g_strcmp0 (_tmp26_, "4x6") == 0) {
+#line 4490 "ui.c"
+									GtkRadioMenuItem* _tmp27_ = NULL;
+									GtkRadioMenuItem* _tmp28_ = NULL;
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+									_tmp27_ = self->priv->four_by_six_menuitem;
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+									_tmp28_ = _g_object_ref0 (_tmp27_);
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+									_g_object_unref0 (menuitem);
+#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+									menuitem = _tmp28_;
+#line 4501 "ui.c"
 								}
 							}
 						}
@@ -4297,60 +4505,51 @@ static void user_interface_page_selected_cb (UserInterface* self, BookView* view
 				}
 			}
 		} else {
-			gchar* _tmp22_ = NULL;
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp22_ = g_strdup ("custom_crop_menuitem");
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_g_free0 (name);
-#line 893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			name = _tmp22_;
-#line 4308 "ui.c"
+			GtkRadioMenuItem* _tmp29_ = NULL;
+			GtkRadioMenuItem* _tmp30_ = NULL;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp29_ = self->priv->custom_crop_menuitem;
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp30_ = _g_object_ref0 (_tmp29_);
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_g_object_unref0 (menuitem);
+#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			menuitem = _tmp30_;
+#line 4519 "ui.c"
 		}
-#line 873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (crop_name);
-#line 4312 "ui.c"
-	}
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp23_ = self->priv->builder;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp24_ = name;
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp25_ = gtk_builder_get_object (_tmp23_, _tmp24_);
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	menuitem = _tmp26_;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp27_ = menuitem;
-#line 897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp27_, TRUE);
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp28_ = self->priv->builder;
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp29_ = gtk_builder_get_object (_tmp28_, "crop_toolbutton");
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GTK_TYPE_TOGGLE_TOOL_BUTTON, GtkToggleToolButton));
-#line 898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	toolbutton = _tmp30_;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = toolbutton;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = page;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = page_get_has_crop (_tmp32_);
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = _tmp33_;
-#line 899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_toggle_tool_button_set_active (_tmp31_, _tmp34_);
-#line 901 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 4523 "ui.c"
+	}
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = menuitem;
+#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp31_, TRUE);
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = self->priv->crop_button;
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = page;
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = page_get_has_crop (_tmp33_);
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = _tmp34_;
+#line 970 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_toggle_button_set_active (_tmp32_, _tmp35_);
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp36_ = self->priv->crop_toolbutton;
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp37_ = page;
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp38_ = page_get_has_crop (_tmp37_);
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp39_ = _tmp38_;
+#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_toggle_tool_button_set_active (_tmp36_, _tmp39_);
+#line 973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->updating_page_menu = FALSE;
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (toolbutton);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (menuitem);
-#line 863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_free0 (name);
-#line 4354 "ui.c"
+#line 4553 "ui.c"
 }
 
 
@@ -4362,51 +4561,51 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 	const gchar* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = get_temporary_filename ("scanned-page", "tiff");
-#line 906 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	path = _tmp0_;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = path;
-#line 907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp1_ == NULL) {
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4384 "ui.c"
+#line 4583 "ui.c"
 	}
-#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = path;
-#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 909 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	file = _tmp3_;
-#line 4392 "ui.c"
+#line 4591 "ui.c"
 	{
 		Page* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		GFile* _tmp7_ = NULL;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = page;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_quality (self);
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = file;
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_save (_tmp4_, "tiff", _tmp6_, _tmp7_, &_inner_error_);
-#line 913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 4410 "ui.c"
+#line 4609 "ui.c"
 			goto __catch17_g_error;
 		}
 	}
@@ -4417,69 +4616,69 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _ ("Unable to save image for preview");
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = e;
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = _tmp9_->message;
-#line 917 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 989 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp8_, _tmp10_);
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 992 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4441 "ui.c"
+#line 4640 "ui.c"
 	}
 	__finally17:
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4456 "ui.c"
+#line 4655 "ui.c"
 	}
 	{
-		GtkApplicationWindow* _tmp11_ = NULL;
+		GdkScreen* _tmp11_ = NULL;
 		GdkScreen* _tmp12_ = NULL;
 		GFile* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		guint32 _tmp16_ = 0U;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = self->priv->window;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp12_ = gtk_window_get_screen ((GtkWindow*) _tmp11_);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = gtk_window_get_screen ((GtkWindow*) self);
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = _tmp11_;
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = file;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = g_file_get_uri (_tmp13_);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = _tmp14_;
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_get_current_event_time ();
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp12_, _tmp15_, _tmp16_, &_inner_error_);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp15_);
-#line 925 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 997 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 4483 "ui.c"
+#line 4682 "ui.c"
 			goto __catch18_g_error;
 		}
 	}
@@ -4490,74 +4689,63 @@ static void user_interface_show_page_cb (UserInterface* self, BookView* view, Pa
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = _ ("Unable to open image preview application");
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp18_ = e;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp19_ = _tmp18_->message;
-#line 929 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp17_, _tmp19_);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 4508 "ui.c"
+#line 4707 "ui.c"
 	}
 	__finally18:
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (file);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 923 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4523 "ui.c"
+#line 4722 "ui.c"
 	}
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (file);
-#line 904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (path);
-#line 4529 "ui.c"
+#line 4728 "ui.c"
 }
 
 
 static void user_interface_show_page_menu_cb (UserInterface* self, BookView* view) {
-	GtkMenu* menu = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GObject* _tmp1_ = NULL;
-	GtkMenu* _tmp2_ = NULL;
-	guint32 _tmp3_ = 0U;
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkMenu* _tmp0_ = NULL;
+	guint32 _tmp1_ = 0U;
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (view != NULL);
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->builder;
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = gtk_builder_get_object (_tmp0_, "page_menu");
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_MENU, GtkMenu));
-#line 937 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	menu = _tmp2_;
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = gtk_get_current_event_time ();
-#line 938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_menu_popup (menu, NULL, NULL, NULL, NULL, (guint) 3, _tmp3_);
-#line 935 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (menu);
-#line 4557 "ui.c"
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->page_menu;
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_get_current_event_time ();
+#line 1009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, (guint) 3, _tmp1_);
+#line 4745 "ui.c"
 }
 
 
-void G_MODULE_EXPORT rotate_left_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_rotate_left_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	Page* page = NULL;
 	BookView* _tmp1_ = NULL;
@@ -4565,47 +4753,54 @@ void G_MODULE_EXPORT rotate_left_button_clicked_cb (GtkWidget* widget, UserInter
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 945 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1016 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4579 "ui.c"
+#line 4767 "ui.c"
 	}
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 947 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1018 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4595 "ui.c"
+#line 4783 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 948 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_left (_tmp6_);
-#line 4601 "ui.c"
+#line 4789 "ui.c"
 	}
-#line 942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4605 "ui.c"
+#line 4793 "ui.c"
+}
+
+
+static void _user_interface_rotate_left_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_rotate_left_button_clicked_cb ((UserInterface*) self, _sender);
+#line 4800 "ui.c"
 }
 
 
-void G_MODULE_EXPORT rotate_right_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_rotate_right_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	gboolean _tmp0_ = FALSE;
 	Page* page = NULL;
 	BookView* _tmp1_ = NULL;
@@ -4613,43 +4808,50 @@ void G_MODULE_EXPORT rotate_right_button_clicked_cb (GtkWidget* widget, UserInte
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 955 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4627 "ui.c"
+#line 4822 "ui.c"
 	}
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->book_view;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_view_get_selected_page (_tmp1_);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _page_ref0 (_tmp3_);
-#line 956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1027 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp4_;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 957 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp5_ != NULL) {
-#line 4643 "ui.c"
+#line 4838 "ui.c"
 		Page* _tmp6_ = NULL;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = page;
-#line 958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_rotate_right (_tmp6_);
-#line 4649 "ui.c"
+#line 4844 "ui.c"
 	}
-#line 952 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4653 "ui.c"
+#line 4848 "ui.c"
+}
+
+
+static void _user_interface_rotate_right_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_rotate_right_button_clicked_cb ((UserInterface*) self, _sender);
+#line 4855 "ui.c"
 }
 
 
@@ -4664,62 +4866,62 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 	Page* _tmp6_ = NULL;
 	Page* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->crop_rotate_menuitem;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = crop_name;
-#line 963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1034 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp1_ != NULL);
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->updating_page_menu;
-#line 965 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4682 "ui.c"
+#line 4884 "ui.c"
 	}
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _page_ref0 (_tmp5_);
-#line 968 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp6_;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page;
-#line 969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ == NULL) {
-#line 971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:971: Trying to set crop but no selected page");
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1042: Trying to set crop but no selected page");
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4704 "ui.c"
+#line 4906 "ui.c"
 	}
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = crop_name;
-#line 975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1046 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp8_ == NULL) {
-#line 4710 "ui.c"
+#line 4912 "ui.c"
 		Page* _tmp9_ = NULL;
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		page_set_no_crop (_tmp9_);
-#line 4716 "ui.c"
+#line 4918 "ui.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = crop_name;
-#line 977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (g_strcmp0 (_tmp10_, "custom") == 0) {
-#line 4723 "ui.c"
+#line 4925 "ui.c"
 			gint width = 0;
 			Page* _tmp11_ = NULL;
 			gint _tmp12_ = 0;
@@ -4740,295 +4942,410 @@ static void user_interface_set_crop (UserInterface* self, const gchar* crop_name
 			gint _tmp24_ = 0;
 			gint _tmp25_ = 0;
 			gint _tmp26_ = 0;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp11_ = page;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp12_ = page_get_width (_tmp11_);
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp13_ = _tmp12_;
-#line 979 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			width = _tmp13_;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp14_ = page;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp15_ = page_get_height (_tmp14_);
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp16_ = _tmp15_;
-#line 980 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1051 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			height = _tmp16_;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp17_ = width;
-#line 981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1052 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_width = (gint) ((_tmp17_ * 0.8) + 0.5);
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp18_ = height;
-#line 982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1053 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			crop_height = (gint) ((_tmp18_ * 0.8) + 0.5);
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp19_ = page;
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp20_ = crop_width;
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = crop_height;
-#line 983 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_custom_crop (_tmp19_, _tmp20_, _tmp21_);
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = page;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = width;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = crop_width;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp25_ = height;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp26_ = crop_height;
-#line 984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_move_crop (_tmp22_, (_tmp23_ - _tmp24_) / 2, (_tmp25_ - _tmp26_) / 2);
-#line 4788 "ui.c"
+#line 4990 "ui.c"
 		} else {
 			Page* _tmp27_ = NULL;
 			const gchar* _tmp28_ = NULL;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp27_ = page;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp28_ = crop_name;
-#line 987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1058 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			page_set_named_crop (_tmp27_, _tmp28_);
-#line 4798 "ui.c"
+#line 5000 "ui.c"
 		}
 	}
-#line 961 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1032 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 4803 "ui.c"
+#line 5005 "ui.c"
 }
 
 
-void G_MODULE_EXPORT no_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void user_interface_no_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1062 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 994 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, NULL);
-#line 4822 "ui.c"
+#line 5027 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT custom_crop_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_no_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5035 "ui.c"
+}
+
+
+static void user_interface_custom_crop_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 998 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1000 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 1001 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "custom");
-#line 4842 "ui.c"
+#line 5057 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT crop_toolbutton_toggled_cb (GtkToggleToolButton* widget, UserInterface* self) {
+static void _user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_custom_crop_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5065 "ui.c"
+}
+
+
+static void user_interface_crop_button_toggled_cb (UserInterface* self, GtkToggleButton* widget) {
+	gboolean _tmp0_ = FALSE;
+	GtkToggleButton* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_ = FALSE;
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (widget != NULL);
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->updating_page_menu;
+#line 1078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 1079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return;
+#line 5084 "ui.c"
+	}
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = widget;
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = gtk_toggle_button_get_active (_tmp1_);
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp3_) {
+#line 5094 "ui.c"
+		GtkRadioMenuItem* _tmp4_ = NULL;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = self->priv->custom_crop_menuitem;
+#line 1082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
+#line 5100 "ui.c"
+	} else {
+		GtkRadioMenuItem* _tmp5_ = NULL;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = self->priv->no_crop_menuitem;
+#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
+#line 5107 "ui.c"
+	}
+}
+
+
+static void _user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_crop_button_toggled_cb ((UserInterface*) self, _sender);
+#line 5115 "ui.c"
+}
+
+
+static void user_interface_crop_toolbutton_toggled_cb (UserInterface* self, GtkToggleToolButton* widget) {
 	gboolean _tmp0_ = FALSE;
-	GtkRadioMenuItem* menuitem = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	GtkRadioMenuItem* _tmp9_ = NULL;
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp3_ = FALSE;
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->updating_page_menu;
-#line 1007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1090 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_) {
-#line 1008 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1091 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 4863 "ui.c"
+#line 5134 "ui.c"
 	}
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = widget;
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 1011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp2_) {
-#line 4871 "ui.c"
-		GtkBuilder* _tmp3_ = NULL;
-		GObject* _tmp4_ = NULL;
-		GtkRadioMenuItem* _tmp5_ = NULL;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = self->priv->builder;
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = gtk_builder_get_object (_tmp3_, "custom_crop_menuitem");
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (menuitem);
-#line 1012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		menuitem = _tmp5_;
-#line 4885 "ui.c"
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _tmp2_;
+#line 1093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp3_) {
+#line 5144 "ui.c"
+		GtkRadioMenuItem* _tmp4_ = NULL;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = self->priv->custom_crop_menuitem;
+#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp4_, TRUE);
+#line 5150 "ui.c"
 	} else {
-		GtkBuilder* _tmp6_ = NULL;
-		GObject* _tmp7_ = NULL;
-		GtkRadioMenuItem* _tmp8_ = NULL;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = self->priv->builder;
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp7_ = gtk_builder_get_object (_tmp6_, "no_crop_menuitem");
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (menuitem);
-#line 1014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		menuitem = _tmp8_;
-#line 4900 "ui.c"
+		GtkRadioMenuItem* _tmp5_ = NULL;
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = self->priv->no_crop_menuitem;
+#line 1096 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp5_, TRUE);
+#line 5157 "ui.c"
 	}
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = menuitem;
-#line 1015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_check_menu_item_set_active ((GtkCheckMenuItem*) _tmp9_, TRUE);
-#line 1005 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (menuitem);
-#line 4908 "ui.c"
 }
 
 
-void G_MODULE_EXPORT four_by_six_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_crop_toolbutton_toggled_cb ((UserInterface*) self, _sender);
+#line 5165 "ui.c"
+}
+
+
+static void user_interface_four_by_six_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1021 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 1022 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "4x6");
-#line 4927 "ui.c"
+#line 5187 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT legal_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_four_by_six_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5195 "ui.c"
+}
+
+
+static void user_interface_legal_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1026 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 1029 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1110 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "legal");
-#line 4947 "ui.c"
+#line 5217 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT letter_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_legal_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5225 "ui.c"
+}
+
+
+static void user_interface_letter_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 1036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "letter");
-#line 4967 "ui.c"
+#line 5247 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT a6_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_letter_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5255 "ui.c"
+}
+
+
+static void user_interface_a6_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1040 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1121 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 1043 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A6");
-#line 4987 "ui.c"
+#line 5277 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT a5_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_a6_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5285 "ui.c"
+}
+
+
+static void user_interface_a5_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1047 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1049 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 1050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A5");
-#line 5007 "ui.c"
+#line 5307 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT a4_menuitem_toggled_cb (GtkCheckMenuItem* widget, UserInterface* self) {
+static void _user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_a5_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5315 "ui.c"
+}
+
+
+static void user_interface_a4_menuitem_toggled_cb (UserInterface* self, GtkCheckMenuItem* widget) {
 	GtkCheckMenuItem* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp2_ = FALSE;
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = widget;
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_check_menu_item_get_active (_tmp0_);
-#line 1056 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp1_) {
-#line 1057 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_) {
+#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_set_crop (self, "A4");
-#line 5027 "ui.c"
+#line 5337 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT crop_rotate_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
+static void _user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled (GtkCheckMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_a4_menuitem_toggled_cb ((UserInterface*) self, _sender);
+#line 5345 "ui.c"
+}
+
+
+static void user_interface_crop_rotate_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
 	Page* page = NULL;
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
@@ -5036,41 +5353,48 @@ void G_MODULE_EXPORT crop_rotate_menuitem_activate_cb (GtkWidget* widget, UserIn
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1063 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ == NULL) {
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_page_unref0 (page);
-#line 1065 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5062 "ui.c"
+#line 5379 "ui.c"
 	}
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page_rotate_crop (_tmp5_);
-#line 1061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5070 "ui.c"
+#line 5387 "ui.c"
 }
 
 
-void G_MODULE_EXPORT page_move_left_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
+static void _user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_crop_rotate_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 5394 "ui.c"
+}
+
+
+static void user_interface_page_move_left_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
 	Page* page = NULL;
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
@@ -5081,55 +5405,60 @@ void G_MODULE_EXPORT page_move_left_menuitem_activate_cb (GtkWidget* widget, Use
 	Page* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
 	guint _tmp7_ = 0U;
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > ((guint) 0)) {
-#line 5111 "ui.c"
+#line 5435 "ui.c"
 		Book* _tmp8_ = NULL;
 		Page* _tmp9_ = NULL;
 		guint _tmp10_ = 0U;
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = self->priv->_book;
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp9_ = page;
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp10_ = index;
-#line 1075 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1156 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp8_, _tmp9_, _tmp10_ - 1);
-#line 5123 "ui.c"
+#line 5447 "ui.c"
 	}
-#line 1077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_page_menu (self);
-#line 1070 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1151 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5129 "ui.c"
+#line 5451 "ui.c"
+}
+
+
+static void _user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_move_left_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 5458 "ui.c"
 }
 
 
-void G_MODULE_EXPORT page_move_right_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_page_move_right_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
 	Page* page = NULL;
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
@@ -5143,181 +5472,1002 @@ void G_MODULE_EXPORT page_move_right_menuitem_activate_cb (GtkWidget* widget, Us
 	Book* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
 	guint _tmp10_ = 0U;
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->_book;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_page_index (_tmp4_, _tmp5_);
-#line 1084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	index = _tmp6_;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = index;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = self->priv->_book;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = book_get_n_pages (_tmp8_);
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = _tmp9_;
-#line 1085 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ < (_tmp10_ - 1)) {
-#line 5179 "ui.c"
+#line 5508 "ui.c"
 		Book* _tmp11_ = NULL;
 		Page* _tmp12_ = NULL;
 		Book* _tmp13_ = NULL;
 		Page* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp11_ = self->priv->_book;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp12_ = page;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp13_ = self->priv->_book;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = page;
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = book_get_page_index (_tmp13_, _tmp14_);
-#line 1086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		book_move_page (_tmp11_, _tmp12_, _tmp15_ + 1);
-#line 5197 "ui.c"
+#line 5526 "ui.c"
 	}
-#line 1088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_update_page_menu (self);
-#line 1081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5203 "ui.c"
+#line 5530 "ui.c"
 }
 
 
-void G_MODULE_EXPORT page_delete_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
+static void _user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_move_right_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 5537 "ui.c"
+}
+
+
+static void user_interface_page_delete_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
 	BookView* _tmp0_ = NULL;
 	Book* _tmp1_ = NULL;
 	Book* _tmp2_ = NULL;
 	BookView* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1092 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_book (_tmp0_);
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->book_view;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book_view_get_selected_page (_tmp3_);
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1094 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_delete_page (_tmp2_, _tmp5_);
-#line 5232 "ui.c"
+#line 5566 "ui.c"
+}
+
+
+static void _user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_delete_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 5573 "ui.c"
+}
+
+
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_atomic_int_inc (&_data1_->_ref_count_);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return _data1_;
+#line 5582 "ui.c"
 }
 
 
-void G_MODULE_EXPORT save_file_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void block1_data_unref (void * _userdata_) {
+	Block1Data* _data1_;
+	_data1_ = (Block1Data*) _userdata_;
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+#line 5591 "ui.c"
+		UserInterface* self;
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		self = _data1_->self;
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (_data1_->dialog);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (self);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_slice_free (Block1Data, _data1_);
+#line 5601 "ui.c"
+	}
+}
+
+
+static gboolean __lambda4_ (Block1Data* _data1_, GdkEventKey* e) {
+	UserInterface* self;
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+	GdkEventKey* _tmp1_ = NULL;
+	GdkModifierType _tmp2_ = 0;
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data1_->self;
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (e != NULL, FALSE);
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = e;
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_->state;
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp2_ == 0) {
+#line 5622 "ui.c"
+		GdkEventKey* _tmp3_ = NULL;
+		guint _tmp4_ = 0U;
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = e;
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = _tmp3_->keyval;
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = _tmp4_ == ((guint) GDK_KEY_Escape);
+#line 5631 "ui.c"
+	} else {
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = FALSE;
+#line 5635 "ui.c"
+	}
+#line 1185 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp0_) {
+#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
+#line 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = TRUE;
+#line 1188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		return result;
+#line 5645 "ui.c"
+	}
+#line 1191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = FALSE;
+#line 1191 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 5651 "ui.c"
+}
+
+
+static gboolean ___lambda4__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
+	gboolean result;
+	result = __lambda4_ (self, event);
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 5660 "ui.c"
+}
+
+
+static void __lambda5_ (Block1Data* _data1_) {
+	UserInterface* self;
+	Book* _tmp0_ = NULL;
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data1_->self;
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_book;
+#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_combine_sides (_tmp0_);
+#line 1208 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
+#line 5675 "ui.c"
+}
+
+
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda5_ (self);
+#line 5682 "ui.c"
+}
+
+
+static void __lambda6_ (Block1Data* _data1_) {
+	UserInterface* self;
+	Book* _tmp0_ = NULL;
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data1_->self;
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_book;
+#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_combine_sides_reverse (_tmp0_);
+#line 1218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
+#line 5697 "ui.c"
+}
+
+
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda6_ (self);
+#line 5704 "ui.c"
+}
+
+
+static void __lambda7_ (Block1Data* _data1_) {
+	UserInterface* self;
+	Book* _tmp0_ = NULL;
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data1_->self;
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->_book;
+#line 1227 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	book_reverse (_tmp0_);
+#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
+#line 5719 "ui.c"
+}
+
+
+static void ___lambda7__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda7_ (self);
+#line 5726 "ui.c"
+}
+
+
+static void __lambda8_ (Block1Data* _data1_) {
+	UserInterface* self;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = _data1_->self;
+#line 1237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) _data1_->dialog);
+#line 5736 "ui.c"
+}
+
+
+static void ___lambda8__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda8_ (self);
+#line 5743 "ui.c"
+}
+
+
+static void user_interface_reorder_document (UserInterface* self) {
+	Block1Data* _data1_;
+	GtkWindow* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	GtkGrid* g = NULL;
+	GtkGrid* _tmp2_ = NULL;
+	GtkButton* b = NULL;
+	const gchar* _tmp3_ = NULL;
+	GtkButton* _tmp4_ = NULL;
+	GtkButton* _tmp5_ = NULL;
+	GtkButton* _tmp6_ = NULL;
+	GtkButton* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	GtkButton* _tmp9_ = NULL;
+	GtkButton* _tmp10_ = NULL;
+	GtkButton* _tmp11_ = NULL;
+	GtkButton* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	GtkButton* _tmp14_ = NULL;
+	GtkButton* _tmp15_ = NULL;
+	GtkButton* _tmp16_ = NULL;
+	GtkButton* _tmp17_ = NULL;
+	const gchar* _tmp18_ = NULL;
+	GtkButton* _tmp19_ = NULL;
+	GtkButton* _tmp20_ = NULL;
+	GtkButton* _tmp21_ = NULL;
+	GtkButton* _tmp22_ = NULL;
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_ = g_slice_new0 (Block1Data);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->_ref_count_ = 1;
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->self = g_object_ref (self);
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = (GtkWindow*) gtk_window_new (GTK_WINDOW_TOPLEVEL);
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp0_);
+#line 1176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_->dialog = _tmp0_;
+#line 1177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_type_hint (_data1_->dialog, GDK_WINDOW_TYPE_HINT_DIALOG);
+#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_modal (_data1_->dialog, TRUE);
+#line 1179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _data1_->dialog, (guint) 12);
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _ ("Reorder Pages");
+#line 1181 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_title (_data1_->dialog, _tmp1_);
+#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_transient_for (_data1_->dialog, (GtkWindow*) self);
+#line 1183 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data ((GtkWidget*) _data1_->dialog, "key-press-event", (GCallback) ___lambda4__gtk_widget_key_press_event, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _data1_->dialog, TRUE);
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = (GtkGrid*) gtk_grid_new ();
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp2_);
+#line 1195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g = _tmp2_;
+#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_set_row_homogeneous (g, TRUE);
+#line 1197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_set_row_spacing (g, 6);
+#line 1198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_set_column_homogeneous (g, TRUE);
+#line 1199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_set_column_spacing (g, 6);
+#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) g, TRUE);
+#line 1201 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add ((GtkContainer*) _data1_->dialog, (GtkWidget*) g);
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = _ ("Combine sides");
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = user_interface_make_reorder_button (self, _tmp3_, "F1F2F3B1B2B3-F1B1F2B2F3B3");
+#line 1204 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp4_;
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = b;
+#line 1205 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp5_, "clicked", (GCallback) ___lambda5__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp6_ = b;
+#line 1210 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp6_, TRUE);
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = b;
+#line 1211 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_attach (g, (GtkWidget*) _tmp7_, 0, 0, 1, 1);
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = _ ("Combine sides (reverse)");
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = user_interface_make_reorder_button (self, _tmp8_, "F1F2F3B3B2B1-F1B1F2B2F3B3");
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (b);
+#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp9_;
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = b;
+#line 1215 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp10_, "clicked", (GCallback) ___lambda6__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = b;
+#line 1220 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = b;
+#line 1221 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_attach (g, (GtkWidget*) _tmp12_, 1, 0, 1, 1);
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = _ ("Reverse");
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = user_interface_make_reorder_button (self, _tmp13_, "C1C2C3C4C5C6-C6C5C4C3C2C1");
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (b);
+#line 1224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp14_;
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = b;
+#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp15_, "clicked", (GCallback) ___lambda7__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = b;
+#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp16_, TRUE);
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = b;
+#line 1231 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_attach (g, (GtkWidget*) _tmp17_, 0, 2, 1, 1);
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = _ ("Keep unchanged");
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = user_interface_make_reorder_button (self, _tmp18_, "C1C2C3C4C5C6-C1C2C3C4C5C6");
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (b);
+#line 1234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp19_;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = b;
+#line 1235 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_data (_tmp20_, "clicked", (GCallback) ___lambda8__gtk_button_clicked, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0);
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp21_ = b;
+#line 1239 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp21_, TRUE);
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = b;
+#line 1240 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_grid_attach (g, (GtkWidget*) _tmp22_, 1, 2, 1, 1);
+#line 1242 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_present (_data1_->dialog);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (b);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (g);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	block1_data_unref (_data1_);
+#line 1174 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_data1_ = NULL;
+#line 5910 "ui.c"
+}
+
+
+void user_interface_reorder_document_activate_cb (UserInterface* self) {
+#line 1245 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_reorder_document (self);
+#line 5919 "ui.c"
+}
+
+
+static void user_interface_reorder_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_reorder_document (self);
+#line 5930 "ui.c"
+}
+
+
+static void _user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_reorder_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 5937 "ui.c"
+}
+
+
+static GtkButton* user_interface_make_reorder_button (UserInterface* self, const gchar* text, const gchar* items) {
+	GtkButton* result = NULL;
+	GtkButton* b = NULL;
+	GtkButton* _tmp0_ = NULL;
+	GtkBox* vbox = NULL;
+	GtkBox* _tmp1_ = NULL;
+	GtkLabel* label = NULL;
+	const gchar* _tmp2_ = NULL;
+	GtkLabel* _tmp3_ = NULL;
+	GtkBox* rb = NULL;
+	const gchar* _tmp4_ = NULL;
+	GtkBox* _tmp5_ = NULL;
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (text != NULL, NULL);
+#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (items != NULL, NULL);
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = (GtkButton*) gtk_button_new ();
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp0_);
+#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	b = _tmp0_;
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp1_);
+#line 1260 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	vbox = _tmp1_;
+#line 1261 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
+#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add ((GtkContainer*) b, (GtkWidget*) vbox);
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = text;
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_);
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp3_);
+#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	label = _tmp3_;
+#line 1265 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) label, TRUE);
+#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (vbox, (GtkWidget*) label, TRUE, TRUE, (guint) 0);
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = items;
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp5_ = user_interface_make_reorder_box (self, _tmp4_);
+#line 1268 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	rb = _tmp5_;
+#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) rb, TRUE);
+#line 1270 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (vbox, (GtkWidget*) rb, TRUE, TRUE, (guint) 0);
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = b;
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (rb);
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (label);
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (vbox);
+#line 1272 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 6007 "ui.c"
+}
+
+
+static gchar string_get (const gchar* self, glong index) {
+	gchar result = '\0';
+	glong _tmp0_ = 0L;
+	gchar _tmp1_ = '\0';
+#line 996 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, '\0');
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp0_ = index;
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	_tmp1_ = ((gchar*) self)[_tmp0_];
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	result = _tmp1_;
+#line 997 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+	return result;
+#line 6025 "ui.c"
+}
+
+
+static GtkBox* user_interface_make_reorder_box (UserInterface* self, const gchar* items) {
+	GtkBox* result = NULL;
+	GtkBox* box = NULL;
+	GtkBox* _tmp0_ = NULL;
+	GtkBox* _tmp1_ = NULL;
+	GtkBox* page_box = NULL;
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (items != NULL, NULL);
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp0_);
+#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	box = _tmp0_;
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = box;
+#line 1278 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp1_, TRUE);
+#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page_box = NULL;
+#line 6051 "ui.c"
+	{
+		gint i = 0;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		i = 0;
+#line 6056 "ui.c"
+		{
+			gboolean _tmp2_ = FALSE;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp2_ = TRUE;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			while (TRUE) {
+#line 6063 "ui.c"
+				const gchar* _tmp4_ = NULL;
+				gint _tmp5_ = 0;
+				gchar _tmp6_ = '\0';
+				const gchar* _tmp7_ = NULL;
+				gint _tmp8_ = 0;
+				gchar _tmp9_ = '\0';
+				gchar side = '\0';
+				const gchar* _tmp14_ = NULL;
+				gint _tmp15_ = 0;
+				gchar _tmp16_ = '\0';
+				gint _tmp17_ = 0;
+				const gchar* _tmp18_ = NULL;
+				gint _tmp19_ = 0;
+				gchar _tmp20_ = '\0';
+				GtkBox* _tmp21_ = NULL;
+				gdouble r = 0.0;
+				gdouble g = 0.0;
+				gdouble b = 0.0;
+				gchar _tmp26_ = '\0';
+				gdouble _tmp33_ = 0.0;
+				gdouble _tmp34_ = 0.0;
+				gdouble _tmp35_ = 0.0;
+				gdouble _tmp36_ = 0.0;
+				gdouble _tmp37_ = 0.0;
+				gdouble _tmp38_ = 0.0;
+				PageIcon* icon = NULL;
+				const gchar* _tmp39_ = NULL;
+				gint _tmp40_ = 0;
+				gchar _tmp41_ = '\0';
+				gchar* _tmp42_ = NULL;
+				gchar* _tmp43_ = NULL;
+				gdouble _tmp44_ = 0.0;
+				gdouble _tmp45_ = 0.0;
+				gdouble _tmp46_ = 0.0;
+				PageIcon* _tmp47_ = NULL;
+				PageIcon* _tmp48_ = NULL;
+				PageIcon* _tmp49_ = NULL;
+				GtkBox* _tmp50_ = NULL;
+				PageIcon* _tmp51_ = NULL;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!_tmp2_) {
+#line 6105 "ui.c"
+					gint _tmp3_ = 0;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp3_ = i;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					i = _tmp3_ + 1;
+#line 6111 "ui.c"
+				}
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp2_ = FALSE;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp4_ = items;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp5_ = i;
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp6_ = string_get (_tmp4_, (glong) _tmp5_);
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (!(_tmp6_ != '\0')) {
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					break;
+#line 6125 "ui.c"
+				}
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp7_ = items;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp8_ = i;
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp9_ = string_get (_tmp7_, (glong) _tmp8_);
+#line 1283 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp9_ == '-') {
+#line 6135 "ui.c"
+					GtkArrow* a = NULL;
+					GtkArrow* _tmp10_ = NULL;
+					GtkArrow* _tmp11_ = NULL;
+					GtkBox* _tmp12_ = NULL;
+					GtkArrow* _tmp13_ = NULL;
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp10_ = (GtkArrow*) gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					g_object_ref_sink (_tmp10_);
+#line 1285 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					a = _tmp10_;
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp11_ = a;
+#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_widget_set_visible ((GtkWidget*) _tmp11_, TRUE);
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp12_ = box;
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp13_ = a;
+#line 1287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_box_pack_start (_tmp12_, (GtkWidget*) _tmp13_, FALSE, FALSE, (guint) 0);
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_g_object_unref0 (page_box);
+#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					page_box = NULL;
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_g_object_unref0 (a);
+#line 1289 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					continue;
+#line 6165 "ui.c"
+				}
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp14_ = items;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp15_ = i;
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp16_ = string_get (_tmp14_, (glong) _tmp15_);
+#line 1293 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				side = _tmp16_;
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp17_ = i;
+#line 1294 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				i = _tmp17_ + 1;
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp18_ = items;
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp19_ = i;
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp20_ = string_get (_tmp18_, (glong) _tmp19_);
+#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp20_ == '\0') {
+#line 1296 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					break;
+#line 6189 "ui.c"
+				}
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp21_ = page_box;
+#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp21_ == NULL) {
+#line 6195 "ui.c"
+					GtkBox* _tmp22_ = NULL;
+					GtkBox* _tmp23_ = NULL;
+					GtkBox* _tmp24_ = NULL;
+					GtkBox* _tmp25_ = NULL;
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					g_object_ref_sink (_tmp22_);
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_g_object_unref0 (page_box);
+#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					page_box = _tmp22_;
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp23_ = page_box;
+#line 1301 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_widget_set_visible ((GtkWidget*) _tmp23_, TRUE);
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp24_ = box;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp25_ = page_box;
+#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_box_pack_start (_tmp24_, (GtkWidget*) _tmp25_, FALSE, FALSE, (guint) 0);
+#line 6218 "ui.c"
+				}
+#line 1306 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				r = 1.0;
+#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				g = 1.0;
+#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				b = 1.0;
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp26_ = side;
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				switch (_tmp26_) {
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					case 'F':
+#line 6232 "ui.c"
+					{
+#line 1313 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						r = 0x75 / 255.0;
+#line 1314 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						g = 0x50 / 255.0;
+#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						b = 0x7B / 255.0;
+#line 1316 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						break;
+#line 6242 "ui.c"
+					}
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					case 'B':
+#line 6246 "ui.c"
+					{
+#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						r = 0xF5 / 255.0;
+#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						g = 0x79 / 255.0;
+#line 1321 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						b = 0.0;
+#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						break;
+#line 6256 "ui.c"
+					}
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					case 'C':
+#line 6260 "ui.c"
+					{
+						gdouble p = 0.0;
+						const gchar* _tmp27_ = NULL;
+						gint _tmp28_ = 0;
+						gchar _tmp29_ = '\0';
+						gdouble _tmp30_ = 0.0;
+						gdouble _tmp31_ = 0.0;
+						gdouble _tmp32_ = 0.0;
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp27_ = items;
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp28_ = i;
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp29_ = string_get (_tmp27_, (glong) _tmp28_);
+#line 1325 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						p = (_tmp29_ - '1') / 5.0;
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp30_ = p;
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp31_ = p;
+#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						r = ((0xED / 255.0) * (1 - _tmp30_)) + (0xCC * _tmp31_);
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp32_ = p;
+#line 1327 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						g = (0xD4 / 255.0) * (1 - _tmp32_);
+#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						b = (gdouble) 0;
+#line 1329 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						break;
+#line 6291 "ui.c"
+					}
+					default:
+#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					break;
+#line 6296 "ui.c"
+				}
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp33_ = r;
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp34_ = r;
+#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				r = _tmp33_ + ((1.0 - _tmp34_) * 0.7);
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp35_ = g;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp36_ = g;
+#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				g = _tmp35_ + ((1.0 - _tmp36_) * 0.7);
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp37_ = b;
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp38_ = b;
+#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				b = _tmp37_ + ((1.0 - _tmp38_) * 0.7);
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp39_ = items;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp40_ = i;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp41_ = string_get (_tmp39_, (glong) _tmp40_);
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp42_ = g_strdup_printf ("%c", (gint) _tmp41_);
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp43_ = _tmp42_;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp44_ = r;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp45_ = g;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp46_ = b;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp47_ = page_icon_new (_tmp43_, _tmp44_, _tmp45_, _tmp46_);
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				g_object_ref_sink (_tmp47_);
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp48_ = _tmp47_;
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_free0 (_tmp43_);
+#line 1337 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				icon = _tmp48_;
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp49_ = icon;
+#line 1338 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_widget_set_visible ((GtkWidget*) _tmp49_, TRUE);
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp50_ = page_box;
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp51_ = icon;
+#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_box_pack_start (_tmp50_, (GtkWidget*) _tmp51_, FALSE, FALSE, (guint) 0);
+#line 1281 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_g_object_unref0 (icon);
+#line 6354 "ui.c"
+			}
+		}
+	}
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = box;
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (page_box);
+#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 6364 "ui.c"
+}
+
+
+static void user_interface_save_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1346 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (widget != NULL);
+#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 5243 "ui.c"
+#line 6375 "ui.c"
+}
+
+
+static void _user_interface_save_file_button_clicked_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_file_button_clicked_cb ((UserInterface*) self, _sender);
+#line 6382 "ui.c"
 }
 
 
 void user_interface_save_document_activate_cb (UserInterface* self) {
-#line 1103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1351 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1105 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1353 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, FALSE);
-#line 5252 "ui.c"
+#line 6391 "ui.c"
 }
 
 
-void G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_copy_to_clipboard_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	Page* page = NULL;
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _page_ref0 (_tmp2_);
-#line 1111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1359 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp3_;
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1112 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1360 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp4_ != NULL) {
-#line 5281 "ui.c"
+#line 6420 "ui.c"
 		Page* _tmp5_ = NULL;
-		GtkApplicationWindow* _tmp6_ = NULL;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = page;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = self->priv->window;
-#line 1113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		page_copy_to_clipboard (_tmp5_, (GtkWindow*) _tmp6_);
-#line 5290 "ui.c"
+#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		page_copy_to_clipboard (_tmp5_, (GtkWindow*) self);
+#line 6426 "ui.c"
 	}
-#line 1109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 5294 "ui.c"
+#line 6430 "ui.c"
 }
 
 
-void G_MODULE_EXPORT save_as_file_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void _user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_copy_to_clipboard_button_clicked_cb ((UserInterface*) self, _sender);
+#line 6437 "ui.c"
+}
+
+
+static void user_interface_save_as_file_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1117 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1365 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 5305 "ui.c"
+#line 6448 "ui.c"
+}
+
+
+static void _user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_save_as_file_button_clicked_cb ((UserInterface*) self, _sender);
+#line 6455 "ui.c"
 }
 
 
 void user_interface_save_as_document_activate_cb (UserInterface* self) {
-#line 1122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1372 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_document (self, TRUE);
-#line 5314 "ui.c"
+#line 6464 "ui.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 5321 "ui.c"
+#line 6471 "ui.c"
 }
 
 
@@ -5355,138 +6505,145 @@ static void user_interface_draw_page (UserInterface* self, GtkPrintOperation* op
 	GdkPixbuf* _tmp30_ = NULL;
 	cairo_t* _tmp31_ = NULL;
 	cairo_t* _tmp32_ = NULL;
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (operation != NULL);
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (print_context != NULL);
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = print_context;
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1131 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1379 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	context = _tmp2_;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->_book;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_page (_tmp3_, _tmp4_);
-#line 1132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	page = _tmp5_;
-#line 1135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	is_landscape = FALSE;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = print_context;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = gtk_print_context_get_width (_tmp6_);
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = print_context;
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = gtk_print_context_get_height (_tmp8_);
-#line 1136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_ > _tmp9_) {
-#line 1137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1385 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		is_landscape = TRUE;
-#line 5395 "ui.c"
+#line 6545 "ui.c"
 	}
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = page;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = page_get_is_landscape (_tmp10_);
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = _tmp11_;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = is_landscape;
-#line 1138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp12_ != _tmp13_) {
-#line 5407 "ui.c"
+#line 6557 "ui.c"
 		cairo_t* _tmp14_ = NULL;
 		GtkPrintContext* _tmp15_ = NULL;
 		gdouble _tmp16_ = 0.0;
 		cairo_t* _tmp17_ = NULL;
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp14_ = context;
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp15_ = print_context;
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp16_ = gtk_print_context_get_width (_tmp15_);
-#line 1140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1388 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_translate (_tmp14_, _tmp16_, (gdouble) 0);
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp17_ = context;
-#line 1141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		cairo_rotate (_tmp17_, G_PI_2);
-#line 5424 "ui.c"
+#line 6574 "ui.c"
 	}
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = context;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = print_context;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = gtk_print_context_get_dpi_x (_tmp19_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = page;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = page_get_dpi (_tmp21_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = _tmp22_;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = print_context;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = gtk_print_context_get_dpi_y (_tmp24_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = page;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = page_get_dpi (_tmp26_);
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp28_ = _tmp27_;
-#line 1144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_scale (_tmp18_, _tmp20_ / _tmp23_, _tmp25_ / _tmp28_);
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = page;
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp30_ = page_get_image (_tmp29_, TRUE);
-#line 1147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	image = _tmp30_;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp31_ = context;
-#line 1148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gdk_cairo_set_source_pixbuf (_tmp31_, image, (gdouble) 0, (gdouble) 0);
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp32_ = context;
-#line 1149 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1397 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	cairo_paint (_tmp32_);
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (image);
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_page_unref0 (page);
-#line 1127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_cairo_destroy0 (context);
-#line 5470 "ui.c"
+#line 6620 "ui.c"
 }
 
 
-void G_MODULE_EXPORT email_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
+static void user_interface_email_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1401 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 5490 "ui.c"
+#line 6640 "ui.c"
+}
+
+
+static void _user_interface_email_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_email_button_clicked_cb ((UserInterface*) self, _sender);
+#line 6647 "ui.c"
 }
 
 
@@ -5494,24 +6651,24 @@ void user_interface_email_document_activate_cb (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->document_hint;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1160 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1408 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_emit_by_name (self, "email", _tmp0_, _tmp2_);
-#line 5508 "ui.c"
+#line 6665 "ui.c"
 }
 
 
 static void _user_interface_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_draw_page (self, _sender, context, page_nr);
-#line 5515 "ui.c"
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_draw_page ((UserInterface*) self, _sender, context, page_nr);
+#line 6672 "ui.c"
 }
 
 
@@ -5521,34 +6678,31 @@ static void user_interface_print_document (UserInterface* self) {
 	Book* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-	guint _tmp7_ = 0U;
+	guint _tmp6_ = 0U;
 	GError * _inner_error_ = NULL;
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_print_operation_new ();
-#line 1165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1413 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	print = _tmp0_;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_print_operation_set_n_pages (print, (gint) _tmp3_);
-#line 1167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
-#line 5543 "ui.c"
+#line 1414 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_set (print, "n-pages", (gint) _tmp3_, NULL);
+#line 1415 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (print, "draw-page", (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self, 0);
+#line 6700 "ui.c"
 	{
-		GtkApplicationWindow* _tmp4_ = NULL;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->window;
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) _tmp4_, &_inner_error_);
-#line 1171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, (GtkWindow*) self, &_inner_error_);
+#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 5552 "ui.c"
+#line 6706 "ui.c"
 			goto __catch19_g_error;
 		}
 	}
@@ -5556,85 +6710,92 @@ static void user_interface_print_document (UserInterface* self) {
 	__catch19_g_error:
 	{
 		GError* e = NULL;
-		GError* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = e;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = _tmp5_->message;
-#line 1175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1175: Error printing: %s", _tmp6_);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = e;
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _tmp4_->message;
+#line 1423 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1423: Error printing: %s", _tmp5_);
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 5574 "ui.c"
+#line 6728 "ui.c"
 	}
 	__finally19:
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_object_unref0 (print);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1417 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5587 "ui.c"
+#line 6741 "ui.c"
 	}
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("draw-page", GTK_TYPE_PRINT_OPERATION, &_tmp7_, NULL, FALSE);
-#line 1178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
-#line 1163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("draw-page", GTK_TYPE_PRINT_OPERATION, &_tmp6_, NULL, FALSE);
+#line 1426 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (print, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _user_interface_draw_page_gtk_print_operation_draw_page, self);
+#line 1411 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (print);
-#line 5595 "ui.c"
+#line 6749 "ui.c"
 }
 
 
-void G_MODULE_EXPORT print_button_clicked_cb (GtkWidget* widget, UserInterface* self) {
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void user_interface_print_button_clicked_cb (UserInterface* self, GtkWidget* widget) {
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1182 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1430 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1184 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1432 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 5606 "ui.c"
+#line 6760 "ui.c"
+}
+
+
+static void _user_interface_print_button_clicked_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_print_button_clicked_cb ((UserInterface*) self, _sender);
+#line 6767 "ui.c"
 }
 
 
 void user_interface_print_document_activate_cb (UserInterface* self) {
-#line 1187 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1435 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_print_document (self);
-#line 5615 "ui.c"
+#line 6776 "ui.c"
 }
 
 
-static void user_interface_show_help (UserInterface* self) {
+static void user_interface_launch_help (UserInterface* self) {
 	GError * _inner_error_ = NULL;
-#line 1192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1440 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 5623 "ui.c"
+#line 6784 "ui.c"
 	{
-		GtkApplicationWindow* _tmp0_ = NULL;
+		GdkScreen* _tmp0_ = NULL;
 		GdkScreen* _tmp1_ = NULL;
 		guint32 _tmp2_ = 0U;
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp0_ = self->priv->window;
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = gtk_window_get_screen ((GtkWindow*) _tmp0_);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = gtk_window_get_screen ((GtkWindow*) self);
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = _tmp0_;
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = gtk_get_current_event_time ();
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_show_uri (_tmp1_, "help:simple-scan", _tmp2_, &_inner_error_);
-#line 1196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1444 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 5638 "ui.c"
+#line 6799 "ui.c"
 			goto __catch20_g_error;
 		}
 	}
@@ -5645,53 +6806,60 @@ static void user_interface_show_help (UserInterface* self) {
 		const gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = _ ("Unable to open help file");
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = e;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _tmp4_->message;
-#line 1200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1448 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_show_error_dialog (self, _tmp3_, _tmp5_);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 5663 "ui.c"
+#line 6824 "ui.c"
 	}
 	__finally20:
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1194 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 5674 "ui.c"
+#line 6835 "ui.c"
 	}
 }
 
 
-void G_MODULE_EXPORT help_contents_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void user_interface_help_contents_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1207 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1455 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1209 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_help (self);
-#line 5686 "ui.c"
+#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_launch_help (self);
+#line 6847 "ui.c"
+}
+
+
+static void _user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_help_contents_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 6854 "ui.c"
 }
 
 
 void user_interface_help_contents_activate_cb (UserInterface* self) {
-#line 1212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1460 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_help (self);
-#line 5695 "ui.c"
+#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_launch_help (self);
+#line 6863 "ui.c"
 }
 
 
@@ -5710,23 +6878,22 @@ static void user_interface_show_about (UserInterface* self) {
 	gchar* description = NULL;
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-	GtkApplicationWindow* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	const gchar* _tmp8_ = NULL;
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("Robert Ancell <robert.ancell@canonical.com>");
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_new0 (gchar*, 1 + 1);
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_[0] = _tmp0_;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = _tmp1_;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors_length1 = 1;
-#line 1219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_authors_size_ = authors_length1;
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _ ("This program is free software: you can redistribute it and/or modify\n" \
 "it under the terms of the GNU General Public License as published by\n" \
 "the Free Software Foundation, either version 3 of the License, or\n" \
@@ -5739,57 +6906,62 @@ static void user_interface_show_about (UserInterface* self) {
 "\n" \
 "You should have received a copy of the GNU General Public License\n" \
 "along with this program.  If not, see <http://www.gnu.org/licenses/>.");
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1222 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	license = _tmp3_;
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = _ ("About Simple Scan");
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	title = _tmp5_;
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _ ("Simple document scanning tool");
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 1228 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	description = _tmp7_;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = self->priv->window;
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = _ ("translator-credits");
-#line 1230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_show_about_dialog ((GtkWindow*) _tmp8_, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp9_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = _ ("translator-credits");
+#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_show_about_dialog ((GtkWindow*) self, "title", title, "program-name", "Simple Scan", "version", VERSION, "comments", description, "logo-icon-name", "scanner", "authors", authors, "translator-credits", _tmp8_, "website", "https://launchpad.net/simple-scan", "copyright", "Copyright © 2009-2011 Canonical Ltd.", "license", license, "wrap-license", TRUE, NULL, NULL);
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (description);
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (title);
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (license);
-#line 1217 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	authors = (_vala_array_free (authors, authors_length1, (GDestroyNotify) g_free), NULL);
-#line 5762 "ui.c"
+#line 6927 "ui.c"
 }
 
 
-void G_MODULE_EXPORT about_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void user_interface_about_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1246 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 5773 "ui.c"
+#line 6938 "ui.c"
+}
+
+
+static void _user_interface_about_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_about_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 6945 "ui.c"
 }
 
 
 void user_interface_about_activate_cb (UserInterface* self) {
-#line 1251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1253 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1501 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_show_about (self);
-#line 5782 "ui.c"
+#line 6954 "ui.c"
 }
 
 
@@ -5798,204 +6970,235 @@ static gboolean user_interface_on_quit (UserInterface* self) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-	GtkApplicationWindow* _tmp3_ = NULL;
-	guint _tmp4_ = 0U;
-	AutosaveManager* _tmp5_ = NULL;
-#line 1256 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	guint _tmp3_ = 0U;
+	AutosaveManager* _tmp4_ = NULL;
+#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = _ ("Save document before quitting?");
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Quit without Saving");
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_prompt_to_save (self, _tmp0_, _tmp1_);
-#line 1258 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = FALSE;
-#line 1262 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 5808 "ui.c"
+#line 6979 "ui.c"
 	}
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->window;
-#line 1264 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_destroy ((GtkWidget*) _tmp3_);
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->save_state_timeout;
-#line 1266 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_ != ((guint) 0)) {
-#line 1267 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_destroy ((GtkWidget*) self);
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->save_state_timeout;
+#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp3_ != ((guint) 0)) {
+#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, TRUE);
-#line 5820 "ui.c"
+#line 6989 "ui.c"
 	}
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp5_ = self->priv->autosave_manager;
-#line 1269 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	autosave_manager_cleanup (_tmp5_);
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->autosave_manager;
+#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	autosave_manager_cleanup (_tmp4_);
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = TRUE;
-#line 1271 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5830 "ui.c"
+#line 6999 "ui.c"
 }
 
 
-void G_MODULE_EXPORT quit_menuitem_activate_cb (GtkWidget* widget, UserInterface* self) {
-#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+static void user_interface_quit_menuitem_activate_cb (UserInterface* self, GtkWidget* widget) {
+#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1275 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1523 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1277 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 5841 "ui.c"
+#line 7010 "ui.c"
+}
+
+
+static void _user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_quit_menuitem_activate_cb ((UserInterface*) self, _sender);
+#line 7017 "ui.c"
 }
 
 
 void user_interface_quit_activate_cb (UserInterface* self) {
-#line 1280 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1282 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_on_quit (self);
-#line 5850 "ui.c"
+#line 7026 "ui.c"
 }
 
 
-gboolean G_MODULE_EXPORT simple_scan_window_configure_event_cb (GtkWidget* widget, GdkEventConfigure* event, UserInterface* self) {
+static gboolean user_interface_simple_scan_window_configure_event_cb (UserInterface* self, GtkWidget* widget, GdkEventConfigure* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->window_is_maximized;
-#line 1288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 5867 "ui.c"
-		GdkEventConfigure _tmp1_ = {0};
+#line 7043 "ui.c"
+		GdkEventConfigure* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-		GdkEventConfigure _tmp3_ = {0};
+		GdkEventConfigure* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp1_ = *event;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = _tmp1_.width;
-#line 1290 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp1_ = event;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_ = _tmp1_->width;
+#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = _tmp2_;
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = *event;
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = _tmp3_.height;
-#line 1291 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = event;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = _tmp3_->height;
+#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = _tmp4_;
-#line 1292 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1540 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 5886 "ui.c"
+#line 7062 "ui.c"
 	}
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1295 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5892 "ui.c"
+#line 7068 "ui.c"
+}
+
+
+static gboolean _user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event (GtkWidget* _sender, GdkEventConfigure* event, gpointer self) {
+	gboolean result;
+	result = user_interface_simple_scan_window_configure_event_cb ((UserInterface*) self, _sender, event);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 7077 "ui.c"
 }
 
 
 static void user_interface_info_bar_response_cb (UserInterface* self, GtkInfoBar* widget, gint response_id) {
 	gint _tmp0_ = 0;
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1298 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (widget != NULL);
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = response_id;
-#line 1300 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp0_ == 1) {
-#line 5906 "ui.c"
+#line 7091 "ui.c"
 		GtkComboBox* _tmp1_ = NULL;
 		GtkDialog* _tmp2_ = NULL;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->device_combo;
-#line 1302 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_widget_grab_focus ((GtkWidget*) _tmp1_);
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = self->priv->preferences_dialog;
-#line 1303 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1551 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_window_present ((GtkWindow*) _tmp2_);
-#line 5917 "ui.c"
+#line 7102 "ui.c"
 	} else {
-#line 1307 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1555 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->have_error = FALSE;
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_title);
-#line 1308 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_title = NULL;
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (self->priv->error_text);
-#line 1309 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->error_text = NULL;
-#line 1310 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_update_info_bar (self);
-#line 5931 "ui.c"
+#line 7116 "ui.c"
 	}
 }
 
 
-gboolean G_MODULE_EXPORT simple_scan_window_window_state_event_cb (GtkWidget* widget, GdkEventWindowState* event, UserInterface* self) {
+static gboolean user_interface_simple_scan_window_window_state_event_cb (UserInterface* self, GtkWidget* widget, GdkEventWindowState* event) {
 	gboolean result = FALSE;
-	GdkEventWindowState _tmp0_ = {0};
+	GdkEventWindowState* _tmp0_ = NULL;
 	GdkWindowState _tmp1_ = 0;
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1315 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = *event;
-#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _tmp0_.changed_mask;
-#line 1317 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = event;
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = _tmp0_->changed_mask;
+#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) {
-#line 5952 "ui.c"
-		GdkEventWindowState _tmp2_ = {0};
+#line 7137 "ui.c"
+		GdkEventWindowState* _tmp2_ = NULL;
 		GdkWindowState _tmp3_ = 0;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp2_ = *event;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = _tmp2_.new_window_state;
-#line 1319 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp2_ = event;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = _tmp2_->new_window_state;
+#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_is_maximized = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0;
-#line 1320 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_save_state (self, FALSE);
-#line 5963 "ui.c"
+#line 7148 "ui.c"
 	}
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1322 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1570 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5969 "ui.c"
+#line 7154 "ui.c"
 }
 
 
-gboolean G_MODULE_EXPORT window_delete_event_cb (GtkWidget* widget, GdkEvent* event, UserInterface* self) {
+static gboolean _user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self) {
+	gboolean result;
+	result = user_interface_simple_scan_window_window_state_event_cb ((UserInterface*) self, _sender, event);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 7163 "ui.c"
+}
+
+
+static gboolean user_interface_window_delete_event_cb (UserInterface* self, GtkWidget* widget, GdkEventAny* event) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (widget != NULL, FALSE);
-#line 1326 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1574 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_on_quit (self);
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = !_tmp0_;
-#line 1328 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 7182 "ui.c"
+}
+
+
+static gboolean _user_interface_window_delete_event_cb_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
+	gboolean result;
+	result = user_interface_window_delete_event_cb ((UserInterface*) self, _sender, event);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 5988 "ui.c"
+#line 7191 "ui.c"
 }
 
 
@@ -6009,37 +7212,37 @@ static void user_interface_page_size_changed_cb (UserInterface* self, Page* page
 	Page* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1331 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_width (_tmp0_);
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1333 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp2_;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = page;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_get_height (_tmp3_);
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1334 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp5_;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = page;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = page_get_dpi (_tmp6_);
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _tmp7_;
-#line 1335 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp8_;
-#line 1336 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 6032 "ui.c"
+#line 7235 "ui.c"
 }
 
 
@@ -6047,35 +7250,35 @@ static void user_interface_page_scan_direction_changed_cb (UserInterface* self,
 	Page* _tmp0_ = NULL;
 	ScanDirection _tmp1_ = 0;
 	ScanDirection _tmp2_ = 0;
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1339 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page_get_scan_direction (_tmp0_);
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1341 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp2_;
-#line 1342 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, FALSE);
-#line 6054 "ui.c"
+#line 7257 "ui.c"
 }
 
 
 static void _user_interface_page_size_changed_cb_page_size_changed (Page* _sender, gpointer self) {
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_size_changed_cb (self, _sender);
-#line 6061 "ui.c"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_size_changed_cb ((UserInterface*) self, _sender);
+#line 7264 "ui.c"
 }
 
 
 static void _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed (Page* _sender, gpointer self) {
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_scan_direction_changed_cb (self, _sender);
-#line 6068 "ui.c"
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_scan_direction_changed_cb ((UserInterface*) self, _sender);
+#line 7271 "ui.c"
 }
 
 
@@ -6086,35 +7289,46 @@ static void user_interface_page_added_cb (UserInterface* self, Book* book, Page*
 	ScanDirection _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
 	Page* _tmp5_ = NULL;
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1345 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1347 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1595 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_page_size_changed_cb (self, _tmp0_);
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = page;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page_get_scan_direction (_tmp1_);
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1348 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_scan_direction = _tmp3_;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page;
-#line 1349 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp4_, "size-changed", (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self, 0);
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = page;
-#line 1350 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1352 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp5_, "scan-direction-changed", (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self, 0);
+#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 6107 "ui.c"
+#line 7310 "ui.c"
+}
+
+
+static void user_interface_reordered_cb (UserInterface* self, Book* book) {
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (self != NULL);
+#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_if_fail (book != NULL);
+#line 1605 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_update_page_menu (self);
+#line 7321 "ui.c"
 }
 
 
@@ -6126,39 +7340,39 @@ static void user_interface_page_removed_cb (UserInterface* self, Book* book, Pag
 	Book* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	guint _tmp6_ = 0U;
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1355 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1608 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (page != NULL);
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = page;
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("size-changed", TYPE_PAGE, &_tmp1_, NULL, FALSE);
-#line 1357 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_size_changed_cb_page_size_changed, self);
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = page;
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_parse_name ("scan-direction-changed", TYPE_PAGE, &_tmp3_, NULL, FALSE);
-#line 1358 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1611 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_scan_direction_changed_cb_page_scan_direction_changed, self);
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = book;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book_get_n_pages (_tmp4_);
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1361 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp6_ == ((guint) 1)) {
-#line 1362 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		user_interface_add_default_page (self);
-#line 6147 "ui.c"
+#line 7361 "ui.c"
 	}
-#line 1364 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_page_menu (self);
-#line 6151 "ui.c"
+#line 7365 "ui.c"
 }
 
 
@@ -6172,224 +7386,227 @@ static void user_interface_set_dpi_combo (UserInterface* self, GtkComboBox* comb
 	GtkListStore* model = NULL;
 	GtkComboBox* _tmp5_ = NULL;
 	GtkTreeModel* _tmp6_ = NULL;
-	GtkListStore* _tmp7_ = NULL;
+	GtkTreeModel* _tmp7_ = NULL;
+	GtkListStore* _tmp8_ = NULL;
 	gint* scan_resolutions = NULL;
-	gint* _tmp8_ = NULL;
+	gint* _tmp9_ = NULL;
 	gint scan_resolutions_length1 = 0;
 	gint _scan_resolutions_size_ = 0;
-	gint* _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint* _tmp10_ = NULL;
+	gint _tmp10__length1 = 0;
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (combo != NULL);
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1369 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	renderer = _tmp0_;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = combo;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = renderer;
-#line 1370 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp1_, (GtkCellRenderer*) _tmp2_, TRUE);
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = combo;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = renderer;
-#line 1371 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1624 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp3_, (GtkCellRenderer*) _tmp4_, "text", 1);
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = combo;
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = gtk_combo_box_get_model (_tmp5_);
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1373 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	model = _tmp7_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = g_new0 (gint, 6);
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_[0] = 75;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_[1] = 150;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_[2] = 300;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_[3] = 600;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_[4] = 1200;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_[5] = 2400;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	scan_resolutions = _tmp8_;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = _tmp6_;
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, GTK_TYPE_LIST_STORE) ? ((GtkListStore*) _tmp7_) : NULL);
+#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	model = _tmp8_;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = g_new0 (gint, 6);
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_[0] = 75;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_[1] = 150;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_[2] = 300;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_[3] = 600;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_[4] = 1200;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_[5] = 2400;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	scan_resolutions = _tmp9_;
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions_length1 = 6;
-#line 1374 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1627 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_scan_resolutions_size_ = scan_resolutions_length1;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = scan_resolutions;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9__length1 = scan_resolutions_length1;
-#line 6226 "ui.c"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = scan_resolutions;
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10__length1 = scan_resolutions_length1;
+#line 7443 "ui.c"
 	{
 		gint* dpi_collection = NULL;
 		gint dpi_collection_length1 = 0;
 		gint _dpi_collection_size_ = 0;
 		gint dpi_it = 0;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi_collection = _tmp9_;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dpi_collection_length1 = _tmp9__length1;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		for (dpi_it = 0; dpi_it < _tmp9__length1; dpi_it = dpi_it + 1) {
-#line 6238 "ui.c"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		dpi_collection = _tmp10_;
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		dpi_collection_length1 = _tmp10__length1;
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		for (dpi_it = 0; dpi_it < _tmp10__length1; dpi_it = dpi_it + 1) {
+#line 7455 "ui.c"
 			gint dpi = 0;
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			dpi = dpi_collection[dpi_it];
-#line 6242 "ui.c"
+#line 7459 "ui.c"
 			{
 				gchar* label = NULL;
-				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
+				gint _tmp12_ = 0;
 				GtkTreeIter iter = {0};
-				GtkListStore* _tmp26_ = NULL;
-				GtkTreeIter _tmp27_ = {0};
-				GtkListStore* _tmp28_ = NULL;
-				GtkTreeIter _tmp29_ = {0};
-				gint _tmp30_ = 0;
-				const gchar* _tmp31_ = NULL;
-				gint _tmp32_ = 0;
+				GtkListStore* _tmp27_ = NULL;
+				GtkTreeIter _tmp28_ = {0};
+				GtkListStore* _tmp29_ = NULL;
+				GtkTreeIter _tmp30_ = {0};
+				gint _tmp31_ = 0;
+				const gchar* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp10_ = dpi;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp11_ = default_dpi;
-#line 1378 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp10_ == _tmp11_) {
-#line 6262 "ui.c"
-					const gchar* _tmp12_ = NULL;
-					gint _tmp13_ = 0;
-					gchar* _tmp14_ = NULL;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp12_ = _ ("%d dpi (default)");
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp13_ = dpi;
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp14_ = g_strdup_printf (_tmp12_, _tmp13_);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gint _tmp34_ = 0;
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp11_ = dpi;
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp12_ = default_dpi;
+#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp11_ == _tmp12_) {
+#line 7479 "ui.c"
+					const gchar* _tmp13_ = NULL;
+					gint _tmp14_ = 0;
+					gchar* _tmp15_ = NULL;
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp13_ = _ ("%d dpi (default)");
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp14_ = dpi;
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp15_ = g_strdup_printf (_tmp13_, _tmp14_);
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 					_g_free0 (label);
-#line 1380 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					label = _tmp14_;
-#line 6276 "ui.c"
+#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					label = _tmp15_;
+#line 7493 "ui.c"
 				} else {
-					gint _tmp15_ = 0;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp15_ = dpi;
-#line 1381 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					if (_tmp15_ == 75) {
-#line 6283 "ui.c"
-						const gchar* _tmp16_ = NULL;
-						gint _tmp17_ = 0;
-						gchar* _tmp18_ = NULL;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp16_ = _ ("%d dpi (draft)");
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp17_ = dpi;
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gint _tmp16_ = 0;
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp16_ = dpi;
+#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					if (_tmp16_ == 75) {
+#line 7500 "ui.c"
+						const gchar* _tmp17_ = NULL;
+						gint _tmp18_ = 0;
+						gchar* _tmp19_ = NULL;
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp17_ = _ ("%d dpi (draft)");
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp18_ = dpi;
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp19_ = g_strdup_printf (_tmp17_, _tmp18_);
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 						_g_free0 (label);
-#line 1383 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						label = _tmp18_;
-#line 6297 "ui.c"
+#line 1636 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						label = _tmp19_;
+#line 7514 "ui.c"
 					} else {
-						gint _tmp19_ = 0;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						_tmp19_ = dpi;
-#line 1384 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-						if (_tmp19_ == 1200) {
-#line 6304 "ui.c"
-							const gchar* _tmp20_ = NULL;
-							gint _tmp21_ = 0;
-							gchar* _tmp22_ = NULL;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp20_ = _ ("%d dpi (high resolution)");
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp21_ = dpi;
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp22_ = g_strdup_printf (_tmp20_, _tmp21_);
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						gint _tmp20_ = 0;
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						_tmp20_ = dpi;
+#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+						if (_tmp20_ == 1200) {
+#line 7521 "ui.c"
+							const gchar* _tmp21_ = NULL;
+							gint _tmp22_ = 0;
+							gchar* _tmp23_ = NULL;
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp21_ = _ ("%d dpi (high resolution)");
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp22_ = dpi;
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp23_ = g_strdup_printf (_tmp21_, _tmp22_);
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1386 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							label = _tmp22_;
-#line 6318 "ui.c"
+#line 1639 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							label = _tmp23_;
+#line 7535 "ui.c"
 						} else {
-							const gchar* _tmp23_ = NULL;
-							gint _tmp24_ = 0;
-							gchar* _tmp25_ = NULL;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp23_ = _ ("%d dpi");
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp24_ = dpi;
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							_tmp25_ = g_strdup_printf (_tmp23_, _tmp24_);
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							const gchar* _tmp24_ = NULL;
+							gint _tmp25_ = 0;
+							gchar* _tmp26_ = NULL;
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp24_ = _ ("%d dpi");
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp25_ = dpi;
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							_tmp26_ = g_strdup_printf (_tmp24_, _tmp25_);
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 							_g_free0 (label);
-#line 1389 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-							label = _tmp25_;
-#line 6333 "ui.c"
+#line 1642 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+							label = _tmp26_;
+#line 7550 "ui.c"
 						}
 					}
 				}
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp26_ = model;
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_list_store_append (_tmp26_, &_tmp27_);
-#line 1392 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				iter = _tmp27_;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp28_ = model;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp29_ = iter;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp30_ = dpi;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp31_ = label;
-#line 1393 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				gtk_list_store_set (_tmp28_, &_tmp29_, 0, _tmp30_, 1, _tmp31_, -1, -1);
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp32_ = dpi;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				_tmp33_ = current_dpi;
-#line 1395 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-				if (_tmp32_ == _tmp33_) {
-#line 6359 "ui.c"
-					GtkComboBox* _tmp34_ = NULL;
-					GtkTreeIter _tmp35_ = {0};
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp34_ = combo;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					_tmp35_ = iter;
-#line 1396 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-					gtk_combo_box_set_active_iter (_tmp34_, &_tmp35_);
-#line 6368 "ui.c"
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp27_ = model;
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_list_store_append (_tmp27_, &_tmp28_);
+#line 1645 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				iter = _tmp28_;
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp29_ = model;
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp30_ = iter;
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp31_ = dpi;
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp32_ = label;
+#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				gtk_list_store_set (_tmp29_, &_tmp30_, 0, _tmp31_, 1, _tmp32_, -1, -1);
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp33_ = dpi;
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				_tmp34_ = current_dpi;
+#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+				if (_tmp33_ == _tmp34_) {
+#line 7576 "ui.c"
+					GtkComboBox* _tmp35_ = NULL;
+					GtkTreeIter _tmp36_ = {0};
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp35_ = combo;
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					_tmp36_ = iter;
+#line 1649 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+					gtk_combo_box_set_active_iter (_tmp35_, &_tmp36_);
+#line 7585 "ui.c"
 				}
-#line 1375 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1628 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				_g_free0 (label);
-#line 6372 "ui.c"
+#line 7589 "ui.c"
 			}
 		}
 	}
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	scan_resolutions = (g_free (scan_resolutions), NULL);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (model);
-#line 1367 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 6382 "ui.c"
+#line 7599 "ui.c"
 }
 
 
@@ -6398,312 +7615,269 @@ static void user_interface_needs_saving_cb (UserInterface* self, Book* book) {
 	Book* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	GtkToolButton* _tmp4_ = NULL;
+	GtkButton* _tmp4_ = NULL;
 	Book* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-	Book* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
+	GtkToolButton* _tmp8_ = NULL;
+	Book* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
-	GtkMenuItem* _tmp12_ = NULL;
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gboolean _tmp11_ = FALSE;
+	Book* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
+	gboolean _tmp14_ = FALSE;
+	GtkMenuItem* _tmp16_ = NULL;
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1400 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (book != NULL);
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->save_menuitem;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_needs_saving (_tmp1_);
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1402 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1655 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp0_, _tmp3_);
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = self->priv->save_toolbutton;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->save_button;
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = book;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = book_get_needs_saving (_tmp5_);
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = _tmp6_;
-#line 1403 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1656 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp4_, _tmp7_);
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp8_ = book;
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp9_ = book_get_needs_saving (_tmp8_);
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp10_ = _tmp9_;
-#line 1404 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp10_) {
-#line 6431 "ui.c"
-		GtkMenuItem* _tmp11_ = NULL;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = self->priv->save_as_menuitem;
-#line 1405 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_sensitive ((GtkWidget*) _tmp11_, TRUE);
-#line 6437 "ui.c"
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = self->priv->save_toolbutton;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = book;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = book_get_needs_saving (_tmp9_);
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = _tmp10_;
+#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp8_, _tmp11_);
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = book;
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = book_get_needs_saving (_tmp12_);
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = _tmp13_;
+#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp14_) {
+#line 7662 "ui.c"
+		GtkMenuItem* _tmp15_ = NULL;
+#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = self->priv->save_as_menuitem;
+#line 1659 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_sensitive ((GtkWidget*) _tmp15_, TRUE);
+#line 7668 "ui.c"
 	}
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = self->priv->copy_to_clipboard_menuitem;
-#line 1406 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_set_sensitive ((GtkWidget*) _tmp12_, TRUE);
-#line 6443 "ui.c"
-}
-
-
-static gboolean user_interface_has_app_menu (UserInterface* self, GtkApplication* app) {
-	gboolean result = FALSE;
-	GtkSettings* gtk_settings = NULL;
-	GtkSettings* _tmp0_ = NULL;
-	GtkSettings* _tmp1_ = NULL;
-	gboolean show_app_menu = FALSE;
-	gboolean show_menubar = FALSE;
-	GtkSettings* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp6_ = FALSE;
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1409 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (app != NULL, FALSE);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = gtk_settings_get_default ();
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1416 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_settings = _tmp1_;
-#line 1418 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_app_menu = FALSE;
-#line 1419 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	show_menubar = TRUE;
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp2_ = gtk_settings;
-#line 1420 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_get ((GObject*) _tmp2_, "gtk-shell-shows-app-menu", &show_app_menu, "gtk-shell-shows-menubar", &show_menubar, NULL, NULL);
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp4_ = show_app_menu;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp4_) {
-#line 6480 "ui.c"
-		gboolean _tmp5_ = FALSE;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = show_menubar;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = !_tmp5_;
-#line 6486 "ui.c"
-	} else {
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = FALSE;
-#line 6490 "ui.c"
-	}
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp6_ = _tmp3_;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = _tmp6_;
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (gtk_settings);
-#line 1422 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return result;
-#line 6500 "ui.c"
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = self->priv->copy_to_clipboard_menuitem;
+#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_sensitive ((GtkWidget*) _tmp16_, TRUE);
+#line 7674 "ui.c"
 }
 
 
 static void _user_interface_info_bar_response_cb_gtk_info_bar_response (GtkInfoBar* _sender, gint response_id, gpointer self) {
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_info_bar_response_cb (self, _sender, response_id);
-#line 6507 "ui.c"
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_info_bar_response_cb ((UserInterface*) self, _sender, response_id);
+#line 7681 "ui.c"
 }
 
 
-static void __lambda4_ (UserInterface* self) {
+static void __lambda10_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_text_dpi (self);
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "text-dpi", _tmp1_);
-#line 6520 "ui.c"
+#line 7694 "ui.c"
 }
 
 
-static void ___lambda4__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda4_ (self);
-#line 6527 "ui.c"
+static void ___lambda10__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda10_ ((UserInterface*) self);
+#line 7701 "ui.c"
 }
 
 
-static void __lambda5_ (UserInterface* self) {
+static void __lambda11_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_photo_dpi (self);
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "photo-dpi", _tmp1_);
-#line 6540 "ui.c"
+#line 7714 "ui.c"
 }
 
 
-static void ___lambda5__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda5_ (self);
-#line 6547 "ui.c"
+static void ___lambda11__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda11_ ((UserInterface*) self);
+#line 7721 "ui.c"
 }
 
 
-static void __lambda6_ (UserInterface* self) {
+static void __lambda12_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	ScanType _tmp1_ = 0;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_page_side (self);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_enum (_tmp0_, "page-side", (gint) _tmp1_);
-#line 6560 "ui.c"
+#line 7734 "ui.c"
 }
 
 
-static void ___lambda6__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda6_ (self);
-#line 6567 "ui.c"
+static void ___lambda12__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda12_ ((UserInterface*) self);
+#line 7741 "ui.c"
 }
 
 
-static void __lambda7_ (UserInterface* self) {
+static void __lambda13_ (UserInterface* self) {
 	gint w = 0;
 	gint h = 0;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	GSettings* _tmp2_ = NULL;
 	GSettings* _tmp3_ = NULL;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_get_paper_size (self, &_tmp0_, &_tmp1_);
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	w = _tmp0_;
-#line 1571 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	h = _tmp1_;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->settings;
-#line 1572 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1799 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp2_, "paper-width", w);
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->settings;
-#line 1573 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp3_, "paper-height", h);
-#line 6592 "ui.c"
+#line 7766 "ui.c"
 }
 
 
-static void ___lambda7__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda7_ (self);
-#line 6599 "ui.c"
+static void ___lambda13__gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda13_ ((UserInterface*) self);
+#line 7773 "ui.c"
 }
 
 
-static void __lambda8_ (UserInterface* self) {
+static void __lambda14_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_brightness (self);
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "brightness", _tmp2_);
-#line 6615 "ui.c"
+#line 7789 "ui.c"
 }
 
 
-static void ___lambda8__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda8_ (self);
-#line 6622 "ui.c"
+static void ___lambda14__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda14_ ((UserInterface*) self);
+#line 7796 "ui.c"
 }
 
 
-static void __lambda9_ (UserInterface* self) {
+static void __lambda15_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_contrast (self);
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "contrast", _tmp2_);
-#line 6638 "ui.c"
+#line 7812 "ui.c"
 }
 
 
-static void ___lambda9__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda9_ (self);
-#line 6645 "ui.c"
+static void ___lambda15__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda15_ ((UserInterface*) self);
+#line 7819 "ui.c"
 }
 
 
-static void __lambda10_ (UserInterface* self) {
+static void __lambda16_ (UserInterface* self) {
 	GSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->settings;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = user_interface_get_quality (self);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_settings_set_int (_tmp0_, "jpeg-quality", _tmp2_);
-#line 6661 "ui.c"
+#line 7835 "ui.c"
 }
 
 
-static void ___lambda10__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	__lambda10_ (self);
-#line 6668 "ui.c"
+static void ___lambda16__gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__lambda16_ ((UserInterface*) self);
+#line 7842 "ui.c"
 }
 
 
 static void _user_interface_page_selected_cb_book_view_page_selected (BookView* _sender, Page* page, gpointer self) {
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_page_selected_cb (self, _sender, page);
-#line 6675 "ui.c"
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_page_selected_cb ((UserInterface*) self, _sender, page);
+#line 7849 "ui.c"
 }
 
 
 static void _user_interface_show_page_cb_book_view_show_page (BookView* _sender, Page* page, gpointer self) {
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_page_cb (self, _sender, page);
-#line 6682 "ui.c"
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_show_page_cb ((UserInterface*) self, _sender, page);
+#line 7856 "ui.c"
 }
 
 
 static void _user_interface_show_page_menu_cb_book_view_show_menu (BookView* _sender, gpointer self) {
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_show_page_menu_cb (self, _sender);
-#line 6689 "ui.c"
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_show_page_menu_cb ((UserInterface*) self, _sender);
+#line 7863 "ui.c"
 }
 
 
 static void _user_interface_book_saving_cb_book_saving (Book* _sender, gint i, gpointer self) {
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_book_saving_cb (self, i);
-#line 6696 "ui.c"
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_book_saving_cb ((UserInterface*) self, i);
+#line 7870 "ui.c"
 }
 
 
@@ -6712,1494 +7886,1125 @@ static void user_interface_load (UserInterface* self) {
 	GtkApplication* app = NULL;
 	GApplication* _tmp1_ = NULL;
 	GtkApplication* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GtkBuilder* _tmp12_ = NULL;
-	GtkBuilder* _tmp13_ = NULL;
-	GObject* _tmp14_ = NULL;
-	GtkApplicationWindow* _tmp15_ = NULL;
-	GtkApplication* _tmp16_ = NULL;
-	GtkApplicationWindow* _tmp17_ = NULL;
-	GtkBuilder* _tmp18_ = NULL;
-	GObject* _tmp19_ = NULL;
-	GtkMenuBar* _tmp20_ = NULL;
-	GtkApplication* _tmp21_ = NULL;
-	gboolean _tmp22_ = FALSE;
-	GtkBuilder* _tmp30_ = NULL;
-	GObject* _tmp31_ = NULL;
-	GtkBox* _tmp32_ = NULL;
-	GtkBuilder* _tmp33_ = NULL;
-	GObject* _tmp34_ = NULL;
-	GtkMenuItem* _tmp35_ = NULL;
-	GtkBuilder* _tmp36_ = NULL;
-	GObject* _tmp37_ = NULL;
-	GtkMenuItem* _tmp38_ = NULL;
-	GtkBuilder* _tmp39_ = NULL;
-	GObject* _tmp40_ = NULL;
-	GtkMenuItem* _tmp41_ = NULL;
-	GtkBuilder* _tmp42_ = NULL;
-	GObject* _tmp43_ = NULL;
-	GtkMenuItem* _tmp44_ = NULL;
-	GtkBuilder* _tmp45_ = NULL;
-	GObject* _tmp46_ = NULL;
-	GtkMenuItem* _tmp47_ = NULL;
-	GtkBuilder* _tmp48_ = NULL;
-	GObject* _tmp49_ = NULL;
-	GtkMenuItem* _tmp50_ = NULL;
-	GtkBuilder* _tmp51_ = NULL;
-	GObject* _tmp52_ = NULL;
-	GtkMenuItem* _tmp53_ = NULL;
-	GtkBuilder* _tmp54_ = NULL;
-	GObject* _tmp55_ = NULL;
-	GtkToolButton* _tmp56_ = NULL;
-	GtkBuilder* _tmp57_ = NULL;
-	GObject* _tmp58_ = NULL;
-	GtkMenuItem* _tmp59_ = NULL;
-	GtkBuilder* _tmp60_ = NULL;
-	GObject* _tmp61_ = NULL;
-	GtkToolButton* _tmp62_ = NULL;
-	GtkBuilder* _tmp63_ = NULL;
-	GObject* _tmp64_ = NULL;
-	GtkRadioMenuItem* _tmp65_ = NULL;
-	GtkBuilder* _tmp66_ = NULL;
-	GObject* _tmp67_ = NULL;
-	GtkRadioMenuItem* _tmp68_ = NULL;
-	GtkBuilder* _tmp69_ = NULL;
-	GObject* _tmp70_ = NULL;
-	GtkRadioMenuItem* _tmp71_ = NULL;
-	GtkBuilder* _tmp72_ = NULL;
-	GObject* _tmp73_ = NULL;
-	GtkRadioMenuItem* _tmp74_ = NULL;
-	GtkBuilder* _tmp75_ = NULL;
-	GObject* _tmp76_ = NULL;
-	GtkDialog* _tmp77_ = NULL;
-	GtkBuilder* _tmp78_ = NULL;
-	GObject* _tmp79_ = NULL;
-	GtkLabel* _tmp80_ = NULL;
-	GtkBuilder* _tmp81_ = NULL;
-	GObject* _tmp82_ = NULL;
-	GtkEntry* _tmp83_ = NULL;
-	GtkBuilder* _tmp84_ = NULL;
-	GObject* _tmp85_ = NULL;
-	GtkEntry* _tmp86_ = NULL;
-	GtkBuilder* _tmp87_ = NULL;
-	GObject* _tmp88_ = NULL;
-	GtkDialog* _tmp89_ = NULL;
-	GtkBuilder* _tmp90_ = NULL;
-	GObject* _tmp91_ = NULL;
-	GtkComboBox* _tmp92_ = NULL;
-	GtkComboBox* _tmp93_ = NULL;
-	GtkTreeModel* _tmp94_ = NULL;
-	GtkListStore* _tmp95_ = NULL;
-	GtkBuilder* _tmp96_ = NULL;
-	GObject* _tmp97_ = NULL;
-	GtkComboBox* _tmp98_ = NULL;
-	GtkComboBox* _tmp99_ = NULL;
-	GtkTreeModel* _tmp100_ = NULL;
-	GtkListStore* _tmp101_ = NULL;
-	GtkBuilder* _tmp102_ = NULL;
-	GObject* _tmp103_ = NULL;
-	GtkComboBox* _tmp104_ = NULL;
-	GtkComboBox* _tmp105_ = NULL;
-	GtkTreeModel* _tmp106_ = NULL;
-	GtkListStore* _tmp107_ = NULL;
-	GtkBuilder* _tmp108_ = NULL;
-	GObject* _tmp109_ = NULL;
-	GtkComboBox* _tmp110_ = NULL;
-	GtkComboBox* _tmp111_ = NULL;
-	GtkTreeModel* _tmp112_ = NULL;
-	GtkListStore* _tmp113_ = NULL;
-	GtkBuilder* _tmp114_ = NULL;
-	GObject* _tmp115_ = NULL;
-	GtkComboBox* _tmp116_ = NULL;
-	GtkComboBox* _tmp117_ = NULL;
-	GtkTreeModel* _tmp118_ = NULL;
-	GtkListStore* _tmp119_ = NULL;
-	GtkBuilder* _tmp120_ = NULL;
-	GObject* _tmp121_ = NULL;
-	GtkScale* _tmp122_ = NULL;
-	GtkScale* _tmp123_ = NULL;
-	GtkAdjustment* _tmp124_ = NULL;
-	GtkAdjustment* _tmp125_ = NULL;
-	GtkBuilder* _tmp126_ = NULL;
-	GObject* _tmp127_ = NULL;
-	GtkScale* _tmp128_ = NULL;
-	GtkScale* _tmp129_ = NULL;
-	GtkAdjustment* _tmp130_ = NULL;
-	GtkAdjustment* _tmp131_ = NULL;
-	GtkBuilder* _tmp132_ = NULL;
-	GObject* _tmp133_ = NULL;
-	GtkScale* _tmp134_ = NULL;
-	GtkScale* _tmp135_ = NULL;
-	GtkAdjustment* _tmp136_ = NULL;
-	GtkAdjustment* _tmp137_ = NULL;
-	GtkInfoBar* _tmp138_ = NULL;
-	GtkInfoBar* _tmp139_ = NULL;
-	GtkBox* _tmp140_ = NULL;
-	GtkInfoBar* _tmp141_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	gboolean _tmp4_ = FALSE;
+	GtkApplication* _tmp54_ = NULL;
+	GtkInfoBar* _tmp55_ = NULL;
+	GtkInfoBar* _tmp56_ = NULL;
+	GtkBox* _tmp57_ = NULL;
+	GtkInfoBar* _tmp58_ = NULL;
 	GtkBox* hbox = NULL;
-	GtkBox* _tmp142_ = NULL;
+	GtkBox* _tmp59_ = NULL;
 	GtkContainer* content_area = NULL;
-	GtkInfoBar* _tmp143_ = NULL;
-	GtkContainer* _tmp144_ = NULL;
-	GtkContainer* _tmp145_ = NULL;
-	GtkContainer* _tmp146_ = NULL;
-	GtkBox* _tmp147_ = NULL;
-	GtkBox* _tmp148_ = NULL;
-	GtkImage* _tmp149_ = NULL;
-	GtkBox* _tmp150_ = NULL;
-	GtkImage* _tmp151_ = NULL;
-	GtkImage* _tmp152_ = NULL;
-	GtkLabel* _tmp153_ = NULL;
-	GtkLabel* _tmp154_ = NULL;
-	GtkBox* _tmp155_ = NULL;
-	GtkLabel* _tmp156_ = NULL;
-	GtkLabel* _tmp157_ = NULL;
-	GtkInfoBar* _tmp158_ = NULL;
-	const gchar* _tmp159_ = NULL;
-	GtkButton* _tmp160_ = NULL;
-	GtkButton* _tmp161_ = NULL;
-	GtkInfoBar* _tmp162_ = NULL;
-	const gchar* _tmp163_ = NULL;
-	GtkButton* _tmp164_ = NULL;
-	GtkButton* _tmp165_ = NULL;
+	GtkInfoBar* _tmp60_ = NULL;
+	GtkContainer* _tmp61_ = NULL;
+	GtkContainer* _tmp62_ = NULL;
+	GtkContainer* _tmp63_ = NULL;
+	GtkBox* _tmp64_ = NULL;
+	GtkBox* _tmp65_ = NULL;
+	GtkImage* _tmp66_ = NULL;
+	GtkBox* _tmp67_ = NULL;
+	GtkImage* _tmp68_ = NULL;
+	GtkImage* _tmp69_ = NULL;
+	GtkLabel* _tmp70_ = NULL;
+	GtkLabel* _tmp71_ = NULL;
+	GtkBox* _tmp72_ = NULL;
+	GtkLabel* _tmp73_ = NULL;
+	GtkLabel* _tmp74_ = NULL;
+	GtkInfoBar* _tmp75_ = NULL;
+	const gchar* _tmp76_ = NULL;
+	GtkButton* _tmp77_ = NULL;
+	GtkButton* _tmp78_ = NULL;
+	GtkInfoBar* _tmp79_ = NULL;
+	const gchar* _tmp80_ = NULL;
+	GtkButton* _tmp81_ = NULL;
+	GtkButton* _tmp82_ = NULL;
 	GtkTreeIter iter = {0};
-	GtkListStore* _tmp166_ = NULL;
-	GtkTreeIter _tmp167_ = {0};
-	GtkListStore* _tmp168_ = NULL;
-	GtkTreeIter _tmp169_ = {0};
-	const gchar* _tmp170_ = NULL;
-	GtkListStore* _tmp171_ = NULL;
-	GtkTreeIter _tmp172_ = {0};
-	GtkListStore* _tmp173_ = NULL;
-	GtkTreeIter _tmp174_ = {0};
-	GtkListStore* _tmp175_ = NULL;
-	GtkTreeIter _tmp176_ = {0};
-	GtkListStore* _tmp177_ = NULL;
-	GtkTreeIter _tmp178_ = {0};
-	GtkListStore* _tmp179_ = NULL;
-	GtkTreeIter _tmp180_ = {0};
-	GtkListStore* _tmp181_ = NULL;
-	GtkTreeIter _tmp182_ = {0};
-	GtkListStore* _tmp183_ = NULL;
-	GtkTreeIter _tmp184_ = {0};
-	GtkListStore* _tmp185_ = NULL;
-	GtkTreeIter _tmp186_ = {0};
-	GtkListStore* _tmp187_ = NULL;
-	GtkTreeIter _tmp188_ = {0};
-	GtkListStore* _tmp189_ = NULL;
-	GtkTreeIter _tmp190_ = {0};
-	GtkListStore* _tmp191_ = NULL;
-	GtkTreeIter _tmp192_ = {0};
-	GtkListStore* _tmp193_ = NULL;
-	GtkTreeIter _tmp194_ = {0};
+	GtkListStore* _tmp83_ = NULL;
+	GtkTreeIter _tmp84_ = {0};
+	GtkListStore* _tmp85_ = NULL;
+	GtkTreeIter _tmp86_ = {0};
+	const gchar* _tmp87_ = NULL;
+	GtkListStore* _tmp88_ = NULL;
+	GtkTreeIter _tmp89_ = {0};
+	GtkListStore* _tmp90_ = NULL;
+	GtkTreeIter _tmp91_ = {0};
+	GtkListStore* _tmp92_ = NULL;
+	GtkTreeIter _tmp93_ = {0};
+	GtkListStore* _tmp94_ = NULL;
+	GtkTreeIter _tmp95_ = {0};
+	GtkListStore* _tmp96_ = NULL;
+	GtkTreeIter _tmp97_ = {0};
+	GtkListStore* _tmp98_ = NULL;
+	GtkTreeIter _tmp99_ = {0};
+	GtkListStore* _tmp100_ = NULL;
+	GtkTreeIter _tmp101_ = {0};
+	GtkListStore* _tmp102_ = NULL;
+	GtkTreeIter _tmp103_ = {0};
+	GtkListStore* _tmp104_ = NULL;
+	GtkTreeIter _tmp105_ = {0};
+	GtkListStore* _tmp106_ = NULL;
+	GtkTreeIter _tmp107_ = {0};
+	GtkListStore* _tmp108_ = NULL;
+	GtkTreeIter _tmp109_ = {0};
+	GtkListStore* _tmp110_ = NULL;
+	GtkTreeIter _tmp111_ = {0};
 	gint dpi = 0;
-	GSettings* _tmp195_ = NULL;
-	gint _tmp196_ = 0;
-	gint _tmp197_ = 0;
-	GtkComboBox* _tmp198_ = NULL;
-	gint _tmp199_ = 0;
-	GtkComboBox* _tmp200_ = NULL;
-	GSettings* _tmp201_ = NULL;
-	gint _tmp202_ = 0;
-	gint _tmp203_ = 0;
-	GtkComboBox* _tmp204_ = NULL;
-	gint _tmp205_ = 0;
-	GtkComboBox* _tmp206_ = NULL;
+	GSettings* _tmp112_ = NULL;
+	gint _tmp113_ = 0;
+	gint _tmp114_ = 0;
+	GtkComboBox* _tmp115_ = NULL;
+	gint _tmp116_ = 0;
+	GtkComboBox* _tmp117_ = NULL;
+	GSettings* _tmp118_ = NULL;
+	gint _tmp119_ = 0;
+	gint _tmp120_ = 0;
+	GtkComboBox* _tmp121_ = NULL;
+	gint _tmp122_ = 0;
+	GtkComboBox* _tmp123_ = NULL;
 	GtkCellRendererText* renderer = NULL;
-	GtkCellRendererText* _tmp207_ = NULL;
-	GtkComboBox* _tmp208_ = NULL;
-	GtkCellRendererText* _tmp209_ = NULL;
-	GtkComboBox* _tmp210_ = NULL;
-	GtkCellRendererText* _tmp211_ = NULL;
-	GtkCellRendererText* _tmp212_ = NULL;
-	GtkComboBox* _tmp213_ = NULL;
-	GtkCellRendererText* _tmp214_ = NULL;
-	GtkComboBox* _tmp215_ = NULL;
-	GtkCellRendererText* _tmp216_ = NULL;
-	GSettings* _tmp217_ = NULL;
-	gint _tmp218_ = 0;
-	GtkComboBox* _tmp219_ = NULL;
-	GtkCellRendererText* _tmp220_ = NULL;
-	GtkComboBox* _tmp221_ = NULL;
-	GtkCellRendererText* _tmp222_ = NULL;
-	GtkComboBox* _tmp223_ = NULL;
-	GtkCellRendererText* _tmp224_ = NULL;
+	GtkCellRendererText* _tmp124_ = NULL;
+	GtkComboBox* _tmp125_ = NULL;
+	GtkCellRendererText* _tmp126_ = NULL;
+	GtkComboBox* _tmp127_ = NULL;
+	GtkCellRendererText* _tmp128_ = NULL;
+	GtkCellRendererText* _tmp129_ = NULL;
+	GtkComboBox* _tmp130_ = NULL;
+	GtkCellRendererText* _tmp131_ = NULL;
+	GtkComboBox* _tmp132_ = NULL;
+	GtkCellRendererText* _tmp133_ = NULL;
+	GSettings* _tmp134_ = NULL;
+	gint _tmp135_ = 0;
+	GtkComboBox* _tmp136_ = NULL;
+	GtkCellRendererText* _tmp137_ = NULL;
+	GtkComboBox* _tmp138_ = NULL;
+	GtkCellRendererText* _tmp139_ = NULL;
+	GtkComboBox* _tmp140_ = NULL;
+	GtkCellRendererText* _tmp141_ = NULL;
 	gint paper_width = 0;
-	GSettings* _tmp225_ = NULL;
-	gint _tmp226_ = 0;
+	GSettings* _tmp142_ = NULL;
+	gint _tmp143_ = 0;
 	gint paper_height = 0;
-	GSettings* _tmp227_ = NULL;
-	gint _tmp228_ = 0;
-	gint _tmp229_ = 0;
-	gint _tmp230_ = 0;
-	GtkComboBox* _tmp231_ = NULL;
+	GSettings* _tmp144_ = NULL;
+	gint _tmp145_ = 0;
+	gint _tmp146_ = 0;
+	gint _tmp147_ = 0;
+	GtkComboBox* _tmp148_ = NULL;
 	gdouble lower = 0.0;
-	GtkAdjustment* _tmp232_ = NULL;
-	gdouble _tmp233_ = 0.0;
+	GtkAdjustment* _tmp149_ = NULL;
+	gdouble _tmp150_ = 0.0;
+	gdouble _tmp151_ = 0.0;
 	gchar* darker_label = NULL;
-	const gchar* _tmp234_ = NULL;
-	gchar* _tmp235_ = NULL;
+	const gchar* _tmp152_ = NULL;
+	gchar* _tmp153_ = NULL;
 	gdouble upper = 0.0;
-	GtkAdjustment* _tmp236_ = NULL;
-	gdouble _tmp237_ = 0.0;
+	GtkAdjustment* _tmp154_ = NULL;
+	gdouble _tmp155_ = 0.0;
+	gdouble _tmp156_ = 0.0;
 	gchar* lighter_label = NULL;
-	const gchar* _tmp238_ = NULL;
-	gchar* _tmp239_ = NULL;
-	GtkScale* _tmp240_ = NULL;
-	gdouble _tmp241_ = 0.0;
-	const gchar* _tmp242_ = NULL;
-	GtkScale* _tmp243_ = NULL;
-	GtkScale* _tmp244_ = NULL;
-	gdouble _tmp245_ = 0.0;
-	const gchar* _tmp246_ = NULL;
-	GSettings* _tmp247_ = NULL;
-	gint _tmp248_ = 0;
-	GtkAdjustment* _tmp249_ = NULL;
-	GtkAdjustment* _tmp250_ = NULL;
-	gdouble _tmp251_ = 0.0;
+	const gchar* _tmp157_ = NULL;
+	gchar* _tmp158_ = NULL;
+	GtkScale* _tmp159_ = NULL;
+	gdouble _tmp160_ = 0.0;
+	const gchar* _tmp161_ = NULL;
+	GtkScale* _tmp162_ = NULL;
+	GtkScale* _tmp163_ = NULL;
+	gdouble _tmp164_ = 0.0;
+	const gchar* _tmp165_ = NULL;
+	GSettings* _tmp166_ = NULL;
+	gint _tmp167_ = 0;
+	GtkAdjustment* _tmp168_ = NULL;
+	GtkAdjustment* _tmp169_ = NULL;
+	gdouble _tmp170_ = 0.0;
+	gdouble _tmp171_ = 0.0;
 	gchar* less_label = NULL;
-	const gchar* _tmp252_ = NULL;
-	gchar* _tmp253_ = NULL;
-	GtkAdjustment* _tmp254_ = NULL;
-	gdouble _tmp255_ = 0.0;
+	const gchar* _tmp172_ = NULL;
+	gchar* _tmp173_ = NULL;
+	GtkAdjustment* _tmp174_ = NULL;
+	gdouble _tmp175_ = 0.0;
+	gdouble _tmp176_ = 0.0;
 	gchar* more_label = NULL;
-	const gchar* _tmp256_ = NULL;
-	gchar* _tmp257_ = NULL;
-	GtkScale* _tmp258_ = NULL;
-	gdouble _tmp259_ = 0.0;
-	const gchar* _tmp260_ = NULL;
-	GtkScale* _tmp261_ = NULL;
-	GtkScale* _tmp262_ = NULL;
-	gdouble _tmp263_ = 0.0;
-	const gchar* _tmp264_ = NULL;
-	GSettings* _tmp265_ = NULL;
-	gint _tmp266_ = 0;
-	GtkAdjustment* _tmp267_ = NULL;
-	GtkAdjustment* _tmp268_ = NULL;
-	gdouble _tmp269_ = 0.0;
+	const gchar* _tmp177_ = NULL;
+	gchar* _tmp178_ = NULL;
+	GtkScale* _tmp179_ = NULL;
+	gdouble _tmp180_ = 0.0;
+	const gchar* _tmp181_ = NULL;
+	GtkScale* _tmp182_ = NULL;
+	GtkScale* _tmp183_ = NULL;
+	gdouble _tmp184_ = 0.0;
+	const gchar* _tmp185_ = NULL;
+	GSettings* _tmp186_ = NULL;
+	gint _tmp187_ = 0;
+	GtkAdjustment* _tmp188_ = NULL;
+	GtkAdjustment* _tmp189_ = NULL;
+	gdouble _tmp190_ = 0.0;
+	gdouble _tmp191_ = 0.0;
 	gchar* minimum_label = NULL;
-	const gchar* _tmp270_ = NULL;
-	gchar* _tmp271_ = NULL;
-	GtkAdjustment* _tmp272_ = NULL;
-	gdouble _tmp273_ = 0.0;
+	const gchar* _tmp192_ = NULL;
+	gchar* _tmp193_ = NULL;
+	GtkAdjustment* _tmp194_ = NULL;
+	gdouble _tmp195_ = 0.0;
+	gdouble _tmp196_ = 0.0;
 	gchar* maximum_label = NULL;
-	const gchar* _tmp274_ = NULL;
-	gchar* _tmp275_ = NULL;
-	GtkScale* _tmp276_ = NULL;
-	gdouble _tmp277_ = 0.0;
-	const gchar* _tmp278_ = NULL;
-	GtkScale* _tmp279_ = NULL;
-	GtkScale* _tmp280_ = NULL;
-	gdouble _tmp281_ = 0.0;
-	const gchar* _tmp282_ = NULL;
-	GSettings* _tmp283_ = NULL;
-	gint _tmp284_ = 0;
-	GtkAdjustment* _tmp285_ = NULL;
+	const gchar* _tmp197_ = NULL;
+	gchar* _tmp198_ = NULL;
+	GtkScale* _tmp199_ = NULL;
+	gdouble _tmp200_ = 0.0;
+	const gchar* _tmp201_ = NULL;
+	GtkScale* _tmp202_ = NULL;
+	GtkScale* _tmp203_ = NULL;
+	gdouble _tmp204_ = 0.0;
+	const gchar* _tmp205_ = NULL;
+	GSettings* _tmp206_ = NULL;
+	gint _tmp207_ = 0;
+	GtkAdjustment* _tmp208_ = NULL;
 	gchar* device = NULL;
-	GSettings* _tmp286_ = NULL;
-	gchar* _tmp287_ = NULL;
-	const gchar* _tmp288_ = NULL;
+	GSettings* _tmp209_ = NULL;
+	gchar* _tmp210_ = NULL;
+	const gchar* _tmp211_ = NULL;
 	gchar* document_type = NULL;
-	GSettings* _tmp294_ = NULL;
-	gchar* _tmp295_ = NULL;
-	const gchar* _tmp296_ = NULL;
-	Book* _tmp298_ = NULL;
-	BookView* _tmp299_ = NULL;
-	BookView* _tmp300_ = NULL;
-	GtkBox* _tmp301_ = NULL;
-	BookView* _tmp302_ = NULL;
-	BookView* _tmp303_ = NULL;
-	BookView* _tmp304_ = NULL;
-	BookView* _tmp305_ = NULL;
-	BookView* _tmp306_ = NULL;
-	gint _tmp307_ = 0;
-	gint _tmp308_ = 0;
-	GtkApplicationWindow* _tmp309_ = NULL;
-	gint _tmp310_ = 0;
-	gint _tmp311_ = 0;
-	gboolean _tmp312_ = FALSE;
-	GtkApplicationWindow* _tmp314_ = NULL;
-	const gchar* _tmp315_ = NULL;
-	ProgressBarDialog* _tmp316_ = NULL;
-	Book* _tmp317_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GSettings* _tmp217_ = NULL;
+	gchar* _tmp218_ = NULL;
+	const gchar* _tmp219_ = NULL;
+	Book* _tmp221_ = NULL;
+	BookView* _tmp222_ = NULL;
+	BookView* _tmp223_ = NULL;
+	GtkBox* _tmp224_ = NULL;
+	BookView* _tmp225_ = NULL;
+	BookView* _tmp226_ = NULL;
+	BookView* _tmp227_ = NULL;
+	BookView* _tmp228_ = NULL;
+	BookView* _tmp229_ = NULL;
+	GtkDialog* _tmp230_ = NULL;
+	GtkDialog* _tmp231_ = NULL;
+	gint _tmp232_ = 0;
+	gint _tmp233_ = 0;
+	gint _tmp234_ = 0;
+	gint _tmp235_ = 0;
+	gboolean _tmp236_ = FALSE;
+	const gchar* _tmp237_ = NULL;
+	ProgressBarDialog* _tmp238_ = NULL;
+	Book* _tmp239_ = NULL;
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 1427 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_icon_theme_append_search_path (_tmp0_, ICON_DIR);
-#line 1429 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_default_icon_name ("scanner");
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_application_get_default ();
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, GTK_TYPE_APPLICATION) ? ((GtkApplication*) _tmp1_) : NULL);
-#line 1431 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1679 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	app = _tmp2_;
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = gtk_builder_new ();
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 1433 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->builder = _tmp3_;
-#line 7036 "ui.c"
-	{
-		GtkBuilder* _tmp4_ = NULL;
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = user_interface_get_shell_shows_menubar (self);
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = _tmp3_;
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (!_tmp4_) {
+#line 8098 "ui.c"
 		GtkApplication* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp4_ = self->priv->builder;
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_builder_add_from_resource (_tmp4_, "/org/gnome/SimpleScan/simple-scan.ui", &_inner_error_);
-#line 1436 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_inner_error_ != NULL) {
-#line 7047 "ui.c"
-			goto __catch21_g_error;
-		}
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = app;
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = user_interface_has_app_menu (self, _tmp5_);
-#line 1437 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp6_) {
-#line 7056 "ui.c"
-			GtkBuilder* _tmp7_ = NULL;
-#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp7_ = self->priv->builder;
-#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_builder_add_from_resource (_tmp7_, "/org/gnome/SimpleScan/simple-scan-menu.ui", &_inner_error_);
-#line 1438 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			if (_inner_error_ != NULL) {
-#line 7064 "ui.c"
-				goto __catch21_g_error;
-			}
-		}
-	}
-	goto __finally21;
-	__catch21_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
+		GMenu* appmenu = NULL;
+		GMenu* _tmp6_ = NULL;
+		GMenu* section = NULL;
+		GMenu* _tmp7_ = NULL;
+		GMenu* _tmp8_ = NULL;
+		GMenu* _tmp9_ = NULL;
+		GMenu* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		e = _inner_error_;
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_inner_error_ = NULL;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp8_ = e;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp9_ = _tmp8_->message;
-#line 1442 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_critical ("ui.vala:1442: Unable to load UI: %s\n", _tmp9_);
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp10_ = _ ("Files missing");
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp11_ = _ ("Please check your installation");
-#line 1443 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_show_error_dialog (self, _tmp10_, _tmp11_);
-#line 1447 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		exit (EXIT_FAILURE);
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_error_free0 (e);
-#line 7097 "ui.c"
+		GMenu* _tmp12_ = NULL;
+		GMenu* _tmp13_ = NULL;
+		GMenu* _tmp14_ = NULL;
+		GMenu* menu = NULL;
+		GMenu* _tmp15_ = NULL;
+		GMenu* _tmp16_ = NULL;
+		const gchar* _tmp17_ = NULL;
+		GMenu* _tmp18_ = NULL;
+		GMenu* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+		GMenu* _tmp21_ = NULL;
+		const gchar* _tmp22_ = NULL;
+		GMenu* _tmp23_ = NULL;
+		const gchar* _tmp24_ = NULL;
+		GMenu* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
+		GMenu* _tmp27_ = NULL;
+		const gchar* _tmp28_ = NULL;
+		GMenu* _tmp29_ = NULL;
+		GMenu* _tmp30_ = NULL;
+		GMenu* _tmp31_ = NULL;
+		GMenu* _tmp32_ = NULL;
+		const gchar* _tmp33_ = NULL;
+		GMenu* _tmp34_ = NULL;
+		GMenu* _tmp35_ = NULL;
+		GMenu* _tmp36_ = NULL;
+		GMenu* _tmp37_ = NULL;
+		const gchar* _tmp38_ = NULL;
+		GMenu* _tmp39_ = NULL;
+		const gchar* _tmp40_ = NULL;
+		GMenu* _tmp41_ = NULL;
+		const gchar* _tmp42_ = NULL;
+		GtkApplication* _tmp43_ = NULL;
+		GMenu* _tmp44_ = NULL;
+		GtkApplication* _tmp45_ = NULL;
+		GtkApplication* _tmp46_ = NULL;
+		GtkApplication* _tmp47_ = NULL;
+		GtkApplication* _tmp48_ = NULL;
+		GtkApplication* _tmp49_ = NULL;
+		GtkApplication* _tmp50_ = NULL;
+		GtkApplication* _tmp51_ = NULL;
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = app;
+#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_action_map_add_action_entries ((GActionMap*) _tmp5_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = g_menu_new ();
+#line 1685 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		appmenu = _tmp6_;
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = g_menu_new ();
+#line 1686 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		section = _tmp7_;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp8_ = appmenu;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp9_ = section;
+#line 1687 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append_section (_tmp8_, NULL, (GMenuModel*) _tmp9_);
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp10_ = section;
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp11_ = _ ("New Document");
+#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp10_, _tmp11_, "app.new_document");
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp12_ = g_menu_new ();
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (section);
+#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		section = _tmp12_;
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp13_ = appmenu;
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp14_ = section;
+#line 1691 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append_section (_tmp13_, NULL, (GMenuModel*) _tmp14_);
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp15_ = g_menu_new ();
+#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		menu = _tmp15_;
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp16_ = section;
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp17_ = _ ("Document");
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp18_ = menu;
+#line 1693 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append_submenu (_tmp16_, _tmp17_, (GMenuModel*) _tmp18_);
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp19_ = menu;
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp20_ = _ ("Reorder Pages");
+#line 1694 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp19_, _tmp20_, "app.reorder");
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp21_ = menu;
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp22_ = _ ("Save");
+#line 1695 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp21_, _tmp22_, "app.save");
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp23_ = menu;
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp24_ = _ ("Save As...");
+#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp23_, _tmp24_, "app.save_as");
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp25_ = menu;
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp26_ = _ ("Email...");
+#line 1697 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp25_, _tmp26_, "app.email");
+#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp27_ = menu;
+#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp28_ = _ ("Print...");
+#line 1698 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp27_, _tmp28_, "app.print");
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp29_ = g_menu_new ();
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (section);
+#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		section = _tmp29_;
+#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp30_ = appmenu;
+#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp31_ = section;
+#line 1701 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append_section (_tmp30_, NULL, (GMenuModel*) _tmp31_);
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp32_ = section;
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp33_ = _ ("Preferences");
+#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp32_, _tmp33_, "app.preferences");
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp34_ = g_menu_new ();
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (section);
+#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		section = _tmp34_;
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp35_ = appmenu;
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp36_ = section;
+#line 1705 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append_section (_tmp35_, NULL, (GMenuModel*) _tmp36_);
+#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp37_ = section;
+#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp38_ = _ ("Help");
+#line 1706 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp37_, _tmp38_, "app.help");
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp39_ = section;
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp40_ = _ ("About");
+#line 1707 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp39_, _tmp40_, "app.about");
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp41_ = section;
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp42_ = _ ("Quit");
+#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_menu_append (_tmp41_, _tmp42_, "app.quit");
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp43_ = app;
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp44_ = appmenu;
+#line 1710 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_set_app_menu (_tmp43_, (GMenuModel*) _tmp44_);
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp45_ = app;
+#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp45_, "<Ctrl>N", "app.new_document", NULL);
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp46_ = app;
+#line 1713 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp46_, "<Ctrl>S", "app.save", NULL);
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp47_ = app;
+#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp47_, "<Shift><Ctrl>S", "app.save_as", NULL);
+#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp48_ = app;
+#line 1715 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp48_, "<Ctrl>E", "app.email", NULL);
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp49_ = app;
+#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp49_, "<Ctrl>P", "app.print", NULL);
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp50_ = app;
+#line 1717 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp50_, "F1", "app.help", NULL);
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp51_ = app;
+#line 1718 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_application_add_accelerator (_tmp51_, "<Ctrl>Q", "app.quit", NULL);
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (menu);
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (section);
+#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_object_unref0 (appmenu);
+#line 8315 "ui.c"
+	} else {
+		GtkMenuBar* _tmp52_ = NULL;
+		GtkToolbar* _tmp53_ = NULL;
+#line 1722 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_window_set_titlebar ((GtkWindow*) self, NULL);
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp52_ = self->priv->menubar;
+#line 1723 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_visible ((GtkWidget*) _tmp52_, TRUE);
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp53_ = self->priv->toolbar;
+#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_widget_set_visible ((GtkWidget*) _tmp53_, TRUE);
+#line 8329 "ui.c"
 	}
-	__finally21:
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_inner_error_ != NULL) {
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (app);
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_clear_error (&_inner_error_);
-#line 1434 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return;
-#line 7110 "ui.c"
-	}
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp12_ = self->priv->builder;
-#line 1449 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_builder_connect_signals (_tmp12_, self);
-#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp13_ = self->priv->builder;
-#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "simple_scan_window");
-#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_APPLICATION_WINDOW, GtkApplicationWindow));
-#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->window);
-#line 1451 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->window = _tmp15_;
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp16_ = app;
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp17_ = self->priv->window;
-#line 1452 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_application_add_window (_tmp16_, (GtkWindow*) _tmp17_);
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp18_ = self->priv->builder;
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "menubar");
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GTK_TYPE_MENU_BAR, GtkMenuBar));
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->menubar);
-#line 1453 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->menubar = _tmp20_;
-#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp21_ = app;
-#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp22_ = user_interface_has_app_menu (self, _tmp21_);
-#line 1454 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp22_) {
-#line 7148 "ui.c"
-		GtkBuilder* _tmp23_ = NULL;
-		GObject* _tmp24_ = NULL;
-		GMenuModel* _tmp25_ = NULL;
-		GtkApplication* _tmp26_ = NULL;
-		GtkApplication* _tmp27_ = NULL;
-		GMenuModel* _tmp28_ = NULL;
-		GtkMenuBar* _tmp29_ = NULL;
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp23_ = self->priv->builder;
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp24_ = gtk_builder_get_object (_tmp23_, "appmenu");
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, g_menu_model_get_type (), GMenuModel));
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_g_object_unref0 (self->priv->app_menu);
-#line 1456 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		self->priv->app_menu = _tmp25_;
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp26_ = app;
-#line 1457 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_action_map_add_action_entries ((GActionMap*) _tmp26_, USER_INTERFACE_action_entries, G_N_ELEMENTS (USER_INTERFACE_action_entries), self);
-#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp27_ = app;
-#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp28_ = self->priv->app_menu;
-#line 1458 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_application_set_app_menu (_tmp27_, _tmp28_);
-#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp29_ = self->priv->menubar;
-#line 1459 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_widget_set_visible ((GtkWidget*) _tmp29_, FALSE);
-#line 7180 "ui.c"
-	}
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp30_ = self->priv->builder;
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp31_ = gtk_builder_get_object (_tmp30_, "main_vbox");
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp32_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_BOX, GtkBox));
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->main_vbox);
-#line 1461 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->main_vbox = _tmp32_;
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp33_ = self->priv->builder;
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp34_ = gtk_builder_get_object (_tmp33_, "page_move_left_menuitem");
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_move_left_menuitem);
-#line 1462 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_move_left_menuitem = _tmp35_;
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp36_ = self->priv->builder;
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp37_ = gtk_builder_get_object (_tmp36_, "page_move_right_menuitem");
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_move_right_menuitem);
-#line 1463 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_move_right_menuitem = _tmp38_;
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp39_ = self->priv->builder;
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp40_ = gtk_builder_get_object (_tmp39_, "page_delete_menuitem");
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_delete_menuitem);
-#line 1464 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_delete_menuitem = _tmp41_;
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp42_ = self->priv->builder;
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp43_ = gtk_builder_get_object (_tmp42_, "crop_rotate_menuitem");
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-#line 1465 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->crop_rotate_menuitem = _tmp44_;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp45_ = self->priv->builder;
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp46_ = gtk_builder_get_object (_tmp45_, "save_menuitem");
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_menuitem);
-#line 1466 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_menuitem = _tmp47_;
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp48_ = self->priv->builder;
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp49_ = gtk_builder_get_object (_tmp48_, "save_as_menuitem");
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp50_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_as_menuitem);
-#line 1467 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_as_menuitem = _tmp50_;
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp51_ = self->priv->builder;
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp52_ = gtk_builder_get_object (_tmp51_, "copy_to_clipboard_menuitem");
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp53_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
-#line 1468 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->copy_to_clipboard_menuitem = _tmp53_;
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp54_ = self->priv->builder;
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp55_ = gtk_builder_get_object (_tmp54_, "save_toolbutton");
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp56_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->save_toolbutton);
-#line 1469 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->save_toolbutton = _tmp56_;
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp57_ = self->priv->builder;
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp58_ = gtk_builder_get_object (_tmp57_, "stop_scan_menuitem");
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp59_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_MENU_ITEM, GtkMenuItem));
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_menuitem);
-#line 1470 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->stop_menuitem = _tmp59_;
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp60_ = self->priv->builder;
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp61_ = gtk_builder_get_object (_tmp60_, "stop_toolbutton");
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_TOOL_BUTTON, GtkToolButton));
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_toolbutton);
-#line 1471 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->stop_toolbutton = _tmp62_;
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp63_ = self->priv->builder;
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp64_ = gtk_builder_get_object (_tmp63_, "text_toolbutton_menuitem");
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_toolbar_menuitem);
-#line 1473 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_toolbar_menuitem = _tmp65_;
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp66_ = self->priv->builder;
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp67_ = gtk_builder_get_object (_tmp66_, "text_menuitem");
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp68_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_menu_menuitem);
-#line 1474 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_menu_menuitem = _tmp68_;
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp69_ = self->priv->builder;
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp70_ = gtk_builder_get_object (_tmp69_, "photo_toolbutton_menuitem");
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_toolbar_menuitem);
-#line 1475 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_toolbar_menuitem = _tmp71_;
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp72_ = self->priv->builder;
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp73_ = gtk_builder_get_object (_tmp72_, "photo_menuitem");
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GTK_TYPE_RADIO_MENU_ITEM, GtkRadioMenuItem));
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_menu_menuitem);
-#line 1476 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_menu_menuitem = _tmp74_;
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp75_ = self->priv->builder;
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp76_ = gtk_builder_get_object (_tmp75_, "authorize_dialog");
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GTK_TYPE_DIALOG, GtkDialog));
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->authorize_dialog);
-#line 1478 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->authorize_dialog = _tmp77_;
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp78_ = self->priv->builder;
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp79_ = gtk_builder_get_object (_tmp78_, "authorize_label");
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, GTK_TYPE_LABEL, GtkLabel));
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->authorize_label);
-#line 1479 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->authorize_label = _tmp80_;
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp81_ = self->priv->builder;
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp82_ = gtk_builder_get_object (_tmp81_, "username_entry");
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GTK_TYPE_ENTRY, GtkEntry));
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->username_entry);
-#line 1480 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->username_entry = _tmp83_;
-#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp84_ = self->priv->builder;
-#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp85_ = gtk_builder_get_object (_tmp84_, "password_entry");
-#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp86_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GTK_TYPE_ENTRY, GtkEntry));
-#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->password_entry);
-#line 1481 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->password_entry = _tmp86_;
-#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp87_ = self->priv->builder;
-#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp88_ = gtk_builder_get_object (_tmp87_, "preferences_dialog");
-#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp89_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GTK_TYPE_DIALOG, GtkDialog));
-#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->preferences_dialog);
-#line 1483 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->preferences_dialog = _tmp89_;
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp90_ = self->priv->builder;
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp91_ = gtk_builder_get_object (_tmp90_, "device_combo");
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp92_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->device_combo);
-#line 1484 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->device_combo = _tmp92_;
-#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp93_ = self->priv->device_combo;
-#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp94_ = gtk_combo_box_get_model (_tmp93_);
-#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp95_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->device_model);
-#line 1485 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->device_model = _tmp95_;
-#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp96_ = self->priv->builder;
-#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp97_ = gtk_builder_get_object (_tmp96_, "text_dpi_combo");
-#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp98_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_dpi_combo);
-#line 1486 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_dpi_combo = _tmp98_;
-#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp99_ = self->priv->text_dpi_combo;
-#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp100_ = gtk_combo_box_get_model (_tmp99_);
-#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp101_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_dpi_model);
-#line 1487 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->text_dpi_model = _tmp101_;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp102_ = self->priv->builder;
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp103_ = gtk_builder_get_object (_tmp102_, "photo_dpi_combo");
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp104_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_dpi_combo);
-#line 1488 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_dpi_combo = _tmp104_;
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp105_ = self->priv->photo_dpi_combo;
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp106_ = gtk_combo_box_get_model (_tmp105_);
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp107_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_dpi_model);
-#line 1489 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->photo_dpi_model = _tmp107_;
-#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp108_ = self->priv->builder;
-#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp109_ = gtk_builder_get_object (_tmp108_, "page_side_combo");
-#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp110_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_side_combo);
-#line 1490 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_side_combo = _tmp110_;
-#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp111_ = self->priv->page_side_combo;
-#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp112_ = gtk_combo_box_get_model (_tmp111_);
-#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp113_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->page_side_model);
-#line 1491 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->page_side_model = _tmp113_;
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp114_ = self->priv->builder;
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp115_ = gtk_builder_get_object (_tmp114_, "paper_size_combo");
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp116_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, GTK_TYPE_COMBO_BOX, GtkComboBox));
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->paper_size_combo);
-#line 1492 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->paper_size_combo = _tmp116_;
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp117_ = self->priv->paper_size_combo;
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp118_ = gtk_combo_box_get_model (_tmp117_);
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp119_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GTK_TYPE_LIST_STORE, GtkListStore));
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->paper_size_model);
-#line 1493 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->paper_size_model = _tmp119_;
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp120_ = self->priv->builder;
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp121_ = gtk_builder_get_object (_tmp120_, "brightness_scale");
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp122_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, GTK_TYPE_SCALE, GtkScale));
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->brightness_scale);
-#line 1494 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->brightness_scale = _tmp122_;
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp123_ = self->priv->brightness_scale;
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp124_ = gtk_range_get_adjustment ((GtkRange*) _tmp123_);
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp125_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->brightness_adjustment);
-#line 1495 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->brightness_adjustment = _tmp125_;
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp126_ = self->priv->builder;
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp127_ = gtk_builder_get_object (_tmp126_, "contrast_scale");
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp128_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, GTK_TYPE_SCALE, GtkScale));
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->contrast_scale);
-#line 1496 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->contrast_scale = _tmp128_;
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp129_ = self->priv->contrast_scale;
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp130_ = gtk_range_get_adjustment ((GtkRange*) _tmp129_);
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp131_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp130_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->contrast_adjustment);
-#line 1497 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->contrast_adjustment = _tmp131_;
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp132_ = self->priv->builder;
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp133_ = gtk_builder_get_object (_tmp132_, "quality_scale");
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp134_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GTK_TYPE_SCALE, GtkScale));
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->quality_scale);
-#line 1498 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->quality_scale = _tmp134_;
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp135_ = self->priv->quality_scale;
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp136_ = gtk_range_get_adjustment ((GtkRange*) _tmp135_);
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp137_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp136_, GTK_TYPE_ADJUSTMENT, GtkAdjustment));
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->quality_adjustment);
-#line 1499 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->quality_adjustment = _tmp137_;
-#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp138_ = (GtkInfoBar*) gtk_info_bar_new ();
-#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp138_);
-#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp54_ = app;
+#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_application_add_window (_tmp54_, (GtkWindow*) self);
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp55_ = (GtkInfoBar*) gtk_info_bar_new ();
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp55_);
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 1502 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar = _tmp138_;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp139_ = self->priv->info_bar;
-#line 1503 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp139_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self);
-#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp140_ = self->priv->main_vbox;
-#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp141_ = self->priv->info_bar;
-#line 1504 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp140_, (GtkWidget*) _tmp141_, FALSE, TRUE, (guint) 0);
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp142_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp142_);
-#line 1505 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	hbox = _tmp142_;
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp143_ = self->priv->info_bar;
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp144_ = gtk_info_bar_get_content_area (_tmp143_);
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp145_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, GTK_TYPE_CONTAINER, GtkContainer));
-#line 1506 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	content_area = _tmp145_;
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp146_ = content_area;
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp147_ = hbox;
-#line 1507 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_add (_tmp146_, (GtkWidget*) _tmp147_);
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp148_ = hbox;
-#line 1508 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp148_);
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp149_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp149_);
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar = _tmp55_;
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp56_ = self->priv->info_bar;
+#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp56_, "response", (GCallback) _user_interface_info_bar_response_cb_gtk_info_bar_response, self, 0);
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp57_ = self->priv->main_vbox;
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp58_ = self->priv->info_bar;
+#line 1731 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp57_, (GtkWidget*) _tmp58_, FALSE, TRUE, (guint) 0);
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp59_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp59_);
+#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	hbox = _tmp59_;
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp60_ = self->priv->info_bar;
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp61_ = gtk_info_bar_get_content_area (_tmp60_);
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp61_, GTK_TYPE_CONTAINER) ? ((GtkContainer*) _tmp61_) : NULL);
+#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	content_area = _tmp62_;
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp63_ = content_area;
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp64_ = hbox;
+#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_add (_tmp63_, (GtkWidget*) _tmp64_);
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp65_ = hbox;
+#line 1735 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp65_, TRUE);
+#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp66_ = (GtkImage*) gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG);
+#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp66_);
+#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 1510 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_image = _tmp149_;
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp150_ = hbox;
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp151_ = self->priv->info_bar_image;
-#line 1511 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp150_, (GtkWidget*) _tmp151_, FALSE, TRUE, (guint) 0);
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp152_ = self->priv->info_bar_image;
-#line 1512 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp152_);
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp153_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp153_);
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1737 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_image = _tmp66_;
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp67_ = hbox;
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp68_ = self->priv->info_bar_image;
+#line 1738 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp67_, (GtkWidget*) _tmp68_, FALSE, TRUE, (guint) 0);
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp69_ = self->priv->info_bar_image;
+#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp69_, TRUE);
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp70_ = (GtkLabel*) gtk_label_new (NULL);
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp70_);
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 1514 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_label = _tmp153_;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp154_ = self->priv->info_bar_label;
-#line 1515 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_misc_set_alignment ((GtkMisc*) _tmp154_, 0.0f, 0.5f);
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp155_ = hbox;
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp156_ = self->priv->info_bar_label;
-#line 1516 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_start (_tmp155_, (GtkWidget*) _tmp156_, TRUE, TRUE, (guint) 0);
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp157_ = self->priv->info_bar_label;
-#line 1517 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp157_);
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp158_ = self->priv->info_bar;
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp159_ = _ ("_Close");
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp160_ = gtk_info_bar_add_button (_tmp158_, _tmp159_, (gint) GTK_RESPONSE_CLOSE);
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp161_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GTK_TYPE_BUTTON, GtkButton));
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_label = _tmp70_;
+#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp71_ = self->priv->info_bar_label;
+#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_misc_set_alignment ((GtkMisc*) _tmp71_, 0.0f, 0.5f);
+#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp72_ = hbox;
+#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp73_ = self->priv->info_bar_label;
+#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_start (_tmp72_, (GtkWidget*) _tmp73_, TRUE, TRUE, (guint) 0);
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp74_ = self->priv->info_bar_label;
+#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp74_, TRUE);
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp75_ = self->priv->info_bar;
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp76_ = _ ("_Close");
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp77_ = gtk_info_bar_add_button (_tmp75_, _tmp76_, (gint) GTK_RESPONSE_CLOSE);
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp78_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp77_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp77_) : NULL);
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 1519 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_close_button = _tmp161_;
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp162_ = self->priv->info_bar;
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp163_ = _ ("Change _Scanner");
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp164_ = gtk_info_bar_add_button (_tmp162_, _tmp163_, 1);
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp165_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp164_, GTK_TYPE_BUTTON, GtkButton));
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_close_button = _tmp78_;
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp79_ = self->priv->info_bar;
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp80_ = _ ("Change _Scanner");
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp81_ = gtk_info_bar_add_button (_tmp79_, _tmp80_, 1);
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp82_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp81_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp81_) : NULL);
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 1520 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->info_bar_change_scanner_button = _tmp165_;
-#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp166_ = self->priv->paper_size_model;
-#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp166_, &_tmp167_);
-#line 1524 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp167_;
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp168_ = self->priv->paper_size_model;
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp169_ = iter;
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp170_ = _ ("Automatic");
-#line 1525 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp168_, &_tmp169_, 0, 0, 1, 0, 2, _tmp170_, -1, -1);
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp171_ = self->priv->paper_size_model;
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp171_, &_tmp172_);
-#line 1528 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp172_;
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp173_ = self->priv->paper_size_model;
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp174_ = iter;
-#line 1529 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp173_, &_tmp174_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp175_ = self->priv->paper_size_model;
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp175_, &_tmp176_);
-#line 1530 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp176_;
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp177_ = self->priv->paper_size_model;
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp178_ = iter;
-#line 1531 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp177_, &_tmp178_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp179_ = self->priv->paper_size_model;
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp179_, &_tmp180_);
-#line 1532 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp180_;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp181_ = self->priv->paper_size_model;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp182_ = iter;
-#line 1533 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp181_, &_tmp182_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp183_ = self->priv->paper_size_model;
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp183_, &_tmp184_);
-#line 1534 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp184_;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp185_ = self->priv->paper_size_model;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp186_ = iter;
-#line 1535 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp185_, &_tmp186_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp187_ = self->priv->paper_size_model;
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp187_, &_tmp188_);
-#line 1536 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp188_;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp189_ = self->priv->paper_size_model;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp190_ = iter;
-#line 1537 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp189_, &_tmp190_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp191_ = self->priv->paper_size_model;
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_append (_tmp191_, &_tmp192_);
-#line 1538 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	iter = _tmp192_;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp193_ = self->priv->paper_size_model;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp194_ = iter;
-#line 1539 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_list_store_set (_tmp193_, &_tmp194_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp195_ = self->priv->settings;
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp196_ = g_settings_get_int (_tmp195_, "text-dpi");
-#line 1541 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp196_;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp197_ = dpi;
-#line 1542 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp197_ <= 0) {
-#line 1543 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->info_bar_change_scanner_button = _tmp82_;
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp83_ = self->priv->paper_size_model;
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp83_, &_tmp84_);
+#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp84_;
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp85_ = self->priv->paper_size_model;
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp86_ = iter;
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp87_ = _ ("Automatic");
+#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp85_, &_tmp86_, 0, 0, 1, 0, 2, _tmp87_, -1, -1);
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp88_ = self->priv->paper_size_model;
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp88_, &_tmp89_);
+#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp89_;
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp90_ = self->priv->paper_size_model;
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp91_ = iter;
+#line 1756 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp90_, &_tmp91_, 0, 1050, 1, 1480, 2, "A6", -1, -1);
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp92_ = self->priv->paper_size_model;
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp92_, &_tmp93_);
+#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp93_;
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp94_ = self->priv->paper_size_model;
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp95_ = iter;
+#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp94_, &_tmp95_, 0, 1480, 1, 2100, 2, "A5", -1, -1);
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp96_ = self->priv->paper_size_model;
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp96_, &_tmp97_);
+#line 1759 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp97_;
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp98_ = self->priv->paper_size_model;
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp99_ = iter;
+#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp98_, &_tmp99_, 0, 2100, 1, 2970, 2, "A4", -1, -1);
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp100_ = self->priv->paper_size_model;
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp100_, &_tmp101_);
+#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp101_;
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp102_ = self->priv->paper_size_model;
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp103_ = iter;
+#line 1762 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp102_, &_tmp103_, 0, 2159, 1, 2794, 2, "Letter", -1, -1);
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp104_ = self->priv->paper_size_model;
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp104_, &_tmp105_);
+#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp105_;
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp106_ = self->priv->paper_size_model;
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp107_ = iter;
+#line 1764 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp106_, &_tmp107_, 0, 2159, 1, 3556, 2, "Legal", -1, -1);
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp108_ = self->priv->paper_size_model;
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_append (_tmp108_, &_tmp109_);
+#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	iter = _tmp109_;
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp110_ = self->priv->paper_size_model;
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp111_ = iter;
+#line 1766 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_list_store_set (_tmp110_, &_tmp111_, 0, 1016, 1, 1524, 2, "4×6", -1, -1);
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp112_ = self->priv->settings;
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp113_ = g_settings_get_int (_tmp112_, "text-dpi");
+#line 1768 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp113_;
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp114_ = dpi;
+#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp114_ <= 0) {
+#line 1770 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_TEXT_DPI;
-#line 7746 "ui.c"
-	}
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp198_ = self->priv->text_dpi_combo;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp199_ = dpi;
-#line 1544 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp198_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp199_);
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp200_ = self->priv->text_dpi_combo;
-#line 1545 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp200_, "changed", (GCallback) ___lambda4__gtk_combo_box_changed, self);
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp201_ = self->priv->settings;
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp202_ = g_settings_get_int (_tmp201_, "photo-dpi");
-#line 1546 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	dpi = _tmp202_;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp203_ = dpi;
-#line 1547 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp203_ <= 0) {
-#line 1548 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 8539 "ui.c"
+	}
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp115_ = self->priv->text_dpi_combo;
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp116_ = dpi;
+#line 1771 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp115_, USER_INTERFACE_DEFAULT_TEXT_DPI, _tmp116_);
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp117_ = self->priv->text_dpi_combo;
+#line 1772 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp117_, "changed", (GCallback) ___lambda10__gtk_combo_box_changed, self, 0);
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp118_ = self->priv->settings;
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp119_ = g_settings_get_int (_tmp118_, "photo-dpi");
+#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	dpi = _tmp119_;
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp120_ = dpi;
+#line 1774 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp120_ <= 0) {
+#line 1775 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		dpi = USER_INTERFACE_DEFAULT_PHOTO_DPI;
-#line 7770 "ui.c"
-	}
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp204_ = self->priv->photo_dpi_combo;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp205_ = dpi;
-#line 1549 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_dpi_combo (self, _tmp204_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp205_);
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp206_ = self->priv->photo_dpi_combo;
-#line 1550 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp206_, "changed", (GCallback) ___lambda5__gtk_combo_box_changed, self);
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp207_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp207_);
-#line 1552 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp207_;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp208_ = self->priv->device_combo;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp209_ = renderer;
-#line 1553 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp208_, (GtkCellRenderer*) _tmp209_, TRUE);
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp210_ = self->priv->device_combo;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp211_ = renderer;
-#line 1554 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp210_, (GtkCellRenderer*) _tmp211_, "text", 1);
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp212_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp212_);
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 8563 "ui.c"
+	}
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp121_ = self->priv->photo_dpi_combo;
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp122_ = dpi;
+#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_dpi_combo (self, _tmp121_, USER_INTERFACE_DEFAULT_PHOTO_DPI, _tmp122_);
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp123_ = self->priv->photo_dpi_combo;
+#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp123_, "changed", (GCallback) ___lambda11__gtk_combo_box_changed, self, 0);
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp124_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp124_);
+#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp124_;
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp125_ = self->priv->device_combo;
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp126_ = renderer;
+#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp125_, (GtkCellRenderer*) _tmp126_, TRUE);
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp127_ = self->priv->device_combo;
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp128_ = renderer;
+#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp127_, (GtkCellRenderer*) _tmp128_, "text", 1);
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp129_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp129_);
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1556 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp212_;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp213_ = self->priv->page_side_combo;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp214_ = renderer;
-#line 1557 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp213_, (GtkCellRenderer*) _tmp214_, TRUE);
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp215_ = self->priv->page_side_combo;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp216_ = renderer;
-#line 1558 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp215_, (GtkCellRenderer*) _tmp216_, "text", 1);
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp217_ = self->priv->settings;
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp218_ = g_settings_get_enum (_tmp217_, "page-side");
-#line 1559 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_page_side (self, (ScanType) _tmp218_);
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp219_ = self->priv->page_side_combo;
-#line 1560 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp219_, "changed", (GCallback) ___lambda6__gtk_combo_box_changed, self);
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp220_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp220_);
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp129_;
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp130_ = self->priv->page_side_combo;
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp131_ = renderer;
+#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp130_, (GtkCellRenderer*) _tmp131_, TRUE);
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp132_ = self->priv->page_side_combo;
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp133_ = renderer;
+#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp132_, (GtkCellRenderer*) _tmp133_, "text", 1);
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp134_ = self->priv->settings;
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp135_ = g_settings_get_enum (_tmp134_, "page-side");
+#line 1786 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_page_side (self, (ScanType) _tmp135_);
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp136_ = self->priv->page_side_combo;
+#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp136_, "changed", (GCallback) ___lambda12__gtk_combo_box_changed, self, 0);
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp137_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp137_);
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1562 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	renderer = _tmp220_;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp221_ = self->priv->paper_size_combo;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp222_ = renderer;
-#line 1563 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp221_, (GtkCellRenderer*) _tmp222_, TRUE);
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp223_ = self->priv->paper_size_combo;
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp224_ = renderer;
-#line 1564 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp223_, (GtkCellRenderer*) _tmp224_, "text", 2);
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp225_ = self->priv->settings;
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp226_ = g_settings_get_int (_tmp225_, "paper-width");
-#line 1565 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_width = _tmp226_;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp227_ = self->priv->settings;
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp228_ = g_settings_get_int (_tmp227_, "paper-height");
-#line 1566 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	paper_height = _tmp228_;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp229_ = paper_width;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp230_ = paper_height;
-#line 1567 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_paper_size (self, _tmp229_, _tmp230_);
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp231_ = self->priv->paper_size_combo;
-#line 1568 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp231_, "changed", (GCallback) ___lambda7__gtk_combo_box_changed, self);
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp232_ = self->priv->brightness_adjustment;
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp233_ = gtk_adjustment_get_lower (_tmp232_);
-#line 1576 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp233_;
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp234_ = _ ("Darker");
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp235_ = g_strdup_printf ("<small>%s</small>", _tmp234_);
-#line 1577 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	darker_label = _tmp235_;
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp236_ = self->priv->brightness_adjustment;
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp237_ = gtk_adjustment_get_upper (_tmp236_);
-#line 1578 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp237_;
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp238_ = _ ("Lighter");
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp239_ = g_strdup_printf ("<small>%s</small>", _tmp238_);
-#line 1579 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lighter_label = _tmp239_;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp240_ = self->priv->brightness_scale;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp241_ = lower;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp242_ = darker_label;
-#line 1580 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp240_, _tmp241_, GTK_POS_BOTTOM, _tmp242_);
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp243_ = self->priv->brightness_scale;
-#line 1581 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp243_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp244_ = self->priv->brightness_scale;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp245_ = upper;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp246_ = lighter_label;
-#line 1582 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp244_, _tmp245_, GTK_POS_BOTTOM, _tmp246_);
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp247_ = self->priv->settings;
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp248_ = g_settings_get_int (_tmp247_, "brightness");
-#line 1583 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_brightness (self, _tmp248_);
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp249_ = self->priv->brightness_adjustment;
-#line 1584 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp249_, "value-changed", (GCallback) ___lambda8__gtk_adjustment_value_changed, self);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp250_ = self->priv->contrast_adjustment;
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp251_ = gtk_adjustment_get_lower (_tmp250_);
-#line 1586 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp251_;
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp252_ = _ ("Less");
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp253_ = g_strdup_printf ("<small>%s</small>", _tmp252_);
-#line 1587 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	less_label = _tmp253_;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp254_ = self->priv->contrast_adjustment;
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp255_ = gtk_adjustment_get_upper (_tmp254_);
-#line 1588 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp255_;
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp256_ = _ ("More");
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp257_ = g_strdup_printf ("<small>%s</small>", _tmp256_);
-#line 1589 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	more_label = _tmp257_;
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp258_ = self->priv->contrast_scale;
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp259_ = lower;
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp260_ = less_label;
-#line 1590 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp258_, _tmp259_, GTK_POS_BOTTOM, _tmp260_);
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp261_ = self->priv->contrast_scale;
-#line 1591 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp261_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp262_ = self->priv->contrast_scale;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp263_ = upper;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp264_ = more_label;
-#line 1592 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp262_, _tmp263_, GTK_POS_BOTTOM, _tmp264_);
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp265_ = self->priv->settings;
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp266_ = g_settings_get_int (_tmp265_, "contrast");
-#line 1593 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_contrast (self, _tmp266_);
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp267_ = self->priv->contrast_adjustment;
-#line 1594 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp267_, "value-changed", (GCallback) ___lambda9__gtk_adjustment_value_changed, self);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp268_ = self->priv->quality_adjustment;
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp269_ = gtk_adjustment_get_lower (_tmp268_);
-#line 1596 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	lower = _tmp269_;
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp270_ = _ ("Minimum");
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp271_ = g_strdup_printf ("<small>%s</small>", _tmp270_);
-#line 1597 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	minimum_label = _tmp271_;
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp272_ = self->priv->quality_adjustment;
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp273_ = gtk_adjustment_get_upper (_tmp272_);
-#line 1598 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	upper = _tmp273_;
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp274_ = _ ("Maximum");
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp275_ = g_strdup_printf ("<small>%s</small>", _tmp274_);
-#line 1599 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	maximum_label = _tmp275_;
-#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp276_ = self->priv->quality_scale;
-#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp277_ = lower;
-#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp278_ = minimum_label;
-#line 1600 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp276_, _tmp277_, GTK_POS_BOTTOM, _tmp278_);
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp279_ = self->priv->quality_scale;
-#line 1601 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp279_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp280_ = self->priv->quality_scale;
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp281_ = upper;
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp282_ = maximum_label;
-#line 1602 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_scale_add_mark (_tmp280_, _tmp281_, GTK_POS_BOTTOM, _tmp282_);
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp283_ = self->priv->settings;
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp284_ = g_settings_get_int (_tmp283_, "jpeg-quality");
-#line 1603 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	user_interface_set_quality (self, _tmp284_);
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp285_ = self->priv->quality_adjustment;
-#line 1604 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp285_, "value-changed", (GCallback) ___lambda10__gtk_adjustment_value_changed, self);
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp286_ = self->priv->settings;
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp287_ = g_settings_get_string (_tmp286_, "selected-device");
-#line 1606 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	device = _tmp287_;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp288_ = device;
-#line 1607 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp288_ != NULL) {
-#line 8044 "ui.c"
-		const gchar* _tmp289_ = NULL;
-		GtkTreeIter _tmp290_ = {0};
-		gboolean _tmp291_ = FALSE;
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp289_ = device;
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp291_ = user_interface_find_scan_device (self, _tmp289_, &_tmp290_);
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		iter = _tmp290_;
-#line 1609 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (_tmp291_) {
-#line 8056 "ui.c"
-			GtkComboBox* _tmp292_ = NULL;
-			GtkTreeIter _tmp293_ = {0};
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp292_ = self->priv->device_combo;
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			_tmp293_ = iter;
-#line 1610 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			gtk_combo_box_set_active_iter (_tmp292_, &_tmp293_);
-#line 8065 "ui.c"
+#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	renderer = _tmp137_;
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp138_ = self->priv->paper_size_combo;
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp139_ = renderer;
+#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp138_, (GtkCellRenderer*) _tmp139_, TRUE);
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp140_ = self->priv->paper_size_combo;
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp141_ = renderer;
+#line 1791 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp140_, (GtkCellRenderer*) _tmp141_, "text", 2);
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp142_ = self->priv->settings;
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp143_ = g_settings_get_int (_tmp142_, "paper-width");
+#line 1792 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_width = _tmp143_;
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp144_ = self->priv->settings;
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp145_ = g_settings_get_int (_tmp144_, "paper-height");
+#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	paper_height = _tmp145_;
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp146_ = paper_width;
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp147_ = paper_height;
+#line 1794 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_paper_size (self, _tmp146_, _tmp147_);
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp148_ = self->priv->paper_size_combo;
+#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp148_, "changed", (GCallback) ___lambda13__gtk_combo_box_changed, self, 0);
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp149_ = self->priv->brightness_adjustment;
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp150_ = gtk_adjustment_get_lower (_tmp149_);
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp151_ = _tmp150_;
+#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp151_;
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp152_ = _ ("Darker");
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp153_ = g_strdup_printf ("<small>%s</small>", _tmp152_);
+#line 1804 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	darker_label = _tmp153_;
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp154_ = self->priv->brightness_adjustment;
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp155_ = gtk_adjustment_get_upper (_tmp154_);
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp156_ = _tmp155_;
+#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp156_;
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp157_ = _ ("Lighter");
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp158_ = g_strdup_printf ("<small>%s</small>", _tmp157_);
+#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lighter_label = _tmp158_;
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp159_ = self->priv->brightness_scale;
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp160_ = lower;
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp161_ = darker_label;
+#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp159_, _tmp160_, GTK_POS_BOTTOM, _tmp161_);
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp162_ = self->priv->brightness_scale;
+#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp162_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp163_ = self->priv->brightness_scale;
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp164_ = upper;
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp165_ = lighter_label;
+#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp163_, _tmp164_, GTK_POS_BOTTOM, _tmp165_);
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp166_ = self->priv->settings;
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp167_ = g_settings_get_int (_tmp166_, "brightness");
+#line 1810 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_brightness (self, _tmp167_);
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp168_ = self->priv->brightness_adjustment;
+#line 1811 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp168_, "value-changed", (GCallback) ___lambda14__gtk_adjustment_value_changed, self, 0);
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp169_ = self->priv->contrast_adjustment;
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp170_ = gtk_adjustment_get_lower (_tmp169_);
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp171_ = _tmp170_;
+#line 1813 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp171_;
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp172_ = _ ("Less");
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp173_ = g_strdup_printf ("<small>%s</small>", _tmp172_);
+#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	less_label = _tmp173_;
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp174_ = self->priv->contrast_adjustment;
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp175_ = gtk_adjustment_get_upper (_tmp174_);
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp176_ = _tmp175_;
+#line 1815 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp176_;
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp177_ = _ ("More");
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp178_ = g_strdup_printf ("<small>%s</small>", _tmp177_);
+#line 1816 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	more_label = _tmp178_;
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp179_ = self->priv->contrast_scale;
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp180_ = lower;
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp181_ = less_label;
+#line 1817 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp179_, _tmp180_, GTK_POS_BOTTOM, _tmp181_);
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp182_ = self->priv->contrast_scale;
+#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp182_, (gdouble) 0, GTK_POS_BOTTOM, NULL);
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp183_ = self->priv->contrast_scale;
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp184_ = upper;
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp185_ = more_label;
+#line 1819 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp183_, _tmp184_, GTK_POS_BOTTOM, _tmp185_);
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp186_ = self->priv->settings;
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp187_ = g_settings_get_int (_tmp186_, "contrast");
+#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_contrast (self, _tmp187_);
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp188_ = self->priv->contrast_adjustment;
+#line 1821 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp188_, "value-changed", (GCallback) ___lambda15__gtk_adjustment_value_changed, self, 0);
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp189_ = self->priv->quality_adjustment;
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp190_ = gtk_adjustment_get_lower (_tmp189_);
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp191_ = _tmp190_;
+#line 1823 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	lower = _tmp191_;
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp192_ = _ ("Minimum");
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp193_ = g_strdup_printf ("<small>%s</small>", _tmp192_);
+#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	minimum_label = _tmp193_;
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp194_ = self->priv->quality_adjustment;
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp195_ = gtk_adjustment_get_upper (_tmp194_);
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp196_ = _tmp195_;
+#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	upper = _tmp196_;
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp197_ = _ ("Maximum");
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp198_ = g_strdup_printf ("<small>%s</small>", _tmp197_);
+#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	maximum_label = _tmp198_;
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp199_ = self->priv->quality_scale;
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp200_ = lower;
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp201_ = minimum_label;
+#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp199_, _tmp200_, GTK_POS_BOTTOM, _tmp201_);
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp202_ = self->priv->quality_scale;
+#line 1828 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp202_, (gdouble) 75, GTK_POS_BOTTOM, NULL);
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp203_ = self->priv->quality_scale;
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp204_ = upper;
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp205_ = maximum_label;
+#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_scale_add_mark (_tmp203_, _tmp204_, GTK_POS_BOTTOM, _tmp205_);
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp206_ = self->priv->settings;
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp207_ = g_settings_get_int (_tmp206_, "jpeg-quality");
+#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	user_interface_set_quality (self, _tmp207_);
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp208_ = self->priv->quality_adjustment;
+#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp208_, "value-changed", (GCallback) ___lambda16__gtk_adjustment_value_changed, self, 0);
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp209_ = self->priv->settings;
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp210_ = g_settings_get_string (_tmp209_, "selected-device");
+#line 1833 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	device = _tmp210_;
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp211_ = device;
+#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp211_ != NULL) {
+#line 8849 "ui.c"
+		const gchar* _tmp212_ = NULL;
+		GtkTreeIter _tmp213_ = {0};
+		gboolean _tmp214_ = FALSE;
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp212_ = device;
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp214_ = user_interface_find_scan_device (self, _tmp212_, &_tmp213_);
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		iter = _tmp213_;
+#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		if (_tmp214_) {
+#line 8861 "ui.c"
+			GtkComboBox* _tmp215_ = NULL;
+			GtkTreeIter _tmp216_ = {0};
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp215_ = self->priv->device_combo;
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			_tmp216_ = iter;
+#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			gtk_combo_box_set_active_iter (_tmp215_, &_tmp216_);
+#line 8870 "ui.c"
 		}
 	}
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp294_ = self->priv->settings;
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp295_ = g_settings_get_string (_tmp294_, "document-type");
-#line 1613 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	document_type = _tmp295_;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp296_ = document_type;
-#line 1614 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp296_ != NULL) {
-#line 8078 "ui.c"
-		const gchar* _tmp297_ = NULL;
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp297_ = document_type;
-#line 1615 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_set_document_hint (self, _tmp297_, FALSE);
-#line 8084 "ui.c"
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp217_ = self->priv->settings;
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp218_ = g_settings_get_string (_tmp217_, "document-type");
+#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	document_type = _tmp218_;
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp219_ = document_type;
+#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp219_ != NULL) {
+#line 8883 "ui.c"
+		const gchar* _tmp220_ = NULL;
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp220_ = document_type;
+#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_document_hint (self, _tmp220_, FALSE);
+#line 8889 "ui.c"
 	}
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp298_ = self->priv->_book;
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp299_ = book_view_new (_tmp298_);
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp299_);
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp221_ = self->priv->_book;
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp222_ = book_view_new (_tmp221_);
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp222_);
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 1617 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->book_view = _tmp299_;
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp300_ = self->priv->book_view;
-#line 1618 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_container_set_border_width ((GtkContainer*) _tmp300_, (guint) 18);
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp301_ = self->priv->main_vbox;
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp302_ = self->priv->book_view;
-#line 1619 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_box_pack_end (_tmp301_, (GtkWidget*) _tmp302_, TRUE, TRUE, (guint) 0);
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp303_ = self->priv->book_view;
-#line 1620 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp303_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self);
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp304_ = self->priv->book_view;
-#line 1621 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp304_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self);
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp305_ = self->priv->book_view;
-#line 1622 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp305_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self);
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp306_ = self->priv->book_view;
-#line 1623 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp306_);
-#line 1626 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->book_view = _tmp222_;
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp223_ = self->priv->book_view;
+#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_container_set_border_width ((GtkContainer*) _tmp223_, (guint) 18);
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp224_ = self->priv->main_vbox;
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp225_ = self->priv->book_view;
+#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_box_pack_end (_tmp224_, (GtkWidget*) _tmp225_, TRUE, TRUE, (guint) 0);
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp226_ = self->priv->book_view;
+#line 1847 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp226_, "page-selected", (GCallback) _user_interface_page_selected_cb_book_view_page_selected, self, 0);
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp227_ = self->priv->book_view;
+#line 1848 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp227_, "show-page", (GCallback) _user_interface_show_page_cb_book_view_show_page, self, 0);
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp228_ = self->priv->book_view;
+#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp228_, "show-menu", (GCallback) _user_interface_show_page_menu_cb_book_view_show_menu, self, 0);
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp229_ = self->priv->book_view;
+#line 1850 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp229_, TRUE);
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp230_ = self->priv->authorize_dialog;
+#line 1852 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_transient_for ((GtkWindow*) _tmp230_, (GtkWindow*) self);
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp231_ = self->priv->preferences_dialog;
+#line 1853 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_transient_for ((GtkWindow*) _tmp231_, (GtkWindow*) self);
+#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_load_state (self);
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp307_ = self->priv->window_width;
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp308_ = self->priv->window_height;
-#line 1629 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1629: Restoring window to %dx%d pixels", _tmp307_, _tmp308_);
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp309_ = self->priv->window;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp310_ = self->priv->window_width;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp311_ = self->priv->window_height;
-#line 1630 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_window_set_default_size ((GtkWindow*) _tmp309_, _tmp310_, _tmp311_);
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp312_ = self->priv->window_is_maximized;
-#line 1631 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (_tmp312_) {
-#line 8142 "ui.c"
-		GtkApplicationWindow* _tmp313_ = NULL;
-#line 1633 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_debug ("ui.vala:1633: Restoring window to maximized");
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp313_ = self->priv->window;
-#line 1634 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		gtk_window_maximize ((GtkWindow*) _tmp313_);
-#line 8150 "ui.c"
-	}
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp314_ = self->priv->window;
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp315_ = _ ("Saving document...");
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp316_ = progress_bar_dialog_new (_tmp314_, _tmp315_);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_object_ref_sink (_tmp316_);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp232_ = self->priv->window_width;
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp233_ = self->priv->window_height;
+#line 1859 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1859: Restoring window to %dx%d pixels", _tmp232_, _tmp233_);
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp234_ = self->priv->window_width;
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp235_ = self->priv->window_height;
+#line 1860 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_window_set_default_size ((GtkWindow*) self, _tmp234_, _tmp235_);
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp236_ = self->priv->window_is_maximized;
+#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (_tmp236_) {
+#line 1863 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_debug ("ui.vala:1863: Restoring window to maximized");
+#line 1864 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gtk_window_maximize ((GtkWindow*) self);
+#line 8957 "ui.c"
+	}
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp237_ = _ ("Saving document...");
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp238_ = progress_bar_dialog_new ((GtkApplicationWindow*) self, _tmp237_);
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_ref_sink (_tmp238_);
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 1637 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->priv->progress_dialog = _tmp316_;
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp317_ = self->priv->_book;
-#line 1638 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_connect (_tmp317_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1867 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->progress_dialog = _tmp238_;
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp239_ = self->priv->_book;
+#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_connect_object (_tmp239_, "saving", (GCallback) _user_interface_book_saving_cb_book_saving, self, 0);
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (document_type);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (device);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (maximum_label);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (minimum_label);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (more_label);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (less_label);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (lighter_label);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (darker_label);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (renderer);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (content_area);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1425 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1673 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (app);
-#line 8192 "ui.c"
+#line 8997 "ui.c"
 }
 
 
@@ -8227,440 +9032,447 @@ static void user_interface_load_state (UserInterface* self) {
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
 	GQuark _tmp29_ = 0U;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label0 = 0;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label1 = 0;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	static GQuark _tmp28_label2 = 0;
-#line 8226 "ui.c"
+#line 9031 "ui.c"
 	GError * _inner_error_ = NULL;
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = user_interface_get_state_filename (self);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _tmp0_;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1648: Loading state from %s", _tmp2_);
-#line 1648 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1878: Loading state from %s", _tmp2_);
+#line 1878 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp2_);
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_key_file_new ();
-#line 1650 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1880 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp3_;
-#line 8244 "ui.c"
+#line 9049 "ui.c"
 	{
 		GKeyFile* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = f;
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = user_interface_get_state_filename (self);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = _tmp5_;
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = _tmp6_;
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_key_file_load_from_file (_tmp4_, _tmp7_, G_KEY_FILE_NONE, &_inner_error_);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp7_);
-#line 1653 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1883 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 8264 "ui.c"
-			goto __catch22_g_error;
+#line 9069 "ui.c"
+			goto __catch21_g_error;
 		}
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally21;
+	__catch21_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp8_ = NULL;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = e;
-#line 1657 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1887 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!g_error_matches (_tmp8_, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
-#line 8281 "ui.c"
+#line 9086 "ui.c"
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp9_ = e;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp10_ = _tmp9_->message;
-#line 1658 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			g_warning ("ui.vala:1658: Failed to load state: %s", _tmp10_);
-#line 8290 "ui.c"
+#line 1888 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+			g_warning ("ui.vala:1888: Failed to load state: %s", _tmp10_);
+#line 9095 "ui.c"
 		}
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 8294 "ui.c"
+#line 9099 "ui.c"
 	}
-	__finally22:
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally21:
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1651 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1881 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 8307 "ui.c"
+#line 9112 "ui.c"
 	}
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = f;
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = user_interface_state_get_integer (self, _tmp11_, "window", "width", 600);
-#line 1660 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1890 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_width = _tmp12_;
-#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_width;
-#line 1661 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1891 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp13_ <= 0) {
-#line 1662 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1892 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_width = 600;
-#line 8321 "ui.c"
+#line 9126 "ui.c"
 	}
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = user_interface_state_get_integer (self, _tmp14_, "window", "height", 400);
-#line 1663 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1893 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_height = _tmp15_;
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = self->priv->window_height;
-#line 1664 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1894 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp16_ <= 0) {
-#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1895 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->window_height = 400;
-#line 8335 "ui.c"
+#line 9140 "ui.c"
 	}
-#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = f;
-#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = user_interface_state_get_boolean (self, _tmp17_, "window", "is-maximized", FALSE);
-#line 1666 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1896 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->window_is_maximized = _tmp18_;
-#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = f;
-#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = user_interface_state_get_integer (self, _tmp19_, "last-page", "width", 595);
-#line 1667 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1897 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_width = _tmp20_;
-#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp21_ = f;
-#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp22_ = user_interface_state_get_integer (self, _tmp21_, "last-page", "height", 842);
-#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1898 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_height = _tmp22_;
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp23_ = f;
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp24_ = user_interface_state_get_integer (self, _tmp23_, "last-page", "dpi", 72);
-#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1899 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->default_page_dpi = _tmp24_;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp25_ = f;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp26_ = user_interface_state_get_string (self, _tmp25_, "last-page", "scan-direction", "top-to-bottom");
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp27_ = _tmp26_;
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp29_ = (NULL == _tmp27_) ? 0 : g_quark_from_string (_tmp27_);
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_free (_tmp27_);
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp29_ == ((0 != _tmp28_label0) ? _tmp28_label0 : (_tmp28_label0 = g_quark_from_static_string ("bottom-to-top")))) {
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 8375 "ui.c"
+#line 9180 "ui.c"
 			default:
 			{
-#line 1677 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1907 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_BOTTOM_TO_TOP;
-#line 1678 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1908 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 8382 "ui.c"
+#line 9187 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label1) ? _tmp28_label1 : (_tmp28_label1 = g_quark_from_static_string ("left-to-right")))) {
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 8388 "ui.c"
+#line 9193 "ui.c"
 			default:
 			{
-#line 1680 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1910 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_LEFT_TO_RIGHT;
-#line 1681 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1911 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 8395 "ui.c"
+#line 9200 "ui.c"
 			}
 		}
 	} else if (_tmp29_ == ((0 != _tmp28_label2) ? _tmp28_label2 : (_tmp28_label2 = g_quark_from_static_string ("right-to-left")))) {
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 8401 "ui.c"
+#line 9206 "ui.c"
 			default:
 			{
-#line 1683 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1913 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_RIGHT_TO_LEFT;
-#line 1684 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1914 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 8408 "ui.c"
+#line 9213 "ui.c"
 			}
 		}
 	} else {
-#line 1670 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1900 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		switch (0) {
-#line 8414 "ui.c"
+#line 9219 "ui.c"
 			default:
 			{
-#line 1674 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1904 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				self->priv->default_page_scan_direction = SCAN_DIRECTION_TOP_TO_BOTTOM;
-#line 1675 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1905 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 				break;
-#line 8421 "ui.c"
+#line 9226 "ui.c"
 			}
 		}
 	}
-#line 1646 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 8427 "ui.c"
+#line 9232 "ui.c"
 }
 
 
 static gint user_interface_state_get_integer (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gint _default_) {
 	gint result = 0;
 	GError * _inner_error_ = NULL;
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, 0);
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, 0);
-#line 1688 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1918 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 8442 "ui.c"
+#line 9247 "ui.c"
 	{
 		gint _tmp0_ = 0;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_integer (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 8461 "ui.c"
-			goto __catch23_g_error;
+#line 9266 "ui.c"
+			goto __catch22_g_error;
 		}
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1692 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1922 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 8468 "ui.c"
+#line 9273 "ui.c"
 	}
-	goto __finally23;
-	__catch23_g_error:
+	goto __finally22;
+	__catch22_g_error:
 	{
 		gint _tmp5_ = 0;
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1696 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1926 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 8484 "ui.c"
+#line 9289 "ui.c"
 	}
-	__finally23:
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally22:
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1690 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1920 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return 0;
-#line 8493 "ui.c"
+#line 9298 "ui.c"
 }
 
 
 static gboolean user_interface_state_get_boolean (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, gboolean _default_) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, FALSE);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, FALSE);
-#line 1700 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1930 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 8508 "ui.c"
+#line 9313 "ui.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_boolean (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 8527 "ui.c"
-			goto __catch24_g_error;
+#line 9332 "ui.c"
+			goto __catch23_g_error;
 		}
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp0_;
-#line 1704 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1934 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 8534 "ui.c"
+#line 9339 "ui.c"
 	}
-	goto __finally24;
-	__catch24_g_error:
+	goto __finally23;
+	__catch23_g_error:
 	{
 		gboolean _tmp5_ = FALSE;
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = _default_;
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = _tmp5_;
-#line 1708 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1938 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 8550 "ui.c"
+#line 9355 "ui.c"
 	}
-	__finally24:
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally23:
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1702 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1932 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return FALSE;
-#line 8559 "ui.c"
+#line 9364 "ui.c"
 }
 
 
 static gchar* user_interface_state_get_string (UserInterface* self, GKeyFile* f, const gchar* group_name, const gchar* key, const gchar* _default_) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (f != NULL, NULL);
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (group_name != NULL, NULL);
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1712 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1942 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (_default_ != NULL, NULL);
-#line 8576 "ui.c"
+#line 9381 "ui.c"
 	{
 		gchar* _tmp0_ = NULL;
 		GKeyFile* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		gchar* _tmp5_ = NULL;
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = f;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp2_ = group_name;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = key;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = g_key_file_get_string (_tmp1_, _tmp2_, _tmp3_, &_inner_error_);
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = _tmp4_;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 8595 "ui.c"
-			goto __catch25_g_error;
+#line 9401 "ui.c"
+			goto __catch24_g_error;
 		}
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp0_;
-#line 1716 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = _tmp0_;
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp0_ = NULL;
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp5_;
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_g_free0 (_tmp0_);
+#line 1946 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 8602 "ui.c"
+#line 9414 "ui.c"
 	}
-	goto __finally25;
-	__catch25_g_error:
+	goto __finally24;
+	__catch24_g_error:
 	{
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		const gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp5_ = _default_;
-#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp6_ = g_strdup (_tmp5_);
-#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		result = _tmp6_;
-#line 1720 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = _default_;
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = g_strdup (_tmp6_);
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		result = _tmp7_;
+#line 1950 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 8621 "ui.c"
+#line 9433 "ui.c"
 	}
-	__finally25:
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally24:
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_clear_error (&_inner_error_);
-#line 1714 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1944 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return NULL;
-#line 8630 "ui.c"
+#line 9442 "ui.c"
 }
 
 
-static gboolean ___lambda3_ (UserInterface* self) {
+static gboolean ___lambda9_ (UserInterface* self) {
 	gboolean result = FALSE;
-#line 1732 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1962 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_save_state (self, TRUE);
-#line 1733 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1963 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->save_state_timeout = (guint) 0;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1734 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1964 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8644 "ui.c"
+#line 9456 "ui.c"
 }
 
 
-static gboolean ____lambda3__gsource_func (gpointer self) {
+static gboolean ____lambda9__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda3_ (self);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = ___lambda9_ ((UserInterface*) self);
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8653 "ui.c"
+#line 9465 "ui.c"
 }
 
 
@@ -8685,145 +9497,145 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 	gint _tmp19_ = 0;
 	ScanDirection _tmp20_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = force;
-#line 1726 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1956 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp0_) {
-#line 8684 "ui.c"
+#line 9496 "ui.c"
 		guint _tmp1_ = 0U;
 		guint _tmp3_ = 0U;
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp1_ = self->priv->save_state_timeout;
-#line 1728 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1958 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_tmp1_ != ((guint) 0)) {
-#line 8691 "ui.c"
+#line 9503 "ui.c"
 			guint _tmp2_ = 0U;
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp2_ = self->priv->save_state_timeout;
-#line 1729 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1959 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_source_remove (_tmp2_);
-#line 8697 "ui.c"
+#line 9509 "ui.c"
 		}
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda3__gsource_func, user_interface_ref (self), user_interface_unref);
-#line 1730 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp3_ = g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 100, ____lambda9__gsource_func, g_object_ref (self), g_object_unref);
+#line 1960 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		self->priv->save_state_timeout = _tmp3_;
-#line 1736 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1966 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 8705 "ui.c"
+#line 9517 "ui.c"
 	}
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = user_interface_get_state_filename (self);
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = _tmp4_;
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = _tmp5_;
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_debug ("ui.vala:1739: Saving state to %s", _tmp6_);
-#line 1739 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_debug ("ui.vala:1969: Saving state to %s", _tmp6_);
+#line 1969 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (_tmp6_);
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = g_key_file_new ();
-#line 1741 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1971 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	f = _tmp7_;
-#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = f;
-#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->window_width;
-#line 1742 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1972 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp8_, "window", "width", _tmp9_);
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = f;
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = self->priv->window_height;
-#line 1743 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1973 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp10_, "window", "height", _tmp11_);
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = f;
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = self->priv->window_is_maximized;
-#line 1744 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1974 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_boolean (_tmp12_, "window", "is-maximized", _tmp13_);
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = f;
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp15_ = self->priv->default_page_width;
-#line 1745 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1975 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp14_, "last-page", "width", _tmp15_);
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp16_ = f;
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp17_ = self->priv->default_page_height;
-#line 1746 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1976 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp16_, "last-page", "height", _tmp17_);
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp18_ = f;
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp19_ = self->priv->default_page_dpi;
-#line 1747 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1977 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_key_file_set_integer (_tmp18_, "last-page", "dpi", _tmp19_);
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp20_ = self->priv->default_page_scan_direction;
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	switch (_tmp20_) {
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_TOP_TO_BOTTOM:
-#line 8763 "ui.c"
+#line 9575 "ui.c"
 		{
 			GKeyFile* _tmp21_ = NULL;
-#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp21_ = f;
-#line 1751 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1981 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp21_, "last-page", "scan-direction", "top-to-bottom");
-#line 1752 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1982 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 8772 "ui.c"
+#line 9584 "ui.c"
 		}
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_BOTTOM_TO_TOP:
-#line 8776 "ui.c"
+#line 9588 "ui.c"
 		{
 			GKeyFile* _tmp22_ = NULL;
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp22_ = f;
-#line 1754 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1984 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp22_, "last-page", "scan-direction", "bottom-to-top");
-#line 1755 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1985 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 8785 "ui.c"
+#line 9597 "ui.c"
 		}
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_LEFT_TO_RIGHT:
-#line 8789 "ui.c"
+#line 9601 "ui.c"
 		{
 			GKeyFile* _tmp23_ = NULL;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp23_ = f;
-#line 1757 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1987 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp23_, "last-page", "scan-direction", "left-to-right");
-#line 1758 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1988 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 8798 "ui.c"
+#line 9610 "ui.c"
 		}
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		case SCAN_DIRECTION_RIGHT_TO_LEFT:
-#line 8802 "ui.c"
+#line 9614 "ui.c"
 		{
 			GKeyFile* _tmp24_ = NULL;
-#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			_tmp24_ = f;
-#line 1760 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1990 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			g_key_file_set_value (_tmp24_, "last-page", "scan-direction", "right-to-left");
-#line 1761 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1991 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 8811 "ui.c"
+#line 9623 "ui.c"
 		}
 		default:
-#line 1748 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1978 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		break;
-#line 8816 "ui.c"
+#line 9628 "ui.c"
 	}
 	{
 		gchar* _tmp25_ = NULL;
@@ -8832,90 +9644,90 @@ static void user_interface_save_state (UserInterface* self, gboolean force) {
 		GKeyFile* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp25_ = user_interface_get_state_filename (self);
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp26_ = _tmp25_;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp27_ = _tmp26_;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp28_ = f;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp29_ = g_key_file_to_data (_tmp28_, NULL, NULL);
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp30_ = _tmp29_;
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_file_set_contents (_tmp27_, _tmp30_, (gssize) (-1), &_inner_error_);
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp30_);
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (_tmp27_);
-#line 1765 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1995 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 8845 "ui.c"
-			goto __catch26_g_error;
+#line 9657 "ui.c"
+			goto __catch25_g_error;
 		}
 	}
-	goto __finally26;
-	__catch26_g_error:
+	goto __finally25;
+	__catch25_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp31_ = NULL;
 		const gchar* _tmp32_ = NULL;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp31_ = e;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp32_ = _tmp31_->message;
-#line 1769 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1769: Failed to write state: %s", _tmp32_);
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1999 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:1999: Failed to write state: %s", _tmp32_);
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 8867 "ui.c"
+#line 9679 "ui.c"
 	}
-	__finally26:
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally25:
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_key_file_unref0 (f);
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1763 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1993 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 8880 "ui.c"
+#line 9692 "ui.c"
 	}
-#line 1724 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1954 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_key_file_unref0 (f);
-#line 8884 "ui.c"
+#line 9696 "ui.c"
 }
 
 
-static gboolean ___lambda11_ (UserInterface* self) {
+static gboolean ___lambda17_ (UserInterface* self) {
 	gboolean result = FALSE;
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 1784 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_hide ((GtkWidget*) _tmp0_);
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2014 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = FALSE;
-#line 1785 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2015 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8899 "ui.c"
+#line 9711 "ui.c"
 }
 
 
-static gboolean ____lambda11__gsource_func (gpointer self) {
+static gboolean ____lambda17__gsource_func (gpointer self) {
 	gboolean result;
-	result = ___lambda11_ (self);
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = ___lambda17_ ((UserInterface*) self);
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 8908 "ui.c"
+#line 9720 "ui.c"
 }
 
 
@@ -8938,97 +9750,97 @@ static void user_interface_book_saving_cb (UserInterface* self, gint page_number
 	ProgressBarDialog* _tmp12_ = NULL;
 	gdouble _tmp13_ = 0.0;
 	ProgressBarDialog* _tmp14_ = NULL;
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	while (TRUE) {
-#line 8935 "ui.c"
+#line 9747 "ui.c"
 		gboolean _tmp0_ = FALSE;
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp0_ = gtk_events_pending ();
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (!_tmp0_) {
-#line 1776 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2006 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 			break;
-#line 8943 "ui.c"
+#line 9755 "ui.c"
 		}
-#line 1777 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2007 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_main_iteration ();
-#line 8947 "ui.c"
+#line 9759 "ui.c"
 	}
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->_book;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = book_get_n_pages (_tmp1_);
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = _tmp2_;
-#line 1779 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2009 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	total = (gint) _tmp3_;
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = page_number;
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = total;
-#line 1780 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2010 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	fraction = (_tmp4_ + 1.0) / _tmp5_;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = fraction;
-#line 1781 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2011 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	complete = _tmp6_ == 1.0;
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = complete;
-#line 1782 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2012 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp7_) {
-#line 1783 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda11__gsource_func, user_interface_ref (self), user_interface_unref);
-#line 8973 "ui.c"
+#line 2013 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_timeout_add_full (G_PRIORITY_DEFAULT, (guint) 500, ____lambda17__gsource_func, g_object_ref (self), g_object_unref);
+#line 9785 "ui.c"
 	}
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = _ ("Saving page %d out of %d");
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = page_number;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp10_ = total;
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp11_ = g_strdup_printf (_tmp8_, _tmp9_ + 1, _tmp10_);
-#line 1787 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2017 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	message = _tmp11_;
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp12_ = self->priv->progress_dialog;
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp13_ = fraction;
-#line 1789 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2019 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_fraction (_tmp12_, _tmp13_);
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp14_ = self->priv->progress_dialog;
-#line 1790 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2020 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_set_message (_tmp14_, message);
-#line 1773 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2003 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (message);
-#line 8997 "ui.c"
+#line 9809 "ui.c"
 }
 
 
 void user_interface_show_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 1793 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2023 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 1795 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp0_);
-#line 9009 "ui.c"
+#line 2025 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp0_, TRUE);
+#line 9821 "ui.c"
 }
 
 
 void user_interface_hide_progress_dialog (UserInterface* self) {
 	ProgressBarDialog* _tmp0_ = NULL;
-#line 1798 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2028 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->progress_dialog;
-#line 1800 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_hide ((GtkWidget*) _tmp0_);
-#line 9021 "ui.c"
+#line 2030 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp0_, FALSE);
+#line 9833 "ui.c"
 }
 
 
@@ -9038,88 +9850,87 @@ void user_interface_show_error (UserInterface* self, const gchar* error_title, c
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_title != NULL);
-#line 1803 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2033 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (error_text != NULL);
-#line 1805 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2035 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->have_error = TRUE;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = error_title;
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 1806 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2036 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_title = _tmp1_;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = error_text;
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 1807 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2037 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_text = _tmp3_;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = change_scanner_hint;
-#line 1808 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2038 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->error_change_scanner_hint = _tmp4_;
-#line 1809 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2039 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_update_info_bar (self);
-#line 9061 "ui.c"
+#line 9873 "ui.c"
 }
 
 
 void user_interface_start (UserInterface* self) {
-	GtkApplicationWindow* _tmp0_ = NULL;
-#line 1812 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2042 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp0_ = self->priv->window;
-#line 1814 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp0_);
-#line 9073 "ui.c"
+#line 2044 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) self, TRUE);
+#line 9882 "ui.c"
 }
 
 
 Book* user_interface_get_book (UserInterface* self) {
 	Book* result;
 	Book* _tmp0_ = NULL;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9088 "ui.c"
+#line 9897 "ui.c"
 }
 
 
 static gpointer _book_ref0 (gpointer self) {
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self ? book_ref (self) : NULL;
-#line 9095 "ui.c"
+#line 9904 "ui.c"
 }
 
 
 static void user_interface_set_book (UserInterface* self, Book* value) {
 	Book* _tmp0_ = NULL;
 	Book* _tmp1_ = NULL;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _book_ref0 (_tmp0_);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->_book);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->_book = _tmp1_;
-#line 9112 "ui.c"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "book");
+#line 9923 "ui.c"
 }
 
 
@@ -9128,81 +9939,85 @@ Page* user_interface_get_selected_page (UserInterface* self) {
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 97 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = book_view_get_selected_page (_tmp0_);
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = _tmp1_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp2_;
-#line 99 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9133 "ui.c"
+#line 9944 "ui.c"
 }
 
 
 void user_interface_set_selected_page (UserInterface* self, Page* value) {
 	BookView* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 101 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->book_view;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	book_view_set_selected_page (_tmp0_, _tmp1_);
-#line 9148 "ui.c"
+#line 171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "selected-page");
+#line 9961 "ui.c"
 }
 
 
 const gchar* user_interface_get_default_file_name (UserInterface* self) {
 	const gchar* result;
 	const gchar* _tmp0_ = NULL;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_default_file_name;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9163 "ui.c"
+#line 9976 "ui.c"
 }
 
 
 void user_interface_set_default_file_name (UserInterface* self, const gchar* value) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->_default_file_name);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->_default_file_name = _tmp1_;
-#line 9180 "ui.c"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "default-file-name");
+#line 9995 "ui.c"
 }
 
 
 gboolean user_interface_get_scanning (UserInterface* self) {
 	gboolean result;
 	gboolean _tmp0_ = FALSE;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, FALSE);
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->scanning_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp0_;
-#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 192 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9195 "ui.c"
+#line 10010 "ui.c"
 }
 
 
@@ -9214,31 +10029,49 @@ void user_interface_set_scanning (UserInterface* self, gboolean value) {
 	gboolean _tmp4_ = FALSE;
 	GtkToolButton* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 123 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GtkButton* _tmp7_ = NULL;
+	gboolean _tmp8_ = FALSE;
+	GtkButton* _tmp9_ = NULL;
+	gboolean _tmp10_ = FALSE;
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 195 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->scanning_ = _tmp0_;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = self->priv->page_delete_menuitem;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = value;
-#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 196 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp1_, !_tmp2_);
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp3_ = self->priv->stop_menuitem;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = self->priv->stop_scan_menuitem;
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = value;
-#line 127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 197 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, _tmp4_);
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->stop_toolbutton;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = value;
-#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 198 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, _tmp6_);
-#line 9231 "ui.c"
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp7_ = self->priv->scan_button;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = value;
+#line 199 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp7_, !_tmp8_);
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = self->priv->stop_button;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = value;
+#line 200 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp9_, _tmp10_);
+#line 193 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "scanning");
+#line 10064 "ui.c"
 }
 
 
@@ -9246,32 +10079,37 @@ gint user_interface_get_brightness (UserInterface* self) {
 	gint result;
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gdouble _tmp2_ = 0.0;
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->brightness_adjustment;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp1_;
-#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp2_;
+#line 212 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9249 "ui.c"
+#line 10085 "ui.c"
 }
 
 
 void user_interface_set_brightness (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->brightness_adjustment;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 141 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 9264 "ui.c"
+#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "brightness");
+#line 10102 "ui.c"
 }
 
 
@@ -9279,32 +10117,37 @@ gint user_interface_get_contrast (UserInterface* self) {
 	gint result;
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gdouble _tmp2_ = 0.0;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->contrast_adjustment;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp1_;
-#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp2_;
+#line 218 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9282 "ui.c"
+#line 10123 "ui.c"
 }
 
 
 void user_interface_set_contrast (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->contrast_adjustment;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 9297 "ui.c"
+#line 219 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "contrast");
+#line 10140 "ui.c"
 }
 
 
@@ -9312,32 +10155,37 @@ gint user_interface_get_quality (UserInterface* self) {
 	gint result;
 	GtkAdjustment* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gdouble _tmp2_ = 0.0;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, 0);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->quality_adjustment;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = gtk_adjustment_get_value (_tmp0_);
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	result = (gint) _tmp1_;
-#line 152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = (gint) _tmp2_;
+#line 224 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9315 "ui.c"
+#line 10161 "ui.c"
 }
 
 
 void user_interface_set_quality (UserInterface* self, gint value) {
 	GtkAdjustment* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->quality_adjustment;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = value;
-#line 153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_adjustment_set_value (_tmp0_, (gdouble) _tmp1_);
-#line 9330 "ui.c"
+#line 225 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "quality");
+#line 10178 "ui.c"
 }
 
 
@@ -9347,37 +10195,37 @@ gchar* user_interface_get_selected_device (UserInterface* self) {
 	GtkComboBox* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-#line 158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 230 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->device_combo;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = gtk_combo_box_get_active_iter (_tmp0_, &_tmp1_);
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 234 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_tmp2_) {
-#line 9350 "ui.c"
+#line 10198 "ui.c"
 		gchar* device = NULL;
 		GtkListStore* _tmp3_ = NULL;
 		GtkTreeIter _tmp4_ = {0};
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = self->priv->device_model;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp4_ = iter;
-#line 165 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 237 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		gtk_tree_model_get ((GtkTreeModel*) _tmp3_, &_tmp4_, 0, &device, -1, -1);
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = device;
-#line 166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 238 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 9364 "ui.c"
+#line 10212 "ui.c"
 	}
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = NULL;
-#line 169 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 241 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9370 "ui.c"
+#line 10218 "ui.c"
 }
 
 
@@ -9388,29 +10236,49 @@ void user_interface_set_selected_device (UserInterface* self, const gchar* value
 	gboolean _tmp2_ = FALSE;
 	GtkComboBox* _tmp3_ = NULL;
 	GtkTreeIter _tmp4_ = {0};
-#line 172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = value;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = user_interface_find_scan_device (self, _tmp0_, &_tmp1_);
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	iter = _tmp1_;
-#line 175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 247 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (!_tmp2_) {
-#line 176 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 248 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return;
-#line 9393 "ui.c"
+#line 10241 "ui.c"
 	}
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->device_combo;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = iter;
-#line 178 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 250 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_combo_box_set_active_iter (_tmp3_, &_tmp4_);
-#line 179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 251 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->user_selected_device = TRUE;
-#line 9403 "ui.c"
+#line 244 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "selected-device");
+#line 10253 "ui.c"
+}
+
+
+static gboolean user_interface_get_shell_shows_menubar (UserInterface* self) {
+	gboolean result;
+	gboolean shell_shows_menubar = FALSE;
+	GtkSettings* _tmp0_ = NULL;
+#line 1665 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = gtk_settings_get_default ();
+#line 1668 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_get ((GObject*) _tmp0_, "gtk-shell-shows-menubar", &shell_shows_menubar, NULL);
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = shell_shows_menubar;
+#line 1669 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 10271 "ui.c"
 }
 
 
@@ -9418,17 +10286,17 @@ static gchar* user_interface_get_state_filename (UserInterface* self) {
 	gchar* result;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_get_user_cache_dir ();
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = g_build_filename (_tmp0_, "simple-scan", "state", NULL);
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = _tmp1_;
-#line 1643 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 1873 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 9421 "ui.c"
+#line 10289 "ui.c"
 }
 
 
@@ -9439,27 +10307,27 @@ static void g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS (GClosure * closur
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = closure->data;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9440 "ui.c"
+#line 10308 "ui.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 9446 "ui.c"
+#line 10314 "ui.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_SCAN_OPTIONS) (marshal_data ? marshal_data : cc->callback);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), value_get_scan_options (param_values + 2), data2);
-#line 9452 "ui.c"
+#line 10320 "ui.c"
 }
 
 
@@ -9470,224 +10338,253 @@ static void g_cclosure_user_marshal_VOID__STRING_INT (GClosure * closure, GValue
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = closure->data;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 9471 "ui.c"
+#line 10339 "ui.c"
 	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		data2 = closure->data;
-#line 9477 "ui.c"
+#line 10345 "ui.c"
 	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 9483 "ui.c"
-}
-
-
-static void value_user_interface_init (GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	value->data[0].v_pointer = NULL;
-#line 9490 "ui.c"
-}
-
-
-static void value_user_interface_free_value (GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (value->data[0].v_pointer) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_unref (value->data[0].v_pointer);
-#line 9499 "ui.c"
-	}
-}
-
-
-static void value_user_interface_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (src_value->data[0].v_pointer) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dest_value->data[0].v_pointer = user_interface_ref (src_value->data[0].v_pointer);
-#line 9509 "ui.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 9513 "ui.c"
-	}
-}
-
-
-static gpointer value_user_interface_peek_pointer (const GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return value->data[0].v_pointer;
-#line 9521 "ui.c"
-}
-
-
-static gchar* value_user_interface_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (collect_values[0].v_pointer) {
-#line 9528 "ui.c"
-		UserInterface* object;
-		object = collect_values[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9535 "ui.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9539 "ui.c"
-		}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value->data[0].v_pointer = user_interface_ref (object);
-#line 9543 "ui.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value->data[0].v_pointer = NULL;
-#line 9547 "ui.c"
-	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return NULL;
-#line 9551 "ui.c"
-}
-
-
-static gchar* value_user_interface_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	UserInterface** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!object_p) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9562 "ui.c"
-	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (!value->data[0].v_pointer) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*object_p = NULL;
-#line 9568 "ui.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*object_p = value->data[0].v_pointer;
-#line 9572 "ui.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		*object_p = user_interface_ref (value->data[0].v_pointer);
-#line 9576 "ui.c"
-	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return NULL;
-#line 9580 "ui.c"
-}
-
-
-GParamSpec* param_spec_user_interface (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	ParamSpecUserInterface* spec;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, TYPE_USER_INTERFACE), NULL);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return G_PARAM_SPEC (spec);
-#line 9594 "ui.c"
-}
-
-
-gpointer value_get_user_interface (const GValue* value) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_USER_INTERFACE), NULL);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return value->data[0].v_pointer;
-#line 9603 "ui.c"
-}
-
-
-void value_set_user_interface (GValue* value, gpointer v_object) {
-	UserInterface* old;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_USER_INTERFACE));
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	old = value->data[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (v_object) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_USER_INTERFACE));
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value->data[0].v_pointer = v_object;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_ref (value->data[0].v_pointer);
-#line 9623 "ui.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value->data[0].v_pointer = NULL;
-#line 9627 "ui.c"
-	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (old) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_unref (old);
-#line 9633 "ui.c"
-	}
-}
-
-
-void value_take_user_interface (GValue* value, gpointer v_object) {
-	UserInterface* old;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_USER_INTERFACE));
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	old = value->data[0].v_pointer;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (v_object) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_USER_INTERFACE));
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value->data[0].v_pointer = v_object;
-#line 9652 "ui.c"
-	} else {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		value->data[0].v_pointer = NULL;
-#line 9656 "ui.c"
-	}
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (old) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		user_interface_unref (old);
-#line 9662 "ui.c"
-	}
+#line 10351 "ui.c"
 }
 
 
 static void user_interface_class_init (UserInterfaceClass * klass) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gint UserInterface_private_offset;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	user_interface_parent_class = g_type_class_peek_parent (klass);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	USER_INTERFACE_CLASS (klass)->finalize = user_interface_finalize;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (UserInterfacePrivate));
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_user_interface_get_property;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_user_interface_set_property;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (klass)->finalize = user_interface_finalize;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_BOOK, param_spec_book ("book", "book", "book", TYPE_BOOK, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SELECTED_PAGE, param_spec_page ("selected-page", "selected-page", "selected-page", TYPE_PAGE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_DEFAULT_FILE_NAME, g_param_spec_string ("default-file-name", "default-file-name", "default-file-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SCANNING, g_param_spec_boolean ("scanning", "scanning", "scanning", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_BRIGHTNESS, g_param_spec_int ("brightness", "brightness", "brightness", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_CONTRAST, g_param_spec_int ("contrast", "contrast", "contrast", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_QUALITY, g_param_spec_int ("quality", "quality", "quality", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), USER_INTERFACE_SELECTED_DEVICE, g_param_spec_string ("selected-device", "selected-device", "selected-device", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	UserInterface_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/SimpleScan/simple-scan.ui");
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("start_scan", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_SCAN_OPTIONS, G_TYPE_NONE, 2, G_TYPE_STRING, TYPE_SCAN_OPTIONS);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("stop_scan", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_signal_new ("email", TYPE_USER_INTERFACE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_INT, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
-#line 9680 "ui.c"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "menubar", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, menubar));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "toolbar", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, toolbar));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_menu", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_menu));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "main_vbox", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, main_vbox));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_crop_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, custom_crop_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a4_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a4_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a5_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a5_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "a6_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, a6_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "letter_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, letter_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "legal_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, legal_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "four_by_six_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, four_by_six_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "no_crop_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, no_crop_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_move_left_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_move_left_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_move_right_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_move_right_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_delete_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_delete_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_rotate_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_rotate_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_as_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_as_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "copy_to_clipboard_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, copy_to_clipboard_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_button));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "save_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, save_toolbutton));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_scan_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_scan_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_toolbutton));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_button));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "crop_toolbutton", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, crop_toolbutton));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "stop_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, stop_button));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "scan_button", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, scan_button));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_button_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_button_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_button_hb_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_button_hb_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_button_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_button_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_button_hb_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_button_hb_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_menuitem", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_menuitem));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "authorize_dialog", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, authorize_dialog));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "authorize_label", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, authorize_label));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "username_entry", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, username_entry));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "password_entry", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, password_entry));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "preferences_dialog", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, preferences_dialog));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "device_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, device_combo));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_dpi_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_dpi_combo));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_dpi_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_dpi_combo));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_side_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_side_combo));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "paper_size_combo", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, paper_size_combo));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "brightness_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, brightness_scale));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "contrast_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, contrast_scale));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "quality_scale", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, quality_scale));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "device_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, device_model));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "text_dpi_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, text_dpi_model));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "photo_dpi_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, photo_dpi_model));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "page_side_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, page_side_model));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "paper_size_model", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, paper_size_model));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "brightness_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, brightness_adjustment));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "contrast_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, contrast_adjustment));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "quality_adjustment", FALSE, UserInterface_private_offset + G_STRUCT_OFFSET (UserInterfacePrivate, quality_adjustment));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "device_combo_changed_cb", G_CALLBACK(_user_interface_device_combo_changed_cb_gtk_combo_box_changed));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "new_button_clicked_cb", G_CALLBACK(_user_interface_new_button_clicked_cb_gtk_button_clicked));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "text_menuitem_toggled_cb", G_CALLBACK(_user_interface_text_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "photo_menuitem_toggled_cb", G_CALLBACK(_user_interface_photo_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "scan_button_clicked_cb", G_CALLBACK(_user_interface_scan_button_clicked_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "stop_scan_button_clicked_cb", G_CALLBACK(_user_interface_stop_scan_button_clicked_cb_gtk_button_clicked));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "continuous_scan_button_clicked_cb", G_CALLBACK(_user_interface_continuous_scan_button_clicked_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_button_clicked_cb", G_CALLBACK(_user_interface_preferences_button_clicked_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_dialog_delete_event_cb", G_CALLBACK(_user_interface_preferences_dialog_delete_event_cb_gtk_widget_delete_event));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "preferences_dialog_response_cb", G_CALLBACK(_user_interface_preferences_dialog_response_cb_gtk_dialog_response));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "rotate_left_button_clicked_cb", G_CALLBACK(_user_interface_rotate_left_button_clicked_cb_gtk_button_clicked));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "rotate_right_button_clicked_cb", G_CALLBACK(_user_interface_rotate_right_button_clicked_cb_gtk_button_clicked));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "no_crop_menuitem_toggled_cb", G_CALLBACK(_user_interface_no_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "custom_crop_menuitem_toggled_cb", G_CALLBACK(_user_interface_custom_crop_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_button_toggled_cb", G_CALLBACK(_user_interface_crop_button_toggled_cb_gtk_toggle_button_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_toolbutton_toggled_cb", G_CALLBACK(_user_interface_crop_toolbutton_toggled_cb_gtk_toggle_tool_button_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "four_by_six_menuitem_toggled_cb", G_CALLBACK(_user_interface_four_by_six_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "legal_menuitem_toggled_cb", G_CALLBACK(_user_interface_legal_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "letter_menuitem_toggled_cb", G_CALLBACK(_user_interface_letter_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a6_menuitem_toggled_cb", G_CALLBACK(_user_interface_a6_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a5_menuitem_toggled_cb", G_CALLBACK(_user_interface_a5_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "a4_menuitem_toggled_cb", G_CALLBACK(_user_interface_a4_menuitem_toggled_cb_gtk_check_menu_item_toggled));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "crop_rotate_menuitem_activate_cb", G_CALLBACK(_user_interface_crop_rotate_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_move_left_menuitem_activate_cb", G_CALLBACK(_user_interface_page_move_left_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_move_right_menuitem_activate_cb", G_CALLBACK(_user_interface_page_move_right_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "page_delete_menuitem_activate_cb", G_CALLBACK(_user_interface_page_delete_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "reorder_menuitem_activate_cb", G_CALLBACK(_user_interface_reorder_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "save_file_button_clicked_cb", G_CALLBACK(_user_interface_save_file_button_clicked_cb_gtk_button_clicked));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "copy_to_clipboard_button_clicked_cb", G_CALLBACK(_user_interface_copy_to_clipboard_button_clicked_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "save_as_file_button_clicked_cb", G_CALLBACK(_user_interface_save_as_file_button_clicked_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "email_button_clicked_cb", G_CALLBACK(_user_interface_email_button_clicked_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "print_button_clicked_cb", G_CALLBACK(_user_interface_print_button_clicked_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "help_contents_menuitem_activate_cb", G_CALLBACK(_user_interface_help_contents_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "about_menuitem_activate_cb", G_CALLBACK(_user_interface_about_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "quit_menuitem_activate_cb", G_CALLBACK(_user_interface_quit_menuitem_activate_cb_gtk_menu_item_activate));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_configure_event_cb", G_CALLBACK(_user_interface_simple_scan_window_configure_event_cb_gtk_widget_configure_event));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "simple_scan_window_window_state_event_cb", G_CALLBACK(_user_interface_simple_scan_window_window_state_event_cb_gtk_widget_window_state_event));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_class_bind_template_callback_full (GTK_WIDGET_CLASS (klass), "window_delete_event_cb", G_CALLBACK(_user_interface_window_delete_event_cb_gtk_widget_delete_event));
+#line 10577 "ui.c"
 }
 
 
@@ -9695,199 +10592,338 @@ static void user_interface_instance_init (UserInterface * self) {
 	gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = USER_INTERFACE_GET_PRIVATE (self);
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->book_uri = NULL;
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = g_strdup ("photo");
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->document_hint = _tmp0_;
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = _ ("Scanned Document.pdf");
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->_default_file_name = _tmp2_;
-#line 119 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 189 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->scanning_ = FALSE;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	self->ref_count = 1;
-#line 9706 "ui.c"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 10603 "ui.c"
 }
 
 
-static void user_interface_finalize (UserInterface* obj) {
+static void user_interface_finalize (GObject* obj) {
 	UserInterface * self;
 	Book* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
 	Book* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	Book* _tmp4_ = NULL;
+	guint _tmp5_ = 0U;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_USER_INTERFACE, UserInterface);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->_book;
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp1_, NULL, FALSE);
-#line 213 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp1_, NULL, FALSE);
+#line 286 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _user_interface_page_added_cb_book_page_added, self);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = self->priv->_book;
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_parse_name ("page-added", TYPE_BOOK, &_tmp3_, NULL, FALSE);
-#line 214 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_page_added_cb_book_page_added, self);
-#line 30 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("reordered", TYPE_BOOK, &_tmp3_, NULL, FALSE);
+#line 287 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _user_interface_reordered_cb_book_reordered, self);
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = self->priv->_book;
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_parse_name ("page-removed", TYPE_BOOK, &_tmp5_, NULL, FALSE);
+#line 288 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _user_interface_page_removed_cb_book_page_removed, self);
+#line 33 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->settings);
-#line 32 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 34 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->window);
-#line 35 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->app_menu);
 #line 36 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->menubar);
-#line 37 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->main_vbox);
 #line 38 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->toolbar);
+#line 40 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->page_menu);
+#line 42 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->main_vbox);
+#line 43 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar);
-#line 39 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 44 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_image);
-#line 40 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 45 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_label);
-#line 41 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 46 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_close_button);
-#line 42 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->info_bar_change_scanner_button);
-#line 43 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 49 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->custom_crop_menuitem);
+#line 51 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->a4_menuitem);
+#line 53 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->a5_menuitem);
+#line 55 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->a6_menuitem);
+#line 57 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->letter_menuitem);
+#line 59 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->legal_menuitem);
+#line 61 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->four_by_six_menuitem);
+#line 63 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->no_crop_menuitem);
+#line 65 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_left_menuitem);
-#line 44 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 67 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_move_right_menuitem);
-#line 45 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 69 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_delete_menuitem);
-#line 46 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 71 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->crop_rotate_menuitem);
-#line 47 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 73 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_menuitem);
-#line 48 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 75 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_as_menuitem);
-#line 49 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 77 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->copy_to_clipboard_menuitem);
-#line 50 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 79 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->save_button);
+#line 81 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_toolbutton);
-#line 51 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->stop_menuitem);
-#line 52 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 83 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->stop_scan_menuitem);
+#line 85 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->stop_toolbutton);
-#line 54 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_toolbar_menuitem);
-#line 55 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->text_menu_menuitem);
-#line 56 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_toolbar_menuitem);
-#line 57 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_g_object_unref0 (self->priv->photo_menu_menuitem);
-#line 59 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 87 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->crop_button);
+#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->crop_toolbutton);
+#line 91 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->stop_button);
+#line 93 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->scan_button);
+#line 96 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->text_button_menuitem);
+#line 98 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->text_button_hb_menuitem);
+#line 100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->text_menuitem);
+#line 102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->photo_button_menuitem);
+#line 104 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->photo_button_hb_menuitem);
+#line 106 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_object_unref0 (self->priv->photo_menuitem);
+#line 109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_dialog);
-#line 60 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->authorize_label);
-#line 61 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 113 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->username_entry);
-#line 62 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 115 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->password_entry);
-#line 64 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->preferences_dialog);
-#line 65 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 120 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_combo);
-#line 66 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_combo);
-#line 67 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_combo);
-#line 68 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_combo);
-#line 69 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 128 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_combo);
-#line 70 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_scale);
-#line 71 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_scale);
-#line 72 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 134 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_scale);
-#line 73 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 136 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->device_model);
-#line 74 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 138 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->text_dpi_model);
-#line 75 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->photo_dpi_model);
-#line 76 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->page_side_model);
-#line 77 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 144 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->paper_size_model);
-#line 78 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 146 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->brightness_adjustment);
-#line 79 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 148 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->contrast_adjustment);
-#line 80 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->quality_adjustment);
-#line 84 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->save_dialog);
-#line 85 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 88 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 158 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_title);
-#line 89 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->error_text);
-#line 92 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 162 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_book_unref0 (self->priv->_book);
-#line 93 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->book_uri);
-#line 107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 177 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_autosave_manager_unref0 (self->priv->autosave_manager);
-#line 109 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 179 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->book_view);
-#line 116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 186 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->document_hint);
-#line 118 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 188 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (self->priv->_default_file_name);
-#line 9842 "ui.c"
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (user_interface_parent_class)->finalize (obj);
+#line 10777 "ui.c"
 }
 
 
 GType user_interface_get_type (void) {
 	static volatile gsize user_interface_type_id__volatile = 0;
 	if (g_once_init_enter (&user_interface_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { value_user_interface_init, value_user_interface_free_value, value_user_interface_copy_value, value_user_interface_peek_pointer, "p", value_user_interface_collect_value, "p", value_user_interface_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (UserInterfaceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) user_interface_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (UserInterface), 0, (GInstanceInitFunc) user_interface_instance_init, &g_define_type_value_table };
-		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		static const GTypeInfo g_define_type_info = { sizeof (UserInterfaceClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) user_interface_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (UserInterface), 0, (GInstanceInitFunc) user_interface_instance_init, NULL };
 		GType user_interface_type_id;
-		user_interface_type_id = g_type_register_fundamental (g_type_fundamental_next (), "UserInterface", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		user_interface_type_id = g_type_register_static (GTK_TYPE_APPLICATION_WINDOW, "UserInterface", &g_define_type_info, 0);
 		g_once_init_leave (&user_interface_type_id__volatile, user_interface_type_id);
 	}
 	return user_interface_type_id__volatile;
 }
 
 
-gpointer user_interface_ref (gpointer instance) {
-	UserInterface* self;
-	self = instance;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	return instance;
-#line 9867 "ui.c"
+static void _vala_user_interface_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	UserInterface * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_USER_INTERFACE, UserInterface);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (property_id) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_BOOK:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		value_set_book (value, user_interface_get_book (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_SELECTED_PAGE:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		value_set_page (value, user_interface_get_selected_page (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_DEFAULT_FILE_NAME:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_set_string (value, user_interface_get_default_file_name (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_SCANNING:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_set_boolean (value, user_interface_get_scanning (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_BRIGHTNESS:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_set_int (value, user_interface_get_brightness (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_CONTRAST:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_set_int (value, user_interface_get_contrast (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_QUALITY:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_set_int (value, user_interface_get_quality (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_SELECTED_DEVICE:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_take_string (value, user_interface_get_selected_device (self));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 10846 "ui.c"
+		default:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 10852 "ui.c"
+	}
 }
 
 
-void user_interface_unref (gpointer instance) {
-	UserInterface* self;
-	self = instance;
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		USER_INTERFACE_GET_CLASS (self)->finalize (self);
-#line 12 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 9880 "ui.c"
+static void _vala_user_interface_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	UserInterface * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_USER_INTERFACE, UserInterface);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (property_id) {
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_BOOK:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_book (self, value_get_book (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_SELECTED_PAGE:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_selected_page (self, value_get_page (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_DEFAULT_FILE_NAME:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_default_file_name (self, g_value_get_string (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_SCANNING:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_scanning (self, g_value_get_boolean (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_BRIGHTNESS:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_brightness (self, g_value_get_int (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_CONTRAST:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_contrast (self, g_value_get_int (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_QUALITY:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_quality (self, g_value_get_int (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case USER_INTERFACE_SELECTED_DEVICE:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		user_interface_set_selected_device (self, g_value_get_string (value));
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 10910 "ui.c"
+		default:
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 14 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 10916 "ui.c"
 	}
 }
 
@@ -9906,154 +10942,206 @@ ProgressBarDialog* progress_bar_dialog_construct (GType object_type, GtkApplicat
 	const gchar* _tmp7_ = NULL;
 	GtkApplicationWindow* _tmp8_ = NULL;
 	GtkProgressBar* _tmp9_ = NULL;
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (parent != NULL, NULL);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = (ProgressBarDialog*) g_object_new (object_type, NULL);
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 1824 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2066 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv->bar = _tmp0_;
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1825 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2067 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	hbox = _tmp1_;
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1826 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2068 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	vbox = _tmp2_;
-#line 1827 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2069 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_hexpand ((GtkWidget*) hbox, TRUE);
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp3_ = self->priv->bar;
-#line 1829 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2071 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp3_, "");
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp4_ = self->priv->bar;
-#line 1830 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2072 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_show_text (_tmp4_, TRUE);
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp5_ = self->priv->bar;
-#line 1831 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2073 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) _tmp5_, 225, 25);
-#line 1832 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2074 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_widget_set_size_request ((GtkWidget*) self, 250, 50);
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp6_ = self->priv->bar;
-#line 1834 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2076 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (vbox, (GtkWidget*) _tmp6_, TRUE, FALSE, (guint) 0);
-#line 1835 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2077 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_box_pack_start (hbox, (GtkWidget*) vbox, TRUE, FALSE, (guint) 0);
-#line 1836 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2078 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_container_add ((GtkContainer*) self, (GtkWidget*) hbox);
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp7_ = title;
-#line 1837 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2079 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_title ((GtkWindow*) self, _tmp7_);
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp8_ = parent;
-#line 1839 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2081 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_transient_for ((GtkWindow*) self, (GtkWindow*) _tmp8_);
-#line 1840 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2082 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_position ((GtkWindow*) self, GTK_WIN_POS_CENTER_ON_PARENT);
-#line 1841 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2083 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_modal ((GtkWindow*) self, TRUE);
-#line 1842 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2084 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_window_set_resizable ((GtkWindow*) self, FALSE);
-#line 1844 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) hbox);
-#line 1845 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) vbox);
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2086 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) hbox, TRUE);
+#line 2087 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) vbox, TRUE);
+#line 2088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp9_ = self->priv->bar;
-#line 1846 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	gtk_widget_show ((GtkWidget*) _tmp9_);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2088 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gtk_widget_set_visible ((GtkWidget*) _tmp9_, TRUE);
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (vbox);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (hbox);
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return self;
-#line 9977 "ui.c"
+#line 11013 "ui.c"
 }
 
 
 ProgressBarDialog* progress_bar_dialog_new (GtkApplicationWindow* parent, const gchar* title) {
-#line 1822 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2064 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return progress_bar_dialog_construct (TYPE_PROGRESS_BAR_DIALOG, parent, title);
-#line 9984 "ui.c"
+#line 11020 "ui.c"
 }
 
 
-void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble percent) {
+gdouble progress_bar_dialog_get_fraction (ProgressBarDialog* self) {
+	gdouble result;
 	GtkProgressBar* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 1849 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	gdouble _tmp2_ = 0.0;
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, 0.0);
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->bar;
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_progress_bar_get_fraction (_tmp0_);
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp2_;
+#line 2054 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 11041 "ui.c"
+}
+
+
+void progress_bar_dialog_set_fraction (ProgressBarDialog* self, gdouble value) {
+	GtkProgressBar* _tmp0_ = NULL;
+	gdouble _tmp1_ = 0.0;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = percent;
-#line 1851 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = value;
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_fraction (_tmp0_, _tmp1_);
-#line 9999 "ui.c"
+#line 2055 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "fraction");
+#line 11058 "ui.c"
 }
 
 
-void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* message) {
+const gchar* progress_bar_dialog_get_message (ProgressBarDialog* self) {
+	const gchar* result;
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	const gchar* _tmp2_ = NULL;
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = self->priv->bar;
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_progress_bar_get_text (_tmp0_);
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = _tmp1_;
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = _tmp2_;
+#line 2060 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 11079 "ui.c"
+}
+
+
+void progress_bar_dialog_set_message (ProgressBarDialog* self, const gchar* value) {
+	GtkProgressBar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_if_fail (self != NULL);
-#line 1854 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	g_return_if_fail (message != NULL);
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = self->priv->bar;
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-	_tmp1_ = message;
-#line 1856 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = value;
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 10016 "ui.c"
+#line 2061 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_notify ((GObject *) self, "message");
+#line 11096 "ui.c"
 }
 
 
 static void progress_bar_dialog_class_init (ProgressBarDialogClass * klass) {
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	progress_bar_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_type_class_add_private (klass, sizeof (ProgressBarDialogPrivate));
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (klass)->get_property = _vala_progress_bar_dialog_get_property;
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (klass)->set_property = _vala_progress_bar_dialog_set_property;
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_bar_dialog_finalize;
-#line 10027 "ui.c"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_FRACTION, g_param_spec_double ("fraction", "fraction", "fraction", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_object_class_install_property (G_OBJECT_CLASS (klass), PROGRESS_BAR_DIALOG_MESSAGE, g_param_spec_string ("message", "message", "message", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
+#line 11115 "ui.c"
 }
 
 
 static void progress_bar_dialog_instance_init (ProgressBarDialog * self) {
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self->priv = PROGRESS_BAR_DIALOG_GET_PRIVATE (self);
-#line 10034 "ui.c"
+#line 11122 "ui.c"
 }
 
 
 static void progress_bar_dialog_finalize (GObject* obj) {
 	ProgressBarDialog * self;
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
-#line 1820 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2050 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_object_unref0 (self->priv->bar);
-#line 1818 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	G_OBJECT_CLASS (progress_bar_dialog_parent_class)->finalize (obj);
-#line 10046 "ui.c"
+#line 11134 "ui.c"
 }
 
 
@@ -10069,6 +11157,62 @@ GType progress_bar_dialog_get_type (void) {
 }
 
 
+static void _vala_progress_bar_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+	ProgressBarDialog * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (property_id) {
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case PROGRESS_BAR_DIALOG_FRACTION:
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_set_double (value, progress_bar_dialog_get_fraction (self));
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case PROGRESS_BAR_DIALOG_MESSAGE:
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_value_set_string (value, progress_bar_dialog_get_message (self));
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 11167 "ui.c"
+		default:
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 11173 "ui.c"
+	}
+}
+
+
+static void _vala_progress_bar_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+	ProgressBarDialog * self;
+	self = G_TYPE_CHECK_INSTANCE_CAST (object, TYPE_PROGRESS_BAR_DIALOG, ProgressBarDialog);
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	switch (property_id) {
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case PROGRESS_BAR_DIALOG_FRACTION:
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		progress_bar_dialog_set_fraction (self, g_value_get_double (value));
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		case PROGRESS_BAR_DIALOG_MESSAGE:
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		progress_bar_dialog_set_message (self, g_value_get_string (value));
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 11195 "ui.c"
+		default:
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 2048 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		break;
+#line 11201 "ui.c"
+	}
+}
+
+
 gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* result = NULL;
 	gchar* filename = NULL;
@@ -10077,96 +11221,462 @@ gchar* get_temporary_filename (const gchar* prefix, const gchar* extension) {
 	gchar* _tmp2_ = NULL;
 	gchar* path = NULL;
 	GError * _inner_error_ = NULL;
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (prefix != NULL, NULL);
-#line 1861 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2093 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp0_ = prefix;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp1_ = extension;
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_tmp2_ = g_strdup_printf ("%sXXXXXX.%s", _tmp0_, _tmp1_);
-#line 1866 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2098 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	filename = _tmp2_;
-#line 10082 "ui.c"
+#line 11226 "ui.c"
 	{
 		gint fd = 0;
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp3_ = filename;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp5_ = g_file_open_tmp (_tmp3_, &_tmp4_, &_inner_error_);
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		path = _tmp4_;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		fd = _tmp5_;
-#line 1870 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2102 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		if (_inner_error_ != NULL) {
-#line 10101 "ui.c"
-			goto __catch27_g_error;
+#line 11245 "ui.c"
+			goto __catch26_g_error;
 		}
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp6_ = fd;
-#line 1871 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2103 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		close (_tmp6_);
-#line 10108 "ui.c"
+#line 11252 "ui.c"
 	}
-	goto __finally27;
-	__catch27_g_error:
+	goto __finally26;
+	__catch26_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		e = _inner_error_;
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_inner_error_ = NULL;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp7_ = e;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_tmp8_ = _tmp7_->message;
-#line 1875 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
-		g_warning ("ui.vala:1875: Error saving email attachment: %s", _tmp8_);
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2107 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		g_warning ("ui.vala:2107: Error saving email attachment: %s", _tmp8_);
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		result = NULL;
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_error_free0 (e);
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 1876 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2108 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return result;
-#line 10136 "ui.c"
+#line 11280 "ui.c"
 	}
-	__finally27:
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	__finally26:
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	if (_inner_error_ != NULL) {
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (path);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		_g_free0 (filename);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		g_clear_error (&_inner_error_);
-#line 1868 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2100 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 		return NULL;
-#line 10151 "ui.c"
+#line 11295 "ui.c"
 	}
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	result = path;
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	_g_free0 (filename);
-#line 1879 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+#line 2111 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return result;
+#line 11303 "ui.c"
+}
+
+
+PageIcon* page_icon_construct (GType object_type, const gchar* text, gdouble r, gdouble g, gdouble b) {
+	PageIcon * self = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gdouble _tmp2_ = 0.0;
+	gdouble _tmp3_ = 0.0;
+	gdouble _tmp4_ = 0.0;
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (text != NULL, NULL);
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) g_object_new (object_type, NULL);
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = text;
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (self->priv->text);
+#line 2124 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->text = _tmp1_;
+#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = r;
+#line 2125 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->r = _tmp2_;
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = g;
+#line 2126 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->g = _tmp3_;
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp4_ = b;
+#line 2127 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv->b = _tmp4_;
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return self;
+#line 11340 "ui.c"
+}
+
+
+PageIcon* page_icon_new (const gchar* text, gdouble r, gdouble g, gdouble b) {
+#line 2122 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	return page_icon_construct (TYPE_PAGE_ICON, text, r, g, b);
+#line 11347 "ui.c"
+}
+
+
+static void page_icon_real_get_preferred_width (GtkWidget* base, gint* minimum_width, gint* natural_width) {
+	PageIcon * self;
+	gint _vala_minimum_width = 0;
+	gint _vala_natural_width = 0;
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_natural_width = PAGE_ICON_MINIMUM_WIDTH;
+#line 2132 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_minimum_width = _vala_natural_width;
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (minimum_width) {
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*minimum_width = _vala_minimum_width;
+#line 11365 "ui.c"
+	}
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (natural_width) {
+#line 2130 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*natural_width = _vala_natural_width;
+#line 11371 "ui.c"
+	}
+}
+
+
+static void page_icon_real_get_preferred_height (GtkWidget* base, gint* minimum_height, gint* natural_height) {
+	PageIcon * self;
+	gint _vala_minimum_height = 0;
+	gint _vala_natural_height = 0;
+	gdouble _tmp0_ = 0.0;
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = round (PAGE_ICON_MINIMUM_WIDTH * G_SQRT2);
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_natural_height = (gint) _tmp0_;
+#line 2137 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_minimum_height = _vala_natural_height;
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (minimum_height) {
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*minimum_height = _vala_minimum_height;
+#line 11393 "ui.c"
+	}
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (natural_height) {
+#line 2135 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*natural_height = _vala_natural_height;
+#line 11399 "ui.c"
+	}
+}
+
+
+static void page_icon_real_get_preferred_height_for_width (GtkWidget* base, gint width, gint* minimum_height, gint* natural_height) {
+	PageIcon * self;
+	gint _vala_minimum_height = 0;
+	gint _vala_natural_height = 0;
+	gint _tmp0_ = 0;
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = width;
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_natural_height = (gint) (_tmp0_ * G_SQRT2);
+#line 2142 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_minimum_height = _vala_natural_height;
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (minimum_height) {
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*minimum_height = _vala_minimum_height;
+#line 11421 "ui.c"
+	}
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (natural_height) {
+#line 2140 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*natural_height = _vala_natural_height;
+#line 11427 "ui.c"
+	}
+}
+
+
+static void page_icon_real_get_preferred_width_for_height (GtkWidget* base, gint height, gint* minimum_width, gint* natural_width) {
+	PageIcon * self;
+	gint _vala_minimum_width = 0;
+	gint _vala_natural_width = 0;
+	gint _tmp0_ = 0;
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = height;
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_natural_width = (gint) (_tmp0_ / G_SQRT2);
+#line 2147 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_vala_minimum_width = _vala_natural_width;
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (minimum_width) {
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*minimum_width = _vala_minimum_width;
+#line 11449 "ui.c"
+	}
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if (natural_width) {
+#line 2145 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		*natural_width = _vala_natural_width;
+#line 11455 "ui.c"
+	}
+}
+
+
+static gboolean page_icon_real_draw (GtkWidget* base, cairo_t* c) {
+	PageIcon * self;
+	gboolean result = FALSE;
+	gint w = 0;
+	gint _tmp0_ = 0;
+	gint h = 0;
+	gint _tmp1_ = 0;
+	gint _tmp2_ = 0;
+	gint _tmp3_ = 0;
+	cairo_t* _tmp8_ = NULL;
+	gint _tmp9_ = 0;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+	gint _tmp12_ = 0;
+	cairo_t* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	gint _tmp15_ = 0;
+	cairo_t* _tmp16_ = NULL;
+	gdouble _tmp17_ = 0.0;
+	gdouble _tmp18_ = 0.0;
+	gdouble _tmp19_ = 0.0;
+	cairo_t* _tmp20_ = NULL;
+	cairo_t* _tmp21_ = NULL;
+	cairo_t* _tmp22_ = NULL;
+	cairo_t* _tmp23_ = NULL;
+	cairo_text_extents_t extents = {0};
+	cairo_t* _tmp24_ = NULL;
+	const gchar* _tmp25_ = NULL;
+	cairo_text_extents_t _tmp26_ = {0};
+	cairo_t* _tmp27_ = NULL;
+	gint _tmp28_ = 0;
+	cairo_text_extents_t _tmp29_ = {0};
+	gdouble _tmp30_ = 0.0;
+	gint _tmp31_ = 0;
+	cairo_text_extents_t _tmp32_ = {0};
+	gdouble _tmp33_ = 0.0;
+	cairo_t* _tmp34_ = NULL;
+	const gchar* _tmp35_ = NULL;
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = (PageIcon*) base;
+#line 2150 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_return_val_if_fail (c != NULL, FALSE);
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp0_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
+#line 2152 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	w = _tmp0_;
+#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp1_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
+#line 2153 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	h = _tmp1_;
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp2_ = w;
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp3_ = h;
+#line 2154 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	if ((_tmp2_ * G_SQRT2) > ((gdouble) _tmp3_)) {
+#line 11516 "ui.c"
+		gint _tmp4_ = 0;
+		gdouble _tmp5_ = 0.0;
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp4_ = h;
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp5_ = round (_tmp4_ / G_SQRT2);
+#line 2155 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		w = (gint) _tmp5_;
+#line 11525 "ui.c"
+	} else {
+		gint _tmp6_ = 0;
+		gdouble _tmp7_ = 0.0;
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp6_ = w;
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		_tmp7_ = round (_tmp6_ * G_SQRT2);
+#line 2157 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+		h = (gint) _tmp7_;
+#line 11535 "ui.c"
+	}
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp8_ = c;
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp9_ = gtk_widget_get_allocated_width ((GtkWidget*) self);
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp10_ = w;
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp11_ = gtk_widget_get_allocated_height ((GtkWidget*) self);
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp12_ = h;
+#line 2159 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_translate (_tmp8_, (gdouble) ((_tmp9_ - _tmp10_) / 2), (gdouble) ((_tmp11_ - _tmp12_) / 2));
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp13_ = c;
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp14_ = w;
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp15_ = h;
+#line 2161 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_rectangle (_tmp13_, 0.5, 0.5, (gdouble) (_tmp14_ - 1), (gdouble) (_tmp15_ - 1));
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp16_ = c;
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp17_ = self->priv->r;
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp18_ = self->priv->g;
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp19_ = self->priv->b;
+#line 2163 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_set_source_rgb (_tmp16_, _tmp17_, _tmp18_, _tmp19_);
+#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp20_ = c;
+#line 2164 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_fill_preserve (_tmp20_);
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp21_ = c;
+#line 2166 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_set_line_width (_tmp21_, 1.0);
+#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp22_ = c;
+#line 2167 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_set_source_rgb (_tmp22_, 0.0, 0.0, 0.0);
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp23_ = c;
+#line 2168 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_stroke (_tmp23_);
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp24_ = c;
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp25_ = self->priv->text;
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_text_extents (_tmp24_, _tmp25_, &_tmp26_);
+#line 2171 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	extents = _tmp26_;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp27_ = c;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp28_ = w;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp29_ = extents;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp30_ = _tmp29_.width;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp31_ = h;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp32_ = extents;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp33_ = _tmp32_.height;
+#line 2172 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_translate (_tmp27_, ((_tmp28_ - _tmp30_) * 0.5) - 0.5, ((_tmp31_ + _tmp33_) * 0.5) - 0.5);
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp34_ = c;
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_tmp35_ = self->priv->text;
+#line 2173 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	cairo_show_text (_tmp34_, _tmp35_);
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	result = TRUE;
+#line 2175 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
 	return result;
-#line 10159 "ui.c"
+#line 11617 "ui.c"
+}
+
+
+static void page_icon_class_init (PageIconClass * klass) {
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	page_icon_parent_class = g_type_class_peek_parent (klass);
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	g_type_class_add_private (klass, sizeof (PageIconPrivate));
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GTK_WIDGET_CLASS (klass)->get_preferred_width = page_icon_real_get_preferred_width;
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GTK_WIDGET_CLASS (klass)->get_preferred_height = page_icon_real_get_preferred_height;
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GTK_WIDGET_CLASS (klass)->get_preferred_height_for_width = page_icon_real_get_preferred_height_for_width;
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GTK_WIDGET_CLASS (klass)->get_preferred_width_for_height = page_icon_real_get_preferred_width_for_height;
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	GTK_WIDGET_CLASS (klass)->draw = page_icon_real_draw;
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (klass)->finalize = page_icon_finalize;
+#line 11638 "ui.c"
+}
+
+
+static void page_icon_instance_init (PageIcon * self) {
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self->priv = PAGE_ICON_GET_PRIVATE (self);
+#line 11645 "ui.c"
+}
+
+
+static void page_icon_finalize (GObject* obj) {
+	PageIcon * self;
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PAGE_ICON, PageIcon);
+#line 2116 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	_g_free0 (self->priv->text);
+#line 2114 "/home/bob/bzr/simple-scan/trunk/src/ui.vala"
+	G_OBJECT_CLASS (page_icon_parent_class)->finalize (obj);
+#line 11657 "ui.c"
+}
+
+
+GType page_icon_get_type (void) {
+	static volatile gsize page_icon_type_id__volatile = 0;
+	if (g_once_init_enter (&page_icon_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PageIconClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) page_icon_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PageIcon), 0, (GInstanceInitFunc) page_icon_instance_init, NULL };
+		GType page_icon_type_id;
+		page_icon_type_id = g_type_register_static (GTK_TYPE_DRAWING_AREA, "PageIcon", &g_define_type_info, 0);
+		g_once_init_leave (&page_icon_type_id__volatile, page_icon_type_id);
+	}
+	return page_icon_type_id__volatile;
 }
 
 
diff --git a/src/ui.vala b/src/ui.vala
index 31ec151..2117a9a 100644
--- a/src/ui.vala
+++ b/src/ui.vala
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2009-2011 Canonical Ltd.
- * Author: Robert Ancell <robert.ancell@canonical.com>
+ * Author: Robert Ancell <robert.ancell@canonical.com>,
+ *         Eduard Gotwig <g@ox.io>
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free Software
@@ -9,7 +10,8 @@
  * license.
  */
 
-public class UserInterface
+[GtkTemplate (ui = "/org/gnome/SimpleScan/simple-scan.ui")]
+public class UserInterface : Gtk.ApplicationWindow
 {
     private const int DEFAULT_TEXT_DPI = 150;
     private const int DEFAULT_PHOTO_DPI = 300;
@@ -17,6 +19,7 @@ public class UserInterface
     private const GLib.ActionEntry[] action_entries =
     {
         { "new_document", new_document_activate_cb },
+        { "reorder", reorder_document_activate_cb },
         { "save", save_document_activate_cb },
         { "save_as", save_as_document_activate_cb },
         { "email", email_document_activate_cb },
@@ -29,54 +32,121 @@ public class UserInterface
 
     private Settings settings;
 
-    private Gtk.Builder builder;
-
-    private Gtk.ApplicationWindow window;
-    private GLib.MenuModel app_menu;
+    [GtkChild]
     private Gtk.MenuBar menubar;
+    [GtkChild]
+    private Gtk.Toolbar toolbar;
+    [GtkChild]
+    private Gtk.Menu page_menu;
+    [GtkChild]
     private Gtk.Box main_vbox;
     private Gtk.InfoBar info_bar;
     private Gtk.Image info_bar_image;
     private Gtk.Label info_bar_label;
     private Gtk.Button info_bar_close_button;
     private Gtk.Button info_bar_change_scanner_button;
+    [GtkChild]
+    private Gtk.RadioMenuItem custom_crop_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem a4_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem a5_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem a6_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem letter_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem legal_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem four_by_six_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem no_crop_menuitem;
+    [GtkChild]
     private Gtk.MenuItem page_move_left_menuitem;
+    [GtkChild]
     private Gtk.MenuItem page_move_right_menuitem;
+    [GtkChild]
     private Gtk.MenuItem page_delete_menuitem;
+    [GtkChild]
     private Gtk.MenuItem crop_rotate_menuitem;
+    [GtkChild]
     private Gtk.MenuItem save_menuitem;
+    [GtkChild]
     private Gtk.MenuItem save_as_menuitem;
+    [GtkChild]
     private Gtk.MenuItem copy_to_clipboard_menuitem;
+    [GtkChild]
+    private Gtk.Button save_button;
+    [GtkChild]
     private Gtk.ToolButton save_toolbutton;
-    private Gtk.MenuItem stop_menuitem;
+    [GtkChild]
+    private Gtk.MenuItem stop_scan_menuitem;
+    [GtkChild]
     private Gtk.ToolButton stop_toolbutton;
-
-    private Gtk.RadioMenuItem text_toolbar_menuitem;
-    private Gtk.RadioMenuItem text_menu_menuitem;
-    private Gtk.RadioMenuItem photo_toolbar_menuitem;
-    private Gtk.RadioMenuItem photo_menu_menuitem;
-
+    [GtkChild]
+    private Gtk.ToggleButton crop_button;
+    [GtkChild]
+    private Gtk.ToggleToolButton crop_toolbutton;
+    [GtkChild]
+    private Gtk.Button stop_button;
+    [GtkChild]
+    private Gtk.Button scan_button;
+
+    [GtkChild]
+    private Gtk.RadioMenuItem text_button_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem text_button_hb_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem text_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem photo_button_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem photo_button_hb_menuitem;
+    [GtkChild]
+    private Gtk.RadioMenuItem photo_menuitem;
+
+    [GtkChild]
     private Gtk.Dialog authorize_dialog;
+    [GtkChild]
     private Gtk.Label authorize_label;
+    [GtkChild]
     private Gtk.Entry username_entry;
+    [GtkChild]
     private Gtk.Entry password_entry;
 
+    [GtkChild]
     private Gtk.Dialog preferences_dialog;
+    [GtkChild]
     private Gtk.ComboBox device_combo;
+    [GtkChild]
     private Gtk.ComboBox text_dpi_combo;
+    [GtkChild]
     private Gtk.ComboBox photo_dpi_combo;
+    [GtkChild]
     private Gtk.ComboBox page_side_combo;
+    [GtkChild]
     private Gtk.ComboBox paper_size_combo;
+    [GtkChild]
     private Gtk.Scale brightness_scale;
+    [GtkChild]
     private Gtk.Scale contrast_scale;
+    [GtkChild]
     private Gtk.Scale quality_scale;
+    [GtkChild]
     private Gtk.ListStore device_model;
+    [GtkChild]
     private Gtk.ListStore text_dpi_model;
+    [GtkChild]
     private Gtk.ListStore photo_dpi_model;
+    [GtkChild]
     private Gtk.ListStore page_side_model;
+    [GtkChild]
     private Gtk.ListStore paper_size_model;
+    [GtkChild]
     private Gtk.Adjustment brightness_adjustment;
+    [GtkChild]
     private Gtk.Adjustment contrast_adjustment;
+    [GtkChild]
     private Gtk.Adjustment quality_adjustment;
     private bool setting_devices;
     private bool user_selected_device;
@@ -123,9 +193,11 @@ public class UserInterface
         set
         {
             scanning_ = value;
-            page_delete_menuitem.set_sensitive (!value);
-            stop_menuitem.set_sensitive (value);
-            stop_toolbutton.set_sensitive (value);
+            page_delete_menuitem.sensitive = !value;
+            stop_scan_menuitem.sensitive = value;
+            stop_toolbutton.sensitive = value;
+            scan_button.visible = !value;
+            stop_button.visible = value;
         }
     }
 
@@ -137,20 +209,20 @@ public class UserInterface
 
     public int brightness
     {
-        get { return (int) brightness_adjustment.get_value (); }
-        set { brightness_adjustment.set_value (value); }
+        get { return (int) brightness_adjustment.value; }
+        set { brightness_adjustment.value = value; }
     }
 
     public int contrast
     {
-        get { return (int) contrast_adjustment.get_value (); }
-        set { contrast_adjustment.set_value (value); }
+        get { return (int) contrast_adjustment.value; }
+        set { contrast_adjustment.value = value; }
     }
 
     public int quality
     {
-        get { return (int) quality_adjustment.get_value (); }
-        set { quality_adjustment.set_value (value); }
+        get { return (int) quality_adjustment.value; }
+        set { quality_adjustment.value = value; }
     }
 
     public string? selected_device
@@ -189,8 +261,9 @@ public class UserInterface
         settings = new Settings ("org.gnome.SimpleScan");
 
         book = new Book ();
-        book.page_removed.connect (page_removed_cb);
         book.page_added.connect (page_added_cb);
+        book.reordered.connect (reordered_cb);
+        book.page_removed.connect (page_removed_cb);
 
         load ();
 
@@ -210,8 +283,9 @@ public class UserInterface
 
     ~UserInterface ()
     {
-        book.page_removed.disconnect (page_removed_cb);
         book.page_added.disconnect (page_added_cb);
+        book.reordered.disconnect (reordered_cb);
+        book.page_removed.disconnect (page_removed_cb);
     }
 
     private bool find_scan_device (string device, out Gtk.TreeIter iter)
@@ -234,7 +308,7 @@ public class UserInterface
 
     private void show_error_dialog (string error_title, string error_text)
     {
-        var dialog = new Gtk.MessageDialog (window,
+        var dialog = new Gtk.MessageDialog (this,
                                             Gtk.DialogFlags.MODAL,
                                             Gtk.MessageType.WARNING,
                                             Gtk.ButtonsType.NONE,
@@ -249,20 +323,20 @@ public class UserInterface
         /* Label in authorization dialog.  '%s' is replaced with the name of the resource requesting authorization */
         var description = _("Username and password required to access '%s'").printf (resource);
 
-        username_entry.set_text ("");
-        password_entry.set_text ("");
+        username_entry.text = "";
+        password_entry.text = "";
         authorize_label.set_text (description);
 
-        authorize_dialog.show ();
+        authorize_dialog.visible = true;
         authorize_dialog.run ();
-        authorize_dialog.hide ();
+        authorize_dialog.visible = false;
 
-        username = username_entry.get_text ();
-        password = password_entry.get_text ();
+        username = username_entry.text;
+        password = password_entry.text;
     }
 
-    [CCode (cname = "G_MODULE_EXPORT device_combo_changed_cb", instance_pos = -1)]
-    public void device_combo_changed_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void device_combo_changed_cb (Gtk.Widget widget)
     {
         if (setting_devices)
             return;
@@ -298,17 +372,17 @@ public class UserInterface
         }
         else
         {
-            info_bar.hide ();
+            info_bar.visible = false;
             return;
         }
 
-        info_bar.set_message_type (type);
+        info_bar.message_type = type;
         info_bar_image.set_from_icon_name (image_id, Gtk.IconSize.DIALOG);
         var message = "<big><b>%s</b></big>\n\n%s".printf (title, text);
         info_bar_label.set_markup (message);
-        info_bar_close_button.set_visible (show_close_button);
-        info_bar_change_scanner_button.set_visible (show_change_scanner_button);
-        info_bar.show ();
+        info_bar_close_button.visible = show_close_button;
+        info_bar_change_scanner_button.visible = show_change_scanner_button;
+        info_bar.visible = true;
     }
 
     public void set_scan_devices (List<ScanDevice> devices)
@@ -321,7 +395,7 @@ public class UserInterface
 
         /* If the user hasn't chosen a scanner choose the best available one */
         if (user_selected_device)
-            have_selection = device_combo.get_active () >= 0;
+            have_selection = device_combo.active >= 0;
 
         /* Add new devices */
         index = 0;
@@ -431,13 +505,13 @@ public class UserInterface
 
         save_dialog = new Gtk.FileChooserDialog (/* Save dialog: Dialog title */
                                                  _("Save As..."),
-                                                 window,
+                                                 this,
                                                  Gtk.FileChooserAction.SAVE,
                                                  _("_Cancel"), Gtk.ResponseType.CANCEL,
                                                  _("_Save"), Gtk.ResponseType.ACCEPT,
                                                  null);
-        save_dialog.set_do_overwrite_confirmation (true);
-        save_dialog.set_local_only (false);
+        save_dialog.do_overwrite_confirmation = true;
+        save_dialog.local_only = false;
         save_dialog.set_current_folder (directory);
         save_dialog.set_current_name (default_file_name);
 
@@ -456,7 +530,7 @@ public class UserInterface
 
         var expander = new Gtk.Expander.with_mnemonic (/* */
                                                        _("Select File _Type"));
-        expander.set_spacing (5);
+        expander.spacing = 5;
         save_dialog.set_extra_widget (expander);
 
         string default_extension = "";
@@ -486,8 +560,8 @@ public class UserInterface
                              -1);
 
         var file_type_view = new Gtk.TreeView.with_model (file_type_store);
-        file_type_view.set_headers_visible (false);
-        file_type_view.set_rules_hint (true);
+        file_type_view.headers_visible = false;
+        file_type_view.rules_hint = true;
         var column = new Gtk.TreeViewColumn.with_attributes ("",
                                                              new Gtk.CellRendererText (),
                                                              "text", 0, null);
@@ -586,7 +660,7 @@ public class UserInterface
         if (!book.needs_saving)
             return true;
 
-        var dialog = new Gtk.MessageDialog (window,
+        var dialog = new Gtk.MessageDialog (this,
                                             Gtk.DialogFlags.MODAL,
                                             Gtk.MessageType.WARNING,
                                             Gtk.ButtonsType.NONE,
@@ -622,8 +696,8 @@ public class UserInterface
         add_default_page ();
         book_uri = null;
         book.needs_saving = false;
-        save_as_menuitem.set_sensitive (false);
-        copy_to_clipboard_menuitem.set_sensitive (false);
+        save_as_menuitem.sensitive = false;
+        copy_to_clipboard_menuitem.sensitive = false;
     }
 
     private void new_document ()
@@ -639,8 +713,8 @@ public class UserInterface
         clear_document ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT new_button_clicked_cb", instance_pos = -1)]
-    public void new_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void new_button_clicked_cb (Gtk.Widget widget)
     {
         new_document();
     }
@@ -656,33 +730,33 @@ public class UserInterface
 
         if (document_hint == "text")
         {
-            text_toolbar_menuitem.set_active (true);
-            text_menu_menuitem.set_active (true);
+            text_button_menuitem.active = true;
+            text_button_hb_menuitem.active = true;
+            text_menuitem.active = true;
         }
         else if (document_hint == "photo")
         {
-            photo_toolbar_menuitem.set_active (true);
-            photo_menu_menuitem.set_active (true);
+            photo_button_menuitem.active = true;
+            photo_button_hb_menuitem.active = true;
+            photo_menuitem.active = true;
         }
 
         if (save)
             settings.set_string ("document-type", document_hint);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT text_menuitem_toggled_cb", instance_pos = -1)]
-    public void text_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void text_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_document_hint ("text", true);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT photo_menuitem_toggled_cb", instance_pos = -1)]
-    public void photo_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void photo_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
-        {
+        if (widget.active)
             set_document_hint ("photo", true);
-        }
     }
 
     private void set_page_side (ScanType page_side)
@@ -794,22 +868,22 @@ public class UserInterface
         return options;
     }
 
-    [CCode (cname = "G_MODULE_EXPORT scan_button_clicked_cb", instance_pos = -1)]
-    public void scan_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void scan_button_clicked_cb (Gtk.Widget widget)
     {
         var options = make_scan_options ();
         options.type = ScanType.SINGLE;
         start_scan (selected_device, options);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT stop_scan_button_clicked_cb", instance_pos = -1)]
-    public void stop_scan_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void stop_scan_button_clicked_cb (Gtk.Widget widget)
     {
         stop_scan ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT continuous_scan_button_clicked_cb", instance_pos = -1)]
-    public void continuous_scan_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void continuous_scan_button_clicked_cb (Gtk.Widget widget)
     {
         if (scanning)
             stop_scan ();
@@ -821,8 +895,8 @@ public class UserInterface
         }
     }
 
-    [CCode (cname = "G_MODULE_EXPORT preferences_button_clicked_cb", instance_pos = -1)]
-    public void preferences_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void preferences_button_clicked_cb (Gtk.Widget widget)
     {
         preferences_dialog.present ();
     }
@@ -832,16 +906,16 @@ public class UserInterface
         preferences_dialog.present ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT preferences_dialog_delete_event_cb", instance_pos = -1)]
-    public bool preferences_dialog_delete_event_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private bool preferences_dialog_delete_event_cb (Gtk.Widget widget, Gdk.EventAny event)
     {
         return true;
     }
 
-    [CCode (cname = "G_MODULE_EXPORT preferences_dialog_response_cb", instance_pos = -1)]
-    public void preferences_dialog_response_cb (Gtk.Widget widget, int response_id)
+    [GtkCallback]
+    private void preferences_dialog_response_cb (Gtk.Widget widget, int response_id)
     {
-        preferences_dialog.hide ();
+        preferences_dialog.visible = false;
     }
 
     private void update_page_menu ()
@@ -849,14 +923,14 @@ public class UserInterface
         var page = book_view.selected_page;
         if (page == null)
         {
-            page_move_left_menuitem.set_sensitive (false);
-            page_move_right_menuitem.set_sensitive (false);
+            page_move_left_menuitem.sensitive = false;
+            page_move_right_menuitem.sensitive = false;
         }
         else
         {
             var index = book.get_page_index (page);
-            page_move_left_menuitem.set_sensitive (index > 0);
-            page_move_right_menuitem.set_sensitive (index < book.n_pages - 1);
+            page_move_left_menuitem.sensitive = index > 0;
+            page_move_right_menuitem.sensitive = index < book.n_pages - 1;
         }
     }
 
@@ -869,35 +943,33 @@ public class UserInterface
 
         update_page_menu ();
 
-        var name = "no_crop_menuitem";
+        var menuitem = no_crop_menuitem;
         if (page.has_crop)
         {
-            // FIXME: Make more generic, move into page-size.c and reuse
             var crop_name = page.crop_name;
             if (crop_name != null)
             {
                 if (crop_name == "A4")
-                    name = "a4_menuitem";
+                    menuitem = a4_menuitem;
                 else if (crop_name == "A5")
-                    name = "a5_menuitem";
+                    menuitem = a5_menuitem;
                 else if (crop_name == "A6")
-                    name = "a6_menuitem";
+                    menuitem = a6_menuitem;
                 else if (crop_name == "letter")
-                    name = "letter_menuitem";
+                    menuitem = letter_menuitem;
                 else if (crop_name == "legal")
-                    name = "legal_menuitem";
+                    menuitem = legal_menuitem;
                 else if (crop_name == "4x6")
-                    name = "4x6_menuitem";
+                    menuitem = four_by_six_menuitem;
             }
             else
-                name = "custom_crop_menuitem";
+                menuitem = custom_crop_menuitem;
         }
 
-        var menuitem = (Gtk.RadioMenuItem) builder.get_object (name);
-        menuitem.set_active (true);
-        var toolbutton = (Gtk.ToggleToolButton) builder.get_object ("crop_toolbutton");
-        toolbutton.set_active (page.has_crop);
-
+        menuitem.active = true;
+        crop_button.active = page.has_crop;
+        crop_toolbutton.active = page.has_crop;
+        
         updating_page_menu = false;
     }
 
@@ -922,7 +994,7 @@ public class UserInterface
 
         try
         {
-            Gtk.show_uri (window.get_screen (), file.get_uri (), Gtk.get_current_event_time ());
+            Gtk.show_uri (screen, file.get_uri (), Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
@@ -934,12 +1006,11 @@ public class UserInterface
 
     private void show_page_menu_cb (BookView view)
     {
-        var menu = (Gtk.Menu) builder.get_object ("page_menu");
-        menu.popup (null, null, null, 3, Gtk.get_current_event_time());
+        page_menu.popup (null, null, null, 3, Gtk.get_current_event_time ());
     }
 
-    [CCode (cname = "G_MODULE_EXPORT rotate_left_button_clicked_cb", instance_pos = -1)]
-    public void rotate_left_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void rotate_left_button_clicked_cb (Gtk.Widget widget)
     {
         if (updating_page_menu)
             return;
@@ -948,8 +1019,8 @@ public class UserInterface
             page.rotate_left ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT rotate_right_button_clicked_cb", instance_pos = -1)]
-    public void rotate_right_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void rotate_right_button_clicked_cb (Gtk.Widget widget)
     {
         if (updating_page_menu)
             return;
@@ -960,7 +1031,7 @@ public class UserInterface
 
     private void set_crop (string? crop_name)
     {
-        crop_rotate_menuitem.set_sensitive (crop_name != null);
+        crop_rotate_menuitem.sensitive = crop_name != null;
 
         if (updating_page_menu)
             return;
@@ -987,78 +1058,88 @@ public class UserInterface
             page.set_named_crop (crop_name);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT no_crop_menuitem_toggled_cb", instance_pos = -1)]
-    public void no_crop_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void no_crop_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop (null);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT custom_crop_menuitem_toggled_cb", instance_pos = -1)]
-    public void custom_crop_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void custom_crop_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop ("custom");
     }
 
-    [CCode (cname = "G_MODULE_EXPORT crop_toolbutton_toggled_cb", instance_pos = -1)]
-    public void crop_toolbutton_toggled_cb (Gtk.ToggleToolButton widget)
+    [GtkCallback]
+    private void crop_button_toggled_cb (Gtk.ToggleButton widget)
+    {
+        if (updating_page_menu)
+            return;
+
+        if (widget.active)
+            custom_crop_menuitem.active = true;
+        else
+            no_crop_menuitem.active = true;
+    }
+    
+    [GtkCallback]
+    private void crop_toolbutton_toggled_cb (Gtk.ToggleToolButton widget)
     {
         if (updating_page_menu)
             return;
 
-        Gtk.RadioMenuItem menuitem;
-        if (widget.get_active ())
-            menuitem = (Gtk.RadioMenuItem) builder.get_object ("custom_crop_menuitem");
+        if (widget.active)
+            custom_crop_menuitem.active = true;
         else
-            menuitem = (Gtk.RadioMenuItem) builder.get_object ("no_crop_menuitem");
-        menuitem.set_active (true);
+            no_crop_menuitem.active = true;
     }
 
-    [CCode (cname = "G_MODULE_EXPORT four_by_six_menuitem_toggled_cb", instance_pos = -1)]
-    public void four_by_six_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void four_by_six_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop ("4x6");
     }
 
-    [CCode (cname = "G_MODULE_EXPORT legal_menuitem_toggled_cb", instance_pos = -1)]
-    public void legal_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void legal_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop ("legal");
     }
 
-    [CCode (cname = "G_MODULE_EXPORT letter_menuitem_toggled_cb", instance_pos = -1)]
-    public void letter_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void letter_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop ("letter");
     }
 
-    [CCode (cname = "G_MODULE_EXPORT a6_menuitem_toggled_cb", instance_pos = -1)]
-    public void a6_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void a6_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop ("A6");
     }
 
-    [CCode (cname = "G_MODULE_EXPORT a5_menuitem_toggled_cb", instance_pos = -1)]
-    public void a5_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void a5_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop ("A5");
     }
 
-    [CCode (cname = "G_MODULE_EXPORT a4_menuitem_toggled_cb", instance_pos = -1)]
-    public void a4_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
+    [GtkCallback]
+    private void a4_menuitem_toggled_cb (Gtk.CheckMenuItem widget)
     {
-        if (widget.get_active ())
+        if (widget.active)
             set_crop ("A4");
     }
 
-    [CCode (cname = "G_MODULE_EXPORT crop_rotate_menuitem_activate_cb", instance_pos = -1)]
-    public void crop_rotate_menuitem_activate_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void crop_rotate_menuitem_activate_cb (Gtk.Widget widget)
     {
         var page = book_view.selected_page;
         if (page == null)
@@ -1066,36 +1147,203 @@ public class UserInterface
         page.rotate_crop ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT page_move_left_menuitem_activate_cb", instance_pos = -1)]
-    public void page_move_left_menuitem_activate_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void page_move_left_menuitem_activate_cb (Gtk.Widget widget)
     {
         var page = book_view.selected_page;
         var index = book.get_page_index (page);
         if (index > 0)
             book.move_page (page, index - 1);
-
-        update_page_menu ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT page_move_right_menuitem_activate_cb", instance_pos = -1)]
-    public void page_move_right_menuitem_activate_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void page_move_right_menuitem_activate_cb (Gtk.Widget widget)
     {
         var page = book_view.selected_page;
         var index = book.get_page_index (page);
         if (index < book.n_pages - 1)
             book.move_page (page, book.get_page_index (page) + 1);
-
-        update_page_menu ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT page_delete_menuitem_activate_cb", instance_pos = -1)]
-    public void page_delete_menuitem_activate_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void page_delete_menuitem_activate_cb (Gtk.Widget widget)
     {
         book_view.book.delete_page (book_view.selected_page);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT save_file_button_clicked_cb", instance_pos = -1)]
-    public void save_file_button_clicked_cb (Gtk.Widget widget)
+    private void reorder_document ()
+    {
+        var dialog = new Gtk.Window ();
+        dialog.type_hint = Gdk.WindowTypeHint.DIALOG;
+        dialog.modal = true;
+        dialog.border_width = 12;
+        /* Title of dialog to reorder pages */
+        dialog.title = _("Reorder Pages");
+        dialog.set_transient_for (this);
+        dialog.key_press_event.connect ((e) =>
+        {
+            if (e.state == 0 && e.keyval == Gdk.Key.Escape)
+            {
+                dialog.destroy ();
+                return true;
+            }
+
+            return false;
+        });
+        dialog.visible = true;
+
+        var g = new Gtk.Grid ();
+        g.row_homogeneous = true;
+        g.row_spacing = 6;
+        g.column_homogeneous = true;
+        g.column_spacing = 6;
+        g.visible = true;
+        dialog.add (g);
+
+        /* Label on button for combining sides in reordering dialog */
+        var b = make_reorder_button (_("Combine sides"), "F1F2F3B1B2B3-F1B1F2B2F3B3");
+        b.clicked.connect (() =>
+        {
+            book.combine_sides ();
+            dialog.destroy ();
+        });
+        b.visible = true;
+        g.attach (b, 0, 0, 1, 1);
+
+        /* Label on button for combining sides in reverse order in reordering dialog */
+        b = make_reorder_button (_("Combine sides (reverse)"), "F1F2F3B3B2B1-F1B1F2B2F3B3");
+        b.clicked.connect (() =>
+        {
+            book.combine_sides_reverse ();
+            dialog.destroy ();
+        });
+        b.visible = true;
+        g.attach (b, 1, 0, 1, 1);
+
+        /* Label on button for reversing in reordering dialog */
+        b = make_reorder_button (_("Reverse"), "C1C2C3C4C5C6-C6C5C4C3C2C1");
+        b.clicked.connect (() =>
+        {
+            book.reverse ();           
+            dialog.destroy ();
+        });
+        b.visible = true;
+        g.attach (b, 0, 2, 1, 1);
+
+        /* Label on button for cancelling page reordering dialog */
+        b = make_reorder_button (_("Keep unchanged"), "C1C2C3C4C5C6-C1C2C3C4C5C6");
+        b.clicked.connect (() =>
+        {
+            dialog.destroy ();
+        });
+        b.visible = true;
+        g.attach (b, 1, 2, 1, 1);
+
+        dialog.present ();
+    }
+
+    public void reorder_document_activate_cb ()
+    {
+        reorder_document ();
+    }
+
+    [GtkCallback]
+    private void reorder_menuitem_activate_cb (Gtk.Widget widget)
+    {
+        reorder_document ();
+    }
+
+    private Gtk.Button make_reorder_button (string text, string items)
+    {
+        var b = new Gtk.Button ();
+        
+        var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+        vbox.visible = true;
+        b.add (vbox);
+
+        var label = new Gtk.Label (text);
+        label.visible = true;
+        vbox.pack_start (label, true, true, 0);
+
+        var rb = make_reorder_box (items);
+        rb.visible = true;
+        vbox.pack_start (rb, true, true, 0);
+
+        return b;
+    }
+
+    private Gtk.Box make_reorder_box (string items)
+    {
+        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        box.visible = true;
+
+        Gtk.Box? page_box = null;
+        for (var i = 0; items[i] != '\0'; i++)
+        {
+            if (items[i] == '-')
+            {
+                var a = new Gtk.Arrow (Gtk.ArrowType.RIGHT, Gtk.ShadowType.NONE);
+                a.visible = true;
+                box.pack_start (a, false, false, 0);
+                page_box = null;
+                continue;
+            }
+
+            /* First character describes side */
+            var side = items[i];
+            i++;
+            if (items[i] == '\0')
+                break;
+
+            if (page_box == null)
+            {
+                page_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
+                page_box.visible = true;
+                box.pack_start (page_box, false, false, 0);
+            }
+
+            /* Get colours for each page (from Tango palette) */
+            var r = 1.0;
+            var g = 1.0;
+            var b = 1.0;
+            switch (side)
+            {
+            case 'F':
+                /* Plum */
+                r = 0x75 / 255.0;
+                g = 0x50 / 255.0;
+                b = 0x7B / 255.0;
+                break;
+            case 'B':
+                /* Orange */
+                r = 0xF5 / 255.0;
+                g = 0x79 / 255.0;
+                b = 0.0;
+                break;
+            case 'C':
+                /* Butter to Scarlet Red */
+                var p = (items[i] - '1') / 5.0;
+                r = (0xED / 255.0) * (1 - p) + 0xCC * p;
+                g = (0xD4 / 255.0) * (1 - p);
+                b = 0;
+                break;
+            }
+
+            /* Mix with white to look more paper like */
+            r = r + (1.0 - r) * 0.7;
+            g = g + (1.0 - g) * 0.7;
+            b = b + (1.0 - b) * 0.7;
+
+            var icon = new PageIcon ("%c".printf (items[i]), r, g, b);
+            icon.visible = true;
+            page_box.pack_start (icon, false, false, 0);
+        }
+
+        return box;
+    }
+
+    [GtkCallback]
+    private void save_file_button_clicked_cb (Gtk.Widget widget)
     {
         save_document (false);
     }
@@ -1105,16 +1353,16 @@ public class UserInterface
         save_document (false);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT copy_to_clipboard_button_clicked_cb", instance_pos = -1)]
-    public void copy_to_clipboard_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void copy_to_clipboard_button_clicked_cb (Gtk.Widget widget)
     {
         var page = book_view.selected_page;
         if (page != null)
-            page.copy_to_clipboard (window);
+            page.copy_to_clipboard (this);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT save_as_file_button_clicked_cb", instance_pos = -1)]
-    public void save_as_file_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void save_as_file_button_clicked_cb (Gtk.Widget widget)
     {
         save_document (true);
     }
@@ -1149,8 +1397,8 @@ public class UserInterface
         context.paint ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT email_button_clicked_cb", instance_pos = -1)]
-    public void email_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void email_button_clicked_cb (Gtk.Widget widget)
     {
         email (document_hint, quality);
     }
@@ -1163,12 +1411,12 @@ public class UserInterface
     private void print_document ()
     {
         var print = new Gtk.PrintOperation ();
-        print.set_n_pages ((int) book.n_pages);
+        print.n_pages = (int) book.n_pages;
         print.draw_page.connect (draw_page);
 
         try
         {
-            print.run (Gtk.PrintOperationAction.PRINT_DIALOG, window);
+            print.run (Gtk.PrintOperationAction.PRINT_DIALOG, this);
         }
         catch (Error e)
         {
@@ -1178,8 +1426,8 @@ public class UserInterface
         print.draw_page.disconnect (draw_page);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT print_button_clicked_cb", instance_pos = -1)]
-    public void print_button_clicked_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void print_button_clicked_cb (Gtk.Widget widget)
     {
         print_document ();
     }
@@ -1189,11 +1437,11 @@ public class UserInterface
         print_document ();
     }
 
-    private void show_help ()
+    private void launch_help ()
     {
         try
         {
-            Gtk.show_uri (window.get_screen (), "help:simple-scan", Gtk.get_current_event_time ());
+            Gtk.show_uri (screen, "help:simple-scan", Gtk.get_current_event_time ());
         }
         catch (Error e)
         {
@@ -1203,15 +1451,15 @@ public class UserInterface
         }
     }
 
-    [CCode (cname = "G_MODULE_EXPORT help_contents_menuitem_activate_cb", instance_pos = -1)]
-    public void help_contents_menuitem_activate_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void help_contents_menuitem_activate_cb (Gtk.Widget widget)
     {
-        show_help ();
+        launch_help ();
     }
 
     public void help_contents_activate_cb ()
     {
-        show_help ();
+        launch_help ();
     }
 
     private void show_about ()
@@ -1227,7 +1475,7 @@ public class UserInterface
         /* Description of program */
         string description = _("Simple document scanning tool");
 
-        Gtk.show_about_dialog (window,
+        Gtk.show_about_dialog (this,
                                "title", title,
                                "program-name", "Simple Scan",
                                "version", VERSION,
@@ -1242,8 +1490,8 @@ public class UserInterface
                                null);
     }
 
-    [CCode (cname = "G_MODULE_EXPORT about_menuitem_activate_cb", instance_pos = -1)]
-    public void about_menuitem_activate_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void about_menuitem_activate_cb (Gtk.Widget widget)
     {
         show_about ();
     }
@@ -1261,7 +1509,7 @@ public class UserInterface
                              _("Quit without Saving")))
             return false;
 
-        window.destroy ();
+        destroy ();
 
         if (save_state_timeout != 0)
             save_state (true);
@@ -1271,8 +1519,8 @@ public class UserInterface
         return true;
     }
 
-    [CCode (cname = "G_MODULE_EXPORT quit_menuitem_activate_cb", instance_pos = -1)]
-    public void quit_menuitem_activate_cb (Gtk.Widget widget)
+    [GtkCallback]
+    private void quit_menuitem_activate_cb (Gtk.Widget widget)
     {
         on_quit ();
     }
@@ -1282,8 +1530,8 @@ public class UserInterface
         on_quit ();
     }
 
-    [CCode (cname = "G_MODULE_EXPORT simple_scan_window_configure_event_cb", instance_pos = -1)]
-    public bool simple_scan_window_configure_event_cb (Gtk.Widget widget, Gdk.EventConfigure event)
+    [GtkCallback]
+    private bool simple_scan_window_configure_event_cb (Gtk.Widget widget, Gdk.EventConfigure event)
     {
         if (!window_is_maximized)
         {
@@ -1311,8 +1559,8 @@ public class UserInterface
         }
     }
 
-    [CCode (cname = "G_MODULE_EXPORT simple_scan_window_window_state_event_cb", instance_pos = -1)]
-    public bool simple_scan_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)
+    [GtkCallback]
+    private bool simple_scan_window_window_state_event_cb (Gtk.Widget widget, Gdk.EventWindowState event)
     {
         if ((event.changed_mask & Gdk.WindowState.MAXIMIZED) != 0)
         {
@@ -1322,8 +1570,8 @@ public class UserInterface
         return false;
     }
 
-    [CCode (cname = "G_MODULE_EXPORT window_delete_event_cb", instance_pos = -1)]
-    public bool window_delete_event_cb (Gtk.Widget widget, Gdk.Event event)
+    [GtkCallback]
+    private bool window_delete_event_cb (Gtk.Widget widget, Gdk.EventAny event)
     {
         return !on_quit ();
     }
@@ -1352,6 +1600,11 @@ public class UserInterface
         update_page_menu ();
     }
 
+    private void reordered_cb (Book book)
+    {
+        update_page_menu ();
+    }
+
     private void page_removed_cb (Book book, Page page)
     {
         page.size_changed.disconnect (page_size_changed_cb);
@@ -1370,7 +1623,7 @@ public class UserInterface
         combo.pack_start (renderer, true);
         combo.add_attribute (renderer, "text", 1);
 
-        var model = (Gtk.ListStore) combo.get_model ();
+        var model = combo.model as Gtk.ListStore;
         int[] scan_resolutions = {75, 150, 300, 600, 1200, 2400};
         foreach (var dpi in scan_resolutions)
         {
@@ -1399,27 +1652,22 @@ public class UserInterface
 
     private void needs_saving_cb (Book book)
     {
-        save_menuitem.set_sensitive (book.needs_saving);
-        save_toolbutton.set_sensitive (book.needs_saving);
+        save_menuitem.sensitive = book.needs_saving;
+        save_button.sensitive = book.needs_saving;
+        save_toolbutton.sensitive = book.needs_saving;
         if (book.needs_saving)
-            save_as_menuitem.set_sensitive (true);
-        copy_to_clipboard_menuitem.set_sensitive (true);
+            save_as_menuitem.sensitive = true;
+        copy_to_clipboard_menuitem.sensitive = true;
     }
 
-    private bool has_app_menu (Gtk.Application app)
+    private bool shell_shows_menubar
     {
-        /* We have three cases:
-         * - GNOME 3: show-app-menu true, show-menubar false -> use the app menu
-         * - Unity, OSX: show-app-menu and show-menubar true -> use the normal menu
-         * - Other WM, Windows: show-app-menu and show-menubar false -> use the normal menu
-         */
-        var gtk_settings = Gtk.Settings.get_default ();
-
-        bool show_app_menu = false;
-        bool show_menubar = true;
-        gtk_settings.get ("gtk-shell-shows-app-menu", &show_app_menu, "gtk-shell-shows-menubar", &show_menubar, null);
-
-        return show_app_menu && !show_menubar;
+        get
+        {
+            bool shell_shows_menubar;
+            Gtk.Settings.get_default ().get ("gtk-shell-shows-menubar", out shell_shows_menubar);
+            return shell_shows_menubar;
+        }
     }
 
     private void load ()
@@ -1430,95 +1678,74 @@ public class UserInterface
 
         var app = Application.get_default () as Gtk.Application;
 
-        builder = new Gtk.Builder ();
-        try
+        if (!shell_shows_menubar)
         {
-            builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan.ui");
-            if (has_app_menu (app))
-                builder.add_from_resource ("/org/gnome/SimpleScan/simple-scan-menu.ui");
-        }
-        catch (Error e)
-        {
-            critical ("Unable to load UI: %s\n", e.message);
-            show_error_dialog (/* Title of dialog when cannot load required files */
-                               _("Files missing"),
-                               /* Description in dialog when cannot load required files */
-                               _("Please check your installation"));
-            Posix.exit (Posix.EXIT_FAILURE);
-        }
-        builder.connect_signals (this);
+            app.add_action_entries (action_entries, this);
 
-        window = (Gtk.ApplicationWindow) builder.get_object ("simple_scan_window");
-        app.add_window (window);
-        menubar = (Gtk.MenuBar) builder.get_object ("menubar");
-        if (has_app_menu (app))
+            var appmenu = new Menu ();
+            var section = new Menu ();
+            appmenu.append_section (null, section);
+            section.append (_("New Document"), "app.new_document");
+
+            section = new Menu ();
+            appmenu.append_section (null, section);
+            var menu = new Menu ();
+            section.append_submenu (_("Document"), menu);
+            menu.append (_("Reorder Pages"), "app.reorder");
+            menu.append (_("Save"), "app.save");
+            menu.append (_("Save As..."), "app.save_as");
+            menu.append (_("Email..."), "app.email");
+            menu.append (_("Print..."), "app.print");
+
+            section = new Menu ();
+            appmenu.append_section (null, section);
+            section.append (_("Preferences"), "app.preferences");
+
+            section = new Menu ();
+            appmenu.append_section (null, section);
+            section.append (_("Help"), "app.help");
+            section.append (_("About"), "app.about");
+            section.append (_("Quit"), "app.quit");
+
+            app.app_menu = appmenu;
+
+            app.add_accelerator ("<Ctrl>N", "app.new_document", null);
+            app.add_accelerator ("<Ctrl>S", "app.save", null);
+            app.add_accelerator ("<Shift><Ctrl>S", "app.save_as", null);
+            app.add_accelerator ("<Ctrl>E", "app.email", null);
+            app.add_accelerator ("<Ctrl>P", "app.print", null);
+            app.add_accelerator ("F1", "app.help", null);
+            app.add_accelerator ("<Ctrl>Q", "app.quit", null);
+        }
+        else
         {
-            app_menu = (GLib.MenuModel) builder.get_object ("appmenu");
-            app.add_action_entries (action_entries, this);
-            app.set_app_menu (app_menu);
-            menubar.set_visible(false);
+            set_titlebar (null);
+            menubar.visible = true;
+            toolbar.visible = true;
         }
-        main_vbox = (Gtk.Box) builder.get_object ("main_vbox");
-        page_move_left_menuitem = (Gtk.MenuItem) builder.get_object ("page_move_left_menuitem");
-        page_move_right_menuitem = (Gtk.MenuItem) builder.get_object ("page_move_right_menuitem");
-        page_delete_menuitem = (Gtk.MenuItem) builder.get_object ("page_delete_menuitem");
-        crop_rotate_menuitem = (Gtk.MenuItem) builder.get_object ("crop_rotate_menuitem");
-        save_menuitem = (Gtk.MenuItem) builder.get_object ("save_menuitem");
-        save_as_menuitem = (Gtk.MenuItem) builder.get_object ("save_as_menuitem");
-        copy_to_clipboard_menuitem = (Gtk.MenuItem) builder.get_object ("copy_to_clipboard_menuitem");
-        save_toolbutton = (Gtk.ToolButton) builder.get_object ("save_toolbutton");
-        stop_menuitem = (Gtk.MenuItem) builder.get_object ("stop_scan_menuitem");
-        stop_toolbutton = (Gtk.ToolButton) builder.get_object ("stop_toolbutton");
-
-        text_toolbar_menuitem = (Gtk.RadioMenuItem) builder.get_object ("text_toolbutton_menuitem");
-        text_menu_menuitem = (Gtk.RadioMenuItem) builder.get_object ("text_menuitem");
-        photo_toolbar_menuitem = (Gtk.RadioMenuItem) builder.get_object ("photo_toolbutton_menuitem");
-        photo_menu_menuitem = (Gtk.RadioMenuItem) builder.get_object ("photo_menuitem");
-
-        authorize_dialog = (Gtk.Dialog) builder.get_object ("authorize_dialog");
-        authorize_label = (Gtk.Label) builder.get_object ("authorize_label");
-        username_entry = (Gtk.Entry) builder.get_object ("username_entry");
-        password_entry = (Gtk.Entry) builder.get_object ("password_entry");
-
-        preferences_dialog = (Gtk.Dialog) builder.get_object ("preferences_dialog");
-        device_combo = (Gtk.ComboBox) builder.get_object ("device_combo");
-        device_model = (Gtk.ListStore) device_combo.get_model ();
-        text_dpi_combo = (Gtk.ComboBox) builder.get_object ("text_dpi_combo");
-        text_dpi_model = (Gtk.ListStore) text_dpi_combo.get_model ();
-        photo_dpi_combo = (Gtk.ComboBox) builder.get_object ("photo_dpi_combo");
-        photo_dpi_model = (Gtk.ListStore) photo_dpi_combo.get_model ();
-        page_side_combo = (Gtk.ComboBox) builder.get_object ("page_side_combo");
-        page_side_model = (Gtk.ListStore) page_side_combo.get_model ();
-        paper_size_combo = (Gtk.ComboBox) builder.get_object ("paper_size_combo");
-        paper_size_model = (Gtk.ListStore) paper_size_combo.get_model ();
-        brightness_scale = (Gtk.Scale) builder.get_object ("brightness_scale");
-        brightness_adjustment = (Gtk.Adjustment) brightness_scale.get_adjustment ();
-        contrast_scale = (Gtk.Scale) builder.get_object ("contrast_scale");
-        contrast_adjustment = (Gtk.Adjustment) contrast_scale.get_adjustment ();
-        quality_scale = (Gtk.Scale) builder.get_object ("quality_scale");
-        quality_adjustment = (Gtk.Adjustment) quality_scale.get_adjustment ();
+        app.add_window (this);
 
         /* Add InfoBar (not supported in Glade) */
         info_bar = new Gtk.InfoBar ();
         info_bar.response.connect (info_bar_response_cb);
         main_vbox.pack_start (info_bar, false, true, 0);
         var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
-        var content_area = (Gtk.Container) info_bar.get_content_area ();
+        var content_area = info_bar.get_content_area () as Gtk.Container;
         content_area.add (hbox);
-        hbox.show ();
+        hbox.visible = true;
 
         info_bar_image = new Gtk.Image.from_icon_name ("dialog-warning", Gtk.IconSize.DIALOG);
         hbox.pack_start (info_bar_image, false, true, 0);
-        info_bar_image.show ();
+        info_bar_image.visible = true;
 
         info_bar_label = new Gtk.Label (null);
         info_bar_label.set_alignment (0.0f, 0.5f);
         hbox.pack_start (info_bar_label, true, true, 0);
-        info_bar_label.show ();
+        info_bar_label.visible = true;
 
-        info_bar_close_button = (Gtk.Button) info_bar.add_button (_("_Close"), Gtk.ResponseType.CLOSE);
-        info_bar_change_scanner_button = (Gtk.Button) info_bar.add_button (/* Button in error infobar to open preferences dialog and change scanner */
-                                                                           _("Change _Scanner"), 1);
+        info_bar_close_button = info_bar.add_button (_("_Close"), Gtk.ResponseType.CLOSE) as Gtk.Button;
+        info_bar_change_scanner_button = info_bar.add_button (/* Button in error infobar to open preferences dialog and change scanner */
+                                                              _("Change _Scanner"), 1) as Gtk.Button;
 
         Gtk.TreeIter iter;
         paper_size_model.append (out iter);
@@ -1573,9 +1800,9 @@ public class UserInterface
             settings.set_int ("paper-height", h);
         });
 
-        var lower = brightness_adjustment.get_lower ();
+        var lower = brightness_adjustment.lower;
         var darker_label = "<small>%s</small>".printf (_("Darker"));
-        var upper = brightness_adjustment.get_upper ();
+        var upper = brightness_adjustment.upper;
         var lighter_label = "<small>%s</small>".printf (_("Lighter"));
         brightness_scale.add_mark (lower, Gtk.PositionType.BOTTOM, darker_label);
         brightness_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
@@ -1583,9 +1810,9 @@ public class UserInterface
         brightness = settings.get_int ("brightness");
         brightness_adjustment.value_changed.connect (() => { settings.set_int ("brightness", brightness); });
 
-        lower = contrast_adjustment.get_lower ();
+        lower = contrast_adjustment.lower;
         var less_label = "<small>%s</small>".printf (_("Less"));
-        upper = contrast_adjustment.get_upper ();
+        upper = contrast_adjustment.upper;
         var more_label = "<small>%s</small>".printf (_("More"));
         contrast_scale.add_mark (lower, Gtk.PositionType.BOTTOM, less_label);
         contrast_scale.add_mark (0, Gtk.PositionType.BOTTOM, null);
@@ -1593,9 +1820,9 @@ public class UserInterface
         contrast = settings.get_int ("contrast");
         contrast_adjustment.value_changed.connect (() => { settings.set_int ("contrast", contrast); });
 
-        lower = quality_adjustment.get_lower ();
+        lower = quality_adjustment.lower;
         var minimum_label = "<small>%s</small>".printf (_("Minimum"));
-        upper = quality_adjustment.get_upper ();
+        upper = quality_adjustment.upper;
         var maximum_label = "<small>%s</small>".printf (_("Maximum"));
         quality_scale.add_mark (lower, Gtk.PositionType.BOTTOM, minimum_label);
         quality_scale.add_mark (75, Gtk.PositionType.BOTTOM, null);
@@ -1615,26 +1842,29 @@ public class UserInterface
             set_document_hint (document_type);
 
         book_view = new BookView (book);
-        book_view.set_border_width (18);
+        book_view.border_width = 18;
         main_vbox.pack_end (book_view, true, true, 0);
         book_view.page_selected.connect (page_selected_cb);
         book_view.show_page.connect (show_page_cb);
         book_view.show_menu.connect (show_page_menu_cb);
-        book_view.show ();
+        book_view.visible = true;
+
+        authorize_dialog.transient_for = this;
+        preferences_dialog.transient_for = this;
 
         /* Load previous state */
         load_state ();
 
         /* Restore window size */
         debug ("Restoring window to %dx%d pixels", window_width, window_height);
-        window.set_default_size (window_width, window_height);
+        set_default_size (window_width, window_height);
         if (window_is_maximized)
         {
             debug ("Restoring window to maximized");
-            window.maximize ();
+            maximize ();
         }
 
-        progress_dialog = new ProgressBarDialog (window, _("Saving document..."));
+        progress_dialog = new ProgressBarDialog (this, _("Saving document..."));
         book.saving.connect (book_saving_cb);
     }
     
@@ -1780,24 +2010,24 @@ public class UserInterface
         var fraction = (page_number + 1.0) / total;
         var complete = fraction == 1.0;
         if (complete)
-            Timeout.add(500, () => {
-                progress_dialog.hide();
+            Timeout.add (500, () => {
+                progress_dialog.visible = false;
                 return false;
             });
         var message = _("Saving page %d out of %d").printf (page_number + 1, total);
 
-        progress_dialog.set_fraction (fraction);
-        progress_dialog.set_message (message);
+        progress_dialog.fraction = fraction;
+        progress_dialog.message = message;
     }
 
     public void show_progress_dialog ()
     {
-        progress_dialog.show ();
+        progress_dialog.visible = true;
     }
 
     public void hide_progress_dialog ()
     {
-        progress_dialog.hide ();
+        progress_dialog.visible = false;
     }
 
     public void show_error (string error_title, string error_text, bool change_scanner_hint)
@@ -1811,49 +2041,51 @@ public class UserInterface
 
     public void start ()
     {
-        window.show ();
+        visible = true;
     }
 }
 
-class ProgressBarDialog : Gtk.Window
+private class ProgressBarDialog : Gtk.Window
 {
-    Gtk.ProgressBar bar;
+    private Gtk.ProgressBar bar;
+    
+    public double fraction
+    {
+        get { return bar.fraction; }
+        set { bar.fraction = value; }
+    }
+
+    public string message
+    {
+        get { return bar.text; }
+        set { bar.text = value; }
+    }
 
     public ProgressBarDialog (Gtk.ApplicationWindow parent, string title)
     {
         bar = new Gtk.ProgressBar ();
         var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 5);
         var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
-        hbox.set_hexpand (true);
+        hbox.hexpand = true;
 
-        bar.set_text ("");
-        bar.set_show_text (true);
+        bar.text = "";
+        bar.show_text = true;
         bar.set_size_request (225, 25);
         set_size_request (250, 50);
 
         vbox.pack_start (bar, true, false, 0);
         hbox.pack_start (vbox, true, false, 0);
         add (hbox);
-        set_title (title);
+        this.title = title;
 
-        set_transient_for (parent);
+        transient_for = parent;
         set_position (Gtk.WindowPosition.CENTER_ON_PARENT);
-        set_modal (true);
-        set_resizable (false);
-
-        hbox.show ();
-        vbox.show ();
-        bar.show ();
-    }
+        modal = true;
+        resizable = false;
 
-    public void set_fraction (double percent)
-    {
-        bar.set_fraction (percent);
-    }
-
-    public void set_message (string message)
-    {
-        bar.set_text (message);
+        hbox.visible = true;
+        vbox.visible = true;
+        bar.visible = true;
     }
 }
 
@@ -1878,3 +2110,68 @@ private string? get_temporary_filename (string prefix, string extension)
 
     return path;
 }
+
+private class PageIcon : Gtk.DrawingArea
+{
+    private string text;
+    private double r;
+    private double g;
+    private double b;
+    private const int MINIMUM_WIDTH = 20;
+
+    public PageIcon (string text, double r = 1.0, double g = 1.0, double b = 1.0)
+    {
+        this.text = text;
+        this.r = r;
+        this.g = g;
+        this.b = b;
+    }
+
+    public override void get_preferred_width (out int minimum_width, out int natural_width)
+    {
+        minimum_width = natural_width = MINIMUM_WIDTH;
+    }
+
+    public override void get_preferred_height (out int minimum_height, out int natural_height)
+    {
+        minimum_height = natural_height = (int) Math.round (MINIMUM_WIDTH * Math.SQRT2);
+    }
+
+    public override void get_preferred_height_for_width (int width, out int minimum_height, out int natural_height)
+    {
+        minimum_height = natural_height = (int) (width * Math.SQRT2);
+    }
+
+    public override void get_preferred_width_for_height (int height, out int minimum_width, out int natural_width)
+    {
+        minimum_width = natural_width = (int) (height / Math.SQRT2);
+    }
+
+    public override bool draw (Cairo.Context c)
+    {
+        var w = get_allocated_width ();
+        var h = get_allocated_height ();
+        if (w * Math.SQRT2 > h)
+            w = (int) Math.round (h / Math.SQRT2);
+        else
+            h = (int) Math.round (w * Math.SQRT2);
+
+        c.translate ((get_allocated_width () - w) / 2, (get_allocated_height () - h) / 2);
+
+        c.rectangle (0.5, 0.5, w - 1, h - 1);
+
+        c.set_source_rgb (r, g, b);
+        c.fill_preserve ();
+
+        c.set_line_width (1.0);
+        c.set_source_rgb (0.0, 0.0, 0.0);
+        c.stroke ();
+
+        Cairo.TextExtents extents;
+        c.text_extents (text, out extents);
+        c.translate ((w - extents.width) * 0.5 - 0.5, (h + extents.height) * 0.5 - 0.5);
+        c.show_text (text);
+
+        return true;
+    }
+}