diff --git a/app/.DS_Store b/app/.DS_Store
new file mode 100644
index 0000000000..a88882c914
Binary files /dev/null and b/app/.DS_Store differ
diff --git a/data/.DS_Store b/data/.DS_Store
new file mode 100644
index 0000000000..6f3ff5773b
Binary files /dev/null and b/data/.DS_Store differ
diff --git a/etc/Makefile.am b/etc/Makefile.am
index b66d1c97a2..7ab896af81 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -5,7 +5,6 @@ gimpsysconf_DATA = \
 	gimprc		\
 	gtkrc		\
 	menurc		\
-	ps-menurc	\
 	sessionrc	\
 	templaterc	\
 	unitrc
diff --git a/plug-ins/common/file-pdf b/plug-ins/common/file-pdf
new file mode 100755
index 0000000000..8baa0984e0
--- /dev/null
+++ b/plug-ins/common/file-pdf
@@ -0,0 +1,130 @@
+#! /bin/sh
+
+# file-pdf - temporary wrapper script for .libs/file-pdf
+# Generated by ltmain.sh (GNU libtool) 2.2.6b
+#
+# The file-pdf program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='/opt/local/bin/gsed -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.2.6b'
+  notinst_deplibs=' ../../libgimp/libgimpui-2.0.la /Users/peter/babl/gegl/gimp/libgimp/libgimp-2.0.la /Users/peter/babl/gegl/gimp/libgimpwidgets/libgimpwidgets-2.0.la /Users/peter/babl/gegl/gimp/libgimpmodule/libgimpmodule-2.0.la ../../libgimpwidgets/libgimpwidgets-2.0.la ../../libgimpmodule/libgimpmodule-2.0.la ../../libgimp/libgimp-2.0.la /Users/peter/babl/gegl/gimp/libgimpconfig/libgimpconfig-2.0.la ../../libgimpmath/libgimpmath-2.0.la ../../libgimpconfig/libgimpconfig-2.0.la /Users/peter/babl/gegl/gimp/libgimpbase/libgimpbase-2.0.la /Users/peter/babl/gegl/gimp/libgimpcolor/libgimpcolor-2.0.la /Users/peter/babl/gegl/gimp/libgimpmath/libgimpmath-2.0.la ../../libgimpcolor/libgimpcolor-2.0.la ../../libgimpbase/libgimpbase-2.0.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    ECHO="/bin/echo"
+    file="$0"
+    # Make sure echo works.
+    if test "X$1" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+      # Yippee, $ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe $ECHO will work.
+      exec /bin/sh "$0" --no-reexec ${1+"$@"}
+    fi
+  fi
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /opt/local/bin/gsed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /opt/local/bin/gsed -n 's/.*-> //p'`
+  done
+
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='file-pdf'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to DYLD_LIBRARY_PATH
+    DYLD_LIBRARY_PATH="/Users/peter/babl/gegl/gimp/libgimp/.libs:/Users/peter/babl/gegl/gimp/libgimpwidgets/.libs:/Users/peter/babl/gegl/gimp/libgimpmodule/.libs:/Users/peter/babl/gegl/gimp/libgimpconfig/.libs:/Users/peter/babl/gegl/gimp/libgimpmath/.libs:/Users/peter/babl/gegl/gimp/libgimpbase/.libs:/Users/peter/babl/gegl/gimp/libgimpcolor/.libs:$DYLD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    DYLD_LIBRARY_PATH=`$ECHO "X$DYLD_LIBRARY_PATH" | $Xsed -e 's/::*$//'`
+
+    export DYLD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    /bin/echo "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/plug-ins/common/gee b/plug-ins/common/gee
new file mode 100755
index 0000000000..aaa7abcf95
--- /dev/null
+++ b/plug-ins/common/gee
@@ -0,0 +1,130 @@
+#! /bin/sh
+
+# gee - temporary wrapper script for .libs/gee
+# Generated by ltmain.sh (GNU libtool) 2.2.6b
+#
+# The gee program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='/opt/local/bin/gsed -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.2.6b'
+  notinst_deplibs=' ../../libgimp/libgimpui-2.0.la /Users/peter/babl/gegl/gimp/libgimp/libgimp-2.0.la /Users/peter/babl/gegl/gimp/libgimpwidgets/libgimpwidgets-2.0.la /Users/peter/babl/gegl/gimp/libgimpmodule/libgimpmodule-2.0.la ../../libgimpwidgets/libgimpwidgets-2.0.la ../../libgimpmodule/libgimpmodule-2.0.la ../../libgimp/libgimp-2.0.la /Users/peter/babl/gegl/gimp/libgimpconfig/libgimpconfig-2.0.la /Users/peter/babl/gegl/gimp/libgimpcolor/libgimpcolor-2.0.la /Users/peter/babl/gegl/gimp/libgimpbase/libgimpbase-2.0.la ../../libgimpmath/libgimpmath-2.0.la ../../libgimpconfig/libgimpconfig-2.0.la /Users/peter/babl/gegl/babl/gegl/gimp/libgimpbase/libgimpbase-2.0.la /Users/peter/babl/gegl/babl/gegl/gimp/libgimpcolor/libgimpcolor-2.0.la /Users/peter/babl/gegl/babl/gegl/gimp/libgimpmath/libgimpmath-2.0.la ../../libgimpcolor/libgimpcolor-2.0.la ../../libgimpbase/libgimpbase-2.0.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    ECHO="/bin/echo"
+    file="$0"
+    # Make sure echo works.
+    if test "X$1" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+      # Yippee, $ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe $ECHO will work.
+      exec /bin/sh "$0" --no-reexec ${1+"$@"}
+    fi
+  fi
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /opt/local/bin/gsed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /opt/local/bin/gsed -n 's/.*-> //p'`
+  done
+
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='gee'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to DYLD_LIBRARY_PATH
+    DYLD_LIBRARY_PATH="/Users/peter/babl/gegl/gimp/libgimp/.libs:/Users/peter/babl/gegl/gimp/libgimpwidgets/.libs:/Users/peter/babl/gegl/gimp/libgimpmodule/.libs:/Users/peter/babl/gegl/gimp/libgimpconfig/.libs:/Users/peter/babl/gegl/gimp/libgimpcolor/.libs:/Users/peter/babl/gegl/gimp/libgimpbase/.libs:/Users/peter/babl/gegl/gimp/libgimpmath/.libs:/Users/peter/babl/gegl/babl/gegl/gimp/libgimpbase/.libs:/Users/peter/babl/gegl/babl/gegl/gimp/libgimpcolor/.libs:/Users/peter/babl/gegl/babl/gegl/gimp/libgimpmath/.libs:$DYLD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    DYLD_LIBRARY_PATH=`$ECHO "X$DYLD_LIBRARY_PATH" | $Xsed -e 's/::*$//'`
+
+    export DYLD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    /bin/echo "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi
diff --git a/plug-ins/common/gee-zoom b/plug-ins/common/gee-zoom
new file mode 100755
index 0000000000..87194a062e
--- /dev/null
+++ b/plug-ins/common/gee-zoom
@@ -0,0 +1,130 @@
+#! /bin/sh
+
+# gee-zoom - temporary wrapper script for .libs/gee-zoom
+# Generated by ltmain.sh (GNU libtool) 2.2.6b
+#
+# The gee-zoom program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='/opt/local/bin/gsed -e 1s/^X//'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=""
+
+# This environment variable determines our operation mode.
+if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
+  # install mode needs the following variables:
+  generated_by_libtool_version='2.2.6b'
+  notinst_deplibs=' ../../libgimp/libgimpui-2.0.la /Users/peter/babl/gegl/gimp/libgimp/libgimp-2.0.la /Users/peter/babl/gegl/gimp/libgimpwidgets/libgimpwidgets-2.0.la /Users/peter/babl/gegl/gimp/libgimpmodule/libgimpmodule-2.0.la ../../libgimpwidgets/libgimpwidgets-2.0.la ../../libgimpmodule/libgimpmodule-2.0.la ../../libgimp/libgimp-2.0.la /Users/peter/babl/gegl/gimp/libgimpconfig/libgimpconfig-2.0.la /Users/peter/babl/gegl/gimp/libgimpcolor/libgimpcolor-2.0.la /Users/peter/babl/gegl/gimp/libgimpbase/libgimpbase-2.0.la ../../libgimpmath/libgimpmath-2.0.la ../../libgimpconfig/libgimpconfig-2.0.la /Users/peter/babl/gegl/babl/gegl/gimp/libgimpbase/libgimpbase-2.0.la /Users/peter/babl/gegl/babl/gegl/gimp/libgimpcolor/libgimpcolor-2.0.la /Users/peter/babl/gegl/babl/gegl/gimp/libgimpmath/libgimpmath-2.0.la ../../libgimpcolor/libgimpcolor-2.0.la ../../libgimpbase/libgimpbase-2.0.la'
+else
+  # When we are sourced in execute mode, $file and $ECHO are already set.
+  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+    ECHO="/bin/echo"
+    file="$0"
+    # Make sure echo works.
+    if test "X$1" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
+      # Yippee, $ECHO works!
+      :
+    else
+      # Restart under the correct shell, and then maybe $ECHO will work.
+      exec /bin/sh "$0" --no-reexec ${1+"$@"}
+    fi
+  fi
+
+  # Find the directory that this script lives in.
+  thisdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+  test "x$thisdir" = "x$file" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=`ls -ld "$file" | /opt/local/bin/gsed -n 's/.*-> //p'`
+  while test -n "$file"; do
+    destdir=`$ECHO "X$file" | $Xsed -e 's%/[^/]*$%%'`
+
+    # If there was a directory component, then change thisdir.
+    if test "x$destdir" != "x$file"; then
+      case "$destdir" in
+      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
+      *) thisdir="$thisdir/$destdir" ;;
+      esac
+    fi
+
+    file=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
+    file=`ls -ld "$thisdir/$file" | /opt/local/bin/gsed -n 's/.*-> //p'`
+  done
+
+
+  # Usually 'no', except on cygwin/mingw when embedded into
+  # the cwrapper.
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
+  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
+    # special case for '.'
+    if test "$thisdir" = "."; then
+      thisdir=`pwd`
+    fi
+    # remove .libs from thisdir
+    case "$thisdir" in
+    *[\\/].libs ) thisdir=`$ECHO "X$thisdir" | $Xsed -e 's%[\\/][^\\/]*$%%'` ;;
+    .libs )   thisdir=. ;;
+    esac
+  fi
+
+  # Try to get the absolute directory name.
+  absdir=`cd "$thisdir" && pwd`
+  test -n "$absdir" && thisdir="$absdir"
+
+  program='gee-zoom'
+  progdir="$thisdir/.libs"
+
+
+  if test -f "$progdir/$program"; then
+    # Add our own library path to DYLD_LIBRARY_PATH
+    DYLD_LIBRARY_PATH="/Users/peter/babl/gegl/gimp/libgimp/.libs:/Users/peter/babl/gegl/gimp/libgimpwidgets/.libs:/Users/peter/babl/gegl/gimp/libgimpmodule/.libs:/Users/peter/babl/gegl/gimp/libgimpconfig/.libs:/Users/peter/babl/gegl/gimp/libgimpcolor/.libs:/Users/peter/babl/gegl/gimp/libgimpbase/.libs:/Users/peter/babl/gegl/gimp/libgimpmath/.libs:/Users/peter/babl/gegl/babl/gegl/gimp/libgimpbase/.libs:/Users/peter/babl/gegl/babl/gegl/gimp/libgimpcolor/.libs:/Users/peter/babl/gegl/babl/gegl/gimp/libgimpmath/.libs:$DYLD_LIBRARY_PATH"
+
+    # Some systems cannot cope with colon-terminated DYLD_LIBRARY_PATH
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    DYLD_LIBRARY_PATH=`$ECHO "X$DYLD_LIBRARY_PATH" | $Xsed -e 's/::*$//'`
+
+    export DYLD_LIBRARY_PATH
+
+    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
+      # Run the actual program with our arguments.
+
+      exec "$progdir/$program" ${1+"$@"}
+
+      $ECHO "$0: cannot exec $program $*" 1>&2
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    $ECHO "$0: error: \`$progdir/$program' does not exist" 1>&2
+    $ECHO "This script is just a wrapper for $program." 1>&2
+    /bin/echo "See the libtool documentation for more information." 1>&2
+    exit 1
+  fi
+fi