diff --git a/Pessulus/Makefile.am b/Pessulus/Makefile.am
index ab191c4..dc2e0d4 100644
--- a/Pessulus/Makefile.am
+++ b/Pessulus/Makefile.am
@@ -9,6 +9,7 @@ app_PYTHON = 			\
 	lockdownapplier.py	\
 	lockdownbutton.py	\
 	lockdowncheckbutton.py	\
+	lockdowncombo.py \
 	main.py			\
 	maindialog.py		\
 	safeprotocols.py	\
diff --git a/Pessulus/lockdownappliergconf.py b/Pessulus/lockdownappliergconf.py
old mode 100644
new mode 100755
index b581341..5097c89
--- a/Pessulus/lockdownappliergconf.py
+++ b/Pessulus/lockdownappliergconf.py
@@ -83,6 +83,26 @@ class SafeGConfClient:
             return
         self.client.set_bool (key, value)
 
+    def get_int (self, key):
+        if not self.can_use:
+            return False
+        return self.client.get_int (key)
+
+    def set_int (self, key, value):
+        if not self.can_use:
+            return
+        self.client.set_int (key, value)
+
+    def get_string (self, key):
+        if not self.can_use:
+            return False
+        return self.client.get_string (key)
+
+    def set_string (self, key, value):
+        if not self.can_use:
+            return
+        self.client.set_string (key, value)
+
     def get_list (self, key, list_type):
         if not self.can_use:
             return []
@@ -163,6 +183,56 @@ class PessulusLockdownApplierGconf (lockdownapplier.PessulusLockdownApplier):
                 self.client_mandatory.unset (key)
             self.client.set_bool (key, value)
 
+    def get_int (self, key):
+        value = None
+        is_mandatory = False
+
+        if self.supports_mandatory_settings ():
+            entry = self.client_mandatory.get_without_default (key)
+            if entry != None:
+                is_mandatory = True
+                value = entry.get_int ()
+            else:
+                value = self.client.get_int (key)
+        else:
+            value = self.client.get_int (key)
+
+        return (value, is_mandatory)
+
+    def set_int (self, key, value, mandatory):
+        if mandatory:
+            if self.supports_mandatory_settings ():
+                self.client_mandatory.set_int (key, value)
+        else:
+            if self.supports_mandatory_settings ():
+                self.client_mandatory.unset (key)
+            self.client.set_int (key, value)
+
+    def get_string (self, key):
+        value = None
+        is_mandatory = False
+
+        if self.supports_mandatory_settings ():
+            entry = self.client_mandatory.get_without_default (key)
+            if entry != None:
+                is_mandatory = True
+                value = entry.get_string ()
+            else:
+                value = self.client.get_string (key)
+        else:
+            value = self.client.get_string (key)
+
+        return (value, is_mandatory)
+
+    def set_string (self, key, value, mandatory):
+        if mandatory:
+            if self.supports_mandatory_settings ():
+                self.client_mandatory.set_string (key, value)
+        else:
+            if self.supports_mandatory_settings ():
+                self.client_mandatory.unset (key)
+            self.client.set_string (key, value)
+
     def get_list (self, key, list_type):
         value = None
         is_mandatory = False
diff --git a/Pessulus/maindialog.py b/Pessulus/maindialog.py
index bc9a14f..6aa3aa7 100644
--- a/Pessulus/maindialog.py
+++ b/Pessulus/maindialog.py
@@ -30,6 +30,7 @@ from config import *
 
 import disabledapplets
 import lockdownbutton
+import lockdowncombo
 import lockdowncheckbutton
 import globalvar
 import safeprotocols
@@ -40,12 +41,14 @@ pages = (
     ( _('General'), "gnome-logo-icon-transparent", "vbox7" ),
     ( _('Panel'), "gnome-panel", "vbox12" ),
     ( _('Epiphany Web Browser'), "web-browser", "vboxEpiphany" ),
+    ( _('OpenOffice.org'), "gnome-logo-icon-transparent", "foo"),
     ( _('GNOME Screensaver'), "preferences-desktop-screensaver", "vbox15" )
 )
 
 gconfdirs = [
 "/desktop/gnome/lockdown",
 "/apps/epiphany/lockdown",
+"/apps/openoffice/lockdown",
 "/apps/panel/global"
 ]
 
@@ -71,7 +74,42 @@ lockdownbuttons = (
     ( "/desktop/gnome/lockdown/disable_lock_screen", _("Disable lock _screen"), "vbox15" ),
     ( "/apps/gnome-screensaver/lock_enabled", _("_Lock on activation"), "vbox15" ),
     ( "/apps/gnome-screensaver/logout_enabled", _("Allow log _out"), "vbox15" ),
-    ( "/apps/gnome-screensaver/user_switch_enabled", _("Allow user _switching"), "vbox15" )
+    ( "/apps/gnome-screensaver/user_switch_enabled", _("Allow user _switching"), "vbox15" ),
+
+    ( "/apps/openoffice/lockdown/remove_personal_info_on_save", _("Remove personal info from doc. on save"), "ooosecurity" ),
+    ( "/apps/openoffice/lockdown/warn_info_create_pdf", _("Warn if macro creates PDF"), "ooosecurity" ),
+    ( "/apps/openoffice/lockdown/warn_info_printing",   _("Warn if macro prints"), "ooosecurity" ),
+    ( "/apps/openoffice/lockdown/warn_info_saving", _("Warn if macro saves doc"), "ooosecurity" ),
+    ( "/apps/openoffice/lockdown/warn_info_signing", _("Warn if macro signs doc"), "ooosecurity" ),
+    ( "/apps/openoffice/lockdown/recommend_password_on_save", _("Recommend password on save"), "ooosecurity" ),
+
+    ( "/apps/openoffice/auto_save", _("Enable auto-save"), "oooio" ),
+#   ( "/apps/openoffice/auto_save_interval", _("Auto save interval"), "oooio" ),
+    ( "/apps/openoffice/printing_modifies_doc", _("Printing modifies document"), "oooio" ),
+    ( "/apps/openoffice/use_system_file_dialog", _("Use system file chooser"), "oooio" ),
+    ( "/apps/openoffice/create_backup", _("Create backup copy on save"), "oooio" ),
+    ( "/apps/openoffice/warn_alien_format", _("Warn for external formats"), "oooio" ),
+
+    ( "/apps/openoffice/use_opengl", _("Use Open GL"), "oooui" ),
+    ( "/apps/openoffice/use_system_font", _("Use system font"), "oooui" ),
+    ( "/apps/openoffice/use_font_anti_aliasing", _("Use anti-aliasing"), "oooui" ),
+    ( "/apps/openoffice/lockdown/disable_ui_customization", _("Disable UI customization"), "oooui" ),
+    ( "/apps/openoffice/show_menu_inactive_items", _("Show insensitive menu items"), "oooui" ),
+    ( "/apps/openoffice/show_font_preview", _("Show font preview"), "oooui" ),
+    ( "/apps/openoffice/show_font_history", _("Show font history") , "oooui"),
+    ( "/apps/openoffice/show_menu_icons", _("Show icons in menus"), "oooui" ),
+# Unclear / minority:
+#   ( "/apps/openoffice/optimize_opengl", , "oooui" ),
+#   ( "/apps/openoffice/font_anti_aliasing_min_pixel", , "oooui" ),
+)
+
+lockdowncombos = (
+    ( "/apps/openoffice/lockdown/macro_security_level", "macroSecurityLevel", "int", [ "3", "2", "1", "0" ] ),
+    ( "/apps/openoffice/writer_default_document_format", "writerDefaultFormat", "string", [ "writer8", "MS Word 97", "StarOffice XML (Writer)" ] ),
+    ( "/apps/openoffice/calc_default_document_format", "calcDefaultFormat", "string", [ "calc8", "MS Excel 97", "StarOffice XML (Calc)" ] ),
+    ( "/apps/openoffice/impress_default_document_format", "impressDefaultFormat", "string", [ "impress8", "MS PowerPoint 97", "StarOffice XML (Impress)" ] ),
+    ( "/apps/openoffice/icon_size", "defaultIconSize", "int", [ "2", "1", "0" ] ),
+    ( "/apps/openoffice/undo_steps", "undoSteps", "int", [ "5", "10", "25", "50" ] )
 )
 
 class PessulusMainDialog:
@@ -101,6 +139,7 @@ class PessulusMainDialog:
         else:
             self.window.connect ("delete-event", gtk.Widget.hide_on_delete)
 
+        self.__init_combos ()
         self.__init_checkbuttons ()
         self.__init_disabledapplets ()
         self.__init_safeprotocols ()
@@ -108,6 +147,12 @@ class PessulusMainDialog:
 
         self.window.show ()
 
+    def __init_combos (self):
+        for (key, combo_str, type, value_list) in lockdowncombos:
+            combo = self.builder.get_object (combo_str)
+            button = self.builder.get_object (combo_str + "Button")
+            lockdowncombo.PessulusLockdownCombo.attach (combo, button, key, type, value_list)
+
     def __init_checkbuttons (self):
         for (key, string, box_str) in lockdownbuttons:
             button = lockdowncheckbutton.PessulusLockdownCheckbutton.new (key,
diff --git a/data/pessulus.ui b/data/pessulus.ui
index c140ad7..0eaeaef 100644
--- a/data/pessulus.ui
+++ b/data/pessulus.ui
@@ -2,6 +2,126 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Very High</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">High</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Medium</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Low</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">OpenDocument (.odt)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Word 97+ (.doc)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">OpenOffice 1.1 (.sxw)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model3">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">OpenDocument (.ods)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Excel 97+ (.xls)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">OpenOffice 1.1 (.sxc)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model4">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">OpenDocument (.odp)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">PowerPoint 97+ (.ppt)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">OpenOffice 1.1 (.sxi)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model5">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Automatic</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Large</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Small</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model6">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes"/>
+      </row>
+      <row>
+        <col id="0" translatable="yes">5</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">10</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">25</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">50</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkDialog" id="dialogEditor">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Lockdown Editor</property>
@@ -363,6 +483,547 @@
                 <property name="position">1</property>
               </packing>
             </child>
+
+
+  <!-- start of OOo -->
+
+  <child>
+    <object class="GtkNotebook" id="notebook3">
+      <property name="border_width">12</property>
+      <property name="visible">True</property>
+      <property name="can_focus">True</property>
+      <property name="show_tabs">True</property>
+      <property name="show_border">True</property>
+      <property name="tab_pos">GTK_POS_TOP</property>
+      <property name="scrollable">False</property>
+      <property name="enable_popup">False</property>
+      <child>
+        <object class="GtkVBox" id="ooosecurity">
+          <property name="border_width">12</property>
+          <property name="visible">True</property>
+          <property name="homogeneous">False</property>
+          <property name="spacing">6</property>
+          <child>
+            <object class="GtkHBox" id="hbox4">
+              <property name="visible">True</property>
+              <property name="homogeneous">False</property>
+              <property name="spacing">0</property>
+              <child>
+                <object class="GtkButton" id="macroSecurityLevelButton">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="label" translatable="yes"/>
+                  <property name="use_underline">True</property>
+                  <property name="relief">GTK_RELIEF_NONE</property>
+                  <property name="focus_on_click">True</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkLabel" id="label17">
+                  <property name="visible">True</property>
+                  <property name="label" translatable="yes">Macro Security Level:</property>
+                  <property name="use_underline">False</property>
+                  <property name="use_markup">True</property>
+                  <property name="justify">GTK_JUSTIFY_LEFT</property>
+                  <property name="wrap">False</property>
+                  <property name="selectable">False</property>
+                  <property name="xalign">0</property>
+                  <property name="yalign">0.5</property>
+                  <property name="xpad">0</property>
+                  <property name="ypad">0</property>
+                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                  <property name="width_chars">-1</property>
+                  <property name="single_line_mode">False</property>
+                  <property name="angle">0</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkComboBox" id="macroSecurityLevel">
+                  <property name="visible">True</property>
+                  <property name="add_tearoffs">False</property>
+                  <property name="focus_on_click">True</property>
+                  <property name="model">model1</property>
+                  <child>
+                    <object class="GtkCellRendererText" id="renderer1"/>
+                    <attributes>
+                      <attribute name="text">0</attribute>
+                    </attributes>
+                  </child>
+                </object>
+                <packing>
+                  <property name="padding">6</property>
+                  <property name="expand">True</property>
+                  <property name="fill">True</property>
+                </packing>
+              </child>
+            </object>
+            <packing>
+              <property name="padding">0</property>
+              <property name="expand">False</property>
+              <property name="fill">True</property>
+            </packing>
+          </child>
+          <child>
+            <placeholder/>
+          </child>
+        </object>
+        <packing>
+          <property name="tab_expand">False</property>
+          <property name="tab_fill">True</property>
+        </packing>
+      </child>
+      <child type="tab">
+        <object class="GtkLabel" id="label24">
+          <property name="visible">True</property>
+          <property name="label" translatable="yes">Security</property>
+          <property name="use_underline">False</property>
+          <property name="use_markup">False</property>
+          <property name="justify">GTK_JUSTIFY_LEFT</property>
+          <property name="wrap">False</property>
+          <property name="selectable">False</property>
+          <property name="xalign">0.5</property>
+          <property name="yalign">0.5</property>
+          <property name="xpad">0</property>
+          <property name="ypad">0</property>
+          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+          <property name="width_chars">-1</property>
+          <property name="single_line_mode">False</property>
+          <property name="angle">0</property>
+        </object>
+      </child>
+      <child>
+        <object class="GtkVBox" id="oooio">
+          <property name="border_width">12</property>
+          <property name="visible">True</property>
+          <property name="homogeneous">False</property>
+          <property name="spacing">6</property>
+          <child>
+            <object class="GtkHBox" id="hbox5">
+              <property name="visible">True</property>
+              <property name="homogeneous">False</property>
+              <property name="spacing">0</property>
+              <child>
+                <object class="GtkButton" id="writerDefaultFormatButton">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="label" translatable="yes"/>
+                  <property name="use_underline">True</property>
+                  <property name="relief">GTK_RELIEF_NONE</property>
+                  <property name="focus_on_click">True</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkLabel" id="label18">
+                  <property name="visible">True</property>
+                  <property name="label" translatable="yes">Writer default format:</property>
+                  <property name="use_underline">False</property>
+                  <property name="use_markup">True</property>
+                  <property name="justify">GTK_JUSTIFY_LEFT</property>
+                  <property name="wrap">False</property>
+                  <property name="selectable">False</property>
+                  <property name="xalign">0</property>
+                  <property name="yalign">0.5</property>
+                  <property name="xpad">0</property>
+                  <property name="ypad">0</property>
+                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                  <property name="width_chars">-1</property>
+                  <property name="single_line_mode">False</property>
+                  <property name="angle">0</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkComboBox" id="writerDefaultFormat">
+                  <property name="visible">True</property>
+                  <property name="add_tearoffs">False</property>
+                  <property name="focus_on_click">True</property>
+                  <property name="model">model2</property>
+                  <child>
+                    <object class="GtkCellRendererText" id="renderer2"/>
+                    <attributes>
+                      <attribute name="text">0</attribute>
+                    </attributes>
+                  </child>
+                </object>
+                <packing>
+                  <property name="padding">6</property>
+                  <property name="expand">True</property>
+                  <property name="fill">True</property>
+                </packing>
+              </child>
+            </object>
+            <packing>
+              <property name="padding">0</property>
+              <property name="expand">False</property>
+              <property name="fill">True</property>
+            </packing>
+          </child>
+          <child>
+            <object class="GtkHBox" id="hbox6">
+              <property name="visible">True</property>
+              <property name="homogeneous">False</property>
+              <property name="spacing">0</property>
+              <child>
+                <object class="GtkButton" id="calcDefaultFormatButton">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="label" translatable="yes"/>
+                  <property name="use_underline">True</property>
+                  <property name="relief">GTK_RELIEF_NONE</property>
+                  <property name="focus_on_click">True</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkLabel" id="label19">
+                  <property name="visible">True</property>
+                  <property name="label" translatable="yes">Calc default format:</property>
+                  <property name="use_underline">False</property>
+                  <property name="use_markup">True</property>
+                  <property name="justify">GTK_JUSTIFY_LEFT</property>
+                  <property name="wrap">False</property>
+                  <property name="selectable">False</property>
+                  <property name="xalign">0</property>
+                  <property name="yalign">0.5</property>
+                  <property name="xpad">0</property>
+                  <property name="ypad">0</property>
+                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                  <property name="width_chars">-1</property>
+                  <property name="single_line_mode">False</property>
+                  <property name="angle">0</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkComboBox" id="calcDefaultFormat">
+                  <property name="visible">True</property>
+                  <property name="add_tearoffs">False</property>
+                  <property name="focus_on_click">True</property>
+                  <property name="model">model3</property>
+                  <child>
+                    <object class="GtkCellRendererText" id="renderer3"/>
+                    <attributes>
+                      <attribute name="text">0</attribute>
+                    </attributes>
+                  </child>
+                </object>
+                <packing>
+                  <property name="padding">6</property>
+                  <property name="expand">True</property>
+                  <property name="fill">True</property>
+                </packing>
+              </child>
+            </object>
+            <packing>
+              <property name="padding">0</property>
+              <property name="expand">False</property>
+              <property name="fill">True</property>
+            </packing>
+          </child>
+          <child>
+            <object class="GtkHBox" id="hbox7">
+              <property name="visible">True</property>
+              <property name="homogeneous">False</property>
+              <property name="spacing">0</property>
+              <child>
+                <object class="GtkButton" id="impressDefaultFormatButton">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="label" translatable="yes"/>
+                  <property name="use_underline">True</property>
+                  <property name="relief">GTK_RELIEF_NONE</property>
+                  <property name="focus_on_click">True</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkLabel" id="label20">
+                  <property name="visible">True</property>
+                  <property name="label" translatable="yes">Impress default format:</property>
+                  <property name="use_underline">False</property>
+                  <property name="use_markup">True</property>
+                  <property name="justify">GTK_JUSTIFY_LEFT</property>
+                  <property name="wrap">False</property>
+                  <property name="selectable">False</property>
+                  <property name="xalign">0</property>
+                  <property name="yalign">0.5</property>
+                  <property name="xpad">0</property>
+                  <property name="ypad">0</property>
+                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                  <property name="width_chars">-1</property>
+                  <property name="single_line_mode">False</property>
+                  <property name="angle">0</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkComboBox" id="impressDefaultFormat">
+                  <property name="visible">True</property>
+                  <property name="add_tearoffs">False</property>
+                  <property name="focus_on_click">True</property>
+                  <property name="model">model4</property>
+                  <child>
+                    <object class="GtkCellRendererText" id="renderer4"/>
+                    <attributes>
+                      <attribute name="text">0</attribute>
+                    </attributes>
+                  </child>
+                </object>
+                <packing>
+                  <property name="padding">6</property>
+                  <property name="expand">True</property>
+                  <property name="fill">True</property>
+                </packing>
+              </child>
+            </object>
+            <packing>
+              <property name="padding">0</property>
+              <property name="expand">False</property>
+              <property name="fill">True</property>
+            </packing>
+          </child>
+        </object>
+        <packing>
+          <property name="tab_expand">False</property>
+          <property name="tab_fill">True</property>
+        </packing>
+      </child>
+      <child type="tab">
+        <object class="GtkLabel" id="label25">
+          <property name="visible">True</property>
+          <property name="label" translatable="yes">Load / Save</property>
+          <property name="use_underline">False</property>
+          <property name="use_markup">False</property>
+          <property name="justify">GTK_JUSTIFY_LEFT</property>
+          <property name="wrap">False</property>
+          <property name="selectable">False</property>
+          <property name="xalign">0.5</property>
+          <property name="yalign">0.5</property>
+          <property name="xpad">0</property>
+          <property name="ypad">0</property>
+          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+          <property name="width_chars">-1</property>
+          <property name="single_line_mode">False</property>
+          <property name="angle">0</property>
+        </object>
+      </child>
+      <child>
+        <object class="GtkVBox" id="oooui">
+          <property name="border_width">12</property>
+          <property name="visible">True</property>
+          <property name="homogeneous">False</property>
+          <property name="spacing">6</property>
+          <child>
+            <object class="GtkHBox" id="hbox8">
+              <property name="visible">True</property>
+              <property name="homogeneous">False</property>
+              <property name="spacing">0</property>
+              <child>
+                <object class="GtkButton" id="defaultIconSizeButton">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="label" translatable="yes"/>
+                  <property name="use_underline">True</property>
+                  <property name="relief">GTK_RELIEF_NONE</property>
+                  <property name="focus_on_click">True</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkLabel" id="label21">
+                  <property name="visible">True</property>
+                  <property name="label" translatable="yes">Default icon size</property>
+                  <property name="use_underline">False</property>
+                  <property name="use_markup">True</property>
+                  <property name="justify">GTK_JUSTIFY_LEFT</property>
+                  <property name="wrap">False</property>
+                  <property name="selectable">False</property>
+                  <property name="xalign">0</property>
+                  <property name="yalign">0.5</property>
+                  <property name="xpad">0</property>
+                  <property name="ypad">0</property>
+                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                  <property name="width_chars">-1</property>
+                  <property name="single_line_mode">False</property>
+                  <property name="angle">0</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkComboBox" id="defaultIconSize">
+                  <property name="visible">True</property>
+                  <property name="add_tearoffs">False</property>
+                  <property name="focus_on_click">True</property>
+                  <property name="model">model5</property>
+                  <child>
+                    <object class="GtkCellRendererText" id="renderer5"/>
+                    <attributes>
+                      <attribute name="text">0</attribute>
+                    </attributes>
+                  </child>
+                </object>
+                <packing>
+                  <property name="padding">6</property>
+                  <property name="expand">True</property>
+                  <property name="fill">True</property>
+                </packing>
+              </child>
+            </object>
+            <packing>
+              <property name="padding">0</property>
+              <property name="expand">False</property>
+              <property name="fill">True</property>
+            </packing>
+          </child>
+          <child>
+            <object class="GtkHBox" id="hbox9">
+              <property name="visible">True</property>
+              <property name="homogeneous">False</property>
+              <property name="spacing">0</property>
+              <child>
+                <object class="GtkButton" id="undoStepsButton">
+                  <property name="visible">True</property>
+                  <property name="can_focus">True</property>
+                  <property name="label" translatable="yes"/>
+                  <property name="use_underline">True</property>
+                  <property name="relief">GTK_RELIEF_NONE</property>
+                  <property name="focus_on_click">True</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkLabel" id="label22">
+                  <property name="visible">True</property>
+                  <property name="label" translatable="yes">Undo Steps:</property>
+                  <property name="use_underline">False</property>
+                  <property name="use_markup">True</property>
+                  <property name="justify">GTK_JUSTIFY_LEFT</property>
+                  <property name="wrap">False</property>
+                  <property name="selectable">False</property>
+                  <property name="xalign">0</property>
+                  <property name="yalign">0.5</property>
+                  <property name="xpad">0</property>
+                  <property name="ypad">0</property>
+                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                  <property name="width_chars">-1</property>
+                  <property name="single_line_mode">False</property>
+                  <property name="angle">0</property>
+                </object>
+                <packing>
+                  <property name="padding">0</property>
+                  <property name="expand">False</property>
+                  <property name="fill">False</property>
+                </packing>
+              </child>
+              <child>
+                <object class="GtkComboBox" id="undoSteps">
+                  <property name="visible">True</property>
+                  <property name="add_tearoffs">False</property>
+                  <property name="focus_on_click">True</property>
+                  <property name="model">model6</property>
+                  <child>
+                    <object class="GtkCellRendererText" id="renderer6"/>
+                    <attributes>
+                      <attribute name="text">0</attribute>
+                    </attributes>
+                  </child>
+                </object>
+                <packing>
+                  <property name="padding">6</property>
+                  <property name="expand">True</property>
+                  <property name="fill">True</property>
+                </packing>
+              </child>
+            </object>
+            <packing>
+              <property name="padding">0</property>
+              <property name="expand">False</property>
+              <property name="fill">True</property>
+            </packing>
+          </child>
+          <child>
+            <placeholder/>
+          </child>
+        </object>
+        <packing>
+          <property name="tab_expand">False</property>
+          <property name="tab_fill">True</property>
+        </packing>
+      </child>
+      <child type="tab">
+        <object class="GtkLabel" id="label26">
+          <property name="visible">True</property>
+          <property name="label" translatable="yes">User Interface</property>
+          <property name="use_underline">False</property>
+          <property name="use_markup">False</property>
+          <property name="justify">GTK_JUSTIFY_LEFT</property>
+          <property name="wrap">False</property>
+          <property name="selectable">False</property>
+          <property name="xalign">0.5</property>
+          <property name="yalign">0.5</property>
+          <property name="xpad">0</property>
+          <property name="ypad">0</property>
+          <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+          <property name="width_chars">-1</property>
+          <property name="single_line_mode">False</property>
+          <property name="angle">0</property>
+        </object>
+      </child>
+    </object>
+    <packing>
+      <property name="tab_expand">False</property>
+      <property name="tab_fill">True</property>
+    </packing>
+  </child>
+  <!-- end of OOo -->
+
           </object>
           <packing>
             <property name="position">1</property>
